X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2Fcluster.pl;h=f62d2522bac7f707a6da0d88e8d75abe69a32b2b;hb=refs%2Fheads%2Fnewprot2;hp=c6ec4e52d51f73a5afaf81fa1ed0211a3c45a581;hpb=c76bd4b6555d057c32b59e29654c2f88beb67c2a;p=spider.git

diff --git a/perl/cluster.pl b/perl/cluster.pl
index c6ec4e52..f62d2522 100755
--- a/perl/cluster.pl
+++ b/perl/cluster.pl
@@ -194,20 +194,15 @@ sub new_channel
 
 	# create the channel
 	if ($user->wantnp) {
-		if ($user->passphrase && $main::me->user->passphrase) {
-			$dxchan = QXProt->new($call, $conn, $user);
-		} else {
-			unless ($user->passphrase) {
-				Log('DXCommand', "$call using NP but has no passphrase");
-				dbg("$call using NP but has no passphrase");
-			}
-			unless ($main::me->user->passphrase) {
-				Log('DXCommand', "$main::mycall using NP but has no passphrase");
-				dbg("$main::mycall using NP but has no passphrase");
-			}
-			already_conn($conn, $call, "Need to exchange passphrases");
-			return;
+		unless ($user->passphrase) {
+			Log('DXCommand', "$call using NP but has no passphrase");
+			dbg("$call using NP but has no passphrase");
+		}
+		unless ($main::me->user->passphrase) {
+			Log('DXCommand', "$main::mycall using NP but has no passphrase");
+			dbg("$main::mycall using NP but has no passphrase");
 		}
+		$dxchan = QXProt->new($call, $conn, $user);
 	} elsif ($user->is_node) {
 		$dxchan = DXProt->new($call, $conn, $user);
 	} elsif ($user->is_user) {