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

pid_child and kill_child are only used when USE_PAM.

Browse Source
This commit is contained in:
nekral-guest 2009-09-08 21:33:14 +00:00
parent 1e51ab0b23
commit 2be243c143
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/su.c
View File

@ -78,8 +78,6 @@
* Global variables * Global variables
*/ */
char *Prog; char *Prog;
/* PID of the child, in case it needs to be killed */
static pid_t pid_child = 0;
/* not needed by sulog.c anymore */ /* not needed by sulog.c anymore */
static char name[BUFSIZ]; static char name[BUFSIZ];
@ -91,6 +89,8 @@ static bool change_environment;
#ifdef USE_PAM #ifdef USE_PAM
static pam_handle_t *pamh = NULL; static pam_handle_t *pamh = NULL;
static bool caught = false; static bool caught = false;
/* PID of the child, in case it needs to be killed */
static pid_t pid_child = 0;
#endif #endif
extern struct passwd pwent; extern struct passwd pwent;
@ -108,8 +108,9 @@ extern size_t newenvc;
static void execve_shell (const char *shellstr, static void execve_shell (const char *shellstr,
char *args[], char *args[],
char *const envp[]); char *const envp[]);
static RETSIGTYPE kill_child (int s); #ifdef USE_PAM
#ifndef USE_PAM static RETSIGTYPE kill_child (int unused(s));
#else /* !USE_PAM */
static RETSIGTYPE die (int); static RETSIGTYPE die (int);
static int iswheel (const char *); static int iswheel (const char *);
#endif /* !USE_PAM */ #endif /* !USE_PAM */
@ -148,8 +149,7 @@ static int iswheel (const char *username)
} }
return is_on_list (grp->gr_mem, username); return is_on_list (grp->gr_mem, username);
} }
#endif /* !USE_PAM */ #else /* USE_PAM */
static RETSIGTYPE kill_child (int unused(s)) static RETSIGTYPE kill_child (int unused(s))
{ {
if (0 != pid_child) { if (0 != pid_child) {
@ -161,6 +161,7 @@ static RETSIGTYPE kill_child (int unused(s))
} }
exit (255); exit (255);
} }
#endif /* USE_PAM */
/* borrowed from GNU sh-utils' "su.c" */ /* borrowed from GNU sh-utils' "su.c" */
static bool restricted_shell (const char *shellstr) static bool restricted_shell (const char *shellstr)