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

[Nicolas FRANÇOIS]

Author: nekral-guest
Date: 2012-05-20 16:15:14 +0000 (Sun, 20 May 2012)
New Revision: 3737

Modified:
   upstream/trunk/ChangeLog
   upstream/trunk/NEWS
   upstream/trunk/src/su.c
Log:
	* src/su.c: non PAM enabled versions: do not fail if su is called
	without a controlling terminal. Ignore ENXIO errors when opening
	/dev/tty.


Modified: upstream/trunk/ChangeLog
===================================================================
--- upstream/trunk/ChangeLog	2012-05-20 15:30:55 UTC (rev 3736)
+++ upstream/trunk/ChangeLog	2012-05-20 16:15:14 UTC (rev 3737)
@@ -1,5 +1,17 @@
 2012-05-20  Nicolas François  <nicolas.francois at centraliens.net>
 
+	* src/su.c: non PAM enabled versions: do not fail if su is called
+	without a controlling terminal. Ignore ENXIO errors when opening
+	/dev/tty.
+
+2012-05-20  Nicolas François  <nicolas.francois at centraliens.net>
+
+	* src/useradd.c: Cleanup, return code 13 no more used.
+	* man/useradd.8.xml: Document return code 14, and remove return
+	code 13.
+
+2012-05-20  Nicolas François  <nicolas.francois at centraliens.net>
+
 	* NEWS, man/generate_mans.mak: Generate manpages in man1, man3,
 	man5, man8 subdirectories. This fix the generation of .so links
 	which did not point to a path relative to the top-level manual

Modified: upstream/trunk/NEWS
===================================================================
--- upstream/trunk/NEWS	2012-05-20 15:30:55 UTC (rev 3736)
+++ upstream/trunk/NEWS	2012-05-20 16:15:14 UTC (rev 3737)
@@ -5,6 +5,9 @@
 - login
   * Log into utmp(x) when PAM is enabled, but do not log into wtmp.
     This complete pam_lastlog which logs into wtmp and in into utmp(x).
+- su
+  * non PAM enabled versions: do not fail if su is called without a
+    controlling terminal.
 - userdel
   * Fix segfault when userdel removes the user's group.
 

Modified: upstream/trunk/src/su.c
===================================================================
--- upstream/trunk/src/su.c	2012-05-20 15:30:55 UTC (rev 3736)
+++ upstream/trunk/src/su.c	2012-05-20 16:15:14 UTC (rev 3737)
@@ -1092,6 +1092,9 @@
 		if (fd >= 0) {
 			err = ioctl (fd, TIOCNOTTY, (char *) 0);
 			(void) close (fd);
+		} else if (ENXIO == errno) {
+			/* There are no controlling terminal already */
+			err = 0;
 		}
 #endif				/* USE_PAM */