[Pkg-shadow-commits] r3467 - in upstream/trunk: . src

[Nicolas FRANÇOIS]

Author: nekral-guest
Date: 2011-08-14 14:44:35 +0000 (Sun, 14 Aug 2011)
New Revision: 3467

Modified:
   upstream/trunk/ChangeLog
   upstream/trunk/src/chgpasswd.c
   upstream/trunk/src/chpasswd.c
   upstream/trunk/src/newusers.c
Log:
	* src/chgpasswd.c, src/chpasswd.c, src/newusers.c: Replace cflg by
	a test on crypt_method.


Modified: upstream/trunk/ChangeLog
===================================================================
--- upstream/trunk/ChangeLog	2011-08-14 14:37:17 UTC (rev 3466)
+++ upstream/trunk/ChangeLog	2011-08-14 14:44:35 UTC (rev 3467)
@@ -1,5 +1,10 @@
 2011-08-14  Nicolas François  <nicolas.francois at centraliens.net>
 
+	* src/chgpasswd.c, src/chpasswd.c, src/newusers.c: Replace cflg by
+	a test on crypt_method.
+
+2011-08-14  Nicolas François  <nicolas.francois at centraliens.net>
+
 	* libmisc/chowndir.c: Add splint annotations.
 	* src/chgpasswd.c: Likewise.
 	* src/chpasswd.c: Likewise.

Modified: upstream/trunk/src/chgpasswd.c
===================================================================
--- upstream/trunk/src/chgpasswd.c	2011-08-14 14:37:17 UTC (rev 3466)
+++ upstream/trunk/src/chgpasswd.c	2011-08-14 14:44:35 UTC (rev 3467)
@@ -58,7 +58,6 @@
  * Global variables
  */
 const char *Prog;
-static bool cflg   = false;
 static bool eflg   = false;
 static bool md5flg = false;
 #ifdef USE_SHA_CRYPT
@@ -66,6 +65,7 @@
 #endif
 
 static /*@null@*//*@observer@*/const char *crypt_method = NULL;
+#define cflg (NULL != crypt_method)
 #ifdef USE_SHA_CRYPT
 static long sha_rounds = 5000;
 #endif
@@ -174,7 +174,6 @@
 	                         long_options, &option_index)) != -1) {
 		switch (c) {
 		case 'c':
-			cflg = true;
 			crypt_method = optarg;
 			break;
 		case 'e':

Modified: upstream/trunk/src/chpasswd.c
===================================================================
--- upstream/trunk/src/chpasswd.c	2011-08-14 14:37:17 UTC (rev 3466)
+++ upstream/trunk/src/chpasswd.c	2011-08-14 14:44:35 UTC (rev 3467)
@@ -55,7 +55,6 @@
  * Global variables
  */
 const char *Prog;
-static bool cflg   = false;
 static bool eflg   = false;
 static bool md5flg = false;
 #ifdef USE_SHA_CRYPT
@@ -63,6 +62,7 @@
 #endif				/* USE_SHA_CRYPT */
 
 static /*@null@*//*@observer@*/const char *crypt_method = NULL;
+#define cflg (NULL != crypt_method)
 #ifdef USE_SHA_CRYPT
 static long sha_rounds = 5000;
 #endif				/* USE_SHA_CRYPT */
@@ -170,7 +170,6 @@
 			usage (E_SUCCESS);
 			/*@notreached@*/break;
 		case 'c':
-			cflg = true;
 			crypt_method = optarg;
 			break;
 		case 'e':

Modified: upstream/trunk/src/newusers.c
===================================================================
--- upstream/trunk/src/newusers.c	2011-08-14 14:37:17 UTC (rev 3466)
+++ upstream/trunk/src/newusers.c	2011-08-14 14:44:35 UTC (rev 3467)
@@ -74,8 +74,8 @@
 
 static bool rflg = false;	/* create a system account */
 #ifndef USE_PAM
-static bool cflg = false;
 static /*@null@*//*@observer@*/char *crypt_method = NULL;
+#define cflg (NULL != crypt_method)
 #ifdef USE_SHA_CRYPT
 static bool sflg = false;
 static long sha_rounds = 5000;
@@ -556,7 +556,6 @@
 			break;
 #ifndef USE_PAM
 		case 'c':
-			cflg = true;
 			crypt_method = optarg;
 			break;
 #ifdef USE_SHA_CRYPT