diff options
| author | Sam Hartman <hartmans@debian.org> | 2023-09-11 14:25:48 -0600 |
|---|---|---|
| committer | Sam Hartman <hartmans@debian.org> | 2023-09-11 14:25:48 -0600 |
| commit | 7ae7ed41ad1d32a258fd8ab2c48a0c2920f06db7 (patch) | |
| tree | a147944bd7566bdd7231f249a777fcc1084b7d37 /debian/patches/031_pam_include | |
| parent | 42408448b00a7a2150b5853dc4f63296b6827e0e (diff) | |
| download | pam-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/031_pam_include')
| -rw-r--r-- | debian/patches/031_pam_include | 21 |
1 files changed, 14 insertions, 7 deletions
diff --git a/debian/patches/031_pam_include b/debian/patches/031_pam_include index 16cf6d31..5b632e2a 100644 --- a/debian/patches/031_pam_include +++ b/debian/patches/031_pam_include @@ -1,14 +1,21 @@ +From: Sam Hartman <hartmans@debian.org> +Date: Mon, 11 Sep 2023 14:00:42 -0600 +Subject: _pam_include + Patch to implement an @include directive for use in pam.d config files. Authors: Jan Christoph Nordholz <hesso@pool.math.tu-berlin.de> Upstream status: not yet submitted +--- + libpam/pam_handlers.c | 36 ++++++++++++++++++++++++++++++++---- + 1 file changed, 32 insertions(+), 4 deletions(-) -Index: pam/libpam/pam_handlers.c -=================================================================== ---- pam.orig/libpam/pam_handlers.c -+++ pam/libpam/pam_handlers.c -@@ -123,6 +123,10 @@ +diff --git a/libpam/pam_handlers.c b/libpam/pam_handlers.c +index 1f1917b..c7045d2 100644 +--- a/libpam/pam_handlers.c ++++ b/libpam/pam_handlers.c +@@ -123,6 +123,10 @@ static int _pam_parse_conf_file(pam_handle_t *pamh, FILE *f module_type = PAM_T_ACCT; } else if (!strcasecmp("password", tok)) { module_type = PAM_T_PASS; @@ -19,7 +26,7 @@ Index: pam/libpam/pam_handlers.c } else { /* Illegal module type */ D(("_pam_init_handlers: bad module type: %s", tok)); -@@ -193,8 +197,10 @@ +@@ -193,8 +197,10 @@ static int _pam_parse_conf_file(pam_handle_t *pamh, FILE *f _pam_set_default_control(actions, _PAM_ACTION_BAD); } @@ -30,7 +37,7 @@ Index: pam/libpam/pam_handlers.c if (substack) { res = _pam_add_handler(pamh, PAM_HT_SUBSTACK, other, stack_level, module_type, actions, tok, -@@ -205,13 +211,35 @@ +@@ -205,13 +211,35 @@ static int _pam_parse_conf_file(pam_handle_t *pamh, FILE *f return PAM_ABORT; } } |