From f9b8a95b9267f311984e97cdb50b3d928ccd3144 Mon Sep 17 00:00:00 2001 From: nekral-guest Date: Thu, 11 Mar 2010 22:03:11 +0000 Subject: [PATCH] * src/usermod.c: Re-indent. * src/usermod.c: Avoid implicit conversion of pointers to booleans. * src/usermod.c: Added parenthesis. --- ChangeLog | 7 +++++++ src/usermod.c | 10 +++++----- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index f21ac4bc..e24b7357 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2010-03-11 Nicolas François + + * 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 * src/pwunconv.c: Only check USE_TCB if configured WITH_TCB. diff --git a/src/usermod.c b/src/usermod.c index d12f5eaa..826b8d5d 100644 --- 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