Compile fixes & cleanups.

This commit is contained in:
nekral-guest 2011-06-13 18:26:52 +00:00
parent 6be3ac560b
commit 40a16a1b04

View File

@ -317,8 +317,8 @@ static void run_shell (const char *shellstr, char *args[], bool doshell,
|| (sigaddset (&ourset, SIGQUIT) != 0) || (sigaddset (&ourset, SIGQUIT) != 0)
|| (sigaddset (&ourset, SIGTSTP) != 0) || (sigaddset (&ourset, SIGTSTP) != 0)
|| (sigaction (SIGINT, &action, NULL) != 0) || (sigaction (SIGINT, &action, NULL) != 0)
|| (sigaction (SIGQUIT, &action, NULL) != 0)) || (sigaction (SIGQUIT, &action, NULL) != 0)
|| (sigaction (SIGTSTP, &action, NULL) != 0)) || (sigaction (SIGTSTP, &action, NULL) != 0)))
|| (sigprocmask (SIG_UNBLOCK, &ourset, NULL) != 0) || (sigprocmask (SIG_UNBLOCK, &ourset, NULL) != 0)
) { ) {
fprintf (stderr, fprintf (stderr,
@ -421,6 +421,14 @@ static void usage (int status)
*/ */
static struct passwd * check_perms (void) static struct passwd * check_perms (void)
{ {
#ifdef USE_PAM
int ret;
#else /* !USE_PAM */
#ifdef SU_ACCESS
struct spwd *spwd = NULL;
#endif /* SU_ACCESS */
RETSIGTYPE (*oldsig) (int);
#endif /* !USE_PAM */
/* /*
* The password file entries for the user is gotten and the account * The password file entries for the user is gotten and the account
* validated. * validated.
@ -691,9 +699,6 @@ int main (int argc, char **argv)
int ret; int ret;
#else /* !USE_PAM */ #else /* !USE_PAM */
int err = 0; int err = 0;
RETSIGTYPE (*oldsig) (int);
#endif /* !USE_PAM */ #endif /* !USE_PAM */
(void) setlocale (LC_ALL, ""); (void) setlocale (LC_ALL, "");