Control: tags -1 + patch

Please find a patch that works for me attached.

Chris


>From f34ffdc141cc0d2cf4ce55e6ff1abe124ca9c1e5 Mon Sep 17 00:00:00 2001
From: Chris Hofstaedtler <[email protected]>
Date: Mon, 15 Jun 2026 11:19:45 +0200
Subject: [PATCH] Unbreak "include" directives in 031_pam_include

Closes: #1140029
---
 debian/patches/031_pam_include | 17 +++++------------
 1 file changed, 5 insertions(+), 12 deletions(-)

diff --git a/debian/patches/031_pam_include b/debian/patches/031_pam_include
index 1a91c325..a41aaf3e 100644
--- a/debian/patches/031_pam_include
+++ b/debian/patches/031_pam_include
@@ -10,11 +10,11 @@ Updated for pam 1.7.0 by Sam Hartman <[email protected]>
 
 Upstream status: not yet submitted
 ---
- libpam/pam_handlers.c | 36 ++++++++++++++++++++++++++++++++----
- 1 file changed, 32 insertions(+), 4 deletions(-)
+ libpam/pam_handlers.c | 29 +++++++++++++++++++++++++----
+ 1 file changed, 25 insertions(+), 4 deletions(-)
 
 diff --git a/libpam/pam_handlers.c b/libpam/pam_handlers.c
-index 7fd6ce8..1df5e40 100644
+index 7fd6ce8..5ef07f4 100644
 --- a/libpam/pam_handlers.c
 +++ b/libpam/pam_handlers.c
 @@ -127,6 +127,10 @@ static int _pam_parse_conf_file(pam_handle_t *pamh, FILE *f
@@ -39,7 +39,7 @@ index 7fd6ce8..1df5e40 100644
  		if (substack) {
  		    res = _pam_add_handler(pamh, PAM_HT_SUBSTACK, other,
  				stack_level, module_type, actions, tok,
-@@ -209,13 +215,35 @@ static int _pam_parse_conf_file(pam_handle_t *pamh, FILE *f
+@@ -209,13 +215,28 @@ static int _pam_parse_conf_file(pam_handle_t *pamh, FILE *f
  			return PAM_ABORT;
  		    }
  		}
@@ -57,12 +57,7 @@ index 7fd6ce8..1df5e40 100644
 +		else if (!stat(PAM_CONFIG_D, &include_dir)
 +		         && S_ISDIR(include_dir.st_mode))
 +		{
-+		    char *include_file;
-+		    if (asprintf (&include_file, PAM_CONFIG_DF, tok) < 0) {
-+			pam_syslog(pamh, LOG_CRIT, "asprintf failed");
-+			return PAM_ABORT;
-+		    }
-+		    if (_pam_load_conf_file(pamh, include_file, this_service,
++		    if (_pam_load_conf_file(pamh, tok, this_service,
 +		                            module_type, include_level+1, stack_level + substack
  #ifdef PAM_READ_BOTH_CONFS
  					      , !other
@@ -71,10 +66,8 @@ index 7fd6ce8..1df5e40 100644
 -		    continue;
 +		       ) == PAM_SUCCESS)
 +		    {
-+			free(include_file);
 +			continue;
 +		    }
-+		    free(include_file);
 +		}
  		_pam_set_default_control(actions, _PAM_ACTION_BAD);
  		mod_path = NULL;
-- 
2.53.0

Reply via email to