[Pkg-shadow-commits] r2662 - in debian/trunk/debian: . patches

[Nicolas FRANÇOIS]

Author: nekral-guest
Date: 2009-04-11 23:37:38 +0000 (Sat, 11 Apr 2009)
New Revision: 2662

Modified:
   debian/trunk/debian/changelog
   debian/trunk/debian/patches/542_useradd-O_option
Log:
Updated debian/patches/542_useradd-O_option for shadow 4.1.3.


Modified: debian/trunk/debian/changelog
===================================================================
--- debian/trunk/debian/changelog	2009-04-11 23:35:49 UTC (rev 2661)
+++ debian/trunk/debian/changelog	2009-04-11 23:37:38 UTC (rev 2662)
@@ -32,6 +32,7 @@
       + debian/patches/401_cppw_src.dpatch
       + debian/patches/506_relaxed_usernames
       + debian/patches/463_login_delay_obeys_to_PAM
+      + debian/patches/542_useradd-O_option
     - Translations
       + New Kazakh translation. Closes: #517809
       + Updated Slovak translation. Closes: #523621

Modified: debian/trunk/debian/patches/542_useradd-O_option
===================================================================
--- debian/trunk/debian/patches/542_useradd-O_option	2009-04-11 23:35:49 UTC (rev 2661)
+++ debian/trunk/debian/patches/542_useradd-O_option	2009-04-11 23:37:38 UTC (rev 2662)
@@ -25,15 +25,18 @@
 ===================================================================
 --- shadow-4.1.0.orig/src/useradd.c
 +++ shadow-4.1.0/src/useradd.c
-@@ -1009,7 +1009,7 @@
- 			{NULL, 0, NULL, '\0'}
+@@ -1009,9 +1009,9 @@
  		};
- 		while ((c =
--			getopt_long (argc, argv, "b:c:d:De:f:g:G:k:K:lmMNop:rs:u:U",
-+			getopt_long (argc, argv, "b:c:d:De:f:g:G:k:O:K:lmMNop:rs:u:U",
- 				     long_options, NULL)) != -1) {
+ 		while ((c = getopt_long (argc, argv,
+ #ifdef WITH_SELINUX
+-		                         "b:c:d:De:f:g:G:k:K:lmMNop:rs:u:UZ:",
++		                         "b:c:d:De:f:g:G:k:O:K:lmMNop:rs:u:UZ:",
+ #else
+-		                         "b:c:d:De:f:g:G:k:K:lmMNop:rs:u:U",
++		                         "b:c:d:De:f:g:G:k:O:K:lmMNop:rs:u:U",
+ #endif
+ 		                         long_options, NULL)) != -1) {
  			switch (c) {
- 			case 'b':
 @@ -1125,6 +1125,7 @@
  				kflg++;
  				break;