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

[nekral-guest at alioth.debian.org]

Author: nekral-guest
Date: 2008-09-20 20:03:04 +0000 (Sat, 20 Sep 2008)
New Revision: 2431

Modified:
   upstream/trunk/ChangeLog
   upstream/trunk/src/login.c
Log:
	* src/login.c: Explicitly tag the end of the #ifdef RLOGIN
	sections.


Modified: upstream/trunk/ChangeLog
===================================================================
--- upstream/trunk/ChangeLog	2008-09-20 20:00:51 UTC (rev 2430)
+++ upstream/trunk/ChangeLog	2008-09-20 20:03:04 UTC (rev 2431)
@@ -6,6 +6,8 @@
 	conditional).
 	* src/login.c: Check that no username is specified with -r.
 	* src/login.c: Make sure a username is specified with -f.
+	* src/login.c: Explicitly tag the end of the #ifdef RLOGIN
+	sections.
 
 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 20:00:51 UTC (rev 2430)
+++ upstream/trunk/src/login.c	2008-09-20 20:03:04 UTC (rev 2431)
@@ -100,9 +100,9 @@
 
 #ifdef RLOGIN
 static bool rflg = false;
-#else
+#else				/* RLOGIN */
 #define rflg false
-#endif
+#endif				/* !RLOGIN */
 static bool hflg = false;
 static bool preauth_flag = false;
 
@@ -157,7 +157,7 @@
 	fprintf (stderr, _("       %s [-p] [-h host] [-f name]\n"), Prog);
 #ifdef RLOGIN
 	fprintf (stderr, _("       %s [-p] -r host\n"), Prog);
-#endif
+#endif				/* RLOGIN */
 	exit (1);
 }
 
@@ -298,7 +298,7 @@
 			hostname = optarg;
 			reason = PW_RLOGIN;
 			break;
-#endif
+#endif				/* RLOGIN */
 		case 'p':
 			pflg = true;
 			break;
@@ -315,7 +315,7 @@
 	if (rflg && (hflg || fflg)) {
 		usage ();
 	}
-#endif
+#endif				/* RLOGIN */
 
 	/*
 	 * Allow authentication bypass only if real UID is zero.
@@ -428,7 +428,7 @@
 
 #ifdef RLOGIN
 	char term[128] = "";
-#endif
+#endif				/* RLOGIN */
 #if defined(HAVE_STRFTIME) && !defined(USE_PAM)
 	char ptime[80];
 #endif
@@ -545,7 +545,7 @@
 			username = NULL;
 		}
 	}
-#endif
+#endif				/* RLOGIN */
 
 	OPENLOG ("login");
 
@@ -584,7 +584,7 @@
 	if (term[0] != '\0') {
 		addenv ("TERM", term);
 	} else
-#endif
+#endif				/* RLOGIN */
 	{
 		/* preserve TERM from getty */
 		if (!pflg) {