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

[Nicolas FRANÇOIS]

Author: nekral-guest
Date: 2009-04-12 00:17:36 +0000 (Sun, 12 Apr 2009)
New Revision: 2664

Modified:
   upstream/trunk/ChangeLog
   upstream/trunk/NEWS
   upstream/trunk/src/login.c
Log:
	* src/login.c: Restore the echoctl, echoke, onclr flags to the
	terminal termio flags. Reset echoprt, noflsh, tostop. This
	behavior seems to have change by mistake in earlier releases
	(4.0.8, for no obvious reason).


Modified: upstream/trunk/ChangeLog
===================================================================
--- upstream/trunk/ChangeLog	2009-04-12 00:08:26 UTC (rev 2663)
+++ upstream/trunk/ChangeLog	2009-04-12 00:17:36 UTC (rev 2664)
@@ -1,5 +1,12 @@
 2009-04-12  Nicolas François  <nicolas.francois at centraliens.net>
 
+	* src/login.c: Restore the echoctl, echoke, onclr flags to the
+	terminal termio flags. Reset echoprt, noflsh, tostop. This
+	behavior seems to have change by mistake in earlier releases
+	(4.0.8, for no obvious reason).
+
+2009-04-12  Nicolas François  <nicolas.francois at centraliens.net>
+
 	* src/login.c: Fix the count of failures before login exits in
 	case of PAM enabled configurations.
 

Modified: upstream/trunk/NEWS
===================================================================
--- upstream/trunk/NEWS	2009-04-12 00:08:26 UTC (rev 2663)
+++ upstream/trunk/NEWS	2009-04-12 00:17:36 UTC (rev 2664)
@@ -82,6 +82,10 @@
   * do not create groups with GID set to (gid_t)-1.
 - grpck
   * warn for groups with GID set to (gid_t)-1.
+- login
+  * Restore the echoctl, echoke, onclr flags to the terminal termio flags.
+    Reset echoprt, noflsh, tostop. This behavior seems to have change by
+    mistake in earlier releases (4.0.8, for no obvious reason).
 - newusers
   * Implement the -r, --system option.
   * Speedup (see "addition of users or groups" above).

Modified: upstream/trunk/src/login.c
===================================================================
--- upstream/trunk/src/login.c	2009-04-12 00:08:26 UTC (rev 2663)
+++ upstream/trunk/src/login.c	2009-04-12 00:17:36 UTC (rev 2664)
@@ -173,6 +173,16 @@
 	termio.c_lflag |= ISIG | ICANON | ECHO | ECHOE;
 	termio.c_iflag |= ICRNL;
 
+#if defined(ECHOKE) && defined(ECHOCTL)
+	termio.c_lflag |= ECHOKE | ECHOCTL;
+#endif
+#if defined(ECHOPRT) && defined(NOFLSH) && defined(TOSTOP)
+	termio.c_lflag &= ~(ECHOPRT | NOFLSH | TOSTOP);
+#endif
+#ifdef ONLCR
+	termio.c_oflag |= ONLCR;
+#endif
+
 	/* leave these values unchanged if not specified in login.defs */
 	termio.c_cc[VERASE] = getdef_num ("ERASECHAR", termio.c_cc[VERASE]);
 	termio.c_cc[VKILL] = getdef_num ("KILLCHAR", termio.c_cc[VKILL]);