From a68ce238bd4c237faaee2b8ad389540ee2221d14 Mon Sep 17 00:00:00 2001 From: Chris Hofstaedtler Date: Mon, 17 Feb 2025 19:47:33 +0100 Subject: [PATCH] Remove "shadowconfig off" If needed please run pwunconv, grpunconv manually, but please understand you are on your own. Gbp-Dch: full --- debian/README.Debian | 13 +- debian/passwd.manpages | 1 - .../Document-the-shadowconfig-utility.patch | 168 ++---------------- ...-building-programs-we-do-not-install.patch | 16 +- debian/shadowconfig | 22 +-- 5 files changed, 29 insertions(+), 191 deletions(-) diff --git a/debian/README.Debian b/debian/README.Debian index e7ef2631..898bbee6 100644 --- a/debian/README.Debian +++ b/debian/README.Debian @@ -1,13 +1,14 @@ -Read this file first for a brief overview of the new versions of login -and passwd. +Read this file first for a brief overview of the current version +of passwd. ---Shadow passwords The command `shadowconfig on' will turn on shadow password support. -`shadowconfig off' will turn it back off. If you turn on shadow -password support, you'll gain the ability to set password ages and -expirations with chage(1). +This is the default. Turning off shadow passwords is not supported +anymore. +Together with shadow passwords, you get the ability to set password ages +and expirations with chage(1). NOTE: If you use the nscd package, you may have problems with a slight delay in updating the password information. You may notice @@ -27,7 +28,7 @@ support. PAM documentation is available in several formats in the libpam-doc package. ----MD5 Encryption +---Encryption This is enabled now using the /etc/pam.d/* files. Examples are given. diff --git a/debian/passwd.manpages b/debian/passwd.manpages index 0c09579f..772d43bb 100644 --- a/debian/passwd.manpages +++ b/debian/passwd.manpages @@ -21,7 +21,6 @@ usr/share/man/*/man8/newusers.8 usr/share/man/*/man8/pwck.8 usr/share/man/*/man8/pwconv.8 usr/share/man/*/man8/pwunconv.8 -usr/share/man/*/man8/shadowconfig.8 usr/share/man/*/man8/useradd.8 usr/share/man/*/man8/userdel.8 usr/share/man/*/man8/usermod.8 diff --git a/debian/patches/debian/Document-the-shadowconfig-utility.patch b/debian/patches/debian/Document-the-shadowconfig-utility.patch index fe4901e2..ae3e2ae3 100644 --- a/debian/patches/debian/Document-the-shadowconfig-utility.patch +++ b/debian/patches/debian/Document-the-shadowconfig-utility.patch @@ -6,19 +6,10 @@ Status wrt upstream: The shadowconfig utility is Debian-specific. The man page is Debian-specific, but it used to be distributed by upstream. --- - man/Makefile.am | 1 + - man/fr/Makefile.am | 1 + - man/fr/man8/shadowconfig.8 | 26 ++++++++++++++++++++++++++ - man/ja/Makefile.am | 1 + - man/ja/man8/shadowconfig.8 | 25 +++++++++++++++++++++++++ - man/man8/shadowconfig.8 | 39 +++++++++++++++++++++++++++++++++++++++ - man/pl/Makefile.am | 1 + - man/pl/man8/shadowconfig.8 | 27 +++++++++++++++++++++++++++ - 8 files changed, 121 insertions(+) - create mode 100644 man/fr/man8/shadowconfig.8 - create mode 100644 man/ja/man8/shadowconfig.8 + man/Makefile.am | 1 + + man/man8/shadowconfig.8 | 34 ++++++++++++++++++++++++++++++++++ + 2 files changed, 35 insertions(+) create mode 100644 man/man8/shadowconfig.8 - create mode 100644 man/pl/man8/shadowconfig.8 diff --git a/man/Makefile.am b/man/Makefile.am index 1405509..0e88fea 100644 @@ -32,116 +23,25 @@ index 1405509..0e88fea 100644 man1/sg.1 \ man3/shadow.3 \ man5/shadow.5 \ -diff --git a/man/fr/Makefile.am b/man/fr/Makefile.am -index 2365e23..e175a15 100644 ---- a/man/fr/Makefile.am -+++ b/man/fr/Makefile.am -@@ -31,6 +31,7 @@ man_MANS = \ - man8/pwck.8 \ - man8/pwconv.8 \ - man8/pwunconv.8 \ -+ man8/shadowconfig.8 \ - man1/sg.1 \ - man3/shadow.3 \ - man5/shadow.5 \ -diff --git a/man/fr/man8/shadowconfig.8 b/man/fr/man8/shadowconfig.8 -new file mode 100644 -index 0000000..784da70 ---- /dev/null -+++ b/man/fr/man8/shadowconfig.8 -@@ -0,0 +1,26 @@ -+.\" This file was generated with po4a. Translate the source file. -+.\" -+.\"$Id: shadowconfig.8,v 1.4 2001/08/23 23:10:48 kloczek Exp $ -+.TH SHADOWCONFIG 8 "19 avril 1997" "Debian GNU/Linux" -+.SH NOM -+shadowconfig \- active ou désactive les mots de passe cachés -+.SH SYNOPSIS -+\fBshadowconfig\fP \fIon\fP | \fIoff\fP -+.SH DESCRIPTION -+.PP -+\fBshadowconfig on\fP active les mots de passe cachés («\ shadow passwords\ »)\ ; \fBshadowconfig off\fP les désactive. \fBShadowconfig\fP affiche un message -+d'erreur et quitte avec une valeur de retour non nulle s'il rencontre -+quelque chose d'inattendu. Dans ce cas, vous devrez corriger l'erreur avant -+de recommencer. -+ -+Activer les mots de passe cachés lorsqu'ils sont déjà activés, ou les -+désactiver lorsqu'ils ne sont pas actifs est sans effet. -+ -+Lisez \fI/usr/share/doc/passwd/README.Debian\fP pour une brève introduction aux -+mots de passe cachés et à leurs fonctionnalités. -+ -+Notez que désactiver puis réactiver les mots de passe cachés aura pour -+conséquence la perte des informations d'âge sur les mots de passe. -+.SH TRADUCTION -+Nicolas FRANÇOIS, 2004. -+Veuillez signaler toute erreur à <\fIdebian\-l10\-french@lists.debian.org\fR>. -diff --git a/man/ja/Makefile.am b/man/ja/Makefile.am -index b759726..b9f1df0 100644 ---- a/man/ja/Makefile.am -+++ b/man/ja/Makefile.am -@@ -26,6 +26,7 @@ man_MANS = \ - man8/pwck.8 \ - man8/pwconv.8 \ - man8/pwunconv.8 \ -+ man8/shadowconfig.8 \ - man1/sg.1 \ - man5/shadow.5 \ - man1/su.1 \ -diff --git a/man/ja/man8/shadowconfig.8 b/man/ja/man8/shadowconfig.8 -new file mode 100644 -index 0000000..a75c6f7 ---- /dev/null -+++ b/man/ja/man8/shadowconfig.8 -@@ -0,0 +1,25 @@ -+.\" all right reserved, -+.\" Translated Tue Oct 30 11:59:11 JST 2001 -+.\" by Maki KURODA -+.\" -+.TH SHADOWCONFIG 8 "19 Apr 1997" "Debian GNU/Linux" -+.SH 名前 -+shadowconfig \- shadow パスワードの設定をオン及びオフに切替える -+.SH 書式 -+.B "shadowconfig" -+.IR on " | " off -+.SH 説明 -+.PP -+.B shadowconfig on -+は shadow パスワードを有効にする。 -+.B shadowconfig off -+は shadow パスワードを無効にする。 -+.B shadowconfig -+は何らかの間違いがあると、エラーメッセージを表示し、 -+ゼロではない返り値を返す。 -+もしそのようなことが起こった場合、エラーを修正し、再度実行しなければならない。 -+shadow パスワードの設定がすでにオンの場合にオンに設定したり、 -+すでにオフの場合にオフに設定しても、何の影響もない。 -+ -+.I /usr/share/doc/passwd/README.debian.gz -+には shadow パスワードとそれに関する特徴の簡単な紹介が書かれている。 diff --git a/man/man8/shadowconfig.8 b/man/man8/shadowconfig.8 new file mode 100644 -index 0000000..ec11fc6 +index 0000000..a463a92 --- /dev/null +++ b/man/man8/shadowconfig.8 -@@ -0,0 +1,39 @@ -+.TH shadowconfig 8 2025-01-01 "Debian shadow-utils" +@@ -0,0 +1,34 @@ ++.TH shadowconfig 8 2025-02-17 "Debian shadow-utils" +.SH Name -+shadowconfig \- toggle shadow passwords on and off ++shadowconfig \- turn shadow passwords on +. +. +.SH Synopsis -+.SY shadowconfig -+.BR on | off ++.SY shadowconfig on +.YS +. +. +.SH Description +.I shadowconfig\ on +will turn shadow passwords on. -+.P -+.I shadowconfig\ off -+will turn shadow passwords off. +. +. +.SH Errors @@ -150,62 +50,16 @@ index 0000000..ec11fc6 +if it finds anything awry. +If that happens, +you should correct the error and run it again. -+Turning shadow passwords on when they are already on, -+or off when they are already off, ++Turning shadow passwords on when they are already on +is harmless. +. +. +.SH Caveats -+Turning shadow passwords off and on again -+will lose all password aging information. ++Turning shadow passwords off using shadowconfig ++is not supported anymore. +. +. +.SH See also +Read +.I /usr/share/doc/passwd/README.Debian +for a brief introduction to shadow passwords and related features. -diff --git a/man/pl/Makefile.am b/man/pl/Makefile.am -index 2a015f3..04093ec 100644 ---- a/man/pl/Makefile.am -+++ b/man/pl/Makefile.am -@@ -17,6 +17,7 @@ man_MANS = \ - man8/logoutd.8 \ - man1/newgrp.1 \ - man1/sg.1 \ -+ man8/shadowconfig.8 \ - man3/shadow.3 \ - man8/userdel.8 \ - man8/usermod.8 \ -diff --git a/man/pl/man8/shadowconfig.8 b/man/pl/man8/shadowconfig.8 -new file mode 100644 -index 0000000..2016c9f ---- /dev/null -+++ b/man/pl/man8/shadowconfig.8 -@@ -0,0 +1,27 @@ -+.\" $Id: shadowconfig.8,v 1.3 2001/08/23 23:10:51 kloczek Exp $ -+.\" {PTM/WK/1999-09-14} -+.TH SHADOWCONFIG 8 "19 kwietnia 1997" "Debian GNU/Linux" -+.SH NAZWA -+shadowconfig - przełącza ochronę haseł i grup przez pliki shadow -+.SH SKŁADNIA -+.B "shadowconfig" -+.IR on " | " off -+.SH OPIS -+.PP -+.B shadowconfig on -+włącza ochronę haseł i grup przez dodatkowe, przesłaniane pliki (shadow); -+.B shadowconfig off -+wyłącza dodatkowe pliki haseł i grup. -+.B shadowconfig -+wyświetla komunikat o błędzie i kończy pracę z niezerowym kodem jeśli -+znajdzie coś nieprawidłowego. W takim wypadku powinieneś poprawić błąd -+.\" if it finds anything awry. -+i uruchomić program ponownie. -+ -+Włączenie ochrony haseł, gdy jest ona już włączona lub jej wyłączenie, -+gdy jest wyłączona jest nieszkodliwe. -+ -+Przeczytaj -+.IR /usr/share/doc/passwd/README.debian.gz , -+gdzie znajdziesz krótkie wprowadzenie do ochrony haseł z użyciem dodatkowych -+plików haseł przesłanianych (shadow passwords) i związanych tematów. diff --git a/debian/patches/debian/Stop-building-programs-we-do-not-install.patch b/debian/patches/debian/Stop-building-programs-we-do-not-install.patch index 1b48df7b..76802269 100644 --- a/debian/patches/debian/Stop-building-programs-we-do-not-install.patch +++ b/debian/patches/debian/Stop-building-programs-we-do-not-install.patch @@ -176,10 +176,10 @@ index d3a6d6c..59602aa 100644 man8/userdel.8 \ man8/usermod.8 \ diff --git a/man/fr/Makefile.am b/man/fr/Makefile.am -index e175a15..d4cb276 100644 +index 2365e23..6cbaadc 100644 --- a/man/fr/Makefile.am +++ b/man/fr/Makefile.am -@@ -8,35 +8,25 @@ man_MANS = \ +@@ -8,34 +8,24 @@ man_MANS = \ man8/chpasswd.8 \ man1/chsh.1 \ man1/expiry.1 \ @@ -206,7 +206,6 @@ index e175a15..d4cb276 100644 man8/pwck.8 \ man8/pwconv.8 \ man8/pwunconv.8 \ - man8/shadowconfig.8 \ - man1/sg.1 \ man3/shadow.3 \ man5/shadow.5 \ @@ -283,7 +282,7 @@ index 736576c..3312232 100644 man8/userdel.8 \ man8/usermod.8 \ diff --git a/man/ja/Makefile.am b/man/ja/Makefile.am -index b9f1df0..07fa208 100644 +index b759726..1e22da2 100644 --- a/man/ja/Makefile.am +++ b/man/ja/Makefile.am @@ -7,8 +7,6 @@ man_MANS = \ @@ -295,7 +294,7 @@ index b9f1df0..07fa208 100644 man1/gpasswd.1 \ man8/groupadd.8 \ man8/groupdel.8 \ -@@ -16,10 +14,7 @@ man_MANS = \ +@@ -16,20 +14,14 @@ man_MANS = \ man8/grpck.8 \ man8/grpconv.8 \ man8/grpunconv.8 \ @@ -306,10 +305,9 @@ index b9f1df0..07fa208 100644 man8/newusers.8 \ man1/passwd.1 \ man5/passwd.5 \ -@@ -27,10 +22,7 @@ man_MANS = \ + man8/pwck.8 \ man8/pwconv.8 \ man8/pwunconv.8 \ - man8/shadowconfig.8 \ - man1/sg.1 \ man5/shadow.5 \ - man1/su.1 \ @@ -332,7 +330,7 @@ index 4f73651..0f17a17 100644 man8/vipw.8 # newgrp.1 must be updated diff --git a/man/pl/Makefile.am b/man/pl/Makefile.am -index 04093ec..ba91f47 100644 +index 2a015f3..02f4533 100644 --- a/man/pl/Makefile.am +++ b/man/pl/Makefile.am @@ -6,17 +6,11 @@ man_MANS = \ @@ -350,9 +348,9 @@ index 04093ec..ba91f47 100644 - man8/logoutd.8 \ - man1/newgrp.1 \ - man1/sg.1 \ - man8/shadowconfig.8 \ man3/shadow.3 \ man8/userdel.8 \ + man8/usermod.8 \ diff --git a/man/ru/Makefile.am b/man/ru/Makefile.am index 845a603..9afcb22 100644 --- a/man/ru/Makefile.am diff --git a/debian/shadowconfig b/debian/shadowconfig index b462597a..807052c0 100644 --- a/debian/shadowconfig +++ b/debian/shadowconfig @@ -1,5 +1,5 @@ #!/bin/sh -# turn shadow passwords on or off on a Debian system +# turn shadow passwords on on a Debian system set -e @@ -36,16 +36,6 @@ shadowon () { chmod 640 "${DPKG_ROOT}/etc/shadow" "${DPKG_ROOT}/etc/gshadow" } -shadowoff () { - set -e - pwck -q -r - grpck -r - pwunconv - grpunconv - # sometimes the passwd perms get munged - chown root:root /etc/passwd /etc/group - chmod 644 /etc/passwd /etc/group -} case "$1" in "on") @@ -57,14 +47,10 @@ case "$1" in fi ;; "off") - if shadowoff ; then - echo Shadow passwords are now off. - else - echo Please correct the error and rerun \`$0 off\' - exit 1 - fi + echo E: Turning shadow passwords off is no longer supported. + exit 1 ;; *) - echo Usage: $0 on \| off + echo Usage: $0 on ;; esac