no manditory passphrase

[spider.git] / perl / cluster.pl

diff --git a/perl/cluster.pl b/perl/cluster.pl
index 655a986b1af35dfd881795a3a3ffb320a867dc82..fb093d7071d94731fec25b0a6958308f0bc943bd 100755 (executable)
--- a/perl/cluster.pl
+++ b/perl/cluster.pl
@@ -33,7 +33,7 @@ BEGIN {
 
        # try to create and lock a lockfile (this isn't atomic but 
        # should do for now
-       $lockfn = "$root/perl/cluster.lck";       # lock file name
+       $lockfn = "$root/local/cluster.lck";       # lock file name
        if (-e $lockfn) {
                open(CLLOCK, "$lockfn") or die "Can't open Lockfile ($lockfn) $!";
                my $pid = <CLLOCK>;
@@ -205,7 +205,7 @@ sub new_channel
                                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");
+#                      already_conn($conn, $call, "Need to exchange passphrases");
                        return;
                }
        } elsif ($user->is_node) {
@@ -240,6 +240,13 @@ sub rec
        }
 }
 
+# remove any outstanding entries on the inqueue after a disconnection (usually)
+sub clean_inqueue
+{
+       my $dxchan = shift;
+       @inqueue = grep {$_->{dxchan} != $dxchan} @inqueue;
+}
+
 sub login
 {
        return \&new_channel;
@@ -399,7 +406,7 @@ dbg("DXSpider Version $version, build $build started");
 
 # load Prefixes
 dbg("loading prefixes ...");
-my $r = Prefix::load();
+my $r = Prefix::init();
 confess $r if $r;
 dbg(USDB::init());
 
@@ -549,7 +556,7 @@ for (;;) {
                DXUser::process();
                DXDupe::process();
                AGWMsg::process();
-                               
+
                eval { 
                        Local::process();       # do any localised processing
                };