Changeset 18493

Timestamp:

2009-02-10T16:02:02+13:00 (15 years ago)

Author:

davidb

Message:

Increased password limit to 128, and made to loop stop after three attempts

File:

• gsdl/trunk/common-src/src/getpw/getpw.cpp (modified) (1 diff)

gsdl/trunk/common-src/src/getpw/getpw.cpp

@@ -71 +71 @@
 int main (int argc, char *argv[]) {
 
+  int password_ok = 0;
   char c[10];
-  while (1) {
+  int i;
+  
+  for (i=0; i<3; i++)  {
     char *a = getpass("Enter password:");
     int len = strlen (a);
-    if (len < 3 || len > 8) {
-      cerr << "Password must be between 3 and 8 characters long. Try again\n";
+    if (len < 3 || len > 128) {
+      cerr << "Password must be between 3 and 128 characters long. Try again\n";
       continue;
     }
+
     strcpy (c, a);
+
     char *b = getpass("Re-enter password:");  
-    if ((strcmp (c, b)) == 0) break;
-    else cerr << "Passwords didn't match. Try again.\n";
+
+    if ((strcmp (c, b)) == 0) {
+      password_ok = 1;
+      break;
+    }
+    else {
+      cerr << "Passwords didn't match. Try again.\n";
+    }
+  }
+
+  if (!password_ok) {
+    cerr << "Failed to capture password." << endl;
+    return -1;
   }