[Pkg-shadow-commits] r311 - trunk/debian/patches
Nicolas FRANCOIS
pkg-shadow-devel@lists.alioth.debian.org
Tue, 28 Jun 2005 22:52:02 +0000
Author: nekral-guest
Date: 2005-06-28 22:52:02 +0000 (Tue, 28 Jun 2005)
New Revision: 311
Added:
trunk/debian/patches/428_grpck_add_prune_option
Removed:
trunk/debian/patches/008_grpck_add_prune_option
Modified:
trunk/debian/patches/series
Log:
Move 008_grpck_add_prune_option to 428.
This patch must be kept for shadowconfig.
Deleted: trunk/debian/patches/008_grpck_add_prune_option
===================================================================
--- trunk/debian/patches/008_grpck_add_prune_option 2005-06-28 14:52:08 UTC (rev 310)
+++ trunk/debian/patches/008_grpck_add_prune_option 2005-06-28 22:52:02 UTC (rev 311)
@@ -1,54 +0,0 @@
-Goal: grpck now has an (otherwise undocumented) -p option, so that
- shadowconfig can clean up the results of the above, so the config
- script will fail randomly less often.
-Fixes: #103385
-
-Status wrt upstream: It could certainly be submitted to upstream.
-
-Index: shadow-4.0.3/src/grpck.c
-===================================================================
---- shadow-4.0.3.orig/src/grpck.c 2005-05-23 01:08:35.567167000 +0200
-+++ shadow-4.0.3/src/grpck.c 2005-05-23 01:09:33.657167000 +0200
-@@ -146,6 +146,7 @@
- int errors = 0;
- int deleted = 0;
- int i;
-+ int prune = 0;
- struct commonio_entry *gre, *tgre;
- struct group *grp;
- int sort_mode = 0;
-@@ -172,7 +173,7 @@
- * 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 */
-@@ -183,6 +184,9 @@
- case 's':
- sort_mode = 1;
- break;
-+ case 'p':
-+ prune = 1;
-+ break;
- default:
- usage ();
- }
-@@ -315,9 +319,13 @@
- /*
- * prompt the user to delete the entry or not
- */
--
-- if (!yes_or_no ())
-+ if (!prune) {
-+ if (!yes_or_no ())
-+ continue;
-+ } else {
-+ puts("Yes");
- continue;
-+ }
-
- /*
- * All group file deletions wind up here. This code
Copied: trunk/debian/patches/428_grpck_add_prune_option (from rev 310, trunk/debian/patches/008_grpck_add_prune_option)
Modified: trunk/debian/patches/series
===================================================================
--- trunk/debian/patches/series 2005-06-28 14:52:08 UTC (rev 310)
+++ trunk/debian/patches/series 2005-06-28 22:52:02 UTC (rev 311)
@@ -31,7 +31,7 @@
008_su_PAM_session
350_su_syslog_old:new
008_login_MAXHOSTNAMELEN
-008_grpck_add_prune_option
+428_grpck_add_prune_option
008_login_stop_checking_args_after--
349_login_opt-f_with_username_after--
008_login_more_LOG_UNKFAIL_ENAB