diff options
| author | nekral-guest <nekral-guest@5a98b0ae-9ef6-0310-add3-de5d479b70d7> | 2012-02-16 20:28:21 +0000 |
|---|---|---|
| committer | nekral-guest <nekral-guest@5a98b0ae-9ef6-0310-add3-de5d479b70d7> | 2012-02-16 20:28:21 +0000 |
| commit | 057ad9bb6998a5910ff7f7f4016c21f4387c1cda (patch) | |
| tree | d167e6d6b541a1c0fa2dd9fc0f665b616e4a84d4 | |
| parent | 27c3b04789b0b2393d7e48f51fdd3dd1ae00c1ab (diff) | |
| download | shadow-057ad9bb6998a5910ff7f7f4016c21f4387c1cda.tar.gz | |
* debian/patches/428_grpck_add_prune_option: removed -p option. The option
was not documented and was meant to fix consequences of a bug now fixed
more than 10 years ago.
Note that debian/patches/428_grpck_add_prune_option was broken by the
refresh in 4.1.5-1
* debian/shadowconfig.sh: Display issues, but dot not prompt interactively
to fix passwd/group/shadow/gshadow issues. Closes: #638263
| -rw-r--r-- | debian/changelog | 14 | ||||
| -rw-r--r-- | debian/patches/428_grpck_add_prune_option | 26 | ||||
| -rw-r--r-- | debian/shadowconfig.sh | 8 |
3 files changed, 18 insertions, 30 deletions
diff --git a/debian/changelog b/debian/changelog index 5c24b678..8f0a5a5d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,17 @@ +shadow (1:4.1.5.1-1) unstable; urgency=low + + * The "Gruyère" release. + + * New upstream release: + - + * debian/patches/428_grpck_add_prune_option: removed -p option. The option + was not documented and was meant to fix consequences of a bug now fixed + more than 10 years ago. + * debian/shadowconfig.sh: Display issues, but dot not prompt interactively + to fix passwd/group/shadow/gshadow issues. Closes: #638263 + + -- Nicolas FRANCOIS (Nekral) <nicolas.francois@centraliens.net> Thu, 16 Feb 2012 20:58:49 +0100 + shadow (1:4.1.5-1) unstable; urgency=low * The "Charolais" release. diff --git a/debian/patches/428_grpck_add_prune_option b/debian/patches/428_grpck_add_prune_option deleted file mode 100644 index e71f1425..00000000 --- a/debian/patches/428_grpck_add_prune_option +++ /dev/null @@ -1,26 +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. - ---- a/src/grpck.c -+++ b/src/grpck.c -@@ -81,6 +81,7 @@ - /* Options */ - static bool read_only = false; - static bool sort_mode = false; -+static bool prune = false; - - /* local function prototypes */ - static void fail_exit (int status); -@@ -203,7 +204,7 @@ - /* - * Parse the command line arguments - */ -- while ((c = getopt_long (argc, argv, "hqrR:s", -+ while ((c = getopt_long (argc, argv, "hqprR:s", - long_options, NULL)) != -1) { - switch (c) { - case 'h': diff --git a/debian/shadowconfig.sh b/debian/shadowconfig.sh index 49953238..28df7512 100644 --- a/debian/shadowconfig.sh +++ b/debian/shadowconfig.sh @@ -5,8 +5,8 @@ set -e shadowon () { set -e - pwck -q - grpck -p + pwck -q -r + grpck -r pwconv grpconv chown root:root /etc/passwd /etc/group @@ -17,8 +17,8 @@ shadowon () { shadowoff () { set -e - pwck -q - grpck -p + pwck -q -r + grpck -r pwunconv grpunconv # sometimes the passwd perms get munged |