From: minima <minima>
Date: Tue, 21 Jan 2003 15:10:36 +0000 (+0000)
Subject: fix passphrase
X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=6afed1e3093451f756df19c0a5d350e28f814381;p=spider.git

fix passphrase
---

diff --git a/perl/cluster.pl b/perl/cluster.pl
index fb093d70..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) {