projects
/
spider.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
changed R and SFI around in mrtg.pl
[spider.git]
/
perl
/
DXUser.pm
diff --git
a/perl/DXUser.pm
b/perl/DXUser.pm
index 6e2c014e80febe2efcd84be9afc6d08b9a67da3e..6ca9b91e5af7aff42fb73c28b08d220429194f11 100644
(file)
--- a/
perl/DXUser.pm
+++ b/
perl/DXUser.pm
@@
-78,8
+78,6
@@
$v3 = 0;
wantlogininfo => '0,Login Info Req,yesno',
wantgrid => '0,Show DX Grid,yesno',
wantann_talk => '0,Talklike Anns,yesno',
wantlogininfo => '0,Login Info Req,yesno',
wantgrid => '0,Show DX Grid,yesno',
wantann_talk => '0,Talklike Anns,yesno',
- wantpc90 => '1,Req PC90,yesno',
- wantnp => '1,Req New Proto,yesno',
wantpc16 => '9,Want Users from node,yesno',
wantsendpc16 => '9,Send PC16,yesno',
wantroutepc19 => '9,Route PC19,yesno',
wantpc16 => '9,Want Users from node,yesno',
wantsendpc16 => '9,Send PC16,yesno',
wantroutepc19 => '9,Route PC19,yesno',
@@
-143,7
+141,7
@@
sub init
$ufn = "$fn.v3";
$v3 = 1;
$ufn = "$fn.v3";
$v3 = 1;
- $convert++
unless
-e $ufn;
+ $convert++
if -e "$fn.v2" && !
-e $ufn;
}
if ($mode) {
}
if ($mode) {
@@
-152,10
+150,12
@@
sub init
$dbm = tie (%u, 'DB_File', $ufn, O_RDONLY, 0666, $DB_BTREE) or confess "can't open user file: $fn ($!) [rebuild it from user_asc?]";
}
$dbm = tie (%u, 'DB_File', $ufn, O_RDONLY, 0666, $DB_BTREE) or confess "can't open user file: $fn ($!) [rebuild it from user_asc?]";
}
+ die "Cannot open $ufn ($!)\n" unless $dbm;
+
$lru = LRU->newbase("DXUser", $lrusize);
# do a conversion if required
$lru = LRU->newbase("DXUser", $lrusize);
# do a conversion if required
- if ($convert) {
+ if ($
dbm && $
convert) {
my ($key, $val, $action, $count, $err) = ('','',0,0,0);
my %oldu;
my ($key, $val, $action, $count, $err) = ('','',0,0,0);
my %oldu;
@@
-686,11
+686,6
@@
sub wantpc16
return _want('pc16', @_);
}
return _want('pc16', @_);
}
-sub wantpc90
-{
- return _wantnot('pc90', @_);
-}
-
sub wantsendpc16
{
return _want('sendpc16', @_);
sub wantsendpc16
{
return _want('sendpc16', @_);
@@
-716,11
+711,6
@@
sub wantdxitu
return _want('dxitu', @_);
}
return _want('dxitu', @_);
}
-sub wantnp
-{
- return _wantnot('np', @_);
-}
-
sub wantlogininfo
{
my $self = shift;
sub wantlogininfo
{
my $self = shift;