fix passwd

diff --git a/perl/DXUser.pm b/perl/DXUser.pm
index 08a6b9ff2aa3bc6c20cb5fb22e7addb7bba79585..16ea931f493c21d03acda744fbf3409216611305 100644 (file)
--- a/perl/DXUser.pm
+++ b/perl/DXUser.pm
@@ -145,12 +145,12 @@ sub init
        
        # do a conversion if required
        if ($convert) {
-               my ($key, $val, $action, $count, $err);
+               my ($key, $val, $action, $count, $err) = ('','',0,0,0);
                
                my %oldu;
                dbg("Converting the User File to V3");
                my $odbm = tie (%oldu, 'DB_File', "${fn}.v2", O_RDONLY, 0666, $DB_BTREE) or confess "can't open user file: $fn ($!) [rebuild it from user_asc?]";
-        for ($count = $err = 0, $action = R_FIRST; !$odbm->seq($key, $val, $action); $action = R_NEXT) {
+        for ($action = R_FIRST; !$odbm->seq($key, $val, $action); $action = R_NEXT) {
                        my $ref = asc_decode($val);
                        if ($ref) {
                                $u{$key} = $ref->encode;

diff --git a/perl/QXProt.pm b/perl/QXProt.pm
index 38d878ed3b73be1ffcac23e0807a319219af0952..10ad4aa47498bee27e518f7e669875220dcfdcba 100644 (file)
--- a/perl/QXProt.pm
+++ b/perl/QXProt.pm
@@ -163,7 +163,7 @@ sub handleI
        my $self = shift;
        
        my @f = split /\^/, $_[3];
-       if ($self->passphrase && $f[7] && $f[8]) {
+       if ($self->user->passphrase && $f[7] && $f[8]) {
                my $inv = Verify->new($f[7]);
                unless ($inv->verify($f[8], $main::me->user->passphrase, $main::mycall, $self->call)) {
                        $self->sendnow('D','Sorry...');