fix registration checking on call+ssid

[spider.git] / perl / cluster.pl

diff --git a/perl/cluster.pl b/perl/cluster.pl
index c9b49182d09f9965c7174e295bd833649f514525..9416a7f3a8578769a2a4152895433646cc00cc8b 100755 (executable)
--- a/perl/cluster.pl
+++ b/perl/cluster.pl
@@ -263,8 +263,8 @@ sub new_channel
                        $lock = $user->lockout;
                } elsif ($basecall ne $call) {
                        # if there isn't a SSID on the $call, then try the base
-                       $user = DXUser::get_current($basecall);
-                       $lock = $user->lockout if $user;
+                       my $luser = DXUser::get_current($basecall);
+                       $lock = $luser->lockout if $luser;
                }
 
                # now deal with the lock
@@ -545,6 +545,12 @@ sub setup_start
                $SIG{__DIE__} = $w;
        }
 
+       # setup location of motd & issue
+       localdata_mv($motd);
+       $motd = localdata($motd);
+       localdata_mv("issue");
+       
+
        # try to load XML::Simple
        DXXml::init();
 
@@ -660,14 +666,14 @@ sub setup_start
        dbg("Start WCY");
        WCY->init();
 
-       # initial the Spot stuff
-       dbg("Starting DX Spot system");
-       Spot->init();
-
        # initialise the protocol engine
        dbg("Start Protocol Engines ...");
        DXProt->init();
 
+       # read startup script
+       my $script = new Script "startup";
+       $script->run($main::me) if $script;
+
        # put in a DXCluster node for us here so we can add users and take them away
        $routeroot = Route::Node->new($mycall, $version*100+5300, Route::here($main::me->here)|Route::conf($main::me->conf));
        $routeroot->do_pc9x(1);
@@ -679,6 +685,10 @@ sub setup_start
        #       $Route::filterdef->cmd($main::me, 'route', 'accept', "node_default call $mycall" );
        #}
 
+       # initial the Spot stuff
+       dbg("Starting DX Spot system");
+       Spot->init();
+
        # read in any existing message headers and clean out old crap
        dbg("reading existing message headers ...");
        DXMsg->init();
@@ -708,8 +718,6 @@ sub setup_start
 
        # this, such as it is, is the main loop!
        dbg("orft we jolly well go ...");
-       my $script = new Script "startup";
-       $script->run($main::me) if $script;
 
        #open(DB::OUT, "|tee /tmp/aa");
 }