fix passphrase

diff --git a/perl/cluster.pl b/perl/cluster.pl
index fb093d7071d94731fec25b0a6958308f0bc943bd..f62d2522bac7f707a6da0d88e8d75abe69a32b2b 100755 (executable)
--- 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) {