diff options
| author | vorlon <Unknown> | 2007-08-30 08:36:44 +0000 |
|---|---|---|
| committer | vorlon <Unknown> | 2007-08-30 08:36:44 +0000 |
| commit | 650e2ba02ea670a03a69037d890f7a39b92d3289 (patch) | |
| tree | 762fbc957371b432914e1cf307112cd3658149da | |
| parent | be1cd96e5fcb1078d8f6392fbcb937cfd7b78686 (diff) | |
| download | pam-650e2ba02ea670a03a69037d890f7a39b92d3289.tar.gz pam-650e2ba02ea670a03a69037d890f7a39b92d3289.tar.bz2 pam-650e2ba02ea670a03a69037d890f7a39b92d3289.zip | |
Split 047_pam_limits_chroot_string_value up between
008_modules_pam_limits_chroot and 029_pam_limits_capabilites
| -rw-r--r-- | changelog | 2 | ||||
| -rw-r--r-- | patches-applied/008_modules_pam_limits_chroot | 12 | ||||
| -rw-r--r-- | patches-applied/029_pam_limits_capabilities | 9 | ||||
| -rw-r--r-- | patches-applied/047_pam_limits_chroot_string_value | 16 | ||||
| -rw-r--r-- | patches-applied/series | 1 |
5 files changed, 23 insertions, 17 deletions
@@ -28,6 +28,8 @@ pam (0.99.7.1-4) UNRELEASED; urgency=low * Drop patch 064_pam_unix_cracklib_dictpath, which is not needed now that we define CRACKLIB_DICTS in debian/rules. * Drop patch 063_paswd_segv, superseded by a different upstream fix + * Split 047_pam_limits_chroot_string_value up between + 008_modules_pam_limits_chroot and 029_pam_limits_capabilites -- Steve Langasek <vorlon@debian.org> Thu, 30 Aug 2007 01:23:29 -0700 diff --git a/patches-applied/008_modules_pam_limits_chroot b/patches-applied/008_modules_pam_limits_chroot index dcc97504..b00ba90f 100644 --- a/patches-applied/008_modules_pam_limits_chroot +++ b/patches-applied/008_modules_pam_limits_chroot @@ -36,6 +36,18 @@ Index: Linux-PAM/modules/pam_limits/pam_limits.c } else { pam_syslog(pamh, LOG_DEBUG, "unknown limit item '%s'", lim_item); return; +@@ -343,9 +349,9 @@ + pam_syslog(pamh, LOG_DEBUG, + "wrong limit value '%s' for limit type '%s'", + lim_value, lim_type); +- return; ++ return; + } +- } else { ++ } else if (limit_item != LIMIT_CHROOT) { + #ifdef __USE_FILE_OFFSET64 + rlimit_value = strtoull (lim_value, &endptr, 10); + #else @@ -392,7 +398,9 @@ break; } diff --git a/patches-applied/029_pam_limits_capabilities b/patches-applied/029_pam_limits_capabilities index 64bc5967..a064cc1c 100644 --- a/patches-applied/029_pam_limits_capabilities +++ b/patches-applied/029_pam_limits_capabilities @@ -81,6 +81,15 @@ Index: Linux-PAM/modules/pam_limits/pam_limits.c } else { pam_syslog(pamh, LOG_DEBUG, "unknown limit item '%s'", lim_item); return; +@@ -387,7 +402,7 @@ + lim_value, lim_type); + return; + } +- } else if (limit_item != LIMIT_CHROOT) { ++ } else if (limit_item != LIMIT_CHROOT && limit_item != LIMIT_CAPS) { + #ifdef __USE_FILE_OFFSET64 + rlimit_value = strtoull (lim_value, &endptr, 10); + #else @@ -438,6 +453,14 @@ if (limit_item == LIMIT_CHROOT) diff --git a/patches-applied/047_pam_limits_chroot_string_value b/patches-applied/047_pam_limits_chroot_string_value deleted file mode 100644 index e82c0c77..00000000 --- a/patches-applied/047_pam_limits_chroot_string_value +++ /dev/null @@ -1,16 +0,0 @@ -Index: Linux-PAM/modules/pam_limits/pam_limits.c -=================================================================== ---- Linux-PAM/modules/pam_limits/pam_limits.c.orig -+++ Linux-PAM/modules/pam_limits/pam_limits.c -@@ -402,9 +402,9 @@ - pam_syslog(pamh, LOG_DEBUG, - "wrong limit value '%s' for limit type '%s'", - lim_value, lim_type); -- return; -+ return; - } -- } else { -+ } else if (limit_item != LIMIT_CHROOT && limit_item != LIMIT_CAPS) { - #ifdef __USE_FILE_OFFSET64 - rlimit_value = strtoull (lim_value, &endptr, 10); - #else diff --git a/patches-applied/series b/patches-applied/series index e7b48e7f..4a321c3a 100644 --- a/patches-applied/series +++ b/patches-applied/series @@ -18,7 +18,6 @@ hurd_no_setfsuid -p0 043_pam_unix_unknown_user_not_alert -p0 045_pam_dispatch_jump_is_ignore -p0 046_pam_group_example -p0 -047_pam_limits_chroot_string_value -p0 049_pam_unix_sane_locking -p0 054_pam_security_abstract_securetty_handling -p0 055_pam_unix_nullok_secure -p0 |