summaryrefslogtreecommitdiff
path: root/debian/patches-applied/008_modules_pam_limits_chroot
diff options
context:
space:
mode:
Diffstat (limited to 'debian/patches-applied/008_modules_pam_limits_chroot')
-rw-r--r--debian/patches-applied/008_modules_pam_limits_chroot42
1 files changed, 21 insertions, 21 deletions
diff --git a/debian/patches-applied/008_modules_pam_limits_chroot b/debian/patches-applied/008_modules_pam_limits_chroot
index fd4fc3a8..acbdc1a9 100644
--- a/debian/patches-applied/008_modules_pam_limits_chroot
+++ b/debian/patches-applied/008_modules_pam_limits_chroot
@@ -1,8 +1,8 @@
-Index: pam.debian/modules/pam_limits/pam_limits.c
+Index: pam/modules/pam_limits/pam_limits.c
===================================================================
---- pam.debian.orig/modules/pam_limits/pam_limits.c
-+++ pam.debian/modules/pam_limits/pam_limits.c
-@@ -87,6 +87,7 @@
+--- pam.orig/modules/pam_limits/pam_limits.c
++++ pam/modules/pam_limits/pam_limits.c
+@@ -88,6 +88,7 @@
int flag_numsyslogins; /* whether to limit logins only for a
specific user or to count all logins */
int priority; /* the priority to run user process with */
@@ -10,7 +10,7 @@ Index: pam.debian/modules/pam_limits/pam_limits.c
struct user_limits_struct limits[RLIM_NLIMITS];
const char *conf_file;
int utmp_after_pam_call;
-@@ -97,6 +98,7 @@
+@@ -98,6 +99,7 @@
#define LIMIT_NUMSYSLOGINS RLIM_NLIMITS+2
#define LIMIT_PRI RLIM_NLIMITS+3
@@ -18,7 +18,7 @@ Index: pam.debian/modules/pam_limits/pam_limits.c
#define LIMIT_SOFT 1
#define LIMIT_HARD 2
-@@ -472,6 +474,8 @@
+@@ -484,6 +486,8 @@
pl->login_limit = -2;
pl->login_limit_def = LIMITS_DEF_NONE;
@@ -27,7 +27,7 @@ Index: pam.debian/modules/pam_limits/pam_limits.c
return retval;
}
-@@ -542,6 +546,8 @@
+@@ -554,6 +558,8 @@
pl->flag_numsyslogins = 1;
} else if (strcmp(lim_item, "priority") == 0) {
limit_item = LIMIT_PRI;
@@ -36,7 +36,7 @@ Index: pam.debian/modules/pam_limits/pam_limits.c
} else {
pam_syslog(pamh, LOG_DEBUG, "unknown limit item '%s'", lim_item);
return;
-@@ -579,9 +585,9 @@
+@@ -591,9 +597,9 @@
pam_syslog(pamh, LOG_DEBUG,
"wrong limit value '%s' for limit type '%s'",
lim_value, lim_type);
@@ -48,7 +48,7 @@ Index: pam.debian/modules/pam_limits/pam_limits.c
#ifdef __USE_FILE_OFFSET64
rlimit_value = strtoull (lim_value, &endptr, 10);
#else
-@@ -642,7 +648,11 @@
+@@ -654,7 +660,11 @@
#endif
}
@@ -61,7 +61,7 @@ Index: pam.debian/modules/pam_limits/pam_limits.c
&& (limit_item != LIMIT_NUMSYSLOGINS)
&& (limit_item != LIMIT_PRI) ) {
if (limit_type & LIMIT_SOFT) {
-@@ -986,6 +996,15 @@
+@@ -998,6 +1008,15 @@
retval |= LOGIN_ERR;
}
@@ -77,11 +77,11 @@ Index: pam.debian/modules/pam_limits/pam_limits.c
return retval;
}
-Index: pam.debian/modules/pam_limits/limits.conf.5.xml
+Index: pam/modules/pam_limits/limits.conf.5.xml
===================================================================
---- pam.debian.orig/modules/pam_limits/limits.conf.5.xml
-+++ pam.debian/modules/pam_limits/limits.conf.5.xml
-@@ -255,6 +255,12 @@
+--- pam.orig/modules/pam_limits/limits.conf.5.xml
++++ pam/modules/pam_limits/limits.conf.5.xml
+@@ -266,6 +266,12 @@
(Linux 2.6.12 and higher)</para>
</listitem>
</varlistentry>
@@ -94,11 +94,11 @@ Index: pam.debian/modules/pam_limits/limits.conf.5.xml
</variablelist>
</listitem>
</varlistentry>
-Index: pam.debian/modules/pam_limits/limits.conf.5
+Index: pam/modules/pam_limits/limits.conf.5
===================================================================
---- pam.debian.orig/modules/pam_limits/limits.conf.5
-+++ pam.debian/modules/pam_limits/limits.conf.5
-@@ -260,6 +260,11 @@
+--- pam.orig/modules/pam_limits/limits.conf.5
++++ pam/modules/pam_limits/limits.conf.5
+@@ -271,6 +271,11 @@
.RS 4
maximum realtime priority allowed for non\-privileged processes (Linux 2\&.6\&.12 and higher)
.RE
@@ -110,10 +110,10 @@ Index: pam.debian/modules/pam_limits/limits.conf.5
.RE
.PP
All items support the values
-Index: pam.debian/modules/pam_limits/limits.conf
+Index: pam/modules/pam_limits/limits.conf
===================================================================
---- pam.debian.orig/modules/pam_limits/limits.conf
-+++ pam.debian/modules/pam_limits/limits.conf
+--- pam.orig/modules/pam_limits/limits.conf
++++ pam/modules/pam_limits/limits.conf
@@ -35,6 +35,7 @@
# - msgqueue - max memory used by POSIX message queues (bytes)
# - nice - max nice priority allowed to raise to values: [-20, 19]