emo/shadow
1
0
Fork 0
Code Issues Pull Requests Packages Releases Activity

* src/groupmems.c: Add parenthesis.

Browse Source 
* src/groupmems.c: Avoid implicit conversion of pointers / chars to
	booleans.
This commit is contained in:
nekral-guest 2008-07-27 22:30:12 +00:00
parent d5c6257ac2
commit 717110d355
2 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
2008-07-27 Nicolas François <nicolas.francois@centraliens.net>
* src/groupmems.c: Add parenthesis.
* src/groupmems.c: Avoid implicit conversion of pointers / chars to
booleans.
2008-07-27 Nicolas François <nicolas.francois@centraliens.net> 2008-07-27 Nicolas François <nicolas.francois@centraliens.net>
* NEWS, src/groupmems.c: Allow everybody to list the users of a group. * NEWS, src/groupmems.c: Allow everybody to list the users of a group.

20
src/groupmems.c
View File

@ -156,7 +156,7 @@ static void process_flags (int argc, char **argv)
} }
} }
if (exclusive > 1 || optind < argc) { if ((exclusive > 1) || (optind < argc)) {
usage (); usage ();
} }
@ -177,25 +177,25 @@ static void check_perms (void)
struct passwd *pampw; struct passwd *pampw;
pampw = getpwuid (getuid ()); /* local, no need for xgetpwuid */ pampw = getpwuid (getuid ()); /* local, no need for xgetpwuid */
if (pampw == NULL) { if (NULL == pampw) {
retval = PAM_USER_UNKNOWN; retval = PAM_USER_UNKNOWN;
} }
if (retval == PAM_SUCCESS) { if (PAM_SUCCESS == retval) {
retval = pam_start ("groupmod", pampw->pw_name, retval = pam_start ("groupmod", pampw->pw_name,
&conv, &pamh); &conv, &pamh);
} }
if (retval == PAM_SUCCESS) { if (PAM_SUCCESS == retval) {
retval = pam_authenticate (pamh, 0); retval = pam_authenticate (pamh, 0);
} }
if (retval == PAM_SUCCESS) { if (PAM_SUCCESS == retval) {
retval = pam_acct_mgmt (pamh, 0); retval = pam_acct_mgmt (pamh, 0);
} }
(void) pam_end (pamh, retval); (void) pam_end (pamh, retval);
if (retval != PAM_SUCCESS) { if (PAM_SUCCESS != retval) {
fprintf (stderr, _("%s: PAM authentication failed\n"), Prog); fprintf (stderr, _("%s: PAM authentication failed\n"), Prog);
fail_exit (1); fail_exit (1);
} }
@ -247,7 +247,7 @@ void main (int argc, char **argv)
if (!list) { if (!list) {
check_perms (); check_perms ();
if (!gr_lock ()) { if (gr_lock () == 0) {
fprintf (stderr, fprintf (stderr,
_("%s: unable to lock group file\n"), Prog); _("%s: unable to lock group file\n"), Prog);
fail_exit (EXIT_GROUP_FILE); fail_exit (EXIT_GROUP_FILE);
@ -255,14 +255,14 @@ void main (int argc, char **argv)
group_locked = true; group_locked = true;
} }
if (!gr_open (list ? O_RDONLY : O_RDWR)) { if (gr_open (list ? O_RDONLY : O_RDWR) == 0) {
fprintf (stderr, _("%s: unable to open group file\n"), Prog); fprintf (stderr, _("%s: unable to open group file\n"), Prog);
fail_exit (EXIT_GROUP_FILE); fail_exit (EXIT_GROUP_FILE);
} }
grp = (struct group *) gr_locate (name); grp = (struct group *) gr_locate (name);
if (grp == NULL) { if (NULL == grp) {
fprintf (stderr, _("%s: `%s' not found in /etc/group\n"), fprintf (stderr, _("%s: `%s' not found in /etc/group\n"),
Prog, name); Prog, name);
fail_exit (EXIT_INVALID_GROUP); fail_exit (EXIT_INVALID_GROUP);
@ -293,7 +293,7 @@ void main (int argc, char **argv)
gr_update (grp); gr_update (grp);
} }
if (!gr_close ()) { if (gr_close () == 0) {
fprintf (stderr, _("%s: unable to close group file\n"), Prog); fprintf (stderr, _("%s: unable to close group file\n"), Prog);
fail_exit (EXIT_GROUP_FILE); fail_exit (EXIT_GROUP_FILE);
} }