[Pkg-shadow-commits] r167 - trunk/debian/patches

[Nicolas FRANCOIS]

Author: nekral-guest
Date: 2005-05-22 23:27:28 +0000 (Sun, 22 May 2005)
New Revision: 167

Added:
   trunk/debian/patches/008_login_stop_checking_args_after--
Modified:
   trunk/debian/patches/008_src.dpatch
   trunk/debian/patches/series
Log:
Move some bits from 008_src.dpatch to 008_login_stop_checking_args_after--


Added: trunk/debian/patches/008_login_stop_checking_args_after--
===================================================================
--- trunk/debian/patches/008_login_stop_checking_args_after--	2005-05-22 23:21:08 UTC (rev 166)
+++ trunk/debian/patches/008_login_stop_checking_args_after--	2005-05-22 23:27:28 UTC (rev 167)
@@ -0,0 +1,18 @@
+Goal: terminate argument validation in login when it hits a '--'.
+Fixes: #66368
+
+Status wrt upstream: It could certainly be submitted to upstream.
+
+Index: shadow-4.0.3/src/login.c
+===================================================================
+--- shadow-4.0.3.orig/src/login.c	2005-05-23 01:23:54.377167000 +0200
++++ shadow-4.0.3/src/login.c	2005-05-23 01:24:36.427167000 +0200
+@@ -294,6 +294,8 @@
+ 	for (arg = 1; arg < argc; arg++) {
+ 		if (argv[arg][0] == '-' && strlen (argv[arg]) > 2)
+ 			usage ();
++		if (!strcmp(argv[arg], "--"))
++			break; /* stop checking on a "--" */
+ 	}
+ }
+ 

Modified: trunk/debian/patches/008_src.dpatch
===================================================================
--- trunk/debian/patches/008_src.dpatch	2005-05-22 23:21:08 UTC (rev 166)
+++ trunk/debian/patches/008_src.dpatch	2005-05-22 23:27:28 UTC (rev 167)
@@ -40,16 +40,7 @@
  #ifdef RADIUS
  /*
   * Support for RADIUS authentication based on a hacked util-linux login
-@@ -289,6 +294,8 @@
- 	for (arg = 1; arg < argc; arg++) {
- 		if (argv[arg][0] == '-' && strlen (argv[arg]) > 2)
- 			usage ();
-+		if (!strcmp(argv[arg], "--"))
-+			break; /* stop checking on a "--" */
- 	}
- }
- 
-@@ -763,49 +770,98 @@
+@@ -763,49 +768,98 @@
  			 * MAX_LOGIN_TRIES?
  			 */
  
@@ -187,7 +178,7 @@
  			retcode = pam_acct_mgmt (pamh, 0);
  
  			if (retcode == PAM_NEW_AUTHTOK_REQD) {
-@@ -828,11 +884,14 @@
+@@ -828,11 +882,14 @@
  
  		if (!pwd || setup_groups (pwd))
  			exit (1);
@@ -203,7 +194,7 @@
  		PAM_FAIL_CHECK;
  
  #else				/* ! USE_PAM */
-@@ -1002,6 +1061,7 @@
+@@ -1002,6 +1059,7 @@
  			failed = 1;
  		}
  #endif
@@ -211,7 +202,7 @@
  		if (pwd && getdef_bool ("FAILLOG_ENAB") &&
  		    !failcheck (pwent.pw_uid, &faillog, failed)) {
  			SYSLOG ((LOG_CRIT, 
-@@ -1009,12 +1069,15 @@
+@@ -1009,12 +1067,15 @@
  				 username, fromhost));
  			failed = 1;
  		}
@@ -227,7 +218,7 @@
  		if (getdef_str ("FTMP_FILE") != NULL) {
  			const char *failent_user;
  
-@@ -1208,6 +1271,40 @@
+@@ -1208,6 +1269,40 @@
  	login_fbtab (tty, pwent.pw_uid, pwent.pw_gid);
  #endif
  
@@ -268,7 +259,7 @@
  	/* We call set_groups() above because this clobbers pam_groups.so */
  #ifndef USE_PAM
  	if (setup_uid_gid (&pwent, is_console))
-@@ -1309,41 +1406,6 @@
+@@ -1309,41 +1404,6 @@
  	signal (SIGTERM, SIG_DFL);	/* default terminate signal */
  	signal (SIGALRM, SIG_DFL);	/* default alarm signal */
  	signal (SIGHUP, SIG_DFL);	/* added this.  --marekm */
@@ -310,7 +301,7 @@
  	signal (SIGINT, SIG_DFL);	/* default interrupt signal */
  
  	endpwent ();	/* stop access to password file */
-@@ -1357,7 +1419,11 @@
+@@ -1357,7 +1417,11 @@
  	if (pwent.pw_uid == 0)
  		SYSLOG ((LOG_NOTICE, "ROOT LOGIN %s", fromhost));
  	else if (getdef_bool ("LOG_OK_LOGINS"))

Modified: trunk/debian/patches/series
===================================================================
--- trunk/debian/patches/series	2005-05-22 23:21:08 UTC (rev 166)
+++ trunk/debian/patches/series	2005-05-22 23:27:28 UTC (rev 167)
@@ -6,6 +6,7 @@
 006_libmisc.dpatch
 008_src.dpatch
 008_grpck_add_prune_option
+008_login_stop_checking_args_after--
 008_login_opt-f_with_username_after--
 009_etc.dpatch
 010_chpasswd-md5.dpatch