aboutsummaryrefslogtreecommitdiff
path: root/debian/patches/026_pam_unix_passwd_unknown_user
diff options
context:
space:
mode:
authorSam Hartman <hartmans@debian.org>2023-09-11 14:25:48 -0600
committerSam Hartman <hartmans@debian.org>2023-09-11 14:25:48 -0600
commit7ae7ed41ad1d32a258fd8ab2c48a0c2920f06db7 (patch)
treea147944bd7566bdd7231f249a777fcc1084b7d37 /debian/patches/026_pam_unix_passwd_unknown_user
parent42408448b00a7a2150b5853dc4f63296b6827e0e (diff)
downloadpam-7ae7ed41ad1d32a258fd8ab2c48a0c2920f06db7.tar.gz
pam-7ae7ed41ad1d32a258fd8ab2c48a0c2920f06db7.tar.bz2
pam-7ae7ed41ad1d32a258fd8ab2c48a0c2920f06db7.zip
WIP initial set of 1.5.3 patches
Just an initial rebase of the patches against 1.5.3. * I'm not sure I handled pam_wheel correctly * I removed most of the generated nroff man page patches; my plan is to add a single patch at the end that includes the nroff manpage updates.
Diffstat (limited to 'debian/patches/026_pam_unix_passwd_unknown_user')
-rw-r--r--debian/patches/026_pam_unix_passwd_unknown_user23
1 files changed, 14 insertions, 9 deletions
diff --git a/debian/patches/026_pam_unix_passwd_unknown_user b/debian/patches/026_pam_unix_passwd_unknown_user
index d277fee9..45967e1d 100644
--- a/debian/patches/026_pam_unix_passwd_unknown_user
+++ b/debian/patches/026_pam_unix_passwd_unknown_user
@@ -1,11 +1,16 @@
-Description: distinguish between password manipulation failure and missing user.
-Author: Martin Schwenke <martin@meltin.net>
+From: Martin Schwenke <martin@meltin.net>
+Date: Mon, 11 Sep 2023 14:00:42 -0600
+Subject: distinguish between password manipulation failure and missing user.
-Index: pam/modules/pam_unix/passverify.c
-===================================================================
---- pam.orig/modules/pam_unix/passverify.c
-+++ pam/modules/pam_unix/passverify.c
-@@ -801,7 +801,7 @@
+---
+ modules/pam_unix/passverify.c | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/modules/pam_unix/passverify.c b/modules/pam_unix/passverify.c
+index 81b10d8..7ff8bf0 100644
+--- a/modules/pam_unix/passverify.c
++++ b/modules/pam_unix/passverify.c
+@@ -804,7 +804,7 @@ PAMH_ARG_DECL(int unix_update_passwd,
struct passwd *tmpent = NULL;
struct stat st;
FILE *pwfile, *opwfile;
@@ -14,7 +19,7 @@ Index: pam/modules/pam_unix/passverify.c
int oldmask;
#ifdef WITH_SELINUX
char *prev_context_raw = NULL;
-@@ -872,6 +872,7 @@
+@@ -875,6 +875,7 @@ PAMH_ARG_DECL(int unix_update_passwd,
tmpent->pw_passwd = assigned_passwd.charp;
err = 0;
@@ -22,7 +27,7 @@ Index: pam/modules/pam_unix/passverify.c
}
if (putpwent(tmpent, pwfile)) {
D(("error writing entry to password file: %m"));
-@@ -914,7 +915,7 @@
+@@ -917,7 +918,7 @@ done:
return PAM_SUCCESS;
} else {
unlink(PW_TMPFILE);