aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorvorlon <Unknown>2005-07-14 06:05:01 +0000
committervorlon <Unknown>2005-07-14 06:05:01 +0000
commit862c1bfc29b9e569c09e428e119723b5ba4eb7b9 (patch)
tree6c6fba3c3d6c0240bd70feb819d08caf09922445
parentc920ee5c2d400e4f668efbb02dc45d55dd188571 (diff)
downloadpam-862c1bfc29b9e569c09e428e119723b5ba4eb7b9.tar.gz
pam-862c1bfc29b9e569c09e428e119723b5ba4eb7b9.tar.bz2
pam-862c1bfc29b9e569c09e428e119723b5ba4eb7b9.zip
port patch 047 to 0.79 and apply
-rw-r--r--patches-applied/047_pam_limits_chroot_string_value17
1 files changed, 7 insertions, 10 deletions
diff --git a/patches-applied/047_pam_limits_chroot_string_value b/patches-applied/047_pam_limits_chroot_string_value
index 21348091..06439b66 100644
--- a/patches-applied/047_pam_limits_chroot_string_value
+++ b/patches-applied/047_pam_limits_chroot_string_value
@@ -1,17 +1,14 @@
Index: Linux-PAM/modules/pam_limits/pam_limits.c
===================================================================
-RCS file: /afs/sipb/project/debian/cvs/pam/Linux-PAM/modules/pam_limits/pam_limits.c,v
-retrieving revision 1.18
-diff -u -r1.18 pam_limits.c
---- Linux-PAM/modules/pam_limits/pam_limits.c 4 May 2003 02:30:17 -0000 1.18
-+++ Linux-PAM/modules/pam_limits/pam_limits.c 21 Jun 2003 20:35:38 -0000
-@@ -404,7 +404,8 @@
- limit_value = strtol(lim_value, (char **) endptr, 10);
+--- Linux-PAM/modules/pam_limits/pam_limits.c (revision 304)
++++ Linux-PAM/modules/pam_limits/pam_limits.c (working copy)
+@@ -360,7 +360,8 @@
+ limit_value = strtol (lim_value, &endptr, 10);
/* special case value when limiting logins */
-- if (limit_value == 0 && value_orig == *endptr) { /* no chars read */
-+ if ((limit_item!=LIMIT_CHROOT)&&
-+ (limit_value == 0 && value_orig == *endptr)) { /* no chars read */
+- if (limit_value == 0 && value_orig == endptr) { /* no chars read */
++ if ((limit_item != LIMIT_CHROOT)
++ && (limit_value == 0 && value_orig == endptr)) { /* no chars read */
if (strcmp(lim_value,"-") != 0) {
_pam_log(LOG_DEBUG,"wrong limit value '%s'", lim_value);
return;