diff options
author | Steve Langasek <vorlon@debian.org> | 2014-01-14 00:30:36 -0800 |
---|---|---|
committer | Steve Langasek <vorlon@debian.org> | 2019-01-08 22:11:51 -0800 |
commit | 1673fdd3756f59f0886cb3d0d594ff71ed3b1f40 (patch) | |
tree | 9cc5f635f1c345bd491ffa1aa33c15c32947ae02 /debian/patches-applied/036_pam_wheel_getlogin_considered_harmful | |
parent | 18ad8104e674ec8e1fb74d15a248680e51044854 (diff) |
Refresh patches
Diffstat (limited to 'debian/patches-applied/036_pam_wheel_getlogin_considered_harmful')
-rw-r--r-- | debian/patches-applied/036_pam_wheel_getlogin_considered_harmful | 236 |
1 files changed, 15 insertions, 221 deletions
diff --git a/debian/patches-applied/036_pam_wheel_getlogin_considered_harmful b/debian/patches-applied/036_pam_wheel_getlogin_considered_harmful index 6dee95c7..146d3e0a 100644 --- a/debian/patches-applied/036_pam_wheel_getlogin_considered_harmful +++ b/debian/patches-applied/036_pam_wheel_getlogin_considered_harmful @@ -8,10 +8,10 @@ Authors: Ben Collins <bcollins@debian.org> Upstream status: submitted in <20070901175405.GA26092@dario.dodds.net> -Index: pam.deb/modules/pam_wheel/pam_wheel.c +Index: pam.debian/modules/pam_wheel/pam_wheel.c =================================================================== ---- pam.deb.orig/modules/pam_wheel/pam_wheel.c -+++ pam.deb/modules/pam_wheel/pam_wheel.c +--- pam.debian.orig/modules/pam_wheel/pam_wheel.c ++++ pam.debian/modules/pam_wheel/pam_wheel.c @@ -60,9 +60,8 @@ /* argument parsing */ @@ -68,10 +68,10 @@ Index: pam.deb/modules/pam_wheel/pam_wheel.c /* * At this point fromsu = username-of-invoker; tpwd = pwd ptr for fromsu -Index: pam.deb/modules/pam_wheel/pam_wheel.8.xml +Index: pam.debian/modules/pam_wheel/pam_wheel.8.xml =================================================================== ---- pam.deb.orig/modules/pam_wheel/pam_wheel.8.xml -+++ pam.deb/modules/pam_wheel/pam_wheel.8.xml +--- pam.debian.orig/modules/pam_wheel/pam_wheel.8.xml ++++ pam.debian/modules/pam_wheel/pam_wheel.8.xml @@ -33,9 +33,6 @@ <arg choice="opt"> trust @@ -101,199 +101,20 @@ Index: pam.deb/modules/pam_wheel/pam_wheel.8.xml </variablelist> </refsect1> -Index: pam.deb/modules/pam_wheel/pam_wheel.8 +Index: pam.debian/modules/pam_wheel/pam_wheel.8 =================================================================== ---- pam.deb.orig/modules/pam_wheel/pam_wheel.8 -+++ pam.deb/modules/pam_wheel/pam_wheel.8 -@@ -1,161 +1,22 @@ -+'\" t - .\" Title: pam_wheel - .\" Author: [see the "AUTHOR" section] --.\" Generator: DocBook XSL Stylesheets v1.74.0 <http://docbook.sf.net/> --.\" Date: 10/27/2010 -+.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/> -+.\" Date: 05/31/2011 - .\" Manual: Linux-PAM Manual - .\" Source: Linux-PAM Manual - .\" Language: English - .\" --.TH "PAM_WHEEL" "8" "10/27/2010" "Linux-PAM Manual" "Linux\-PAM Manual" -+.TH "PAM_WHEEL" "8" "05/31/2011" "Linux-PAM Manual" "Linux\-PAM Manual" - .\" ----------------------------------------------------------------- --.\" * (re)Define some macros -+.\" * Define some portability stuff - .\" ----------------------------------------------------------------- - .\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ --.\" toupper - uppercase a string (locale-aware) -+.\" http://bugs.debian.org/507673 -+.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html - .\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ --.de toupper --.tr aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ --\\$* --.tr aabbccddeeffgghhiijjkkllmmnnooppqqrrssttuuvvwwxxyyzz --.. --.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ --.\" SH-xref - format a cross-reference to an SH section --.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ --.de SH-xref --.ie n \{\ --.\} --.toupper \\$* --.el \{\ --\\$* --.\} --.. --.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ --.\" SH - level-one heading that works better for non-TTY output --.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ --.de1 SH --.\" put an extra blank line of space above the head in non-TTY output --.if t \{\ --.sp 1 --.\} --.sp \\n[PD]u --.nr an-level 1 --.set-an-margin --.nr an-prevailing-indent \\n[IN] --.fi --.in \\n[an-margin]u --.ti 0 --.HTML-TAG ".NH \\n[an-level]" --.it 1 an-trap --.nr an-no-space-flag 1 --.nr an-break-flag 1 --\." make the size of the head bigger --.ps +3 --.ft B --.ne (2v + 1u) --.ie n \{\ --.\" if n (TTY output), use uppercase --.toupper \\$* --.\} --.el \{\ --.nr an-break-flag 0 --.\" if not n (not TTY), use normal case (not uppercase) --\\$1 --.in \\n[an-margin]u --.ti 0 --.\" if not n (not TTY), put a border/line under subheading --.sp -.6 --\l'\n(.lu' --.\} --.. --.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ --.\" SS - level-two heading that works better for non-TTY output --.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ --.de1 SS --.sp \\n[PD]u --.nr an-level 1 --.set-an-margin --.nr an-prevailing-indent \\n[IN] --.fi --.in \\n[IN]u --.ti \\n[SN]u --.it 1 an-trap --.nr an-no-space-flag 1 --.nr an-break-flag 1 --.ps \\n[PS-SS]u --\." make the size of the head bigger --.ps +2 --.ft B --.ne (2v + 1u) --.if \\n[.$] \&\\$* --.. --.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ --.\" BB/BE - put background/screen (filled box) around block of text --.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ --.de BB --.if t \{\ --.sp -.5 --.br --.in +2n --.ll -2n --.gcolor red --.di BX --.\} --.. --.de EB --.if t \{\ --.if "\\$2"adjust-for-leading-newline" \{\ --.sp -1 --.\} --.br --.di --.in --.ll --.gcolor --.nr BW \\n(.lu-\\n(.i --.nr BH \\n(dn+.5v --.ne \\n(BHu+.5v --.ie "\\$2"adjust-for-leading-newline" \{\ --\M[\\$1]\h'1n'\v'+.5v'\D'P \\n(BWu 0 0 \\n(BHu -\\n(BWu 0 0 -\\n(BHu'\M[] --.\} --.el \{\ --\M[\\$1]\h'1n'\v'-.5v'\D'P \\n(BWu 0 0 \\n(BHu -\\n(BWu 0 0 -\\n(BHu'\M[] --.\} --.in 0 --.sp -.5v --.nf --.BX --.in --.sp .5v --.fi --.\} --.. --.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ --.\" BM/EM - put colored marker in margin next to block of text --.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ --.de BM --.if t \{\ --.br --.ll -2n --.gcolor red --.di BX --.\} --.. --.de EM --.if t \{\ --.br --.di --.ll --.gcolor --.nr BH \\n(dn --.ne \\n(BHu --\M[\\$1]\D'P -.75n 0 0 \\n(BHu -(\\n[.i]u - \\n(INu - .75n) 0 0 -\\n(BHu'\M[] --.in 0 --.nf --.BX --.in --.fi --.\} --.. -+.ie \n(.g .ds Aq \(aq -+.el .ds Aq ' - .\" ----------------------------------------------------------------- - .\" * set default formatting - .\" ----------------------------------------------------------------- -@@ -166,13 +27,11 @@ - .\" ----------------------------------------------------------------- - .\" * MAIN CONTENT STARTS HERE * - .\" ----------------------------------------------------------------- --.SH "Name" -+.SH "NAME" +--- pam.debian.orig/modules/pam_wheel/pam_wheel.8 ++++ pam.debian/modules/pam_wheel/pam_wheel.8 +@@ -31,7 +31,7 @@ pam_wheel \- Only permit root access to members of group wheel --.SH "Synopsis" --.fam C -+.SH "SYNOPSIS" + .SH "SYNOPSIS" .HP \w'\fBpam_wheel\&.so\fR\ 'u -\fBpam_wheel\&.so\fR [debug] [deny] [group=\fIname\fR] [root_only] [trust] [use_uid] --.fam +\fBpam_wheel\&.so\fR [debug] [deny] [group=\fIname\fR] [root_only] [trust] .SH "DESCRIPTION" .PP The pam_wheel PAM module is used to enforce the so\-called -@@ -213,11 +72,6 @@ +@@ -72,11 +72,6 @@ .RS 4 The pam_wheel module will return PAM_SUCCESS instead of PAM_IGNORE if the user is a member of the wheel group (thus with a little play stacking the modules the wheel members may be able to su to root without being prompted for a passwd)\&. .RE @@ -305,37 +126,10 @@ Index: pam.deb/modules/pam_wheel/pam_wheel.8 .SH "MODULE TYPES PROVIDED" .PP The -@@ -268,26 +122,12 @@ - .if n \{\ - .RS 4 - .\} --.fam C --.ps -1 - .nf --.if t \{\ --.sp -1 --.\} --.BB lightgray adjust-for-leading-newline --.sp -1 -- - su auth sufficient pam_rootok\&.so - su auth required pam_wheel\&.so - su auth required pam_unix\&.so - --.EB lightgray adjust-for-leading-newline --.if t \{\ --.sp 1 --.\} - .fi --.fam --.ps +1 - .if n \{\ - .RE - .\} -Index: pam.deb/modules/pam_wheel/README +Index: pam.debian/modules/pam_wheel/README =================================================================== ---- pam.deb.orig/modules/pam_wheel/README -+++ pam.deb/modules/pam_wheel/README +--- pam.debian.orig/modules/pam_wheel/README ++++ pam.debian/modules/pam_wheel/README @@ -39,12 +39,6 @@ modules the wheel members may be able to su to root without being prompted for a passwd). |