diff options
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/patches-applied/008_modules_pam_limits_chroot | 167 | ||||
| -rw-r--r-- | debian/patches-applied/021_nis_cleanup | 12 |
2 files changed, 80 insertions, 99 deletions
diff --git a/debian/patches-applied/008_modules_pam_limits_chroot b/debian/patches-applied/008_modules_pam_limits_chroot index f2d3cc26..170ed73b 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.deb/modules/pam_limits/pam_limits.c =================================================================== ---- pam.debian.orig/modules/pam_limits/pam_limits.c -+++ pam.debian/modules/pam_limits/pam_limits.c -@@ -75,6 +75,7 @@ +--- pam.deb.orig/modules/pam_limits/pam_limits.c ++++ pam.deb/modules/pam_limits/pam_limits.c +@@ -79,6 +79,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; -@@ -85,6 +86,7 @@ +@@ -89,6 +90,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 -@@ -243,6 +245,8 @@ +@@ -250,6 +252,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; } -@@ -313,6 +317,8 @@ +@@ -320,6 +324,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; -@@ -350,9 +356,9 @@ +@@ -357,9 +363,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 -@@ -413,7 +419,9 @@ +@@ -420,7 +426,9 @@ break; } @@ -59,7 +59,7 @@ Index: pam.debian/modules/pam_limits/pam_limits.c && (limit_item != LIMIT_NUMSYSLOGINS) && (limit_item != LIMIT_PRI) ) { if (limit_type & LIMIT_SOFT) { -@@ -601,6 +609,13 @@ +@@ -615,6 +623,13 @@ retval |= LOGIN_ERR; } @@ -73,10 +73,10 @@ Index: pam.debian/modules/pam_limits/pam_limits.c return retval; } -Index: pam.debian/modules/pam_limits/limits.conf.5.xml +Index: pam.deb/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 +--- pam.deb.orig/modules/pam_limits/limits.conf.5.xml ++++ pam.deb/modules/pam_limits/limits.conf.5.xml @@ -224,6 +224,12 @@ (Linux 2.6.12 and higher)</para> </listitem> @@ -90,140 +90,121 @@ Index: pam.debian/modules/pam_limits/limits.conf.5.xml </variablelist> </listitem> </varlistentry> -Index: pam.debian/modules/pam_limits/limits.conf.5 +Index: pam.deb/modules/pam_limits/limits.conf.5 =================================================================== ---- pam.debian.orig/modules/pam_limits/limits.conf.5 -+++ pam.debian/modules/pam_limits/limits.conf.5 +--- pam.deb.orig/modules/pam_limits/limits.conf.5 ++++ pam.deb/modules/pam_limits/limits.conf.5 @@ -1,17 +1,17 @@ .\" Title: limits.conf .\" Author: --.\" Generator: DocBook XSL Stylesheets v1.72.0 <http://docbook.sf.net/> --.\" Date: 08/30/2007 +-.\" Generator: DocBook XSL Stylesheets v1.73.1 <http://docbook.sf.net/> +-.\" Date: 01/08/2008 +.\" Generator: DocBook XSL Stylesheets v1.73.2 <http://docbook.sf.net/> -+.\" Date: 07/22/2008 ++.\" Date: 07/26/2008 .\" Manual: Linux-PAM Manual .\" Source: Linux-PAM Manual .\" --.TH "LIMITS.CONF" "5" "08/30/2007" "Linux\-PAM Manual" "Linux\-PAM Manual" -+.TH "LIMITS\.CONF" "5" "07/22/2008" "Linux-PAM Manual" "Linux\-PAM Manual" +-.TH "LIMITS\.CONF" "5" "01/08/2008" "Linux-PAM Manual" "Linux\-PAM Manual" ++.TH "LIMITS\&.CONF" "5" "07/26/2008" "Linux-PAM Manual" "Linux\-PAM Manual" .\" disable hyphenation .nh .\" disable justification (adjust text to left margin only) .ad l .SH "NAME" --limits.conf \- configuration file for the pam_limits module -+limits.conf - configuration file for the pam_limits module +-limits.conf - configuration file for the pam_limits module ++limits.conf \- configuration file for the pam_limits module .SH "DESCRIPTION" .PP The syntax of the lines is as follows: -@@ -26,46 +26,49 @@ - .PP - \fB<domain>\fR - .RS 4 -+.sp - .RS 4 - \h'-04'\(bu\h'+03'a username - .RE -+.sp +@@ -34,19 +34,19 @@ .RS 4 \h'-04'\(bu\h'+03'a groupname, with \fB@group\fR --syntax. This should not be confused with netgroups. -+syntax\. This should not be confused with netgroups\. +-syntax\. This should not be confused with netgroups\. ++syntax\&. This should not be confused with netgroups\&. .RE -+.sp + .sp .RS 4 \h'-04'\(bu\h'+03'the wildcard --\fB*\fR, for default entry. -+\fB*\fR, for default entry\. +-\fB*\fR, for default entry\. ++\fB*\fR, for default entry\&. .RE -+.sp + .sp .RS 4 \h'-04'\(bu\h'+03'the wildcard \fB%\fR, for maxlogins limit only, can also be used with \fI%group\fR --syntax. -+syntax\. +-syntax\. ++syntax\&. .RE .RE .PP - \fB<type>\fR - .RS 4 --.RS 4 - .PP - \fBhard\fR +@@ -57,18 +57,18 @@ .RS 4 for enforcing \fBhard\fR --resource limits. These limits are set by the superuser and enforced by the Kernel. The user cannot raise his requirement of system resources above such values. -+resource limits\. These limits are set by the superuser and enforced by the Kernel\. The user cannot raise his requirement of system resources above such values\. +-resource limits\. These limits are set by the superuser and enforced by the Kernel\. The user cannot raise his requirement of system resources above such values\. ++resource limits\&. These limits are set by the superuser and enforced by the Kernel\&. The user cannot raise his requirement of system resources above such values\&. .RE .PP \fBsoft\fR .RS 4 for enforcing \fBsoft\fR --resource limits. These limits are ones that the user can move up or down within the permitted range by any pre\-exisiting -+resource limits\. These limits are ones that the user can move up or down within the permitted range by any pre\-exisiting +-resource limits\. These limits are ones that the user can move up or down within the permitted range by any pre\-existing ++resource limits\&. These limits are ones that the user can move up or down within the permitted range by any pre\-existing \fBhard\fR --limits. The values specified with this token can be thought of as -+limits\. The values specified with this token can be thought of as +-limits\. The values specified with this token can be thought of as ++limits\&. The values specified with this token can be thought of as \fIdefault\fR --values, for normal system usage. -+values, for normal system usage\. +-values, for normal system usage\. ++values, for normal system usage\&. .RE .PP \fB\-\fR -@@ -74,16 +77,14 @@ +@@ -77,9 +77,9 @@ \fBsoft\fR and \fBhard\fR --resource limits together. -+resource limits together\. +-resource limits together\. ++resource limits together\&. .sp --Note, if you specify a type of '\-' but neglect to supply the item and value fields then the module will never enforce any limits on the specified user/group etc. . --.RE -+Note, if you specify a type of \'\-\' but neglect to supply the item and value fields then the module will never enforce any limits on the specified user/group etc\. \. +-Note, if you specify a type of \'\-\' but neglect to supply the item and value fields then the module will never enforce any limits on the specified user/group etc\. \. ++Note, if you specify a type of \'\-\' but neglect to supply the item and value fields then the module will never enforce any limits on the specified user/group etc\&. \&. .RE .RE .PP - \fB<item>\fR - .RS 4 --.RS 4 - .PP - \fBcore\fR - .RS 4 -@@ -153,48 +154,52 @@ +@@ -154,47 +154,52 @@ .PP \fBlocks\fR .RS 4 --maximum locked files (Linux 2.4 and higher) -+maximum locked files (Linux 2\.4 and higher) +-maximum locked files (Linux 2\.4 and higher) ++maximum locked files (Linux 2\&.4 and higher) .RE .PP \fBsigpending\fR .RS 4 --maximum number of pending signals (Linux 2.6 and higher) -+maximum number of pending signals (Linux 2\.6 and higher) +-maximum number of pending signals (Linux 2\.6 and higher) ++maximum number of pending signals (Linux 2\&.6 and higher) .RE .PP \fBmsqqueue\fR .RS 4 --maximum memory used by POSIX message queues (bytes) (Linux 2.6 and higher) -+maximum memory used by POSIX message queues (bytes) (Linux 2\.6 and higher) +-maximum memory used by POSIX message queues (bytes) (Linux 2\.6 and higher) ++maximum memory used by POSIX message queues (bytes) (Linux 2\&.6 and higher) .RE .PP \fBnice\fR .RS 4 --maximum nice priority allowed to raise to (Linux 2.6.12 and higher) -+maximum nice priority allowed to raise to (Linux 2\.6\.12 and higher) +-maximum nice priority allowed to raise to (Linux 2\.6\.12 and higher) values: [\-20,19] ++maximum nice priority allowed to raise to (Linux 2\&.6\&.12 and higher) values: [\-20,19] .RE .PP \fBrtprio\fR .RS 4 --maximum realtime priority allowed for non\-privileged processes (Linux 2.6.12 and higher) -+maximum realtime priority allowed for non\-privileged processes (Linux 2\.6\.12 and higher) - .RE +-maximum realtime priority allowed for non\-privileged processes (Linux 2\.6\.12 and higher) ++maximum realtime priority allowed for non\-privileged processes (Linux 2\&.6\&.12 and higher) ++.RE +.PP +\fBchroot\fR +.RS 4 @@ -233,26 +214,26 @@ Index: pam.debian/modules/pam_limits/limits.conf.5 .PP In general, individual limits have priority over group limits, so if you impose no limits for \fIadmin\fR --group, but one of the members in this group have a limits line, the user will have its limits set according to this line. -+group, but one of the members in this group have a limits line, the user will have its limits set according to this line\. +-group, but one of the members in this group have a limits line, the user will have its limits set according to this line\. ++group, but one of the members in this group have a limits line, the user will have its limits set according to this line\&. .PP Also, please note that all limit settings are set --\fIper login\fR. They are not global, nor are they permanent; existing only for the duration of the session. -+\fIper login\fR\. They are not global, nor are they permanent; existing only for the duration of the session\. +-\fIper login\fR\. They are not global, nor are they permanent; existing only for the duration of the session\. ++\fIper login\fR\&. They are not global, nor are they permanent; existing only for the duration of the session\&. .PP In the \fIlimits\fR --configuration file, the '\fB#\fR' character introduces a comment \- after which the rest of the line is ignored. -+configuration file, the \'\fB#\fR\' character introduces a comment \- after which the rest of the line is ignored\. +-configuration file, the \'\fB#\fR\' character introduces a comment \- after which the rest of the line is ignored\. ++configuration file, the \'\fB#\fR\' character introduces a comment \- after which the rest of the line is ignored\&. .PP The pam_limits module does its best to report configuration problems found in its configuration file via --\fBsyslog\fR(3). -+\fBsyslog\fR(3)\. +-\fBsyslog\fR(3)\. ++\fBsyslog\fR(3)\&. .SH "EXAMPLES" .PP These are some example lines which might be specified in --\fI/etc/security/limits.conf\fR. -+\fI/etc/security/limits\.conf\fR\. +-\fI/etc/security/limits\.conf\fR\. ++\fI/etc/security/limits\&.conf\fR\&. .sp .RS 4 .nf @@ -260,15 +241,15 @@ Index: pam.debian/modules/pam_limits/limits.conf.5 \fBpam\fR(8) .SH "AUTHOR" .PP --pam_limits was initially written by Cristian Gafton <gafton@redhat.com> -+pam_limits was initially written by Cristian Gafton <gafton@redhat\.com> -Index: pam.debian/modules/pam_limits/limits.conf +-pam_limits was initially written by Cristian Gafton <gafton@redhat\.com> ++pam_limits was initially written by Cristian Gafton <gafton@redhat\&.com> +Index: pam.deb/modules/pam_limits/limits.conf =================================================================== ---- pam.debian.orig/modules/pam_limits/limits.conf -+++ pam.debian/modules/pam_limits/limits.conf +--- pam.deb.orig/modules/pam_limits/limits.conf ++++ pam.deb/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 + # - nice - max nice priority allowed to raise to values: [-20, 19] # - rtprio - max realtime priority +# - chroot - change root to directory (Debian-specific) # diff --git a/debian/patches-applied/021_nis_cleanup b/debian/patches-applied/021_nis_cleanup index f3345052..86e80927 100644 --- a/debian/patches-applied/021_nis_cleanup +++ b/debian/patches-applied/021_nis_cleanup @@ -3,11 +3,11 @@ Patch from Philippe Troin <phil@fifi.org> Originally this included a bunch of changes to locking, but the more recent code pulled from Linux_pam CVS seems to fix that issue. -Index: Linux-PAM/modules/pam_unix/pam_unix_passwd.c +Index: pam.deb/modules/pam_unix/pam_unix_passwd.c =================================================================== ---- Linux-PAM/modules/pam_unix/pam_unix_passwd.c.orig -+++ Linux-PAM/modules/pam_unix/pam_unix_passwd.c -@@ -1107,7 +1107,7 @@ +--- pam.deb.orig/modules/pam_unix/pam_unix_passwd.c ++++ pam.deb/modules/pam_unix/pam_unix_passwd.c +@@ -588,7 +588,7 @@ if (_unix_blankpasswd(pamh, ctrl, user)) { return PAM_SUCCESS; @@ -16,7 +16,7 @@ Index: Linux-PAM/modules/pam_unix/pam_unix_passwd.c /* instruct user what is happening */ if (asprintf(&Announce, _("Changing password for %s."), user) < 0) { -@@ -1120,7 +1120,9 @@ +@@ -601,7 +601,9 @@ set(UNIX__OLD_PASSWD, lctrl); retval = _unix_read_password(pamh, lctrl ,Announce @@ -27,7 +27,7 @@ Index: Linux-PAM/modules/pam_unix/pam_unix_passwd.c ,NULL ,_UNIX_OLD_AUTHTOK ,&pass_old); -@@ -1131,9 +1133,12 @@ +@@ -612,9 +614,12 @@ "password - (old) token not obtained"); return retval; } |