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

[nekral-guest at alioth.debian.org]

Author: nekral-guest
Date: 2008-09-20 20:00:51 +0000 (Sat, 20 Sep 2008)
New Revision: 2430

Modified:
   upstream/trunk/ChangeLog
   upstream/trunk/src/login.c
Log:
	* src/login.c: Check that no username is specified with -r.
	* src/login.c: Make sure a username is specified with -f.


Modified: upstream/trunk/ChangeLog
===================================================================
--- upstream/trunk/ChangeLog	2008-09-20 19:54:35 UTC (rev 2429)
+++ upstream/trunk/ChangeLog	2008-09-20 20:00:51 UTC (rev 2430)
@@ -4,6 +4,8 @@
 	* src/login.c: Copy the name of the user authenticated by PAM to
 	username. This simplify later logging (avoid USE_PAM
 	conditional).
+	* src/login.c: Check that no username is specified with -r.
+	* src/login.c: Make sure a username is specified with -f.
 
 2008-09-20  Nicolas François  <nicolas.francois at centraliens.net>
 

Modified: upstream/trunk/src/login.c
===================================================================
--- upstream/trunk/src/login.c	2008-09-20 19:54:35 UTC (rev 2429)
+++ upstream/trunk/src/login.c	2008-09-20 20:00:51 UTC (rev 2430)
@@ -339,6 +339,15 @@
 		++optind;
 	}
 
+#ifdef	RLOGIN
+	if (rflg && (NULL != username)) {
+		usage ();
+	}
+#endif				/* RLOGIN */
+	if (fflg && (NULL == username)) {
+		usage ();
+	}
+
 }