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

[Nicolas FRANÇOIS]

Author: nekral-guest
Date: 2010-08-21 19:55:46 +0000 (Sat, 21 Aug 2010)
New Revision: 3228

Modified:
   upstream/trunk/ChangeLog
   upstream/trunk/src/passwd.c
Log:
	* src/passwd.c: Fix a const issue.
	* src/passwd.c: Avoid multi-statements lines.


Modified: upstream/trunk/ChangeLog
===================================================================
--- upstream/trunk/ChangeLog	2010-08-21 19:22:32 UTC (rev 3227)
+++ upstream/trunk/ChangeLog	2010-08-21 19:55:46 UTC (rev 3228)
@@ -1,5 +1,10 @@
 2010-08-21  Nicolas François  <nicolas.francois at centraliens.net>
 
+	* src/passwd.c: Fix a const issue.
+	* src/passwd.c: Avoid multi-statements lines.
+
+2010-08-21  Nicolas François  <nicolas.francois at centraliens.net>
+
 	* libmisc/copydir.c, lib/prototypes.h: Caller can choose not to
 	copy the extended attributes (the SELinux context is hence reset)
 	* src/usermod.c: Copy the extended attributes.

Modified: upstream/trunk/src/passwd.c
===================================================================
--- upstream/trunk/src/passwd.c	2010-08-21 19:22:32 UTC (rev 3227)
+++ upstream/trunk/src/passwd.c	2010-08-21 19:55:46 UTC (rev 3228)
@@ -221,7 +221,7 @@
 	int i;			/* Counter for retries */
 	int warned;
 	int pass_max_len = -1;
-	char *method;
+	const char *method;
 
 #ifdef HAVE_LIBCRACK_HIST
 	int HistUpdate (const char *, const char *);
@@ -261,7 +261,8 @@
 	 * for strength, unless it is the root user. This provides an escape
 	 * for initial login passwords.
 	 */
-	if ((method = getdef_str ("ENCRYPT_METHOD")) == NULL) {
+	method = getdef_str ("ENCRYPT_METHOD");
+	if (NULL == method) {
 		if (!getdef_bool ("MD5_CRYPT_ENAB")) {
 			pass_max_len = getdef_num ("PASS_MAX_LEN", 8);
 		}