* src/usermod.c: Re-indent.

	* src/usermod.c: Avoid implicit conversion of pointers to
	booleans.
	* src/usermod.c: Added parenthesis.

diff --git a/ChangeLog b/ChangeLog
index f21ac4bcac71ee0b77cb6862a212d420b88fdc8e..e24b73578416ed013bc1be8428253582b9a91446 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2010-03-11  Nicolas François  <nicolas.francois@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@centraliens.net>
 
        * src/pwunconv.c: Only check USE_TCB if configured WITH_TCB.

diff --git a/src/usermod.c b/src/usermod.c
index d12f5eaa3e4dbfd91a72945b33a6dd13152447d4..826b8d5da5e162ee6726cf9afa6f19c40ff88a1c 100644 (file)
--- a/src/usermod.c
+++ b/src/usermod.c
@@ -1774,8 +1774,8 @@ int main (int argc, char **argv)
 #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 @@ int main (int argc, char **argv)
        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