better error message for "Illegal password"

[freeside.git] / FS / FS / svc_acct.pm

diff --git a/FS/FS/svc_acct.pm b/FS/FS/svc_acct.pm
index bb8c5e2..a43f97a 100644 (file)
--- a/FS/FS/svc_acct.pm
+++ b/FS/FS/svc_acct.pm
@@ -212,6 +212,7 @@ sub insert {
     if $part_svc->part_svc_column('uid')->columnflag ne 'F'
       && qsearchs( 'svc_acct', { 'uid' => $self->uid } )
       && $self->username !~ /^(hyla)?fax$/
+      && $self->username !~ /^toor$/ #FreeBSD
     ;
 
   $error = $self->SUPER::insert;
@@ -577,7 +578,9 @@ sub check {
     #you can set a fixed gid in part_svc
 
     return "Only root can have uid 0"
-      if $recref->{uid} == 0 && $recref->{username} ne 'root';
+      if $recref->{uid} == 0
+         && $recref->{username} ne 'root'
+         && $recref->{username} ne 'toor';
 
 #    $error = $self->ut_textn('finger');
 #    return $error if $error;
@@ -673,7 +676,9 @@ sub check {
     $recref->{_password} = '!!';
   } else {
     #return "Illegal password";
-    return gettext('illegal_password'). ": ". $recref->{_password};
+    return gettext('illegal_password'). "$passwordmin-$passwordmax".
+           FS::Msgcat::_gettext('illegal_password_characters').
+           ": ". $recref->{_password};
   }
 
   ''; #no error