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

* src/userdel.c: The ID argument of audit_logger is an unsigned

Browse Source 
int.
	* src/userdel.c: fork() and wait() return a pid_t, not an int.
This commit is contained in:
nekral-guest 2008-06-13 20:23:26 +00:00
parent f626317e90
commit 6713a2ce67
2 changed files with 62 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -1,3 +1,9 @@
2008-06-13 Nicolas François <nicolas.francois@centraliens.net>
* src/userdel.c: The ID argument of audit_logger is an unsigned
int.
* src/userdel.c: fork() and wait() return a pid_t, not an int.
2008-06-13 Nicolas François <nicolas.francois@centraliens.net> 2008-06-13 Nicolas François <nicolas.francois@centraliens.net>
* src/newgrp.c: Use a %lu format and cast group and user IDs to * src/newgrp.c: Use a %lu format and cast group and user IDs to
@ -76,7 +82,7 @@
2008-06-13 Nicolas François <nicolas.francois@centraliens.net> 2008-06-13 Nicolas François <nicolas.francois@centraliens.net>
* libmisc/age.c: fork() and wait return a pid_t, not an int. * libmisc/age.c: fork() and wait() return a pid_t, not an int.
* libmisc/age.c: Avoid implicit conversion of pointers to * libmisc/age.c: Avoid implicit conversion of pointers to
booleans. booleans.
* libmisc/age.c: Avoid assignments in comparisons. * libmisc/age.c: Avoid assignments in comparisons.

95
src/userdel.c
View File

@ -172,8 +172,8 @@ static void update_groups (void)
*/ */
#ifdef WITH_AUDIT #ifdef WITH_AUDIT
audit_logger (AUDIT_USER_CHAUTHTOK, Prog, audit_logger (AUDIT_USER_CHAUTHTOK, Prog,
"deleting user from group", user_name, user_id, "deleting user from group",
0); user_name, (unsigned int) user_id, 0);
#endif #endif
SYSLOG ((LOG_INFO, "delete `%s' from group `%s'\n", SYSLOG ((LOG_INFO, "delete `%s' from group `%s'\n",
user_name, ngrp->gr_name)); user_name, ngrp->gr_name));
@ -224,7 +224,8 @@ static void update_groups (void)
#ifdef WITH_AUDIT #ifdef WITH_AUDIT
audit_logger (AUDIT_USER_CHAUTHTOK, Prog, audit_logger (AUDIT_USER_CHAUTHTOK, Prog,
"deleting group", user_name, user_id, 0); "deleting group",
user_name, (unsigned int) user_id, 0);
#endif #endif
SYSLOG ((LOG_INFO, SYSLOG ((LOG_INFO,
"removed group `%s' owned by `%s'\n", "removed group `%s' owned by `%s'\n",
@ -280,8 +281,8 @@ static void update_groups (void)
} }
#ifdef WITH_AUDIT #ifdef WITH_AUDIT
audit_logger (AUDIT_USER_CHAUTHTOK, Prog, audit_logger (AUDIT_USER_CHAUTHTOK, Prog,
"deleting user from shadow group", user_name, "deleting user from shadow group",
user_id, 0); user_name, (unsigned int) user_id, 0);
#endif #endif
SYSLOG ((LOG_INFO, "delete `%s' from shadow group `%s'\n", SYSLOG ((LOG_INFO, "delete `%s' from shadow group `%s'\n",
user_name, nsgrp->sg_name)); user_name, nsgrp->sg_name));
@ -340,8 +341,9 @@ static void fail_exit (int code)
} }
#endif #endif
#ifdef WITH_AUDIT #ifdef WITH_AUDIT
audit_logger (AUDIT_USER_CHAUTHTOK, Prog, "deleting user", user_name, audit_logger (AUDIT_USER_CHAUTHTOK, Prog,
user_id, 0); "deleting user",
user_name, (unsigned int) user_id, 0);
#endif #endif
exit (code); exit (code);
} }
@ -358,7 +360,8 @@ static void open_files (void)
fprintf (stderr, _("%s: unable to lock password file\n"), Prog); fprintf (stderr, _("%s: unable to lock password file\n"), Prog);
#ifdef WITH_AUDIT #ifdef WITH_AUDIT
audit_logger (AUDIT_USER_CHAUTHTOK, Prog, audit_logger (AUDIT_USER_CHAUTHTOK, Prog,
"locking password file", user_name, user_id, 0); "locking password file",
user_name, (unsigned int) user_id, 0);
#endif #endif
exit (E_PW_UPDATE); exit (E_PW_UPDATE);
} }
@ -366,7 +369,8 @@ static void open_files (void)
fprintf (stderr, _("%s: unable to open password file\n"), Prog); fprintf (stderr, _("%s: unable to open password file\n"), Prog);
#ifdef WITH_AUDIT #ifdef WITH_AUDIT
audit_logger (AUDIT_USER_CHAUTHTOK, Prog, audit_logger (AUDIT_USER_CHAUTHTOK, Prog,
"opening password file", user_name, user_id, 0); "opening password file",
user_name, (unsigned int) user_id, 0);
#endif #endif
fail_exit (E_PW_UPDATE); fail_exit (E_PW_UPDATE);
} }
@ -375,8 +379,8 @@ static void open_files (void)
_("%s: cannot lock shadow password file\n"), Prog); _("%s: cannot lock shadow password file\n"), Prog);
#ifdef WITH_AUDIT #ifdef WITH_AUDIT
audit_logger (AUDIT_USER_CHAUTHTOK, Prog, audit_logger (AUDIT_USER_CHAUTHTOK, Prog,
"locking shadow password file", user_name, "locking shadow password file",
user_id, 0); user_name, (unsigned int) user_id, 0);
#endif #endif
fail_exit (E_PW_UPDATE); fail_exit (E_PW_UPDATE);
} }
@ -385,24 +389,26 @@ static void open_files (void)
_("%s: cannot open shadow password file\n"), Prog); _("%s: cannot open shadow password file\n"), Prog);
#ifdef WITH_AUDIT #ifdef WITH_AUDIT
audit_logger (AUDIT_USER_CHAUTHTOK, Prog, audit_logger (AUDIT_USER_CHAUTHTOK, Prog,
"opening shadow password file", user_name, "opening shadow password file",
user_id, 0); user_name, (unsigned int) user_id, 0);
#endif #endif
fail_exit (E_PW_UPDATE); fail_exit (E_PW_UPDATE);
} }
if (gr_lock () == 0) { if (gr_lock () == 0) {
fprintf (stderr, _("%s: unable to lock group file\n"), Prog); fprintf (stderr, _("%s: unable to lock group file\n"), Prog);
#ifdef WITH_AUDIT #ifdef WITH_AUDIT
audit_logger (AUDIT_USER_CHAUTHTOK, Prog, "locking group file", audit_logger (AUDIT_USER_CHAUTHTOK, Prog,
user_name, user_id, 0); "locking group file",
user_name, (unsigned int) user_id, 0);
#endif #endif
fail_exit (E_GRP_UPDATE); fail_exit (E_GRP_UPDATE);
} }
if (gr_open (O_RDWR) == 0) { if (gr_open (O_RDWR) == 0) {
fprintf (stderr, _("%s: cannot open group file\n"), Prog); fprintf (stderr, _("%s: cannot open group file\n"), Prog);
#ifdef WITH_AUDIT #ifdef WITH_AUDIT
audit_logger (AUDIT_USER_CHAUTHTOK, Prog, "opening group file", audit_logger (AUDIT_USER_CHAUTHTOK, Prog,
user_name, user_id, 0); "opening group file",
user_name, (unsigned int) user_id, 0);
#endif #endif
fail_exit (E_GRP_UPDATE); fail_exit (E_GRP_UPDATE);
} }
@ -412,8 +418,8 @@ static void open_files (void)
_("%s: unable to lock shadow group file\n"), Prog); _("%s: unable to lock shadow group file\n"), Prog);
#ifdef WITH_AUDIT #ifdef WITH_AUDIT
audit_logger (AUDIT_USER_CHAUTHTOK, Prog, audit_logger (AUDIT_USER_CHAUTHTOK, Prog,
"locking shadow group file", user_name, user_id, "locking shadow group file",
0); user_name, (unsigned int) user_id, 0);
#endif #endif
fail_exit (E_GRP_UPDATE); fail_exit (E_GRP_UPDATE);
} }
@ -422,8 +428,8 @@ static void open_files (void)
Prog); Prog);
#ifdef WITH_AUDIT #ifdef WITH_AUDIT
audit_logger (AUDIT_USER_CHAUTHTOK, Prog, audit_logger (AUDIT_USER_CHAUTHTOK, Prog,
"opening shadow group file", user_name, user_id, "opening shadow group file",
0); user_name, (unsigned int) user_id, 0);
#endif #endif
fail_exit (E_GRP_UPDATE); fail_exit (E_GRP_UPDATE);
} }
@ -449,8 +455,9 @@ static void update_user (void)
fail_exit (E_PW_UPDATE); fail_exit (E_PW_UPDATE);
} }
#ifdef WITH_AUDIT #ifdef WITH_AUDIT
audit_logger (AUDIT_USER_CHAUTHTOK, Prog, "deleting user entries", audit_logger (AUDIT_USER_CHAUTHTOK, Prog,
user_name, user_id, 1); "deleting user entries",
user_name, (unsigned int) user_id, 1);
#endif #endif
SYSLOG ((LOG_INFO, "delete user `%s'\n", user_name)); SYSLOG ((LOG_INFO, "delete user `%s'\n", user_name));
} }
@ -491,7 +498,8 @@ static void user_busy (const char *name, uid_t uid)
if (!fflg) { if (!fflg) {
#ifdef WITH_AUDIT #ifdef WITH_AUDIT
audit_logger (AUDIT_USER_CHAUTHTOK, Prog, audit_logger (AUDIT_USER_CHAUTHTOK, Prog,
"deleting user logged in", name, -1, 0); "deleting user logged in",
name, AUDIT_NO_ID, 0);
#endif #endif
exit (E_USER_BUSY); exit (E_USER_BUSY);
} }
@ -538,11 +546,11 @@ exit 0
static void user_cancel (const char *user) static void user_cancel (const char *user)
{ {
char *cmd; char *cmd;
int pid, wpid; pid_t pid, wpid;
int status; int status;
cmd = getdef_str ("USERDEL_CMD"); cmd = getdef_str ("USERDEL_CMD");
if (NUll == cmd) { if (NULL == cmd) {
return; return;
} }
pid = fork (); pid = fork ();
@ -550,13 +558,13 @@ static void user_cancel (const char *user)
execl (cmd, cmd, user, (char *) 0); execl (cmd, cmd, user, (char *) 0);
perror (cmd); perror (cmd);
_exit (errno == ENOENT ? E_CMD_NOTFOUND : E_CMD_NOEXEC); _exit (errno == ENOENT ? E_CMD_NOTFOUND : E_CMD_NOEXEC);
} else if (pid == -1) { } else if ((pid_t)-1 == pid) {
perror ("fork"); perror ("fork");
return; return;
} }
do { do {
wpid = wait (&status); wpid = wait (&status);
} while ((wpid != pid) && (-1 != wpid)); } while ((wpid != pid) && ((pid_t)-1 != wpid));
} }
#ifdef EXTRA_CHECK_HOME_DIR #ifdef EXTRA_CHECK_HOME_DIR
@ -597,20 +605,21 @@ static void remove_mailbox (void)
if (fflg) { if (fflg) {
unlink (mailfile); /* always remove, ignore errors */ unlink (mailfile); /* always remove, ignore errors */
#ifdef WITH_AUDIT #ifdef WITH_AUDIT
audit_logger (AUDIT_USER_CHAUTHTOK, Prog, "deleting mail file", audit_logger (AUDIT_USER_CHAUTHTOK, Prog,
user_name, user_id, 1); "deleting mail file",
user_name, (unsigned int) user_id, 1);
#endif #endif
return; return;
} }
i = is_owner (user_id, mailfile); i = is_owner (user_id, mailfile);
if (i == 0) { if (i == 0) {
fprintf (stderr, fprintf (stderr,
_ _("%s: %s not owned by %s, not removing\n"),
("%s: %s not owned by %s, not removing\n"),
Prog, mailfile, user_name); Prog, mailfile, user_name);
#ifdef WITH_AUDIT #ifdef WITH_AUDIT
audit_logger (AUDIT_USER_CHAUTHTOK, Prog, "deleting mail file", audit_logger (AUDIT_USER_CHAUTHTOK, Prog,
user_name, user_id, 0); "deleting mail file",
user_name, (unsigned int) user_id, 0);
#endif #endif
return; return;
} else if (i == -1) } else if (i == -1)
@ -621,8 +630,9 @@ static void remove_mailbox (void)
} }
#ifdef WITH_AUDIT #ifdef WITH_AUDIT
else { else {
audit_logger (AUDIT_USER_CHAUTHTOK, Prog, "deleting mail file", audit_logger (AUDIT_USER_CHAUTHTOK, Prog,
user_name, user_id, 1); "deleting mail file",
user_name, (unsigned int) user_id, 1);
} }
#endif #endif
} }
@ -736,7 +746,8 @@ int main (int argc, char **argv)
Prog, user_name); Prog, user_name);
#ifdef WITH_AUDIT #ifdef WITH_AUDIT
audit_logger (AUDIT_USER_CHAUTHTOK, Prog, audit_logger (AUDIT_USER_CHAUTHTOK, Prog,
"deleting user not found", user_name, -1, 0); "deleting user not found",
user_name, AUDIT_NO_ID, 0);
#endif #endif
exit (E_NOTFOUND); exit (E_NOTFOUND);
} }
@ -824,14 +835,15 @@ int main (int argc, char **argv)
Prog, user_home); Prog, user_home);
#ifdef WITH_AUDIT #ifdef WITH_AUDIT
audit_logger (AUDIT_USER_CHAUTHTOK, Prog, audit_logger (AUDIT_USER_CHAUTHTOK, Prog,
"deleting home directory", user_name, "deleting home directory",
user_id, 1); user_name, (unsigned int) user_id, 1);
#endif #endif
errors++; errors++;
} }
#ifdef WITH_AUDIT #ifdef WITH_AUDIT
audit_logger (AUDIT_USER_CHAUTHTOK, Prog, audit_logger (AUDIT_USER_CHAUTHTOK, Prog,
"deleting home directory", user_name, user_id, 1); "deleting home directory",
user_name, (unsigned int) user_id, 1);
#endif #endif
} }
@ -853,7 +865,8 @@ int main (int argc, char **argv)
#ifdef WITH_AUDIT #ifdef WITH_AUDIT
if (0 != errors) { if (0 != errors) {
audit_logger (AUDIT_USER_CHAUTHTOK, Prog, audit_logger (AUDIT_USER_CHAUTHTOK, Prog,
"deleting home directory", user_name, -1, 0); "deleting home directory",
user_name, AUDIT_NO_ID, 0);
} }
#endif #endif
exit ((0 != errors) ? E_HOMEDIR : E_SUCCESS); exit ((0 != errors) ? E_HOMEDIR : E_SUCCESS);