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

[Nicolas FRANÇOIS]

Author: nekral-guest
Date: 2011-07-08 19:58:40 +0000 (Fri, 08 Jul 2011)
New Revision: 3382

Modified:
   upstream/trunk/ChangeLog
   upstream/trunk/src/groupmod.c
Log:
	* src/groupmod.c: Avoid implicit conversion of pointer to boolean.
	* src/groupmod.c: osgrp can be set only if pflg || nflg. No need
	to check for pflg || nflg again


Modified: upstream/trunk/ChangeLog
===================================================================
--- upstream/trunk/ChangeLog	2011-07-08 19:57:08 UTC (rev 3381)
+++ upstream/trunk/ChangeLog	2011-07-08 19:58:40 UTC (rev 3382)
@@ -8,6 +8,9 @@
 	* src/vipw.c: Use Prog instead of progname. This is needed since
 	Prog is used in the library.
 	* configure.in: Fix typo. libcrack default is 'no'.
+	* src/groupmod.c: Avoid implicit conversion of pointer to boolean.
+	* src/groupmod.c: osgrp can be set only if pflg || nflg. No need
+	to check for pflg || nflg again
 
 2011-07-08  Nicolas François  <nicolas.francois at centraliens.net>
 

Modified: upstream/trunk/src/groupmod.c
===================================================================
--- upstream/trunk/src/groupmod.c	2011-07-08 19:57:08 UTC (rev 3381)
+++ upstream/trunk/src/groupmod.c	2011-07-08 19:58:40 UTC (rev 3382)
@@ -190,7 +190,7 @@
 	 * Get the current settings for this group.
 	 */
 	ogrp = gr_locate (group_name);
-	if (!ogrp) {
+	if (NULL == ogrp) {
 		fprintf (stderr,
 		         _("%s: group '%s' does not exist in %s\n"),
 		         Prog, group_name, gr_dbname ());
@@ -231,13 +231,12 @@
 		         Prog, grp.gr_name, gr_dbname ());
 		exit (E_GRP_UPDATE);
 	}
-#ifdef	SHADOWGRP
 
+#ifdef	SHADOWGRP
 	/*
 	 * Make sure there was a shadow entry to begin with.
 	 */
-	if (   (NULL != osgrp)
-	    && (pflg || nflg)) {
+	if (NULL != osgrp) {
 		/*
 		 * Write out the new shadow group entries as well.
 		 */