48 lines
1.7 KiB
Diff
48 lines
1.7 KiB
Diff
|
From 8e8a817a87782a562b69c60db108b914d742419a Mon Sep 17 00:00:00 2001
|
||
|
|
From: Alejandro Colomar <alx@kernel.org>
|
||
|
|
Date: Tue, 13 Feb 2024 13:17:44 +0100
|
||
|
|
Subject: [PATCH] etc/pam.d/Makefile.am: Fix typo
|
||
|
|
|
||
|
|
The commit we're fixing mentions that it wanted to move 'chpasswd', but
|
||
|
|
it removed 'ch_g_passwd' from 'pamd_acct_tools_files' and added
|
||
|
|
'chpasswd' to 'pamd_files'. It seems it removed the wrong thing by
|
||
|
|
accident.
|
||
|
|
|
||
|
|
Fixes: 341d80c2c751 ("Makefile: move chpasswd and newusers to pamd target")
|
||
|
|
Link: <https://github.com/shadow-maint/shadow/pull/928#discussion_r1487687347>
|
||
|
|
Link: <https://github.com/shadow-maint/shadow/issues/926#issuecomment-1941324761>
|
||
|
|
Reported-by: Dominique Leuenberger <dleuenberger@suse.com>
|
||
|
|
Reported-by: Michael Vetter <jubalh@iodoru.org>
|
||
|
|
Cc: loqs <https://github.com/loqs>
|
||
|
|
Cc: David Runge <dvzrv@archlinux.org>
|
||
|
|
Cc: Iker Pedrosa <ipedrosa@redhat.com>
|
||
|
|
Co-developed-by: Dominique Leuenberger <dleuenberger@suse.com>
|
||
|
|
Signed-off-by: Dominique Leuenberger <dleuenberger@suse.com>
|
||
|
|
Signed-off-by: Alejandro Colomar <alx@kernel.org>
|
||
|
|
---
|
||
|
|
etc/pam.d/Makefile.am | 2 +-
|
||
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||
|
|
|
||
|
|
Index: shadow-4.14.4/etc/pam.d/Makefile.am
|
||
|
|
===================================================================
|
||
|
|
--- shadow-4.14.4.orig/etc/pam.d/Makefile.am
|
||
|
|
+++ shadow-4.14.4/etc/pam.d/Makefile.am
|
||
|
|
@@ -12,7 +12,7 @@ pamd_files = \
|
||
|
|
|
||
|
|
pamd_acct_tools_files = \
|
||
|
|
chage \
|
||
|
|
- chpasswd \
|
||
|
|
+ chgpasswd \
|
||
|
|
groupadd \
|
||
|
|
groupdel \
|
||
|
|
groupmod \
|
||
|
|
Index: shadow-4.14.4/etc/pam.d/chgpasswd
|
||
|
|
===================================================================
|
||
|
|
--- /dev/null
|
||
|
|
+++ shadow-4.14.4/etc/pam.d/chgpasswd
|
||
|
|
@@ -0,0 +1,4 @@
|
||
|
|
+#%PAM-1.0
|
||
|
|
+auth sufficient pam_rootok.so
|
||
|
|
+account required pam_permit.so
|
||
|
|
+password include system-auth
|