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

[Nicolas FRANÇOIS]

Author: nekral-guest
Date: 2011-08-15 09:25:58 +0000 (Mon, 15 Aug 2011)
New Revision: 3469

Modified:
   upstream/trunk/ChangeLog
   upstream/trunk/lib/prototypes.h
   upstream/trunk/src/su.c
Log:
	* src/su.c: Added const modifiers.
	* lib/prototypes: Synchronize splint annotations.


Modified: upstream/trunk/ChangeLog
===================================================================
--- upstream/trunk/ChangeLog	2011-08-14 21:44:46 UTC (rev 3468)
+++ upstream/trunk/ChangeLog	2011-08-15 09:25:58 UTC (rev 3469)
@@ -1,3 +1,8 @@
+2011-08-15  Nicolas François  <nicolas.francois at centraliens.net>
+
+	* src/su.c: Added const modifiers.
+	* lib/prototypes: Synchronize splint annotations.
+
 2011-08-14  Nicolas François  <nicolas.francois at centraliens.net>
 
 	* src/su.c: Add splint annotations.

Modified: upstream/trunk/lib/prototypes.h
===================================================================
--- upstream/trunk/lib/prototypes.h	2011-08-14 21:44:46 UTC (rev 3468)
+++ upstream/trunk/lib/prototypes.h	2011-08-15 09:25:58 UTC (rev 3469)
@@ -240,7 +240,7 @@
 extern void motd (void);
 
 /* myname.c */
-extern /*@null@*/struct passwd *get_my_pwent (void);
+extern /*@null@*//*@only@*/struct passwd *get_my_pwent (void);
 
 /* pam_pass_non_interractive.c */
 #ifdef USE_PAM

Modified: upstream/trunk/src/su.c
===================================================================
--- upstream/trunk/src/su.c	2011-08-14 21:44:46 UTC (rev 3468)
+++ upstream/trunk/src/su.c	2011-08-15 09:25:58 UTC (rev 3469)
@@ -132,11 +132,11 @@
 #endif				/* !USE_PAM */
 static bool restricted_shell (const char *shellname);
 static /*@noreturn@*/void su_failure (const char *tty, bool su_to_root);
-static struct passwd * check_perms (void);
+static /*@only@*/struct passwd * check_perms (void);
 #ifdef USE_PAM
-static void check_perms_pam (struct passwd *pw);
+static void check_perms_pam (const struct passwd *pw);
 #else				/* !USE_PAM */
-static void check_perms_nopam (struct passwd *pw);
+static void check_perms_nopam (const struct passwd *pw);
 #endif				/* !USE_PAM */
 static void save_caller_context (char **argv);
 static void process_flags (int argc, char **argv);
@@ -418,7 +418,7 @@
 }
 
 #ifdef USE_PAM
-static void check_perms_pam (struct passwd *pw)
+static void check_perms_pam (const struct passwd *pw)
 {
 	int ret;
 	ret = pam_authenticate (pamh, 0);
@@ -459,9 +459,9 @@
 	}
 }
 #else				/* !USE_PAM */
-static void check_perms_nopam (struct passwd *pw)
+static void check_perms_nopam (const struct passwd *pw)
 {
-	struct spwd *spwd = NULL;
+	/*@observer@*/const struct spwd *spwd = NULL;
 	/*@observer@*/const char *password = pw->pw_passwd;
 	RETSIGTYPE (*oldsig) (int);
 
@@ -572,7 +572,7 @@
  *	In case of subsystem login, the user is first authenticated in the
  *	caller's root subsystem, and then in the user's target subsystem.
  */
-static struct passwd * check_perms (void)
+static /*@only@*/struct passwd * check_perms (void)
 {
 #ifdef USE_PAM
 	const char *tmp_name;
@@ -654,7 +654,7 @@
  */
 static void save_caller_context (char **argv)
 {
-	struct passwd *pw = NULL;
+	const struct passwd *pw = NULL;
 	const char *password = NULL;
 	/*
 	 * Get the program name. The program name is used as a prefix to
@@ -710,7 +710,7 @@
 	 */
 	password = pw->pw_passwd;
 	if (strcmp (pw->pw_passwd, SHADOW_PASSWD_STRING) == 0) {
-		struct spwd *spwd = getspnam (caller_name);
+		const struct spwd *spwd = getspnam (caller_name);
 		if (NULL != spwd) {
 			password = spwd->sp_pwdp;
 		}
@@ -1006,7 +1006,7 @@
 	 * in /etc/passwd.
 	 */
 	if (NULL == shellstr) {
-		shellstr = (char *) strdup (pw->pw_shell);
+		shellstr = pw->pw_shell;
 	}
 
 	/*
@@ -1161,6 +1161,8 @@
 		(void) shell (shellstr, cp, environ);
 	}
 
+	pw_free (pw);
+
 	return (errno == ENOENT ? E_CMD_NOTFOUND : E_CMD_NOEXEC);
 }