X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXProt.pm;h=310a3e87b94b61ecc17c43cb32d13123ca570b6a;hb=2b58ccdf81685a1167a43c38705a0d84b9d8d661;hp=ab1e7572b45c426a374cbebd3da369d1100ec6d7;hpb=775fd16897916dccc374098ba6130b0f8858b636;p=spider.git diff --git a/perl/DXProt.pm b/perl/DXProt.pm index ab1e7572..310a3e87 100644 --- a/perl/DXProt.pm +++ b/perl/DXProt.pm @@ -34,6 +34,13 @@ use Route; use Route::Node; use strict; + +use vars qw($VERSION $BRANCH); +$VERSION = sprintf( "%d.%03d", q$Revision$ =~ /(\d+)\.(\d+)/ ); +$BRANCH = sprintf( "%d.%03d", q$Revision$ =~ /\d+\.\d+\.(\d+)\.(\d+)/ ) || 0; +$main::build += $VERSION; +$main::branch += $BRANCH; + use vars qw($me $pc11_max_age $pc23_max_age $last_hour $last10 %eph %pings %rcmds %nodehops $baddx $badspotter $badnode $censorpc @@ -213,7 +220,9 @@ sub start # remember type of connection $self->{consort} = $line; $self->{outbound} = $sort eq 'O'; - $self->{priv} = $user->priv || 1; # other clusters can always be 'normal' users + my $priv = $user->priv; + $priv = $user->priv(1) unless $priv; + $self->{priv} = $priv; # other clusters can always be 'normal' users $self->{lang} = $user->lang || 'en'; $self->{isolate} = $user->{isolate}; $self->{consort} = $line; # save the connection type @@ -716,7 +725,7 @@ sub normal $user = DXUser->new($call); $user->sort('A'); $user->priv(1); # I have relented and defaulted nodes - $self->{priv} = 1; # to user RCMDs allowed + $user->lockout(1); $user->homenode($call); $user->node($call); } @@ -856,7 +865,7 @@ sub normal return; } - Log('DXProt', "Merge request for $field[3] spots and $field[4] WWV from $field[1]"); + Log('DXProt', "Merge request for $field[3] spots and $field[4] WWV from $field[2]"); # spots if ($field[3] > 0) {