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

[Nicolas FRANÇOIS]

Author: nekral-guest
Date: 2010-03-11 22:03:11 +0000 (Thu, 11 Mar 2010)
New Revision: 3101

Modified:
   upstream/trunk/ChangeLog
   upstream/trunk/src/usermod.c
Log:
	* src/usermod.c: Re-indent.
	* src/usermod.c: Avoid implicit conversion of pointers to
	booleans.
	* src/usermod.c: Added parenthesis.

Modified: upstream/trunk/ChangeLog
===================================================================
--- upstream/trunk/ChangeLog	2010-03-11 22:02:54 UTC (rev 3100)
+++ upstream/trunk/ChangeLog	2010-03-11 22:03:11 UTC (rev 3101)
@@ -1,5 +1,12 @@
 2010-03-11  Nicolas François  <nicolas.francois at centraliens.net>
 
+	* src/usermod.c: Re-indent.
+	* src/usermod.c: Avoid implicit conversion of pointers to
+	booleans.
+	* src/usermod.c: Added parenthesis.
+
+2010-03-11  Nicolas François  <nicolas.francois at centraliens.net>
+
 	* src/pwunconv.c: Only check USE_TCB if configured WITH_TCB.
 
 2010-03-10  Nicolas François  <nicolas.francois at centraliens.net>

Modified: upstream/trunk/src/usermod.c
===================================================================
--- upstream/trunk/src/usermod.c	2010-03-11 22:02:54 UTC (rev 3100)
+++ upstream/trunk/src/usermod.c	2010-03-11 22:03:11 UTC (rev 3101)
@@ -1774,8 +1774,8 @@
 #endif				/* ACCT_TOOLS_SETUID */
 
 #ifdef WITH_TCB
-	if (!shadowtcb_set_user(user_name))
-		exit(E_PW_UPDATE);
+	if (!shadowtcb_set_user (user_name))
+		exit (E_PW_UPDATE);
 #endif
 
 	/*
@@ -1793,9 +1793,9 @@
 	close_files ();
 
 #ifdef WITH_TCB
-	if ((user_newname || user_newid != -1) &&
-		!shadowtcb_move(user_newname, user_newid)) {
-		exit(E_PW_UPDATE);
+	if (   ((NULL != user_newname) || (user_newid != -1))
+	    && (!shadowtcb_move (user_newname, user_newid)) ) {
+		exit (E_PW_UPDATE);
 	}
 #endif