* src/su.c: Add brackets and parenthesis.

	* src/su.c: Avoid implicit conversion of pointers to booleans.

diff --git a/ChangeLog b/ChangeLog
index 1adfc147f11d36d69ce1090b4713bea5cad2a8ed..2e46a8ff50822f80692b2760a0be3ee85194a46e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-08-29  Nicolas François  <nicolas.francois@centraliens.net>
+
+       * src/su.c: Add brackets and parenthesis.
+       * src/su.c: Avoid implicit conversion of pointers to booleans.
+
 2008-08-29  Nicolas François  <nicolas.francois@centraliens.net>
 
        * libmisc/list.c: Remove historical comment.

diff --git a/src/su.c b/src/su.c
index d25bd134c99f9e88da2e292651651e476fd6c74b..7a16dbffd0f13c396ca670c4bc771456626bf671 100644 (file)
--- 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);