summaryrefslogtreecommitdiff
path: root/debian/patches-applied/040_pam_limits_log_failure
diff options
context:
space:
mode:
Diffstat (limited to 'debian/patches-applied/040_pam_limits_log_failure')
-rw-r--r--debian/patches-applied/040_pam_limits_log_failure36
1 files changed, 0 insertions, 36 deletions
diff --git a/debian/patches-applied/040_pam_limits_log_failure b/debian/patches-applied/040_pam_limits_log_failure
deleted file mode 100644
index 0ef703bf..00000000
--- a/debian/patches-applied/040_pam_limits_log_failure
+++ /dev/null
@@ -1,36 +0,0 @@
-Patch for Debian bug #180310
-
-Generate some (low-severity) log information whenever setrlimit() fails,
-for debugging purposes.
-
-Authors: Sam Hartman <hartmans@debian.org>
-
-Upstream status: submitted in <20070830171918.GB30563@dario.dodds.net>
-
-Index: pam/modules/pam_limits/pam_limits.c
-===================================================================
---- pam.orig/modules/pam_limits/pam_limits.c
-+++ pam/modules/pam_limits/pam_limits.c
-@@ -1108,9 +1108,19 @@
- if (pl->limits[i].limit.rlim_cur > pl->limits[i].limit.rlim_max)
- pl->limits[i].limit.rlim_cur = pl->limits[i].limit.rlim_max;
- res = setrlimit(i, &pl->limits[i].limit);
-- if (res != 0)
-- pam_syslog(pamh, LOG_ERR, "Could not set limit for '%s': %m",
-- rlimit2str(i));
-+ if (res != 0 && (i != RLIMIT_NOFILE
-+ || pl->limits[i].limit.rlim_cur != RLIM_INFINITY))
-+ {
-+ int save_errno = errno;
-+ pam_syslog(pamh, LOG_DEBUG,
-+ "Could not set limit for '%s' to soft=%d, hard=%d:"
-+ " %m; uid=%lu,euid=%lu", rlimit2str(i),
-+ pl->limits[i].limit.rlim_cur,
-+ pl->limits[i].limit.rlim_max,
-+ (unsigned long) getuid(),
-+ (unsigned long) geteuid());
-+ errno = save_errno;
-+ }
- if (res == -1 && errno == EPERM)
- continue;
- status |= res;