[Pkg-shadow-commits] r1416 - upstream/trunk/src

[nekral-guest at alioth.debian.org]

Author: nekral-guest
Date: 2007-11-20 12:10:55 +0000 (Tue, 20 Nov 2007)
New Revision: 1416

Modified:
   upstream/trunk/src/chgpasswd.c
   upstream/trunk/src/chpasswd.c
Log:
Fix typo s/method/crypt_method/


Modified: upstream/trunk/src/chgpasswd.c
===================================================================
--- upstream/trunk/src/chgpasswd.c	2007-11-20 09:51:36 UTC (rev 1415)
+++ upstream/trunk/src/chgpasswd.c	2007-11-20 12:10:55 UTC (rev 1416)
@@ -191,16 +191,16 @@
 		usage ();
 	}
 	if (cflg) {
-		if (0 != strcmp (method, "DES") &&
-		    0 != strcmp (method, "MD5") &&
+		if (0 != strcmp (crypt_method, "DES") &&
+		    0 != strcmp (crypt_method, "MD5") &&
 #ifdef ENCRYPTMETHOD_SELECT
-		    0 != strcmp (method, "SHA256") &&
-		    0 != strcmp (method, "SHA512")
+		    0 != strcmp (crypt_method, "SHA256") &&
+		    0 != strcmp (crypt_method, "SHA512")
 #endif
 		    ) {
 			fprintf (stderr,
 			 _("%s: unsupported crypt method: %s\n"),
-			 Prog, method);
+			 Prog, crypt_method);
 			usage ();
 		}
 	}

Modified: upstream/trunk/src/chpasswd.c
===================================================================
--- upstream/trunk/src/chpasswd.c	2007-11-20 09:51:36 UTC (rev 1415)
+++ upstream/trunk/src/chpasswd.c	2007-11-20 12:10:55 UTC (rev 1416)
@@ -185,16 +185,16 @@
 		usage ();
 	}
 	if (cflg) {
-		if (0 != strcmp (method, "DES") &&
-		    0 != strcmp (method, "MD5") &&
+		if (0 != strcmp (crypt_method, "DES") &&
+		    0 != strcmp (crypt_method, "MD5") &&
 #ifdef ENCRYPTMETHOD_SELECT
-		    0 != strcmp (method, "SHA256") &&
-		    0 != strcmp (method, "SHA512")
+		    0 != strcmp (crypt_method, "SHA256") &&
+		    0 != strcmp (crypt_method, "SHA512")
 #endif
 		    ) {
 			fprintf (stderr,
 			 _("%s: unsupported crypt method: %s\n"),
-			 Prog, method);
+			 Prog, crypt_method);
 			usage ();
 		}
 	}