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

[Nicolas FRANÇOIS]

Author: nekral-guest
Date: 2011-11-06 19:08:11 +0000 (Sun, 06 Nov 2011)
New Revision: 3568

Modified:
   debian/trunk/debian/changelog
   debian/trunk/debian/patches/428_grpck_add_prune_option
   debian/trunk/debian/patches/429_login_FAILLOG_ENAB
   debian/trunk/debian/patches/542_useradd-O_option
Log:
Refreshed patches.


Modified: debian/trunk/debian/changelog
===================================================================
--- debian/trunk/debian/changelog	2011-11-06 19:06:37 UTC (rev 3567)
+++ debian/trunk/debian/changelog	2011-11-06 19:08:11 UTC (rev 3568)
@@ -43,6 +43,7 @@
       + debian/patches/506_relaxed_usernames
       + debian/patches/523_su_arguments_are_concatenated
       + debian/patches/542_useradd-O_option
+      + debian/patches/428_grpck_add_prune_option
     - debian/patches/506_relaxed_usernames: Really check if the user/group
       name starts with a dash. Also forbid names starting with '+' or '~'.
       Document the naming policy in useradd.8 / groupadd.8.

Modified: debian/trunk/debian/patches/428_grpck_add_prune_option
===================================================================
--- debian/trunk/debian/patches/428_grpck_add_prune_option	2011-11-06 19:06:37 UTC (rev 3567)
+++ debian/trunk/debian/patches/428_grpck_add_prune_option	2011-11-06 19:08:11 UTC (rev 3568)
@@ -19,11 +19,12 @@
  	/*
  	 * Parse the command line arguments
  	 */
--	while ((arg = getopt (argc, argv, "qrs")) != EOF) {
-+	while ((arg = getopt (argc, argv, "qprs")) != EOF) {
- 		switch (arg) {
- 		case 'q':
- 			/* quiet - ignored for now */
+-	while ((c = getopt_long (argc, argv, "hqrR:s",
++	while ((c = getopt_long (argc, argv, "hqprR:s",
+	                         long_options, NULL)) != -1) {
+ 		switch (c) {
+ 		case 'h':
+ 			usage (E_SUCCESS);
 @@ -189,6 +190,9 @@
  		case 's':
  			sort_mode = true;

Modified: debian/trunk/debian/patches/429_login_FAILLOG_ENAB
===================================================================
--- debian/trunk/debian/patches/429_login_FAILLOG_ENAB	2011-11-06 19:06:37 UTC (rev 3567)
+++ debian/trunk/debian/patches/429_login_FAILLOG_ENAB	2011-11-06 19:08:11 UTC (rev 3568)
@@ -27,9 +27,9 @@
 +				if ((NULL != pwd) && getdef_bool("FAILLOG_ENAB")) {
 +					failure (pwd->pw_uid, tty, &faillog);
 +				}
- 				fprintf(stderr,
- 				        _("Maximum number of tries exceeded (%u)\n"),
- 				        failcount);
+ 				fprintf (stderr,
+ 				         _("Maximum number of tries exceeded (%u)\n"),
+ 				         failcount);
 @@ -812,6 +815,14 @@
  				         pam_strerror (pamh, retcode)));
  				failed = true;

Modified: debian/trunk/debian/patches/542_useradd-O_option
===================================================================
--- debian/trunk/debian/patches/542_useradd-O_option	2011-11-06 19:06:37 UTC (rev 3567)
+++ debian/trunk/debian/patches/542_useradd-O_option	2011-11-06 19:08:11 UTC (rev 3568)
@@ -25,11 +25,11 @@
  		};
  		while ((c = getopt_long (argc, argv,
  #ifdef WITH_SELINUX
--		                         "b:c:d:De:f:g:G:hk:K:lmMNop:rs:u:UZ:",
-+		                         "b:c:d:De:f:g:G:hk:O:K:lmMNop:rs:u:UZ:",
+-		                         "b:c:d:De:f:g:G:hk:K:lmMNop:rR:s:u:UZ:",
++		                         "b:c:d:De:f:g:G:hk:O:K:lmMNop:rR:s:u:UZ:",
  #else
--		                         "b:c:d:De:f:g:G:hk:K:lmMNop:rs:u:U",
-+		                         "b:c:d:De:f:g:G:hk:O:K:lmMNop:rs:u:U",
+-		                         "b:c:d:De:f:g:G:hk:K:lmMNop:rR:s:u:U",
++		                         "b:c:d:De:f:g:G:hk:O:K:lmMNop:rR:s:u:U",
  #endif
  		                         long_options, NULL)) != -1) {
  			switch (c) {