diff options
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 | 54 |
1 files changed, 27 insertions, 27 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 717fdd5c..5ac946f5 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 @@ -13,11 +13,11 @@ Author: Peter Paluch <peterp@frcatel.fri.utc.sk>, Ben Collins <bcollins@debian.org>, Steve Langasek <vorlon@debian.org>, Bug-Debian: http://bugs.debian.org/63230 -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 -@@ -45,6 +45,14 @@ +--- pam.orig/modules/pam_limits/pam_limits.c ++++ pam/modules/pam_limits/pam_limits.c +@@ -46,6 +46,14 @@ #include <libaudit.h> #endif @@ -32,7 +32,7 @@ Index: pam.debian/modules/pam_limits/pam_limits.c /* Module defines */ #define LINE_LENGTH 1024 -@@ -82,6 +90,7 @@ +@@ -83,6 +91,7 @@ /* internal data */ struct pam_limit_s { @@ -40,7 +40,7 @@ Index: pam.debian/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 -@@ -436,9 +445,18 @@ +@@ -448,9 +457,18 @@ { int i; int retval = PAM_SUCCESS; @@ -59,7 +59,7 @@ Index: pam.debian/modules/pam_limits/pam_limits.c for(i = 0; i < RLIM_NLIMITS; i++) { int r = getrlimit(i, &pl->limits[i].limit); if (r == -1) { -@@ -454,18 +472,68 @@ +@@ -466,18 +484,68 @@ } #ifdef __linux__ @@ -134,7 +134,7 @@ Index: pam.debian/modules/pam_limits/pam_limits.c errno = 0; pl->priority = getpriority (PRIO_PROCESS, 0); -@@ -804,7 +872,7 @@ +@@ -816,7 +884,7 @@ if (strcmp(uname, domain) == 0) /* this user have a limit */ process_limit(pamh, LIMITS_DEF_USER, ltype, item, value, ctrl, pl); @@ -143,7 +143,7 @@ Index: pam.debian/modules/pam_limits/pam_limits.c if (ctrl & PAM_DEBUG_ARG) { pam_syslog(pamh, LOG_DEBUG, "checking if %s is in group %s", -@@ -830,7 +898,7 @@ +@@ -842,7 +910,7 @@ process_limit(pamh, LIMITS_DEF_GROUP, ltype, item, value, ctrl, pl); } @@ -152,7 +152,7 @@ Index: pam.debian/modules/pam_limits/pam_limits.c if (ctrl & PAM_DEBUG_ARG) { pam_syslog(pamh, LOG_DEBUG, "checking if %s is in group %s", -@@ -864,7 +932,7 @@ +@@ -876,7 +944,7 @@ } else { switch(rngtype) { case LIMIT_RANGE_NONE: @@ -161,7 +161,7 @@ Index: pam.debian/modules/pam_limits/pam_limits.c process_limit(pamh, LIMITS_DEF_DEFAULT, ltype, item, value, ctrl, pl); break; -@@ -1050,6 +1118,8 @@ +@@ -1062,6 +1130,8 @@ return PAM_ABORT; } @@ -170,10 +170,10 @@ Index: pam.debian/modules/pam_limits/pam_limits.c retval = parse_config_file(pamh, pwd->pw_name, pwd->pw_uid, pwd->pw_gid, ctrl, pl); if (retval == PAM_IGNORE) { D(("the configuration file ('%s') has an applicable '<domain> -' entry", CONF_FILE)); -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 @@ -11,6 +11,9 @@ # - the wildcard *, for default entry # - the wildcard %, can be also used with %group syntax, @@ -192,11 +192,11 @@ Index: pam.debian/modules/pam_limits/limits.conf #* hard rss 10000 #@student hard nproc 20 #@faculty soft nproc 20 -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 -@@ -88,6 +88,11 @@ +--- pam.orig/modules/pam_limits/limits.conf.5.xml ++++ pam/modules/pam_limits/limits.conf.5.xml +@@ -96,6 +96,11 @@ </para> </listitem> </itemizedlist> @@ -208,7 +208,7 @@ Index: pam.debian/modules/pam_limits/limits.conf.5.xml </listitem> </varlistentry> -@@ -309,6 +314,7 @@ +@@ -323,6 +328,7 @@ </para> <programlisting> * soft core 0 @@ -216,11 +216,11 @@ Index: pam.debian/modules/pam_limits/limits.conf.5.xml * hard nofile 512 @student hard nproc 20 @faculty soft nproc 20 -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 -@@ -132,6 +132,10 @@ +--- pam.orig/modules/pam_limits/limits.conf.5 ++++ pam/modules/pam_limits/limits.conf.5 +@@ -142,6 +142,10 @@ \fB%:\fR\fI<gid>\fR applicable to maxlogins limit only\&. It limits the total number of logins of all users that are member of the group with the specified gid\&. .RE @@ -231,7 +231,7 @@ Index: pam.debian/modules/pam_limits/limits.conf.5 .RE .PP \fB<type>\fR -@@ -304,6 +308,7 @@ +@@ -317,6 +321,7 @@ .\} .nf * soft core 0 @@ -239,10 +239,10 @@ Index: pam.debian/modules/pam_limits/limits.conf.5 * hard nofile 512 @student hard nproc 20 @faculty soft nproc 20 -Index: pam.debian/modules/pam_limits/README +Index: pam/modules/pam_limits/README =================================================================== ---- pam.debian.orig/modules/pam_limits/README -+++ pam.debian/modules/pam_limits/README +--- pam.orig/modules/pam_limits/README ++++ pam/modules/pam_limits/README @@ -54,6 +54,7 @@ limits.conf. |