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

[Christian Perrier]

Author: bubulle
Date: 2006-01-03 07:05:40 +0000 (Tue, 03 Jan 2006)
New Revision: 746

Removed:
   trunk/debian/patches/469_non-su-options
Modified:
   trunk/debian/patches/series
Log:
Patch 469 has been applied by Tomasz


Deleted: trunk/debian/patches/469_non-su-options
===================================================================
--- trunk/debian/patches/469_non-su-options	2006-01-03 07:02:31 UTC (rev 745)
+++ trunk/debian/patches/469_non-su-options	2006-01-03 07:05:40 UTC (rev 746)
@@ -1,37 +0,0 @@
-Index: shadow-4.0.14/src/su.c
-===================================================================
---- shadow-4.0.14.orig/src/su.c	2005-12-14 21:36:58.000000000 +0100
-+++ shadow-4.0.14/src/su.c	2005-12-14 21:47:18.000000000 +0100
-@@ -358,9 +358,19 @@
- 		};
- 
- 		while ((c =
--			getopt_long (argc, argv, "hlmps:", long_options,
-+			getopt_long (argc, argv, "-hlmps:", long_options,
- 				     &option_index)) != -1) {
- 			switch (c) {
-+			case 1:
-+				/* this is not an su option */
-+				/* The next arguments are either '-', the
-+				 * target name, or arguments to be passed
-+				 * to the shell.
-+				 */
-+				/* rewind the (not yet handled) option */
-+				optind--;
-+				goto end_su_options;
-+				break; /* NOT REACHED */
- 			case 'h':
- 				usage ();
- 				break;
-@@ -375,9 +385,10 @@
- 				shellstr = optarg;
- 				break;
- 			default:
--				usage ();
-+				usage (); /* NOT REACHED */
- 			}
- 		}
-+end_su_options:
- 		if (optind < argc && !strcmp (argv[optind], "-")) {
- 			fakelogin = 1;
- 			optind++;

Modified: trunk/debian/patches/series
===================================================================
--- trunk/debian/patches/series	2006-01-03 07:02:31 UTC (rev 745)
+++ trunk/debian/patches/series	2006-01-03 07:05:40 UTC (rev 746)
@@ -40,7 +40,6 @@
 366_fflush-prompt
 468_duplicate_passwd_struct_before_usage
 502_fix_generated_man_pages
-469_non-su-options
 470_su.1_document_options
 471_su_simplify_option_preserve_environment
 472_su_exported_variables