[Pkg-shadow-commits] r3485 - in upstream/trunk: . src

[Nicolas FRANÇOIS]

Author: nekral-guest
Date: 2011-09-18 17:47:03 +0000 (Sun, 18 Sep 2011)
New Revision: 3485

Modified:
   upstream/trunk/ChangeLog
   upstream/trunk/src/su.c
Log:
	* src/su.c: Too much const were added on 2011-08-15. pw in
	save_caller_context() is allocated and freed.
	* src/su.c: Added missing #endif indication
	* src/su.c save_caller_context(): password only needed if
	SU_ACCESS and !USE_PAM.


Modified: upstream/trunk/ChangeLog
===================================================================
--- upstream/trunk/ChangeLog	2011-09-18 17:34:21 UTC (rev 3484)
+++ upstream/trunk/ChangeLog	2011-09-18 17:47:03 UTC (rev 3485)
@@ -1,5 +1,13 @@
 2011-09-18  Nicolas François  <nicolas.francois at centraliens.net>
 
+	* src/su.c: Too much const were added on 2011-08-15. pw in
+	save_caller_context() is allocated and freed.
+	* src/su.c: Added missing #endif indication
+	* src/su.c save_caller_context(): password only needed if
+	SU_ACCESS and !USE_PAM.
+
+2011-09-18  Nicolas François  <nicolas.francois at centraliens.net>
+
 	* src/usermod.c: date_to_str() is always called with negativ set
 	to "never", remove this argument.
 	* src/usermod.c: Added missing cast for gr_free argument.
@@ -81,7 +89,7 @@
 
 	* src/su.c: Add splint annotations.
 	* src/su.c: Set caller_on_console as boolean.
-	* src/su.c: Ignore retunr value from fputs (usage) / puts (prompt).
+	* src/su.c: Ignore return value from fputs (usage) / puts (prompt).
 	* src/su.c: Improved memory management.
 
 2011-08-14  Nicolas François  <nicolas.francois at centraliens.net>

Modified: upstream/trunk/src/su.c
===================================================================
--- upstream/trunk/src/su.c	2011-09-18 17:34:21 UTC (rev 3484)
+++ upstream/trunk/src/su.c	2011-09-18 17:47:03 UTC (rev 3485)
@@ -654,8 +654,12 @@
  */
 static void save_caller_context (char **argv)
 {
-	const struct passwd *pw = NULL;
+	struct passwd *pw = NULL;
+#ifndef USE_PAM
+#ifdef SU_ACCESS
 	const char *password = NULL;
+#endif				/* SU_ACCESS */
+#endif				/* !USE_PAM */
 	/*
 	 * Get the program name. The program name is used as a prefix to
 	 * most error messages.
@@ -673,7 +677,7 @@
 	if ((isatty (0) != 0) && (NULL != caller_tty)) {
 #ifndef USE_PAM
 		caller_on_console = console (caller_tty);
-#endif
+#endif				/* !USE_PAM */
 	} else {
 		/*
 		 * Be more paranoid, like su from SimplePAMApps.  --marekm