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

[Nicolas FRANÇOIS]

Author: nekral-guest
Date: 2011-08-14 13:15:20 +0000 (Sun, 14 Aug 2011)
New Revision: 3462

Modified:
   upstream/trunk/ChangeLog
   upstream/trunk/src/su.c
Log:
	* src/su.c: Add annotations to indicate that su_failure() does
	not return.


Modified: upstream/trunk/ChangeLog
===================================================================
--- upstream/trunk/ChangeLog	2011-07-30 01:48:42 UTC (rev 3461)
+++ upstream/trunk/ChangeLog	2011-08-14 13:15:20 UTC (rev 3462)
@@ -1,3 +1,8 @@
+2011-08-14  Nicolas François  <nicolas.francois at centraliens.net>
+
+	* src/su.c: Add annotations to indicate that su_failure() does
+	not return.
+
 2011-07-30  Nicolas François  <nicolas.francois at centraliens.net>
 
 	* lib/commonio.c: Display PID as unsigned long.

Modified: upstream/trunk/src/su.c
===================================================================
--- upstream/trunk/src/su.c	2011-07-30 01:48:42 UTC (rev 3461)
+++ upstream/trunk/src/su.c	2011-08-14 13:15:20 UTC (rev 3462)
@@ -131,7 +131,7 @@
 static bool iswheel (const char *);
 #endif				/* !USE_PAM */
 static bool restricted_shell (const char *shellname);
-static void su_failure (const char *tty, bool su_to_root);
+static /*@noreturn@*/void su_failure (const char *tty, bool su_to_root);
 static struct passwd * check_perms (void);
 #ifdef USE_PAM
 static void check_perms_pam (struct passwd *pw);
@@ -207,7 +207,7 @@
 	return true;
 }
 
-static void su_failure (const char *tty, bool su_to_root)
+static /*@noreturn@*/void su_failure (const char *tty, bool su_to_root)
 {
 	sulog (tty, false, caller_name, name);	/* log failed attempt */
 #ifdef USE_SYSLOG