diff options
| author | vorlon <Unknown> | 2007-08-19 12:29:47 +0000 |
|---|---|---|
| committer | vorlon <Unknown> | 2007-08-19 12:29:47 +0000 |
| commit | 9213a6d2fa37a1eaab9c3ffb04263a2a95293f62 (patch) | |
| tree | 3f0609c927a36f3d3b4f2c25352746a5dfe52ef3 | |
| parent | 126719f9161d567c98ebea9aaae8c64bc8db7264 (diff) | |
| download | pam-9213a6d2fa37a1eaab9c3ffb04263a2a95293f62.tar.gz pam-9213a6d2fa37a1eaab9c3ffb04263a2a95293f62.tar.bz2 pam-9213a6d2fa37a1eaab9c3ffb04263a2a95293f62.zip | |
Refresh for new upstream version
| -rw-r--r-- | patches-applied/046_pam_group_example | 2 | ||||
| -rw-r--r-- | patches-applied/047_pam_limits_chroot_string_value | 16 |
2 files changed, 9 insertions, 9 deletions
diff --git a/patches-applied/046_pam_group_example b/patches-applied/046_pam_group_example index e9ea5a92..dd79e790 100644 --- a/patches-applied/046_pam_group_example +++ b/patches-applied/046_pam_group_example @@ -2,7 +2,7 @@ Index: Linux-PAM/modules/pam_group/group.conf =================================================================== --- Linux-PAM/modules/pam_group/group.conf.orig +++ Linux-PAM/modules/pam_group/group.conf -@@ -45,16 +45,17 @@ +@@ -84,16 +84,17 @@ # #xsh;tty*&!ttyp*;us;Al0000-2400;floppy diff --git a/patches-applied/047_pam_limits_chroot_string_value b/patches-applied/047_pam_limits_chroot_string_value index c8289c0e..e82c0c77 100644 --- a/patches-applied/047_pam_limits_chroot_string_value +++ b/patches-applied/047_pam_limits_chroot_string_value @@ -2,15 +2,15 @@ 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 -@@ -417,9 +417,9 @@ - if (int_value == 0 && value_orig == endptr) { - _pam_log(LOG_DEBUG, "wrong limit value '%s' for limit type '%s'", - lim_value, lim_type); +@@ -402,9 +402,9 @@ + pam_syslog(pamh, LOG_DEBUG, + "wrong limit value '%s' for limit type '%s'", + lim_value, lim_type); - return; -+ return; ++ return; } - } else { + } else if (limit_item != LIMIT_CHROOT && limit_item != LIMIT_CAPS) { - rlimit_value = strtoul (lim_value, &endptr, 10); - if (rlimit_value == 0 && value_orig == endptr) { - _pam_log(LOG_DEBUG, "wrong limit value '%s' for limit type '%s'", + #ifdef __USE_FILE_OFFSET64 + rlimit_value = strtoull (lim_value, &endptr, 10); + #else |