[Pkg-shadow-commits] r3350 - upstream/trunk/src

[Nicolas FRANÇOIS]

Author: nekral-guest
Date: 2011-06-13 18:26:52 +0000 (Mon, 13 Jun 2011)
New Revision: 3350

Modified:
   upstream/trunk/src/su.c
Log:
Compile fixes & cleanups.

Modified: upstream/trunk/src/su.c
===================================================================
--- upstream/trunk/src/su.c	2011-06-13 18:26:47 UTC (rev 3349)
+++ upstream/trunk/src/su.c	2011-06-13 18:26:52 UTC (rev 3350)
@@ -317,8 +317,8 @@
 		            || (sigaddset (&ourset, SIGQUIT) != 0)
 		            || (sigaddset (&ourset, SIGTSTP) != 0)
 		            || (sigaction (SIGINT,  &action, NULL) != 0)
-		            || (sigaction (SIGQUIT, &action, NULL) != 0))
-		            || (sigaction (SIGTSTP,  &action, NULL) != 0))
+		            || (sigaction (SIGQUIT, &action, NULL) != 0)
+		            || (sigaction (SIGTSTP,  &action, NULL) != 0)))
 		    || (sigprocmask (SIG_UNBLOCK, &ourset, NULL) != 0)
 		    ) {
 			fprintf (stderr,
@@ -421,6 +421,14 @@
  */
 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
 	 * validated.
@@ -691,9 +699,6 @@
 	int ret;
 #else				/* !USE_PAM */
 	int err = 0;
-
-	RETSIGTYPE (*oldsig) (int);
-
 #endif				/* !USE_PAM */
 
 	(void) setlocale (LC_ALL, "");