From: jocuri%softhome.net <>
Date: Fri, 27 Feb 2004 19:01:51 +0000 (+0000)
Subject: Patch for bug 166755; improve checksetup.pl's error message when asking for administr... 
X-Git-Tag: bugzilla-2.16.5~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5233e1cc74c14a8db4efd6c50ccc094baf22aae0;p=thirdparty%2Fbugzilla.git

Patch for bug 166755; improve checksetup.pl's error message when asking for administrator's password; r=jouni, justdave; a=justdave.
---

diff --git a/checksetup.pl b/checksetup.pl
index 2a6a6b0197..6b0f1d6fa4 100755
--- a/checksetup.pl
+++ b/checksetup.pl
@@ -2024,8 +2024,10 @@ _End_Of_SQL_
         chomp $pass1;
         if(! $pass1 ) {
           print "\n\nIt's just plain stupid to not have a password.  Try again!\n";
-        } elsif ( $pass1 !~ /^.{3,16}$/ ) {
-          print "The password must be 3-16 characters in length.";
+        } elsif ( $pass1 !~ /^[a-zA-Z0-9-_]{3,16}$/ ) {
+          print "\n\nThe password must be 3-16 characters in length, " .
+                "and it may\ncontain only letters, digits, " .
+                "underscores (_), and hyphens (-).\n";
         }
       }
       print "\nPlease retype the password to verify: ";