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

[nekral-guest at alioth.debian.org]

Author: nekral-guest
Date: 2007-12-28 22:34:14 +0000 (Fri, 28 Dec 2007)
New Revision: 1544

Modified:
   upstream/trunk/ChangeLog
   upstream/trunk/src/chpasswd.c
Log:
Avoid implicit brackets.


Modified: upstream/trunk/ChangeLog
===================================================================
--- upstream/trunk/ChangeLog	2007-12-28 22:31:45 UTC (rev 1543)
+++ upstream/trunk/ChangeLog	2007-12-28 22:34:14 UTC (rev 1544)
@@ -8,6 +8,7 @@
 	This force flushing the password database after the password file is
 	unlocked.
 	* src/chpasswd.c: Avoid assignments in comparisons.
+	* src/chpasswd.c: Avoid implicit brackets.
 
 2007-12-28  Nicolas François  <nicolas.francois at centraliens.net>
 

Modified: upstream/trunk/src/chpasswd.c
===================================================================
--- upstream/trunk/src/chpasswd.c	2007-12-28 22:31:45 UTC (rev 1543)
+++ upstream/trunk/src/chpasswd.c	2007-12-28 22:34:14 UTC (rev 1544)
@@ -382,13 +382,15 @@
 		    (NULL == crypt_method ||
 		     0 != strcmp(crypt_method, "NONE"))) {
 			void *arg = NULL;
-			if (md5flg)
+			if (md5flg) {
 				crypt_method = "MD5";
-			else if (crypt_method != NULL) {
-				if (sflg)
+			} else if (crypt_method != NULL) {
+				if (sflg) {
 					arg = &sha_rounds;
-			} else
+				}
+			} else {
 				crypt_method = NULL;
+			}
 			cp = pw_encrypt (newpwd,
 			                 crypt_make_salt(crypt_method, arg));
 		}
@@ -405,10 +407,11 @@
 			errors++;
 			continue;
 		}
-		if (is_shadow_pwd)
+		if (is_shadow_pwd) {
 			sp = spw_locate (name);
-		else
+		} else {
 			sp = NULL;
+		}
 
 		/*
 		 * The freshly encrypted new password is merged into the
@@ -429,10 +432,11 @@
 		 * be written to the password file later, after all the
 		 * other entries have been updated as well.
 		 */
-		if (sp)
+		if (sp) {
 			ok = spw_update (&newsp);
-		else
+		} else {
 			ok = pw_update (&newpw);
+		}
 
 		if (!ok) {
 			fprintf (stderr,
@@ -454,8 +458,9 @@
 	if (errors) {
 		fprintf (stderr,
 		         _("%s: error detected, changes ignored\n"), Prog);
-		if (is_shadow_pwd)
+		if (is_shadow_pwd) {
 			spw_unlock ();
+		}
 		pw_unlock ();
 		exit (1);
 	}