From 614e95af39640bf5364c2e0cae33587bc4bd8267 Mon Sep 17 00:00:00 2001 From: nekral-guest Date: Sun, 31 Aug 2008 17:30:30 +0000 Subject: [PATCH] * src/su.c: Add brackets and parenthesis. * src/su.c: Avoid implicit conversion of pointers to booleans. --- ChangeLog | 5 +++++ src/su.c | 7 +++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1adfc147..2e46a8ff 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2008-08-29 Nicolas François + + * src/su.c: Add brackets and parenthesis. + * src/su.c: Avoid implicit conversion of pointers to booleans. + 2008-08-29 Nicolas François * libmisc/list.c: Remove historical comment. diff --git a/src/su.c b/src/su.c index d25bd134..7a16dbff 100644 --- a/src/su.c +++ b/src/su.c @@ -132,8 +132,10 @@ static int iswheel (const char *username) struct group *grp; grp = getgrnam ("wheel"); /* !USE_PAM, no need for xgetgrnam */ - if (!grp || !grp->gr_mem) + if ( (NULL ==grp) + || (NULL == grp->gr_mem)) { return 0; + } return is_on_list (grp->gr_mem, username); } #endif /* !USE_PAM */ @@ -158,11 +160,12 @@ static void su_failure (const char *tty) { sulog (tty, 0, oldname, name); /* log failed attempt */ #ifdef USE_SYSLOG - if (getdef_bool ("SYSLOG_SU_ENAB")) + if (getdef_bool ("SYSLOG_SU_ENAB")) { SYSLOG (((0 != pwent.pw_uid) ? LOG_INFO : LOG_NOTICE, "- %s %s:%s", tty, ('\0' != oldname[0]) ? oldname : "???", ('\0' != name[0]) ? name : "???")); + } closelog (); #endif exit (1);