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

* src/groupmod.c: Use a bool when possible instead of int

Browse Source 
integers.
	* src/groupmod.c: Avoid assignments in comparisons.
	* src/groupmod.c: Add brackets and parenthesis.
	* src/groupmod.c: Avoid implicit conversion of pointers / integers
	/ chars to booleans.
	* src/groupmod.c: Use a %lu format to print GIDs, and cast the GID
	to (unsigned long int).
	* src/groupmod.c: Ignore return value of setlocale(),
	bindtextdomain(), and textdomain().
	* src/groupmod.c: Ignore the return value of pam_end() before
	exiting.
This commit is contained in:
nekral-guest 2008-06-10 17:45:08 +00:00
parent 7dea133b55
commit be8d08fda6
2 changed files with 98 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
ChangeLog
View File

@ -1,3 +1,18 @@
2008-06-09 Nicolas François <nicolas.francois@centraliens.net>
* src/groupmod.c: Use a bool when possible instead of int
integers.
* src/groupmod.c: Avoid assignments in comparisons.
* src/groupmod.c: Add brackets and parenthesis.
* src/groupmod.c: Avoid implicit conversion of pointers / integers
/ chars to booleans.
* src/groupmod.c: Use a %lu format to print GIDs, and cast the GID
to (unsigned long int).
* src/groupmod.c: Ignore return value of setlocale(),
bindtextdomain(), and textdomain().
* src/groupmod.c: Ignore the return value of pam_end() before
exiting.
2008-06-09 Nicolas François <nicolas.francois@centraliens.net> 2008-06-09 Nicolas François <nicolas.francois@centraliens.net>
* src/su.c: Ignore return value of setlocale(), * src/su.c: Ignore return value of setlocale(),

143
src/groupmod.c
View File

@ -67,11 +67,11 @@
* Global variables * Global variables
*/ */
#ifdef SHADOWGRP #ifdef SHADOWGRP
static int is_shadow_grp; static bool is_shadow_grp;
static int gshadow_locked = 0; static bool gshadow_locked = false;
#endif /* SHADOWGRP */ #endif /* SHADOWGRP */
static int group_locked = 0; static bool group_locked = false;
static int passwd_locked = 0; static bool passwd_locked = false;
static char *group_name; static char *group_name;
static char *group_newname; static char *group_newname;
static char *group_passwd; static char *group_passwd;
@ -80,11 +80,11 @@ static gid_t group_newid;
static char *Prog; static char *Prog;
static int static bool
oflg = 0, /* permit non-unique group ID to be specified with -g */ oflg = false, /* permit non-unique group ID to be specified with -g */
gflg = 0, /* new ID value for the group */ gflg = false, /* new ID value for the group */
nflg = 0, /* a new name has been specified for the group */ nflg = false, /* a new name has been specified for the group */
pflg = 0; /* new encrypted password */ pflg = false; /* new encrypted password */
/* local function prototypes */ /* local function prototypes */
static void usage (void); static void usage (void);
@ -204,12 +204,16 @@ static void grp_update (void)
grp = *ogrp; grp = *ogrp;
new_grent (&grp); new_grent (&grp);
#ifdef SHADOWGRP #ifdef SHADOWGRP
if (is_shadow_grp && (osgrp = sgr_locate (group_name))) { if (is_shadow_grp) {
osgrp = sgr_locate (group_name);
if (NULL != osgrp) {
sgrp = *osgrp; sgrp = *osgrp;
new_sgent (&sgrp); new_sgent (&sgrp);
if (pflg) if (pflg) {
grp.gr_passwd = SHADOW_PASSWD_STRING; grp.gr_passwd = SHADOW_PASSWD_STRING;
} }
}
}
#endif /* SHADOWGRP */ #endif /* SHADOWGRP */
if (gflg) { if (gflg) {
@ -219,7 +223,7 @@ static void grp_update (void)
/* /*
* Write out the new group file entry. * Write out the new group file entry.
*/ */
if (!gr_update (&grp)) { if (gr_update (&grp) == 0) {
fprintf (stderr, _("%s: error adding new group entry\n"), Prog); fprintf (stderr, _("%s: error adding new group entry\n"), Prog);
#ifdef WITH_AUDIT #ifdef WITH_AUDIT
audit_logger (AUDIT_USER_CHAUTHTOK, Prog, "adding group", audit_logger (AUDIT_USER_CHAUTHTOK, Prog, "adding group",
@ -227,7 +231,7 @@ static void grp_update (void)
#endif #endif
fail_exit (E_GRP_UPDATE); fail_exit (E_GRP_UPDATE);
} }
if (nflg && !gr_remove (group_name)) { if (nflg && (gr_remove (group_name) == 0)) {
fprintf (stderr, _("%s: error removing group entry\n"), Prog); fprintf (stderr, _("%s: error removing group entry\n"), Prog);
#ifdef WITH_AUDIT #ifdef WITH_AUDIT
audit_logger (AUDIT_USER_CHAUTHTOK, Prog, "deleting group", audit_logger (AUDIT_USER_CHAUTHTOK, Prog, "deleting group",
@ -242,13 +246,13 @@ static void grp_update (void)
* "out" if there wasn't. Can't just return because there might be * "out" if there wasn't. Can't just return because there might be
* some syslogging to do. * some syslogging to do.
*/ */
if (!osgrp) if (NULL == osgrp)
goto out; goto out;
/* /*
* Write out the new shadow group entries as well. * Write out the new shadow group entries as well.
*/ */
if (is_shadow_grp && !sgr_update (&sgrp)) { if (is_shadow_grp && (sgr_update (&sgrp) == 0)) {
fprintf (stderr, _("%s: error adding new group entry\n"), Prog); fprintf (stderr, _("%s: error adding new group entry\n"), Prog);
#ifdef WITH_AUDIT #ifdef WITH_AUDIT
audit_logger (AUDIT_USER_CHAUTHTOK, Prog, "adding group", audit_logger (AUDIT_USER_CHAUTHTOK, Prog, "adding group",
@ -256,7 +260,7 @@ static void grp_update (void)
#endif #endif
fail_exit (E_GRP_UPDATE); fail_exit (E_GRP_UPDATE);
} }
if (is_shadow_grp && nflg && !sgr_remove (group_name)) { if (is_shadow_grp && nflg && (sgr_remove (group_name) == 0)) {
fprintf (stderr, _("%s: error removing group entry\n"), Prog); fprintf (stderr, _("%s: error removing group entry\n"), Prog);
#ifdef WITH_AUDIT #ifdef WITH_AUDIT
audit_logger (AUDIT_USER_CHAUTHTOK, Prog, "deleting group", audit_logger (AUDIT_USER_CHAUTHTOK, Prog, "deleting group",
@ -271,9 +275,10 @@ static void grp_update (void)
audit_logger (AUDIT_USER_CHAUTHTOK, Prog, "modifing group", group_name, audit_logger (AUDIT_USER_CHAUTHTOK, Prog, "modifing group", group_name,
group_id, 1); group_id, 1);
#endif #endif
if (nflg) if (nflg) {
SYSLOG ((LOG_INFO, "change group `%s' to `%s'", SYSLOG ((LOG_INFO, "change group `%s' to `%s'",
group_name, group_newname)); group_name, group_newname));
}
if (gflg) { if (gflg) {
SYSLOG ((LOG_INFO, "change GID for `%s' to %u", SYSLOG ((LOG_INFO, "change GID for `%s' to %u",
@ -298,13 +303,17 @@ static void check_new_gid (void)
return; return;
} }
if (oflg || !getgrgid (group_newid)) /* local, no need for xgetgrgid */ if (oflg ||
(getgrgid (group_newid) == NULL) /* local, no need for xgetgrgid */
) {
return; return;
}
/* /*
* Tell the user what they did wrong. * Tell the user what they did wrong.
*/ */
fprintf (stderr, _("%s: %u is not a unique GID\n"), Prog, group_newid); fprintf (stderr, _("%s: %lu is not a unique GID\n"),
Prog, (unsigned long int) group_newid);
#ifdef WITH_AUDIT #ifdef WITH_AUDIT
audit_logger (AUDIT_USER_CHAUTHTOK, Prog, "modify gid", NULL, audit_logger (AUDIT_USER_CHAUTHTOK, Prog, "modify gid", NULL,
group_newid, 0); group_newid, 0);
@ -334,7 +343,7 @@ static void check_new_name (void)
* If the entry is found, too bad. * If the entry is found, too bad.
*/ */
/* local, no need for xgetgrnam */ /* local, no need for xgetgrnam */
if (getgrnam (group_newname)) { if (getgrnam (group_newname) != NULL) {
fprintf (stderr, fprintf (stderr,
_("%s: %s is not a unique name\n"), Prog, _("%s: %s is not a unique name\n"), Prog,
group_newname); group_newname);
@ -369,7 +378,7 @@ static gid_t get_gid (const char *gidstr)
char *errptr; char *errptr;
val = strtol (gidstr, &errptr, 10); val = strtol (gidstr, &errptr, 10);
if (*errptr || errno == ERANGE || val < 0) { if (('\0' != *errptr) || (ERANGE == errno) || (val < 0)) {
fprintf (stderr, _("%s: invalid numeric argument '%s'\n"), Prog, fprintf (stderr, _("%s: invalid numeric argument '%s'\n"), Prog,
gidstr); gidstr);
fail_exit (E_BAD_ARG); fail_exit (E_BAD_ARG);
@ -403,7 +412,7 @@ static void process_flags (int argc, char **argv)
long_options, &option_index)) != -1) { long_options, &option_index)) != -1) {
switch (c) { switch (c) {
case 'g': case 'g':
gflg++; gflg = true;
group_newid = get_gid (optarg); group_newid = get_gid (optarg);
#ifdef WITH_AUDIT #ifdef WITH_AUDIT
audit_logger (AUDIT_USER_CHAUTHTOK, audit_logger (AUDIT_USER_CHAUTHTOK,
@ -412,15 +421,15 @@ static void process_flags (int argc, char **argv)
#endif #endif
break; break;
case 'n': case 'n':
nflg++; nflg = true;
group_newname = optarg; group_newname = optarg;
break; break;
case 'o': case 'o':
oflg++; oflg = true;
break; break;
case 'p': case 'p':
group_passwd = optarg; group_passwd = optarg;
pflg++; pflg = true;
break; break;
default: default:
usage (); usage ();
@ -428,11 +437,13 @@ static void process_flags (int argc, char **argv)
} }
} }
if (oflg && !gflg) if (oflg && !gflg) {
usage (); usage ();
}
if (optind != argc - 1) if (optind != (argc - 1)) {
usage (); usage ();
}
group_name = argv[argc - 1]; group_name = argv[argc - 1];
} }
@ -445,31 +456,31 @@ static void process_flags (int argc, char **argv)
*/ */
static void close_files (void) static void close_files (void)
{ {
if (!gr_close ()) { if (gr_close () == 0) {
fprintf (stderr, _("%s: cannot rewrite group file\n"), Prog); fprintf (stderr, _("%s: cannot rewrite group file\n"), Prog);
fail_exit (E_GRP_UPDATE); fail_exit (E_GRP_UPDATE);
} }
gr_unlock (); gr_unlock ();
group_locked--; group_locked = false;
#ifdef SHADOWGRP #ifdef SHADOWGRP
if (is_shadow_grp && !sgr_close ()) { if (is_shadow_grp && (sgr_close () == 0)) {
fprintf (stderr, fprintf (stderr,
_("%s: cannot rewrite shadow group file\n"), Prog); _("%s: cannot rewrite shadow group file\n"), Prog);
fail_exit (E_GRP_UPDATE); fail_exit (E_GRP_UPDATE);
} }
if (is_shadow_grp) { if (is_shadow_grp) {
sgr_unlock (); sgr_unlock ();
gshadow_locked--; gshadow_locked = false;
} }
#endif /* SHADOWGRP */ #endif /* SHADOWGRP */
if (gflg) { if (gflg) {
if (!pw_close ()) { if (pw_close () == 0) {
fprintf (stderr, fprintf (stderr,
_("%s: cannot rewrite passwd file\n"), Prog); _("%s: cannot rewrite passwd file\n"), Prog);
fail_exit (E_GRP_UPDATE); fail_exit (E_GRP_UPDATE);
} }
pw_unlock(); pw_unlock();
passwd_locked--; passwd_locked = false;
} }
} }
@ -480,25 +491,25 @@ static void close_files (void)
*/ */
static void open_files (void) static void open_files (void)
{ {
if (!gr_lock ()) { if (gr_lock () == 0) {
fprintf (stderr, _("%s: unable to lock group file\n"), Prog); fprintf (stderr, _("%s: unable to lock group file\n"), Prog);
fail_exit (E_GRP_UPDATE); fail_exit (E_GRP_UPDATE);
} }
group_locked++; group_locked = true;
if (!gr_open (O_RDWR)) { if (gr_open (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 (E_GRP_UPDATE); fail_exit (E_GRP_UPDATE);
} }
#ifdef SHADOWGRP #ifdef SHADOWGRP
if (is_shadow_grp) { if (is_shadow_grp) {
if (!sgr_lock ()) { if (sgr_lock () == 0) {
fprintf (stderr, fprintf (stderr,
_("%s: unable to lock shadow group file\n"), _("%s: unable to lock shadow group file\n"),
Prog); Prog);
fail_exit (E_GRP_UPDATE); fail_exit (E_GRP_UPDATE);
} }
gshadow_locked++; gshadow_locked = true;
if (!sgr_open (O_RDWR)) { if (sgr_open (O_RDWR) == 0) {
fprintf (stderr, fprintf (stderr,
_("%s: unable to open shadow group file\n"), _("%s: unable to open shadow group file\n"),
Prog); Prog);
@ -507,14 +518,14 @@ static void open_files (void)
} }
#endif /* SHADOWGRP */ #endif /* SHADOWGRP */
if (gflg) { if (gflg) {
if (!pw_lock ()) { if (pw_lock () == 0) {
fprintf (stderr, fprintf (stderr,
_("%s: unable to lock password file\n"), _("%s: unable to lock password file\n"),
Prog); Prog);
fail_exit (E_GRP_UPDATE); fail_exit (E_GRP_UPDATE);
} }
passwd_locked++; passwd_locked = true;
if (!pw_open (O_RDWR)) { if (pw_open (O_RDWR) == 0) {
fprintf (stderr, fprintf (stderr,
_("%s: unable to open password file\n"), _("%s: unable to open password file\n"),
Prog); Prog);
@ -541,7 +552,7 @@ void update_primary_groups (gid_t ogid, gid_t ngid)
} else { } else {
npwd = *lpwd; npwd = *lpwd;
npwd.pw_gid = ngid; npwd.pw_gid = ngid;
if (!pw_update (&npwd)) { if (pw_update (&npwd) == 0) {
fprintf (stderr, fprintf (stderr,
_("%s: cannot change the primary group of user '%s' from %u to %u.\n"), _("%s: cannot change the primary group of user '%s' from %u to %u.\n"),
Prog, pwd->pw_name, ogid, ngid); Prog, pwd->pw_name, ogid, ngid);
@ -581,9 +592,9 @@ int main (int argc, char **argv)
*/ */
Prog = Basename (argv[0]); Prog = Basename (argv[0]);
setlocale (LC_ALL, ""); (void) setlocale (LC_ALL, "");
bindtextdomain (PACKAGE, LOCALEDIR); (void) bindtextdomain (PACKAGE, LOCALEDIR);
textdomain (PACKAGE); (void) textdomain (PACKAGE);
process_flags (argc, argv); process_flags (argc, argv);
@ -599,27 +610,27 @@ int main (int argc, char **argv)
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) {
pam_end (pamh, retval); (void) pam_end (pamh, retval);
} }
} }
if (retval == PAM_SUCCESS) { if (PAM_SUCCESS == retval) {
retval = pam_acct_mgmt (pamh, 0); retval = pam_acct_mgmt (pamh, 0);
if (retval != PAM_SUCCESS) { if (PAM_SUCCESS != retval) {
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);
} }
@ -633,8 +644,8 @@ int main (int argc, char **argv)
/* /*
* Start with a quick check to see if the group exists. * Start with a quick check to see if the group exists.
*/ */
/* local, no need for xgetgrnam */ grp = getgrnam (group_name); /* local, no need for xgetgrnam */
if (!(grp = getgrnam (group_name))) { if (NULL == grp) {
fprintf (stderr, _("%s: group %s does not exist\n"), fprintf (stderr, _("%s: group %s does not exist\n"),
Prog, group_name); Prog, group_name);
#ifdef WITH_AUDIT #ifdef WITH_AUDIT
@ -642,16 +653,19 @@ int main (int argc, char **argv)
"modifying group", group_name, -1, 0); "modifying group", group_name, -1, 0);
#endif #endif
fail_exit (E_NOTFOUND); fail_exit (E_NOTFOUND);
} else } else {
group_id = grp->gr_gid; group_id = grp->gr_gid;
} }
}
#ifdef WITH_AUDIT #ifdef WITH_AUDIT
/* Set new name/id to original if not specified on command line */ /* Set new name/id to original if not specified on command line */
if (nflg == 0) if (!nflg) {
group_newname = group_name; group_newname = group_name;
if (gflg == 0) }
if (!gflg) {
group_newid = group_id; group_newid = group_id;
}
#endif #endif
#ifdef USE_NIS #ifdef USE_NIS
@ -678,11 +692,13 @@ int main (int argc, char **argv)
} }
#endif #endif
if (gflg) if (gflg) {
check_new_gid (); check_new_gid ();
}
if (nflg) if (nflg) {
check_new_name (); check_new_name ();
}
/* /*
* Do the hard stuff - open the files, create the group entries, * Do the hard stuff - open the files, create the group entries,
@ -697,8 +713,9 @@ int main (int argc, char **argv)
nscd_flush_cache ("group"); nscd_flush_cache ("group");
#ifdef USE_PAM #ifdef USE_PAM
if (retval == PAM_SUCCESS) if (PAM_SUCCESS == retval) {
pam_end (pamh, PAM_SUCCESS); (void) pam_end (pamh, PAM_SUCCESS);
}
#endif /* USE_PAM */ #endif /* USE_PAM */
exit (E_SUCCESS); exit (E_SUCCESS);
/* NOT REACHED */ /* NOT REACHED */