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

* src/su.c: fork() and waitpid() return a pid_t, not an int.

Browse Source 
* src/su.c: Add brackets and parenthesis.
	* src/su.c: Ignore the return value of signal().
This commit is contained in:
nekral-guest 2008-06-13 21:02:07 +00:00
parent a22c7e731a
commit 00431d772e
2 changed files with 19 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
2008-06-13 Nicolas François <nicolas.francois@centraliens.net>
* src/su.c: fork() and waitpid() return a pid_t, not an int.
* src/su.c: Add brackets and parenthesis.
* src/su.c: Ignore the return value of signal().
2008-06-13 Nicolas François <nicolas.francois@centraliens.net> 2008-06-13 Nicolas François <nicolas.francois@centraliens.net>
* src/groupdel.c: The ID argument of audit_logger is an unsigned * src/groupdel.c: The ID argument of audit_logger is an unsigned

25
src/su.c
View File

@ -183,7 +183,7 @@ static void catch_signals (unused int sig)
static void run_shell (const char *shellstr, char *args[], bool doshell, static void run_shell (const char *shellstr, char *args[], bool doshell,
char *const envp[]) char *const envp[])
{ {
int child; pid_t child;
sigset_t ourset; sigset_t ourset;
int status; int status;
int ret; int ret;
@ -197,12 +197,13 @@ static void run_shell (const char *shellstr, char *args[], bool doshell,
pam_end (pamh, PAM_SUCCESS | PAM_DATA_SILENT); pam_end (pamh, PAM_SUCCESS | PAM_DATA_SILENT);
*/ */
if (doshell) if (doshell) {
(void) shell (shellstr, (char *) args[0], envp); (void) shell (shellstr, (char *) args[0], envp);
else } else {
(void) execve (shellstr, (char **) args, envp); (void) execve (shellstr, (char **) args, envp);
}
exit (errno == ENOENT ? E_CMD_NOTFOUND : E_CMD_NOEXEC); exit (errno == ENOENT ? E_CMD_NOTFOUND : E_CMD_NOEXEC);
} else if (child == -1) { } else if ((pid_t)-1 == child) {
(void) fprintf (stderr, "%s: Cannot fork user shell\n", Prog); (void) fprintf (stderr, "%s: Cannot fork user shell\n", Prog);
SYSLOG ((LOG_WARN, "Cannot execute %s", shellstr)); SYSLOG ((LOG_WARN, "Cannot execute %s", shellstr));
closelog (); closelog ();
@ -235,11 +236,11 @@ static void run_shell (const char *shellstr, char *args[], bool doshell,
if (!caught) { if (!caught) {
do { do {
int pid; pid_t pid;
pid = waitpid (-1, &status, WUNTRACED); pid = waitpid (-1, &status, WUNTRACED);
if ((-1 != pid) && (0 != WIFSTOPPED (status))) { if (((pid_t)-1 != pid) && (0 != WIFSTOPPED (status))) {
/* The child (shell) was suspended. /* The child (shell) was suspended.
* Suspend su. */ * Suspend su. */
kill (getpid (), WSTOPSIG(status)); kill (getpid (), WSTOPSIG(status));
@ -663,8 +664,8 @@ int main (int argc, char **argv)
shellstr = "/bin/sh"; shellstr = "/bin/sh";
} }
signal (SIGINT, SIG_IGN); (void) signal (SIGINT, SIG_IGN);
signal (SIGQUIT, SIG_IGN); (void) signal (SIGQUIT, SIG_IGN);
#ifdef USE_PAM #ifdef USE_PAM
ret = pam_authenticate (pamh, 0); ret = pam_authenticate (pamh, 0);
if (PAM_SUCCESS != ret) { if (PAM_SUCCESS != ret) {
@ -704,7 +705,7 @@ int main (int argc, char **argv)
* Set up a signal handler in case the user types QUIT. * Set up a signal handler in case the user types QUIT.
*/ */
die (0); die (0);
oldsig = signal (SIGQUIT, die); (void) oldsig = signal (SIGQUIT, die);
/* /*
* See if the system defined authentication method is being used. * See if the system defined authentication method is being used.
@ -716,7 +717,7 @@ int main (int argc, char **argv)
"Authentication failed for %s", name)); "Authentication failed for %s", name));
su_failure (tty); su_failure (tty);
} }
signal (SIGQUIT, oldsig); (void) signal (SIGQUIT, oldsig);
/* /*
* Check to see if the account is expired. root gets to ignore any * Check to see if the account is expired. root gets to ignore any
@ -756,8 +757,8 @@ int main (int argc, char **argv)
} }
#endif /* !USE_PAM */ #endif /* !USE_PAM */
signal (SIGINT, SIG_DFL); (void) signal (SIGINT, SIG_DFL);
signal (SIGQUIT, SIG_DFL); (void) signal (SIGQUIT, SIG_DFL);
cp = getdef_str ((pwent.pw_uid == 0) ? "ENV_SUPATH" : "ENV_PATH"); cp = getdef_str ((pwent.pw_uid == 0) ? "ENV_SUPATH" : "ENV_PATH");
if (NULL == cp) { if (NULL == cp) {