diff options
| author | Steve Langasek <vorlon@debian.org> | 2011-06-21 11:58:16 -0700 |
|---|---|---|
| committer | Steve Langasek <vorlon@debian.org> | 2019-01-08 22:11:30 -0800 |
| commit | 56f95db13983171989e55e0cca89fba97b3d7876 (patch) | |
| tree | fec1641287ccac61fe03212afdc7f0acc5c1050f | |
| parent | 6a8fd96f8c1fdbed06fc27633e30e9f37d571cb0 (diff) | |
| download | pam-56f95db13983171989e55e0cca89fba97b3d7876.tar.gz pam-56f95db13983171989e55e0cca89fba97b3d7876.tar.bz2 pam-56f95db13983171989e55e0cca89fba97b3d7876.zip | |
make sure we're passing ctrl to the function if we need to check PAM_DEBUG
| -rw-r--r-- | debian/patches-applied/027_pam_limits_better_init_allow_explicit_root | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/debian/patches-applied/027_pam_limits_better_init_allow_explicit_root b/debian/patches-applied/027_pam_limits_better_init_allow_explicit_root index 1d07ed85..59c0d943 100644 --- a/debian/patches-applied/027_pam_limits_better_init_allow_explicit_root +++ b/debian/patches-applied/027_pam_limits_better_init_allow_explicit_root @@ -141,7 +141,7 @@ Index: pam-debian/modules/pam_limits/pam_limits.c + item = line + pos + 1; \ +} + -+static void parse_kernel_limits(pam_handle_t *pamh, struct pam_limit_s *pl) ++static void parse_kernel_limits(pam_handle_t *pamh, struct pam_limit_s *pl, int ctrl) +{ + int i, maxlen = 0; + FILE *limitsfile; @@ -205,7 +205,7 @@ Index: pam-debian/modules/pam_limits/pam_limits.c + fclose(limitsfile); +} + -+static int init_limits(pam_handle_t *pamh, struct pam_limit_s *pl) ++static int init_limits(pam_handle_t *pamh, struct pam_limit_s *pl, int ctrl) { int i; int retval = PAM_SUCCESS; @@ -229,7 +229,7 @@ Index: pam-debian/modules/pam_limits/pam_limits.c } +#ifdef __linux__ -+ parse_kernel_limits(pamh, pl); ++ parse_kernel_limits(pamh, pl, ctrl); +#endif + + for(i = 0; i < RLIM_NLIMITS; i++) { @@ -328,7 +328,7 @@ Index: pam-debian/modules/pam_limits/pam_limits.c } - retval = init_limits(pl); -+ retval = init_limits(pamh, pl); ++ retval = init_limits(pamh, pl, ctrl); if (retval != PAM_SUCCESS) { pam_syslog(pamh, LOG_WARNING, "cannot initialize"); return PAM_ABORT; |