* 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
This commit is contained in:
nekral-guest 2011-07-08 19:58:40 +00:00
parent 9cfc91a935
commit 95257d63a1
2 changed files with 6 additions and 4 deletions

View File

@ -8,6 +8,9 @@
* src/vipw.c: Use Prog instead of progname. This is needed since * src/vipw.c: Use Prog instead of progname. This is needed since
Prog is used in the library. Prog is used in the library.
* configure.in: Fix typo. libcrack default is 'no'. * 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@centraliens.net> 2011-07-08 Nicolas François <nicolas.francois@centraliens.net>

View File

@ -190,7 +190,7 @@ static void grp_update (void)
* Get the current settings for this group. * Get the current settings for this group.
*/ */
ogrp = gr_locate (group_name); ogrp = gr_locate (group_name);
if (!ogrp) { if (NULL == ogrp) {
fprintf (stderr, fprintf (stderr,
_("%s: group '%s' does not exist in %s\n"), _("%s: group '%s' does not exist in %s\n"),
Prog, group_name, gr_dbname ()); Prog, group_name, gr_dbname ());
@ -231,13 +231,12 @@ static void grp_update (void)
Prog, grp.gr_name, gr_dbname ()); Prog, grp.gr_name, gr_dbname ());
exit (E_GRP_UPDATE); exit (E_GRP_UPDATE);
} }
#ifdef SHADOWGRP
#ifdef SHADOWGRP
/* /*
* Make sure there was a shadow entry to begin with. * Make sure there was a shadow entry to begin with.
*/ */
if ( (NULL != osgrp) if (NULL != osgrp) {
&& (pflg || nflg)) {
/* /*
* Write out the new shadow group entries as well. * Write out the new shadow group entries as well.
*/ */