diff options
| author | Steve Langasek <vorlon@debian.org> | 2008-07-27 01:18:28 -0700 |
|---|---|---|
| committer | Steve Langasek <steve.langasek@ubuntu.com> | 2019-01-03 17:28:18 -0800 |
| commit | 34f77a041c55ea3734a7b59a21ab5b7fb5d43e2a (patch) | |
| tree | cd61dc8d7c52d9719fb19865acee8af1137c29a8 /debian/patches-applied/027_pam_limits_better_init_allow_explicit_root | |
| parent | 47c98f2062c89f63656b48bd44db462317d842b9 (diff) | |
refresh patches for new upstream version
Diffstat (limited to 'debian/patches-applied/027_pam_limits_better_init_allow_explicit_root')
| -rw-r--r-- | debian/patches-applied/027_pam_limits_better_init_allow_explicit_root | 16 |
1 files changed, 8 insertions, 8 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 eae70ef1..f89bd256 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 @@ -4,7 +4,7 @@ Index: pam.deb/modules/pam_limits/pam_limits.c =================================================================== --- pam.deb.orig/modules/pam_limits/pam_limits.c +++ pam.deb/modules/pam_limits/pam_limits.c -@@ -70,6 +70,7 @@ +@@ -74,6 +74,7 @@ /* internal data */ struct pam_limit_s { @@ -12,7 +12,7 @@ Index: pam.deb/modules/pam_limits/pam_limits.c int login_limit; /* the max logins limit */ int login_limit_def; /* which entry set the login limit */ int flag_numsyslogins; /* whether to limit logins only for a -@@ -224,6 +225,7 @@ +@@ -231,6 +232,7 @@ D(("called.")); @@ -20,7 +20,7 @@ Index: pam.deb/modules/pam_limits/pam_limits.c for(i = 0; i < RLIM_NLIMITS; i++) { int r = getrlimit(i, &pl->limits[i].limit); if (r == -1) { -@@ -235,6 +237,41 @@ +@@ -242,6 +244,41 @@ pl->limits[i].supported = 1; pl->limits[i].src_soft = LIMITS_DEF_NONE; pl->limits[i].src_hard = LIMITS_DEF_NONE; @@ -62,7 +62,7 @@ Index: pam.deb/modules/pam_limits/pam_limits.c } } -@@ -517,7 +554,7 @@ +@@ -524,7 +561,7 @@ if (strcmp(uname, domain) == 0) /* this user have a limit */ process_limit(pamh, LIMITS_DEF_USER, ltype, item, value, ctrl, pl); @@ -71,7 +71,7 @@ Index: pam.deb/modules/pam_limits/pam_limits.c if (ctrl & PAM_DEBUG_ARG) { pam_syslog(pamh, LOG_DEBUG, "checking if %s is in group %s", -@@ -526,7 +563,7 @@ +@@ -533,7 +570,7 @@ if (pam_modutil_user_in_group_nam_nam(pamh, uname, domain+1)) process_limit(pamh, LIMITS_DEF_GROUP, ltype, item, value, ctrl, pl); @@ -80,7 +80,7 @@ Index: pam.deb/modules/pam_limits/pam_limits.c if (ctrl & PAM_DEBUG_ARG) { pam_syslog(pamh, LOG_DEBUG, "checking if %s is in group %s", -@@ -540,7 +577,7 @@ +@@ -547,7 +584,7 @@ process_limit(pamh, LIMITS_DEF_ALLGROUP, ltype, item, value, ctrl, pl); } @@ -89,7 +89,7 @@ Index: pam.deb/modules/pam_limits/pam_limits.c process_limit(pamh, LIMITS_DEF_DEFAULT, ltype, item, value, ctrl, pl); } else if (i == 2 && ltype[0] == '-') { /* Probably a no-limit line */ -@@ -575,6 +612,12 @@ +@@ -582,6 +619,12 @@ int status; int retval = LIMITED_OK; @@ -102,7 +102,7 @@ Index: pam.deb/modules/pam_limits/pam_limits.c for (i=0, status=LIMITED_OK; i<RLIM_NLIMITS; i++) { if (!pl->limits[i].supported) { /* skip it if its not known to the system */ -@@ -661,6 +704,8 @@ +@@ -675,6 +718,8 @@ return PAM_ABORT; } |