From 3ccbb380d0d3158874cd55b8e913dcc9ea2f7d76 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 26 Jan 2010 10:05:09 +0000
Subject: more fallout from default pw encryption: fix error reporting when
 entering a bad password

---
 FS/FS/svc_acct.pm | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

(limited to 'FS')

diff --git a/FS/FS/svc_acct.pm b/FS/FS/svc_acct.pm
index ca33aa858..f965e8dff 100644
--- a/FS/FS/svc_acct.pm
+++ b/FS/FS/svc_acct.pm
@@ -1333,11 +1333,14 @@ is >0), one will be generated randomly.
 sub set_password {
   my( $self, $pass ) = ( shift, shift );
 
+  warn "[$me] set_password (to $pass) called on $self: ". Dumper($self)
+     if $DEBUG;
+
   my $failure = gettext('illegal_password'). " $passwordmin-$passwordmax ".
                 FS::Msgcat::_gettext('illegal_password_characters').
                 ": ". $pass;
 
-  my ($encoding, $encryption);
+  my( $encoding, $encryption ) = ('', '');
 
   if ( $self->_password_encoding ) {
     $encoding = $self->_password_encoding;
@@ -1357,7 +1360,7 @@ sub set_password {
     $self->_password_encoding($encoding);
   }
 
-  if( $encoding eq 'legacy' ) {
+  if ( $encoding eq 'legacy' ) {
 
     # The legacy behavior from check():
     # If the password is blank, randomize it and set encoding to 'plain'.
@@ -1374,14 +1377,12 @@ sub set_password {
         $pass = $1.$3;
         $self->_password_encoding('crypt');
       # Various disabled crypt passwords
-      } elsif ( $pass eq '*' or
-              $pass eq '!' or
-              $pass eq '!!' ) {
+      } elsif ( $pass eq '*' || $pass eq '!' || $pass eq '!!' ) {
         $self->_password_encoding('crypt');
       } else {
         return $failure;
       }
-   }
+    }
 
     $self->_password($pass);
     return;
-- 
cgit v1.2.1