aboutsummaryrefslogtreecommitdiff
path: root/debian/patches/nullok_secure-compat.patch
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/nullok_secure-compat.patch
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/nullok_secure-compat.patch')
-rw-r--r--debian/patches/nullok_secure-compat.patch21
1 files changed, 13 insertions, 8 deletions
diff --git a/debian/patches/nullok_secure-compat.patch b/debian/patches/nullok_secure-compat.patch
index d85aa9fe..a69cd05e 100644
--- a/debian/patches/nullok_secure-compat.patch
+++ b/debian/patches/nullok_secure-compat.patch
@@ -1,12 +1,17 @@
-Description: Support nullok_secure as a deprecated alias for nullok
-Author: Steve Langasek <vorlon@debian.org>
+From: Steve Langasek <vorlon@debian.org>
+Date: Mon, 11 Sep 2023 14:00:42 -0600
+Subject: Support nullok_secure as a deprecated alias for nullok
+
Last-Update: 2020-08-11
+---
+ modules/pam_unix/support.h | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
-Index: pam/modules/pam_unix/support.h
-===================================================================
---- pam.orig/modules/pam_unix/support.h
-+++ pam/modules/pam_unix/support.h
-@@ -102,8 +102,9 @@
+diff --git a/modules/pam_unix/support.h b/modules/pam_unix/support.h
+index 91e7478..e15ee98 100644
+--- a/modules/pam_unix/support.h
++++ b/modules/pam_unix/support.h
+@@ -102,8 +102,9 @@ typedef struct {
#define UNIX_YESCRYPT_PASS 32 /* new password hashes will use yescrypt */
#define UNIX_NULLRESETOK 33 /* allow empty password if password reset is enforced */
#define UNIX_OBSCURE_CHECKS 34 /* enable obscure checks on passwords */
@@ -17,7 +22,7 @@ Index: pam/modules/pam_unix/support.h
#define UNIX_DES_CRYPT(ctrl) (off(UNIX_MD5_PASS,ctrl)&&off(UNIX_BIGCRYPT,ctrl)&&off(UNIX_SHA256_PASS,ctrl)&&off(UNIX_SHA512_PASS,ctrl)&&off(UNIX_BLOWFISH_PASS,ctrl)&&off(UNIX_GOST_YESCRYPT_PASS,ctrl)&&off(UNIX_YESCRYPT_PASS,ctrl))
-@@ -147,6 +148,7 @@
+@@ -147,6 +148,7 @@ static const UNIX_Ctrls unix_args[UNIX_CTRLS_] =
/* UNIX_YESCRYPT_PASS */ {"yescrypt", _ALL_ON_^(0x6EC22000ULL), 0x40000000, 1},
/* UNIX_NULLRESETOK */ {"nullresetok", _ALL_ON_, 0x80000000, 0},
/* UNIX_OBSCURE_CHECKS */ {"obscure", _ALL_ON_, 0x100000000, 0},