summaryrefslogtreecommitdiff
path: root/debian/patches-applied
diff options
context:
space:
mode:
Diffstat (limited to 'debian/patches-applied')
-rw-r--r--debian/patches-applied/008_modules_pam_limits_chroot48
-rw-r--r--debian/patches-applied/036_pam_wheel_getlogin_considered_harmful29
-rw-r--r--debian/patches-applied/055_pam_unix_nullok_secure38
-rw-r--r--debian/patches-applied/PAM-manpage-section3033
-rw-r--r--debian/patches-applied/autoconf.patch33740
-rw-r--r--debian/patches-applied/fix-man-crud875
6 files changed, 34005 insertions, 3758 deletions
diff --git a/debian/patches-applied/008_modules_pam_limits_chroot b/debian/patches-applied/008_modules_pam_limits_chroot
index d791567c..7dd3ebbd 100644
--- a/debian/patches-applied/008_modules_pam_limits_chroot
+++ b/debian/patches-applied/008_modules_pam_limits_chroot
@@ -94,25 +94,29 @@ Index: pam.deb/modules/pam_limits/limits.conf.5
===================================================================
--- pam.deb.orig/modules/pam_limits/limits.conf.5
+++ pam.deb/modules/pam_limits/limits.conf.5
-@@ -1,161 +1,13 @@
+@@ -1,161 +1,22 @@
+'\" t
.\" Title: limits.conf
.\" Author: [see the "AUTHOR" section]
-.\" Generator: DocBook XSL Stylesheets v1.74.0 <http://docbook.sf.net/>
--.\" Date: 03/02/2009
+-.\" Date: 07/08/2010
+.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-+.\" Date: 08/24/2009
++.\" Date: 08/31/2010
.\" Manual: Linux-PAM Manual
.\" Source: Linux-PAM Manual
.\" Language: English
.\"
--.TH "LIMITS\&.CONF" "5" "03/02/2009" "Linux-PAM Manual" "Linux\-PAM Manual"
--.\" -----------------------------------------------------------------
+-.TH "LIMITS\&.CONF" "5" "07/08/2010" "Linux-PAM Manual" "Linux\-PAM Manual"
++.TH "LIMITS\&.CONF" "5" "08/31/2010" "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
-\\$*
@@ -256,11 +260,12 @@ Index: pam.deb/modules/pam_limits/limits.conf.5
-.fi
-.\}
-..
-+.TH "LIMITS\&.CONF" "5" "08/24/2009" "Linux-PAM Manual" "Linux\-PAM Manual"
++.ie \n(.g .ds Aq \(aq
++.el .ds Aq '
.\" -----------------------------------------------------------------
.\" * set default formatting
.\" -----------------------------------------------------------------
-@@ -166,7 +18,7 @@
+@@ -166,7 +27,7 @@
.\" -----------------------------------------------------------------
.\" * MAIN CONTENT STARTS HERE *
.\" -----------------------------------------------------------------
@@ -269,7 +274,16 @@ Index: pam.deb/modules/pam_limits/limits.conf.5
limits.conf \- configuration file for the pam_limits module
.SH "DESCRIPTION"
.PP
-@@ -360,6 +212,11 @@
+@@ -263,7 +124,7 @@
+ \fBhard\fR
+ 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\&. \&.
++Note, if you specify a type of \*(Aq\-\*(Aq 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
+@@ -360,6 +221,11 @@
.RS 4
maximum realtime priority allowed for non\-privileged processes (Linux 2\&.6\&.12 and higher)
.RE
@@ -281,7 +295,15 @@ Index: pam.deb/modules/pam_limits/limits.conf.5
.RE
.PP
All items support the values
-@@ -392,20 +249,12 @@
+@@ -385,27 +251,19 @@
+ .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 \*(Aq\fB#\fR\*(Aq character introduces a comment \- after which the rest of the line is ignored\&.
+ .PP
+ The pam_limits module does report configuration problems found in its configuration file and errors via
+ \fBsyslog\fR(3)\&.
.SH "EXAMPLES"
.PP
These are some example lines which might be specified in
@@ -303,7 +325,7 @@ Index: pam.deb/modules/pam_limits/limits.conf.5
* soft core 0
* hard rss 10000
@student hard nproc 20
-@@ -414,13 +263,7 @@
+@@ -414,13 +272,7 @@
ftp hard nproc 0
@student \- maxlogins 4
diff --git a/debian/patches-applied/036_pam_wheel_getlogin_considered_harmful b/debian/patches-applied/036_pam_wheel_getlogin_considered_harmful
index 20f408a3..5eb09b32 100644
--- a/debian/patches-applied/036_pam_wheel_getlogin_considered_harmful
+++ b/debian/patches-applied/036_pam_wheel_getlogin_considered_harmful
@@ -105,25 +105,29 @@ Index: pam.deb/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,13 @@
+@@ -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: 03/02/2009
+-.\" Date: 07/08/2010
+.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-+.\" Date: 08/24/2009
++.\" Date: 08/31/2010
.\" Manual: Linux-PAM Manual
.\" Source: Linux-PAM Manual
.\" Language: English
.\"
--.TH "PAM_WHEEL" "8" "03/02/2009" "Linux-PAM Manual" "Linux\-PAM Manual"
--.\" -----------------------------------------------------------------
+-.TH "PAM_WHEEL" "8" "07/08/2010" "Linux-PAM Manual" "Linux\-PAM Manual"
++.TH "PAM_WHEEL" "8" "08/31/2010" "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
-\\$*
@@ -267,11 +271,12 @@ Index: pam.deb/modules/pam_wheel/pam_wheel.8
-.fi
-.\}
-..
-+.TH "PAM_WHEEL" "8" "08/24/2009" "Linux-PAM Manual" "Linux\-PAM Manual"
++.ie \n(.g .ds Aq \(aq
++.el .ds Aq '
.\" -----------------------------------------------------------------
.\" * set default formatting
.\" -----------------------------------------------------------------
-@@ -166,13 +18,11 @@
+@@ -166,13 +27,11 @@
.\" -----------------------------------------------------------------
.\" * MAIN CONTENT STARTS HERE *
.\" -----------------------------------------------------------------
@@ -288,7 +293,7 @@ Index: pam.deb/modules/pam_wheel/pam_wheel.8
.SH "DESCRIPTION"
.PP
The pam_wheel PAM module is used to enforce the so\-called
-@@ -213,11 +63,6 @@
+@@ -213,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
@@ -300,7 +305,7 @@ Index: pam.deb/modules/pam_wheel/pam_wheel.8
.SH "MODULE TYPES PROVIDED"
.PP
The
-@@ -268,26 +113,12 @@
+@@ -268,26 +122,12 @@
.if n \{\
.RS 4
.\}
diff --git a/debian/patches-applied/055_pam_unix_nullok_secure b/debian/patches-applied/055_pam_unix_nullok_secure
index 27415915..cc46dcf5 100644
--- a/debian/patches-applied/055_pam_unix_nullok_secure
+++ b/debian/patches-applied/055_pam_unix_nullok_secure
@@ -39,7 +39,7 @@ Index: pam.deb/modules/pam_unix/support.c
}
}
-@@ -449,6 +456,7 @@
+@@ -455,6 +462,7 @@
child = fork();
if (child == 0) {
int i=0;
@@ -47,7 +47,7 @@ Index: pam.deb/modules/pam_unix/support.c
struct rlimit rlim;
static char *envp[] = { NULL };
char *args[] = { NULL, NULL, NULL, NULL };
-@@ -476,7 +484,18 @@
+@@ -482,7 +490,18 @@
/* exec binary helper */
args[0] = strdup(CHKPWD_HELPER);
args[1] = x_strdup(user);
@@ -67,7 +67,7 @@ Index: pam.deb/modules/pam_unix/support.c
args[2]=strdup("nullok");
} else {
args[2]=strdup("nonull");
-@@ -557,6 +576,17 @@
+@@ -563,6 +582,17 @@
if (on(UNIX__NONULL, ctrl))
return 0; /* will fail but don't let on yet */
@@ -85,7 +85,7 @@ Index: pam.deb/modules/pam_unix/support.c
/* UNIX passwords area */
retval = get_pwd_hash(pamh, name, &pwd, &salt);
-@@ -643,7 +673,8 @@
+@@ -649,7 +679,8 @@
}
}
} else {
@@ -99,18 +99,18 @@ Index: pam.deb/modules/pam_unix/support.h
===================================================================
--- pam.deb.orig/modules/pam_unix/support.h
+++ pam.deb/modules/pam_unix/support.h
-@@ -92,8 +92,9 @@
- #define UNIX_MAX_PASS_LEN 27 /* internal, for compatibility only */
+@@ -93,8 +93,9 @@
#define UNIX_MIN_PASS_LEN 28 /* min length for password */
- #define UNIX_OBSCURE_CHECKS 29 /* enable obscure checks on passwords */
-+#define UNIX_NULLOK_SECURE 30 /* NULL passwords allowed only on secure ttys */
+ #define UNIX_MIN_PASS_COMPAT 29 /* min length for password */
+ #define UNIX_OBSCURE_CHECKS 30 /* enable obscure checks on passwords */
++#define UNIX_NULLOK_SECURE 31 /* NULL passwords allowed only on secure ttys */
/* -------------- */
--#define UNIX_CTRLS_ 30 /* number of ctrl arguments defined */
-+#define UNIX_CTRLS_ 31 /* number of ctrl arguments defined */
+-#define UNIX_CTRLS_ 31 /* number of ctrl arguments defined */
++#define UNIX_CTRLS_ 32 /* number of ctrl arguments defined */
- #define UNIX_HASH_MASK (UNIX_MD5_PASS|UNIX_BIGCRYPT|UNIX_SHA256_PASS|UNIX_SHA512_PASS|UNIX_BLOWFISH_PASS)
+ #define UNIX_DES_CRYPT(ctrl) (off(UNIX_MD5_PASS,ctrl)&&off(UNIX_BIGCRYPT,ctrl)&&off(UNIX_SHA256_PASS,ctrl)&&off(UNIX_SHA512_PASS,ctrl)&&off(UNIX_BLOWFISH_PASS,ctrl))
-@@ -111,7 +112,7 @@
+@@ -112,7 +113,7 @@
/* UNIX_NOT_SET_PASS */ {"not_set_pass", _ALL_ON_, 0x40},
/* UNIX__PRELIM */ {NULL, _ALL_ON_^(0x180), 0x80},
/* UNIX__UPDATE */ {NULL, _ALL_ON_^(0x180), 0x100},
@@ -119,15 +119,15 @@ Index: pam.deb/modules/pam_unix/support.h
/* UNIX__QUIET */ {NULL, _ALL_ON_, 0x400},
/* UNIX_USE_AUTHTOK */ {"use_authtok", _ALL_ON_, 0x800},
/* UNIX_SHADOW */ {"shadow", _ALL_ON_, 0x1000},
-@@ -132,6 +133,7 @@
- /* UNIX_MAX_PASS_LEN */ {"max=", _ALL_ON_, 0},
- /* UNIX_MIN_PASS_LEN */ {"min=", _ALL_ON_, 0x4000000},
- /* UNIX_OBSCURE_CHECKS */ {"obscure", _ALL_ON_, 0x8000000},
-+/* UNIX__NULLOK */ {"nullok_secure", _ALL_ON_^(0x200), 0x10000000},
+@@ -134,6 +135,7 @@
+ /* UNIX_MIN_PASS_LEN */ {"minlen=", _ALL_ON_, 0x4000000},
+ /* UNIX_MIN_PASS_COMPAT */ {"min=", _ALL_ON_, 0x8000000},
+ /* UNIX_OBSCURE_CHECKS */ {"obscure", _ALL_ON_, 0x10000000},
++/* UNIX__NULLOK */ {"nullok_secure", _ALL_ON_^(0x200), 0x20000000},
};
#define UNIX_DEFAULTS (unix_args[UNIX__NONULL].flag)
-@@ -167,6 +169,9 @@
+@@ -169,6 +171,9 @@
,const char *data_name
,const void **pass);
@@ -177,7 +177,7 @@ Index: pam.deb/modules/pam_unix/pam_unix.8
===================================================================
--- pam.deb.orig/modules/pam_unix/pam_unix.8
+++ pam.deb/modules/pam_unix/pam_unix.8
-@@ -218,7 +218,14 @@
+@@ -79,7 +79,14 @@
.RS 4
The default action of this module is to not permit the user access to a service if their official password is blank\&. The
\fBnullok\fR
diff --git a/debian/patches-applied/PAM-manpage-section b/debian/patches-applied/PAM-manpage-section
index 0106037a..2fee0b1b 100644
--- a/debian/patches-applied/PAM-manpage-section
+++ b/debian/patches-applied/PAM-manpage-section
@@ -9,25 +9,29 @@ Index: pam.deb/doc/man/PAM.8
===================================================================
--- pam.deb.orig/doc/man/PAM.8
+++ pam.deb/doc/man/PAM.8
-@@ -1,161 +1,13 @@
+@@ -1,161 +1,22 @@
+'\" t
.\" Title: pam
.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
-.\" Generator: DocBook XSL Stylesheets v1.74.0 <http://docbook.sf.net/>
--.\" Date: 03/02/2009
+-.\" Date: 04/01/2010
+.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-+.\" Date: 08/24/2009
++.\" Date: 08/31/2010
.\" Manual: Linux-PAM Manual
.\" Source: Linux-PAM Manual
.\" Language: English
.\"
--.TH "PAM" "8" "03/02/2009" "Linux-PAM Manual" "Linux-PAM Manual"
--.\" -----------------------------------------------------------------
+-.TH "PAM" "8" "04/01/2010" "Linux-PAM Manual" "Linux-PAM Manual"
++.TH "PAM" "7" "08/31/2010" "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
-\\$*
@@ -171,11 +175,12 @@ Index: pam.deb/doc/man/PAM.8
-.fi
-.\}
-..
-+.TH "PAM" "7" "08/24/2009" "Linux-PAM Manual" "Linux-PAM Manual"
++.ie \n(.g .ds Aq \(aq
++.el .ds Aq '
.\" -----------------------------------------------------------------
.\" * set default formatting
.\" -----------------------------------------------------------------
-@@ -166,7 +18,7 @@
+@@ -166,13 +27,13 @@
.\" -----------------------------------------------------------------
.\" * MAIN CONTENT STARTS HERE *
.\" -----------------------------------------------------------------
@@ -184,7 +189,14 @@ Index: pam.deb/doc/man/PAM.8
PAM, pam \- Pluggable Authentication Modules for Linux
.SH "DESCRIPTION"
.PP
-@@ -184,13 +36,13 @@
+ This manual is intended to offer a quick introduction to
+ \fBLinux\-PAM\fR\&. For more information the reader is directed to the
+-\fBLinux\-PAM system administrators\' guide\fR\&.
++\fBLinux\-PAM system administrators\*(Aq guide\fR\&.
+ .PP
+
+ \fBLinux\-PAM\fR
+@@ -184,13 +45,13 @@
The principal feature of the PAM approach is that the nature of the authentication is dynamically configurable\&. In other words, the system administrator is free to choose how individual service\-providing applications will authenticate users\&. This dynamic configuration is set by the contents of the single
\fBLinux\-PAM\fR
configuration file
@@ -201,7 +213,30 @@ Index: pam.deb/doc/man/PAM.8
.PP
From the point of view of the system administrator, for whom this manual is provided, it is not of primary importance to understand the internal behavior of the
\fBLinux\-PAM\fR
-@@ -231,17 +83,17 @@
+@@ -212,36 +73,36 @@
+ \fBsession\fR
+ management\&. (We highlight the abbreviations used for these groups in the configuration file\&.)
+ .PP
+-Simply put, these groups take care of different aspects of a typical user\'s request for a restricted service:
++Simply put, these groups take care of different aspects of a typical user\*(Aqs request for a restricted service:
+ .PP
+ \fBaccount\fR
+-\- provide account verification types of service: has the user\'s password expired?; is this user permitted access to the requested service?
++\- provide account verification types of service: has the user\*(Aqs password expired?; is this user permitted access to the requested service?
+ .PP
+ \fBauth\fRentication \- authenticate a user and set up user credentials\&. Typically this is via some challenge\-response request that the user must satisfy: if you are who you claim to be please enter your password\&. Not all authentications are of this type, there exist hardware based authentication schemes (such as the use of smart\-cards and biometric devices), with suitable modules, these may be substituted seamlessly for more standard approaches to authentication \- such is the flexibility of
+ \fBLinux\-PAM\fR\&.
+ .PP
+ \fBpassword\fR
+-\- this group\'s responsibility is the task of updating authentication mechanisms\&. Typically, such services are strongly coupled to those of the
++\- this group\*(Aqs responsibility is the task of updating authentication mechanisms\&. Typically, such services are strongly coupled to those of the
+ \fBauth\fR
+ group\&. Some authentication mechanisms lend themselves well to being updated with such a function\&. Standard UN*X password\-based access is the obvious example: please enter a replacement password\&.
+ .PP
+ \fBsession\fR
+-\- this group of tasks cover things that should be done prior to a service being given and after it is withdrawn\&. Such tasks include the maintenance of audit trails and the mounting of the user\'s home directory\&. The
++\- this group of tasks cover things that should be done prior to a service being given and after it is withdrawn\&. Such tasks include the maintenance of audit trails and the mounting of the user\*(Aqs home directory\&. The
+ \fBsession\fR
management group is important as it provides both an opening and closing hook for modules to affect the services available to a user\&.
.SH "FILES"
.PP
@@ -222,7 +257,7 @@ Index: pam.deb/doc/man/PAM.8
file is ignored\&.
.RE
.SH "ERRORS"
-@@ -260,4 +112,4 @@
+@@ -260,4 +121,4 @@
\fBpam_authenticate\fR(3),
\fBpam_sm_setcred\fR(3),
\fBpam_strerror\fR(3),
@@ -231,10 +266,9 @@ Index: pam.deb/doc/man/PAM.8
Index: pam.deb/doc/man/pam.8
===================================================================
--- pam.deb.orig/doc/man/pam.8
-+++ pam.deb/doc/man/pam.8
-@@ -1 +1 @@
++++ /dev/null
+@@ -1 +0,0 @@
-.so man8/PAM.8
-+.so man7/PAM.7
Index: pam.deb/doc/man/pam.8.xml
===================================================================
--- pam.deb.orig/doc/man/pam.8.xml
@@ -261,7 +295,222 @@ Index: pam.deb/modules/pam_access/access.conf.5
===================================================================
--- pam.deb.orig/modules/pam_access/access.conf.5
+++ pam.deb/modules/pam_access/access.conf.5
-@@ -174,7 +174,7 @@
+@@ -1,161 +1,22 @@
++'\" t
+ .\" Title: access.conf
+ .\" Author: [see the "AUTHORS" section]
+-.\" Generator: DocBook XSL Stylesheets v1.74.0 <http://docbook.sf.net/>
+-.\" Date: 07/08/2010
++.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
++.\" Date: 08/31/2010
+ .\" Manual: Linux-PAM Manual
+ .\" Source: Linux-PAM Manual
+ .\" Language: English
+ .\"
+-.TH "ACCESS\&.CONF" "5" "07/08/2010" "Linux-PAM Manual" "Linux\-PAM Manual"
++.TH "ACCESS\&.CONF" "5" "08/31/2010" "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,19 +27,19 @@
+ .\" -----------------------------------------------------------------
+ .\" * MAIN CONTENT STARTS HERE *
+ .\" -----------------------------------------------------------------
+-.SH "Name"
++.SH "NAME"
+ access.conf \- the login access control table file
+ .SH "DESCRIPTION"
+ .PP
+ The
+-\FC/etc/security/access\&.conf\F[]
++/etc/security/access\&.conf
+ file specifies (\fIuser/group\fR,
+ \fIhost\fR), (\fIuser/group\fR,
+ \fInetwork/netmask\fR) or (\fIuser/group\fR,
+ \fItty\fR) combinations for which a login will be either accepted or refused\&.
+ .PP
+ When someone logs in, the file
+-\FCaccess\&.conf\F[]
++access\&.conf
+ is scanned for the first entry that matches the (\fIuser/group\fR,
+ \fIhost\fR) or (\fIuser/group\fR,
+ \fInetwork/netmask\fR) combination, or, in case of non\-networked logins, the first entry that matches the (\fIuser/group\fR,
+@@ -230,7 +91,7 @@
+ .SH "EXAMPLES"
+ .PP
+ These are some example lines which might be specified in
+-\FC/etc/security/access\&.conf\F[]\&.
++/etc/security/access\&.conf\&.
+ .PP
+ User
+ \fIroot\fR
+@@ -254,9 +115,9 @@
+ User
+ \fIroot\fR
+ should get access from network
+-\FC192\&.168\&.201\&.\F[]
++192\&.168\&.201\&.
+ where the term will be evaluated by string matching\&. But it might be better to use network/netmask instead\&. The same meaning of
+-\FC192\&.168\&.201\&.\F[]
++192\&.168\&.201\&.
+ is
+ \fI192\&.168\&.201\&.0/24\fR
+ or
+@@ -322,7 +183,7 @@
\fBpam_access\fR(8),
\fBpam.d\fR(5),
@@ -287,25 +536,29 @@ Index: pam.deb/modules/pam_env/pam_env.conf.5
===================================================================
--- pam.deb.orig/modules/pam_env/pam_env.conf.5
+++ pam.deb/modules/pam_env/pam_env.conf.5
-@@ -1,161 +1,13 @@
+@@ -1,161 +1,22 @@
+'\" t
.\" Title: pam_env.conf
.\" Author: [see the "AUTHOR" section]
-.\" Generator: DocBook XSL Stylesheets v1.74.0 <http://docbook.sf.net/>
--.\" Date: 03/02/2009
+-.\" Date: 07/08/2010
+.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-+.\" Date: 08/24/2009
++.\" Date: 08/31/2010
.\" Manual: Linux-PAM Manual
.\" Source: Linux-PAM Manual
.\" Language: English
.\"
--.TH "PAM_ENV\&.CONF" "5" "03/02/2009" "Linux-PAM Manual" "Linux\-PAM Manual"
--.\" -----------------------------------------------------------------
+-.TH "PAM_ENV\&.CONF" "5" "07/08/2010" "Linux-PAM Manual" "Linux\-PAM Manual"
++.TH "PAM_ENV\&.CONF" "5" "08/31/2010" "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
-\\$*
@@ -449,11 +702,12 @@ Index: pam.deb/modules/pam_env/pam_env.conf.5
-.fi
-.\}
-..
-+.TH "PAM_ENV\&.CONF" "5" "08/24/2009" "Linux-PAM Manual" "Linux\-PAM Manual"
++.ie \n(.g .ds Aq \(aq
++.el .ds Aq '
.\" -----------------------------------------------------------------
.\" * set default formatting
.\" -----------------------------------------------------------------
-@@ -166,12 +18,12 @@
+@@ -166,12 +27,12 @@
.\" -----------------------------------------------------------------
.\" * MAIN CONTENT STARTS HERE *
.\" -----------------------------------------------------------------
@@ -468,7 +722,14 @@ Index: pam.deb/modules/pam_env/pam_env.conf.5
file specifies the environment variables to be set, unset or modified by
\fBpam_env\fR(8)\&. When someone logs in, this file is read and the environment variables are set according\&.
.PP
-@@ -187,31 +39,17 @@
+@@ -181,37 +42,23 @@
+ \fIVARIABLE\fR
+ [\fIDEFAULT=[value]\fR] [\fIOVERRIDE=[value]\fR]
+ .PP
+-(Possibly non\-existent) environment variables may be used in values using the ${string} syntax and (possibly non\-existent) PAM_ITEMs may be used in values using the @{string} syntax\&. Both the $ and @ characters can be backslash escaped to be used as literal values values can be delimited with "", escaped " not supported\&. Note that many environment variables that you would like to use may not be set by the time the module is called\&. For example, HOME is used below several times, but many PAM applications don\'t make it available by the time you need it\&.
++(Possibly non\-existent) environment variables may be used in values using the ${string} syntax and (possibly non\-existent) PAM_ITEMs may be used in values using the @{string} syntax\&. Both the $ and @ characters can be backslash escaped to be used as literal values values can be delimited with "", escaped " not supported\&. Note that many environment variables that you would like to use may not be set by the time the module is called\&. For example, HOME is used below several times, but many PAM applications don\*(Aqt make it available by the time you need it\&.
+ .PP
+ The "\fI#\fR" character at start of line (no space at front) can be used to mark this line as a comment line\&.
.SH "EXAMPLES"
.PP
These are some example lines which might be specified in
@@ -501,7 +762,7 @@ Index: pam.deb/modules/pam_env/pam_env.conf.5
.if n \{\
.RE
.\}
-@@ -221,24 +59,10 @@
+@@ -221,24 +68,10 @@
.if n \{\
.RS 4
.\}
@@ -526,7 +787,7 @@ Index: pam.deb/modules/pam_env/pam_env.conf.5
.if n \{\
.RE
.\}
-@@ -248,15 +72,7 @@
+@@ -248,15 +81,7 @@
.if n \{\
.RS 4
.\}
@@ -542,7 +803,7 @@ Index: pam.deb/modules/pam_env/pam_env.conf.5
PAGER DEFAULT=less
MANPAGER DEFAULT=less
LESS DEFAULT="M q e h15 z23 b80"
-@@ -264,13 +80,7 @@
+@@ -264,13 +89,7 @@
PATH DEFAULT=${HOME}/bin:/usr/local/bin:/bin\e
:/usr/bin:/usr/local/bin/X11:/usr/bin/X11
@@ -556,7 +817,7 @@ Index: pam.deb/modules/pam_env/pam_env.conf.5
.if n \{\
.RE
.\}
-@@ -280,27 +90,13 @@
+@@ -280,27 +99,13 @@
.if n \{\
.RS 4
.\}
@@ -584,7 +845,7 @@ Index: pam.deb/modules/pam_env/pam_env.conf.5
.if n \{\
.RE
.\}
-@@ -309,7 +105,7 @@
+@@ -309,7 +114,7 @@
\fBpam_env\fR(8),
\fBpam.d\fR(5),
@@ -610,25 +871,29 @@ Index: pam.deb/modules/pam_group/group.conf.5
===================================================================
--- pam.deb.orig/modules/pam_group/group.conf.5
+++ pam.deb/modules/pam_group/group.conf.5
-@@ -1,161 +1,13 @@
+@@ -1,161 +1,22 @@
+'\" t
.\" Title: group.conf
.\" Author: [see the "AUTHOR" section]
-.\" Generator: DocBook XSL Stylesheets v1.74.0 <http://docbook.sf.net/>
--.\" Date: 03/02/2009
+-.\" Date: 08/04/2010
+.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-+.\" Date: 08/24/2009
++.\" Date: 08/31/2010
.\" Manual: Linux-PAM Manual
.\" Source: Linux-PAM Manual
.\" Language: English
.\"
--.TH "GROUP\&.CONF" "5" "03/02/2009" "Linux-PAM Manual" "Linux\-PAM Manual"
--.\" -----------------------------------------------------------------
+-.TH "GROUP\&.CONF" "5" "08/04/2010" "Linux-PAM Manual" "Linux\-PAM Manual"
++.TH "GROUP\&.CONF" "5" "08/31/2010" "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
-\\$*
@@ -772,11 +1037,12 @@ Index: pam.deb/modules/pam_group/group.conf.5
-.fi
-.\}
-..
-+.TH "GROUP\&.CONF" "5" "08/24/2009" "Linux-PAM Manual" "Linux\-PAM Manual"
++.ie \n(.g .ds Aq \(aq
++.el .ds Aq '
.\" -----------------------------------------------------------------
.\" * set default formatting
.\" -----------------------------------------------------------------
-@@ -166,14 +18,14 @@
+@@ -166,15 +27,15 @@
.\" -----------------------------------------------------------------
.\" * MAIN CONTENT STARTS HERE *
.\" -----------------------------------------------------------------
@@ -789,18 +1055,43 @@ Index: pam.deb/modules/pam_group/group.conf.5
.PP
For this module to function correctly there must be a correctly formatted
-\FC/etc/security/group\&.conf\F[]
+-file present\&. White spaces are ignored and lines maybe extended with \'\e\' (escaped newlines)\&. Text following a \'#\' is ignored to the end of the line\&.
+/etc/security/group\&.conf
- file present\&. White spaces are ignored and lines maybe extended with \'\e\' (escaped newlines)\&. Text following a \'#\' is ignored to the end of the line\&.
++file present\&. White spaces are ignored and lines maybe extended with \*(Aq\e\*(Aq (escaped newlines)\&. Text following a \*(Aq#\*(Aq is ignored to the end of the line\&.
.PP
The syntax of the lines is as follows:
-@@ -209,22 +61,16 @@
+ .PP
+@@ -191,95 +52,61 @@
+ .PP
+ The third field, the
+ \fIusers\fR
+-field, is a logic list of users, or a UNIX group, or a netgroup of users to whom this rule applies\&. Group names are preceded by a \'%\' symbol, while netgroup names are preceded by a \'@\' symbol\&.
++field, is a logic list of users, or a UNIX group, or a netgroup of users to whom this rule applies\&. Group names are preceded by a \*(Aq%\*(Aq symbol, while netgroup names are preceded by a \*(Aq@\*(Aq symbol\&.
+ .PP
+-For these items the simple wildcard \'*\' may be used only once\&. With UNIX groups or netgroups no wildcards or logic operators are allowed\&.
++For these items the simple wildcard \*(Aq*\*(Aq may be used only once\&. With UNIX groups or netgroups no wildcards or logic operators are allowed\&.
+ .PP
+ The
+ \fItimes\fR
+ field is used to indicate "when" these groups are to be given to the user\&. The format here is a logic list of day/time\-range entries\&. The days are specified by a sequence of two character entries, MoTuSa for example is Monday Tuesday and Saturday\&. Note that repeated days are unset MoMo = no day, and MoWk = all weekdays bar Monday\&. The two character combinations accepted are Mo Tu We Th Fr Sa Su Wk Wd Al, the last two being week\-end days and all 7 days of the week respectively\&. As a final example, AlFr means all days except Friday\&.
+ .PP
+-Each day/time\-range can be prefixed with a \'!\' to indicate "anything but"\&. The time\-range part is two 24\-hour times HHMM, separated by a hyphen, indicating the start and finish time (if the finish time is smaller than the start time it is deemed to apply on the following day)\&.
++Each day/time\-range can be prefixed with a \*(Aq!\*(Aq to indicate "anything but"\&. The time\-range part is two 24\-hour times HHMM, separated by a hyphen, indicating the start and finish time (if the finish time is smaller than the start time it is deemed to apply on the following day)\&.
+ .PP
+ The
+ \fIgroups\fR
+-field is a comma or space separated list of groups that the user inherits membership of\&. These groups are added if the previous fields are satisfied by the user\'s request\&.
++field is a comma or space separated list of groups that the user inherits membership of\&. These groups are added if the previous fields are satisfied by the user\*(Aqs request\&.
+ .PP
+ For a rule to be active, ALL of service+ttys+users must be satisfied by the applying process\&.
.SH "EXAMPLES"
.PP
These are some example lines which might be specified in
-\FC/etc/security/group\&.conf\F[]\&.
+/etc/security/group\&.conf\&.
.PP
- Running \'xsh\' on tty* (any ttyXXX device), the user \'us\' is given access to the floppy (through membership of the floppy group)
+-Running \'xsh\' on tty* (any ttyXXX device), the user \'us\' is given access to the floppy (through membership of the floppy group)
++Running \*(Aqxsh\*(Aq on tty* (any ttyXXX device), the user \*(Aqus\*(Aq is given access to the floppy (through membership of the floppy group)
.sp
.if n \{\
.RS 4
@@ -817,7 +1108,10 @@ Index: pam.deb/modules/pam_group/group.conf.5
.if n \{\
.RE
.\}
-@@ -234,25 +80,11 @@
+ .PP
+-Running \'xsh\' on tty* (any ttyXXX device), the user \'sword\' is given access to games (through membership of the floppy group) after work hours\&.
++Running \*(Aqxsh\*(Aq on tty* (any ttyXXX device), the user \*(Aqsword\*(Aq is given access to games (through membership of the floppy group) after work hours\&.
+ .sp
.if n \{\
.RS 4
.\}
@@ -843,7 +1137,35 @@ Index: pam.deb/modules/pam_group/group.conf.5
.if n \{\
.RE
.\}
-@@ -261,7 +93,7 @@
+ .PP
+-Any member of the group \'admin\' running \'xsh\' on tty*, is granted access (at any time) to the group \'plugdev\'
++Any member of the group \*(Aqadmin\*(Aq running \*(Aqxsh\*(Aq on tty*, is granted access (at any time) to the group \*(Aqplugdev\*(Aq
+ .sp
+ .if n \{\
+ .RS 4
+ .\}
+-.fam C
+-.ps -1
+ .nf
+-.if t \{\
+-.sp -1
+-.\}
+-.BB lightgray adjust-for-leading-newline
+-.sp -1
+-
+ xsh; tty* ;%admin;Al0000\-2400;plugdev
+
+-.EB lightgray adjust-for-leading-newline
+-.if t \{\
+-.sp 1
+-.\}
+ .fi
+-.fam
+-.ps +1
+ .if n \{\
+ .RE
+ .\}
+@@ -288,7 +115,7 @@
\fBpam_group\fR(8),
\fBpam.d\fR(5),
@@ -856,7 +1178,7 @@ Index: pam.deb/modules/pam_group/group.conf.5.xml
===================================================================
--- pam.deb.orig/modules/pam_group/group.conf.5.xml
+++ pam.deb/modules/pam_group/group.conf.5.xml
-@@ -118,7 +118,7 @@
+@@ -128,7 +128,7 @@
<para>
<citerefentry><refentrytitle>pam_group</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
<citerefentry><refentrytitle>pam.d</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
@@ -869,7 +1191,16 @@ Index: pam.deb/modules/pam_limits/limits.conf.5
===================================================================
--- pam.deb.orig/modules/pam_limits/limits.conf.5
+++ pam.deb/modules/pam_limits/limits.conf.5
-@@ -278,7 +278,7 @@
+@@ -93,7 +93,7 @@
+ \fI%group\fR
+ syntax\&.
+ .RE
+-.RS 4
++.sp
+
+ \fBNOTE:\fR
+ group and wildcard limits are not applied to the root user\&. To set a limit for the root user, this field must contain the literal username
+@@ -287,7 +287,7 @@
\fBpam_limits\fR(8),
\fBpam.d\fR(5),
@@ -895,25 +1226,29 @@ Index: pam.deb/modules/pam_namespace/namespace.conf.5
===================================================================
--- pam.deb.orig/modules/pam_namespace/namespace.conf.5
+++ pam.deb/modules/pam_namespace/namespace.conf.5
-@@ -1,161 +1,13 @@
+@@ -1,161 +1,22 @@
+'\" t
.\" Title: namespace.conf
.\" Author: [see the "AUTHORS" section]
-.\" Generator: DocBook XSL Stylesheets v1.74.0 <http://docbook.sf.net/>
--.\" Date: 03/02/2009
+-.\" Date: 07/08/2010
+.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-+.\" Date: 08/24/2009
++.\" Date: 08/31/2010
.\" Manual: Linux-PAM Manual
.\" Source: Linux-PAM Manual
.\" Language: English
.\"
--.TH "NAMESPACE\&.CONF" "5" "03/02/2009" "Linux-PAM Manual" "Linux\-PAM Manual"
--.\" -----------------------------------------------------------------
+-.TH "NAMESPACE\&.CONF" "5" "07/08/2010" "Linux-PAM Manual" "Linux\-PAM Manual"
++.TH "NAMESPACE\&.CONF" "5" "08/31/2010" "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
-\\$*
@@ -1057,11 +1392,12 @@ Index: pam.deb/modules/pam_namespace/namespace.conf.5
-.fi
-.\}
-..
-+.TH "NAMESPACE\&.CONF" "5" "08/24/2009" "Linux-PAM Manual" "Linux\-PAM Manual"
++.ie \n(.g .ds Aq \(aq
++.el .ds Aq '
.\" -----------------------------------------------------------------
.\" * set default formatting
.\" -----------------------------------------------------------------
-@@ -166,22 +18,22 @@
+@@ -166,22 +27,22 @@
.\" -----------------------------------------------------------------
.\" * MAIN CONTENT STARTS HERE *
.\" -----------------------------------------------------------------
@@ -1088,7 +1424,31 @@ Index: pam.deb/modules/pam_namespace/namespace.conf.5
is scanned\&. Comments are marked by
\fI#\fR
characters\&. Each non comment line represents one polyinstantiated directory\&. The fields are separated by spaces but can be quoted by
-@@ -231,7 +83,7 @@
+@@ -200,7 +61,7 @@
+ The first field,
+ \fIpolydir\fR, is the absolute pathname of the directory to polyinstantiate\&. The special string
+ \fI$HOME\fR
+-is replaced with the user\'s home directory, and
++is replaced with the user\*(Aqs home directory, and
+ \fI$USER\fR
+ with the username\&. This field cannot be blank\&.
+ .PP
+@@ -210,12 +71,12 @@
+ \fImethod\fR
+ it is then appended with "instance differentiation string" to generate the final instance directory path\&. This directory is created if it did not exist already, and is then bind mounted on the <polydir> to provide an instance of <polydir> based on the <method> column\&. The special string
+ \fI$HOME\fR
+-is replaced with the user\'s home directory, and
++is replaced with the user\*(Aqs home directory, and
+ \fI$USER\fR
+ with the username\&. This field cannot be blank\&.
+ .PP
+ The third field,
+-\fImethod\fR, is the method used for polyinstantiation\&. It can take these values; "user" for polyinstantiation based on user name, "level" for polyinstantiation based on process MLS level and user name, "context" for polyinstantiation based on process security context and user name, "tmpfs" for mounting tmpfs filesystem as an instance dir, and "tmpdir" for creating temporary directory as an instance dir which is removed when the user\'s session is closed\&. Methods "context" and "level" are only available with SELinux\&. This field cannot be blank\&.
++\fImethod\fR, is the method used for polyinstantiation\&. It can take these values; "user" for polyinstantiation based on user name, "level" for polyinstantiation based on process MLS level and user name, "context" for polyinstantiation based on process security context and user name, "tmpfs" for mounting tmpfs filesystem as an instance dir, and "tmpdir" for creating temporary directory as an instance dir which is removed when the user\*(Aqs session is closed\&. Methods "context" and "level" are only available with SELinux\&. This field cannot be blank\&.
+ .PP
+ The fourth field,
+ \fIlist_of_uids\fR, is a comma separated list of user names for whom the polyinstantiation is not performed\&. If left blank, polyinstantiation will be performed for all users\&. If the list is preceded with a single "~" character, polyinstantiation is performed only for users in the list\&.
+@@ -231,7 +92,7 @@
.PP
\fIiscript\fR=\fIpath\fR
\- path to the instance directory init script\&. The base directory for relative paths is
@@ -1097,7 +1457,7 @@ Index: pam.deb/modules/pam_namespace/namespace.conf.5
.PP
\fInoinit\fR
\- instance directory init script will not be executed\&.
-@@ -243,7 +95,7 @@
+@@ -243,7 +104,7 @@
\fIignore_instance_parent_mode\fR
.PP
In case of context or level polyinstantiation the SELinux context which is used for polyinstantiation is the context used for executing a new process as obtained by getexeccon\&. This context must be set by the calling application or
@@ -1106,7 +1466,7 @@ Index: pam.deb/modules/pam_namespace/namespace.conf.5
module\&. If this context is not set the polyinstatiation will be based just on user name\&.
.PP
The "instance differentiation string" is <user name> for "user" method and <user name>_<raw directory context> for "context" and "level" methods\&. If the whole string is too long the end of it is replaced with md5sum of itself\&. Also when command line option
-@@ -252,20 +104,12 @@
+@@ -252,22 +113,14 @@
.SH "EXAMPLES"
.PP
These are some example lines which might be specified in
@@ -1126,9 +1486,12 @@ Index: pam.deb/modules/pam_namespace/namespace.conf.5
-.sp -1
-
# The following three lines will polyinstantiate /tmp,
- # /var/tmp and user\'s home directories\&. /tmp and /var/tmp
+- # /var/tmp and user\'s home directories\&. /tmp and /var/tmp
++ # /var/tmp and user\*(Aqs home directories\&. /tmp and /var/tmp
# will be polyinstantiated based on the security level
-@@ -286,13 +130,7 @@
+ # as well as user name, whereas home directory will be
+ # polyinstantiated based on the full security context and user name\&.
+@@ -286,13 +139,7 @@
/var/tmp /var/tmp/tmp\-inst/ level root,adm
$HOME $HOME/$USER\&.inst/inst\- context
@@ -1142,7 +1505,7 @@ Index: pam.deb/modules/pam_namespace/namespace.conf.5
.if n \{\
.RE
.\}
-@@ -307,7 +145,7 @@
+@@ -307,7 +154,7 @@
\fBpam_namespace\fR(8),
\fBpam.d\fR(5),
@@ -1168,25 +1531,29 @@ Index: pam.deb/modules/pam_time/time.conf.5
===================================================================
--- pam.deb.orig/modules/pam_time/time.conf.5
+++ pam.deb/modules/pam_time/time.conf.5
-@@ -1,161 +1,13 @@
+@@ -1,161 +1,22 @@
+'\" t
.\" Title: time.conf
.\" Author: [see the "AUTHOR" section]
-.\" Generator: DocBook XSL Stylesheets v1.74.0 <http://docbook.sf.net/>
--.\" Date: 03/02/2009
+-.\" Date: 07/08/2010
+.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-+.\" Date: 08/24/2009
++.\" Date: 08/31/2010
.\" Manual: Linux-PAM Manual
.\" Source: Linux-PAM Manual
.\" Language: English
.\"
--.TH "TIME\&.CONF" "5" "03/02/2009" "Linux-PAM Manual" "Linux\-PAM Manual"
--.\" -----------------------------------------------------------------
+-.TH "TIME\&.CONF" "5" "07/08/2010" "Linux-PAM Manual" "Linux\-PAM Manual"
++.TH "TIME\&.CONF" "5" "08/31/2010" "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
-\\$*
@@ -1330,11 +1697,12 @@ Index: pam.deb/modules/pam_time/time.conf.5
-.fi
-.\}
-..
-+.TH "TIME\&.CONF" "5" "08/24/2009" "Linux-PAM Manual" "Linux\-PAM Manual"
++.ie \n(.g .ds Aq \(aq
++.el .ds Aq '
.\" -----------------------------------------------------------------
.\" * set default formatting
.\" -----------------------------------------------------------------
-@@ -166,14 +18,14 @@
+@@ -166,22 +27,22 @@
.\" -----------------------------------------------------------------
.\" * MAIN CONTENT STARTS HERE *
.\" -----------------------------------------------------------------
@@ -1347,11 +1715,37 @@ Index: pam.deb/modules/pam_time/time.conf.5
.PP
For this module to function correctly there must be a correctly formatted
-\FC/etc/security/time\&.conf\F[]
+-file present\&. White spaces are ignored and lines maybe extended with \'\e\' (escaped newlines)\&. Text following a \'#\' is ignored to the end of the line\&.
+/etc/security/time\&.conf
- file present\&. White spaces are ignored and lines maybe extended with \'\e\' (escaped newlines)\&. Text following a \'#\' is ignored to the end of the line\&.
++file present\&. White spaces are ignored and lines maybe extended with \*(Aq\e\*(Aq (escaped newlines)\&. Text following a \*(Aq#\*(Aq is ignored to the end of the line\&.
.PP
The syntax of the lines is as follows:
-@@ -212,7 +64,7 @@
+ .PP
+
+ \fIservices\fR;\fIttys\fR;\fIusers\fR;\fItimes\fR
+ .PP
+-In words, each rule occupies a line, terminated with a newline or the beginning of a comment; a \'\fB#\fR\'\&. It contains four fields separated with semicolons, \'\fB;\fR\'\&.
++In words, each rule occupies a line, terminated with a newline or the beginning of a comment; a \*(Aq\fB#\fR\*(Aq\&. It contains four fields separated with semicolons, \*(Aq\fB;\fR\*(Aq\&.
+ .PP
+ The first field, the
+ \fIservices\fR
+@@ -195,13 +56,13 @@
+ \fIusers\fR
+ field, is a logic list of users or a netgroup of users to whom this rule applies\&.
+ .PP
+-For these items the simple wildcard \'*\' may be used only once\&. With netgroups no wildcards or logic operators are allowed\&.
++For these items the simple wildcard \*(Aq*\*(Aq may be used only once\&. With netgroups no wildcards or logic operators are allowed\&.
+ .PP
+ The
+ \fItimes\fR
+ field is used to indicate the times at which this rule applies\&. The format here is a logic list of day/time\-range entries\&. The days are specified by a sequence of two character entries, MoTuSa for example is Monday Tuesday and Saturday\&. Note that repeated days are unset MoMo = no day, and MoWk = all weekdays bar Monday\&. The two character combinations accepted are Mo Tu We Th Fr Sa Su Wk Wd Al, the last two being week\-end days and all 7 days of the week respectively\&. As a final example, AlFr means all days except Friday\&.
+ .PP
+-Each day/time\-range can be prefixed with a \'!\' to indicate "anything but"\&. The time\-range part is two 24\-hour times HHMM, separated by a hyphen, indicating the start and finish time (if the finish time is smaller than the start time it is deemed to apply on the following day)\&.
++Each day/time\-range can be prefixed with a \*(Aq!\*(Aq to indicate "anything but"\&. The time\-range part is two 24\-hour times HHMM, separated by a hyphen, indicating the start and finish time (if the finish time is smaller than the start time it is deemed to apply on the following day)\&.
+ .PP
+ For a rule to be active, ALL of service+ttys+users must be satisfied by the applying process\&.
+ .PP
+@@ -212,7 +73,7 @@
.SH "EXAMPLES"
.PP
These are some example lines which might be specified in
@@ -1360,7 +1754,7 @@ Index: pam.deb/modules/pam_time/time.conf.5
.PP
All users except for
\fIroot\fR
-@@ -221,24 +73,10 @@
+@@ -221,24 +82,10 @@
.if n \{\
.RS 4
.\}
@@ -1385,7 +1779,7 @@ Index: pam.deb/modules/pam_time/time.conf.5
.if n \{\
.RE
.\}
-@@ -249,17 +87,11 @@
+@@ -249,17 +96,11 @@
.if n \{\
.RS 4
.\}
@@ -1403,7 +1797,7 @@ Index: pam.deb/modules/pam_time/time.conf.5
.if n \{\
.RE
.\}
-@@ -269,7 +101,7 @@
+@@ -269,7 +110,7 @@
\fBpam_time\fR(8),
\fBpam.d\fR(5),
@@ -1429,25 +1823,29 @@ Index: pam.deb/modules/pam_access/pam_access.8
===================================================================
--- pam.deb.orig/modules/pam_access/pam_access.8
+++ pam.deb/modules/pam_access/pam_access.8
-@@ -1,161 +1,13 @@
+@@ -1,161 +1,22 @@
+'\" t
.\" Title: pam_access
.\" Author: [see the "AUTHORS" section]
-.\" Generator: DocBook XSL Stylesheets v1.74.0 <http://docbook.sf.net/>
--.\" Date: 06/16/2009
+-.\" Date: 07/08/2010
+.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-+.\" Date: 08/24/2009
++.\" Date: 08/31/2010
.\" Manual: Linux-PAM Manual
.\" Source: Linux-PAM Manual
.\" Language: English
.\"
--.TH "PAM_ACCESS" "8" "06/16/2009" "Linux-PAM Manual" "Linux-PAM Manual"
--.\" -----------------------------------------------------------------
+-.TH "PAM_ACCESS" "8" "07/08/2010" "Linux-PAM Manual" "Linux-PAM Manual"
++.TH "PAM_ACCESS" "8" "08/31/2010" "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
-\\$*
@@ -1591,11 +1989,12 @@ Index: pam.deb/modules/pam_access/pam_access.8
-.fi
-.\}
-..
-+.TH "PAM_ACCESS" "8" "08/24/2009" "Linux-PAM Manual" "Linux-PAM Manual"
++.ie \n(.g .ds Aq \(aq
++.el .ds Aq '
.\" -----------------------------------------------------------------
.\" * set default formatting
.\" -----------------------------------------------------------------
-@@ -166,19 +18,17 @@
+@@ -166,20 +27,18 @@
.\" -----------------------------------------------------------------
.\" * MAIN CONTENT STARTS HERE *
.\" -----------------------------------------------------------------
@@ -1614,11 +2013,13 @@ Index: pam.deb/modules/pam_access/pam_access.8
.PP
By default rules for access management are taken from config file
-\FC/etc/security/access\&.conf\F[]
+-if you don\'t specify another file\&.
+/etc/security/access\&.conf
- if you don\'t specify another file\&.
++if you don\*(Aqt specify another file\&.
.PP
If Linux PAM is compiled with audit support the module will report when it denies access based on origin (host or tty)\&.
-@@ -187,7 +37,7 @@
+ .SH "OPTIONS"
+@@ -187,7 +46,7 @@
\fBaccessfile=\fR\fB\fI/path/to/access\&.conf\fR\fR
.RS 4
Indicate an alternative
@@ -1627,7 +2028,27 @@ Index: pam.deb/modules/pam_access/pam_access.8
style configuration file to override the default\&. This can be useful when different services need different access lists\&.
.RE
.PP
-@@ -259,7 +109,7 @@
+@@ -206,16 +65,16 @@
+ .RS 4
+ This option modifies the field separator character that pam_access will recognize when parsing the access configuration file\&. For example:
+ \fBfieldsep=|\fR
+-will cause the default `:\' character to be treated as part of a field value and `|\' becomes the field separator\&. Doing this may be useful in conjunction with a system that wants to use pam_access with X based applications, since the
++will cause the default `:\*(Aq character to be treated as part of a field value and `|\*(Aq becomes the field separator\&. Doing this may be useful in conjunction with a system that wants to use pam_access with X based applications, since the
+ \fBPAM_TTY\fR
+-item is likely to be of the form "hostname:0" which includes a `:\' character in its value\&. But you should not need this\&.
++item is likely to be of the form "hostname:0" which includes a `:\*(Aq character in its value\&. But you should not need this\&.
+ .RE
+ .PP
+ \fBlistsep=\fR\fB\fIseparators\fR\fR
+ .RS 4
+ This option modifies the list separator character that pam_access will recognize when parsing the access configuration file\&. For example:
+ \fBlistsep=,\fR
+-will cause the default ` \' (space) and `\et\' (tab) characters to be treated as part of a list element value and `,\' becomes the only list element separator\&. Doing this may be useful on a system with group information obtained from a Windows domain, where the default built\-in groups "Domain Users", "Domain Admins" contain a space\&.
++will cause the default ` \*(Aq (space) and `\et\*(Aq (tab) characters to be treated as part of a list element value and `,\*(Aq becomes the only list element separator\&. Doing this may be useful on a system with group information obtained from a Windows domain, where the default built\-in groups "Domain Users", "Domain Admins" contain a space\&.
+ .RE
+ .PP
+ \fBnodefgroup\fR
+@@ -259,7 +118,7 @@
.RE
.SH "FILES"
.PP
@@ -1636,7 +2057,7 @@ Index: pam.deb/modules/pam_access/pam_access.8
.RS 4
Default configuration file
.RE
-@@ -268,7 +118,7 @@
+@@ -268,7 +127,7 @@
\fBaccess.conf\fR(5),
\fBpam.d\fR(5),
@@ -1662,25 +2083,29 @@ Index: pam.deb/modules/pam_cracklib/pam_cracklib.8
===================================================================
--- pam.deb.orig/modules/pam_cracklib/pam_cracklib.8
+++ pam.deb/modules/pam_cracklib/pam_cracklib.8
-@@ -1,161 +1,13 @@
+@@ -1,161 +1,22 @@
+'\" t
.\" Title: pam_cracklib
.\" Author: [see the "AUTHOR" section]
-.\" Generator: DocBook XSL Stylesheets v1.74.0 <http://docbook.sf.net/>
--.\" Date: 06/16/2009
+-.\" Date: 07/08/2010
+.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-+.\" Date: 08/24/2009
++.\" Date: 08/31/2010
.\" Manual: Linux-PAM Manual
.\" Source: Linux-PAM Manual
.\" Language: English
.\"
--.TH "PAM_CRACKLIB" "8" "06/16/2009" "Linux-PAM Manual" "Linux\-PAM Manual"
--.\" -----------------------------------------------------------------
+-.TH "PAM_CRACKLIB" "8" "07/08/2010" "Linux-PAM Manual" "Linux\-PAM Manual"
++.TH "PAM_CRACKLIB" "8" "08/31/2010" "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
-\\$*
@@ -1824,11 +2249,12 @@ Index: pam.deb/modules/pam_cracklib/pam_cracklib.8
-.fi
-.\}
-..
-+.TH "PAM_CRACKLIB" "8" "08/24/2009" "Linux-PAM Manual" "Linux\-PAM Manual"
++.ie \n(.g .ds Aq \(aq
++.el .ds Aq '
.\" -----------------------------------------------------------------
.\" * set default formatting
.\" -----------------------------------------------------------------
-@@ -166,13 +18,11 @@
+@@ -166,13 +27,11 @@
.\" -----------------------------------------------------------------
.\" * MAIN CONTENT STARTS HERE *
.\" -----------------------------------------------------------------
@@ -1844,7 +2270,16 @@ Index: pam.deb/modules/pam_cracklib/pam_cracklib.8
.SH "DESCRIPTION"
.PP
This module can be plugged into the
-@@ -421,15 +271,7 @@
+@@ -234,7 +93,7 @@
+ .PP
+ Contains user name
+ .RS 4
+-Optional check whether the password contains the user\'s name in some form\&.
++Optional check whether the password contains the user\*(Aqs name in some form\&.
+ .RE
+ .PP
+ This module with no arguments will work well for standard unix password encryption\&. With md5 encryption, passwords can be longer than 8 characters and the default settings for this module can make it hard for the user to choose a satisfactory new password\&. Notably, the requirement that the new password contain no more than 1/2 of the characters in the old password becomes a non\-trivial constraint\&. For example, an old password of the form "the quick brown fox jumped over the lazy dogs" would be difficult to change\&.\&.\&. In addition, the default action is to allow passwords as small as 5 characters in length\&. For a md5 systems it can be a good idea to increase the required minimum size of a password\&. One can then allow more credit for different kinds of characters but accept that the new password may share most of these characters with the old password\&.
+@@ -421,15 +280,7 @@
.if n \{\
.RS 4
.\}
@@ -1860,7 +2295,7 @@ Index: pam.deb/modules/pam_cracklib/pam_cracklib.8
#
# These lines stack two password type modules\&. In this example the
# user is given 3 opportunities to enter a strong password\&. The
-@@ -440,33 +282,19 @@
+@@ -440,33 +291,19 @@
passwd password required pam_cracklib\&.so retry=3
passwd password required pam_unix\&.so use_authtok
@@ -1895,7 +2330,7 @@ Index: pam.deb/modules/pam_cracklib/pam_cracklib.8
#%PAM\-1\&.0
#
# These lines allow a md5 systems to support passwords of at least 14
-@@ -478,13 +306,7 @@
+@@ -478,31 +315,17 @@
difok=3 minlen=15 dcredit= 2 ocredit=2
password required pam_unix\&.so use_authtok nullok md5
@@ -1909,7 +2344,10 @@ Index: pam.deb/modules/pam_cracklib/pam_cracklib.8
.if n \{\
.RE
.\}
-@@ -494,15 +316,7 @@
+ .PP
+-And here is another example in case you don\'t want to use credits:
++And here is another example in case you don\*(Aqt want to use credits:
+ .sp
.if n \{\
.RS 4
.\}
@@ -1925,7 +2363,7 @@ Index: pam.deb/modules/pam_cracklib/pam_cracklib.8
#%PAM\-1\&.0
#
# These lines require the user to select a password with a minimum
-@@ -513,13 +327,7 @@
+@@ -513,13 +336,7 @@
dcredit=\-1 ucredit=\-1 ocredit=\-1 lcredit=0 minlen=8
password required pam_unix\&.so use_authtok nullok md5
@@ -1939,7 +2377,7 @@ Index: pam.deb/modules/pam_cracklib/pam_cracklib.8
.if n \{\
.RE
.\}
-@@ -529,7 +337,7 @@
+@@ -529,7 +346,7 @@
\fBpam.conf\fR(5),
\fBpam.d\fR(5),
@@ -1965,25 +2403,29 @@ Index: pam.deb/modules/pam_debug/pam_debug.8
===================================================================
--- pam.deb.orig/modules/pam_debug/pam_debug.8
+++ pam.deb/modules/pam_debug/pam_debug.8
-@@ -1,161 +1,13 @@
+@@ -1,161 +1,22 @@
+'\" t
.\" Title: pam_debug
.\" Author: [see the "AUTHOR" section]
-.\" Generator: DocBook XSL Stylesheets v1.74.0 <http://docbook.sf.net/>
--.\" Date: 03/02/2009
+-.\" Date: 07/08/2010
+.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-+.\" Date: 08/24/2009
++.\" Date: 08/31/2010
.\" Manual: Linux-PAM Manual
.\" Source: Linux-PAM Manual
.\" Language: English
.\"
--.TH "PAM_DEBUG" "8" "03/02/2009" "Linux-PAM Manual" "Linux\-PAM Manual"
--.\" -----------------------------------------------------------------
+-.TH "PAM_DEBUG" "8" "07/08/2010" "Linux-PAM Manual" "Linux\-PAM Manual"
++.TH "PAM_DEBUG" "8" "08/31/2010" "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
-\\$*
@@ -2127,11 +2569,12 @@ Index: pam.deb/modules/pam_debug/pam_debug.8
-.fi
-.\}
-..
-+.TH "PAM_DEBUG" "8" "08/24/2009" "Linux-PAM Manual" "Linux\-PAM Manual"
++.ie \n(.g .ds Aq \(aq
++.el .ds Aq '
.\" -----------------------------------------------------------------
.\" * set default formatting
.\" -----------------------------------------------------------------
-@@ -166,13 +18,11 @@
+@@ -166,13 +27,11 @@
.\" -----------------------------------------------------------------
.\" * MAIN CONTENT STARTS HERE *
.\" -----------------------------------------------------------------
@@ -2147,7 +2590,7 @@ Index: pam.deb/modules/pam_debug/pam_debug.8
.SH "DESCRIPTION"
.PP
The pam_debug PAM module is intended as a debugging aide for determining how the PAM stack is operating\&. This module returns what its module arguments tell it to return\&.
-@@ -263,15 +113,7 @@
+@@ -263,15 +122,7 @@
.if n \{\
.RS 4
.\}
@@ -2163,7 +2606,7 @@ Index: pam.deb/modules/pam_debug/pam_debug.8
auth requisite pam_permit\&.so
auth [success=2 default=ok] pam_debug\&.so auth=perm_denied cred=success
auth [default=reset] pam_debug\&.so auth=success cred=perm_denied
-@@ -279,13 +121,7 @@
+@@ -279,13 +130,7 @@
auth optional pam_debug\&.so auth=perm_denied cred=perm_denied
auth sufficient pam_debug\&.so auth=success cred=success
@@ -2177,7 +2620,7 @@ Index: pam.deb/modules/pam_debug/pam_debug.8
.if n \{\
.RE
.\}
-@@ -294,7 +130,7 @@
+@@ -294,7 +139,7 @@
\fBpam.conf\fR(5),
\fBpam.d\fR(5),
@@ -2203,25 +2646,29 @@ Index: pam.deb/modules/pam_deny/pam_deny.8
===================================================================
--- pam.deb.orig/modules/pam_deny/pam_deny.8
+++ pam.deb/modules/pam_deny/pam_deny.8
-@@ -1,161 +1,13 @@
+@@ -1,161 +1,22 @@
+'\" t
.\" Title: pam_deny
.\" Author: [see the "AUTHOR" section]
-.\" Generator: DocBook XSL Stylesheets v1.74.0 <http://docbook.sf.net/>
--.\" Date: 03/02/2009
+-.\" Date: 07/08/2010
+.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-+.\" Date: 08/24/2009
++.\" Date: 08/31/2010
.\" Manual: Linux-PAM Manual
.\" Source: Linux-PAM Manual
.\" Language: English
.\"
--.TH "PAM_DENY" "8" "03/02/2009" "Linux-PAM Manual" "Linux\-PAM Manual"
--.\" -----------------------------------------------------------------
+-.TH "PAM_DENY" "8" "07/08/2010" "Linux-PAM Manual" "Linux\-PAM Manual"
++.TH "PAM_DENY" "8" "08/31/2010" "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
-\\$*
@@ -2365,11 +2812,12 @@ Index: pam.deb/modules/pam_deny/pam_deny.8
-.fi
-.\}
-..
-+.TH "PAM_DENY" "8" "08/24/2009" "Linux-PAM Manual" "Linux\-PAM Manual"
++.ie \n(.g .ds Aq \(aq
++.el .ds Aq '
.\" -----------------------------------------------------------------
.\" * set default formatting
.\" -----------------------------------------------------------------
-@@ -166,13 +18,11 @@
+@@ -166,13 +27,11 @@
.\" -----------------------------------------------------------------
.\" * MAIN CONTENT STARTS HERE *
.\" -----------------------------------------------------------------
@@ -2385,7 +2833,7 @@ Index: pam.deb/modules/pam_deny/pam_deny.8
.SH "DESCRIPTION"
.PP
This module can be used to deny access\&. It always indicates a failure to the application through the PAM framework\&. It might be suitable for using for default (the
-@@ -214,15 +64,7 @@
+@@ -214,18 +73,10 @@
.if n \{\
.RS 4
.\}
@@ -2400,8 +2848,12 @@ Index: pam.deb/modules/pam_deny/pam_deny.8
-
#%PAM\-1\&.0
#
- # If we don\'t have config entries for a service, the
-@@ -237,13 +79,7 @@
+-# If we don\'t have config entries for a service, the
++# If we don\*(Aqt have config entries for a service, the
+ # OTHER entries are used\&. To be secure, warn and deny
+ # access to everything\&.
+ other auth required pam_warn\&.so
+@@ -237,13 +88,7 @@
other session required pam_warn\&.so
other session required pam_deny\&.so
@@ -2415,7 +2867,7 @@ Index: pam.deb/modules/pam_deny/pam_deny.8
.if n \{\
.RE
.\}
-@@ -252,7 +88,7 @@
+@@ -252,7 +97,7 @@
\fBpam.conf\fR(5),
\fBpam.d\fR(5),
@@ -2441,25 +2893,29 @@ Index: pam.deb/modules/pam_echo/pam_echo.8
===================================================================
--- pam.deb.orig/modules/pam_echo/pam_echo.8
+++ pam.deb/modules/pam_echo/pam_echo.8
-@@ -1,161 +1,13 @@
+@@ -1,161 +1,22 @@
+'\" t
.\" Title: pam_echo
.\" Author: [see the "AUTHOR" section]
-.\" Generator: DocBook XSL Stylesheets v1.74.0 <http://docbook.sf.net/>
--.\" Date: 06/16/2009
+-.\" Date: 07/08/2010
+.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-+.\" Date: 08/24/2009
++.\" Date: 08/31/2010
.\" Manual: Linux-PAM Manual
.\" Source: Linux-PAM Manual
.\" Language: English
.\"
--.TH "PAM_ECHO" "8" "06/16/2009" "Linux-PAM Manual" "Linux-PAM Manual"
--.\" -----------------------------------------------------------------
+-.TH "PAM_ECHO" "8" "07/08/2010" "Linux-PAM Manual" "Linux-PAM Manual"
++.TH "PAM_ECHO" "8" "08/31/2010" "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
-\\$*
@@ -2603,11 +3059,12 @@ Index: pam.deb/modules/pam_echo/pam_echo.8
-.fi
-.\}
-..
-+.TH "PAM_ECHO" "8" "08/24/2009" "Linux-PAM Manual" "Linux-PAM Manual"
++.ie \n(.g .ds Aq \(aq
++.el .ds Aq '
.\" -----------------------------------------------------------------
.\" * set default formatting
.\" -----------------------------------------------------------------
-@@ -166,13 +18,11 @@
+@@ -166,13 +27,11 @@
.\" -----------------------------------------------------------------
.\" * MAIN CONTENT STARTS HERE *
.\" -----------------------------------------------------------------
@@ -2623,7 +3080,7 @@ Index: pam.deb/modules/pam_echo/pam_echo.8
.SH "DESCRIPTION"
.PP
The
-@@ -221,7 +71,7 @@
+@@ -221,7 +80,7 @@
\fBfile=\fR\fB\fI/path/message\fR\fR
.RS 4
The content of the file
@@ -2632,7 +3089,7 @@ Index: pam.deb/modules/pam_echo/pam_echo.8
will be printed with the PAM conversion function as PAM_TEXT_INFO\&.
.RE
.SH "MODULE TYPES PROVIDED"
-@@ -254,25 +104,11 @@
+@@ -254,25 +113,11 @@
.if n \{\
.RS 4
.\}
@@ -2658,7 +3115,7 @@ Index: pam.deb/modules/pam_echo/pam_echo.8
.if n \{\
.RE
.\}
-@@ -282,7 +118,7 @@
+@@ -282,7 +127,7 @@
\fBpam.conf\fR(8),
\fBpam.d\fR(5),
@@ -2684,25 +3141,29 @@ Index: pam.deb/modules/pam_env/pam_env.8
===================================================================
--- pam.deb.orig/modules/pam_env/pam_env.8
+++ pam.deb/modules/pam_env/pam_env.8
-@@ -1,161 +1,13 @@
+@@ -1,161 +1,22 @@
+'\" t
.\" Title: pam_env
.\" Author: [see the "AUTHOR" section]
-.\" Generator: DocBook XSL Stylesheets v1.74.0 <http://docbook.sf.net/>
--.\" Date: 06/16/2009
+-.\" Date: 07/08/2010
+.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-+.\" Date: 08/24/2009
++.\" Date: 08/31/2010
.\" Manual: Linux-PAM Manual
.\" Source: Linux-PAM Manual
.\" Language: English
.\"
--.TH "PAM_ENV" "8" "06/16/2009" "Linux-PAM Manual" "Linux-PAM Manual"
--.\" -----------------------------------------------------------------
+-.TH "PAM_ENV" "8" "07/08/2010" "Linux-PAM Manual" "Linux-PAM Manual"
++.TH "PAM_ENV" "8" "08/31/2010" "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
-\\$*
@@ -2846,11 +3307,12 @@ Index: pam.deb/modules/pam_env/pam_env.8
-.fi
-.\}
-..
-+.TH "PAM_ENV" "8" "08/24/2009" "Linux-PAM Manual" "Linux-PAM Manual"
++.ie \n(.g .ds Aq \(aq
++.el .ds Aq '
.\" -----------------------------------------------------------------
.\" * set default formatting
.\" -----------------------------------------------------------------
-@@ -166,13 +18,11 @@
+@@ -166,13 +27,11 @@
.\" -----------------------------------------------------------------
.\" * MAIN CONTENT STARTS HERE *
.\" -----------------------------------------------------------------
@@ -2866,7 +3328,7 @@ Index: pam.deb/modules/pam_env/pam_env.8
.SH "DESCRIPTION"
.PP
The pam_env PAM module allows the (un)setting of environment variables\&. Supported is the use of previously set environment variables as well as
-@@ -180,12 +30,12 @@
+@@ -180,12 +39,12 @@
\fIPAM_RHOST\fR\&.
.PP
By default rules for (un)setting of variables is taken from the config file
@@ -2881,7 +3343,7 @@ Index: pam.deb/modules/pam_env/pam_env.8
by default)\&. You can change the default file to parse, with the
\fIenvfile\fR
flag and turn it on or off by setting the
-@@ -196,7 +46,7 @@
+@@ -196,7 +55,7 @@
\fBconffile=\fR\fB\fI/path/to/pam_env\&.conf\fR\fR
.RS 4
Indicate an alternative
@@ -2890,7 +3352,7 @@ Index: pam.deb/modules/pam_env/pam_env.8
style configuration file to override the default\&. This can be useful when different services need different environments\&.
.RE
.PP
-@@ -209,7 +59,7 @@
+@@ -209,7 +68,7 @@
\fBenvfile=\fR\fB\fI/path/to/environment\fR\fR
.RS 4
Indicate an alternative
@@ -2899,7 +3361,7 @@ Index: pam.deb/modules/pam_env/pam_env.8
file to override the default\&. This can be useful when different services need different environments\&.
.RE
.PP
-@@ -221,7 +71,7 @@
+@@ -221,7 +80,7 @@
\fBuser_envfile=\fR\fB\fIfilename\fR\fR
.RS 4
Indicate an alternative
@@ -2908,7 +3370,7 @@ Index: pam.deb/modules/pam_env/pam_env.8
file to override the default\&. This can be useful when different services need different environments\&. The filename is relative to the user home directory\&.
.RE
.PP
-@@ -259,17 +109,17 @@
+@@ -259,17 +118,17 @@
.RE
.SH "FILES"
.PP
@@ -2929,7 +3391,7 @@ Index: pam.deb/modules/pam_env/pam_env.8
.RS 4
User specific environment file
.RE
-@@ -278,7 +128,7 @@
+@@ -278,7 +137,7 @@
\fBpam_env.conf\fR(5),
\fBpam.d\fR(5),
@@ -2955,25 +3417,29 @@ Index: pam.deb/modules/pam_exec/pam_exec.8
===================================================================
--- pam.deb.orig/modules/pam_exec/pam_exec.8
+++ pam.deb/modules/pam_exec/pam_exec.8
-@@ -1,161 +1,13 @@
+@@ -1,161 +1,22 @@
+'\" t
.\" Title: pam_exec
.\" Author: [see the "AUTHOR" section]
-.\" Generator: DocBook XSL Stylesheets v1.74.0 <http://docbook.sf.net/>
--.\" Date: 06/16/2009
+-.\" Date: 07/08/2010
+.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-+.\" Date: 02/01/2010
++.\" Date: 08/31/2010
.\" Manual: Linux-PAM Manual
.\" Source: Linux-PAM Manual
.\" Language: English
.\"
--.TH "PAM_EXEC" "8" "06/16/2009" "Linux-PAM Manual" "Linux\-PAM Manual"
--.\" -----------------------------------------------------------------
+-.TH "PAM_EXEC" "8" "07/08/2010" "Linux-PAM Manual" "Linux\-PAM Manual"
++.TH "PAM_EXEC" "8" "08/31/2010" "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
-\\$*
@@ -3117,11 +3583,12 @@ Index: pam.deb/modules/pam_exec/pam_exec.8
-.fi
-.\}
-..
-+.TH "PAM_EXEC" "8" "02/01/2010" "Linux-PAM Manual" "Linux\-PAM Manual"
++.ie \n(.g .ds Aq \(aq
++.el .ds Aq '
.\" -----------------------------------------------------------------
.\" * set default formatting
.\" -----------------------------------------------------------------
-@@ -166,13 +18,11 @@
+@@ -166,18 +27,16 @@
.\" -----------------------------------------------------------------
.\" * MAIN CONTENT STARTS HERE *
.\" -----------------------------------------------------------------
@@ -3137,7 +3604,13 @@ Index: pam.deb/modules/pam_exec/pam_exec.8
.SH "DESCRIPTION"
.PP
pam_exec is a PAM module that can be used to run an external command\&.
-@@ -210,7 +60,7 @@
+ .PP
+-The child\'s environment is set to the current PAM environment list, as returned by
++The child\*(Aqs environment is set to the current PAM environment list, as returned by
+ \fBpam_getenvlist\fR(3)
+ In addition, the following PAM items are exported as environment variables:
+ \fIPAM_RHOST\fR,
+@@ -210,7 +69,7 @@
\fBlog=\fR\fB\fIfile\fR\fR
.RS 4
The output of the command is appended to
@@ -3146,7 +3619,7 @@ Index: pam.deb/modules/pam_exec/pam_exec.8
.RE
.PP
\fBquiet\fR
-@@ -256,30 +106,16 @@
+@@ -256,30 +115,16 @@
.SH "EXAMPLES"
.PP
Add the following line to
@@ -3166,7 +3639,7 @@ Index: pam.deb/modules/pam_exec/pam_exec.8
-.BB lightgray adjust-for-leading-newline
-.sp -1
-
- passwd optional pam_exec\&.so seteuid make \-C /var/yp
+ password optional pam_exec\&.so seteuid /usr/bin/make \-C /var/yp
-.EB lightgray adjust-for-leading-newline
-.if t \{\
@@ -3178,7 +3651,7 @@ Index: pam.deb/modules/pam_exec/pam_exec.8
.if n \{\
.RE
.\}
-@@ -289,15 +125,9 @@
+@@ -289,15 +134,9 @@
.if n \{\
.RS 4
.\}
@@ -3194,7 +3667,7 @@ Index: pam.deb/modules/pam_exec/pam_exec.8
.if n \{\
.RE
.\}
-@@ -308,7 +138,7 @@
+@@ -308,7 +147,7 @@
\fBpam.conf\fR(5),
\fBpam.d\fR(5),
@@ -3220,25 +3693,29 @@ Index: pam.deb/modules/pam_faildelay/pam_faildelay.8
===================================================================
--- pam.deb.orig/modules/pam_faildelay/pam_faildelay.8
+++ pam.deb/modules/pam_faildelay/pam_faildelay.8
-@@ -1,161 +1,13 @@
+@@ -1,161 +1,22 @@
+'\" t
.\" Title: pam_faildelay
.\" Author: [see the "AUTHOR" section]
-.\" Generator: DocBook XSL Stylesheets v1.74.0 <http://docbook.sf.net/>
--.\" Date: 03/02/2009
+-.\" Date: 07/08/2010
+.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-+.\" Date: 08/24/2009
++.\" Date: 08/31/2010
.\" Manual: Linux-PAM Manual
.\" Source: Linux-PAM Manual
.\" Language: English
.\"
--.TH "PAM_FAILDELAY" "8" "03/02/2009" "Linux-PAM Manual" "Linux\-PAM Manual"
--.\" -----------------------------------------------------------------
+-.TH "PAM_FAILDELAY" "8" "07/08/2010" "Linux-PAM Manual" "Linux\-PAM Manual"
++.TH "PAM_FAILDELAY" "8" "08/31/2010" "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
-\\$*
@@ -3382,11 +3859,12 @@ Index: pam.deb/modules/pam_faildelay/pam_faildelay.8
-.fi
-.\}
-..
-+.TH "PAM_FAILDELAY" "8" "08/24/2009" "Linux-PAM Manual" "Linux\-PAM Manual"
++.ie \n(.g .ds Aq \(aq
++.el .ds Aq '
.\" -----------------------------------------------------------------
.\" * set default formatting
.\" -----------------------------------------------------------------
-@@ -166,13 +18,11 @@
+@@ -166,13 +27,11 @@
.\" -----------------------------------------------------------------
.\" * MAIN CONTENT STARTS HERE *
.\" -----------------------------------------------------------------
@@ -3402,7 +3880,7 @@ Index: pam.deb/modules/pam_faildelay/pam_faildelay.8
.SH "DESCRIPTION"
.PP
pam_faildelay is a PAM module that can be used to set the delay on failure per\-application\&.
-@@ -180,7 +30,7 @@
+@@ -180,7 +39,7 @@
If no
\fBdelay\fR
is given, pam_faildelay will use the value of FAIL_DELAY from
@@ -3411,7 +3889,7 @@ Index: pam.deb/modules/pam_faildelay/pam_faildelay.8
.SH "OPTIONS"
.PP
\fBdebug\fR
-@@ -215,24 +65,10 @@
+@@ -215,24 +74,10 @@
.if n \{\
.RS 4
.\}
@@ -3436,7 +3914,7 @@ Index: pam.deb/modules/pam_faildelay/pam_faildelay.8
.if n \{\
.RE
.\}
-@@ -243,7 +79,7 @@
+@@ -243,7 +88,7 @@
\fBpam_fail_delay\fR(3),
\fBpam.conf\fR(5),
\fBpam.d\fR(5),
@@ -3462,25 +3940,29 @@ Index: pam.deb/modules/pam_filter/pam_filter.8
===================================================================
--- pam.deb.orig/modules/pam_filter/pam_filter.8
+++ pam.deb/modules/pam_filter/pam_filter.8
-@@ -1,161 +1,13 @@
+@@ -1,161 +1,22 @@
+'\" t
.\" Title: pam_filter
.\" Author: [see the "AUTHOR" section]
-.\" Generator: DocBook XSL Stylesheets v1.74.0 <http://docbook.sf.net/>
--.\" Date: 06/16/2009
+-.\" Date: 07/08/2010
+.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-+.\" Date: 08/24/2009
++.\" Date: 08/31/2010
.\" Manual: Linux-PAM Manual
.\" Source: Linux-PAM Manual
.\" Language: English
.\"
--.TH "PAM_FILTER" "8" "06/16/2009" "Linux-PAM Manual" "Linux\-PAM Manual"
--.\" -----------------------------------------------------------------
+-.TH "PAM_FILTER" "8" "07/08/2010" "Linux-PAM Manual" "Linux\-PAM Manual"
++.TH "PAM_FILTER" "8" "08/31/2010" "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
-\\$*
@@ -3624,11 +4106,12 @@ Index: pam.deb/modules/pam_filter/pam_filter.8
-.fi
-.\}
-..
-+.TH "PAM_FILTER" "8" "08/24/2009" "Linux-PAM Manual" "Linux\-PAM Manual"
++.ie \n(.g .ds Aq \(aq
++.el .ds Aq '
.\" -----------------------------------------------------------------
.\" * set default formatting
.\" -----------------------------------------------------------------
-@@ -166,13 +18,11 @@
+@@ -166,13 +27,11 @@
.\" -----------------------------------------------------------------
.\" * MAIN CONTENT STARTS HERE *
.\" -----------------------------------------------------------------
@@ -3644,7 +4127,25 @@ Index: pam.deb/modules/pam_filter/pam_filter.8
.SH "DESCRIPTION"
.PP
This module is intended to be a platform for providing access to all of the input/output that passes between the user and the application\&. It is only suitable for tty\-based and (stdin/stdout) applications\&.
-@@ -289,30 +139,16 @@
+@@ -205,7 +64,7 @@
+ .PP
+ \fBnon_term\fR
+ .RS 4
+-don\'t try to set the
++don\*(Aqt try to set the
+ \fIPAM_TTY\fR
+ item\&.
+ .RE
+@@ -221,7 +80,7 @@
+ and
+ \fI2\fR\&. These indicate the precise time that the filter is to be run\&. To understand this concept it will be useful to have read the
+ \fBpam\fR(3)
+-manual page\&. Basically, for each management group there are up to two ways of calling the module\'s functions\&. In the case of the
++manual page\&. Basically, for each management group there are up to two ways of calling the module\*(Aqs functions\&. In the case of the
+ \fIauthentication\fR
+ and
+ \fIsession\fR
+@@ -289,30 +148,16 @@
.SH "EXAMPLES"
.PP
Add the following line to
@@ -3676,7 +4177,7 @@ Index: pam.deb/modules/pam_filter/pam_filter.8
.if n \{\
.RE
.\}
-@@ -322,7 +158,7 @@
+@@ -322,7 +167,7 @@
\fBpam.conf\fR(5),
\fBpam.d\fR(5),
@@ -3702,25 +4203,29 @@ Index: pam.deb/modules/pam_ftp/pam_ftp.8
===================================================================
--- pam.deb.orig/modules/pam_ftp/pam_ftp.8
+++ pam.deb/modules/pam_ftp/pam_ftp.8
-@@ -1,161 +1,13 @@
+@@ -1,161 +1,22 @@
+'\" t
.\" Title: pam_ftp
.\" Author: [see the "AUTHOR" section]
-.\" Generator: DocBook XSL Stylesheets v1.74.0 <http://docbook.sf.net/>
--.\" Date: 06/16/2009
+-.\" Date: 07/08/2010
+.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-+.\" Date: 08/24/2009
++.\" Date: 08/31/2010
.\" Manual: Linux-PAM Manual
.\" Source: Linux-PAM Manual
.\" Language: English
.\"
--.TH "PAM_FTP" "8" "06/16/2009" "Linux-PAM Manual" "Linux\-PAM Manual"
--.\" -----------------------------------------------------------------
+-.TH "PAM_FTP" "8" "07/08/2010" "Linux-PAM Manual" "Linux\-PAM Manual"
++.TH "PAM_FTP" "8" "08/31/2010" "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
-\\$*
@@ -3864,11 +4369,12 @@ Index: pam.deb/modules/pam_ftp/pam_ftp.8
-.fi
-.\}
-..
-+.TH "PAM_FTP" "8" "08/24/2009" "Linux-PAM Manual" "Linux\-PAM Manual"
++.ie \n(.g .ds Aq \(aq
++.el .ds Aq '
.\" -----------------------------------------------------------------
.\" * set default formatting
.\" -----------------------------------------------------------------
-@@ -166,13 +18,11 @@
+@@ -166,21 +27,19 @@
.\" -----------------------------------------------------------------
.\" * MAIN CONTENT STARTS HERE *
.\" -----------------------------------------------------------------
@@ -3884,7 +4390,17 @@ Index: pam.deb/modules/pam_ftp/pam_ftp.8
.SH "DESCRIPTION"
.PP
pam_ftp is a PAM module which provides a pluggable anonymous ftp mode of access\&.
-@@ -234,21 +84,13 @@
+ .PP
+-This module intercepts the user\'s name and password\&. If the name is
++This module intercepts the user\*(Aqs name and password\&. If the name is
+ \fIftp\fR
+ or
+-\fIanonymous\fR, the user\'s password is broken up at the
++\fIanonymous\fR, the user\*(Aqs password is broken up at the
+ \fI@\fR
+ delimiter into a
+ \fIPAM_RUSER\fR
+@@ -234,21 +93,13 @@
.SH "EXAMPLES"
.PP
Add the following line to
@@ -3907,7 +4423,7 @@ Index: pam.deb/modules/pam_ftp/pam_ftp.8
#
# ftpd; add ftp\-specifics\&. These lines enable anonymous ftp over
# standard UN*X access (the listfile entry blocks access to
-@@ -259,13 +101,7 @@
+@@ -259,13 +110,7 @@
auth required pam_listfile\&.so \e
onerr=succeed item=user sense=deny file=/etc/ftpusers
@@ -3921,7 +4437,7 @@ Index: pam.deb/modules/pam_ftp/pam_ftp.8
.if n \{\
.RE
.\}
-@@ -275,7 +111,7 @@
+@@ -275,7 +120,7 @@
\fBpam.conf\fR(5),
\fBpam.d\fR(5),
@@ -3947,25 +4463,29 @@ Index: pam.deb/modules/pam_group/pam_group.8
===================================================================
--- pam.deb.orig/modules/pam_group/pam_group.8
+++ pam.deb/modules/pam_group/pam_group.8
-@@ -1,161 +1,13 @@
+@@ -1,161 +1,22 @@
+'\" t
.\" Title: pam_group
.\" Author: [see the "AUTHORS" section]
-.\" Generator: DocBook XSL Stylesheets v1.74.0 <http://docbook.sf.net/>
--.\" Date: 06/16/2009
+-.\" Date: 07/08/2010
+.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-+.\" Date: 08/24/2009
++.\" Date: 08/31/2010
.\" Manual: Linux-PAM Manual
.\" Source: Linux-PAM Manual
.\" Language: English
.\"
--.TH "PAM_GROUP" "8" "06/16/2009" "Linux-PAM Manual" "Linux-PAM Manual"
--.\" -----------------------------------------------------------------
+-.TH "PAM_GROUP" "8" "07/08/2010" "Linux-PAM Manual" "Linux-PAM Manual"
++.TH "PAM_GROUP" "8" "08/31/2010" "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
-\\$*
@@ -4109,11 +4629,12 @@ Index: pam.deb/modules/pam_group/pam_group.8
-.fi
-.\}
-..
-+.TH "PAM_GROUP" "8" "08/24/2009" "Linux-PAM Manual" "Linux-PAM Manual"
++.ie \n(.g .ds Aq \(aq
++.el .ds Aq '
.\" -----------------------------------------------------------------
.\" * set default formatting
.\" -----------------------------------------------------------------
-@@ -166,19 +18,17 @@
+@@ -166,21 +27,19 @@
.\" -----------------------------------------------------------------
.\" * MAIN CONTENT STARTS HERE *
.\" -----------------------------------------------------------------
@@ -4134,9 +4655,12 @@ Index: pam.deb/modules/pam_group/pam_group.8
-\FC/etc/security/group\&.conf\F[]\&.
+/etc/security/group\&.conf\&.
.PP
- This module\'s usefulness relies on the file\-systems accessible to the user\&. The point being that once granted the membership of a group, the user may attempt to create a
+-This module\'s usefulness relies on the file\-systems accessible to the user\&. The point being that once granted the membership of a group, the user may attempt to create a
++This module\*(Aqs usefulness relies on the file\-systems accessible to the user\&. The point being that once granted the membership of a group, the user may attempt to create a
\fBsetgid\fR
-@@ -188,11 +38,11 @@
+ binary with a restricted group ownership\&. Later, when the user is not given membership to this group, they can recover group membership with the precompiled binary\&. The reason that the file\-systems that the user has access to are so significant, is the fact that when a system is mounted
+ \fInosuid\fR
+@@ -188,11 +47,11 @@
\fInosuid\fR\&.
.PP
The pam_group module functions in parallel with the
@@ -4150,7 +4674,7 @@ Index: pam.deb/modules/pam_group/pam_group.8
(or equivalent)\&.
.SH "OPTIONS"
.PP
-@@ -237,7 +87,7 @@
+@@ -237,7 +96,7 @@
.RE
.SH "FILES"
.PP
@@ -4159,7 +4683,7 @@ Index: pam.deb/modules/pam_group/pam_group.8
.RS 4
Default configuration file
.RE
-@@ -246,7 +96,7 @@
+@@ -246,7 +105,7 @@
\fBgroup.conf\fR(5),
\fBpam.d\fR(5),
@@ -4185,25 +4709,29 @@ Index: pam.deb/modules/pam_issue/pam_issue.8
===================================================================
--- pam.deb.orig/modules/pam_issue/pam_issue.8
+++ pam.deb/modules/pam_issue/pam_issue.8
-@@ -1,161 +1,13 @@
+@@ -1,161 +1,22 @@
+'\" t
.\" Title: pam_issue
.\" Author: [see the "AUTHOR" section]
-.\" Generator: DocBook XSL Stylesheets v1.74.0 <http://docbook.sf.net/>
--.\" Date: 06/16/2009
+-.\" Date: 07/08/2010
+.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-+.\" Date: 08/24/2009
++.\" Date: 08/31/2010
.\" Manual: Linux-PAM Manual
.\" Source: Linux-PAM Manual
.\" Language: English
.\"
--.TH "PAM_ISSUE" "8" "06/16/2009" "Linux-PAM Manual" "Linux\-PAM Manual"
--.\" -----------------------------------------------------------------
+-.TH "PAM_ISSUE" "8" "07/08/2010" "Linux-PAM Manual" "Linux\-PAM Manual"
++.TH "PAM_ISSUE" "8" "08/31/2010" "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
-\\$*
@@ -4347,11 +4875,12 @@ Index: pam.deb/modules/pam_issue/pam_issue.8
-.fi
-.\}
-..
-+.TH "PAM_ISSUE" "8" "08/24/2009" "Linux-PAM Manual" "Linux\-PAM Manual"
++.ie \n(.g .ds Aq \(aq
++.el .ds Aq '
.\" -----------------------------------------------------------------
.\" * set default formatting
.\" -----------------------------------------------------------------
-@@ -166,13 +18,11 @@
+@@ -166,16 +27,14 @@
.\" -----------------------------------------------------------------
.\" * MAIN CONTENT STARTS HERE *
.\" -----------------------------------------------------------------
@@ -4366,8 +4895,21 @@ Index: pam.deb/modules/pam_issue/pam_issue.8
-.fam
.SH "DESCRIPTION"
.PP
- pam_issue is a PAM module to prepend an issue file to the username prompt\&. It also by default parses escape codes in the issue file similar to some common getty\'s (using \ex format)\&.
-@@ -275,30 +125,16 @@
+-pam_issue is a PAM module to prepend an issue file to the username prompt\&. It also by default parses escape codes in the issue file similar to some common getty\'s (using \ex format)\&.
++pam_issue is a PAM module to prepend an issue file to the username prompt\&. It also by default parses escape codes in the issue file similar to some common getty\*(Aqs (using \ex format)\&.
+ .PP
+ Recognized escapes:
+ .PP
+@@ -196,7 +55,7 @@
+ .PP
+ \fB\en\fR
+ .RS 4
+-machine\'s network node hostname (uname \-n)
++machine\*(Aqs network node hostname (uname \-n)
+ .RE
+ .PP
+ \fB\eo\fR
+@@ -275,30 +134,16 @@
.SH "EXAMPLES"
.PP
Add the following line to
@@ -4399,7 +4941,7 @@ Index: pam.deb/modules/pam_issue/pam_issue.8
.if n \{\
.RE
.\}
-@@ -308,7 +144,7 @@
+@@ -308,7 +153,7 @@
\fBpam.conf\fR(5),
\fBpam.d\fR(5),
@@ -4425,25 +4967,29 @@ Index: pam.deb/modules/pam_keyinit/pam_keyinit.8
===================================================================
--- pam.deb.orig/modules/pam_keyinit/pam_keyinit.8
+++ pam.deb/modules/pam_keyinit/pam_keyinit.8
-@@ -1,161 +1,13 @@
+@@ -1,161 +1,22 @@
+'\" t
.\" Title: pam_keyinit
.\" Author: [see the "AUTHOR" section]
-.\" Generator: DocBook XSL Stylesheets v1.74.0 <http://docbook.sf.net/>
--.\" Date: 03/02/2009
+-.\" Date: 07/08/2010
+.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-+.\" Date: 08/24/2009
++.\" Date: 08/31/2010
.\" Manual: Linux-PAM Manual
.\" Source: Linux-PAM Manual
.\" Language: English
.\"
--.TH "PAM_KEYINIT" "8" "03/02/2009" "Linux-PAM Manual" "Linux\-PAM Manual"
--.\" -----------------------------------------------------------------
+-.TH "PAM_KEYINIT" "8" "07/08/2010" "Linux-PAM Manual" "Linux\-PAM Manual"
++.TH "PAM_KEYINIT" "8" "08/31/2010" "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
-\\$*
@@ -4587,11 +5133,12 @@ Index: pam.deb/modules/pam_keyinit/pam_keyinit.8
-.fi
-.\}
-..
-+.TH "PAM_KEYINIT" "8" "08/24/2009" "Linux-PAM Manual" "Linux\-PAM Manual"
++.ie \n(.g .ds Aq \(aq
++.el .ds Aq '
.\" -----------------------------------------------------------------
.\" * set default formatting
.\" -----------------------------------------------------------------
-@@ -166,13 +18,11 @@
+@@ -166,18 +27,16 @@
.\" -----------------------------------------------------------------
.\" * MAIN CONTENT STARTS HERE *
.\" -----------------------------------------------------------------
@@ -4607,7 +5154,13 @@ Index: pam.deb/modules/pam_keyinit/pam_keyinit.8
.SH "DESCRIPTION"
.PP
The pam_keyinit PAM module ensures that the invoking process has a session keyring other than the user default session keyring\&.
-@@ -193,7 +43,7 @@
+ .PP
+-The session component of the module checks to see if the process\'s session keyring is the user default, and, if it is, creates a new anonymous session keyring with which to replace it\&.
++The session component of the module checks to see if the process\*(Aqs session keyring is the user default, and, if it is, creates a new anonymous session keyring with which to replace it\&.
+ .PP
+ If a new session keyring is created, it will install a link to the user common keyring in the session keyring so that keys common to the user will be automatically accessible through it\&.
+ .PP
+@@ -193,7 +52,7 @@
The keyutils package is used to manipulate keys more directly\&. This can be obtained from:
.PP
@@ -4616,7 +5169,7 @@ Index: pam.deb/modules/pam_keyinit/pam_keyinit.8
.SH "OPTIONS"
.PP
\fBdebug\fR
-@@ -259,24 +109,10 @@
+@@ -259,24 +118,10 @@
.if n \{\
.RS 4
.\}
@@ -4641,7 +5194,7 @@ Index: pam.deb/modules/pam_keyinit/pam_keyinit.8
.if n \{\
.RE
.\}
-@@ -287,12 +123,12 @@
+@@ -287,12 +132,12 @@
\fBpam.conf\fR(5),
\fBpam.d\fR(5),
@@ -4673,25 +5226,29 @@ Index: pam.deb/modules/pam_lastlog/pam_lastlog.8
===================================================================
--- pam.deb.orig/modules/pam_lastlog/pam_lastlog.8
+++ pam.deb/modules/pam_lastlog/pam_lastlog.8
-@@ -1,161 +1,13 @@
+@@ -1,161 +1,22 @@
+'\" t
.\" Title: pam_lastlog
.\" Author: [see the "AUTHOR" section]
-.\" Generator: DocBook XSL Stylesheets v1.74.0 <http://docbook.sf.net/>
--.\" Date: 06/16/2009
+-.\" Date: 07/08/2010
+.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-+.\" Date: 08/24/2009
++.\" Date: 08/31/2010
.\" Manual: Linux-PAM Manual
.\" Source: Linux-PAM Manual
.\" Language: English
.\"
--.TH "PAM_LASTLOG" "8" "06/16/2009" "Linux-PAM Manual" "Linux\-PAM Manual"
--.\" -----------------------------------------------------------------
+-.TH "PAM_LASTLOG" "8" "07/08/2010" "Linux-PAM Manual" "Linux\-PAM Manual"
++.TH "PAM_LASTLOG" "8" "08/31/2010" "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
-\\$*
@@ -4835,11 +5392,12 @@ Index: pam.deb/modules/pam_lastlog/pam_lastlog.8
-.fi
-.\}
-..
-+.TH "PAM_LASTLOG" "8" "08/24/2009" "Linux-PAM Manual" "Linux\-PAM Manual"
++.ie \n(.g .ds Aq \(aq
++.el .ds Aq '
.\" -----------------------------------------------------------------
.\" * set default formatting
.\" -----------------------------------------------------------------
-@@ -166,17 +18,15 @@
+@@ -166,17 +27,15 @@
.\" -----------------------------------------------------------------
.\" * MAIN CONTENT STARTS HERE *
.\" -----------------------------------------------------------------
@@ -4860,11 +5418,13 @@ Index: pam.deb/modules/pam_lastlog/pam_lastlog.8
file\&.
.PP
Some applications may perform this function themselves\&. In such cases, this module is not necessary\&.
-@@ -190,14 +40,14 @@
+@@ -189,41 +48,41 @@
+ .PP
\fBsilent\fR
.RS 4
- Don\'t inform the user about any previous login, just update the
+-Don\'t inform the user about any previous login, just update the
-\FC/var/log/lastlog\F[]
++Don\*(Aqt inform the user about any previous login, just update the
+/var/log/lastlog
file\&.
.RE
@@ -4877,7 +5437,38 @@ Index: pam.deb/modules/pam_lastlog/pam_lastlog.8
file does not contain any old entries for the user, indicate that the user has never previously logged in with a welcome message\&.
.RE
.PP
-@@ -257,36 +107,22 @@
+ \fBnodate\fR
+ .RS 4
+-Don\'t display the date of the last login\&.
++Don\*(Aqt display the date of the last login\&.
+ .RE
+ .PP
+ \fBnoterm\fR
+ .RS 4
+-Don\'t display the terminal name on which the last login was attempted\&.
++Don\*(Aqt display the terminal name on which the last login was attempted\&.
+ .RE
+ .PP
+ \fBnohost\fR
+ .RS 4
+-Don\'t indicate from which host the last login was attempted\&.
++Don\*(Aqt indicate from which host the last login was attempted\&.
+ .RE
+ .PP
+ \fBnowtmp\fR
+ .RS 4
+-Don\'t update the wtmp entry\&.
++Don\*(Aqt update the wtmp entry\&.
+ .RE
+ .PP
+ \fBnoupdate\fR
+ .RS 4
+-Don\'t update any file\&.
++Don\*(Aqt update any file\&.
+ .RE
+ .PP
+ \fBshowfailed\fR
+@@ -257,36 +116,22 @@
.SH "EXAMPLES"
.PP
Add the following line to
@@ -4916,7 +5507,7 @@ Index: pam.deb/modules/pam_lastlog/pam_lastlog.8
.RS 4
Lastlog logging file
.RE
-@@ -295,7 +131,7 @@
+@@ -295,7 +140,7 @@
\fBpam.conf\fR(5),
\fBpam.d\fR(5),
@@ -4942,25 +5533,29 @@ Index: pam.deb/modules/pam_limits/pam_limits.8
===================================================================
--- pam.deb.orig/modules/pam_limits/pam_limits.8
+++ pam.deb/modules/pam_limits/pam_limits.8
-@@ -1,161 +1,13 @@
+@@ -1,161 +1,22 @@
+'\" t
.\" Title: pam_limits
.\" Author: [see the "AUTHORS" section]
-.\" Generator: DocBook XSL Stylesheets v1.74.0 <http://docbook.sf.net/>
--.\" Date: 06/16/2009
+-.\" Date: 07/08/2010
+.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-+.\" Date: 08/24/2009
++.\" Date: 08/31/2010
.\" Manual: Linux-PAM Manual
.\" Source: Linux-PAM Manual
.\" Language: English
.\"
--.TH "PAM_LIMITS" "8" "06/16/2009" "Linux-PAM Manual" "Linux-PAM Manual"
--.\" -----------------------------------------------------------------
+-.TH "PAM_LIMITS" "8" "07/08/2010" "Linux-PAM Manual" "Linux-PAM Manual"
++.TH "PAM_LIMITS" "8" "08/31/2010" "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
-\\$*
@@ -5104,11 +5699,12 @@ Index: pam.deb/modules/pam_limits/pam_limits.8
-.fi
-.\}
-..
-+.TH "PAM_LIMITS" "8" "08/24/2009" "Linux-PAM Manual" "Linux-PAM Manual"
++.ie \n(.g .ds Aq \(aq
++.el .ds Aq '
.\" -----------------------------------------------------------------
.\" * set default formatting
.\" -----------------------------------------------------------------
-@@ -166,13 +18,11 @@
+@@ -166,13 +27,11 @@
.\" -----------------------------------------------------------------
.\" * MAIN CONTENT STARTS HERE *
.\" -----------------------------------------------------------------
@@ -5124,7 +5720,7 @@ Index: pam.deb/modules/pam_limits/pam_limits.8
.SH "DESCRIPTION"
.PP
The pam_limits PAM module sets limits on the system resources that can be obtained in a user\-session\&. Users of
-@@ -180,9 +30,9 @@
+@@ -180,9 +39,9 @@
are affected by this limits, too\&.
.PP
By default limits are taken from the
@@ -5136,7 +5732,7 @@ Index: pam.deb/modules/pam_limits/pam_limits.8
directory are read\&. The files are parsed one after another in the order of "C" locale\&. The effect of the individual files is the same as if all the files were concatenated together in the order of parsing\&. If a config file is explicitly specified with a module option then the files in the above directory are not parsed\&.
.PP
The module must not be called by a multithreaded application\&.
-@@ -257,41 +107,27 @@
+@@ -257,41 +116,27 @@
.RE
.SH "FILES"
.PP
@@ -5180,7 +5776,7 @@ Index: pam.deb/modules/pam_limits/pam_limits.8
.if n \{\
.RE
.\}
-@@ -302,7 +138,7 @@
+@@ -302,7 +147,7 @@
\fBlimits.conf\fR(5),
\fBpam.d\fR(5),
@@ -5206,25 +5802,29 @@ Index: pam.deb/modules/pam_listfile/pam_listfile.8
===================================================================
--- pam.deb.orig/modules/pam_listfile/pam_listfile.8
+++ pam.deb/modules/pam_listfile/pam_listfile.8
-@@ -1,161 +1,13 @@
+@@ -1,161 +1,22 @@
+'\" t
.\" Title: pam_listfile
.\" Author: [see the "AUTHOR" section]
-.\" Generator: DocBook XSL Stylesheets v1.74.0 <http://docbook.sf.net/>
--.\" Date: 06/16/2009
+-.\" Date: 07/08/2010
+.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-+.\" Date: 08/24/2009
++.\" Date: 08/31/2010
.\" Manual: Linux-PAM Manual
.\" Source: Linux-PAM Manual
.\" Language: English
.\"
--.TH "PAM_LISTFILE" "8" "06/16/2009" "Linux-PAM Manual" "Linux\-PAM Manual"
--.\" -----------------------------------------------------------------
+-.TH "PAM_LISTFILE" "8" "07/08/2010" "Linux-PAM Manual" "Linux\-PAM Manual"
++.TH "PAM_LISTFILE" "8" "08/31/2010" "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
-\\$*
@@ -5368,11 +5968,12 @@ Index: pam.deb/modules/pam_listfile/pam_listfile.8
-.fi
-.\}
-..
-+.TH "PAM_LISTFILE" "8" "08/24/2009" "Linux-PAM Manual" "Linux\-PAM Manual"
++.ie \n(.g .ds Aq \(aq
++.el .ds Aq '
.\" -----------------------------------------------------------------
.\" * set default formatting
.\" -----------------------------------------------------------------
-@@ -166,13 +18,11 @@
+@@ -166,13 +27,11 @@
.\" -----------------------------------------------------------------
.\" * MAIN CONTENT STARTS HERE *
.\" -----------------------------------------------------------------
@@ -5388,7 +5989,7 @@ Index: pam.deb/modules/pam_listfile/pam_listfile.8
.SH "DESCRIPTION"
.PP
pam_listfile is a PAM module which provides a way to deny or allow services based on an arbitrary file\&.
-@@ -188,7 +38,7 @@
+@@ -188,7 +47,7 @@
\fIPAM_RUSER\fR
\-\- and looks for an instance of that item in the
\fBfile=\fR\fB\fIfilename\fR\fR\&.
@@ -5397,7 +5998,7 @@ Index: pam.deb/modules/pam_listfile/pam_listfile.8
contains one line per item listed\&. If the item is found, then if
\fBsense=\fR\fB\fIallow\fR\fR,
\fIPAM_SUCCESS\fR
-@@ -198,7 +48,7 @@
+@@ -198,7 +57,7 @@
is returned, causing the authorization request to fail\&.
.PP
If an error is encountered (for instance, if
@@ -5406,11 +6007,13 @@ Index: pam.deb/modules/pam_listfile/pam_listfile.8
does not exist, or a poorly\-constructed argument is encountered), then if
\fIonerr=succeed\fR,
\fIPAM_SUCCESS\fR
-@@ -295,79 +145,51 @@
+@@ -294,80 +153,52 @@
+ .RE
.SH "EXAMPLES"
.PP
- Classic \'ftpusers\' authentication can be implemented with this entry in
+-Classic \'ftpusers\' authentication can be implemented with this entry in
-\FC/etc/pam\&.d/ftpd\F[]:
++Classic \*(Aqftpusers\*(Aq authentication can be implemented with this entry in
+/etc/pam\&.d/ftpd:
.sp
.if n \{\
@@ -5491,7 +6094,7 @@ Index: pam.deb/modules/pam_listfile/pam_listfile.8
\fIsu\fR
to the root account\&.
.SH "SEE ALSO"
-@@ -375,7 +197,7 @@
+@@ -375,7 +206,7 @@
\fBpam.conf\fR(5),
\fBpam.d\fR(5),
@@ -5517,25 +6120,29 @@ Index: pam.deb/modules/pam_localuser/pam_localuser.8
===================================================================
--- pam.deb.orig/modules/pam_localuser/pam_localuser.8
+++ pam.deb/modules/pam_localuser/pam_localuser.8
-@@ -1,161 +1,13 @@
+@@ -1,161 +1,22 @@
+'\" t
.\" Title: pam_localuser
.\" Author: [see the "AUTHOR" section]
-.\" Generator: DocBook XSL Stylesheets v1.74.0 <http://docbook.sf.net/>
--.\" Date: 06/16/2009
+-.\" Date: 07/08/2010
+.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-+.\" Date: 08/24/2009
++.\" Date: 08/31/2010
.\" Manual: Linux-PAM Manual
.\" Source: Linux-PAM Manual
.\" Language: English
.\"
--.TH "PAM_LOCALUSER" "8" "06/16/2009" "Linux-PAM Manual" "Linux\-PAM Manual"
--.\" -----------------------------------------------------------------
+-.TH "PAM_LOCALUSER" "8" "07/08/2010" "Linux-PAM Manual" "Linux\-PAM Manual"
++.TH "PAM_LOCALUSER" "8" "08/31/2010" "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
-\\$*
@@ -5679,11 +6286,12 @@ Index: pam.deb/modules/pam_localuser/pam_localuser.8
-.fi
-.\}
-..
-+.TH "PAM_LOCALUSER" "8" "08/24/2009" "Linux-PAM Manual" "Linux\-PAM Manual"
++.ie \n(.g .ds Aq \(aq
++.el .ds Aq '
.\" -----------------------------------------------------------------
.\" * set default formatting
.\" -----------------------------------------------------------------
-@@ -166,13 +18,11 @@
+@@ -166,18 +27,16 @@
.\" -----------------------------------------------------------------
.\" * MAIN CONTENT STARTS HERE *
.\" -----------------------------------------------------------------
@@ -5698,8 +6306,15 @@ Index: pam.deb/modules/pam_localuser/pam_localuser.8
-.fam
.SH "DESCRIPTION"
.PP
- pam_localuser is a PAM module to help implementing site\-wide login policies, where they typically include a subset of the network\'s users and a few accounts that are local to a particular workstation\&. Using pam_localuser and pam_wheel or pam_listfile is an effective way to restrict access to either local users and/or a subset of the network\'s users\&.
-@@ -189,7 +39,7 @@
+-pam_localuser is a PAM module to help implementing site\-wide login policies, where they typically include a subset of the network\'s users and a few accounts that are local to a particular workstation\&. Using pam_localuser and pam_wheel or pam_listfile is an effective way to restrict access to either local users and/or a subset of the network\'s users\&.
++pam_localuser is a PAM module to help implementing site\-wide login policies, where they typically include a subset of the network\*(Aqs users and a few accounts that are local to a particular workstation\&. Using pam_localuser and pam_wheel or pam_listfile is an effective way to restrict access to either local users and/or a subset of the network\*(Aqs users\&.
+ .PP
+-This could also be implemented using pam_listfile\&.so and a very short awk script invoked by cron, but it\'s common enough to have been separated out\&.
++This could also be implemented using pam_listfile\&.so and a very short awk script invoked by cron, but it\*(Aqs common enough to have been separated out\&.
+ .SH "OPTIONS"
+ .PP
+ .PP
+@@ -189,7 +48,7 @@
\fBfile=\fR\fB\fI/path/passwd\fR\fR
.RS 4
Use a file other than
@@ -5708,7 +6323,7 @@ Index: pam.deb/modules/pam_localuser/pam_localuser.8
.RE
.SH "MODULE TYPES PROVIDED"
.PP
-@@ -218,38 +68,24 @@
+@@ -218,38 +77,24 @@
.SH "EXAMPLES"
.PP
Add the following line to
@@ -5749,7 +6364,7 @@ Index: pam.deb/modules/pam_localuser/pam_localuser.8
.RS 4
Local user account information\&.
.RE
-@@ -258,7 +94,7 @@
+@@ -258,7 +103,7 @@
\fBpam.conf\fR(5),
\fBpam.d\fR(5),
@@ -5775,25 +6390,29 @@ Index: pam.deb/modules/pam_loginuid/pam_loginuid.8
===================================================================
--- pam.deb.orig/modules/pam_loginuid/pam_loginuid.8
+++ pam.deb/modules/pam_loginuid/pam_loginuid.8
-@@ -1,161 +1,13 @@
+@@ -1,161 +1,22 @@
+'\" t
.\" Title: pam_loginuid
.\" Author: [see the "AUTHOR" section]
-.\" Generator: DocBook XSL Stylesheets v1.74.0 <http://docbook.sf.net/>
--.\" Date: 06/16/2009
+-.\" Date: 07/08/2010
+.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-+.\" Date: 08/24/2009
++.\" Date: 08/31/2010
.\" Manual: Linux-PAM Manual
.\" Source: Linux-PAM Manual
.\" Language: English
.\"
--.TH "PAM_LOGINUID" "8" "06/16/2009" "Linux-PAM Manual" "Linux\-PAM Manual"
--.\" -----------------------------------------------------------------
+-.TH "PAM_LOGINUID" "8" "07/08/2010" "Linux-PAM Manual" "Linux\-PAM Manual"
++.TH "PAM_LOGINUID" "8" "08/31/2010" "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
-\\$*
@@ -5937,19 +6556,21 @@ Index: pam.deb/modules/pam_loginuid/pam_loginuid.8
-.fi
-.\}
-..
-+.TH "PAM_LOGINUID" "8" "08/24/2009" "Linux-PAM Manual" "Linux\-PAM Manual"
++.ie \n(.g .ds Aq \(aq
++.el .ds Aq '
.\" -----------------------------------------------------------------
.\" * set default formatting
.\" -----------------------------------------------------------------
-@@ -166,13 +18,11 @@
+@@ -166,13 +27,11 @@
.\" -----------------------------------------------------------------
.\" * MAIN CONTENT STARTS HERE *
.\" -----------------------------------------------------------------
-.SH "Name"
-+.SH "NAME"
- pam_loginuid \- Record user\'s login uid to the process attribute
+-pam_loginuid \- Record user\'s login uid to the process attribute
-.SH "Synopsis"
-.fam C
++.SH "NAME"
++pam_loginuid \- Record user\*(Aqs login uid to the process attribute
+.SH "SYNOPSIS"
.HP \w'\fBpam_loginuid\&.so\fR\ 'u
\fBpam_loginuid\&.so\fR [require_auditd]
@@ -5957,7 +6578,7 @@ Index: pam.deb/modules/pam_loginuid/pam_loginuid.8
.SH "DESCRIPTION"
.PP
The pam_loginuid module sets the loginuid process attribute for the process that was authenticated\&. This is necessary for applications to be correctly audited\&. This PAM module should only be used for entry point applications like: login, sshd, gdm, vsftpd, crond and atd\&. There are probably other entry point applications besides these\&. You should not use it for applications like sudo or su as that defeats the purpose by changing the loginuid to the account they just switched to\&.
-@@ -199,15 +49,7 @@
+@@ -199,15 +58,7 @@
.if n \{\
.RS 4
.\}
@@ -5973,7 +6594,7 @@ Index: pam.deb/modules/pam_loginuid/pam_loginuid.8
#%PAM\-1\&.0
auth required pam_unix\&.so
auth required pam_nologin\&.so
-@@ -216,13 +58,7 @@
+@@ -216,13 +67,7 @@
session required pam_unix\&.so
session required pam_loginuid\&.so
@@ -5987,7 +6608,7 @@ Index: pam.deb/modules/pam_loginuid/pam_loginuid.8
.if n \{\
.RE
.\}
-@@ -231,7 +67,7 @@
+@@ -231,7 +76,7 @@
\fBpam.conf\fR(5),
\fBpam.d\fR(5),
@@ -6013,25 +6634,29 @@ Index: pam.deb/modules/pam_mail/pam_mail.8
===================================================================
--- pam.deb.orig/modules/pam_mail/pam_mail.8
+++ pam.deb/modules/pam_mail/pam_mail.8
-@@ -1,161 +1,13 @@
+@@ -1,161 +1,22 @@
+'\" t
.\" Title: pam_mail
.\" Author: [see the "AUTHOR" section]
-.\" Generator: DocBook XSL Stylesheets v1.74.0 <http://docbook.sf.net/>
--.\" Date: 03/02/2009
+-.\" Date: 07/08/2010
+.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-+.\" Date: 08/24/2009
++.\" Date: 08/31/2010
.\" Manual: Linux-PAM Manual
.\" Source: Linux-PAM Manual
.\" Language: English
.\"
--.TH "PAM_MAIL" "8" "03/02/2009" "Linux-PAM Manual" "Linux\-PAM Manual"
--.\" -----------------------------------------------------------------
+-.TH "PAM_MAIL" "8" "07/08/2010" "Linux-PAM Manual" "Linux\-PAM Manual"
++.TH "PAM_MAIL" "8" "08/31/2010" "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
-\\$*
@@ -6175,11 +6800,12 @@ Index: pam.deb/modules/pam_mail/pam_mail.8
-.fi
-.\}
-..
-+.TH "PAM_MAIL" "8" "08/24/2009" "Linux-PAM Manual" "Linux\-PAM Manual"
++.ie \n(.g .ds Aq \(aq
++.el .ds Aq '
.\" -----------------------------------------------------------------
.\" * set default formatting
.\" -----------------------------------------------------------------
-@@ -166,13 +18,11 @@
+@@ -166,22 +27,20 @@
.\" -----------------------------------------------------------------
.\" * MAIN CONTENT STARTS HERE *
.\" -----------------------------------------------------------------
@@ -6195,8 +6821,11 @@ Index: pam.deb/modules/pam_mail/pam_mail.8
.SH "DESCRIPTION"
.PP
The pam_mail PAM module provides the "you have new mail" service to the user\&. It can be plugged into any application that has credential or session hooks\&. It gives a single message indicating the
-@@ -181,7 +31,7 @@
- \fBMAIL\fR, to the user\'s mail directory\&.
+ \fInewness\fR
+-of any mail it finds in the user\'s mail folder\&. This module also sets the PAM environment variable,
+-\fBMAIL\fR, to the user\'s mail directory\&.
++of any mail it finds in the user\*(Aqs mail folder\&. This module also sets the PAM environment variable,
++\fBMAIL\fR, to the user\*(Aqs mail directory\&.
.PP
If the mail spool file (be it
-\FC/var/mail/$USER\F[]
@@ -6204,20 +6833,24 @@ Index: pam.deb/modules/pam_mail/pam_mail.8
or a pathname given with the
\fBdir=\fR
parameter) is a directory then pam_mail assumes it is in the
-@@ -203,9 +53,9 @@
+@@ -202,11 +61,11 @@
+ .PP
\fBdir=\fR\fB\fImaildir\fR\fR
.RS 4
- Look for the users\' mail in an alternative location defined by
+-Look for the users\' mail in an alternative location defined by
-\FCmaildir/<login>\F[]\&. The default location for mail is
-\FC/var/mail/<login>\F[]\&. Note, if the supplied
-\FCmaildir\F[]
+-is prefixed by a \'~\', the directory is interpreted as indicating a file in the user\'s home directory\&.
++Look for the users\*(Aq mail in an alternative location defined by
+maildir/<login>\&. The default location for mail is
+/var/mail/<login>\&. Note, if the supplied
+maildir
- is prefixed by a \'~\', the directory is interpreted as indicating a file in the user\'s home directory\&.
++is prefixed by a \*(Aq~\*(Aq, the directory is interpreted as indicating a file in the user\*(Aqs home directory\&.
.RE
.PP
-@@ -219,7 +69,7 @@
+ \fBempty\fR
+@@ -219,7 +78,7 @@
Mail directory hash depth\&. For example, a
\fIhashcount\fR
of 2 would make the mail file be
@@ -6226,7 +6859,25 @@ Index: pam.deb/modules/pam_mail/pam_mail.8
.RE
.PP
\fBnoenv\fR
-@@ -276,30 +126,16 @@
+@@ -231,7 +90,7 @@
+ .PP
+ \fBnopen\fR
+ .RS 4
+-Don\'t print any mail information on login\&. This flag is useful to get the
++Don\*(Aqt print any mail information on login\&. This flag is useful to get the
+ \fBMAIL\fR
+ environment variable set, but to not display any information about it\&.
+ .RE
+@@ -243,7 +102,7 @@
+ .PP
+ \fBstandard\fR
+ .RS 4
+-Old style "You have\&.\&.\&." format which doesn\'t show the mail spool being used\&. This also implies "empty"\&.
++Old style "You have\&.\&.\&." format which doesn\*(Aqt show the mail spool being used\&. This also implies "empty"\&.
+ .RE
+ .SH "MODULE TYPES PROVIDED"
+ .PP
+@@ -276,30 +135,16 @@
.SH "EXAMPLES"
.PP
Add the following line to
@@ -6258,7 +6909,7 @@ Index: pam.deb/modules/pam_mail/pam_mail.8
.if n \{\
.RE
.\}
-@@ -309,7 +145,7 @@
+@@ -309,7 +154,7 @@
\fBpam.conf\fR(5),
\fBpam.d\fR(5),
@@ -6284,25 +6935,29 @@ Index: pam.deb/modules/pam_mkhomedir/pam_mkhomedir.8
===================================================================
--- pam.deb.orig/modules/pam_mkhomedir/pam_mkhomedir.8
+++ pam.deb/modules/pam_mkhomedir/pam_mkhomedir.8
-@@ -1,161 +1,13 @@
+@@ -1,161 +1,22 @@
+'\" t
.\" Title: pam_mkhomedir
.\" Author: [see the "AUTHOR" section]
-.\" Generator: DocBook XSL Stylesheets v1.74.0 <http://docbook.sf.net/>
--.\" Date: 06/16/2009
+-.\" Date: 07/08/2010
+.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-+.\" Date: 08/24/2009
++.\" Date: 08/31/2010
.\" Manual: Linux-PAM Manual
.\" Source: Linux-PAM Manual
.\" Language: English
.\"
--.TH "PAM_MKHOMEDIR" "8" "06/16/2009" "Linux-PAM Manual" "Linux-PAM Manual"
--.\" -----------------------------------------------------------------
+-.TH "PAM_MKHOMEDIR" "8" "07/08/2010" "Linux-PAM Manual" "Linux-PAM Manual"
++.TH "PAM_MKHOMEDIR" "8" "08/31/2010" "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
-\\$*
@@ -6446,11 +7101,12 @@ Index: pam.deb/modules/pam_mkhomedir/pam_mkhomedir.8
-.fi
-.\}
-..
-+.TH "PAM_MKHOMEDIR" "8" "08/24/2009" "Linux-PAM Manual" "Linux-PAM Manual"
++.ie \n(.g .ds Aq \(aq
++.el .ds Aq '
.\" -----------------------------------------------------------------
.\" * set default formatting
.\" -----------------------------------------------------------------
-@@ -166,17 +18,15 @@
+@@ -166,24 +27,22 @@
.\" -----------------------------------------------------------------
.\" * MAIN CONTENT STARTS HERE *
.\" -----------------------------------------------------------------
@@ -6471,7 +7127,15 @@ Index: pam.deb/modules/pam_mkhomedir/pam_mkhomedir.8
.PP
The new users home directory will not be removed after logout of the user\&.
.SH "OPTIONS"
-@@ -195,9 +45,9 @@
+ .PP
+ \fBsilent\fR
+ .RS 4
+-Don\'t print informative messages\&.
++Don\*(Aqt print informative messages\&.
+ .RE
+ .PP
+ \fBumask=\fR\fB\fImask\fR\fR
+@@ -195,9 +54,9 @@
\fBskel=\fR\fB\fI/path/to/skel/directory\fR\fR
.RS 4
Indicate an alternative
@@ -6483,7 +7147,7 @@ Index: pam.deb/modules/pam_mkhomedir/pam_mkhomedir.8
.RE
.SH "MODULE TYPES PROVIDED"
.PP
-@@ -232,7 +82,7 @@
+@@ -232,7 +91,7 @@
.RE
.SH "FILES"
.PP
@@ -6492,7 +7156,7 @@ Index: pam.deb/modules/pam_mkhomedir/pam_mkhomedir.8
.RS 4
Default skel directory
.RE
-@@ -243,15 +93,7 @@
+@@ -243,15 +102,7 @@
.if n \{\
.RS 4
.\}
@@ -6508,7 +7172,7 @@ Index: pam.deb/modules/pam_mkhomedir/pam_mkhomedir.8
auth requisite pam_securetty\&.so
auth sufficient pam_ldap\&.so
auth required pam_unix\&.so
-@@ -264,13 +106,7 @@
+@@ -264,13 +115,7 @@
session optional pam_lastlog\&.so
session optional pam_mail\&.so standard
@@ -6522,7 +7186,7 @@ Index: pam.deb/modules/pam_mkhomedir/pam_mkhomedir.8
.if n \{\
.RE
.\}
-@@ -279,7 +115,7 @@
+@@ -279,7 +124,7 @@
.PP
\fBpam.d\fR(5),
@@ -6548,25 +7212,29 @@ Index: pam.deb/modules/pam_motd/pam_motd.8
===================================================================
--- pam.deb.orig/modules/pam_motd/pam_motd.8
+++ pam.deb/modules/pam_motd/pam_motd.8
-@@ -1,161 +1,13 @@
+@@ -1,161 +1,22 @@
+'\" t
.\" Title: pam_motd
.\" Author: [see the "AUTHOR" section]
-.\" Generator: DocBook XSL Stylesheets v1.74.0 <http://docbook.sf.net/>
--.\" Date: 06/16/2009
+-.\" Date: 07/08/2010
+.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-+.\" Date: 08/24/2009
++.\" Date: 08/31/2010
.\" Manual: Linux-PAM Manual
.\" Source: Linux-PAM Manual
.\" Language: English
.\"
--.TH "PAM_MOTD" "8" "06/16/2009" "Linux-PAM Manual" "Linux\-PAM Manual"
--.\" -----------------------------------------------------------------
+-.TH "PAM_MOTD" "8" "07/08/2010" "Linux-PAM Manual" "Linux\-PAM Manual"
++.TH "PAM_MOTD" "8" "08/31/2010" "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
-\\$*
@@ -6710,11 +7378,12 @@ Index: pam.deb/modules/pam_motd/pam_motd.8
-.fi
-.\}
-..
-+.TH "PAM_MOTD" "8" "08/24/2009" "Linux-PAM Manual" "Linux\-PAM Manual"
++.ie \n(.g .ds Aq \(aq
++.el .ds Aq '
.\" -----------------------------------------------------------------
.\" * set default formatting
.\" -----------------------------------------------------------------
-@@ -166,24 +18,22 @@
+@@ -166,24 +27,22 @@
.\" -----------------------------------------------------------------
.\" * MAIN CONTENT STARTS HERE *
.\" -----------------------------------------------------------------
@@ -6743,7 +7412,7 @@ Index: pam.deb/modules/pam_motd/pam_motd.8
file is displayed as message of the day\&.
.RE
.SH "MODULE TYPES PROVIDED"
-@@ -200,30 +50,16 @@
+@@ -200,30 +59,16 @@
.SH "EXAMPLES"
.PP
The suggested usage for
@@ -6775,7 +7444,7 @@ Index: pam.deb/modules/pam_motd/pam_motd.8
.if n \{\
.RE
.\}
-@@ -234,7 +70,7 @@
+@@ -234,7 +79,7 @@
\fBmotd\fR(5),
\fBpam.conf\fR(5),
\fBpam.d\fR(5),
@@ -6801,25 +7470,29 @@ Index: pam.deb/modules/pam_namespace/pam_namespace.8
===================================================================
--- pam.deb.orig/modules/pam_namespace/pam_namespace.8
+++ pam.deb/modules/pam_namespace/pam_namespace.8
-@@ -1,161 +1,13 @@
+@@ -1,161 +1,22 @@
+'\" t
.\" Title: pam_namespace
.\" Author: [see the "AUTHORS" section]
-.\" Generator: DocBook XSL Stylesheets v1.74.0 <http://docbook.sf.net/>
--.\" Date: 06/16/2009
+-.\" Date: 07/08/2010
+.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-+.\" Date: 08/24/2009
++.\" Date: 08/31/2010
.\" Manual: Linux-PAM Manual
.\" Source: Linux-PAM Manual
.\" Language: English
.\"
--.TH "PAM_NAMESPACE" "8" "06/16/2009" "Linux-PAM Manual" "Linux-PAM Manual"
--.\" -----------------------------------------------------------------
+-.TH "PAM_NAMESPACE" "8" "07/08/2010" "Linux-PAM Manual" "Linux-PAM Manual"
++.TH "PAM_NAMESPACE" "8" "08/31/2010" "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
-\\$*
@@ -6963,11 +7636,12 @@ Index: pam.deb/modules/pam_namespace/pam_namespace.8
-.fi
-.\}
-..
-+.TH "PAM_NAMESPACE" "8" "08/24/2009" "Linux-PAM Manual" "Linux-PAM Manual"
++.ie \n(.g .ds Aq \(aq
++.el .ds Aq '
.\" -----------------------------------------------------------------
.\" * set default formatting
.\" -----------------------------------------------------------------
-@@ -166,17 +18,15 @@
+@@ -166,17 +27,15 @@
.\" -----------------------------------------------------------------
.\" * MAIN CONTENT STARTS HERE *
.\" -----------------------------------------------------------------
@@ -6988,7 +7662,7 @@ Index: pam.deb/modules/pam_namespace/pam_namespace.8
exists, it is used to initialize the instance directory after it is set up and mounted on the polyinstantiated directory\&. The script receives the polyinstantiated directory path, the instance directory path, flag whether the instance directory was newly created (0 for no, 1 for yes), and the user name as its arguments\&.
.PP
The pam_namespace module disassociates the session namespace from the parent namespace\&. Any mounts/unmounts performed in the parent namespace, such as mounting of devices, are not reflected in the session namespace\&. To propagate selected mount/unmount events from the parent namespace into the disassociated session namespace, an administrator may use the special shared\-subtree feature\&. For additional information on shared\-subtree feature, please refer to the mount(8) man page and the shared\-subtree description at http://lwn\&.net/Articles/159077 and http://lwn\&.net/Articles/159092\&.
-@@ -254,17 +104,17 @@
+@@ -254,17 +113,17 @@
.RE
.SH "FILES"
.PP
@@ -7009,7 +7683,7 @@ Index: pam.deb/modules/pam_namespace/pam_namespace.8
.RS 4
Init script for instance directories
.RE
-@@ -279,24 +129,16 @@
+@@ -279,24 +138,16 @@
/usr/sbin/gdm\-safe\-restart
.PP
This allows gdm to restart after each session and appropriately adjust namespaces of display manager and the X server\&. If polyinstantiation of /tmp is desired along with the graphical environment, then additional configuration changes are needed to address the interaction of X server and font server namespaces with their use of /tmp to create communication sockets\&. Please use the initialization script
@@ -7036,7 +7710,7 @@ Index: pam.deb/modules/pam_namespace/pam_namespace.8
1\&. Disable the use of font server by commenting out "FontPath"
line in /etc/X11/xorg\&.conf\&. If you do want to use the font server
then you will have to augment the instance initialization
-@@ -310,13 +152,7 @@
+@@ -310,13 +161,7 @@
"AlwaysRestartServer=true", and it is not overridden by
/etc/gdm/custom\&.conf\&.
@@ -7050,7 +7724,7 @@ Index: pam.deb/modules/pam_namespace/pam_namespace.8
.if n \{\
.RE
.\}
-@@ -327,7 +163,7 @@
+@@ -327,7 +172,7 @@
\fBnamespace.conf\fR(5),
\fBpam.d\fR(5),
\fBmount\fR(8),
@@ -7076,25 +7750,29 @@ Index: pam.deb/modules/pam_nologin/pam_nologin.8
===================================================================
--- pam.deb.orig/modules/pam_nologin/pam_nologin.8
+++ pam.deb/modules/pam_nologin/pam_nologin.8
-@@ -1,161 +1,13 @@
+@@ -1,161 +1,22 @@
+'\" t
.\" Title: pam_nologin
.\" Author: [see the "AUTHOR" section]
-.\" Generator: DocBook XSL Stylesheets v1.74.0 <http://docbook.sf.net/>
--.\" Date: 03/02/2009
+-.\" Date: 08/30/2010
+.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-+.\" Date: 02/01/2010
++.\" Date: 08/31/2010
.\" Manual: Linux-PAM Manual
.\" Source: Linux-PAM Manual
.\" Language: English
.\"
--.TH "PAM_NOLOGIN" "8" "03/02/2009" "Linux-PAM Manual" "Linux\-PAM Manual"
--.\" -----------------------------------------------------------------
+-.TH "PAM_NOLOGIN" "8" "08/30/2010" "Linux-PAM Manual" "Linux\-PAM Manual"
++.TH "PAM_NOLOGIN" "8" "08/31/2010" "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
-\\$*
@@ -7238,11 +7916,12 @@ Index: pam.deb/modules/pam_nologin/pam_nologin.8
-.fi
-.\}
-..
-+.TH "PAM_NOLOGIN" "8" "02/01/2010" "Linux-PAM Manual" "Linux\-PAM Manual"
++.ie \n(.g .ds Aq \(aq
++.el .ds Aq '
.\" -----------------------------------------------------------------
.\" * set default formatting
.\" -----------------------------------------------------------------
-@@ -166,26 +18,24 @@
+@@ -166,27 +27,25 @@
.\" -----------------------------------------------------------------
.\" * MAIN CONTENT STARTS HERE *
.\" -----------------------------------------------------------------
@@ -7258,23 +7937,25 @@ Index: pam.deb/modules/pam_nologin/pam_nologin.8
.SH "DESCRIPTION"
.PP
pam_nologin is a PAM module that prevents users from logging into the system when
--\FC/etc/nologin\F[]
-+/etc/nologin
- exists\&. The contents of the
--\FC/etc/nologin\F[]
-+/etc/nologin
- file are displayed to the user\&. The pam_nologin module has no effect on the root user\'s ability to log in\&.
+-\FC/var/run/nologin\F[]
++/var/run/nologin
+ or
+-\FC/etc/nologin\F[]exists\&. The contents of the file are displayed to the user\&. The pam_nologin module has no effect on the root user\'s ability to log in\&.
++/etc/nologinexists\&. The contents of the file are displayed to the user\&. The pam_nologin module has no effect on the root user\*(Aqs ability to log in\&.
.SH "OPTIONS"
.PP
\fBfile=\fR\fB\fI/path/nologin\fR\fR
.RS 4
Use this file instead the default
+-\FC/var/run/nologin\F[]
++/var/run/nologin
+ or
-\FC/etc/nologin\F[]\&.
+/etc/nologin\&.
.RE
.PP
\fBsuccessok\fR
-@@ -204,7 +54,7 @@
+@@ -205,7 +64,7 @@
PAM_AUTH_ERR
.RS 4
The user is not root and
@@ -7283,16 +7964,7 @@ Index: pam.deb/modules/pam_nologin/pam_nologin.8
exists, so the user is not permitted to log in\&.
.RE
.PP
-@@ -221,7 +71,7 @@
- PAM_SUCCESS
- .RS 4
- Success: either the user is root or the
--\FC/etc/nologin\F[]
-+/etc/nologin
- file does not exist\&.
- .RE
- .PP
-@@ -232,30 +82,16 @@
+@@ -231,30 +90,16 @@
.SH "EXAMPLES"
.PP
The suggested usage for
@@ -7324,7 +7996,7 @@ Index: pam.deb/modules/pam_nologin/pam_nologin.8
.if n \{\
.RE
.\}
-@@ -280,7 +116,7 @@
+@@ -279,7 +124,7 @@
\fBnologin\fR(5),
\fBpam.conf\fR(5),
\fBpam.d\fR(5),
@@ -7337,7 +8009,7 @@ Index: pam.deb/modules/pam_nologin/pam_nologin.8.xml
===================================================================
--- pam.deb.orig/modules/pam_nologin/pam_nologin.8.xml
+++ pam.deb/modules/pam_nologin/pam_nologin.8.xml
-@@ -159,7 +159,7 @@
+@@ -160,7 +160,7 @@
<refentrytitle>pam.d</refentrytitle><manvolnum>5</manvolnum>
</citerefentry>,
<citerefentry>
@@ -7350,25 +8022,29 @@ Index: pam.deb/modules/pam_permit/pam_permit.8
===================================================================
--- pam.deb.orig/modules/pam_permit/pam_permit.8
+++ pam.deb/modules/pam_permit/pam_permit.8
-@@ -1,161 +1,13 @@
+@@ -1,161 +1,22 @@
+'\" t
.\" Title: pam_permit
.\" Author: [see the "AUTHOR" section]
-.\" Generator: DocBook XSL Stylesheets v1.74.0 <http://docbook.sf.net/>
--.\" Date: 03/02/2009
+-.\" Date: 07/08/2010
+.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-+.\" Date: 08/24/2009
++.\" Date: 08/31/2010
.\" Manual: Linux-PAM Manual
.\" Source: Linux-PAM Manual
.\" Language: English
.\"
--.TH "PAM_PERMIT" "8" "03/02/2009" "Linux-PAM Manual" "Linux\-PAM Manual"
--.\" -----------------------------------------------------------------
+-.TH "PAM_PERMIT" "8" "07/08/2010" "Linux-PAM Manual" "Linux\-PAM Manual"
++.TH "PAM_PERMIT" "8" "08/31/2010" "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
-\\$*
@@ -7512,11 +8188,12 @@ Index: pam.deb/modules/pam_permit/pam_permit.8
-.fi
-.\}
-..
-+.TH "PAM_PERMIT" "8" "08/24/2009" "Linux-PAM Manual" "Linux\-PAM Manual"
++.ie \n(.g .ds Aq \(aq
++.el .ds Aq '
.\" -----------------------------------------------------------------
.\" * set default formatting
.\" -----------------------------------------------------------------
-@@ -166,13 +18,11 @@
+@@ -166,20 +27,18 @@
.\" -----------------------------------------------------------------
.\" * MAIN CONTENT STARTS HERE *
.\" -----------------------------------------------------------------
@@ -7532,7 +8209,16 @@ Index: pam.deb/modules/pam_permit/pam_permit.8
.SH "DESCRIPTION"
.PP
pam_permit is a PAM module that always permit access\&. It does nothing else\&.
-@@ -207,24 +57,10 @@
+ .PP
+-In the case of authentication, the user\'s name will be set to
++In the case of authentication, the user\*(Aqs name will be set to
+ \fInobody\fR
+-if the application didn\'t set one\&. Many applications and PAM modules become confused if this name is unknown\&.
++if the application didn\*(Aqt set one\&. Many applications and PAM modules become confused if this name is unknown\&.
+ .PP
+ This module is very dangerous\&. It should be used with extreme caution\&.
+ .SH "OPTIONS"
+@@ -207,24 +66,10 @@
.if n \{\
.RS 4
.\}
@@ -7557,7 +8243,7 @@ Index: pam.deb/modules/pam_permit/pam_permit.8
.if n \{\
.RE
.\}
-@@ -234,7 +70,7 @@
+@@ -234,7 +79,7 @@
\fBpam.conf\fR(5),
\fBpam.d\fR(5),
@@ -7583,25 +8269,29 @@ Index: pam.deb/modules/pam_rhosts/pam_rhosts.8
===================================================================
--- pam.deb.orig/modules/pam_rhosts/pam_rhosts.8
+++ pam.deb/modules/pam_rhosts/pam_rhosts.8
-@@ -1,161 +1,13 @@
+@@ -1,161 +1,22 @@
+'\" t
.\" Title: pam_rhosts
.\" Author: [see the "AUTHOR" section]
-.\" Generator: DocBook XSL Stylesheets v1.74.0 <http://docbook.sf.net/>
--.\" Date: 03/02/2009
+-.\" Date: 07/08/2010
+.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-+.\" Date: 08/24/2009
++.\" Date: 08/31/2010
.\" Manual: Linux-PAM Manual
.\" Source: Linux-PAM Manual
.\" Language: English
.\"
--.TH "PAM_RHOSTS" "8" "03/02/2009" "Linux-PAM Manual" "Linux\-PAM Manual"
--.\" -----------------------------------------------------------------
+-.TH "PAM_RHOSTS" "8" "07/08/2010" "Linux-PAM Manual" "Linux\-PAM Manual"
++.TH "PAM_RHOSTS" "8" "08/31/2010" "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
-\\$*
@@ -7745,11 +8435,12 @@ Index: pam.deb/modules/pam_rhosts/pam_rhosts.8
-.fi
-.\}
-..
-+.TH "PAM_RHOSTS" "8" "08/24/2009" "Linux-PAM Manual" "Linux\-PAM Manual"
++.ie \n(.g .ds Aq \(aq
++.el .ds Aq '
.\" -----------------------------------------------------------------
.\" * set default formatting
.\" -----------------------------------------------------------------
-@@ -166,13 +18,11 @@
+@@ -166,13 +27,11 @@
.\" -----------------------------------------------------------------
.\" * MAIN CONTENT STARTS HERE *
.\" -----------------------------------------------------------------
@@ -7765,7 +8456,7 @@ Index: pam.deb/modules/pam_rhosts/pam_rhosts.8
.SH "DESCRIPTION"
.PP
This module performs the standard network authentication for services, as used by traditional implementations of
-@@ -182,10 +32,10 @@
+@@ -182,10 +41,10 @@
etc\&.
.PP
The authentication mechanism of this module is based on the contents of two files;
@@ -7774,21 +8465,32 @@ Index: pam.deb/modules/pam_rhosts/pam_rhosts.8
(or and
-\FC~/\&.rhosts\F[]\&. Firstly, hosts listed in the former file are treated as equivalent to the localhost\&. Secondly, entries in the user\'s own copy of the latter file is used to map "\fIremote\-host remote\-user\fR" pairs to that user\'s account on the current host\&. Access is granted to the user if their host is present in
-\FC/etc/hosts\&.equiv\F[]
-+~/\&.rhosts\&. Firstly, hosts listed in the former file are treated as equivalent to the localhost\&. Secondly, entries in the user\'s own copy of the latter file is used to map "\fIremote\-host remote\-user\fR" pairs to that user\'s account on the current host\&. Access is granted to the user if their host is present in
++~/\&.rhosts\&. Firstly, hosts listed in the former file are treated as equivalent to the localhost\&. Secondly, entries in the user\*(Aqs own copy of the latter file is used to map "\fIremote\-host remote\-user\fR" pairs to that user\*(Aqs account on the current host\&. Access is granted to the user if their host is present in
+/etc/hosts\&.equiv
and their remote account is identical to their local one, or if their remote account has an entry in their personal configuration file\&.
.PP
The module authenticates a remote user (internally specified by the item
-@@ -221,7 +71,7 @@
+@@ -202,7 +61,7 @@
+ .PP
+ \fBsilent\fR
+ .RS 4
+-Don\'t print informative messages\&.
++Don\*(Aqt print informative messages\&.
+ .RE
+ .PP
+ \fBsuperuser=\fR\fB\fIaccount\fR\fR
+@@ -220,8 +79,8 @@
+ .PP
PAM_AUTH_ERR
.RS 4
- The remote host, remote user name or the local user name couldn\'t be determined or access was denied by
+-The remote host, remote user name or the local user name couldn\'t be determined or access was denied by
-\FC\&.rhosts\F[]
++The remote host, remote user name or the local user name couldn\*(Aqt be determined or access was denied by
+\&.rhosts
file\&.
.RE
.PP
-@@ -232,26 +82,18 @@
+@@ -232,26 +91,18 @@
.SH "EXAMPLES"
.PP
To grant a remote user access by
@@ -7818,7 +8520,7 @@ Index: pam.deb/modules/pam_rhosts/pam_rhosts.8
#%PAM\-1\&.0
#
auth required pam_rhosts\&.so
-@@ -259,13 +101,7 @@
+@@ -259,13 +110,7 @@
auth required pam_env\&.so
auth required pam_unix\&.so
@@ -7832,7 +8534,7 @@ Index: pam.deb/modules/pam_rhosts/pam_rhosts.8
.if n \{\
.RE
.\}
-@@ -278,7 +114,7 @@
+@@ -278,7 +123,7 @@
\fBrhosts\fR(5),
\fBpam.conf\fR(5),
\fBpam.d\fR(5),
@@ -7858,25 +8560,29 @@ Index: pam.deb/modules/pam_rootok/pam_rootok.8
===================================================================
--- pam.deb.orig/modules/pam_rootok/pam_rootok.8
+++ pam.deb/modules/pam_rootok/pam_rootok.8
-@@ -1,161 +1,13 @@
+@@ -1,161 +1,22 @@
+'\" t
.\" Title: pam_rootok
.\" Author: [see the "AUTHOR" section]
-.\" Generator: DocBook XSL Stylesheets v1.74.0 <http://docbook.sf.net/>
--.\" Date: 03/02/2009
+-.\" Date: 07/08/2010
+.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-+.\" Date: 08/24/2009
++.\" Date: 08/31/2010
.\" Manual: Linux-PAM Manual
.\" Source: Linux-PAM Manual
.\" Language: English
.\"
--.TH "PAM_ROOTOK" "8" "03/02/2009" "Linux-PAM Manual" "Linux\-PAM Manual"
--.\" -----------------------------------------------------------------
+-.TH "PAM_ROOTOK" "8" "07/08/2010" "Linux-PAM Manual" "Linux\-PAM Manual"
++.TH "PAM_ROOTOK" "8" "08/31/2010" "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
-\\$*
@@ -8020,11 +8726,12 @@ Index: pam.deb/modules/pam_rootok/pam_rootok.8
-.fi
-.\}
-..
-+.TH "PAM_ROOTOK" "8" "08/24/2009" "Linux-PAM Manual" "Linux\-PAM Manual"
++.ie \n(.g .ds Aq \(aq
++.el .ds Aq '
.\" -----------------------------------------------------------------
.\" * set default formatting
.\" -----------------------------------------------------------------
-@@ -166,13 +18,11 @@
+@@ -166,13 +27,11 @@
.\" -----------------------------------------------------------------
.\" * MAIN CONTENT STARTS HERE *
.\" -----------------------------------------------------------------
@@ -8040,7 +8747,7 @@ Index: pam.deb/modules/pam_rootok/pam_rootok.8
.SH "DESCRIPTION"
.PP
pam_rootok is a PAM module that authenticates the user if their
-@@ -217,32 +67,18 @@
+@@ -220,32 +79,18 @@
In the case of the
\fBsu\fR(1)
application the historical usage is to permit the superuser to adopt the identity of a lesser user without the use of a password\&. To obtain this behavior with PAM the following pair of lines are needed for the corresponding entry in the
@@ -8074,7 +8781,7 @@ Index: pam.deb/modules/pam_rootok/pam_rootok.8
.if n \{\
.RE
.\}
-@@ -253,7 +89,7 @@
+@@ -256,7 +101,7 @@
\fBsu\fR(1),
\fBpam.conf\fR(5),
\fBpam.d\fR(5),
@@ -8087,7 +8794,7 @@ Index: pam.deb/modules/pam_rootok/pam_rootok.8.xml
===================================================================
--- pam.deb.orig/modules/pam_rootok/pam_rootok.8.xml
+++ pam.deb/modules/pam_rootok/pam_rootok.8.xml
-@@ -115,7 +115,7 @@
+@@ -116,7 +116,7 @@
<refentrytitle>pam.d</refentrytitle><manvolnum>5</manvolnum>
</citerefentry>,
<citerefentry>
@@ -8100,25 +8807,29 @@ Index: pam.deb/modules/pam_securetty/pam_securetty.8
===================================================================
--- pam.deb.orig/modules/pam_securetty/pam_securetty.8
+++ pam.deb/modules/pam_securetty/pam_securetty.8
-@@ -1,161 +1,13 @@
+@@ -1,161 +1,22 @@
+'\" t
.\" Title: pam_securetty
.\" Author: [see the "AUTHOR" section]
-.\" Generator: DocBook XSL Stylesheets v1.74.0 <http://docbook.sf.net/>
--.\" Date: 03/02/2009
+-.\" Date: 07/08/2010
+.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-+.\" Date: 08/24/2009
++.\" Date: 08/31/2010
.\" Manual: Linux-PAM Manual
.\" Source: Linux-PAM Manual
.\" Language: English
.\"
--.TH "PAM_SECURETTY" "8" "03/02/2009" "Linux-PAM Manual" "Linux\-PAM Manual"
--.\" -----------------------------------------------------------------
+-.TH "PAM_SECURETTY" "8" "07/08/2010" "Linux-PAM Manual" "Linux\-PAM Manual"
++.TH "PAM_SECURETTY" "8" "08/31/2010" "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
-\\$*
@@ -8262,11 +8973,12 @@ Index: pam.deb/modules/pam_securetty/pam_securetty.8
-.fi
-.\}
-..
-+.TH "PAM_SECURETTY" "8" "08/24/2009" "Linux-PAM Manual" "Linux\-PAM Manual"
++.ie \n(.g .ds Aq \(aq
++.el .ds Aq '
.\" -----------------------------------------------------------------
.\" * set default formatting
.\" -----------------------------------------------------------------
-@@ -166,18 +18,16 @@
+@@ -166,18 +27,16 @@
.\" -----------------------------------------------------------------
.\" * MAIN CONTENT STARTS HERE *
.\" -----------------------------------------------------------------
@@ -8289,7 +9001,7 @@ Index: pam.deb/modules/pam_securetty/pam_securetty.8
is a plain file and not world writable\&.
.PP
This module has no effect on non\-root users and requires that the application fills in the
-@@ -210,7 +60,7 @@
+@@ -210,7 +69,7 @@
PAM_AUTH_ERR
.RS 4
Authentication is rejected\&. Either root is attempting to log in via an unacceptable device, or the
@@ -8298,11 +9010,13 @@ Index: pam.deb/modules/pam_securetty/pam_securetty.8
file is world writable or not a normal file\&.
.RE
.PP
-@@ -222,13 +72,13 @@
+@@ -221,14 +80,14 @@
+ .PP
PAM_SERVICE_ERR
.RS 4
- An error occurred while the module was determining the user\'s name or tty, or the module could not open
+-An error occurred while the module was determining the user\'s name or tty, or the module could not open
-\FC/etc/securetty\F[]\&.
++An error occurred while the module was determining the user\*(Aqs name or tty, or the module could not open
+/etc/securetty\&.
.RE
.PP
@@ -8314,7 +9028,7 @@ Index: pam.deb/modules/pam_securetty/pam_securetty.8
file to verify whether the user had a UID of 0\&. Therefore, the results of running this module are ignored\&.
.RE
.SH "EXAMPLES"
-@@ -238,25 +88,11 @@
+@@ -238,25 +97,11 @@
.if n \{\
.RS 4
.\}
@@ -8340,7 +9054,7 @@ Index: pam.deb/modules/pam_securetty/pam_securetty.8
.if n \{\
.RE
.\}
-@@ -267,7 +103,7 @@
+@@ -267,7 +112,7 @@
\fBsecuretty\fR(5),
\fBpam.conf\fR(5),
\fBpam.d\fR(5),
@@ -8366,25 +9080,29 @@ Index: pam.deb/modules/pam_selinux/pam_selinux.8
===================================================================
--- pam.deb.orig/modules/pam_selinux/pam_selinux.8
+++ pam.deb/modules/pam_selinux/pam_selinux.8
-@@ -1,161 +1,13 @@
+@@ -1,161 +1,22 @@
+'\" t
.\" Title: pam_selinux
.\" Author: [see the "AUTHOR" section]
-.\" Generator: DocBook XSL Stylesheets v1.74.0 <http://docbook.sf.net/>
--.\" Date: 06/16/2009
+-.\" Date: 07/08/2010
+.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-+.\" Date: 02/01/2010
++.\" Date: 08/31/2010
.\" Manual: Linux-PAM Manual
.\" Source: Linux-PAM Manual
.\" Language: English
.\"
--.TH "PAM_SELINUX" "8" "06/16/2009" "Linux-PAM Manual" "Linux\-PAM Manual"
--.\" -----------------------------------------------------------------
+-.TH "PAM_SELINUX" "8" "07/08/2010" "Linux-PAM Manual" "Linux\-PAM Manual"
++.TH "PAM_SELINUX" "8" "08/31/2010" "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
-\\$*
@@ -8528,11 +9246,12 @@ Index: pam.deb/modules/pam_selinux/pam_selinux.8
-.fi
-.\}
-..
-+.TH "PAM_SELINUX" "8" "02/01/2010" "Linux-PAM Manual" "Linux\-PAM Manual"
++.ie \n(.g .ds Aq \(aq
++.el .ds Aq '
.\" -----------------------------------------------------------------
.\" * set default formatting
.\" -----------------------------------------------------------------
-@@ -166,13 +18,11 @@
+@@ -166,18 +27,16 @@
.\" -----------------------------------------------------------------
.\" * MAIN CONTENT STARTS HERE *
.\" -----------------------------------------------------------------
@@ -8548,7 +9267,13 @@ Index: pam.deb/modules/pam_selinux/pam_selinux.8
.SH "DESCRIPTION"
.PP
In a nutshell, pam_selinux sets up the default security context for the next execed shell\&.
-@@ -251,26 +101,12 @@
+ .PP
+-When an application opens a session using pam_selinux, the shell that gets executed will be run in the default security context, or if the user chooses and the pam file allows the selected security context\&. Also the controlling tty will have it\'s security context modified to match the users\&.
++When an application opens a session using pam_selinux, the shell that gets executed will be run in the default security context, or if the user chooses and the pam file allows the selected security context\&. Also the controlling tty will have it\*(Aqs security context modified to match the users\&.
+ .PP
+ Adding pam_selinux into a pam file could cause other pam modules to change their behavior if the exec another application\&. The close and open option help mitigate this problem\&. close option will only cause the close portion of the pam_selinux to execute, and open will only cause the open portion to run\&. You can add pam_selinux to the config file twice\&. Add the pam_selinux close as the executes the open pass through the modules, pam_selinux open_session will happen last\&. When PAM executes the close pass through the modules pam_selinux close_session will happen first\&.
+ .SH "OPTIONS"
+@@ -251,26 +110,12 @@
.if n \{\
.RS 4
.\}
@@ -8575,7 +9300,7 @@ Index: pam.deb/modules/pam_selinux/pam_selinux.8
.if n \{\
.RE
.\}
-@@ -279,7 +115,7 @@
+@@ -279,7 +124,7 @@
\fBpam.conf\fR(5),
\fBpam.d\fR(5),
@@ -8601,7 +9326,240 @@ Index: pam.deb/modules/pam_sepermit/pam_sepermit.8
===================================================================
--- pam.deb.orig/modules/pam_sepermit/pam_sepermit.8
+++ pam.deb/modules/pam_sepermit/pam_sepermit.8
-@@ -116,7 +116,7 @@
+@@ -1,161 +1,22 @@
++'\" t
+ .\" Title: pam_sepermit
+ .\" Author: [see the "AUTHOR" section]
+-.\" Generator: DocBook XSL Stylesheets v1.74.0 <http://docbook.sf.net/>
+-.\" Date: 07/08/2010
++.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
++.\" Date: 08/31/2010
+ .\" Manual: Linux-PAM Manual
+ .\" Source: Linux-PAM Manual
+ .\" Language: English
+ .\"
+-.TH "PAM_SEPERMIT" "8" "07/08/2010" "Linux-PAM Manual" "Linux\-PAM Manual"
++.TH "PAM_SEPERMIT" "8" "08/31/2010" "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_sepermit \- PAM module to allow/deny login depending on SELinux enforcement state
+-.SH "Synopsis"
+-.fam C
++.SH "SYNOPSIS"
+ .HP \w'\fBpam_sepermit\&.so\fR\ 'u
+ \fBpam_sepermit\&.so\fR [debug] [conf=\fI/path/to/config/file\fR]
+-.fam
+ .SH "DESCRIPTION"
+ .PP
+ The pam_sepermit module allows or denies login depending on SELinux enforcement state\&.
+@@ -232,7 +91,7 @@
+ .PP
+ PAM_USER_UNKNOWN
+ .RS 4
+-The module was unable to determine the user\'s name\&.
++The module was unable to determine the user\*(Aqs name\&.
+ .RE
+ .PP
+ PAM_SERVICE_ERR
+@@ -241,7 +100,7 @@
+ .RE
+ .SH "FILES"
+ .PP
+-\FC/etc/security/sepermit\&.conf\F[]
++/etc/security/sepermit\&.conf
+ .RS 4
+ Default configuration file
+ .RE
+@@ -250,27 +109,13 @@
+ .if n \{\
+ .RS 4
+ .\}
+-.fam C
+-.ps -1
+ .nf
+-.if t \{\
+-.sp -1
+-.\}
+-.BB lightgray adjust-for-leading-newline
+-.sp -1
+-
+ auth [success=done ignore=ignore default=bad] pam_sepermit\&.so
+ auth required pam_unix\&.so
+ account required pam_unix\&.so
+ session required pam_permit\&.so
+
+-.EB lightgray adjust-for-leading-newline
+-.if t \{\
+-.sp 1
+-.\}
+ .fi
+-.fam
+-.ps +1
+ .if n \{\
+ .RE
+ .\}
+@@ -280,7 +125,7 @@
\fBsepermit.conf\fR(5),
\fBpam.conf\fR(5),
\fBpam.d\fR(5),
@@ -8627,25 +9585,29 @@ Index: pam.deb/modules/pam_shells/pam_shells.8
===================================================================
--- pam.deb.orig/modules/pam_shells/pam_shells.8
+++ pam.deb/modules/pam_shells/pam_shells.8
-@@ -1,161 +1,13 @@
+@@ -1,161 +1,22 @@
+'\" t
.\" Title: pam_shells
.\" Author: [see the "AUTHOR" section]
-.\" Generator: DocBook XSL Stylesheets v1.74.0 <http://docbook.sf.net/>
--.\" Date: 03/02/2009
+-.\" Date: 07/08/2010
+.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-+.\" Date: 08/24/2009
++.\" Date: 08/31/2010
.\" Manual: Linux-PAM Manual
.\" Source: Linux-PAM Manual
.\" Language: English
.\"
--.TH "PAM_SHELLS" "8" "03/02/2009" "Linux-PAM Manual" "Linux\-PAM Manual"
--.\" -----------------------------------------------------------------
+-.TH "PAM_SHELLS" "8" "07/08/2010" "Linux-PAM Manual" "Linux\-PAM Manual"
++.TH "PAM_SHELLS" "8" "08/31/2010" "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
-\\$*
@@ -8789,11 +9751,12 @@ Index: pam.deb/modules/pam_shells/pam_shells.8
-.fi
-.\}
-..
-+.TH "PAM_SHELLS" "8" "08/24/2009" "Linux-PAM Manual" "Linux\-PAM Manual"
++.ie \n(.g .ds Aq \(aq
++.el .ds Aq '
.\" -----------------------------------------------------------------
.\" * set default formatting
.\" -----------------------------------------------------------------
-@@ -166,20 +18,18 @@
+@@ -166,20 +27,18 @@
.\" -----------------------------------------------------------------
.\" * MAIN CONTENT STARTS HERE *
.\" -----------------------------------------------------------------
@@ -8818,7 +9781,7 @@ Index: pam.deb/modules/pam_shells/pam_shells.8
is a plain file and not world writable\&.
.SH "OPTIONS"
.PP
-@@ -201,7 +51,7 @@
+@@ -201,7 +60,7 @@
PAM_SUCCESS
.RS 4
The users login shell was listed as valid shell in
@@ -8827,7 +9790,7 @@ Index: pam.deb/modules/pam_shells/pam_shells.8
.RE
.PP
PAM_SERVICE_ERR
-@@ -215,24 +65,10 @@
+@@ -215,24 +74,10 @@
.if n \{\
.RS 4
.\}
@@ -8852,7 +9815,7 @@ Index: pam.deb/modules/pam_shells/pam_shells.8
.if n \{\
.RE
.\}
-@@ -243,7 +79,7 @@
+@@ -243,7 +88,7 @@
\fBshells\fR(5),
\fBpam.conf\fR(5),
\fBpam.d\fR(5),
@@ -8878,25 +9841,29 @@ Index: pam.deb/modules/pam_succeed_if/pam_succeed_if.8
===================================================================
--- pam.deb.orig/modules/pam_succeed_if/pam_succeed_if.8
+++ pam.deb/modules/pam_succeed_if/pam_succeed_if.8
-@@ -1,161 +1,13 @@
+@@ -1,161 +1,22 @@
+'\" t
.\" Title: pam_succeed_if
.\" Author: [see the "AUTHOR" section]
-.\" Generator: DocBook XSL Stylesheets v1.74.0 <http://docbook.sf.net/>
--.\" Date: 06/16/2009
+-.\" Date: 07/08/2010
+.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-+.\" Date: 08/24/2009
++.\" Date: 08/31/2010
.\" Manual: Linux-PAM
.\" Source: Linux-PAM
.\" Language: English
.\"
--.TH "PAM_SUCCEED_IF" "8" "06/16/2009" "Linux-PAM" "Linux\-PAM"
--.\" -----------------------------------------------------------------
+-.TH "PAM_SUCCEED_IF" "8" "07/08/2010" "Linux-PAM" "Linux\-PAM"
++.TH "PAM_SUCCEED_IF" "8" "08/31/2010" "Linux-PAM" "Linux\-PAM"
+ .\" -----------------------------------------------------------------
-.\" * (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
-\\$*
@@ -9040,11 +10007,12 @@ Index: pam.deb/modules/pam_succeed_if/pam_succeed_if.8
-.fi
-.\}
-..
-+.TH "PAM_SUCCEED_IF" "8" "08/24/2009" "Linux-PAM" "Linux\-PAM"
++.ie \n(.g .ds Aq \(aq
++.el .ds Aq '
.\" -----------------------------------------------------------------
.\" * set default formatting
.\" -----------------------------------------------------------------
-@@ -166,13 +18,11 @@
+@@ -166,13 +27,11 @@
.\" -----------------------------------------------------------------
.\" * MAIN CONTENT STARTS HERE *
.\" -----------------------------------------------------------------
@@ -9060,7 +10028,37 @@ Index: pam.deb/modules/pam_succeed_if/pam_succeed_if.8
.SH "DESCRIPTION"
.PP
pam_succeed_if\&.so is designed to succeed or fail authentication based on characteristics of the account belonging to the user being authenticated\&. One use is to select whether to load other modules based on this test\&.
-@@ -330,24 +180,10 @@
+@@ -195,17 +54,17 @@
+ .PP
+ \fBquiet\fR
+ .RS 4
+-Don\'t log failure or success to the system log\&.
++Don\*(Aqt log failure or success to the system log\&.
+ .RE
+ .PP
+ \fBquiet_fail\fR
+ .RS 4
+-Don\'t log failure to the system log\&.
++Don\*(Aqt log failure to the system log\&.
+ .RE
+ .PP
+ \fBquiet_success\fR
+ .RS 4
+-Don\'t log success to the system log\&.
++Don\*(Aqt log success to the system log\&.
+ .RE
+ .PP
+ \fBaudit\fR
+@@ -325,7 +184,7 @@
+ .PP
+ PAM_SERVICE_ERR
+ .RS 4
+-A service error occurred or the arguments can\'t be parsed correctly\&.
++A service error occurred or the arguments can\*(Aqt be parsed correctly\&.
+ .RE
+ .SH "EXAMPLES"
+ .PP
+@@ -335,24 +194,10 @@
.if n \{\
.RS 4
.\}
@@ -9085,7 +10083,7 @@ Index: pam.deb/modules/pam_succeed_if/pam_succeed_if.8
.if n \{\
.RE
.\}
-@@ -357,25 +193,11 @@
+@@ -362,25 +207,11 @@
.if n \{\
.RS 4
.\}
@@ -9111,7 +10109,7 @@ Index: pam.deb/modules/pam_succeed_if/pam_succeed_if.8
.if n \{\
.RE
.\}
-@@ -383,7 +205,7 @@
+@@ -388,7 +219,7 @@
.PP
\fBglob\fR(7),
@@ -9124,7 +10122,7 @@ Index: pam.deb/modules/pam_succeed_if/pam_succeed_if.8.xml
===================================================================
--- pam.deb.orig/modules/pam_succeed_if/pam_succeed_if.8.xml
+++ pam.deb/modules/pam_succeed_if/pam_succeed_if.8.xml
-@@ -286,7 +286,7 @@
+@@ -294,7 +294,7 @@
<refentrytitle>glob</refentrytitle><manvolnum>7</manvolnum>
</citerefentry>,
<citerefentry>
@@ -9137,25 +10135,29 @@ Index: pam.deb/modules/pam_tally/pam_tally.8
===================================================================
--- pam.deb.orig/modules/pam_tally/pam_tally.8
+++ pam.deb/modules/pam_tally/pam_tally.8
-@@ -1,161 +1,13 @@
+@@ -1,161 +1,22 @@
+'\" t
.\" Title: pam_tally
.\" Author: [see the "AUTHOR" section]
-.\" Generator: DocBook XSL Stylesheets v1.74.0 <http://docbook.sf.net/>
--.\" Date: 06/16/2009
+-.\" Date: 08/09/2010
+.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-+.\" Date: 08/24/2009
++.\" Date: 08/31/2010
.\" Manual: Linux-PAM Manual
.\" Source: Linux-PAM Manual
.\" Language: English
.\"
--.TH "PAM_TALLY" "8" "06/16/2009" "Linux-PAM Manual" "Linux\-PAM Manual"
--.\" -----------------------------------------------------------------
+-.TH "PAM_TALLY" "8" "08/09/2010" "Linux-PAM Manual" "Linux\-PAM Manual"
++.TH "PAM_TALLY" "8" "08/31/2010" "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
-\\$*
@@ -9299,11 +10301,12 @@ Index: pam.deb/modules/pam_tally/pam_tally.8
-.fi
-.\}
-..
-+.TH "PAM_TALLY" "8" "08/24/2009" "Linux-PAM Manual" "Linux\-PAM Manual"
++.ie \n(.g .ds Aq \(aq
++.el .ds Aq '
.\" -----------------------------------------------------------------
.\" * set default formatting
.\" -----------------------------------------------------------------
-@@ -166,17 +18,13 @@
+@@ -166,17 +27,13 @@
.\" -----------------------------------------------------------------
.\" * MAIN CONTENT STARTS HERE *
.\" -----------------------------------------------------------------
@@ -9323,7 +10326,25 @@ Index: pam.deb/modules/pam_tally/pam_tally.8
.SH "DESCRIPTION"
.PP
This module maintains a count of attempted accesses, can reset count on success, can deny access if too many attempts fail\&.
-@@ -219,7 +67,7 @@
+@@ -188,7 +45,7 @@
+ and
+ \fBpam_tally\fR\&. The former is the PAM module and the latter, a stand\-alone program\&.
+ \fBpam_tally\fR
+-is an (optional) application which can be used to interrogate and manipulate the counter file\&. It can display users\' counts, set individual counts, or clear all counts\&. Setting artificially high counts may be useful for blocking users without changing their passwords\&. For example, one might find it useful to clear all counts every midnight from a cron job\&. The
++is an (optional) application which can be used to interrogate and manipulate the counter file\&. It can display users\*(Aq counts, set individual counts, or clear all counts\&. Setting artificially high counts may be useful for blocking users without changing their passwords\&. For example, one might find it useful to clear all counts every midnight from a cron job\&. The
+ \fBfaillog\fR(8)
+ command can be used instead of pam_tally to to maintain the counter file\&.
+ .PP
+@@ -196,7 +53,7 @@
+ \fIroot\fR
+ will
+ \fBnot\fR
+-cause the root account to become blocked, to prevent denial\-of\-service: if your users aren\'t given shell accounts and root may only login via
++cause the root account to become blocked, to prevent denial\-of\-service: if your users aren\*(Aqt given shell accounts and root may only login via
+ \fBsu\fR
+ or at the machine console (not telnet/rsh, etc), this is safe\&.
+ .SH "OPTIONS"
+@@ -221,7 +78,7 @@
\fBfile=\fR\fB\fI/path/to/counter\fR\fR
.RS 4
File where to keep counts\&. Default is
@@ -9332,7 +10353,22 @@ Index: pam.deb/modules/pam_tally/pam_tally.8
.RE
.PP
\fBaudit\fR
-@@ -274,7 +122,7 @@
+@@ -231,12 +88,12 @@
+ .PP
+ \fBsilent\fR
+ .RS 4
+-Don\'t print informative messages\&.
++Don\*(Aqt print informative messages\&.
+ .RE
+ .PP
+ \fBno_log_info\fR
+ .RS 4
+-Don\'t log informative messages via
++Don\*(Aqt log informative messages via
+ \fBsyslog\fR(3)\&.
+ .RE
+ .RE
+@@ -276,13 +133,13 @@
\fBno_lock_time\fR
.RS 4
Do not use the \&.fail_locktime field in
@@ -9341,7 +10377,14 @@ Index: pam.deb/modules/pam_tally/pam_tally.8
for this user\&.
.RE
.PP
-@@ -291,7 +139,7 @@
+ \fBno_reset\fR
+ .RS 4
+-Don\'t reset count on successful entry, only decrement\&.
++Don\*(Aqt reset count on successful entry, only decrement\&.
+ .RE
+ .PP
+ \fBeven_deny_root_account\fR
+@@ -293,7 +150,7 @@
\fBper_user\fR
.RS 4
If
@@ -9350,16 +10393,36 @@ Index: pam.deb/modules/pam_tally/pam_tally.8
contains a non\-zero \&.fail_max/\&.fail_locktime field for this user then use it instead of
\fBdeny=\fR\fB\fIn\fR\fR/
\fBlock_time=\fR\fB\fIn\fR\fR
-@@ -301,7 +149,7 @@
+@@ -302,8 +159,8 @@
+ .PP
\fBno_lock_time\fR
.RS 4
- Don\'t use \&.fail_locktime filed in
+-Don\'t use \&.fail_locktime filed in
-\FC/var/log/faillog\F[]
++Don\*(Aqt use \&.fail_locktime filed in
+/var/log/faillog
for this user\&.
.RE
.RE
-@@ -351,9 +199,9 @@
+@@ -312,7 +169,7 @@
+ .RS 4
+ Account phase resets attempts counter if the user is
+ \fBnot\fR
+-magic root\&. This phase can be used optionally for services which don\'t call
++magic root\&. This phase can be used optionally for services which don\*(Aqt call
+ \fBpam_setcred\fR(3)
+ correctly or if the reset should be done regardless of the failure of the account phase of other modules\&.
+ .PP
+@@ -324,7 +181,7 @@
+ .PP
+ \fBno_reset\fR
+ .RS 4
+-Don\'t reset count on successful entry, only decrement\&.
++Don\*(Aqt reset count on successful entry, only decrement\&.
+ .RE
+ .RE
+ .SH "MODULE TYPES PROVIDED"
+@@ -353,9 +210,9 @@
.SH "EXAMPLES"
.PP
Add the following line to
@@ -9371,7 +10434,7 @@ Index: pam.deb/modules/pam_tally/pam_tally.8
and needs to be set with pam_tally or
\fBfaillog\fR(8)
before\&.
-@@ -361,15 +209,7 @@
+@@ -363,15 +220,7 @@
.if n \{\
.RS 4
.\}
@@ -9387,7 +10450,7 @@ Index: pam.deb/modules/pam_tally/pam_tally.8
auth required pam_securetty\&.so
auth required pam_tally\&.so per_user
auth required pam_env\&.so
-@@ -382,19 +222,13 @@
+@@ -384,19 +233,13 @@
session required pam_lastlog\&.so nowtmp
session optional pam_mail\&.so standard
@@ -9408,7 +10471,7 @@ Index: pam.deb/modules/pam_tally/pam_tally.8
.RS 4
failure logging file
.RE
-@@ -404,7 +238,7 @@
+@@ -406,7 +249,7 @@
\fBfaillog\fR(8),
\fBpam.conf\fR(5),
\fBpam.d\fR(5),
@@ -9421,7 +10484,7 @@ Index: pam.deb/modules/pam_tally/pam_tally.8.xml
===================================================================
--- pam.deb.orig/modules/pam_tally/pam_tally.8.xml
+++ pam.deb/modules/pam_tally/pam_tally.8.xml
-@@ -438,7 +438,7 @@
+@@ -444,7 +444,7 @@
<refentrytitle>pam.d</refentrytitle><manvolnum>5</manvolnum>
</citerefentry>,
<citerefentry>
@@ -9434,25 +10497,29 @@ Index: pam.deb/modules/pam_time/pam_time.8
===================================================================
--- pam.deb.orig/modules/pam_time/pam_time.8
+++ pam.deb/modules/pam_time/pam_time.8
-@@ -1,161 +1,13 @@
+@@ -1,161 +1,22 @@
+'\" t
.\" Title: pam_time
.\" Author: [see the "AUTHOR" section]
-.\" Generator: DocBook XSL Stylesheets v1.74.0 <http://docbook.sf.net/>
--.\" Date: 06/16/2009
+-.\" Date: 07/08/2010
+.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-+.\" Date: 08/24/2009
++.\" Date: 08/31/2010
.\" Manual: Linux-PAM Manual
.\" Source: Linux-PAM Manual
.\" Language: English
.\"
--.TH "PAM_TIME" "8" "06/16/2009" "Linux-PAM Manual" "Linux-PAM Manual"
--.\" -----------------------------------------------------------------
+-.TH "PAM_TIME" "8" "07/08/2010" "Linux-PAM Manual" "Linux-PAM Manual"
++.TH "PAM_TIME" "8" "08/31/2010" "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
-\\$*
@@ -9596,11 +10663,12 @@ Index: pam.deb/modules/pam_time/pam_time.8
-.fi
-.\}
-..
-+.TH "PAM_TIME" "8" "08/24/2009" "Linux-PAM Manual" "Linux-PAM Manual"
++.ie \n(.g .ds Aq \(aq
++.el .ds Aq '
.\" -----------------------------------------------------------------
.\" * set default formatting
.\" -----------------------------------------------------------------
-@@ -166,19 +18,17 @@
+@@ -166,19 +27,17 @@
.\" -----------------------------------------------------------------
.\" * MAIN CONTENT STARTS HERE *
.\" -----------------------------------------------------------------
@@ -9623,7 +10691,7 @@ Index: pam.deb/modules/pam_time/pam_time.8
.PP
If Linux PAM is compiled with audit support the module will report when it denies access\&.
.SH "OPTIONS"
-@@ -226,7 +76,7 @@
+@@ -226,7 +85,7 @@
.RE
.SH "FILES"
.PP
@@ -9632,7 +10700,7 @@ Index: pam.deb/modules/pam_time/pam_time.8
.RS 4
Default configuration file
.RE
-@@ -235,28 +85,14 @@
+@@ -235,28 +94,14 @@
.if n \{\
.RS 4
.\}
@@ -9661,7 +10729,7 @@ Index: pam.deb/modules/pam_time/pam_time.8
.if n \{\
.RE
.\}
-@@ -265,7 +101,7 @@
+@@ -265,7 +110,7 @@
\fBtime.conf\fR(5),
\fBpam.d\fR(5),
@@ -9687,25 +10755,29 @@ Index: pam.deb/modules/pam_umask/pam_umask.8
===================================================================
--- pam.deb.orig/modules/pam_umask/pam_umask.8
+++ pam.deb/modules/pam_umask/pam_umask.8
-@@ -1,161 +1,13 @@
+@@ -1,161 +1,22 @@
+'\" t
.\" Title: pam_umask
.\" Author: [see the "AUTHOR" section]
-.\" Generator: DocBook XSL Stylesheets v1.74.0 <http://docbook.sf.net/>
--.\" Date: 06/16/2009
+-.\" Date: 07/08/2010
+.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-+.\" Date: 08/24/2009
++.\" Date: 08/31/2010
.\" Manual: Linux-PAM Manual
.\" Source: Linux-PAM Manual
.\" Language: English
.\"
--.TH "PAM_UMASK" "8" "06/16/2009" "Linux-PAM Manual" "Linux\-PAM Manual"
--.\" -----------------------------------------------------------------
+-.TH "PAM_UMASK" "8" "07/08/2010" "Linux-PAM Manual" "Linux\-PAM Manual"
++.TH "PAM_UMASK" "8" "08/31/2010" "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
-\\$*
@@ -9849,11 +10921,12 @@ Index: pam.deb/modules/pam_umask/pam_umask.8
-.fi
-.\}
-..
-+.TH "PAM_UMASK" "8" "08/24/2009" "Linux-PAM Manual" "Linux\-PAM Manual"
++.ie \n(.g .ds Aq \(aq
++.el .ds Aq '
.\" -----------------------------------------------------------------
.\" * set default formatting
.\" -----------------------------------------------------------------
-@@ -166,13 +18,11 @@
+@@ -166,13 +27,11 @@
.\" -----------------------------------------------------------------
.\" * MAIN CONTENT STARTS HERE *
.\" -----------------------------------------------------------------
@@ -9869,7 +10942,33 @@ Index: pam.deb/modules/pam_umask/pam_umask.8
.SH "DESCRIPTION"
.PP
pam_umask is a PAM module to set the file mode creation mask of the current environment\&. The umask affects the default permissions assigned to newly created files\&.
-@@ -295,30 +145,16 @@
+@@ -245,7 +104,6 @@
+ UMASK entry from /etc/login\&.defs
+ .RE
+ .sp
+-.RE
+ .SH "OPTIONS"
+ .PP
+ .PP
+@@ -256,7 +114,7 @@
+ .PP
+ \fBsilent\fR
+ .RS 4
+-Don\'t print informative messages\&.
++Don\*(Aqt print informative messages\&.
+ .RE
+ .PP
+ \fBusergroups\fR
+@@ -266,7 +124,7 @@
+ .PP
+ \fBumask=\fR\fB\fImask\fR\fR
+ .RS 4
+-Sets the calling process\'s file mode creation mask (umask) to
++Sets the calling process\*(Aqs file mode creation mask (umask) to
+ \fBmask\fR
+ & 0777\&. The value is interpreted as Octal\&.
+ .RE
+@@ -295,30 +153,16 @@
.SH "EXAMPLES"
.PP
Add the following line to
@@ -9901,7 +11000,7 @@ Index: pam.deb/modules/pam_umask/pam_umask.8
.if n \{\
.RE
.\}
-@@ -328,7 +164,7 @@
+@@ -328,7 +172,7 @@
\fBpam.conf\fR(5),
\fBpam.d\fR(5),
@@ -9914,7 +11013,7 @@ Index: pam.deb/modules/pam_umask/pam_umask.8.xml
===================================================================
--- pam.deb.orig/modules/pam_umask/pam_umask.8.xml
+++ pam.deb/modules/pam_umask/pam_umask.8.xml
-@@ -205,7 +205,7 @@
+@@ -204,7 +204,7 @@
<refentrytitle>pam.d</refentrytitle><manvolnum>5</manvolnum>
</citerefentry>,
<citerefentry>
@@ -9927,173 +11026,7 @@ Index: pam.deb/modules/pam_unix/pam_unix.8
===================================================================
--- pam.deb.orig/modules/pam_unix/pam_unix.8
+++ pam.deb/modules/pam_unix/pam_unix.8
-@@ -1,161 +1,13 @@
-+'\" t
- .\" Title: pam_unix
- .\" Author: [see the "AUTHOR" section]
--.\" Generator: DocBook XSL Stylesheets v1.74.0 <http://docbook.sf.net/>
--.\" Date: 06/29/2009
-+.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-+.\" Date: 02/01/2010
- .\" Manual: Linux-PAM Manual
- .\" Source: Linux-PAM Manual
- .\" Language: English
- .\"
--.TH "PAM_UNIX" "8" "06/29/2009" "Linux-PAM Manual" "Linux\-PAM Manual"
--.\" -----------------------------------------------------------------
--.\" * (re)Define some macros
--.\" -----------------------------------------------------------------
--.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
--.\" toupper - uppercase a string (locale-aware)
--.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
--.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
--.\}
--..
-+.TH "PAM_UNIX" "8" "02/01/2010" "Linux-PAM Manual" "Linux\-PAM Manual"
- .\" -----------------------------------------------------------------
- .\" * set default formatting
- .\" -----------------------------------------------------------------
-@@ -403,7 +255,7 @@
+@@ -264,7 +264,7 @@
\fBpam.conf\fR(5),
\fBpam.d\fR(5),
@@ -10106,7 +11039,7 @@ Index: pam.deb/modules/pam_unix/pam_unix.8.xml
===================================================================
--- pam.deb.orig/modules/pam_unix/pam_unix.8.xml
+++ pam.deb/modules/pam_unix/pam_unix.8.xml
-@@ -486,7 +486,7 @@
+@@ -487,7 +487,7 @@
<refentrytitle>pam.d</refentrytitle><manvolnum>5</manvolnum>
</citerefentry>,
<citerefentry>
@@ -10119,25 +11052,29 @@ Index: pam.deb/doc/man/misc_conv.3
===================================================================
--- pam.deb.orig/doc/man/misc_conv.3
+++ pam.deb/doc/man/misc_conv.3
-@@ -1,161 +1,13 @@
+@@ -1,161 +1,22 @@
+'\" t
.\" Title: misc_conv
.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
-.\" Generator: DocBook XSL Stylesheets v1.74.0 <http://docbook.sf.net/>
--.\" Date: 03/02/2009
+-.\" Date: 04/01/2010
+.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-+.\" Date: 08/24/2009
++.\" Date: 08/31/2010
.\" Manual: Linux-PAM Manual
.\" Source: Linux-PAM Manual
.\" Language: English
.\"
--.TH "MISC_CONV" "3" "03/02/2009" "Linux-PAM Manual" "Linux-PAM Manual"
--.\" -----------------------------------------------------------------
+-.TH "MISC_CONV" "3" "04/01/2010" "Linux-PAM Manual" "Linux-PAM Manual"
++.TH "MISC_CONV" "3" "08/31/2010" "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
-\\$*
@@ -10281,11 +11218,12 @@ Index: pam.deb/doc/man/misc_conv.3
-.fi
-.\}
-..
-+.TH "MISC_CONV" "3" "08/24/2009" "Linux-PAM Manual" "Linux-PAM Manual"
++.ie \n(.g .ds Aq \(aq
++.el .ds Aq '
.\" -----------------------------------------------------------------
.\" * set default formatting
.\" -----------------------------------------------------------------
-@@ -166,23 +18,17 @@
+@@ -166,23 +27,17 @@
.\" -----------------------------------------------------------------
.\" * MAIN CONTENT STARTS HERE *
.\" -----------------------------------------------------------------
@@ -10311,7 +11249,7 @@ Index: pam.deb/doc/man/misc_conv.3
.SH "DESCRIPTION"
.PP
The
-@@ -263,7 +109,7 @@
+@@ -263,7 +118,7 @@
.PP
\fBpam_conv\fR(3),
@@ -10337,25 +11275,29 @@ Index: pam.deb/doc/man/pam_acct_mgmt.3
===================================================================
--- pam.deb.orig/doc/man/pam_acct_mgmt.3
+++ pam.deb/doc/man/pam_acct_mgmt.3
-@@ -1,161 +1,13 @@
+@@ -1,161 +1,22 @@
+'\" t
.\" Title: pam_acct_mgmt
.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
-.\" Generator: DocBook XSL Stylesheets v1.74.0 <http://docbook.sf.net/>
--.\" Date: 03/02/2009
+-.\" Date: 04/01/2010
+.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-+.\" Date: 08/24/2009
++.\" Date: 08/31/2010
.\" Manual: Linux-PAM Manual
.\" Source: Linux-PAM Manual
.\" Language: English
.\"
--.TH "PAM_ACCT_MGMT" "3" "03/02/2009" "Linux-PAM Manual" "Linux-PAM Manual"
--.\" -----------------------------------------------------------------
+-.TH "PAM_ACCT_MGMT" "3" "04/01/2010" "Linux-PAM Manual" "Linux-PAM Manual"
++.TH "PAM_ACCT_MGMT" "3" "08/31/2010" "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
-\\$*
@@ -10499,11 +11441,12 @@ Index: pam.deb/doc/man/pam_acct_mgmt.3
-.fi
-.\}
-..
-+.TH "PAM_ACCT_MGMT" "3" "08/24/2009" "Linux-PAM Manual" "Linux-PAM Manual"
++.ie \n(.g .ds Aq \(aq
++.el .ds Aq '
.\" -----------------------------------------------------------------
.\" * set default formatting
.\" -----------------------------------------------------------------
-@@ -166,23 +18,17 @@
+@@ -166,23 +27,17 @@
.\" -----------------------------------------------------------------
.\" * MAIN CONTENT STARTS HERE *
.\" -----------------------------------------------------------------
@@ -10529,7 +11472,7 @@ Index: pam.deb/doc/man/pam_acct_mgmt.3
.SH "DESCRIPTION"
.PP
The
-@@ -243,4 +89,4 @@
+@@ -243,4 +98,4 @@
\fBpam_authenticate\fR(3),
\fBpam_chauthtok\fR(3),
\fBpam_strerror\fR(3),
@@ -10552,25 +11495,29 @@ Index: pam.deb/doc/man/pam_authenticate.3
===================================================================
--- pam.deb.orig/doc/man/pam_authenticate.3
+++ pam.deb/doc/man/pam_authenticate.3
-@@ -1,161 +1,13 @@
+@@ -1,161 +1,22 @@
+'\" t
.\" Title: pam_authenticate
.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
-.\" Generator: DocBook XSL Stylesheets v1.74.0 <http://docbook.sf.net/>
--.\" Date: 03/02/2009
+-.\" Date: 04/01/2010
+.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-+.\" Date: 08/24/2009
++.\" Date: 08/31/2010
.\" Manual: Linux-PAM Manual
.\" Source: Linux-PAM Manual
.\" Language: English
.\"
--.TH "PAM_AUTHENTICATE" "3" "03/02/2009" "Linux-PAM Manual" "Linux-PAM Manual"
--.\" -----------------------------------------------------------------
+-.TH "PAM_AUTHENTICATE" "3" "04/01/2010" "Linux-PAM Manual" "Linux-PAM Manual"
++.TH "PAM_AUTHENTICATE" "3" "08/31/2010" "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
-\\$*
@@ -10714,11 +11661,12 @@ Index: pam.deb/doc/man/pam_authenticate.3
-.fi
-.\}
-..
-+.TH "PAM_AUTHENTICATE" "3" "08/24/2009" "Linux-PAM Manual" "Linux-PAM Manual"
++.ie \n(.g .ds Aq \(aq
++.el .ds Aq '
.\" -----------------------------------------------------------------
.\" * set default formatting
.\" -----------------------------------------------------------------
-@@ -166,23 +18,17 @@
+@@ -166,23 +27,17 @@
.\" -----------------------------------------------------------------
.\" * MAIN CONTENT STARTS HERE *
.\" -----------------------------------------------------------------
@@ -10744,7 +11692,7 @@ Index: pam.deb/doc/man/pam_authenticate.3
.SH "DESCRIPTION"
.PP
The
-@@ -253,4 +99,4 @@
+@@ -253,4 +108,4 @@
\fBpam_setcred\fR(3),
\fBpam_chauthtok\fR(3),
\fBpam_strerror\fR(3),
@@ -10767,25 +11715,29 @@ Index: pam.deb/doc/man/pam_chauthtok.3
===================================================================
--- pam.deb.orig/doc/man/pam_chauthtok.3
+++ pam.deb/doc/man/pam_chauthtok.3
-@@ -1,161 +1,13 @@
+@@ -1,161 +1,22 @@
+'\" t
.\" Title: pam_chauthtok
.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
-.\" Generator: DocBook XSL Stylesheets v1.74.0 <http://docbook.sf.net/>
--.\" Date: 03/02/2009
+-.\" Date: 04/01/2010
+.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-+.\" Date: 08/24/2009
++.\" Date: 08/31/2010
.\" Manual: Linux-PAM Manual
.\" Source: Linux-PAM Manual
.\" Language: English
.\"
--.TH "PAM_CHAUTHTOK" "3" "03/02/2009" "Linux-PAM Manual" "Linux-PAM Manual"
--.\" -----------------------------------------------------------------
+-.TH "PAM_CHAUTHTOK" "3" "04/01/2010" "Linux-PAM Manual" "Linux-PAM Manual"
++.TH "PAM_CHAUTHTOK" "3" "08/31/2010" "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
-\\$*
@@ -10929,11 +11881,12 @@ Index: pam.deb/doc/man/pam_chauthtok.3
-.fi
-.\}
-..
-+.TH "PAM_CHAUTHTOK" "3" "08/24/2009" "Linux-PAM Manual" "Linux-PAM Manual"
++.ie \n(.g .ds Aq \(aq
++.el .ds Aq '
.\" -----------------------------------------------------------------
.\" * set default formatting
.\" -----------------------------------------------------------------
-@@ -166,23 +18,17 @@
+@@ -166,23 +27,17 @@
.\" -----------------------------------------------------------------
.\" * MAIN CONTENT STARTS HERE *
.\" -----------------------------------------------------------------
@@ -10959,7 +11912,16 @@ Index: pam.deb/doc/man/pam_chauthtok.3
.SH "DESCRIPTION"
.PP
The
-@@ -252,4 +98,4 @@
+@@ -237,7 +92,7 @@
+ .PP
+ PAM_TRY_AGAIN
+ .RS 4
+-Not all of the modules were in a position to update the authentication token(s)\&. In such a case none of the user\'s authentication tokens are updated\&.
++Not all of the modules were in a position to update the authentication token(s)\&. In such a case none of the user\*(Aqs authentication tokens are updated\&.
+ .RE
+ .PP
+ PAM_USER_UNKNOWN
+@@ -252,4 +107,4 @@
\fBpam_setcred\fR(3),
\fBpam_get_item\fR(3),
\fBpam_strerror\fR(3),
@@ -10982,25 +11944,29 @@ Index: pam.deb/doc/man/pam_conv.3
===================================================================
--- pam.deb.orig/doc/man/pam_conv.3
+++ pam.deb/doc/man/pam_conv.3
-@@ -1,161 +1,13 @@
+@@ -1,161 +1,22 @@
+'\" t
.\" Title: pam_conv
.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
-.\" Generator: DocBook XSL Stylesheets v1.74.0 <http://docbook.sf.net/>
--.\" Date: 03/02/2009
+-.\" Date: 04/01/2010
+.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-+.\" Date: 08/24/2009
++.\" Date: 08/31/2010
.\" Manual: Linux-PAM Manual
.\" Source: Linux-PAM Manual
.\" Language: English
.\"
--.TH "PAM_CONV" "3" "03/02/2009" "Linux-PAM Manual" "Linux-PAM Manual"
--.\" -----------------------------------------------------------------
+-.TH "PAM_CONV" "3" "04/01/2010" "Linux-PAM Manual" "Linux-PAM Manual"
++.TH "PAM_CONV" "3" "08/31/2010" "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
-\\$*
@@ -11144,11 +12110,12 @@ Index: pam.deb/doc/man/pam_conv.3
-.fi
-.\}
-..
-+.TH "PAM_CONV" "3" "08/24/2009" "Linux-PAM Manual" "Linux-PAM Manual"
++.ie \n(.g .ds Aq \(aq
++.el .ds Aq '
.\" -----------------------------------------------------------------
.\" * set default formatting
.\" -----------------------------------------------------------------
-@@ -166,22 +18,16 @@
+@@ -166,22 +27,16 @@
.\" -----------------------------------------------------------------
.\" * MAIN CONTENT STARTS HERE *
.\" -----------------------------------------------------------------
@@ -11173,7 +12140,7 @@ Index: pam.deb/doc/man/pam_conv.3
.nf
struct pam_message {
int msg_style;
-@@ -200,8 +46,6 @@
+@@ -200,8 +55,6 @@
};
.fi
@@ -11182,7 +12149,34 @@ Index: pam.deb/doc/man/pam_conv.3
.SH "DESCRIPTION"
.PP
The PAM library uses an application\-defined callback to allow a direct communication between a loaded module and the application\&. This callback is specified by the
-@@ -290,24 +134,10 @@
+@@ -221,7 +74,7 @@
+ \fIresp\fR
+ points to an array of pam_response structures, holding the application supplied text\&. The
+ \fIresp_retcode\fR
+-member of this struct is unused and should be set to zero\&. It is the caller\'s responsibility to release both, this array and the responses themselves, using
++member of this struct is unused and should be set to zero\&. It is the caller\*(Aqs responsibility to release both, this array and the responses themselves, using
+ \fBfree\fR(3)\&. Note,
+ \fI*resp\fR
+ is a
+@@ -231,7 +84,7 @@
+ The number of responses is always equal to the
+ \fInum_msg\fR
+ conversation function argument\&. This does require that the response array is
+-\fBfree\fR(3)\'d after every call to the conversation function\&. The index of the responses corresponds directly to the prompt index in the pam_message array\&.
++\fBfree\fR(3)\*(Aqd after every call to the conversation function\&. The index of the responses corresponds directly to the prompt index in the pam_message array\&.
+ .PP
+ On failure, the conversation function should release any resources it has allocated, and return one of the predefined PAM error codes\&.
+ .PP
+@@ -262,7 +115,7 @@
+ .PP
+ The point of having an array of messages is that it becomes possible to pass a number of things to the application in a single call from the module\&. It can also be convenient for the application that related things come at once: a windows based application can then present a single form with many messages/prompts on at once\&.
+ .PP
+-In passing, it is worth noting that there is a descrepency between the way Linux\-PAM handles the const struct pam_message **msg conversation function argument from the way that Solaris\' PAM (and derivitives, known to include HP/UX, are there others?) does\&. Linux\-PAM interprets the msg argument as entirely equivalent to the following prototype const struct pam_message *msg[] (which, in spirit, is consistent with the commonly used prototypes for argv argument to the familiar main() function: char **argv; and char *argv[])\&. Said another way Linux\-PAM interprets the msg argument as a pointer to an array of num_msg read only \'struct pam_message\' pointers\&. Solaris\' PAM implementation interprets this argument as a pointer to a pointer to an array of num_msg pam_message structures\&. Fortunately, perhaps, for most module/application developers when num_msg has a value of one these two definitions are entirely equivalent\&. Unfortunately, casually raising this number to two has led to unanticipated compatibility problems\&.
++In passing, it is worth noting that there is a descrepency between the way Linux\-PAM handles the const struct pam_message **msg conversation function argument from the way that Solaris\*(Aq PAM (and derivitives, known to include HP/UX, are there others?) does\&. Linux\-PAM interprets the msg argument as entirely equivalent to the following prototype const struct pam_message *msg[] (which, in spirit, is consistent with the commonly used prototypes for argv argument to the familiar main() function: char **argv; and char *argv[])\&. Said another way Linux\-PAM interprets the msg argument as a pointer to an array of num_msg read only \*(Aqstruct pam_message\*(Aq pointers\&. Solaris\*(Aq PAM implementation interprets this argument as a pointer to a pointer to an array of num_msg pam_message structures\&. Fortunately, perhaps, for most module/application developers when num_msg has a value of one these two definitions are entirely equivalent\&. Unfortunately, casually raising this number to two has led to unanticipated compatibility problems\&.
+ .PP
+ For what its worth the two known module writer work\-arounds for trying to maintain source level compatibility with both PAM implementations are:
+ .sp
+@@ -290,24 +143,10 @@
.if n \{\
.RS 4
.\}
@@ -11207,7 +12201,7 @@ Index: pam.deb/doc/man/pam_conv.3
.if n \{\
.RE
.\}
-@@ -336,4 +166,4 @@
+@@ -336,4 +175,4 @@
\fBpam_set_item\fR(3),
\fBpam_get_item\fR(3),
\fBpam_strerror\fR(3),
@@ -11230,25 +12224,29 @@ Index: pam.deb/doc/man/pam_error.3
===================================================================
--- pam.deb.orig/doc/man/pam_error.3
+++ pam.deb/doc/man/pam_error.3
-@@ -1,161 +1,13 @@
+@@ -1,161 +1,22 @@
+'\" t
.\" Title: pam_error
.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
-.\" Generator: DocBook XSL Stylesheets v1.74.0 <http://docbook.sf.net/>
--.\" Date: 03/02/2009
+-.\" Date: 04/01/2010
+.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-+.\" Date: 08/24/2009
++.\" Date: 08/31/2010
.\" Manual: Linux-PAM Manual
.\" Source: Linux-PAM Manual
.\" Language: English
.\"
--.TH "PAM_ERROR" "3" "03/02/2009" "Linux-PAM Manual" "Linux-PAM Manual"
--.\" -----------------------------------------------------------------
+-.TH "PAM_ERROR" "3" "04/01/2010" "Linux-PAM Manual" "Linux-PAM Manual"
++.TH "PAM_ERROR" "3" "08/31/2010" "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
-\\$*
@@ -11392,11 +12390,12 @@ Index: pam.deb/doc/man/pam_error.3
-.fi
-.\}
-..
-+.TH "PAM_ERROR" "3" "08/24/2009" "Linux-PAM Manual" "Linux-PAM Manual"
++.ie \n(.g .ds Aq \(aq
++.el .ds Aq '
.\" -----------------------------------------------------------------
.\" * set default formatting
.\" -----------------------------------------------------------------
-@@ -166,27 +18,19 @@
+@@ -166,27 +27,19 @@
.\" -----------------------------------------------------------------
.\" * MAIN CONTENT STARTS HERE *
.\" -----------------------------------------------------------------
@@ -11426,7 +12425,7 @@ Index: pam.deb/doc/man/pam_error.3
.SH "DESCRIPTION"
.PP
The
-@@ -228,7 +72,7 @@
+@@ -228,7 +81,7 @@
\fBpam_vinfo\fR(3),
\fBpam_prompt\fR(3),
\fBpam_vprompt\fR(3),
@@ -11452,25 +12451,29 @@ Index: pam.deb/doc/man/pam_getenv.3
===================================================================
--- pam.deb.orig/doc/man/pam_getenv.3
+++ pam.deb/doc/man/pam_getenv.3
-@@ -1,161 +1,13 @@
+@@ -1,161 +1,22 @@
+'\" t
.\" Title: pam_getenv
.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
-.\" Generator: DocBook XSL Stylesheets v1.74.0 <http://docbook.sf.net/>
--.\" Date: 03/02/2009
+-.\" Date: 04/01/2010
+.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-+.\" Date: 08/24/2009
++.\" Date: 08/31/2010
.\" Manual: Linux-PAM Manual
.\" Source: Linux-PAM Manual
.\" Language: English
.\"
--.TH "PAM_GETENV" "3" "03/02/2009" "Linux-PAM Manual" "Linux-PAM Manual"
--.\" -----------------------------------------------------------------
+-.TH "PAM_GETENV" "3" "04/01/2010" "Linux-PAM Manual" "Linux-PAM Manual"
++.TH "PAM_GETENV" "3" "08/31/2010" "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
-\\$*
@@ -11614,11 +12617,12 @@ Index: pam.deb/doc/man/pam_getenv.3
-.fi
-.\}
-..
-+.TH "PAM_GETENV" "3" "08/24/2009" "Linux-PAM Manual" "Linux-PAM Manual"
++.ie \n(.g .ds Aq \(aq
++.el .ds Aq '
.\" -----------------------------------------------------------------
.\" * set default formatting
.\" -----------------------------------------------------------------
-@@ -166,23 +18,17 @@
+@@ -166,23 +27,17 @@
.\" -----------------------------------------------------------------
.\" * MAIN CONTENT STARTS HERE *
.\" -----------------------------------------------------------------
@@ -11644,7 +12648,7 @@ Index: pam.deb/doc/man/pam_getenv.3
.SH "DESCRIPTION"
.PP
The
-@@ -203,4 +49,4 @@
+@@ -203,4 +58,4 @@
\fBpam_start\fR(3),
\fBpam_getenvlist\fR(3),
\fBpam_putenv\fR(3),
@@ -11667,25 +12671,29 @@ Index: pam.deb/doc/man/pam_getenvlist.3
===================================================================
--- pam.deb.orig/doc/man/pam_getenvlist.3
+++ pam.deb/doc/man/pam_getenvlist.3
-@@ -1,161 +1,13 @@
+@@ -1,161 +1,22 @@
+'\" t
.\" Title: pam_getenvlist
.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
-.\" Generator: DocBook XSL Stylesheets v1.74.0 <http://docbook.sf.net/>
--.\" Date: 03/02/2009
+-.\" Date: 04/01/2010
+.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-+.\" Date: 08/24/2009
++.\" Date: 08/31/2010
.\" Manual: Linux-PAM Manual
.\" Source: Linux-PAM Manual
.\" Language: English
.\"
--.TH "PAM_GETENVLIST" "3" "03/02/2009" "Linux-PAM Manual" "Linux-PAM Manual"
--.\" -----------------------------------------------------------------
+-.TH "PAM_GETENVLIST" "3" "04/01/2010" "Linux-PAM Manual" "Linux-PAM Manual"
++.TH "PAM_GETENVLIST" "3" "08/31/2010" "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
-\\$*
@@ -11829,11 +12837,12 @@ Index: pam.deb/doc/man/pam_getenvlist.3
-.fi
-.\}
-..
-+.TH "PAM_GETENVLIST" "3" "08/24/2009" "Linux-PAM Manual" "Linux-PAM Manual"
++.ie \n(.g .ds Aq \(aq
++.el .ds Aq '
.\" -----------------------------------------------------------------
.\" * set default formatting
.\" -----------------------------------------------------------------
-@@ -166,23 +18,17 @@
+@@ -166,23 +27,17 @@
.\" -----------------------------------------------------------------
.\" * MAIN CONTENT STARTS HERE *
.\" -----------------------------------------------------------------
@@ -11859,7 +12868,19 @@ Index: pam.deb/doc/man/pam_getenvlist.3
.SH "DESCRIPTION"
.PP
The
-@@ -209,4 +55,4 @@
+@@ -190,9 +45,9 @@
+ function returns a complete copy of the PAM environment as associated with the handle
+ \fIpamh\fR\&. The PAM environment variables represent the contents of the regular environment variables of the authenticated user when service is granted\&.
+ .PP
+-The format of the memory is a malloc()\'d array of char pointers, the last element of which is set to NULL\&. Each of the non\-NULL entries in this array point to a NUL terminated and malloc()\'d char string of the form: "\fIname=value\fR"\&.
++The format of the memory is a malloc()\*(Aqd array of char pointers, the last element of which is set to NULL\&. Each of the non\-NULL entries in this array point to a NUL terminated and malloc()\*(Aqd char string of the form: "\fIname=value\fR"\&.
+ .PP
+-It should be noted that this memory will never be free()\'d by libpam\&. Once obtained by a call to
++It should be noted that this memory will never be free()\*(Aqd by libpam\&. Once obtained by a call to
+ \fBpam_getenvlist\fR, it is the responsibility of the calling application to free() this memory\&.
+ .PP
+ It is by design, and not a coincidence, that the format and contents of the returned array matches that required for the third argument of the
+@@ -209,4 +64,4 @@
\fBpam_start\fR(3),
\fBpam_getenv\fR(3),
\fBpam_putenv\fR(3),
@@ -11882,25 +12903,29 @@ Index: pam.deb/doc/man/pam_info.3
===================================================================
--- pam.deb.orig/doc/man/pam_info.3
+++ pam.deb/doc/man/pam_info.3
-@@ -1,161 +1,13 @@
+@@ -1,161 +1,22 @@
+'\" t
.\" Title: pam_info
.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
-.\" Generator: DocBook XSL Stylesheets v1.74.0 <http://docbook.sf.net/>
--.\" Date: 03/02/2009
+-.\" Date: 04/01/2010
+.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-+.\" Date: 08/24/2009
++.\" Date: 08/31/2010
.\" Manual: Linux-PAM Manual
.\" Source: Linux-PAM Manual
.\" Language: English
.\"
--.TH "PAM_INFO" "3" "03/02/2009" "Linux-PAM Manual" "Linux-PAM Manual"
--.\" -----------------------------------------------------------------
+-.TH "PAM_INFO" "3" "04/01/2010" "Linux-PAM Manual" "Linux-PAM Manual"
++.TH "PAM_INFO" "3" "08/31/2010" "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
-\\$*
@@ -12044,11 +13069,12 @@ Index: pam.deb/doc/man/pam_info.3
-.fi
-.\}
-..
-+.TH "PAM_INFO" "3" "08/24/2009" "Linux-PAM Manual" "Linux-PAM Manual"
++.ie \n(.g .ds Aq \(aq
++.el .ds Aq '
.\" -----------------------------------------------------------------
.\" * set default formatting
.\" -----------------------------------------------------------------
-@@ -166,27 +18,19 @@
+@@ -166,27 +27,19 @@
.\" -----------------------------------------------------------------
.\" * MAIN CONTENT STARTS HERE *
.\" -----------------------------------------------------------------
@@ -12078,7 +13104,7 @@ Index: pam.deb/doc/man/pam_info.3
.SH "DESCRIPTION"
.PP
The
-@@ -224,7 +68,7 @@
+@@ -224,7 +77,7 @@
.SH "SEE ALSO"
.PP
@@ -12104,25 +13130,29 @@ Index: pam.deb/doc/man/pam_misc_drop_env.3
===================================================================
--- pam.deb.orig/doc/man/pam_misc_drop_env.3
+++ pam.deb/doc/man/pam_misc_drop_env.3
-@@ -1,161 +1,13 @@
+@@ -1,161 +1,22 @@
+'\" t
.\" Title: pam_misc_drop_env
.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
-.\" Generator: DocBook XSL Stylesheets v1.74.0 <http://docbook.sf.net/>
--.\" Date: 03/02/2009
+-.\" Date: 04/01/2010
+.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-+.\" Date: 08/24/2009
++.\" Date: 08/31/2010
.\" Manual: Linux-PAM Manual
.\" Source: Linux-PAM Manual
.\" Language: English
.\"
--.TH "PAM_MISC_DROP_ENV" "3" "03/02/2009" "Linux-PAM Manual" "Linux-PAM Manual"
--.\" -----------------------------------------------------------------
+-.TH "PAM_MISC_DROP_ENV" "3" "04/01/2010" "Linux-PAM Manual" "Linux-PAM Manual"
++.TH "PAM_MISC_DROP_ENV" "3" "08/31/2010" "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
-\\$*
@@ -12266,11 +13296,12 @@ Index: pam.deb/doc/man/pam_misc_drop_env.3
-.fi
-.\}
-..
-+.TH "PAM_MISC_DROP_ENV" "3" "08/24/2009" "Linux-PAM Manual" "Linux-PAM Manual"
++.ie \n(.g .ds Aq \(aq
++.el .ds Aq '
.\" -----------------------------------------------------------------
.\" * set default formatting
.\" -----------------------------------------------------------------
-@@ -166,23 +18,17 @@
+@@ -166,23 +27,17 @@
.\" -----------------------------------------------------------------
.\" * MAIN CONTENT STARTS HERE *
.\" -----------------------------------------------------------------
@@ -12296,7 +13327,7 @@ Index: pam.deb/doc/man/pam_misc_drop_env.3
.SH "DESCRIPTION"
.PP
This function is defined to complement the
-@@ -198,7 +44,7 @@
+@@ -198,7 +53,7 @@
.PP
\fBpam_getenvlist\fR(3),
@@ -12322,25 +13353,29 @@ Index: pam.deb/doc/man/pam_misc_paste_env.3
===================================================================
--- pam.deb.orig/doc/man/pam_misc_paste_env.3
+++ pam.deb/doc/man/pam_misc_paste_env.3
-@@ -1,161 +1,13 @@
+@@ -1,161 +1,22 @@
+'\" t
.\" Title: pam_misc_paste_env
.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
-.\" Generator: DocBook XSL Stylesheets v1.74.0 <http://docbook.sf.net/>
--.\" Date: 03/02/2009
+-.\" Date: 04/01/2010
+.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-+.\" Date: 08/24/2009
++.\" Date: 08/31/2010
.\" Manual: Linux-PAM Manual
.\" Source: Linux-PAM Manual
.\" Language: English
.\"
--.TH "PAM_MISC_PASTE_ENV" "3" "03/02/2009" "Linux-PAM Manual" "Linux-PAM Manual"
--.\" -----------------------------------------------------------------
+-.TH "PAM_MISC_PASTE_ENV" "3" "04/01/2010" "Linux-PAM Manual" "Linux-PAM Manual"
++.TH "PAM_MISC_PASTE_ENV" "3" "08/31/2010" "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
-\\$*
@@ -12484,11 +13519,12 @@ Index: pam.deb/doc/man/pam_misc_paste_env.3
-.fi
-.\}
-..
-+.TH "PAM_MISC_PASTE_ENV" "3" "08/24/2009" "Linux-PAM Manual" "Linux-PAM Manual"
++.ie \n(.g .ds Aq \(aq
++.el .ds Aq '
.\" -----------------------------------------------------------------
.\" * set default formatting
.\" -----------------------------------------------------------------
-@@ -166,23 +18,17 @@
+@@ -166,23 +27,17 @@
.\" -----------------------------------------------------------------
.\" * MAIN CONTENT STARTS HERE *
.\" -----------------------------------------------------------------
@@ -12514,7 +13550,7 @@ Index: pam.deb/doc/man/pam_misc_paste_env.3
.SH "DESCRIPTION"
.PP
This function takes the supplied list of environment pointers and
-@@ -193,7 +39,7 @@
+@@ -193,7 +48,7 @@
.PP
\fBpam_putenv\fR(3),
@@ -12540,25 +13576,29 @@ Index: pam.deb/doc/man/pam_misc_setenv.3
===================================================================
--- pam.deb.orig/doc/man/pam_misc_setenv.3
+++ pam.deb/doc/man/pam_misc_setenv.3
-@@ -1,161 +1,13 @@
+@@ -1,161 +1,22 @@
+'\" t
.\" Title: pam_misc_setenv
.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
-.\" Generator: DocBook XSL Stylesheets v1.74.0 <http://docbook.sf.net/>
--.\" Date: 03/02/2009
+-.\" Date: 04/01/2010
+.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-+.\" Date: 08/24/2009
++.\" Date: 08/31/2010
.\" Manual: Linux-PAM Manual
.\" Source: Linux-PAM Manual
.\" Language: English
.\"
--.TH "PAM_MISC_SETENV" "3" "03/02/2009" "Linux-PAM Manual" "Linux-PAM Manual"
--.\" -----------------------------------------------------------------
+-.TH "PAM_MISC_SETENV" "3" "04/01/2010" "Linux-PAM Manual" "Linux-PAM Manual"
++.TH "PAM_MISC_SETENV" "3" "08/31/2010" "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
-\\$*
@@ -12702,11 +13742,12 @@ Index: pam.deb/doc/man/pam_misc_setenv.3
-.fi
-.\}
-..
-+.TH "PAM_MISC_SETENV" "3" "08/24/2009" "Linux-PAM Manual" "Linux-PAM Manual"
++.ie \n(.g .ds Aq \(aq
++.el .ds Aq '
.\" -----------------------------------------------------------------
.\" * set default formatting
.\" -----------------------------------------------------------------
-@@ -166,23 +18,17 @@
+@@ -166,23 +27,17 @@
.\" -----------------------------------------------------------------
.\" * MAIN CONTENT STARTS HERE *
.\" -----------------------------------------------------------------
@@ -12732,7 +13773,15 @@ Index: pam.deb/doc/man/pam_misc_setenv.3
.SH "DESCRIPTION"
.PP
This function performs a task equivalent to
-@@ -198,7 +44,7 @@
+@@ -191,14 +46,14 @@
+ \fIname\fR
+ and
+ \fIvalue\fR
+-are concatenated with an \'=\' to form a name=value and passed to
++are concatenated with an \*(Aq=\*(Aq to form a name=value and passed to
+ \fBpam_putenv()\fR\&. If, however, the PAM variable is already set, the replacement will only be applied if the last argument,
+ \fIreadonly\fR, is zero\&.
+ .SH "SEE ALSO"
.PP
\fBpam_putenv\fR(3),
@@ -12758,25 +13807,29 @@ Index: pam.deb/doc/man/pam_prompt.3
===================================================================
--- pam.deb.orig/doc/man/pam_prompt.3
+++ pam.deb/doc/man/pam_prompt.3
-@@ -1,161 +1,13 @@
+@@ -1,161 +1,22 @@
+'\" t
.\" Title: pam_prompt
.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
-.\" Generator: DocBook XSL Stylesheets v1.74.0 <http://docbook.sf.net/>
--.\" Date: 03/02/2009
+-.\" Date: 04/01/2010
+.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-+.\" Date: 08/24/2009
++.\" Date: 08/31/2010
.\" Manual: Linux-PAM Manual
.\" Source: Linux-PAM Manual
.\" Language: English
.\"
--.TH "PAM_PROMPT" "3" "03/02/2009" "Linux-PAM Manual" "Linux-PAM Manual"
--.\" -----------------------------------------------------------------
+-.TH "PAM_PROMPT" "3" "04/01/2010" "Linux-PAM Manual" "Linux-PAM Manual"
++.TH "PAM_PROMPT" "3" "08/31/2010" "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
-\\$*
@@ -12920,11 +13973,12 @@ Index: pam.deb/doc/man/pam_prompt.3
-.fi
-.\}
-..
-+.TH "PAM_PROMPT" "3" "08/24/2009" "Linux-PAM Manual" "Linux-PAM Manual"
++.ie \n(.g .ds Aq \(aq
++.el .ds Aq '
.\" -----------------------------------------------------------------
.\" * set default formatting
.\" -----------------------------------------------------------------
-@@ -166,27 +18,19 @@
+@@ -166,27 +27,19 @@
.\" -----------------------------------------------------------------
.\" * MAIN CONTENT STARTS HERE *
.\" -----------------------------------------------------------------
@@ -12954,7 +14008,7 @@ Index: pam.deb/doc/man/pam_prompt.3
.SH "DESCRIPTION"
.PP
The
-@@ -218,7 +62,7 @@
+@@ -218,7 +71,7 @@
.SH "SEE ALSO"
.PP
@@ -12980,25 +14034,29 @@ Index: pam.deb/doc/man/pam_putenv.3
===================================================================
--- pam.deb.orig/doc/man/pam_putenv.3
+++ pam.deb/doc/man/pam_putenv.3
-@@ -1,161 +1,13 @@
+@@ -1,161 +1,22 @@
+'\" t
.\" Title: pam_putenv
.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
-.\" Generator: DocBook XSL Stylesheets v1.74.0 <http://docbook.sf.net/>
--.\" Date: 03/02/2009
+-.\" Date: 04/01/2010
+.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-+.\" Date: 08/24/2009
++.\" Date: 08/31/2010
.\" Manual: Linux-PAM Manual
.\" Source: Linux-PAM Manual
.\" Language: English
.\"
--.TH "PAM_PUTENV" "3" "03/02/2009" "Linux-PAM Manual" "Linux-PAM Manual"
--.\" -----------------------------------------------------------------
+-.TH "PAM_PUTENV" "3" "04/01/2010" "Linux-PAM Manual" "Linux-PAM Manual"
++.TH "PAM_PUTENV" "3" "08/31/2010" "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
-\\$*
@@ -13142,11 +14200,12 @@ Index: pam.deb/doc/man/pam_putenv.3
-.fi
-.\}
-..
-+.TH "PAM_PUTENV" "3" "08/24/2009" "Linux-PAM Manual" "Linux-PAM Manual"
++.ie \n(.g .ds Aq \(aq
++.el .ds Aq '
.\" -----------------------------------------------------------------
.\" * set default formatting
.\" -----------------------------------------------------------------
-@@ -166,23 +18,17 @@
+@@ -166,23 +27,17 @@
.\" -----------------------------------------------------------------
.\" * MAIN CONTENT STARTS HERE *
.\" -----------------------------------------------------------------
@@ -13172,7 +14231,16 @@ Index: pam.deb/doc/man/pam_putenv.3
.SH "DESCRIPTION"
.PP
The
-@@ -255,4 +101,4 @@
+@@ -210,7 +65,7 @@
+ .PP
+ NAME
+ .RS 4
+-Without an \'=\' the
++Without an \*(Aq=\*(Aq the
+ \fBpam_putenv\fR() function will delete the corresponding variable from the PAM environment\&.
+ .RE
+ .PP
+@@ -255,4 +110,4 @@
\fBpam_getenv\fR(3),
\fBpam_getenvlist\fR(3),
\fBpam_strerror\fR(3),
@@ -13195,25 +14263,29 @@ Index: pam.deb/doc/man/pam_strerror.3
===================================================================
--- pam.deb.orig/doc/man/pam_strerror.3
+++ pam.deb/doc/man/pam_strerror.3
-@@ -1,161 +1,13 @@
+@@ -1,161 +1,22 @@
+'\" t
.\" Title: pam_strerror
.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
-.\" Generator: DocBook XSL Stylesheets v1.74.0 <http://docbook.sf.net/>
--.\" Date: 03/02/2009
+-.\" Date: 04/01/2010
+.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-+.\" Date: 08/24/2009
++.\" Date: 08/31/2010
.\" Manual: Linux-PAM Manual
.\" Source: Linux-PAM Manual
.\" Language: English
.\"
--.TH "PAM_STRERROR" "3" "03/02/2009" "Linux-PAM Manual" "Linux-PAM Manual"
--.\" -----------------------------------------------------------------
+-.TH "PAM_STRERROR" "3" "04/01/2010" "Linux-PAM Manual" "Linux-PAM Manual"
++.TH "PAM_STRERROR" "3" "08/31/2010" "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
-\\$*
@@ -13357,11 +14429,12 @@ Index: pam.deb/doc/man/pam_strerror.3
-.fi
-.\}
-..
-+.TH "PAM_STRERROR" "3" "08/24/2009" "Linux-PAM Manual" "Linux-PAM Manual"
++.ie \n(.g .ds Aq \(aq
++.el .ds Aq '
.\" -----------------------------------------------------------------
.\" * set default formatting
.\" -----------------------------------------------------------------
-@@ -166,23 +18,17 @@
+@@ -166,23 +27,17 @@
.\" -----------------------------------------------------------------
.\" * MAIN CONTENT STARTS HERE *
.\" -----------------------------------------------------------------
@@ -13387,7 +14460,7 @@ Index: pam.deb/doc/man/pam_strerror.3
.SH "DESCRIPTION"
.PP
The
-@@ -195,4 +41,4 @@
+@@ -195,4 +50,4 @@
.SH "SEE ALSO"
.PP
@@ -13410,25 +14483,29 @@ Index: pam.deb/doc/man/pam_syslog.3
===================================================================
--- pam.deb.orig/doc/man/pam_syslog.3
+++ pam.deb/doc/man/pam_syslog.3
-@@ -1,161 +1,13 @@
+@@ -1,161 +1,22 @@
+'\" t
.\" Title: pam_syslog
.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
-.\" Generator: DocBook XSL Stylesheets v1.74.0 <http://docbook.sf.net/>
--.\" Date: 03/02/2009
+-.\" Date: 04/01/2010
+.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-+.\" Date: 08/24/2009
++.\" Date: 08/31/2010
.\" Manual: Linux-PAM Manual
.\" Source: Linux-PAM Manual
.\" Language: English
.\"
--.TH "PAM_SYSLOG" "3" "03/02/2009" "Linux-PAM Manual" "Linux-PAM Manual"
--.\" -----------------------------------------------------------------
+-.TH "PAM_SYSLOG" "3" "04/01/2010" "Linux-PAM Manual" "Linux-PAM Manual"
++.TH "PAM_SYSLOG" "3" "08/31/2010" "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
-\\$*
@@ -13572,11 +14649,12 @@ Index: pam.deb/doc/man/pam_syslog.3
-.fi
-.\}
-..
-+.TH "PAM_SYSLOG" "3" "08/24/2009" "Linux-PAM Manual" "Linux-PAM Manual"
++.ie \n(.g .ds Aq \(aq
++.el .ds Aq '
.\" -----------------------------------------------------------------
.\" * set default formatting
.\" -----------------------------------------------------------------
-@@ -166,37 +18,25 @@
+@@ -166,37 +27,25 @@
.\" -----------------------------------------------------------------
.\" * MAIN CONTENT STARTS HERE *
.\" -----------------------------------------------------------------
@@ -13616,7 +14694,7 @@ Index: pam.deb/doc/man/pam_syslog.3
.SH "DESCRIPTION"
.PP
The
-@@ -219,7 +59,7 @@
+@@ -219,7 +68,7 @@
.SH "SEE ALSO"
.PP
@@ -13642,25 +14720,29 @@ Index: pam.deb/modules/pam_userdb/pam_userdb.8
===================================================================
--- pam.deb.orig/modules/pam_userdb/pam_userdb.8
+++ pam.deb/modules/pam_userdb/pam_userdb.8
-@@ -1,161 +1,13 @@
+@@ -1,161 +1,22 @@
+'\" t
.\" Title: pam_userdb
.\" Author: [see the "AUTHOR" section]
-.\" Generator: DocBook XSL Stylesheets v1.74.0 <http://docbook.sf.net/>
--.\" Date: 03/02/2009
+-.\" Date: 07/08/2010
+.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-+.\" Date: 08/24/2009
++.\" Date: 08/31/2010
.\" Manual: Linux-PAM Manual
.\" Source: Linux-PAM Manual
.\" Language: English
.\"
--.TH "PAM_USERDB" "8" "03/02/2009" "Linux-PAM Manual" "Linux\-PAM Manual"
--.\" -----------------------------------------------------------------
+-.TH "PAM_USERDB" "8" "07/08/2010" "Linux-PAM Manual" "Linux\-PAM Manual"
++.TH "PAM_USERDB" "8" "08/31/2010" "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
-\\$*
@@ -13804,11 +14886,12 @@ Index: pam.deb/modules/pam_userdb/pam_userdb.8
-.fi
-.\}
-..
-+.TH "PAM_USERDB" "8" "08/24/2009" "Linux-PAM Manual" "Linux\-PAM Manual"
++.ie \n(.g .ds Aq \(aq
++.el .ds Aq '
.\" -----------------------------------------------------------------
.\" * set default formatting
.\" -----------------------------------------------------------------
-@@ -166,13 +18,11 @@
+@@ -166,13 +27,11 @@
.\" -----------------------------------------------------------------
.\" * MAIN CONTENT STARTS HERE *
.\" -----------------------------------------------------------------
@@ -13824,7 +14907,7 @@ Index: pam.deb/modules/pam_userdb/pam_userdb.8
.SH "DESCRIPTION"
.PP
The pam_userdb module is used to verify a username/password pair against values stored in a Berkeley DB database\&. The database is indexed by the username, and the data fields corresponding to the username keys are the passwords\&.
-@@ -191,7 +41,7 @@
+@@ -191,7 +50,7 @@
\fBdb=\fR\fB\fI/path/database\fR\fR
.RS 4
Use the
@@ -13833,7 +14916,25 @@ Index: pam.deb/modules/pam_userdb/pam_userdb.8
database for performing lookup\&. There is no default; the module will return
\fBPAM_IGNORE\fR
if no database is provided\&.
-@@ -279,24 +129,10 @@
+@@ -204,7 +63,7 @@
+ .PP
+ \fBdump\fR
+ .RS 4
+-Dump all the entries in the database to the log\&. Don\'t do this by default!
++Dump all the entries in the database to the log\&. Don\*(Aqt do this by default!
+ .RE
+ .PP
+ \fBicase\fR
+@@ -229,7 +88,7 @@
+ .PP
+ \fBkey_only\fR
+ .RS 4
+-The username and password are concatenated together in the database hash as \'username\-password\' with a random value\&. if the concatenation of the username and password with a dash in the middle returns any result, the user is valid\&. this is useful in cases where the username may not be unique but the username and password pair are\&.
++The username and password are concatenated together in the database hash as \*(Aqusername\-password\*(Aq with a random value\&. if the concatenation of the username and password with a dash in the middle returns any result, the user is valid\&. this is useful in cases where the username may not be unique but the username and password pair are\&.
+ .RE
+ .SH "MODULE TYPES PROVIDED"
+ .PP
+@@ -279,24 +138,10 @@
.if n \{\
.RS 4
.\}
@@ -13858,7 +14959,7 @@ Index: pam.deb/modules/pam_userdb/pam_userdb.8
.if n \{\
.RE
.\}
-@@ -306,7 +142,7 @@
+@@ -306,7 +151,7 @@
\fBcrypt\fR(3),
\fBpam.conf\fR(5),
\fBpam.d\fR(5),
@@ -13884,25 +14985,29 @@ Index: pam.deb/modules/pam_warn/pam_warn.8
===================================================================
--- pam.deb.orig/modules/pam_warn/pam_warn.8
+++ pam.deb/modules/pam_warn/pam_warn.8
-@@ -1,161 +1,13 @@
+@@ -1,161 +1,22 @@
+'\" t
.\" Title: pam_warn
.\" Author: [see the "AUTHOR" section]
-.\" Generator: DocBook XSL Stylesheets v1.74.0 <http://docbook.sf.net/>
--.\" Date: 03/02/2009
+-.\" Date: 07/08/2010
+.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-+.\" Date: 08/24/2009
++.\" Date: 08/31/2010
.\" Manual: Linux-PAM Manual
.\" Source: Linux-PAM Manual
.\" Language: English
.\"
--.TH "PAM_WARN" "8" "03/02/2009" "Linux-PAM Manual" "Linux\-PAM Manual"
--.\" -----------------------------------------------------------------
+-.TH "PAM_WARN" "8" "07/08/2010" "Linux-PAM Manual" "Linux\-PAM Manual"
++.TH "PAM_WARN" "8" "08/31/2010" "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
-\\$*
@@ -14046,11 +15151,12 @@ Index: pam.deb/modules/pam_warn/pam_warn.8
-.fi
-.\}
-..
-+.TH "PAM_WARN" "8" "08/24/2009" "Linux-PAM Manual" "Linux\-PAM Manual"
++.ie \n(.g .ds Aq \(aq
++.el .ds Aq '
.\" -----------------------------------------------------------------
.\" * set default formatting
.\" -----------------------------------------------------------------
-@@ -166,13 +18,11 @@
+@@ -166,13 +27,11 @@
.\" -----------------------------------------------------------------
.\" * MAIN CONTENT STARTS HERE *
.\" -----------------------------------------------------------------
@@ -14066,7 +15172,7 @@ Index: pam.deb/modules/pam_warn/pam_warn.8
.SH "DESCRIPTION"
.PP
pam_warn is a PAM module that logs the service, terminal, user, remote user and remote host to
-@@ -201,15 +51,7 @@
+@@ -201,18 +60,10 @@
.if n \{\
.RS 4
.\}
@@ -14081,8 +15187,12 @@ Index: pam.deb/modules/pam_warn/pam_warn.8
-
#%PAM\-1\&.0
#
- # If we don\'t have config entries for a service, the
-@@ -224,13 +66,7 @@
+-# If we don\'t have config entries for a service, the
++# If we don\*(Aqt have config entries for a service, the
+ # OTHER entries are used\&. To be secure, warn and deny
+ # access to everything\&.
+ other auth required pam_warn\&.so
+@@ -224,13 +75,7 @@
other session required pam_warn\&.so
other session required pam_deny\&.so
@@ -14096,7 +15206,7 @@ Index: pam.deb/modules/pam_warn/pam_warn.8
.if n \{\
.RE
.\}
-@@ -239,7 +75,7 @@
+@@ -239,7 +84,7 @@
\fBpam.conf\fR(5),
\fBpam.d\fR(5),
@@ -14122,7 +15232,7 @@ Index: pam.deb/modules/pam_wheel/pam_wheel.8
===================================================================
--- pam.deb.orig/modules/pam_wheel/pam_wheel.8
+++ pam.deb/modules/pam_wheel/pam_wheel.8
-@@ -128,7 +128,7 @@
+@@ -137,7 +137,7 @@
\fBpam.conf\fR(5),
\fBpam.d\fR(5),
@@ -14148,25 +15258,29 @@ Index: pam.deb/modules/pam_xauth/pam_xauth.8
===================================================================
--- pam.deb.orig/modules/pam_xauth/pam_xauth.8
+++ pam.deb/modules/pam_xauth/pam_xauth.8
-@@ -1,161 +1,13 @@
+@@ -1,161 +1,22 @@
+'\" t
.\" Title: pam_xauth
.\" Author: [see the "AUTHOR" section]
-.\" Generator: DocBook XSL Stylesheets v1.74.0 <http://docbook.sf.net/>
--.\" Date: 06/16/2009
+-.\" Date: 07/08/2010
+.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-+.\" Date: 08/24/2009
++.\" Date: 08/31/2010
.\" Manual: Linux-PAM Manual
.\" Source: Linux-PAM Manual
.\" Language: English
.\"
--.TH "PAM_XAUTH" "8" "06/16/2009" "Linux-PAM Manual" "Linux\-PAM Manual"
--.\" -----------------------------------------------------------------
+-.TH "PAM_XAUTH" "8" "07/08/2010" "Linux-PAM Manual" "Linux\-PAM Manual"
++.TH "PAM_XAUTH" "8" "08/31/2010" "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
-\\$*
@@ -14310,11 +15424,12 @@ Index: pam.deb/modules/pam_xauth/pam_xauth.8
-.fi
-.\}
-..
-+.TH "PAM_XAUTH" "8" "08/24/2009" "Linux-PAM Manual" "Linux\-PAM Manual"
++.ie \n(.g .ds Aq \(aq
++.el .ds Aq '
.\" -----------------------------------------------------------------
.\" * set default formatting
.\" -----------------------------------------------------------------
-@@ -166,13 +18,11 @@
+@@ -166,20 +27,18 @@
.\" -----------------------------------------------------------------
.\" * MAIN CONTENT STARTS HERE *
.\" -----------------------------------------------------------------
@@ -14330,16 +15445,26 @@ Index: pam.deb/modules/pam_xauth/pam_xauth.8
.SH "DESCRIPTION"
.PP
The pam_xauth PAM module is designed to forward xauth keys (sometimes referred to as "cookies") between users\&.
-@@ -190,24 +40,24 @@
+ .PP
+ Without pam_xauth, when xauth is enabled and a user uses the
+ \fBsu\fR(1)
+-command to assume another user\'s privileges, that user is no longer able to access the original user\'s X display because the new user does not have the key needed to access the display\&. pam_xauth solves the problem by forwarding the key from the user running su (the source user) to the user whose identity the source user is assuming (the target user) when the session is created, and destroying the key when the session is torn down\&.
++command to assume another user\*(Aqs privileges, that user is no longer able to access the original user\*(Aqs X display because the new user does not have the key needed to access the display\&. pam_xauth solves the problem by forwarding the key from the user running su (the source user) to the user whose identity the source user is assuming (the target user) when the session is created, and destroying the key when the session is torn down\&.
+ .PP
+ This means, for example, that when you run
+ \fBsu\fR(1)
+@@ -190,24 +49,24 @@
pam_xauth will only forward keys if xauth can list a key connected to the $DISPLAY environment variable\&.
.PP
Primitive access control is provided by
-\FC~/\&.xauth/export\F[]
-+~/\&.xauth/export
- in the invoking user\'s home directory and
+-in the invoking user\'s home directory and
-\FC~/\&.xauth/import\F[]
+-in the target user\'s home directory\&.
++~/\&.xauth/export
++in the invoking user\*(Aqs home directory and
+~/\&.xauth/import
- in the target user\'s home directory\&.
++in the target user\*(Aqs home directory\&.
.PP
If a user has a
-\FC~/\&.xauth/import\F[]
@@ -14362,7 +15487,7 @@ Index: pam.deb/modules/pam_xauth/pam_xauth.8
file, and the invoking user is
\fBroot\fR, the user will
\fInot\fR
-@@ -225,9 +75,9 @@
+@@ -225,9 +84,9 @@
\fBxauthpath=\fR\fB\fI/path/to/xauth\fR\fR
.RS 4
Specify the path the xauth program (it is expected in
@@ -14375,7 +15500,7 @@ Index: pam.deb/modules/pam_xauth/pam_xauth.8
by default)\&.
.RE
.PP
-@@ -274,30 +124,16 @@
+@@ -274,30 +133,16 @@
.SH "EXAMPLES"
.PP
Add the following line to
@@ -14407,7 +15532,7 @@ Index: pam.deb/modules/pam_xauth/pam_xauth.8
.if n \{\
.RE
.\}
-@@ -319,12 +155,12 @@
+@@ -319,12 +164,12 @@
pam_xauth cannot be told to not remove the keys when the session is closed\&.
.SH "FILES"
.PP
@@ -14422,7 +15547,7 @@ Index: pam.deb/modules/pam_xauth/pam_xauth.8
.RS 4
XXX
.RE
-@@ -333,7 +169,7 @@
+@@ -333,7 +178,7 @@
\fBpam.conf\fR(5),
\fBpam.d\fR(5),
diff --git a/debian/patches-applied/autoconf.patch b/debian/patches-applied/autoconf.patch
index 5168eee9..70866bea 100644
--- a/debian/patches-applied/autoconf.patch
+++ b/debian/patches-applied/autoconf.patch
@@ -24,7 +24,7 @@ Index: pam.debian/ltmain.sh
# compiler flags: $LTCFLAGS
# linker: $LD (gnu? $with_gnu_ld)
-# $progname: (GNU libtool) 2.2.6
-+# $progname: (GNU libtool) 2.2.6b Debian-2.2.6b-2ubuntu1
++# $progname: (GNU libtool) 2.2.6b Debian-2.2.6b-2
# automake: $automake_version
# autoconf: $autoconf_version
#
@@ -33,7 +33,7 @@ Index: pam.debian/ltmain.sh
PROGRAM=ltmain.sh
PACKAGE=libtool
-VERSION=2.2.6
-+VERSION="2.2.6b Debian-2.2.6b-2ubuntu1"
++VERSION="2.2.6b Debian-2.2.6b-2"
TIMESTAMP=""
-package_revision=1.3012
+package_revision=1.3017
@@ -269,59 +269,622 @@ Index: pam.debian/aclocal.m4
===================================================================
--- pam.debian.orig/aclocal.m4
+++ pam.debian/aclocal.m4
-@@ -1,4 +1,4 @@
--# generated automatically by aclocal 1.11 -*- Autoconf -*-
+@@ -1,7 +1,7 @@
+-# generated automatically by aclocal 1.10.1 -*- Autoconf -*-
+# generated automatically by aclocal 1.11.1 -*- Autoconf -*-
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
- # 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
-@@ -13,8 +13,8 @@
+-# 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
++# 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+ # This file is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -13,13 +13,13 @@
m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
--m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.63],,
+-m4_if(AC_AUTOCONF_VERSION, [2.63],,
-[m4_warning([this file was generated for autoconf 2.63.
+m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.65],,
+[m4_warning([this file was generated for autoconf 2.65.
You have another version of autoconf. It may work, but is not guaranteed to.
If you have problems, you may need to regenerate the build system entirely.
To do so, use the procedure documented by the package, typically `autoreconf'.])])
-@@ -34,7 +34,7 @@
- [am__api_version='1.11'
+
+-# Copyright (C) 2002, 2003, 2005, 2006, 2007 Free Software Foundation, Inc.
++# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+ #
+ # This file is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+@@ -31,10 +31,10 @@
+ # generated from the m4 files accompanying Automake X.Y.
+ # (This private macro should not be called outside this file.)
+ AC_DEFUN([AM_AUTOMAKE_VERSION],
+-[am__api_version='1.10'
++[am__api_version='1.11'
dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
dnl require some minimum version. Point them to the right macro.
--m4_if([$1], [1.11], [],
+-m4_if([$1], [1.10.1], [],
+m4_if([$1], [1.11.1], [],
[AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
])
-@@ -50,7 +50,7 @@
+@@ -48,12 +48,12 @@
+ # AM_SET_CURRENT_AUTOMAKE_VERSION
+ # -------------------------------
# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
- # This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
+-# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
++# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
--[AM_AUTOMAKE_VERSION([1.11])dnl
+-[AM_AUTOMAKE_VERSION([1.10.1])dnl
+[AM_AUTOMAKE_VERSION([1.11.1])dnl
m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
- _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
-@@ -1008,7 +1008,6 @@
- m4_include([m4/gettext.m4])
- m4_include([m4/iconv.m4])
- m4_include([m4/intlmacosx.m4])
--m4_include([m4/japhar_grep_cflags.m4])
- m4_include([m4/jh_path_xml_catalog.m4])
- m4_include([m4/ld-O1.m4])
- m4_include([m4/ld-as-needed.m4])
-@@ -1024,3 +1023,4 @@
- m4_include([m4/nls.m4])
- m4_include([m4/po.m4])
- m4_include([m4/progtest.m4])
-+m4_include([acinclude.m4])
+-_AM_AUTOCONF_VERSION(AC_AUTOCONF_VERSION)])
++_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
+
+ # AM_AUX_DIR_EXPAND -*- Autoconf -*-
+
+@@ -110,14 +110,14 @@
+
+ # AM_CONDITIONAL -*- Autoconf -*-
+
+-# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006
++# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006, 2008
+ # Free Software Foundation, Inc.
+ #
+ # This file is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+
+-# serial 8
++# serial 9
+
+ # AM_CONDITIONAL(NAME, SHELL-CONDITION)
+ # -------------------------------------
+@@ -130,6 +130,7 @@
+ AC_SUBST([$1_FALSE])dnl
+ _AM_SUBST_NOTMAKE([$1_TRUE])dnl
+ _AM_SUBST_NOTMAKE([$1_FALSE])dnl
++m4_define([_AM_COND_VALUE_$1], [$2])dnl
+ if $2; then
+ $1_TRUE=
+ $1_FALSE='#'
+@@ -143,14 +144,14 @@
+ Usually this means the macro was only invoked conditionally.]])
+ fi])])
+
+-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006
++# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009
+ # Free Software Foundation, Inc.
+ #
+ # This file is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+
+-# serial 9
++# serial 10
+
+ # There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
+ # written in clear, in which case automake, when reading aclocal.m4,
+@@ -207,6 +208,16 @@
+ if test "$am_compiler_list" = ""; then
+ am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp`
+ fi
++ am__universal=false
++ m4_case([$1], [CC],
++ [case " $depcc " in #(
++ *\ -arch\ *\ -arch\ *) am__universal=true ;;
++ esac],
++ [CXX],
++ [case " $depcc " in #(
++ *\ -arch\ *\ -arch\ *) am__universal=true ;;
++ esac])
++
+ for depmode in $am_compiler_list; do
+ # Setup a source with many dependencies, because some compilers
+ # like to wrap large dependency lists on column 80 (with \), and
+@@ -224,7 +235,17 @@
+ done
+ echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
+
++ # We check with `-c' and `-o' for the sake of the "dashmstdout"
++ # mode. It turns out that the SunPro C++ compiler does not properly
++ # handle `-M -o', and we need to detect this. Also, some Intel
++ # versions had trouble with output in subdirs
++ am__obj=sub/conftest.${OBJEXT-o}
++ am__minus_obj="-o $am__obj"
+ case $depmode in
++ gcc)
++ # This depmode causes a compiler race in universal mode.
++ test "$am__universal" = false || continue
++ ;;
+ nosideeffect)
+ # after this tag, mechanisms are not by side-effect, so they'll
+ # only be used when explicitly requested
+@@ -234,19 +255,23 @@
+ break
+ fi
+ ;;
++ msvisualcpp | msvcmsys)
++ # This compiler won't grok `-c -o', but also, the minuso test has
++ # not run yet. These depmodes are late enough in the game, and
++ # so weak that their functioning should not be impacted.
++ am__obj=conftest.${OBJEXT-o}
++ am__minus_obj=
++ ;;
+ none) break ;;
+ esac
+- # We check with `-c' and `-o' for the sake of the "dashmstdout"
+- # mode. It turns out that the SunPro C++ compiler does not properly
+- # handle `-M -o', and we need to detect this.
+ if depmode=$depmode \
+- source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
++ source=sub/conftest.c object=$am__obj \
+ depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
+- $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
++ $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \
+ >/dev/null 2>conftest.err &&
+ grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
+ grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
+- grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
++ grep $am__obj sub/conftest.Po > /dev/null 2>&1 &&
+ ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
+ # icc doesn't choke on unknown options, it will just issue warnings
+ # or remarks (even with -Werror). So we grep stderr for any message
+@@ -303,57 +328,68 @@
+
+ # Generate code to set up dependency tracking. -*- Autoconf -*-
+
+-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005
++# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008
+ # Free Software Foundation, Inc.
+ #
+ # This file is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+
+-#serial 3
++#serial 5
+
+ # _AM_OUTPUT_DEPENDENCY_COMMANDS
+ # ------------------------------
+ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
+-[for mf in $CONFIG_FILES; do
+- # Strip MF so we end up with the name of the file.
+- mf=`echo "$mf" | sed -e 's/:.*$//'`
+- # Check whether this is an Automake generated Makefile or not.
+- # We used to match only the files named `Makefile.in', but
+- # some people rename them; so instead we look at the file content.
+- # Grep'ing the first line is not enough: some people post-process
+- # each Makefile.in and add a new line on top of each file to say so.
+- # Grep'ing the whole file is not good either: AIX grep has a line
+- # limit of 2048, but all sed's we know have understand at least 4000.
+- if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
+- dirpart=`AS_DIRNAME("$mf")`
+- else
+- continue
+- fi
+- # Extract the definition of DEPDIR, am__include, and am__quote
+- # from the Makefile without running `make'.
+- DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
+- test -z "$DEPDIR" && continue
+- am__include=`sed -n 's/^am__include = //p' < "$mf"`
+- test -z "am__include" && continue
+- am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
+- # When using ansi2knr, U may be empty or an underscore; expand it
+- U=`sed -n 's/^U = //p' < "$mf"`
+- # Find all dependency output files, they are included files with
+- # $(DEPDIR) in their names. We invoke sed twice because it is the
+- # simplest approach to changing $(DEPDIR) to its actual value in the
+- # expansion.
+- for file in `sed -n "
+- s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
+- sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
+- # Make sure the directory exists.
+- test -f "$dirpart/$file" && continue
+- fdir=`AS_DIRNAME(["$file"])`
+- AS_MKDIR_P([$dirpart/$fdir])
+- # echo "creating $dirpart/$file"
+- echo '# dummy' > "$dirpart/$file"
++[{
++ # Autoconf 2.62 quotes --file arguments for eval, but not when files
++ # are listed without --file. Let's play safe and only enable the eval
++ # if we detect the quoting.
++ case $CONFIG_FILES in
++ *\'*) eval set x "$CONFIG_FILES" ;;
++ *) set x $CONFIG_FILES ;;
++ esac
++ shift
++ for mf
++ do
++ # Strip MF so we end up with the name of the file.
++ mf=`echo "$mf" | sed -e 's/:.*$//'`
++ # Check whether this is an Automake generated Makefile or not.
++ # We used to match only the files named `Makefile.in', but
++ # some people rename them; so instead we look at the file content.
++ # Grep'ing the first line is not enough: some people post-process
++ # each Makefile.in and add a new line on top of each file to say so.
++ # Grep'ing the whole file is not good either: AIX grep has a line
++ # limit of 2048, but all sed's we know have understand at least 4000.
++ if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
++ dirpart=`AS_DIRNAME("$mf")`
++ else
++ continue
++ fi
++ # Extract the definition of DEPDIR, am__include, and am__quote
++ # from the Makefile without running `make'.
++ DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
++ test -z "$DEPDIR" && continue
++ am__include=`sed -n 's/^am__include = //p' < "$mf"`
++ test -z "am__include" && continue
++ am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
++ # When using ansi2knr, U may be empty or an underscore; expand it
++ U=`sed -n 's/^U = //p' < "$mf"`
++ # Find all dependency output files, they are included files with
++ # $(DEPDIR) in their names. We invoke sed twice because it is the
++ # simplest approach to changing $(DEPDIR) to its actual value in the
++ # expansion.
++ for file in `sed -n "
++ s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
++ sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
++ # Make sure the directory exists.
++ test -f "$dirpart/$file" && continue
++ fdir=`AS_DIRNAME(["$file"])`
++ AS_MKDIR_P([$dirpart/$fdir])
++ # echo "creating $dirpart/$file"
++ echo '# dummy' > "$dirpart/$file"
++ done
+ done
+-done
++}
+ ])# _AM_OUTPUT_DEPENDENCY_COMMANDS
+
+
+@@ -373,13 +409,13 @@
+ # Do all the work for Automake. -*- Autoconf -*-
+
+ # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+-# 2005, 2006, 2008 Free Software Foundation, Inc.
++# 2005, 2006, 2008, 2009 Free Software Foundation, Inc.
+ #
+ # This file is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+
+-# serial 13
++# serial 16
+
+ # This macro actually does too much. Some checks are only needed if
+ # your package does certain things. But this isn't really a big deal.
+@@ -396,7 +432,7 @@
+ # arguments mandatory, and then we can depend on a new Autoconf
+ # release and drop the old call support.
+ AC_DEFUN([AM_INIT_AUTOMAKE],
+-[AC_PREREQ([2.60])dnl
++[AC_PREREQ([2.62])dnl
+ dnl Autoconf wants to disallow AM_ names. We explicitly allow
+ dnl the ones we care about.
+ m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
+@@ -447,8 +483,8 @@
+ AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version})
+ AM_MISSING_PROG(AUTOHEADER, autoheader)
+ AM_MISSING_PROG(MAKEINFO, makeinfo)
+-AM_PROG_INSTALL_SH
+-AM_PROG_INSTALL_STRIP
++AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
++AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl
+ AC_REQUIRE([AM_PROG_MKDIR_P])dnl
+ # We need awk for the "check" target. The system "awk" is bad on
+ # some platforms.
+@@ -456,23 +492,36 @@
+ AC_REQUIRE([AC_PROG_MAKE_SET])dnl
+ AC_REQUIRE([AM_SET_LEADING_DOT])dnl
+ _AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])],
+- [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])],
+- [_AM_PROG_TAR([v7])])])
++ [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])],
++ [_AM_PROG_TAR([v7])])])
+ _AM_IF_OPTION([no-dependencies],,
+ [AC_PROVIDE_IFELSE([AC_PROG_CC],
+- [_AM_DEPENDENCIES(CC)],
+- [define([AC_PROG_CC],
+- defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl
++ [_AM_DEPENDENCIES(CC)],
++ [define([AC_PROG_CC],
++ defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl
+ AC_PROVIDE_IFELSE([AC_PROG_CXX],
+- [_AM_DEPENDENCIES(CXX)],
+- [define([AC_PROG_CXX],
+- defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
++ [_AM_DEPENDENCIES(CXX)],
++ [define([AC_PROG_CXX],
++ defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
+ AC_PROVIDE_IFELSE([AC_PROG_OBJC],
+- [_AM_DEPENDENCIES(OBJC)],
+- [define([AC_PROG_OBJC],
+- defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl
+-])
+-])
++ [_AM_DEPENDENCIES(OBJC)],
++ [define([AC_PROG_OBJC],
++ defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl
++])
++_AM_IF_OPTION([silent-rules], [AC_REQUIRE([AM_SILENT_RULES])])dnl
++dnl The `parallel-tests' driver may need to know about EXEEXT, so add the
++dnl `am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This macro
++dnl is hooked onto _AC_COMPILER_EXEEXT early, see below.
++AC_CONFIG_COMMANDS_PRE(dnl
++[m4_provide_if([_AM_COMPILER_EXEEXT],
++ [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl
++])
++
++dnl Hook into `_AC_COMPILER_EXEEXT' early to learn its expansion. Do not
++dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further
++dnl mangled by Autoconf and run in a shell conditional statement.
++m4_define([_AC_COMPILER_EXEEXT],
++m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])])
+
+
+ # When config.status generates a header, we must update the stamp-h file.
+@@ -496,7 +545,7 @@
+ done
+ echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
+
+-# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc.
++# Copyright (C) 2001, 2003, 2005, 2008 Free Software Foundation, Inc.
+ #
+ # This file is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+@@ -507,7 +556,14 @@
+ # Define $install_sh.
+ AC_DEFUN([AM_PROG_INSTALL_SH],
+ [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
+-install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"}
++if test x"${install_sh}" != xset; then
++ case $am_aux_dir in
++ *\ * | *\ *)
++ install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
++ *)
++ install_sh="\${SHELL} $am_aux_dir/install-sh"
++ esac
++fi
+ AC_SUBST(install_sh)])
+
+ # Copyright (C) 2003, 2005 Free Software Foundation, Inc.
+@@ -554,13 +610,13 @@
+
+ # Check to see how 'make' treats includes. -*- Autoconf -*-
+
+-# Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc.
++# Copyright (C) 2001, 2002, 2003, 2005, 2009 Free Software Foundation, Inc.
+ #
+ # This file is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+
+-# serial 3
++# serial 4
+
+ # AM_MAKE_INCLUDE()
+ # -----------------
+@@ -569,7 +625,7 @@
+ [am_make=${MAKE-make}
+ cat > confinc << 'END'
+ am__doit:
+- @echo done
++ @echo this is the am__doit target
+ .PHONY: am__doit
+ END
+ # If we don't find an include directive, just comment out the code.
+@@ -579,24 +635,24 @@
+ _am_result=none
+ # First try GNU make style include.
+ echo "include confinc" > confmf
+-# We grep out `Entering directory' and `Leaving directory'
+-# messages which can occur if `w' ends up in MAKEFLAGS.
+-# In particular we don't look at `^make:' because GNU make might
+-# be invoked under some other name (usually "gmake"), in which
+-# case it prints its new name instead of `make'.
+-if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then
+- am__include=include
+- am__quote=
+- _am_result=GNU
+-fi
++# Ignore all kinds of additional output from `make'.
++case `$am_make -s -f confmf 2> /dev/null` in #(
++*the\ am__doit\ target*)
++ am__include=include
++ am__quote=
++ _am_result=GNU
++ ;;
++esac
+ # Now try BSD make style include.
+ if test "$am__include" = "#"; then
+ echo '.include "confinc"' > confmf
+- if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then
+- am__include=.include
+- am__quote="\""
+- _am_result=BSD
+- fi
++ case `$am_make -s -f confmf 2> /dev/null` in #(
++ *the\ am__doit\ target*)
++ am__include=.include
++ am__quote="\""
++ _am_result=BSD
++ ;;
++ esac
+ fi
+ AC_SUBST([am__include])
+ AC_SUBST([am__quote])
+@@ -604,14 +660,14 @@
+ rm -f confinc confmf
+ ])
+
+-# Copyright (C) 1999, 2000, 2001, 2003, 2004, 2005
++# Copyright (C) 1999, 2000, 2001, 2003, 2004, 2005, 2008
+ # Free Software Foundation, Inc.
+ #
+ # This file is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+
+-# serial 5
++# serial 6
+
+ # AM_PROG_CC_C_O
+ # --------------
+@@ -623,8 +679,9 @@
+ # FIXME: we rely on the cache variable name because
+ # there is no other way.
+ set dummy $CC
+-ac_cc=`echo $[2] | sed ['s/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/']`
+-if eval "test \"`echo '$ac_cv_prog_cc_'${ac_cc}_c_o`\" != yes"; then
++am_cc=`echo $[2] | sed ['s/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/']`
++eval am_t=\$ac_cv_prog_cc_${am_cc}_c_o
++if test "$am_t" != yes; then
+ # Losing compiler, so override with the script.
+ # FIXME: It is wrong to rewrite CC.
+ # But if we don't then we get into trouble of one sort or another.
+@@ -640,14 +697,14 @@
+
+ # Fake the existence of programs that GNU maintainers use. -*- Autoconf -*-
+
+-# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005
++# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005, 2008
+ # Free Software Foundation, Inc.
+ #
+ # This file is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+
+-# serial 5
++# serial 6
+
+ # AM_MISSING_PROG(NAME, PROGRAM)
+ # ------------------------------
+@@ -664,7 +721,14 @@
+ AC_DEFUN([AM_MISSING_HAS_RUN],
+ [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
+ AC_REQUIRE_AUX_FILE([missing])dnl
+-test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing"
++if test x"${MISSING+set}" != xset; then
++ case $am_aux_dir in
++ *\ * | *\ *)
++ MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;;
++ *)
++ MISSING="\${SHELL} $am_aux_dir/missing" ;;
++ esac
++fi
+ # Use eval to expand $SHELL
+ if eval "$MISSING --run true"; then
+ am_missing_run="$MISSING --run "
+@@ -702,13 +766,13 @@
+
+ # Helper functions for option handling. -*- Autoconf -*-
+
+-# Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc.
++# Copyright (C) 2001, 2002, 2003, 2005, 2008 Free Software Foundation, Inc.
+ #
+ # This file is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+
+-# serial 3
++# serial 4
+
+ # _AM_MANGLE_OPTION(NAME)
+ # -----------------------
+@@ -725,7 +789,7 @@
+ # ----------------------------------
+ # OPTIONS is a space-separated list of Automake options.
+ AC_DEFUN([_AM_SET_OPTIONS],
+-[AC_FOREACH([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
++[m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
+
+ # _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET])
+ # -------------------------------------------
+@@ -735,14 +799,14 @@
+
+ # Check to make sure that the build environment is sane. -*- Autoconf -*-
+
+-# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005
++# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005, 2008
+ # Free Software Foundation, Inc.
+ #
+ # This file is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+
+-# serial 4
++# serial 5
+
+ # AM_SANITY_CHECK
+ # ---------------
+@@ -751,16 +815,29 @@
+ # Just in case
+ sleep 1
+ echo timestamp > conftest.file
++# Reject unsafe characters in $srcdir or the absolute working directory
++# name. Accept space and tab only in the latter.
++am_lf='
++'
++case `pwd` in
++ *[[\\\"\#\$\&\'\`$am_lf]]*)
++ AC_MSG_ERROR([unsafe absolute working directory name]);;
++esac
++case $srcdir in
++ *[[\\\"\#\$\&\'\`$am_lf\ \ ]]*)
++ AC_MSG_ERROR([unsafe srcdir value: `$srcdir']);;
++esac
++
+ # Do `set' in a subshell so we don't clobber the current shell's
+ # arguments. Must try -L first in case configure is actually a
+ # symlink; some systems play weird games with the mod time of symlinks
+ # (eg FreeBSD returns the mod time of the symlink's containing
+ # directory).
+ if (
+- set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null`
++ set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
+ if test "$[*]" = "X"; then
+ # -L didn't work.
+- set X `ls -t $srcdir/configure conftest.file`
++ set X `ls -t "$srcdir/configure" conftest.file`
+ fi
+ rm -f conftest.file
+ if test "$[*]" != "X $srcdir/configure conftest.file" \
+@@ -813,18 +890,25 @@
+ INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
+ AC_SUBST([INSTALL_STRIP_PROGRAM])])
+
+-# Copyright (C) 2006 Free Software Foundation, Inc.
++# Copyright (C) 2006, 2008 Free Software Foundation, Inc.
+ #
+ # This file is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+
++# serial 2
++
+ # _AM_SUBST_NOTMAKE(VARIABLE)
+ # ---------------------------
+ # Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in.
+ # This macro is traced by Automake.
+ AC_DEFUN([_AM_SUBST_NOTMAKE])
+
++# AM_SUBST_NOTMAKE(VARIABLE)
++# ---------------------------
++# Public sister of _AM_SUBST_NOTMAKE.
++AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
++
+ # Check how to create a tarball. -*- Autoconf -*-
+
+ # Copyright (C) 2004, 2005 Free Software Foundation, Inc.
Index: pam.debian/config.h.in
===================================================================
--- pam.debian.orig/config.h.in
+++ pam.debian/config.h.in
-@@ -294,6 +294,9 @@
+@@ -297,6 +297,9 @@
/* Define to the one symbol short name of this package. */
#undef PACKAGE_TARNAME
@@ -1148,7 +1711,18 @@ Index: pam.debian/configure
ac_unique_file="conf/pam_conv1/pam_conv_y.y"
ac_default_prefix=/usr
-@@ -957,6 +913,7 @@
+@@ -786,7 +742,9 @@
+ #endif"
+
+ gt_needs=
+-ac_subst_vars='LTLIBOBJS
++ac_subst_vars='am__EXEEXT_FALSE
++am__EXEEXT_TRUE
++LTLIBOBJS
+ HAVE_KEY_MANAGEMENT_FALSE
+ HAVE_KEY_MANAGEMENT_TRUE
+ HAVE_KEY_MANAGEMENT
+@@ -956,6 +914,7 @@
program_transform_name
prefix
exec_prefix
@@ -1156,7 +1730,7 @@ Index: pam.debian/configure
PACKAGE_BUGREPORT
PACKAGE_STRING
PACKAGE_VERSION
-@@ -1120,8 +1077,7 @@
+@@ -1119,8 +1078,7 @@
ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
# Reject names that are not valid shell variable names.
expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
@@ -1166,7 +1740,7 @@ Index: pam.debian/configure
ac_useropt_orig=$ac_useropt
ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
case $ac_user_opts in
-@@ -1147,8 +1103,7 @@
+@@ -1146,8 +1104,7 @@
ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
# Reject names that are not valid shell variable names.
expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
@@ -1176,7 +1750,7 @@ Index: pam.debian/configure
ac_useropt_orig=$ac_useropt
ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
case $ac_user_opts in
-@@ -1352,8 +1307,7 @@
+@@ -1351,8 +1308,7 @@
ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
# Reject names that are not valid shell variable names.
expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
@@ -1186,7 +1760,7 @@ Index: pam.debian/configure
ac_useropt_orig=$ac_useropt
ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
case $ac_user_opts in
-@@ -1369,8 +1323,7 @@
+@@ -1368,8 +1324,7 @@
ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`
# Reject names that are not valid shell variable names.
expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
@@ -1196,7 +1770,7 @@ Index: pam.debian/configure
ac_useropt_orig=$ac_useropt
ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
case $ac_user_opts in
-@@ -1400,17 +1353,17 @@
+@@ -1399,17 +1354,17 @@
| --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
x_libraries=$ac_optarg ;;
@@ -1220,7 +1794,7 @@ Index: pam.debian/configure
eval $ac_envvar=\$ac_optarg
export $ac_envvar ;;
-@@ -1427,15 +1380,13 @@
+@@ -1426,15 +1381,13 @@
if test -n "$ac_prev"; then
ac_option=--`echo $ac_prev | sed 's/_/-/g'`
@@ -1238,7 +1812,7 @@ Index: pam.debian/configure
*) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
esac
fi
-@@ -1458,8 +1409,7 @@
+@@ -1457,8 +1410,7 @@
[\\/$]* | ?:[\\/]* ) continue;;
NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
esac
@@ -1248,7 +1822,7 @@ Index: pam.debian/configure
done
# There might be people who depend on the old broken behavior: `$host'
-@@ -1489,11 +1439,9 @@
+@@ -1488,11 +1440,9 @@
ac_pwd=`pwd` && test -n "$ac_pwd" &&
ac_ls_di=`ls -di .` &&
ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
@@ -1262,7 +1836,7 @@ Index: pam.debian/configure
# Find the source files, if location was not specified.
-@@ -1532,13 +1480,11 @@
+@@ -1531,13 +1481,11 @@
fi
if test ! -r "$srcdir/$ac_unique_file"; then
test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
@@ -1278,7 +1852,7 @@ Index: pam.debian/configure
pwd)`
# When building in place, set srcdir=.
if test "$ac_abs_confdir" = "$ac_pwd"; then
-@@ -1705,7 +1651,7 @@
+@@ -1704,7 +1652,7 @@
LDFLAGS linker flags, e.g. -L<lib dir> if you have libraries in a
nonstandard directory <lib dir>
LIBS libraries to pass to the linker, e.g. -l<library>
@@ -1287,7 +1861,7 @@ Index: pam.debian/configure
you have headers in a nonstandard directory <include dir>
CPP C preprocessor
YACC The `Yet Another C Compiler' implementation to use. Defaults to
-@@ -1717,6 +1663,7 @@
+@@ -1716,6 +1664,7 @@
Use these variables to override the choices made by `configure' or to help
it to find libraries and programs with nonstandard names/locations.
@@ -1295,7 +1869,7 @@ Index: pam.debian/configure
_ACEOF
ac_status=$?
fi
-@@ -1780,21 +1727,465 @@
+@@ -1779,21 +1728,465 @@
if $ac_init_version; then
cat <<\_ACEOF
configure
@@ -1765,7 +2339,7 @@ Index: pam.debian/configure
$ $0 $@
-@@ -1830,8 +2221,8 @@
+@@ -1829,8 +2222,8 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -1776,7 +2350,7 @@ Index: pam.debian/configure
IFS=$as_save_IFS
} >&5
-@@ -1868,9 +2259,9 @@
+@@ -1867,9 +2260,9 @@
ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
esac
case $ac_pass in
@@ -1788,7 +2362,7 @@ Index: pam.debian/configure
if test $ac_must_keep_next = true; then
ac_must_keep_next=false # Got value, back to normal.
else
-@@ -1886,13 +2277,13 @@
+@@ -1885,13 +2278,13 @@
-* ) ac_must_keep_next=true ;;
esac
fi
@@ -1805,7 +2379,7 @@ Index: pam.debian/configure
# When interrupted or exit'd, cleanup temporary files, and complete
# config.log. We remove comments because anyway the quotes in there
-@@ -1917,13 +2308,13 @@
+@@ -1916,13 +2309,13 @@
case $ac_val in #(
*${as_nl}*)
case $ac_var in #(
@@ -1821,7 +2395,7 @@ Index: pam.debian/configure
esac ;;
esac
done
-@@ -1995,39 +2386,41 @@
+@@ -1994,39 +2387,41 @@
exit $exit_status
' 0
for ac_signal in 1 2 13 15; do
@@ -1868,7 +2442,7 @@ Index: pam.debian/configure
# Let the site file select an alternate cache file if it wants to.
# Prefer an explicitly selected file to automatically selected ones.
-@@ -2045,8 +2438,8 @@
+@@ -2044,8 +2439,8 @@
for ac_site_file in "$ac_site_file1" "$ac_site_file2"
do
test "x$ac_site_file" = xNONE && continue
@@ -1879,7 +2453,7 @@ Index: pam.debian/configure
$as_echo "$as_me: loading site script $ac_site_file" >&6;}
sed 's/^/| /' "$ac_site_file" >&5
. "$ac_site_file"
-@@ -2054,10 +2447,10 @@
+@@ -2053,10 +2448,10 @@
done
if test -r "$cache_file"; then
@@ -1894,7 +2468,7 @@ Index: pam.debian/configure
$as_echo "$as_me: loading cache $cache_file" >&6;}
case $cache_file in
[\\/]* | ?:[\\/]* ) . "$cache_file";;
-@@ -2065,7 +2458,7 @@
+@@ -2064,7 +2459,7 @@
esac
fi
else
@@ -1903,7 +2477,7 @@ Index: pam.debian/configure
$as_echo "$as_me: creating cache $cache_file" >&6;}
>$cache_file
fi
-@@ -2081,11 +2474,11 @@
+@@ -2080,11 +2475,11 @@
eval ac_new_val=\$ac_env_${ac_var}_value
case $ac_old_set,$ac_new_set in
set,)
@@ -1917,7 +2491,7 @@ Index: pam.debian/configure
$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
ac_cache_corrupted=: ;;
,);;
-@@ -2095,17 +2488,17 @@
+@@ -2094,17 +2489,17 @@
ac_old_val_w=`echo x $ac_old_val`
ac_new_val_w=`echo x $ac_new_val`
if test "$ac_old_val_w" != "$ac_new_val_w"; then
@@ -1939,7 +2513,7 @@ Index: pam.debian/configure
$as_echo "$as_me: current value: \`$ac_new_val'" >&2;}
fi;;
esac
-@@ -2117,35 +2510,20 @@
+@@ -2116,35 +2511,20 @@
esac
case " $ac_configure_args " in
*" '$ac_arg' "*) ;; # Avoid dups. Use of quotes ensures accuracy.
@@ -1982,7 +2556,12 @@ Index: pam.debian/configure
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
-@@ -2159,24 +2537,16 @@
+@@ -2154,28 +2534,20 @@
+
+
+
+-am__api_version='1.10'
++am__api_version='1.11'
ac_aux_dir=
for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
@@ -2015,7 +2594,7 @@ Index: pam.debian/configure
fi
# These three variables are undocumented and unsupported,
-@@ -2202,10 +2572,10 @@
+@@ -2201,10 +2573,10 @@
# OS/2's system install, which has a completely different semantic
# ./install, which can be erroneously created by make from ./install.sh.
# Reject install programs that cannot install multiple files.
@@ -2028,7 +2607,7 @@ Index: pam.debian/configure
$as_echo_n "(cached) " >&6
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-@@ -2213,11 +2583,11 @@
+@@ -2212,11 +2584,11 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -2044,7 +2623,7 @@ Index: pam.debian/configure
/usr/ucb/* ) ;;
*)
# OSF1 and SCO ODT 3.0 have their own names for install.
-@@ -2254,7 +2624,7 @@
+@@ -2253,7 +2625,7 @@
;;
esac
@@ -2053,7 +2632,7 @@ Index: pam.debian/configure
IFS=$as_save_IFS
rm -rf conftest.one conftest.two conftest.dir
-@@ -2270,7 +2640,7 @@
+@@ -2269,7 +2641,7 @@
INSTALL=$ac_install_sh
fi
fi
@@ -2062,7 +2641,7 @@ Index: pam.debian/configure
$as_echo "$INSTALL" >&6; }
# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
-@@ -2281,7 +2651,7 @@
+@@ -2280,21 +2652,34 @@
test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
@@ -2071,25 +2650,36 @@ Index: pam.debian/configure
$as_echo_n "checking whether build environment is sane... " >&6; }
# Just in case
sleep 1
-@@ -2292,15 +2662,11 @@
- '
- case `pwd` in
- *[\\\"\#\$\&\'\`$am_lf]*)
-- { { $as_echo "$as_me:$LINENO: error: unsafe absolute working directory name" >&5
--$as_echo "$as_me: error: unsafe absolute working directory name" >&2;}
-- { (exit 1); exit 1; }; };;
+ echo timestamp > conftest.file
++# Reject unsafe characters in $srcdir or the absolute working directory
++# name. Accept space and tab only in the latter.
++am_lf='
++'
++case `pwd` in
++ *[\\\"\#\$\&\'\`$am_lf]*)
+ as_fn_error "unsafe absolute working directory name" "$LINENO" 5;;
- esac
- case $srcdir in
- *[\\\"\#\$\&\'\`$am_lf\ \ ]*)
-- { { $as_echo "$as_me:$LINENO: error: unsafe srcdir value: \`$srcdir'" >&5
--$as_echo "$as_me: error: unsafe srcdir value: \`$srcdir'" >&2;}
-- { (exit 1); exit 1; }; };;
++esac
++case $srcdir in
++ *[\\\"\#\$\&\'\`$am_lf\ \ ]*)
+ as_fn_error "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;;
- esac
-
++esac
++
# Do `set' in a subshell so we don't clobber the current shell's
-@@ -2322,11 +2688,8 @@
+ # arguments. Must try -L first in case configure is actually a
+ # symlink; some systems play weird games with the mod time of symlinks
+ # (eg FreeBSD returns the mod time of the symlink's containing
+ # directory).
+ if (
+- set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null`
++ set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
+ if test "$*" = "X"; then
+ # -L didn't work.
+- set X `ls -t $srcdir/configure conftest.file`
++ set X `ls -t "$srcdir/configure" conftest.file`
+ fi
+ rm -f conftest.file
+ if test "$*" != "X $srcdir/configure conftest.file" \
+@@ -2304,11 +2689,8 @@
# if, for instance, CONFIG_SHELL is bash and it inherits a
# broken ls alias from the environment. This has actually
# happened. Such a system could not be considered "sane".
@@ -2103,7 +2693,7 @@ Index: pam.debian/configure
fi
test "$2" = conftest.file
-@@ -2335,13 +2698,10 @@
+@@ -2317,13 +2699,10 @@
# Ok.
:
else
@@ -2120,7 +2710,21 @@ Index: pam.debian/configure
$as_echo "yes" >&6; }
test "$program_prefix" != NONE &&
program_transform_name="s&^&$program_prefix&;$program_transform_name"
-@@ -2369,7 +2729,7 @@
+@@ -2338,20 +2717,136 @@
+ # expand $ac_aux_dir to an absolute path
+ am_aux_dir=`cd $ac_aux_dir && pwd`
+
+-test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing"
++if test x"${MISSING+set}" != xset; then
++ case $am_aux_dir in
++ *\ * | *\ *)
++ MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;;
++ *)
++ MISSING="\${SHELL} $am_aux_dir/missing" ;;
++ esac
++fi
+ # Use eval to expand $SHELL
+ if eval "$MISSING --run true"; then
am_missing_run="$MISSING --run "
else
am_missing_run=
@@ -2129,104 +2733,116 @@ Index: pam.debian/configure
$as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
fi
-@@ -2390,9 +2750,9 @@
- if test -n "$ac_tool_prefix"; then
- # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
- set dummy ${ac_tool_prefix}strip; ac_word=$2
--{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+-{ $as_echo "$as_me:$LINENO: checking for a thread-safe mkdir -p" >&5
++if test x"${install_sh}" != xset; then
++ case $am_aux_dir in
++ *\ * | *\ *)
++ install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
++ *)
++ install_sh="\${SHELL} $am_aux_dir/install-sh"
++ esac
++fi
++
++# Installed binaries are usually stripped using `strip' when the user
++# run `make install-strip'. However `strip' might not be the right
++# tool to use in cross-compilation environments, therefore Automake
++# will honor the `STRIP' environment variable to overrule this program.
++if test "$cross_compiling" != no; then
++ if test -n "$ac_tool_prefix"; then
++ # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
++set dummy ${ac_tool_prefix}strip; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- $as_echo_n "checking for $ac_word... " >&6; }
--if test "${ac_cv_prog_STRIP+set}" = set; then
++$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_STRIP+set}" = set; then :
- $as_echo_n "(cached) " >&6
- else
- if test -n "$STRIP"; then
-@@ -2403,24 +2763,24 @@
- do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
-- for ac_exec_ext in '' $ac_executable_extensions; do
++ $as_echo_n "(cached) " >&6
++else
++ if test -n "$STRIP"; then
++ ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
++else
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++ IFS=$as_save_IFS
++ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_STRIP="${ac_tool_prefix}strip"
-- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++ ac_cv_prog_STRIP="${ac_tool_prefix}strip"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
--done
++ break 2
++ fi
++done
+ done
- IFS=$as_save_IFS
-
- fi
- fi
- STRIP=$ac_cv_prog_STRIP
- if test -n "$STRIP"; then
-- { $as_echo "$as_me:$LINENO: result: $STRIP" >&5
++IFS=$as_save_IFS
++
++fi
++fi
++STRIP=$ac_cv_prog_STRIP
++if test -n "$STRIP"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5
- $as_echo "$STRIP" >&6; }
- else
-- { $as_echo "$as_me:$LINENO: result: no" >&5
++$as_echo "$STRIP" >&6; }
++else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
- fi
-
-@@ -2430,9 +2790,9 @@
- ac_ct_STRIP=$STRIP
- # Extract the first word of "strip", so it can be a program name with args.
- set dummy strip; ac_word=$2
--{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
++$as_echo "no" >&6; }
++fi
++
++
++fi
++if test -z "$ac_cv_prog_STRIP"; then
++ ac_ct_STRIP=$STRIP
++ # Extract the first word of "strip", so it can be a program name with args.
++set dummy strip; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- $as_echo_n "checking for $ac_word... " >&6; }
--if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
++$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then :
- $as_echo_n "(cached) " >&6
- else
- if test -n "$ac_ct_STRIP"; then
-@@ -2443,24 +2803,24 @@
- do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
-- for ac_exec_ext in '' $ac_executable_extensions; do
++ $as_echo_n "(cached) " >&6
++else
++ if test -n "$ac_ct_STRIP"; then
++ ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
++else
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++ IFS=$as_save_IFS
++ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_ac_ct_STRIP="strip"
-- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++ ac_cv_prog_ac_ct_STRIP="strip"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
--done
++ break 2
++ fi
++done
+ done
- IFS=$as_save_IFS
-
- fi
- fi
- ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
- if test -n "$ac_ct_STRIP"; then
-- { $as_echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
++IFS=$as_save_IFS
++
++fi
++fi
++ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
++if test -n "$ac_ct_STRIP"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5
- $as_echo "$ac_ct_STRIP" >&6; }
- else
-- { $as_echo "$as_me:$LINENO: result: no" >&5
++$as_echo "$ac_ct_STRIP" >&6; }
++else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
- fi
-
-@@ -2469,7 +2829,7 @@
- else
- case $cross_compiling:$ac_tool_warned in
- yes:)
--{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
++$as_echo "no" >&6; }
++fi
++
++ if test "x$ac_ct_STRIP" = x; then
++ STRIP=":"
++ else
++ case $cross_compiling:$ac_tool_warned in
++yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
- $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
- ac_tool_warned=yes ;;
- esac
-@@ -2482,10 +2842,10 @@
- fi
- INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
-
--{ $as_echo "$as_me:$LINENO: checking for a thread-safe mkdir -p" >&5
++$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
++ac_tool_warned=yes ;;
++esac
++ STRIP=$ac_ct_STRIP
++ fi
++else
++ STRIP="$ac_cv_prog_STRIP"
++fi
++
++fi
++INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
++
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a thread-safe mkdir -p" >&5
$as_echo_n "checking for a thread-safe mkdir -p... " >&6; }
if test -z "$MKDIR_P"; then
@@ -2235,7 +2851,7 @@ Index: pam.debian/configure
$as_echo_n "(cached) " >&6
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-@@ -2493,7 +2853,7 @@
+@@ -2359,7 +2854,7 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -2244,7 +2860,7 @@ Index: pam.debian/configure
for ac_exec_ext in '' $ac_executable_extensions; do
{ test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue
case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #(
-@@ -2505,11 +2865,12 @@
+@@ -2371,11 +2866,12 @@
esac
done
done
@@ -2258,7 +2874,7 @@ Index: pam.debian/configure
if test "${ac_cv_path_mkdir+set}" = set; then
MKDIR_P="$ac_cv_path_mkdir -p"
else
-@@ -2517,11 +2878,10 @@
+@@ -2383,11 +2879,10 @@
# value for MKDIR_P within a source directory, because that will
# break other packages using the cache if that directory is
# removed, or if the value is a relative name.
@@ -2271,7 +2887,7 @@ Index: pam.debian/configure
$as_echo "$MKDIR_P" >&6; }
mkdir_p="$MKDIR_P"
-@@ -2534,9 +2894,9 @@
+@@ -2400,9 +2895,9 @@
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
@@ -2283,7 +2899,7 @@ Index: pam.debian/configure
$as_echo_n "(cached) " >&6
else
if test -n "$AWK"; then
-@@ -2547,24 +2907,24 @@
+@@ -2413,24 +2908,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -2313,7 +2929,7 @@ Index: pam.debian/configure
$as_echo "no" >&6; }
fi
-@@ -2572,11 +2932,11 @@
+@@ -2438,11 +2933,11 @@
test -n "$AWK" && break
done
@@ -2327,7 +2943,7 @@ Index: pam.debian/configure
$as_echo_n "(cached) " >&6
else
cat >conftest.make <<\_ACEOF
-@@ -2594,11 +2954,11 @@
+@@ -2460,11 +2955,11 @@
rm -f conftest.make
fi
if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
@@ -2341,7 +2957,7 @@ Index: pam.debian/configure
$as_echo "no" >&6; }
SET_MAKE="MAKE=${MAKE-make}"
fi
-@@ -2618,9 +2978,7 @@
+@@ -2484,9 +2979,7 @@
am__isrc=' -I$(srcdir)'
# test to see if srcdir already configured
if test -f $srcdir/config.status; then
@@ -2352,7 +2968,116 @@ Index: pam.debian/configure
fi
fi
-@@ -2682,35 +3040,27 @@
+@@ -2530,108 +3023,6 @@
+
+ MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
+
+-install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"}
+-
+-# Installed binaries are usually stripped using `strip' when the user
+-# run `make install-strip'. However `strip' might not be the right
+-# tool to use in cross-compilation environments, therefore Automake
+-# will honor the `STRIP' environment variable to overrule this program.
+-if test "$cross_compiling" != no; then
+- if test -n "$ac_tool_prefix"; then
+- # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
+-set dummy ${ac_tool_prefix}strip; ac_word=$2
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+-$as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_STRIP+set}" = set; then
+- $as_echo_n "(cached) " >&6
+-else
+- if test -n "$STRIP"; then
+- ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
+-else
+-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+-do
+- IFS=$as_save_IFS
+- test -z "$as_dir" && as_dir=.
+- for ac_exec_ext in '' $ac_executable_extensions; do
+- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+- ac_cv_prog_STRIP="${ac_tool_prefix}strip"
+- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+- break 2
+- fi
+-done
+-done
+-IFS=$as_save_IFS
+-
+-fi
+-fi
+-STRIP=$ac_cv_prog_STRIP
+-if test -n "$STRIP"; then
+- { $as_echo "$as_me:$LINENO: result: $STRIP" >&5
+-$as_echo "$STRIP" >&6; }
+-else
+- { $as_echo "$as_me:$LINENO: result: no" >&5
+-$as_echo "no" >&6; }
+-fi
+-
+-
+-fi
+-if test -z "$ac_cv_prog_STRIP"; then
+- ac_ct_STRIP=$STRIP
+- # Extract the first word of "strip", so it can be a program name with args.
+-set dummy strip; ac_word=$2
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+-$as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
+- $as_echo_n "(cached) " >&6
+-else
+- if test -n "$ac_ct_STRIP"; then
+- ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
+-else
+-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+-do
+- IFS=$as_save_IFS
+- test -z "$as_dir" && as_dir=.
+- for ac_exec_ext in '' $ac_executable_extensions; do
+- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+- ac_cv_prog_ac_ct_STRIP="strip"
+- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+- break 2
+- fi
+-done
+-done
+-IFS=$as_save_IFS
+-
+-fi
+-fi
+-ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
+-if test -n "$ac_ct_STRIP"; then
+- { $as_echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
+-$as_echo "$ac_ct_STRIP" >&6; }
+-else
+- { $as_echo "$as_me:$LINENO: result: no" >&5
+-$as_echo "no" >&6; }
+-fi
+-
+- if test "x$ac_ct_STRIP" = x; then
+- STRIP=":"
+- else
+- case $cross_compiling:$ac_tool_warned in
+-yes:)
+-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+-ac_tool_warned=yes ;;
+-esac
+- STRIP=$ac_ct_STRIP
+- fi
+-else
+- STRIP="$ac_cv_prog_STRIP"
+-fi
+-
+-fi
+-INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
+-
+ # We need awk for the "check" target. The system "awk" is bad on
+ # some platforms.
+ # Always define AMTAR for backward compatibility.
+@@ -2650,35 +3041,27 @@
# Make sure we can run config.sub.
$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
@@ -2395,7 +3120,7 @@ Index: pam.debian/configure
esac
build=$ac_cv_build
ac_save_IFS=$IFS; IFS='-'
-@@ -2726,28 +3076,24 @@
+@@ -2694,28 +3077,24 @@
case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
@@ -2429,7 +3154,7 @@ Index: pam.debian/configure
esac
host=$ac_cv_host
ac_save_IFS=$IFS; IFS='-'
-@@ -2806,7 +3152,7 @@
+@@ -2774,7 +3153,7 @@
fi
# Check whether --enable-static-modules was given.
@@ -2438,7 +3163,7 @@ Index: pam.debian/configure
enableval=$enable_static_modules; STATIC_MODULES=$enableval
else
STATIC_MODULES=no
-@@ -2815,7 +3161,7 @@
+@@ -2783,7 +3162,7 @@
if test "$STATIC_MODULES" != "no" ; then
CFLAGS="$CFLAGS -DPAM_STATIC"
# Check whether --enable-static was given.
@@ -2447,7 +3172,7 @@ Index: pam.debian/configure
enableval=$enable_static; p=${PACKAGE-default}
case $enableval in
yes) enable_static=yes ;;
-@@ -2846,7 +3192,7 @@
+@@ -2814,7 +3193,7 @@
# Check whether --enable-shared was given.
@@ -2456,7 +3181,7 @@ Index: pam.debian/configure
enableval=$enable_shared; p=${PACKAGE-default}
case $enableval in
yes) enable_shared=yes ;;
-@@ -2879,7 +3225,7 @@
+@@ -2847,7 +3226,7 @@
else
# per default don't build static libraries
# Check whether --enable-static was given.
@@ -2465,7 +3190,7 @@ Index: pam.debian/configure
enableval=$enable_static; p=${PACKAGE-default}
case $enableval in
yes) enable_static=yes ;;
-@@ -2907,7 +3253,7 @@
+@@ -2875,7 +3254,7 @@
# Check whether --enable-shared was given.
@@ -2474,7 +3199,12 @@ Index: pam.debian/configure
enableval=$enable_shared; p=${PACKAGE-default}
case $enableval in
yes) enable_shared=yes ;;
-@@ -2956,7 +3302,7 @@
+@@ -2920,44 +3299,44 @@
+ am_make=${MAKE-make}
+ cat > confinc << 'END'
+ am__doit:
+- @echo done
++ @echo this is the am__doit target
.PHONY: am__doit
END
# If we don't find an include directive, just comment out the code.
@@ -2483,7 +3213,42 @@ Index: pam.debian/configure
$as_echo_n "checking for style of include used by $am_make... " >&6; }
am__include="#"
am__quote=
-@@ -2984,12 +3330,12 @@
+ _am_result=none
+ # First try GNU make style include.
+ echo "include confinc" > confmf
+-# We grep out `Entering directory' and `Leaving directory'
+-# messages which can occur if `w' ends up in MAKEFLAGS.
+-# In particular we don't look at `^make:' because GNU make might
+-# be invoked under some other name (usually "gmake"), in which
+-# case it prints its new name instead of `make'.
+-if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then
+- am__include=include
+- am__quote=
+- _am_result=GNU
+-fi
++# Ignore all kinds of additional output from `make'.
++case `$am_make -s -f confmf 2> /dev/null` in #(
++*the\ am__doit\ target*)
++ am__include=include
++ am__quote=
++ _am_result=GNU
++ ;;
++esac
+ # Now try BSD make style include.
+ if test "$am__include" = "#"; then
+ echo '.include "confinc"' > confmf
+- if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then
+- am__include=.include
+- am__quote="\""
+- _am_result=BSD
+- fi
++ case `$am_make -s -f confmf 2> /dev/null` in #(
++ *the\ am__doit\ target*)
++ am__include=.include
++ am__quote="\""
++ _am_result=BSD
++ ;;
++ esac
fi
@@ -2498,7 +3263,7 @@ Index: pam.debian/configure
enableval=$enable_dependency_tracking;
fi
-@@ -3014,9 +3360,9 @@
+@@ -2982,9 +3361,9 @@
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
set dummy ${ac_tool_prefix}gcc; ac_word=$2
@@ -2510,7 +3275,7 @@ Index: pam.debian/configure
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
-@@ -3027,24 +3373,24 @@
+@@ -2995,24 +3374,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -2540,7 +3305,7 @@ Index: pam.debian/configure
$as_echo "no" >&6; }
fi
-@@ -3054,9 +3400,9 @@
+@@ -3022,9 +3401,9 @@
ac_ct_CC=$CC
# Extract the first word of "gcc", so it can be a program name with args.
set dummy gcc; ac_word=$2
@@ -2552,7 +3317,7 @@ Index: pam.debian/configure
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_CC"; then
-@@ -3067,24 +3413,24 @@
+@@ -3035,24 +3414,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -2582,7 +3347,7 @@ Index: pam.debian/configure
$as_echo "no" >&6; }
fi
-@@ -3093,7 +3439,7 @@
+@@ -3061,7 +3440,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -2591,7 +3356,7 @@ Index: pam.debian/configure
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -3107,9 +3453,9 @@
+@@ -3075,9 +3454,9 @@
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
set dummy ${ac_tool_prefix}cc; ac_word=$2
@@ -2603,7 +3368,7 @@ Index: pam.debian/configure
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
-@@ -3120,24 +3466,24 @@
+@@ -3088,24 +3467,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -2633,7 +3398,7 @@ Index: pam.debian/configure
$as_echo "no" >&6; }
fi
-@@ -3147,9 +3493,9 @@
+@@ -3115,9 +3494,9 @@
if test -z "$CC"; then
# Extract the first word of "cc", so it can be a program name with args.
set dummy cc; ac_word=$2
@@ -2645,7 +3410,7 @@ Index: pam.debian/configure
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
-@@ -3161,18 +3507,18 @@
+@@ -3129,18 +3508,18 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -2667,7 +3432,7 @@ Index: pam.debian/configure
IFS=$as_save_IFS
if test $ac_prog_rejected = yes; then
-@@ -3191,10 +3537,10 @@
+@@ -3159,10 +3538,10 @@
fi
CC=$ac_cv_prog_CC
if test -n "$CC"; then
@@ -2680,7 +3445,7 @@ Index: pam.debian/configure
$as_echo "no" >&6; }
fi
-@@ -3206,9 +3552,9 @@
+@@ -3174,9 +3553,9 @@
do
# Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
set dummy $ac_tool_prefix$ac_prog; ac_word=$2
@@ -2692,7 +3457,7 @@ Index: pam.debian/configure
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
-@@ -3219,24 +3565,24 @@
+@@ -3187,24 +3566,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -2722,7 +3487,7 @@ Index: pam.debian/configure
$as_echo "no" >&6; }
fi
-@@ -3250,9 +3596,9 @@
+@@ -3218,9 +3597,9 @@
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
@@ -2734,7 +3499,7 @@ Index: pam.debian/configure
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_CC"; then
-@@ -3263,24 +3609,24 @@
+@@ -3231,24 +3610,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -2764,7 +3529,7 @@ Index: pam.debian/configure
$as_echo "no" >&6; }
fi
-@@ -3293,7 +3639,7 @@
+@@ -3261,7 +3640,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -2773,7 +3538,7 @@ Index: pam.debian/configure
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -3304,57 +3650,37 @@
+@@ -3272,57 +3651,37 @@
fi
@@ -2851,7 +3616,7 @@ Index: pam.debian/configure
/* end confdefs.h. */
int
-@@ -3370,8 +3696,8 @@
+@@ -3338,8 +3697,8 @@
# Try to create an executable without -o first, disregard a.out.
# It will help us diagnose broken compilers, and finding out an intuition
# of exeext.
@@ -2862,7 +3627,7 @@ Index: pam.debian/configure
ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
# The possible output files:
-@@ -3387,17 +3713,17 @@
+@@ -3355,17 +3714,17 @@
done
rm -f $ac_rmfiles
@@ -2885,7 +3650,7 @@ Index: pam.debian/configure
# Autoconf-2.13 could set the ac_cv_exeext variable to `no'.
# So ignore a value of `no', otherwise this would lead to `EXEEXT = no'
# in a Makefile. We should not override ac_cv_exeext if it was cached,
-@@ -3414,7 +3740,7 @@
+@@ -3382,7 +3741,7 @@
# certainly right.
break;;
*.* )
@@ -2894,7 +3659,7 @@ Index: pam.debian/configure
then :; else
ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
fi
-@@ -3433,84 +3759,42 @@
+@@ -3401,84 +3760,42 @@
else
ac_file=''
fi
@@ -3000,7 +3765,7 @@ Index: pam.debian/configure
# If both `conftest.exe' and `conftest' are `present' (well, observable)
# catch `conftest.exe'. For instance with Cygwin, `ls conftest' will
# work properly (i.e., refer to `conftest.exe'), while it won't with
-@@ -3525,32 +3809,83 @@
+@@ -3493,32 +3810,83 @@
esac
done
else
@@ -3100,7 +3865,7 @@ Index: pam.debian/configure
/* end confdefs.h. */
int
-@@ -3562,17 +3897,17 @@
+@@ -3530,17 +3898,17 @@
}
_ACEOF
rm -f conftest.o conftest.obj
@@ -3123,7 +3888,7 @@ Index: pam.debian/configure
for ac_file in conftest.o conftest.obj conftest.*; do
test -f "$ac_file" || continue;
case $ac_file in
-@@ -3585,31 +3920,23 @@
+@@ -3553,31 +3921,23 @@
$as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -3162,7 +3927,7 @@ Index: pam.debian/configure
/* end confdefs.h. */
int
-@@ -3623,37 +3950,16 @@
+@@ -3591,37 +3951,16 @@
return 0;
}
_ACEOF
@@ -3203,7 +3968,7 @@ Index: pam.debian/configure
$as_echo "$ac_cv_c_compiler_gnu" >&6; }
if test $ac_compiler_gnu = yes; then
GCC=yes
-@@ -3662,20 +3968,16 @@
+@@ -3630,20 +3969,16 @@
fi
ac_test_CFLAGS=${CFLAGS+set}
ac_save_CFLAGS=$CFLAGS
@@ -3227,7 +3992,7 @@ Index: pam.debian/configure
/* end confdefs.h. */
int
-@@ -3686,35 +3988,11 @@
+@@ -3654,35 +3989,11 @@
return 0;
}
_ACEOF
@@ -3266,7 +4031,7 @@ Index: pam.debian/configure
/* end confdefs.h. */
int
-@@ -3725,36 +4003,12 @@
+@@ -3693,36 +4004,12 @@
return 0;
}
_ACEOF
@@ -3307,7 +4072,7 @@ Index: pam.debian/configure
/* end confdefs.h. */
int
-@@ -3765,42 +4019,17 @@
+@@ -3733,42 +4020,17 @@
return 0;
}
_ACEOF
@@ -3352,7 +4117,7 @@ Index: pam.debian/configure
$as_echo "$ac_cv_prog_cc_g" >&6; }
if test "$ac_test_CFLAGS" = set; then
CFLAGS=$ac_save_CFLAGS
-@@ -3817,18 +4046,14 @@
+@@ -3785,18 +4047,14 @@
CFLAGS=
fi
fi
@@ -3374,7 +4139,7 @@ Index: pam.debian/configure
/* end confdefs.h. */
#include <stdarg.h>
#include <stdio.h>
-@@ -3885,32 +4110,9 @@
+@@ -3853,32 +4111,9 @@
-Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
do
CC="$ac_save_CC $ac_arg"
@@ -3408,7 +4173,7 @@ Index: pam.debian/configure
rm -f core conftest.err conftest.$ac_objext
test "x$ac_cv_prog_cc_c89" != "xno" && break
done
-@@ -3921,17 +4123,19 @@
+@@ -3889,17 +4124,19 @@
# AC_CACHE_VAL
case "x$ac_cv_prog_cc_c89" in
x)
@@ -3431,7 +4196,7 @@ Index: pam.debian/configure
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
-@@ -3941,9 +4145,9 @@
+@@ -3909,9 +4146,9 @@
depcc="$CC" am_compiler_list=
@@ -3443,7 +4208,67 @@ Index: pam.debian/configure
$as_echo_n "(cached) " >&6
else
if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
-@@ -4051,7 +4255,7 @@
+@@ -3937,6 +4174,11 @@
+ if test "$am_compiler_list" = ""; then
+ am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
+ fi
++ am__universal=false
++ case " $depcc " in #(
++ *\ -arch\ *\ -arch\ *) am__universal=true ;;
++ esac
++
+ for depmode in $am_compiler_list; do
+ # Setup a source with many dependencies, because some compilers
+ # like to wrap large dependency lists on column 80 (with \), and
+@@ -3954,7 +4196,17 @@
+ done
+ echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
+
++ # We check with `-c' and `-o' for the sake of the "dashmstdout"
++ # mode. It turns out that the SunPro C++ compiler does not properly
++ # handle `-M -o', and we need to detect this. Also, some Intel
++ # versions had trouble with output in subdirs
++ am__obj=sub/conftest.${OBJEXT-o}
++ am__minus_obj="-o $am__obj"
+ case $depmode in
++ gcc)
++ # This depmode causes a compiler race in universal mode.
++ test "$am__universal" = false || continue
++ ;;
+ nosideeffect)
+ # after this tag, mechanisms are not by side-effect, so they'll
+ # only be used when explicitly requested
+@@ -3964,19 +4216,23 @@
+ break
+ fi
+ ;;
++ msvisualcpp | msvcmsys)
++ # This compiler won't grok `-c -o', but also, the minuso test has
++ # not run yet. These depmodes are late enough in the game, and
++ # so weak that their functioning should not be impacted.
++ am__obj=conftest.${OBJEXT-o}
++ am__minus_obj=
++ ;;
+ none) break ;;
+ esac
+- # We check with `-c' and `-o' for the sake of the "dashmstdout"
+- # mode. It turns out that the SunPro C++ compiler does not properly
+- # handle `-M -o', and we need to detect this.
+ if depmode=$depmode \
+- source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
++ source=sub/conftest.c object=$am__obj \
+ depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
+- $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
++ $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \
+ >/dev/null 2>conftest.err &&
+ grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
+ grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
+- grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
++ grep $am__obj sub/conftest.Po > /dev/null 2>&1 &&
+ ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
+ # icc doesn't choke on unknown options, it will just issue warnings
+ # or remarks (even with -Werror). So we grep stderr for any message
+@@ -4000,7 +4256,7 @@
fi
fi
@@ -3452,7 +4277,7 @@ Index: pam.debian/configure
$as_echo "$am_cv_CC_dependencies_compiler_type" >&6; }
CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
-@@ -4072,14 +4276,14 @@
+@@ -4021,14 +4277,14 @@
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
ac_compiler_gnu=$ac_cv_c_compiler_gnu
@@ -3469,7 +4294,7 @@ Index: pam.debian/configure
$as_echo_n "(cached) " >&6
else
# Double quotes because CPP needs to be expanded
-@@ -4094,11 +4298,7 @@
+@@ -4043,11 +4299,7 @@
# <limits.h> exists even on freestanding compilers.
# On the NeXT, cc -E runs the code through the compiler's parser,
# not just through cpp. "Syntax error" is here to catch this case.
@@ -3482,7 +4307,7 @@ Index: pam.debian/configure
/* end confdefs.h. */
#ifdef __STDC__
# include <limits.h>
-@@ -4107,78 +4307,34 @@
+@@ -4056,78 +4308,34 @@
#endif
Syntax error
_ACEOF
@@ -3566,7 +4391,7 @@ Index: pam.debian/configure
break
fi
-@@ -4190,7 +4346,7 @@
+@@ -4139,7 +4347,7 @@
else
ac_cv_prog_CPP=$CPP
fi
@@ -3575,7 +4400,7 @@ Index: pam.debian/configure
$as_echo "$CPP" >&6; }
ac_preproc_ok=false
for ac_c_preproc_warn_flag in '' yes
-@@ -4201,11 +4357,7 @@
+@@ -4150,11 +4358,7 @@
# <limits.h> exists even on freestanding compilers.
# On the NeXT, cc -E runs the code through the compiler's parser,
# not just through cpp. "Syntax error" is here to catch this case.
@@ -3588,7 +4413,7 @@ Index: pam.debian/configure
/* end confdefs.h. */
#ifdef __STDC__
# include <limits.h>
-@@ -4214,87 +4366,40 @@
+@@ -4163,87 +4367,40 @@
#endif
Syntax error
_ACEOF
@@ -3685,7 +4510,7 @@ Index: pam.debian/configure
fi
ac_ext=c
-@@ -4304,9 +4409,9 @@
+@@ -4253,9 +4410,9 @@
ac_compiler_gnu=$ac_cv_c_compiler_gnu
@@ -3697,7 +4522,7 @@ Index: pam.debian/configure
$as_echo_n "(cached) " >&6
else
if test -z "$GREP"; then
-@@ -4317,7 +4422,7 @@
+@@ -4266,7 +4423,7 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -3706,7 +4531,7 @@ Index: pam.debian/configure
for ac_exec_ext in '' $ac_executable_extensions; do
ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
{ test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
-@@ -4337,7 +4442,7 @@
+@@ -4286,7 +4443,7 @@
$as_echo 'GREP' >> "conftest.nl"
"$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break
diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
@@ -3715,7 +4540,7 @@ Index: pam.debian/configure
if test $ac_count -gt ${ac_path_GREP_max-0}; then
# Best one so far, save it but keep looking for a better one
ac_cv_path_GREP="$ac_path_GREP"
-@@ -4352,26 +4457,24 @@
+@@ -4301,26 +4458,24 @@
$ac_path_GREP_found && break 3
done
done
@@ -3747,7 +4572,7 @@ Index: pam.debian/configure
$as_echo_n "(cached) " >&6
else
if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
-@@ -4385,7 +4488,7 @@
+@@ -4334,7 +4489,7 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -3756,7 +4581,7 @@ Index: pam.debian/configure
for ac_exec_ext in '' $ac_executable_extensions; do
ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
{ test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
-@@ -4405,7 +4508,7 @@
+@@ -4354,7 +4509,7 @@
$as_echo 'EGREP' >> "conftest.nl"
"$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
@@ -3765,7 +4590,7 @@ Index: pam.debian/configure
if test $ac_count -gt ${ac_path_EGREP_max-0}; then
# Best one so far, save it but keep looking for a better one
ac_cv_path_EGREP="$ac_path_EGREP"
-@@ -4420,12 +4523,10 @@
+@@ -4369,12 +4524,10 @@
$ac_path_EGREP_found && break 3
done
done
@@ -3780,7 +4605,7 @@ Index: pam.debian/configure
fi
else
ac_cv_path_EGREP=$EGREP
-@@ -4433,21 +4534,17 @@
+@@ -4382,21 +4535,17 @@
fi
fi
@@ -3806,7 +4631,7 @@ Index: pam.debian/configure
/* end confdefs.h. */
#include <stdlib.h>
#include <stdarg.h>
-@@ -4462,48 +4559,23 @@
+@@ -4411,48 +4560,23 @@
return 0;
}
_ACEOF
@@ -3860,7 +4685,7 @@ Index: pam.debian/configure
else
ac_cv_header_stdc=no
fi
-@@ -4513,18 +4585,14 @@
+@@ -4462,18 +4586,14 @@
if test $ac_cv_header_stdc = yes; then
# ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
@@ -3882,7 +4707,7 @@ Index: pam.debian/configure
else
ac_cv_header_stdc=no
fi
-@@ -4534,14 +4602,10 @@
+@@ -4483,14 +4603,10 @@
if test $ac_cv_header_stdc = yes; then
# /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
@@ -3899,7 +4724,7 @@ Index: pam.debian/configure
/* end confdefs.h. */
#include <ctype.h>
#include <stdlib.h>
-@@ -4568,118 +4632,34 @@
+@@ -4517,256 +4633,46 @@
return 0;
}
_ACEOF
@@ -3959,17 +4784,30 @@ Index: pam.debian/configure
fi
# On IRIX 5.3, sys/types and inttypes.h are conflicting.
++for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
++ inttypes.h stdint.h unistd.h
++do :
++ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
++ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
++"
++eval as_val=\$$as_ac_Header
++ if test "x$as_val" = x""yes; then :
++ cat >>confdefs.h <<_ACEOF
++#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
++_ACEOF
+
++fi
+
++done
+
+
+
-
-
-
-
--
--
--
--
--
- for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
- inttypes.h stdint.h unistd.h
+-for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
+- inttypes.h stdint.h unistd.h
-do
-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
@@ -4022,19 +4860,16 @@ Index: pam.debian/configure
-as_val=`eval 'as_val=${'$as_ac_Header'}
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
-+do :
-+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-+ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
-+"
-+eval as_val=\$$as_ac_Header
-+ if test "x$as_val" = x""yes; then :
- cat >>confdefs.h <<_ACEOF
- #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
- _ACEOF
-@@ -4690,134 +4670,8 @@
-
-
-
+- cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+-_ACEOF
+-
+-fi
+-
+-done
+-
+-
+-
- if test "${ac_cv_header_minix_config_h+set}" = set; then
- { $as_echo "$as_me:$LINENO: checking for minix/config.h" >&5
-$as_echo_n "checking for minix/config.h... " >&6; }
@@ -4168,7 +5003,7 @@ Index: pam.debian/configure
MINIX=yes
else
MINIX=
-@@ -4826,34 +4680,23 @@
+@@ -4775,34 +4681,23 @@
if test "$MINIX" = yes; then
@@ -4209,7 +5044,7 @@ Index: pam.debian/configure
/* end confdefs.h. */
# define __EXTENSIONS__ 1
-@@ -4866,56 +4709,25 @@
+@@ -4815,56 +4710,25 @@
return 0;
}
_ACEOF
@@ -4274,7 +5109,7 @@ Index: pam.debian/configure
ac_ext=c
-@@ -4926,9 +4738,9 @@
+@@ -4875,9 +4739,9 @@
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
set dummy ${ac_tool_prefix}gcc; ac_word=$2
@@ -4286,7 +5121,7 @@ Index: pam.debian/configure
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
-@@ -4939,24 +4751,24 @@
+@@ -4888,24 +4752,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -4316,7 +5151,7 @@ Index: pam.debian/configure
$as_echo "no" >&6; }
fi
-@@ -4966,9 +4778,9 @@
+@@ -4915,9 +4779,9 @@
ac_ct_CC=$CC
# Extract the first word of "gcc", so it can be a program name with args.
set dummy gcc; ac_word=$2
@@ -4328,7 +5163,7 @@ Index: pam.debian/configure
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_CC"; then
-@@ -4979,24 +4791,24 @@
+@@ -4928,24 +4792,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -4358,7 +5193,7 @@ Index: pam.debian/configure
$as_echo "no" >&6; }
fi
-@@ -5005,7 +4817,7 @@
+@@ -4954,7 +4818,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -4367,7 +5202,7 @@ Index: pam.debian/configure
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -5019,9 +4831,9 @@
+@@ -4968,9 +4832,9 @@
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
set dummy ${ac_tool_prefix}cc; ac_word=$2
@@ -4379,7 +5214,7 @@ Index: pam.debian/configure
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
-@@ -5032,24 +4844,24 @@
+@@ -4981,24 +4845,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -4409,7 +5244,7 @@ Index: pam.debian/configure
$as_echo "no" >&6; }
fi
-@@ -5059,9 +4871,9 @@
+@@ -5008,9 +4872,9 @@
if test -z "$CC"; then
# Extract the first word of "cc", so it can be a program name with args.
set dummy cc; ac_word=$2
@@ -4421,7 +5256,7 @@ Index: pam.debian/configure
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
-@@ -5073,18 +4885,18 @@
+@@ -5022,18 +4886,18 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -4443,7 +5278,7 @@ Index: pam.debian/configure
IFS=$as_save_IFS
if test $ac_prog_rejected = yes; then
-@@ -5103,10 +4915,10 @@
+@@ -5052,10 +4916,10 @@
fi
CC=$ac_cv_prog_CC
if test -n "$CC"; then
@@ -4456,7 +5291,7 @@ Index: pam.debian/configure
$as_echo "no" >&6; }
fi
-@@ -5118,9 +4930,9 @@
+@@ -5067,9 +4931,9 @@
do
# Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
set dummy $ac_tool_prefix$ac_prog; ac_word=$2
@@ -4468,7 +5303,7 @@ Index: pam.debian/configure
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
-@@ -5131,24 +4943,24 @@
+@@ -5080,24 +4944,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -4498,7 +5333,7 @@ Index: pam.debian/configure
$as_echo "no" >&6; }
fi
-@@ -5162,9 +4974,9 @@
+@@ -5111,9 +4975,9 @@
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
@@ -4510,7 +5345,7 @@ Index: pam.debian/configure
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_CC"; then
-@@ -5175,24 +4987,24 @@
+@@ -5124,24 +4988,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -4540,7 +5375,7 @@ Index: pam.debian/configure
$as_echo "no" >&6; }
fi
-@@ -5205,7 +5017,7 @@
+@@ -5154,7 +5018,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -4549,7 +5384,7 @@ Index: pam.debian/configure
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -5216,62 +5028,42 @@
+@@ -5165,62 +5029,42 @@
fi
@@ -4634,7 +5469,7 @@ Index: pam.debian/configure
/* end confdefs.h. */
int
-@@ -5285,37 +5077,16 @@
+@@ -5234,37 +5078,16 @@
return 0;
}
_ACEOF
@@ -4675,7 +5510,7 @@ Index: pam.debian/configure
$as_echo "$ac_cv_c_compiler_gnu" >&6; }
if test $ac_compiler_gnu = yes; then
GCC=yes
-@@ -5324,20 +5095,16 @@
+@@ -5273,20 +5096,16 @@
fi
ac_test_CFLAGS=${CFLAGS+set}
ac_save_CFLAGS=$CFLAGS
@@ -4699,7 +5534,7 @@ Index: pam.debian/configure
/* end confdefs.h. */
int
-@@ -5348,35 +5115,11 @@
+@@ -5297,35 +5116,11 @@
return 0;
}
_ACEOF
@@ -4738,7 +5573,7 @@ Index: pam.debian/configure
/* end confdefs.h. */
int
-@@ -5387,36 +5130,12 @@
+@@ -5336,36 +5131,12 @@
return 0;
}
_ACEOF
@@ -4779,7 +5614,7 @@ Index: pam.debian/configure
/* end confdefs.h. */
int
-@@ -5427,42 +5146,17 @@
+@@ -5376,42 +5147,17 @@
return 0;
}
_ACEOF
@@ -4824,7 +5659,7 @@ Index: pam.debian/configure
$as_echo "$ac_cv_prog_cc_g" >&6; }
if test "$ac_test_CFLAGS" = set; then
CFLAGS=$ac_save_CFLAGS
-@@ -5479,18 +5173,14 @@
+@@ -5428,18 +5174,14 @@
CFLAGS=
fi
fi
@@ -4846,7 +5681,7 @@ Index: pam.debian/configure
/* end confdefs.h. */
#include <stdarg.h>
#include <stdio.h>
-@@ -5547,32 +5237,9 @@
+@@ -5496,32 +5238,9 @@
-Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
do
CC="$ac_save_CC $ac_arg"
@@ -4880,7 +5715,7 @@ Index: pam.debian/configure
rm -f core conftest.err conftest.$ac_objext
test "x$ac_cv_prog_cc_c89" != "xno" && break
done
-@@ -5583,17 +5250,19 @@
+@@ -5532,17 +5251,19 @@
# AC_CACHE_VAL
case "x$ac_cv_prog_cc_c89" in
x)
@@ -4903,7 +5738,7 @@ Index: pam.debian/configure
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
-@@ -5603,9 +5272,9 @@
+@@ -5552,9 +5273,9 @@
depcc="$CC" am_compiler_list=
@@ -4915,7 +5750,67 @@ Index: pam.debian/configure
$as_echo_n "(cached) " >&6
else
if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
-@@ -5713,7 +5382,7 @@
+@@ -5580,6 +5301,11 @@
+ if test "$am_compiler_list" = ""; then
+ am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
+ fi
++ am__universal=false
++ case " $depcc " in #(
++ *\ -arch\ *\ -arch\ *) am__universal=true ;;
++ esac
++
+ for depmode in $am_compiler_list; do
+ # Setup a source with many dependencies, because some compilers
+ # like to wrap large dependency lists on column 80 (with \), and
+@@ -5597,7 +5323,17 @@
+ done
+ echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
+
++ # We check with `-c' and `-o' for the sake of the "dashmstdout"
++ # mode. It turns out that the SunPro C++ compiler does not properly
++ # handle `-M -o', and we need to detect this. Also, some Intel
++ # versions had trouble with output in subdirs
++ am__obj=sub/conftest.${OBJEXT-o}
++ am__minus_obj="-o $am__obj"
+ case $depmode in
++ gcc)
++ # This depmode causes a compiler race in universal mode.
++ test "$am__universal" = false || continue
++ ;;
+ nosideeffect)
+ # after this tag, mechanisms are not by side-effect, so they'll
+ # only be used when explicitly requested
+@@ -5607,19 +5343,23 @@
+ break
+ fi
+ ;;
++ msvisualcpp | msvcmsys)
++ # This compiler won't grok `-c -o', but also, the minuso test has
++ # not run yet. These depmodes are late enough in the game, and
++ # so weak that their functioning should not be impacted.
++ am__obj=conftest.${OBJEXT-o}
++ am__minus_obj=
++ ;;
+ none) break ;;
+ esac
+- # We check with `-c' and `-o' for the sake of the "dashmstdout"
+- # mode. It turns out that the SunPro C++ compiler does not properly
+- # handle `-M -o', and we need to detect this.
+ if depmode=$depmode \
+- source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
++ source=sub/conftest.c object=$am__obj \
+ depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
+- $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
++ $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \
+ >/dev/null 2>conftest.err &&
+ grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
+ grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
+- grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
++ grep $am__obj sub/conftest.Po > /dev/null 2>&1 &&
+ ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
+ # icc doesn't choke on unknown options, it will just issue warnings
+ # or remarks (even with -Werror). So we grep stderr for any message
+@@ -5643,7 +5383,7 @@
fi
fi
@@ -4924,7 +5819,7 @@ Index: pam.debian/configure
$as_echo "$am_cv_CC_dependencies_compiler_type" >&6; }
CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
-@@ -5732,9 +5401,9 @@
+@@ -5662,9 +5402,9 @@
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
@@ -4936,7 +5831,7 @@ Index: pam.debian/configure
$as_echo_n "(cached) " >&6
else
if test -n "$YACC"; then
-@@ -5745,24 +5414,24 @@
+@@ -5675,24 +5415,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -4966,7 +5861,7 @@ Index: pam.debian/configure
$as_echo "no" >&6; }
fi
-@@ -5775,9 +5444,9 @@
+@@ -5705,9 +5445,9 @@
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
@@ -4978,7 +5873,7 @@ Index: pam.debian/configure
$as_echo_n "(cached) " >&6
else
if test -n "$LEX"; then
-@@ -5788,24 +5457,24 @@
+@@ -5718,24 +5458,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -5008,7 +5903,7 @@ Index: pam.debian/configure
$as_echo "no" >&6; }
fi
-@@ -5834,20 +5503,20 @@
+@@ -5764,20 +5504,20 @@
return ! yylex () + ! yywrap ();
}
_ACEOF
@@ -5036,7 +5931,7 @@ Index: pam.debian/configure
$as_echo_n "(cached) " >&6
else
-@@ -5856,19 +5525,17 @@
+@@ -5786,19 +5526,17 @@
elif test -f lexyy.c; then
ac_cv_prog_lex_root=lexyy
else
@@ -5060,7 +5955,7 @@ Index: pam.debian/configure
$as_echo_n "(cached) " >&6
else
-@@ -5876,55 +5543,29 @@
+@@ -5806,55 +5544,29 @@
ac_cv_lib_lex='none needed'
for ac_lib in '' -lfl -ll; do
LIBS="$ac_lib $ac_save_LIBS"
@@ -5124,7 +6019,7 @@ Index: pam.debian/configure
$as_echo_n "(cached) " >&6
else
# POSIX says lex can declare yytext either as a pointer or an array; the
-@@ -5933,52 +5574,24 @@
+@@ -5863,52 +5575,24 @@
ac_cv_prog_lex_yytext_pointer=no
ac_save_LIBS=$LIBS
LIBS="$LEXLIB $ac_save_LIBS"
@@ -5184,7 +6079,7 @@ Index: pam.debian/configure
fi
rm -f conftest.l $LEX_OUTPUT_ROOT.c
-@@ -5987,115 +5600,23 @@
+@@ -5917,115 +5601,23 @@
if test "$LEX" = :; then
LEX=${am_missing_run}flex
fi
@@ -5278,9 +6173,9 @@ Index: pam.debian/configure
-test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
-
-test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
-
--test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
-
+-test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
+
-{ $as_echo "$as_me:$LINENO: checking whether ln -s works" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ln -s works" >&5
$as_echo_n "checking whether ln -s works... " >&6; }
@@ -5305,7 +6200,7 @@ Index: pam.debian/configure
$as_echo_n "(cached) " >&6
else
cat >conftest.make <<\_ACEOF
-@@ -6113,25 +5634,25 @@
+@@ -6043,25 +5635,25 @@
rm -f conftest.make
fi
if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
@@ -5336,7 +6231,7 @@ Index: pam.debian/configure
-@@ -6147,9 +5668,9 @@
+@@ -6077,9 +5669,9 @@
ltmain="$ac_aux_dir/ltmain.sh"
@@ -5348,7 +6243,7 @@ Index: pam.debian/configure
$as_echo_n "(cached) " >&6
else
ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/
-@@ -6157,7 +5678,7 @@
+@@ -6087,7 +5679,7 @@
ac_script="$ac_script$as_nl$ac_script"
done
echo "$ac_script" 2>/dev/null | sed 99q >conftest.sed
@@ -5357,7 +6252,7 @@ Index: pam.debian/configure
if test -z "$SED"; then
ac_path_SED_found=false
# Loop through the user's path and test for each of PROGNAME-LIST
-@@ -6166,7 +5687,7 @@
+@@ -6096,7 +5688,7 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -5366,7 +6261,7 @@ Index: pam.debian/configure
for ac_exec_ext in '' $ac_executable_extensions; do
ac_path_SED="$as_dir/$ac_prog$ac_exec_ext"
{ test -f "$ac_path_SED" && $as_test_x "$ac_path_SED"; } || continue
-@@ -6186,7 +5707,7 @@
+@@ -6116,7 +5708,7 @@
$as_echo '' >> "conftest.nl"
"$ac_path_SED" -f conftest.sed < "conftest.nl" >"conftest.out" 2>/dev/null || break
diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
@@ -5375,7 +6270,7 @@ Index: pam.debian/configure
if test $ac_count -gt ${ac_path_SED_max-0}; then
# Best one so far, save it but keep looking for a better one
ac_cv_path_SED="$ac_path_SED"
-@@ -6201,19 +5722,17 @@
+@@ -6131,19 +5723,17 @@
$ac_path_SED_found && break 3
done
done
@@ -5398,7 +6293,7 @@ Index: pam.debian/configure
$as_echo "$ac_cv_path_SED" >&6; }
SED="$ac_cv_path_SED"
rm -f conftest.sed
-@@ -6231,9 +5750,9 @@
+@@ -6161,9 +5751,9 @@
@@ -5410,7 +6305,7 @@ Index: pam.debian/configure
$as_echo_n "(cached) " >&6
else
if echo 'ab*c' | $GREP -F 'ab*c' >/dev/null 2>&1
-@@ -6247,7 +5766,7 @@
+@@ -6177,7 +5767,7 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -5419,7 +6314,7 @@ Index: pam.debian/configure
for ac_exec_ext in '' $ac_executable_extensions; do
ac_path_FGREP="$as_dir/$ac_prog$ac_exec_ext"
{ test -f "$ac_path_FGREP" && $as_test_x "$ac_path_FGREP"; } || continue
-@@ -6267,7 +5786,7 @@
+@@ -6197,7 +5787,7 @@
$as_echo 'FGREP' >> "conftest.nl"
"$ac_path_FGREP" FGREP < "conftest.nl" >"conftest.out" 2>/dev/null || break
diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
@@ -5428,7 +6323,7 @@ Index: pam.debian/configure
if test $ac_count -gt ${ac_path_FGREP_max-0}; then
# Best one so far, save it but keep looking for a better one
ac_cv_path_FGREP="$ac_path_FGREP"
-@@ -6282,12 +5801,10 @@
+@@ -6212,12 +5802,10 @@
$ac_path_FGREP_found && break 3
done
done
@@ -5443,7 +6338,7 @@ Index: pam.debian/configure
fi
else
ac_cv_path_FGREP=$FGREP
-@@ -6295,7 +5812,7 @@
+@@ -6225,7 +5813,7 @@
fi
fi
@@ -5452,7 +6347,7 @@ Index: pam.debian/configure
$as_echo "$ac_cv_path_FGREP" >&6; }
FGREP="$ac_cv_path_FGREP"
-@@ -6321,7 +5838,7 @@
+@@ -6251,7 +5839,7 @@
# Check whether --with-gnu-ld was given.
@@ -5461,7 +6356,7 @@ Index: pam.debian/configure
withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes
else
with_gnu_ld=no
-@@ -6330,7 +5847,7 @@
+@@ -6260,7 +5848,7 @@
ac_prog=ld
if test "$GCC" = yes; then
# Check if gcc -print-prog-name=ld gives a path.
@@ -5470,7 +6365,7 @@ Index: pam.debian/configure
$as_echo_n "checking for ld used by $CC... " >&6; }
case $host in
*-*-mingw*)
-@@ -6360,13 +5877,13 @@
+@@ -6290,13 +5878,13 @@
;;
esac
elif test "$with_gnu_ld" = yes; then
@@ -5487,7 +6382,7 @@ Index: pam.debian/configure
$as_echo_n "(cached) " >&6
else
if test -z "$LD"; then
-@@ -6397,18 +5914,16 @@
+@@ -6327,18 +5915,16 @@
LD="$lt_cv_path_LD"
if test -n "$LD"; then
@@ -5511,7 +6406,7 @@ Index: pam.debian/configure
$as_echo_n "(cached) " >&6
else
# I'd rather use --version here, but apparently some GNU lds only accept -v.
-@@ -6421,7 +5936,7 @@
+@@ -6351,7 +5937,7 @@
;;
esac
fi
@@ -5520,7 +6415,7 @@ Index: pam.debian/configure
$as_echo "$lt_cv_prog_gnu_ld" >&6; }
with_gnu_ld=$lt_cv_prog_gnu_ld
-@@ -6433,9 +5948,9 @@
+@@ -6363,9 +5949,9 @@
@@ -5532,7 +6427,7 @@ Index: pam.debian/configure
$as_echo_n "(cached) " >&6
else
if test -n "$NM"; then
-@@ -6482,7 +5997,7 @@
+@@ -6412,7 +5998,7 @@
: ${lt_cv_path_NM=no}
fi
fi
@@ -5541,7 +6436,7 @@ Index: pam.debian/configure
$as_echo "$lt_cv_path_NM" >&6; }
if test "$lt_cv_path_NM" != "no"; then
NM="$lt_cv_path_NM"
-@@ -6493,9 +6008,9 @@
+@@ -6423,9 +6009,9 @@
do
# Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
set dummy $ac_tool_prefix$ac_prog; ac_word=$2
@@ -5553,7 +6448,7 @@ Index: pam.debian/configure
$as_echo_n "(cached) " >&6
else
if test -n "$DUMPBIN"; then
-@@ -6506,24 +6021,24 @@
+@@ -6436,24 +6022,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -5583,7 +6478,7 @@ Index: pam.debian/configure
$as_echo "no" >&6; }
fi
-@@ -6537,9 +6052,9 @@
+@@ -6467,9 +6053,9 @@
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
@@ -5595,7 +6490,7 @@ Index: pam.debian/configure
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_DUMPBIN"; then
-@@ -6550,24 +6065,24 @@
+@@ -6480,24 +6066,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -5625,7 +6520,7 @@ Index: pam.debian/configure
$as_echo "no" >&6; }
fi
-@@ -6580,7 +6095,7 @@
+@@ -6510,7 +6096,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -5634,7 +6529,7 @@ Index: pam.debian/configure
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -6600,33 +6115,33 @@
+@@ -6530,33 +6116,33 @@
@@ -5647,16 +6542,16 @@ Index: pam.debian/configure
else
lt_cv_nm_interface="BSD nm"
echo "int some_variable = 0;" > conftest.$ac_ext
-- (eval echo "\"\$as_me:6610: $ac_compile\"" >&5)
-+ (eval echo "\"\$as_me:6125: $ac_compile\"" >&5)
+- (eval echo "\"\$as_me:6540: $ac_compile\"" >&5)
++ (eval echo "\"\$as_me:6126: $ac_compile\"" >&5)
(eval "$ac_compile" 2>conftest.err)
cat conftest.err >&5
-- (eval echo "\"\$as_me:6613: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
-+ (eval echo "\"\$as_me:6128: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+- (eval echo "\"\$as_me:6543: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
++ (eval echo "\"\$as_me:6129: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
(eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
cat conftest.err >&5
-- (eval echo "\"\$as_me:6616: output\"" >&5)
-+ (eval echo "\"\$as_me:6131: output\"" >&5)
+- (eval echo "\"\$as_me:6546: output\"" >&5)
++ (eval echo "\"\$as_me:6132: output\"" >&5)
cat conftest.out >&5
if $GREP 'External.*some_variable' conftest.out > /dev/null; then
lt_cv_nm_interface="MS dumpbin"
@@ -5676,7 +6571,7 @@ Index: pam.debian/configure
$as_echo_n "(cached) " >&6
else
i=0
-@@ -6744,10 +6259,10 @@
+@@ -6674,10 +6260,10 @@
fi
if test -n $lt_cv_sys_max_cmd_len ; then
@@ -5689,7 +6584,7 @@ Index: pam.debian/configure
$as_echo "none" >&6; }
fi
max_cmd_len=$lt_cv_sys_max_cmd_len
-@@ -6761,7 +6276,7 @@
+@@ -6691,7 +6277,7 @@
: ${MV="mv -f"}
: ${RM="rm -f"}
@@ -5698,7 +6593,7 @@ Index: pam.debian/configure
$as_echo_n "checking whether the shell understands some XSI constructs... " >&6; }
# Try some XSI features
xsi_shell=no
-@@ -6771,17 +6286,17 @@
+@@ -6701,17 +6287,17 @@
&& eval 'test $(( 1 + 1 )) -eq 2 \
&& test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
&& xsi_shell=yes
@@ -5719,7 +6614,7 @@ Index: pam.debian/configure
$as_echo "$lt_shell_append" >&6; }
-@@ -6816,14 +6331,14 @@
+@@ -6746,14 +6332,14 @@
@@ -5737,7 +6632,7 @@ Index: pam.debian/configure
$as_echo "$lt_cv_ld_reload_flag" >&6; }
reload_flag=$lt_cv_ld_reload_flag
case $reload_flag in
-@@ -6852,9 +6367,9 @@
+@@ -6782,9 +6368,9 @@
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args.
set dummy ${ac_tool_prefix}objdump; ac_word=$2
@@ -5749,7 +6644,7 @@ Index: pam.debian/configure
$as_echo_n "(cached) " >&6
else
if test -n "$OBJDUMP"; then
-@@ -6865,24 +6380,24 @@
+@@ -6795,24 +6381,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -5779,7 +6674,7 @@ Index: pam.debian/configure
$as_echo "no" >&6; }
fi
-@@ -6892,9 +6407,9 @@
+@@ -6822,9 +6408,9 @@
ac_ct_OBJDUMP=$OBJDUMP
# Extract the first word of "objdump", so it can be a program name with args.
set dummy objdump; ac_word=$2
@@ -5791,7 +6686,7 @@ Index: pam.debian/configure
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_OBJDUMP"; then
-@@ -6905,24 +6420,24 @@
+@@ -6835,24 +6421,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -5821,7 +6716,7 @@ Index: pam.debian/configure
$as_echo "no" >&6; }
fi
-@@ -6931,7 +6446,7 @@
+@@ -6861,7 +6447,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -5830,7 +6725,7 @@ Index: pam.debian/configure
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -6951,9 +6466,9 @@
+@@ -6881,9 +6467,9 @@
@@ -5842,7 +6737,7 @@ Index: pam.debian/configure
$as_echo_n "(cached) " >&6
else
lt_cv_file_magic_cmd='$MAGIC_CMD'
-@@ -7068,11 +6583,11 @@
+@@ -6998,11 +6584,11 @@
;;
# This must be Linux ELF.
@@ -5856,7 +6751,7 @@ Index: pam.debian/configure
if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
else
-@@ -7147,7 +6662,7 @@
+@@ -7077,7 +6663,7 @@
esac
fi
@@ -5865,7 +6760,7 @@ Index: pam.debian/configure
$as_echo "$lt_cv_deplibs_check_method" >&6; }
file_magic_cmd=$lt_cv_file_magic_cmd
deplibs_check_method=$lt_cv_deplibs_check_method
-@@ -7167,9 +6682,9 @@
+@@ -7097,9 +6683,9 @@
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
set dummy ${ac_tool_prefix}ar; ac_word=$2
@@ -5877,7 +6772,7 @@ Index: pam.debian/configure
$as_echo_n "(cached) " >&6
else
if test -n "$AR"; then
-@@ -7180,24 +6695,24 @@
+@@ -7110,24 +6696,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -5907,7 +6802,7 @@ Index: pam.debian/configure
$as_echo "no" >&6; }
fi
-@@ -7207,9 +6722,9 @@
+@@ -7137,9 +6723,9 @@
ac_ct_AR=$AR
# Extract the first word of "ar", so it can be a program name with args.
set dummy ar; ac_word=$2
@@ -5919,7 +6814,7 @@ Index: pam.debian/configure
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_AR"; then
-@@ -7220,24 +6735,24 @@
+@@ -7150,24 +6736,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -5949,7 +6844,7 @@ Index: pam.debian/configure
$as_echo "no" >&6; }
fi
-@@ -7246,7 +6761,7 @@
+@@ -7176,7 +6762,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -5958,7 +6853,7 @@ Index: pam.debian/configure
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -7272,9 +6787,9 @@
+@@ -7202,9 +6788,9 @@
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
set dummy ${ac_tool_prefix}strip; ac_word=$2
@@ -5970,7 +6865,7 @@ Index: pam.debian/configure
$as_echo_n "(cached) " >&6
else
if test -n "$STRIP"; then
-@@ -7285,24 +6800,24 @@
+@@ -7215,24 +6801,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -6000,7 +6895,7 @@ Index: pam.debian/configure
$as_echo "no" >&6; }
fi
-@@ -7312,9 +6827,9 @@
+@@ -7242,9 +6828,9 @@
ac_ct_STRIP=$STRIP
# Extract the first word of "strip", so it can be a program name with args.
set dummy strip; ac_word=$2
@@ -6012,7 +6907,7 @@ Index: pam.debian/configure
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_STRIP"; then
-@@ -7325,24 +6840,24 @@
+@@ -7255,24 +6841,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -6042,7 +6937,7 @@ Index: pam.debian/configure
$as_echo "no" >&6; }
fi
-@@ -7351,7 +6866,7 @@
+@@ -7281,7 +6867,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -6051,7 +6946,7 @@ Index: pam.debian/configure
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -7371,9 +6886,9 @@
+@@ -7301,9 +6887,9 @@
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
set dummy ${ac_tool_prefix}ranlib; ac_word=$2
@@ -6063,7 +6958,7 @@ Index: pam.debian/configure
$as_echo_n "(cached) " >&6
else
if test -n "$RANLIB"; then
-@@ -7384,24 +6899,24 @@
+@@ -7314,24 +6900,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -6093,7 +6988,7 @@ Index: pam.debian/configure
$as_echo "no" >&6; }
fi
-@@ -7411,9 +6926,9 @@
+@@ -7341,9 +6927,9 @@
ac_ct_RANLIB=$RANLIB
# Extract the first word of "ranlib", so it can be a program name with args.
set dummy ranlib; ac_word=$2
@@ -6105,7 +7000,7 @@ Index: pam.debian/configure
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_RANLIB"; then
-@@ -7424,24 +6939,24 @@
+@@ -7354,24 +6940,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -6135,7 +7030,7 @@ Index: pam.debian/configure
$as_echo "no" >&6; }
fi
-@@ -7450,7 +6965,7 @@
+@@ -7380,7 +6966,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -6144,7 +7039,7 @@ Index: pam.debian/configure
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -7528,9 +7043,9 @@
+@@ -7458,9 +7044,9 @@
# Check for command to grab the raw symbol name followed by C symbol from nm.
@@ -6156,7 +7051,7 @@ Index: pam.debian/configure
$as_echo_n "(cached) " >&6
else
-@@ -7646,18 +7161,18 @@
+@@ -7576,18 +7162,18 @@
int main(){nm_test_var='a';nm_test_func();return(0);}
_LT_EOF
@@ -6181,7 +7076,7 @@ Index: pam.debian/configure
# Try sorting and uniquifying the output.
if sort "$nlist" | uniq > "$nlist"T; then
mv -f "$nlist"T "$nlist"
-@@ -7710,11 +7225,11 @@
+@@ -7640,11 +7226,11 @@
lt_save_CFLAGS="$CFLAGS"
LIBS="conftstm.$ac_objext"
CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
@@ -6196,7 +7091,7 @@ Index: pam.debian/configure
pipe_works=yes
fi
LIBS="$lt_save_LIBS"
-@@ -7748,10 +7263,10 @@
+@@ -7678,10 +7264,10 @@
lt_cv_sys_global_symbol_to_cdecl=
fi
if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then
@@ -6209,7 +7104,7 @@ Index: pam.debian/configure
$as_echo "ok" >&6; }
fi
-@@ -7777,7 +7292,7 @@
+@@ -7707,7 +7293,7 @@
# Check whether --enable-libtool-lock was given.
@@ -6218,7 +7113,7 @@ Index: pam.debian/configure
enableval=$enable_libtool_lock;
fi
-@@ -7789,11 +7304,11 @@
+@@ -7719,11 +7305,11 @@
ia64-*-hpux*)
# Find out which ABI we are using.
echo 'int i;' > conftest.$ac_ext
@@ -6233,13 +7128,13 @@ Index: pam.debian/configure
case `/usr/bin/file conftest.$ac_objext` in
*ELF-32*)
HPUX_IA64_MODE="32"
-@@ -7807,12 +7322,12 @@
+@@ -7737,12 +7323,12 @@
;;
*-*-irix6*)
# Find out which ABI we are using.
-- echo '#line 7810 "configure"' > conftest.$ac_ext
+- echo '#line 7740 "configure"' > conftest.$ac_ext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+ echo '#line 7325 "configure"' > conftest.$ac_ext
++ echo '#line 7326 "configure"' > conftest.$ac_ext
+ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -6250,7 +7145,7 @@ Index: pam.debian/configure
if test "$lt_cv_prog_gnu_ld" = yes; then
case `/usr/bin/file conftest.$ac_objext` in
*32-bit*)
-@@ -7846,11 +7361,11 @@
+@@ -7776,11 +7362,11 @@
s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
# Find out which ABI we are using.
echo 'int i;' > conftest.$ac_ext
@@ -6265,7 +7160,7 @@ Index: pam.debian/configure
case `/usr/bin/file conftest.o` in
*32-bit*)
case $host in
-@@ -7899,9 +7414,9 @@
+@@ -7829,9 +7415,9 @@
# On SCO OpenServer 5, we need -belf to get full-featured binaries.
SAVE_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS -belf"
@@ -6277,7 +7172,7 @@ Index: pam.debian/configure
$as_echo_n "(cached) " >&6
else
ac_ext=c
-@@ -7910,11 +7425,7 @@
+@@ -7840,11 +7426,7 @@
ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
ac_compiler_gnu=$ac_cv_c_compiler_gnu
@@ -6290,7 +7185,7 @@ Index: pam.debian/configure
/* end confdefs.h. */
int
-@@ -7925,38 +7436,13 @@
+@@ -7855,38 +7437,13 @@
return 0;
}
_ACEOF
@@ -6333,7 +7228,7 @@ Index: pam.debian/configure
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -7964,7 +7450,7 @@
+@@ -7894,7 +7451,7 @@
ac_compiler_gnu=$ac_cv_c_compiler_gnu
fi
@@ -6342,7 +7237,7 @@ Index: pam.debian/configure
$as_echo "$lt_cv_cc_needs_belf" >&6; }
if test x"$lt_cv_cc_needs_belf" != x"yes"; then
# this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
-@@ -7974,11 +7460,11 @@
+@@ -7904,11 +7461,11 @@
sparc*-*solaris*)
# Find out which ABI we are using.
echo 'int i;' > conftest.$ac_ext
@@ -6357,7 +7252,7 @@ Index: pam.debian/configure
case `/usr/bin/file conftest.o` in
*64-bit*)
case $lt_cv_prog_gnu_ld in
-@@ -8004,9 +7490,9 @@
+@@ -7934,9 +7491,9 @@
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}dsymutil", so it can be a program name with args.
set dummy ${ac_tool_prefix}dsymutil; ac_word=$2
@@ -6369,7 +7264,7 @@ Index: pam.debian/configure
$as_echo_n "(cached) " >&6
else
if test -n "$DSYMUTIL"; then
-@@ -8017,24 +7503,24 @@
+@@ -7947,24 +7504,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -6399,7 +7294,7 @@ Index: pam.debian/configure
$as_echo "no" >&6; }
fi
-@@ -8044,9 +7530,9 @@
+@@ -7974,9 +7531,9 @@
ac_ct_DSYMUTIL=$DSYMUTIL
# Extract the first word of "dsymutil", so it can be a program name with args.
set dummy dsymutil; ac_word=$2
@@ -6411,7 +7306,7 @@ Index: pam.debian/configure
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_DSYMUTIL"; then
-@@ -8057,24 +7543,24 @@
+@@ -7987,24 +7544,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -6441,7 +7336,7 @@ Index: pam.debian/configure
$as_echo "no" >&6; }
fi
-@@ -8083,7 +7569,7 @@
+@@ -8013,7 +7570,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -6450,7 +7345,7 @@ Index: pam.debian/configure
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -8096,9 +7582,9 @@
+@@ -8026,9 +7583,9 @@
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}nmedit", so it can be a program name with args.
set dummy ${ac_tool_prefix}nmedit; ac_word=$2
@@ -6462,7 +7357,7 @@ Index: pam.debian/configure
$as_echo_n "(cached) " >&6
else
if test -n "$NMEDIT"; then
-@@ -8109,24 +7595,24 @@
+@@ -8039,24 +7596,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -6492,7 +7387,7 @@ Index: pam.debian/configure
$as_echo "no" >&6; }
fi
-@@ -8136,9 +7622,9 @@
+@@ -8066,9 +7623,9 @@
ac_ct_NMEDIT=$NMEDIT
# Extract the first word of "nmedit", so it can be a program name with args.
set dummy nmedit; ac_word=$2
@@ -6504,7 +7399,7 @@ Index: pam.debian/configure
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_NMEDIT"; then
-@@ -8149,24 +7635,24 @@
+@@ -8079,24 +7636,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -6534,7 +7429,7 @@ Index: pam.debian/configure
$as_echo "no" >&6; }
fi
-@@ -8175,7 +7661,7 @@
+@@ -8105,7 +7662,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -6543,7 +7438,7 @@ Index: pam.debian/configure
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -8188,9 +7674,9 @@
+@@ -8118,9 +7675,9 @@
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}lipo", so it can be a program name with args.
set dummy ${ac_tool_prefix}lipo; ac_word=$2
@@ -6555,7 +7450,7 @@ Index: pam.debian/configure
$as_echo_n "(cached) " >&6
else
if test -n "$LIPO"; then
-@@ -8201,24 +7687,24 @@
+@@ -8131,24 +7688,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -6585,7 +7480,7 @@ Index: pam.debian/configure
$as_echo "no" >&6; }
fi
-@@ -8228,9 +7714,9 @@
+@@ -8158,9 +7715,9 @@
ac_ct_LIPO=$LIPO
# Extract the first word of "lipo", so it can be a program name with args.
set dummy lipo; ac_word=$2
@@ -6597,7 +7492,7 @@ Index: pam.debian/configure
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_LIPO"; then
-@@ -8241,24 +7727,24 @@
+@@ -8171,24 +7728,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -6627,7 +7522,7 @@ Index: pam.debian/configure
$as_echo "no" >&6; }
fi
-@@ -8267,7 +7753,7 @@
+@@ -8197,7 +7754,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -6636,7 +7531,7 @@ Index: pam.debian/configure
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -8280,9 +7766,9 @@
+@@ -8210,9 +7767,9 @@
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}otool", so it can be a program name with args.
set dummy ${ac_tool_prefix}otool; ac_word=$2
@@ -6648,7 +7543,7 @@ Index: pam.debian/configure
$as_echo_n "(cached) " >&6
else
if test -n "$OTOOL"; then
-@@ -8293,24 +7779,24 @@
+@@ -8223,24 +7780,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -6678,7 +7573,7 @@ Index: pam.debian/configure
$as_echo "no" >&6; }
fi
-@@ -8320,9 +7806,9 @@
+@@ -8250,9 +7807,9 @@
ac_ct_OTOOL=$OTOOL
# Extract the first word of "otool", so it can be a program name with args.
set dummy otool; ac_word=$2
@@ -6690,7 +7585,7 @@ Index: pam.debian/configure
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_OTOOL"; then
-@@ -8333,24 +7819,24 @@
+@@ -8263,24 +7820,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -6720,7 +7615,7 @@ Index: pam.debian/configure
$as_echo "no" >&6; }
fi
-@@ -8359,7 +7845,7 @@
+@@ -8289,7 +7846,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -6729,7 +7624,7 @@ Index: pam.debian/configure
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -8372,9 +7858,9 @@
+@@ -8302,9 +7859,9 @@
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}otool64", so it can be a program name with args.
set dummy ${ac_tool_prefix}otool64; ac_word=$2
@@ -6741,7 +7636,7 @@ Index: pam.debian/configure
$as_echo_n "(cached) " >&6
else
if test -n "$OTOOL64"; then
-@@ -8385,24 +7871,24 @@
+@@ -8315,24 +7872,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -6771,7 +7666,7 @@ Index: pam.debian/configure
$as_echo "no" >&6; }
fi
-@@ -8412,9 +7898,9 @@
+@@ -8342,9 +7899,9 @@
ac_ct_OTOOL64=$OTOOL64
# Extract the first word of "otool64", so it can be a program name with args.
set dummy otool64; ac_word=$2
@@ -6783,7 +7678,7 @@ Index: pam.debian/configure
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_OTOOL64"; then
-@@ -8425,24 +7911,24 @@
+@@ -8355,24 +7912,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -6813,7 +7708,7 @@ Index: pam.debian/configure
$as_echo "no" >&6; }
fi
-@@ -8451,7 +7937,7 @@
+@@ -8381,7 +7938,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -6822,7 +7717,7 @@ Index: pam.debian/configure
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -8487,9 +7973,9 @@
+@@ -8417,9 +7974,9 @@
@@ -6834,7 +7729,7 @@ Index: pam.debian/configure
$as_echo_n "(cached) " >&6
else
lt_cv_apple_cc_single_mod=no
-@@ -8514,22 +8000,18 @@
+@@ -8444,22 +8001,18 @@
rm -f conftest.*
fi
fi
@@ -6861,7 +7756,7 @@ Index: pam.debian/configure
/* end confdefs.h. */
int
-@@ -8540,42 +8022,17 @@
+@@ -8470,42 +8023,17 @@
return 0;
}
_ACEOF
@@ -6909,7 +7804,7 @@ Index: pam.debian/configure
$as_echo "$lt_cv_ld_exported_symbols_list" >&6; }
case $host_os in
rhapsody* | darwin1.[012])
-@@ -8612,62 +8069,13 @@
+@@ -8542,62 +8070,13 @@
;;
esac
@@ -6967,18 +7862,17 @@ Index: pam.debian/configure
-as_val=`eval 'as_val=${'$as_ac_Header'}
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
-- cat >>confdefs.h <<_ACEOF
--#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+do :
+ ac_fn_c_check_header_compile "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default
+"
+if test "x$ac_cv_header_dlfcn_h" = x""yes; then :
-+ cat >>confdefs.h <<_ACEOF
+ cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+#define HAVE_DLFCN_H 1
_ACEOF
fi
-@@ -8690,7 +8098,7 @@
+@@ -8620,7 +8099,7 @@
# Check whether --with-pic was given.
@@ -6987,7 +7881,7 @@ Index: pam.debian/configure
withval=$with_pic; pic_mode="$withval"
else
pic_mode=default
-@@ -8706,7 +8114,7 @@
+@@ -8636,7 +8115,7 @@
# Check whether --enable-fast-install was given.
@@ -6996,7 +7890,7 @@ Index: pam.debian/configure
enableval=$enable_fast_install; p=${PACKAGE-default}
case $enableval in
yes) enable_fast_install=yes ;;
-@@ -8787,9 +8195,9 @@
+@@ -8717,9 +8196,9 @@
setopt NO_GLOB_SUBST
fi
@@ -7008,7 +7902,7 @@ Index: pam.debian/configure
$as_echo_n "(cached) " >&6
else
rm -f .libs 2>/dev/null
-@@ -8802,7 +8210,7 @@
+@@ -8732,7 +8211,7 @@
fi
rmdir .libs 2>/dev/null
fi
@@ -7017,7 +7911,7 @@ Index: pam.debian/configure
$as_echo "$lt_cv_objdir" >&6; }
objdir=$lt_cv_objdir
-@@ -8895,9 +8303,9 @@
+@@ -8825,9 +8304,9 @@
case $deplibs_check_method in
file_magic*)
if test "$file_magic_cmd" = '$MAGIC_CMD'; then
@@ -7029,7 +7923,7 @@ Index: pam.debian/configure
$as_echo_n "(cached) " >&6
else
case $MAGIC_CMD in
-@@ -8948,10 +8356,10 @@
+@@ -8878,10 +8357,10 @@
MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
if test -n "$MAGIC_CMD"; then
@@ -7042,7 +7936,7 @@ Index: pam.debian/configure
$as_echo "no" >&6; }
fi
-@@ -8961,9 +8369,9 @@
+@@ -8891,9 +8370,9 @@
if test -z "$lt_cv_path_MAGIC_CMD"; then
if test -n "$ac_tool_prefix"; then
@@ -7054,7 +7948,7 @@ Index: pam.debian/configure
$as_echo_n "(cached) " >&6
else
case $MAGIC_CMD in
-@@ -9014,10 +8422,10 @@
+@@ -8944,10 +8423,10 @@
MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
if test -n "$MAGIC_CMD"; then
@@ -7067,7 +7961,7 @@ Index: pam.debian/configure
$as_echo "no" >&6; }
fi
-@@ -9098,9 +8506,9 @@
+@@ -9028,9 +8507,9 @@
if test "$GCC" = yes; then
lt_prog_compiler_no_builtin_flag=' -fno-builtin'
@@ -7079,21 +7973,21 @@ Index: pam.debian/configure
$as_echo_n "(cached) " >&6
else
lt_cv_prog_compiler_rtti_exceptions=no
-@@ -9116,11 +8524,11 @@
+@@ -9046,11 +8525,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:9119: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:8527: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:9049: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:8528: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:9123: \$? = $ac_status" >&5
-+ echo "$as_me:8531: \$? = $ac_status" >&5
+- echo "$as_me:9053: \$? = $ac_status" >&5
++ echo "$as_me:8532: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
-@@ -9133,7 +8541,7 @@
+@@ -9063,7 +8542,7 @@
$RM conftest*
fi
@@ -7102,7 +7996,7 @@ Index: pam.debian/configure
$as_echo "$lt_cv_prog_compiler_rtti_exceptions" >&6; }
if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then
-@@ -9153,7 +8561,7 @@
+@@ -9083,7 +8562,7 @@
lt_prog_compiler_pic=
lt_prog_compiler_static=
@@ -7111,7 +8005,7 @@ Index: pam.debian/configure
$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
if test "$GCC" = yes; then
-@@ -9285,7 +8693,7 @@
+@@ -9215,7 +8694,7 @@
lt_prog_compiler_static='-non_shared'
;;
@@ -7120,7 +8014,7 @@ Index: pam.debian/configure
case $cc_basename in
# old Intel for x86_64 which still supported -KPIC.
ecc*)
-@@ -9425,7 +8833,7 @@
+@@ -9355,7 +8834,7 @@
lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
;;
esac
@@ -7129,7 +8023,7 @@ Index: pam.debian/configure
$as_echo "$lt_prog_compiler_pic" >&6; }
-@@ -9437,9 +8845,9 @@
+@@ -9367,9 +8846,9 @@
# Check to make sure the PIC flag actually works.
#
if test -n "$lt_prog_compiler_pic"; then
@@ -7141,21 +8035,21 @@ Index: pam.debian/configure
$as_echo_n "(cached) " >&6
else
lt_cv_prog_compiler_pic_works=no
-@@ -9455,11 +8863,11 @@
+@@ -9385,11 +8864,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:9458: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:8866: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:9388: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:8867: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:9462: \$? = $ac_status" >&5
-+ echo "$as_me:8870: \$? = $ac_status" >&5
+- echo "$as_me:9392: \$? = $ac_status" >&5
++ echo "$as_me:8871: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
-@@ -9472,7 +8880,7 @@
+@@ -9402,7 +8881,7 @@
$RM conftest*
fi
@@ -7164,7 +8058,7 @@ Index: pam.debian/configure
$as_echo "$lt_cv_prog_compiler_pic_works" >&6; }
if test x"$lt_cv_prog_compiler_pic_works" = xyes; then
-@@ -9496,9 +8904,9 @@
+@@ -9426,9 +8905,9 @@
# Check to make sure the static flag actually works.
#
wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\"
@@ -7176,7 +8070,7 @@ Index: pam.debian/configure
$as_echo_n "(cached) " >&6
else
lt_cv_prog_compiler_static_works=no
-@@ -9524,7 +8932,7 @@
+@@ -9454,7 +8933,7 @@
LDFLAGS="$save_LDFLAGS"
fi
@@ -7185,7 +8079,7 @@ Index: pam.debian/configure
$as_echo "$lt_cv_prog_compiler_static_works" >&6; }
if test x"$lt_cv_prog_compiler_static_works" = xyes; then
-@@ -9539,9 +8947,9 @@
+@@ -9469,9 +8948,9 @@
@@ -7197,21 +8091,21 @@ Index: pam.debian/configure
$as_echo_n "(cached) " >&6
else
lt_cv_prog_compiler_c_o=no
-@@ -9560,11 +8968,11 @@
+@@ -9490,11 +8969,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:9563: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:8971: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:9493: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:8972: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
-- echo "$as_me:9567: \$? = $ac_status" >&5
-+ echo "$as_me:8975: \$? = $ac_status" >&5
+- echo "$as_me:9497: \$? = $ac_status" >&5
++ echo "$as_me:8976: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
-@@ -9586,7 +8994,7 @@
+@@ -9516,7 +8995,7 @@
$RM conftest*
fi
@@ -7220,7 +8114,7 @@ Index: pam.debian/configure
$as_echo "$lt_cv_prog_compiler_c_o" >&6; }
-@@ -9594,9 +9002,9 @@
+@@ -9524,9 +9003,9 @@
@@ -7232,21 +8126,21 @@ Index: pam.debian/configure
$as_echo_n "(cached) " >&6
else
lt_cv_prog_compiler_c_o=no
-@@ -9615,11 +9023,11 @@
+@@ -9545,11 +9024,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:9618: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:9026: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:9548: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:9027: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
-- echo "$as_me:9622: \$? = $ac_status" >&5
-+ echo "$as_me:9030: \$? = $ac_status" >&5
+- echo "$as_me:9552: \$? = $ac_status" >&5
++ echo "$as_me:9031: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
-@@ -9641,7 +9049,7 @@
+@@ -9571,7 +9050,7 @@
$RM conftest*
fi
@@ -7255,7 +8149,7 @@ Index: pam.debian/configure
$as_echo "$lt_cv_prog_compiler_c_o" >&6; }
-@@ -9650,7 +9058,7 @@
+@@ -9580,7 +9059,7 @@
hard_links="nottested"
if test "$lt_cv_prog_compiler_c_o" = no && test "$need_locks" != no; then
# do not overwrite the value of need_locks provided by the user
@@ -7264,7 +8158,7 @@ Index: pam.debian/configure
$as_echo_n "checking if we can lock with hard links... " >&6; }
hard_links=yes
$RM conftest*
-@@ -9658,10 +9066,10 @@
+@@ -9588,10 +9067,10 @@
touch conftest.a
ln conftest.a conftest.b 2>&5 || hard_links=no
ln conftest.a conftest.b 2>/dev/null && hard_links=no
@@ -7277,7 +8171,7 @@ Index: pam.debian/configure
$as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
need_locks=warn
fi
-@@ -9674,7 +9082,7 @@
+@@ -9604,7 +9083,7 @@
@@ -7286,7 +8180,7 @@ Index: pam.debian/configure
$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
runpath_var=
-@@ -9734,6 +9142,9 @@
+@@ -9664,6 +9143,9 @@
openbsd*)
with_gnu_ld=no
;;
@@ -7296,7 +8190,7 @@ Index: pam.debian/configure
esac
ld_shlibs=yes
-@@ -9755,6 +9166,7 @@
+@@ -9685,6 +9167,7 @@
fi
supports_anon_versioning=no
case `$LD -v 2>&1` in
@@ -7304,7 +8198,7 @@ Index: pam.debian/configure
*\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
*\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
*\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
-@@ -9846,7 +9258,7 @@
+@@ -9776,7 +9259,7 @@
archive_expsym_cmds='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
;;
@@ -7313,7 +8207,7 @@ Index: pam.debian/configure
tmp_diet=no
if test "$host_os" = linux-dietlibc; then
case $cc_basename in
-@@ -9916,7 +9328,7 @@
+@@ -9846,7 +9329,7 @@
fi
;;
@@ -7322,7 +8216,7 @@ Index: pam.debian/configure
if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
wlarc=
-@@ -10091,6 +9503,7 @@
+@@ -10021,6 +9504,7 @@
if test "$aix_use_runtimelinking" = yes; then
shared_flag="$shared_flag "'${wl}-G'
fi
@@ -7330,7 +8224,7 @@ Index: pam.debian/configure
else
# not using gcc
if test "$host_cpu" = ia64; then
-@@ -10116,11 +9529,7 @@
+@@ -10046,11 +9530,7 @@
allow_undefined_flag='-berok'
# Determine the default libpath from the value encoded in an
# empty executable.
@@ -7343,7 +8237,7 @@ Index: pam.debian/configure
/* end confdefs.h. */
int
-@@ -10131,27 +9540,7 @@
+@@ -10061,27 +9541,7 @@
return 0;
}
_ACEOF
@@ -7372,7 +8266,7 @@ Index: pam.debian/configure
lt_aix_libpath_sed='
/Import File Strings/,/^$/ {
-@@ -10165,16 +9554,9 @@
+@@ -10095,16 +9555,9 @@
if test -z "$aix_libpath"; then
aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
fi
@@ -7391,7 +8285,7 @@ Index: pam.debian/configure
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
-@@ -10187,11 +9569,7 @@
+@@ -10117,11 +9570,7 @@
else
# Determine the default libpath from the value encoded in an
# empty executable.
@@ -7404,7 +8298,7 @@ Index: pam.debian/configure
/* end confdefs.h. */
int
-@@ -10202,27 +9580,7 @@
+@@ -10132,27 +9581,7 @@
return 0;
}
_ACEOF
@@ -7433,7 +8327,7 @@ Index: pam.debian/configure
lt_aix_libpath_sed='
/Import File Strings/,/^$/ {
-@@ -10236,16 +9594,9 @@
+@@ -10166,16 +9595,9 @@
if test -z "$aix_libpath"; then
aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
fi
@@ -7452,7 +8346,7 @@ Index: pam.debian/configure
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
-@@ -10457,42 +9808,16 @@
+@@ -10387,42 +9809,16 @@
# implicitly export all symbols.
save_LDFLAGS="$LDFLAGS"
LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
@@ -7500,7 +8394,7 @@ Index: pam.debian/configure
LDFLAGS="$save_LDFLAGS"
else
archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
-@@ -10505,7 +9830,7 @@
+@@ -10435,7 +9831,7 @@
link_all_deplibs=yes
;;
@@ -7509,7 +8403,7 @@ Index: pam.debian/configure
if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
else
-@@ -10748,7 +10073,7 @@
+@@ -10678,7 +10074,7 @@
fi
fi
@@ -7518,7 +8412,7 @@ Index: pam.debian/configure
$as_echo "$ld_shlibs" >&6; }
test "$ld_shlibs" = no && can_build_shared=no
-@@ -10785,16 +10110,16 @@
+@@ -10715,16 +10111,16 @@
# Test whether the compiler implicitly links with -lc since on some
# systems, -lgcc has to come before -lc. If gcc already passes -lc
# to ld, don't add -lc before -lgcc.
@@ -7539,7 +8433,7 @@ Index: pam.debian/configure
soname=conftest
lib=conftest
libobjs=conftest.$ac_objext
-@@ -10808,11 +10133,11 @@
+@@ -10738,11 +10134,11 @@
libname=conftest
lt_save_allow_undefined_flag=$allow_undefined_flag
allow_undefined_flag=
@@ -7554,7 +8448,7 @@ Index: pam.debian/configure
then
archive_cmds_need_lc=no
else
-@@ -10823,7 +10148,7 @@
+@@ -10753,7 +10149,7 @@
cat conftest.err 1>&5
fi
$RM conftest*
@@ -7563,7 +8457,7 @@ Index: pam.debian/configure
$as_echo "$archive_cmds_need_lc" >&6; }
;;
esac
-@@ -10987,7 +10312,7 @@
+@@ -10917,7 +10313,7 @@
@@ -7572,7 +8466,7 @@ Index: pam.debian/configure
$as_echo_n "checking dynamic linker characteristics... " >&6; }
if test "$GCC" = yes; then
-@@ -11395,7 +10720,7 @@
+@@ -11325,7 +10721,7 @@
;;
# This must be Linux ELF.
@@ -7581,7 +8475,7 @@ Index: pam.debian/configure
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -11409,11 +10734,7 @@
+@@ -11339,11 +10735,7 @@
save_libdir=$libdir
eval "libdir=/foo; wl=\"$lt_prog_compiler_wl\"; \
LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec\""
@@ -7594,7 +8488,7 @@ Index: pam.debian/configure
/* end confdefs.h. */
int
-@@ -11424,41 +10745,13 @@
+@@ -11354,41 +10746,13 @@
return 0;
}
_ACEOF
@@ -7640,7 +8534,7 @@ Index: pam.debian/configure
LDFLAGS=$save_LDFLAGS
libdir=$save_libdir
-@@ -11482,6 +10775,18 @@
+@@ -11412,6 +10776,18 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -7659,7 +8553,7 @@ Index: pam.debian/configure
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -11670,7 +10975,7 @@
+@@ -11600,7 +10976,7 @@
dynamic_linker=no
;;
esac
@@ -7668,7 +8562,7 @@ Index: pam.debian/configure
$as_echo "$dynamic_linker" >&6; }
test "$dynamic_linker" = no && can_build_shared=no
-@@ -11772,7 +11077,7 @@
+@@ -11702,7 +11078,7 @@
@@ -7677,7 +8571,7 @@ Index: pam.debian/configure
$as_echo_n "checking how to hardcode library paths into programs... " >&6; }
hardcode_action=
if test -n "$hardcode_libdir_flag_spec" ||
-@@ -11797,7 +11102,7 @@
+@@ -11727,7 +11103,7 @@
# directories.
hardcode_action=unsupported
fi
@@ -7686,7 +8580,7 @@ Index: pam.debian/configure
$as_echo "$hardcode_action" >&6; }
if test "$hardcode_action" = relink ||
-@@ -11842,18 +11147,14 @@
+@@ -11772,18 +11148,14 @@
darwin*)
# if libdl is installed we need to link against it
@@ -7708,7 +8602,7 @@ Index: pam.debian/configure
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -11871,43 +11172,18 @@
+@@ -11801,43 +11173,18 @@
return 0;
}
_ACEOF
@@ -7758,31 +8652,21 @@ Index: pam.debian/configure
lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
else
-@@ -11920,33 +11196,19 @@
+@@ -11850,106 +11197,18 @@
;;
*)
- { $as_echo "$as_me:$LINENO: checking for shl_load" >&5
-$as_echo_n "checking for shl_load... " >&6; }
-if test "${ac_cv_func_shl_load+set}" = set; then
-+ ac_fn_c_check_func "$LINENO" "shl_load" "ac_cv_func_shl_load"
-+if test "x$ac_cv_func_shl_load" = x""yes; then :
-+ lt_cv_dlopen="shl_load"
-+else
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shl_load in -ldld" >&5
-+$as_echo_n "checking for shl_load in -ldld... " >&6; }
-+if test "${ac_cv_lib_dld_shl_load+set}" = set; then :
- $as_echo_n "(cached) " >&6
- else
+- $as_echo_n "(cached) " >&6
+-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-+ ac_check_lib_save_LIBS=$LIBS
-+LIBS="-ldld $LIBS"
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
+-/* end confdefs.h. */
-/* Define shl_load to an innocuous variant, in case <limits.h> declares shl_load.
- For example, HP-UX 11i <limits.h> declares gettimeofday. */
-#define shl_load innocuous_shl_load
@@ -7799,13 +8683,14 @@ Index: pam.debian/configure
-#endif
-
-#undef shl_load
-
- /* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
-@@ -11955,13 +11217,6 @@
- extern "C"
- #endif
- char shl_load ();
+-
+-/* Override any GCC internal prototype to avoid an error.
+- Use char because int might match the return type of a GCC
+- builtin and then its argument prototype would still apply. */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-char shl_load ();
-/* The GNU C library defines this for functions which it implements
- to always fail with ENOSYS. Some functions are actually named
- something starting with __ and the normal name is an alias. */
@@ -7813,13 +8698,14 @@ Index: pam.debian/configure
-choke me
-#endif
-
- int
- main ()
- {
-@@ -11970,56 +11225,32 @@
- return 0;
- }
- _ACEOF
+-int
+-main ()
+-{
+-return shl_load ();
+- ;
+- return 0;
+-}
+-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
@@ -7842,68 +8728,43 @@ Index: pam.debian/configure
- $as_test_x conftest$ac_exeext
- }; then
- ac_cv_func_shl_load=yes
-+if ac_fn_c_try_link "$LINENO"; then :
-+ ac_cv_lib_dld_shl_load=yes
- else
+-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_func_shl_load=no
-+ ac_cv_lib_dld_shl_load=no
- fi
+-fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
-+rm -f core conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
- fi
+-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5
-$as_echo "$ac_cv_func_shl_load" >&6; }
-if test "x$ac_cv_func_shl_load" = x""yes; then
-- lt_cv_dlopen="shl_load"
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_shl_load" >&5
-+$as_echo "$ac_cv_lib_dld_shl_load" >&6; }
-+if test "x$ac_cv_lib_dld_shl_load" = x""yes; then :
-+ lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"
++ ac_fn_c_check_func "$LINENO" "shl_load" "ac_cv_func_shl_load"
++if test "x$ac_cv_func_shl_load" = x""yes; then :
+ lt_cv_dlopen="shl_load"
else
- { $as_echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5
--$as_echo_n "checking for shl_load in -ldld... " >&6; }
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shl_load in -ldld" >&5
+ $as_echo_n "checking for shl_load in -ldld... " >&6; }
-if test "${ac_cv_lib_dld_shl_load+set}" = set; then
-+ ac_fn_c_check_func "$LINENO" "dlopen" "ac_cv_func_dlopen"
-+if test "x$ac_cv_func_dlopen" = x""yes; then :
-+ lt_cv_dlopen="dlopen"
-+else
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
-+$as_echo_n "checking for dlopen in -ldl... " >&6; }
-+if test "${ac_cv_lib_dl_dlopen+set}" = set; then :
++if test "${ac_cv_lib_dld_shl_load+set}" = set; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
--LIBS="-ldld $LIBS"
+ LIBS="-ldld $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-+LIBS="-ldl $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -12028,81 +11259,38 @@
- #ifdef __cplusplus
- extern "C"
- #endif
--char shl_load ();
-+char dlopen ();
- int
- main ()
- {
--return shl_load ();
-+return dlopen ();
- ;
+@@ -11967,145 +11226,32 @@
return 0;
}
_ACEOF
@@ -7928,15 +8789,14 @@ Index: pam.debian/configure
- test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
- }; then
-- ac_cv_lib_dld_shl_load=yes
+if ac_fn_c_try_link "$LINENO"; then :
-+ ac_cv_lib_dl_dlopen=yes
+ ac_cv_lib_dld_shl_load=yes
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_lib_dld_shl_load=no
-+ ac_cv_lib_dl_dlopen=no
++ ac_cv_lib_dld_shl_load=no
fi
-
-rm -rf conftest.dSYM
@@ -7947,31 +8807,23 @@ Index: pam.debian/configure
LIBS=$ac_check_lib_save_LIBS
fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5
--$as_echo "$ac_cv_lib_dld_shl_load" >&6; }
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_shl_load" >&5
+ $as_echo "$ac_cv_lib_dld_shl_load" >&6; }
-if test "x$ac_cv_lib_dld_shl_load" = x""yes; then
-- lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
-+$as_echo "$ac_cv_lib_dl_dlopen" >&6; }
-+if test "x$ac_cv_lib_dl_dlopen" = x""yes; then :
-+ lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
++if test "x$ac_cv_lib_dld_shl_load" = x""yes; then :
+ lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"
else
- { $as_echo "$as_me:$LINENO: checking for dlopen" >&5
-$as_echo_n "checking for dlopen... " >&6; }
-if test "${ac_cv_func_dlopen+set}" = set; then
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -lsvld" >&5
-+$as_echo_n "checking for dlopen in -lsvld... " >&6; }
-+if test "${ac_cv_lib_svld_dlopen+set}" = set; then :
- $as_echo_n "(cached) " >&6
- else
+- $as_echo_n "(cached) " >&6
+-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-+ ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lsvld $LIBS"
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
+-/* end confdefs.h. */
-/* Define dlopen to an innocuous variant, in case <limits.h> declares dlopen.
- For example, HP-UX 11i <limits.h> declares gettimeofday. */
-#define dlopen innocuous_dlopen
@@ -7988,13 +8840,14 @@ Index: pam.debian/configure
-#endif
-
-#undef dlopen
-
- /* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
-@@ -12111,13 +11299,6 @@
- extern "C"
- #endif
- char dlopen ();
+-
+-/* Override any GCC internal prototype to avoid an error.
+- Use char because int might match the return type of a GCC
+- builtin and then its argument prototype would still apply. */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-char dlopen ();
-/* The GNU C library defines this for functions which it implements
- to always fail with ENOSYS. Some functions are actually named
- something starting with __ and the normal name is an alias. */
@@ -8002,13 +8855,14 @@ Index: pam.debian/configure
-choke me
-#endif
-
- int
- main ()
- {
-@@ -12126,56 +11307,28 @@
- return 0;
- }
- _ACEOF
+-int
+-main ()
+-{
+-return dlopen ();
+- ;
+- return 0;
+-}
+-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
@@ -8031,64 +8885,43 @@ Index: pam.debian/configure
- $as_test_x conftest$ac_exeext
- }; then
- ac_cv_func_dlopen=yes
-+if ac_fn_c_try_link "$LINENO"; then :
-+ ac_cv_lib_svld_dlopen=yes
- else
+-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_func_dlopen=no
-+ ac_cv_lib_svld_dlopen=no
- fi
+-fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
-+rm -f core conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
- fi
+-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5
-$as_echo "$ac_cv_func_dlopen" >&6; }
-if test "x$ac_cv_func_dlopen" = x""yes; then
-- lt_cv_dlopen="dlopen"
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_svld_dlopen" >&5
-+$as_echo "$ac_cv_lib_svld_dlopen" >&6; }
-+if test "x$ac_cv_lib_svld_dlopen" = x""yes; then :
-+ lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"
++ ac_fn_c_check_func "$LINENO" "dlopen" "ac_cv_func_dlopen"
++if test "x$ac_cv_func_dlopen" = x""yes; then :
+ lt_cv_dlopen="dlopen"
else
- { $as_echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
--$as_echo_n "checking for dlopen in -ldl... " >&6; }
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
+ $as_echo_n "checking for dlopen in -ldl... " >&6; }
-if test "${ac_cv_lib_dl_dlopen+set}" = set; then
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dld_link in -ldld" >&5
-+$as_echo_n "checking for dld_link in -ldld... " >&6; }
-+if test "${ac_cv_lib_dld_dld_link+set}" = set; then :
++if test "${ac_cv_lib_dl_dlopen+set}" = set; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
--LIBS="-ldl $LIBS"
+ LIBS="-ldl $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-+LIBS="-ldld $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -12184,188 +11337,27 @@
- #ifdef __cplusplus
- extern "C"
- #endif
--char dlopen ();
-+char dld_link ();
- int
- main ()
- {
--return dlopen ();
-+return dld_link ();
- ;
+@@ -12123,57 +11269,28 @@
return 0;
}
_ACEOF
@@ -8113,55 +8946,52 @@ Index: pam.debian/configure
- test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
- }; then
-- ac_cv_lib_dl_dlopen=yes
+if ac_fn_c_try_link "$LINENO"; then :
-+ ac_cv_lib_dld_dld_link=yes
+ ac_cv_lib_dl_dlopen=yes
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_lib_dl_dlopen=no
--fi
++ ac_cv_lib_dl_dlopen=no
+ fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
--LIBS=$ac_check_lib_save_LIBS
--fi
++rm -f core conftest.err conftest.$ac_objext \
++ conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
--$as_echo "$ac_cv_lib_dl_dlopen" >&6; }
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
+ $as_echo "$ac_cv_lib_dl_dlopen" >&6; }
-if test "x$ac_cv_lib_dl_dlopen" = x""yes; then
-- lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
--else
++if test "x$ac_cv_lib_dl_dlopen" = x""yes; then :
+ lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
+ else
- { $as_echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5
--$as_echo_n "checking for dlopen in -lsvld... " >&6; }
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -lsvld" >&5
+ $as_echo_n "checking for dlopen in -lsvld... " >&6; }
-if test "${ac_cv_lib_svld_dlopen+set}" = set; then
-- $as_echo_n "(cached) " >&6
--else
-- ac_check_lib_save_LIBS=$LIBS
--LIBS="-lsvld $LIBS"
++if test "${ac_cv_lib_svld_dlopen+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lsvld $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
--
--/* Override any GCC internal prototype to avoid an error.
-- Use char because int might match the return type of a GCC
-- builtin and then its argument prototype would still apply. */
--#ifdef __cplusplus
--extern "C"
--#endif
--char dlopen ();
--int
--main ()
--{
--return dlopen ();
-- ;
-- return 0;
--}
--_ACEOF
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
+
+ /* Override any GCC internal prototype to avoid an error.
+@@ -12191,57 +11308,28 @@
+ return 0;
+ }
+ _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
@@ -8183,53 +9013,52 @@ Index: pam.debian/configure
- test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
- }; then
-- ac_cv_lib_svld_dlopen=yes
--else
++if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_lib_svld_dlopen=yes
+ else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_lib_svld_dlopen=no
--fi
++ ac_cv_lib_svld_dlopen=no
+ fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
--LIBS=$ac_check_lib_save_LIBS
--fi
++rm -f core conftest.err conftest.$ac_objext \
++ conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5
--$as_echo "$ac_cv_lib_svld_dlopen" >&6; }
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_svld_dlopen" >&5
+ $as_echo "$ac_cv_lib_svld_dlopen" >&6; }
-if test "x$ac_cv_lib_svld_dlopen" = x""yes; then
-- lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"
--else
++if test "x$ac_cv_lib_svld_dlopen" = x""yes; then :
+ lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"
+ else
- { $as_echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5
--$as_echo_n "checking for dld_link in -ldld... " >&6; }
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dld_link in -ldld" >&5
+ $as_echo_n "checking for dld_link in -ldld... " >&6; }
-if test "${ac_cv_lib_dld_dld_link+set}" = set; then
-- $as_echo_n "(cached) " >&6
--else
-- ac_check_lib_save_LIBS=$LIBS
--LIBS="-ldld $LIBS"
++if test "${ac_cv_lib_dld_dld_link+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ldld $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
--
--/* Override any GCC internal prototype to avoid an error.
-- Use char because int might match the return type of a GCC
-- builtin and then its argument prototype would still apply. */
--#ifdef __cplusplus
--extern "C"
--#endif
--char dld_link ();
--int
--main ()
--{
--return dld_link ();
-- ;
-- return 0;
--}
--_ACEOF
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
+
+ /* Override any GCC internal prototype to avoid an error.
+@@ -12259,43 +11347,18 @@
+ return 0;
+ }
+ _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
@@ -8251,8 +9080,9 @@ Index: pam.debian/configure
- test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
- }; then
-- ac_cv_lib_dld_dld_link=yes
--else
++if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_lib_dld_dld_link=yes
+ else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
@@ -8275,7 +9105,7 @@ Index: pam.debian/configure
lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"
fi
-@@ -12404,9 +11396,9 @@
+@@ -12334,9 +11397,9 @@
save_LIBS="$LIBS"
LIBS="$lt_cv_dlopen_libs $LIBS"
@@ -8287,16 +9117,16 @@ Index: pam.debian/configure
$as_echo_n "(cached) " >&6
else
if test "$cross_compiling" = yes; then :
-@@ -12415,7 +11407,7 @@
+@@ -12345,7 +11408,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
--#line 12418 "configure"
-+#line 11410 "configure"
+-#line 12348 "configure"
++#line 11411 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -12474,11 +11466,11 @@
+@@ -12404,11 +11467,11 @@
return status;
}
_LT_EOF
@@ -8311,7 +9141,7 @@ Index: pam.debian/configure
(./conftest; exit; ) >&5 2>/dev/null
lt_status=$?
case x$lt_status in
-@@ -12495,14 +11487,14 @@
+@@ -12425,14 +11488,14 @@
fi
@@ -8329,16 +9159,16 @@ Index: pam.debian/configure
$as_echo_n "(cached) " >&6
else
if test "$cross_compiling" = yes; then :
-@@ -12511,7 +11503,7 @@
+@@ -12441,7 +11504,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
--#line 12514 "configure"
-+#line 11506 "configure"
+-#line 12444 "configure"
++#line 11507 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -12570,11 +11562,11 @@
+@@ -12500,11 +11563,11 @@
return status;
}
_LT_EOF
@@ -8353,7 +9183,7 @@ Index: pam.debian/configure
(./conftest; exit; ) >&5 2>/dev/null
lt_status=$?
case x$lt_status in
-@@ -12591,7 +11583,7 @@
+@@ -12521,7 +11584,7 @@
fi
@@ -8362,7 +9192,7 @@ Index: pam.debian/configure
$as_echo "$lt_cv_dlopen_self_static" >&6; }
fi
-@@ -12630,12 +11622,12 @@
+@@ -12560,12 +11623,12 @@
striplib=
old_striplib=
@@ -8377,7 +9207,7 @@ Index: pam.debian/configure
$as_echo "yes" >&6; }
else
# FIXME - insert some real tests, host_os isn't really good enough
-@@ -12644,15 +11636,15 @@
+@@ -12574,15 +11637,15 @@
if test -n "$STRIP" ; then
striplib="$STRIP -x"
old_striplib="$STRIP -S"
@@ -8396,7 +9226,7 @@ Index: pam.debian/configure
$as_echo "no" >&6; }
;;
esac
-@@ -12670,12 +11662,12 @@
+@@ -12600,12 +11663,12 @@
# Report which library types will actually be built
@@ -8412,7 +9242,7 @@ Index: pam.debian/configure
$as_echo_n "checking whether to build shared libraries... " >&6; }
test "$can_build_shared" = "no" && enable_shared=no
-@@ -12696,14 +11688,14 @@
+@@ -12626,14 +11689,14 @@
fi
;;
esac
@@ -8430,7 +9260,7 @@ Index: pam.debian/configure
$as_echo "$enable_static" >&6; }
-@@ -12739,22 +11731,18 @@
+@@ -12669,22 +11732,18 @@
if test "x$CC" != xcc; then
@@ -8457,7 +9287,7 @@ Index: pam.debian/configure
/* end confdefs.h. */
int
-@@ -12770,63 +11758,63 @@
+@@ -12700,63 +11759,63 @@
# existing .o file with -o, though they will create one.
ac_try='$CC -c conftest.$ac_ext -o conftest2.$ac_objext >&5'
rm -f conftest2.*
@@ -8546,7 +9376,7 @@ Index: pam.debian/configure
then
# cc works too.
:
-@@ -12843,15 +11831,13 @@
+@@ -12773,23 +11832,22 @@
fi
if eval test \$ac_cv_prog_cc_${ac_cc}_c_o = yes; then
@@ -8565,7 +9395,18 @@ Index: pam.debian/configure
fi
-@@ -12871,9 +11857,9 @@
+ # FIXME: we rely on the cache variable name because
+ # there is no other way.
+ set dummy $CC
+-ac_cc=`echo $2 | sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'`
+-if eval "test \"`echo '$ac_cv_prog_cc_'${ac_cc}_c_o`\" != yes"; then
++am_cc=`echo $2 | sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'`
++eval am_t=\$ac_cv_prog_cc_${am_cc}_c_o
++if test "$am_t" != yes; then
+ # Losing compiler, so override with the script.
+ # FIXME: It is wrong to rewrite CC.
+ # But if we don't then we get into trouble of one sort or another.
+@@ -12800,9 +11858,9 @@
@@ -8577,7 +9418,7 @@ Index: pam.debian/configure
$as_echo_n "(cached) " >&6
else
cat > conftest.c <<EOF
-@@ -12882,11 +11868,11 @@
+@@ -12811,11 +11869,11 @@
if { ac_try='${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS
-o conftest.o conftest.c
-Wl,--as-needed 1>&5'
@@ -8592,7 +9433,7 @@ Index: pam.debian/configure
then
pam_cv_ld_as_needed=yes
LDFLAGS="$LDFLAGS -Wl,--as-needed"
-@@ -12895,15 +11881,15 @@
+@@ -12824,15 +11882,15 @@
fi
rm -f conftest*
fi
@@ -8611,7 +9452,7 @@ Index: pam.debian/configure
$as_echo_n "(cached) " >&6
else
cat > conftest.c <<EOF
-@@ -12912,11 +11898,11 @@
+@@ -12841,11 +11899,11 @@
if { ac_try='${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS
-o conftest.o conftest.c
-Wl,-O1 1>&5'
@@ -8626,7 +9467,7 @@ Index: pam.debian/configure
then
pam_cv_ld_O1=yes
LDFLAGS="$LDFLAGS -Wl,-O1"
-@@ -12925,22 +11911,22 @@
+@@ -12854,7 +11912,7 @@
fi
rm -f conftest*
fi
@@ -8635,7 +9476,50 @@ Index: pam.debian/configure
$as_echo "$pam_cv_ld_O1" >&6; }
+@@ -12865,9 +11923,9 @@
+ do
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_CC_FOR_BUILD+set}" = set; then
++if test "${ac_cv_prog_CC_FOR_BUILD+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ if test -n "$CC_FOR_BUILD"; then
+@@ -12878,24 +11936,24 @@
+ do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+- for ac_exec_ext in '' $ac_executable_extensions; do
++ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_CC_FOR_BUILD="$ac_prog"
+- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+ done
+-done
++ done
+ IFS=$as_save_IFS
+
+ fi
+ fi
+ CC_FOR_BUILD=$ac_cv_prog_CC_FOR_BUILD
+ if test -n "$CC_FOR_BUILD"; then
+- { $as_echo "$as_me:$LINENO: result: $CC_FOR_BUILD" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC_FOR_BUILD" >&5
+ $as_echo "$CC_FOR_BUILD" >&6; }
+ else
+- { $as_echo "$as_me:$LINENO: result: no" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ fi
+@@ -12908,15 +11966,15 @@
+ fi
# Check whether --enable-largefile was given.
-if test "${enable_largefile+set}" = set; then
@@ -8653,7 +9537,7 @@ Index: pam.debian/configure
$as_echo_n "(cached) " >&6
else
ac_cv_sys_largefile_CC=no
-@@ -12949,11 +11935,7 @@
+@@ -12925,11 +11983,7 @@
while :; do
# IRIX 6.2 and later do not support large files by default,
# so use the C compiler's -n32 option if that helps.
@@ -8666,7 +9550,7 @@ Index: pam.debian/configure
/* end confdefs.h. */
#include <sys/types.h>
/* Check that off_t can represent 2**63 - 1 correctly.
-@@ -12972,60 +11954,14 @@
+@@ -12948,60 +12002,14 @@
return 0;
}
_ACEOF
@@ -8729,7 +9613,7 @@ Index: pam.debian/configure
rm -f core conftest.err conftest.$ac_objext
break
done
-@@ -13033,23 +11969,19 @@
+@@ -13009,23 +12017,19 @@
rm -f conftest.$ac_ext
fi
fi
@@ -8757,7 +9641,7 @@ Index: pam.debian/configure
/* end confdefs.h. */
#include <sys/types.h>
/* Check that off_t can represent 2**63 - 1 correctly.
-@@ -13068,38 +12000,11 @@
+@@ -13044,38 +12048,11 @@
return 0;
}
_ACEOF
@@ -8798,7 +9682,7 @@ Index: pam.debian/configure
/* end confdefs.h. */
#define _FILE_OFFSET_BITS 64
#include <sys/types.h>
-@@ -13119,38 +12024,15 @@
+@@ -13095,38 +12072,15 @@
return 0;
}
_ACEOF
@@ -8839,7 +9723,7 @@ Index: pam.debian/configure
$as_echo "$ac_cv_sys_file_offset_bits" >&6; }
case $ac_cv_sys_file_offset_bits in #(
no | unknown) ;;
-@@ -13162,17 +12044,13 @@
+@@ -13138,17 +12092,13 @@
esac
rm -rf conftest*
if test $ac_cv_sys_file_offset_bits = unknown; then
@@ -8860,7 +9744,7 @@ Index: pam.debian/configure
/* end confdefs.h. */
#include <sys/types.h>
/* Check that off_t can represent 2**63 - 1 correctly.
-@@ -13191,38 +12069,11 @@
+@@ -13167,38 +12117,11 @@
return 0;
}
_ACEOF
@@ -8901,7 +9785,7 @@ Index: pam.debian/configure
/* end confdefs.h. */
#define _LARGE_FILES 1
#include <sys/types.h>
-@@ -13242,38 +12093,15 @@
+@@ -13218,38 +12141,15 @@
return 0;
}
_ACEOF
@@ -8942,7 +9826,7 @@ Index: pam.debian/configure
$as_echo "$ac_cv_sys_large_files" >&6; }
case $ac_cv_sys_large_files in #(
no | unknown) ;;
-@@ -13342,17 +12170,13 @@
+@@ -13318,17 +12218,13 @@
fi
@@ -8963,7 +9847,7 @@ Index: pam.debian/configure
/* end confdefs.h. */
#include <stdlib.h>
-@@ -13374,54 +12198,29 @@
+@@ -13350,54 +12246,29 @@
return 0;
}
_ACEOF
@@ -9025,7 +9909,7 @@ Index: pam.debian/configure
$as_echo_n "(cached) " >&6
else
cat > conftest.s <<EOF
-@@ -13436,11 +12235,11 @@
+@@ -13412,11 +12283,11 @@
fi
rm -f conftest*
fi
@@ -9040,7 +9924,7 @@ Index: pam.debian/configure
$as_echo_n "(cached) " >&6
else
if test $libc_cv_asm_symver_directive = yes; then
-@@ -13465,11 +12264,11 @@
+@@ -13441,11 +12312,11 @@
-nostartfiles -nostdlib
-Wl,--version-script,conftest.map
1>&5'
@@ -9055,7 +9939,7 @@ Index: pam.debian/configure
then
libc_cv_ld_version_script_option=yes
else
-@@ -13483,7 +12282,7 @@
+@@ -13459,7 +12330,7 @@
fi
rm -f conftest*
fi
@@ -9064,7 +9948,7 @@ Index: pam.debian/configure
$as_echo "$libc_cv_ld_version_script_option" >&6; }
if test "$libc_cv_ld_version_script_option" = "yes"; then
HAVE_VERSIONING_TRUE=
-@@ -13495,16 +12294,16 @@
+@@ -13471,16 +12342,16 @@
# Check whether --enable-pie was given.
@@ -9084,7 +9968,7 @@ Index: pam.debian/configure
$as_echo_n "(cached) " >&6
else
cat > conftest.c <<EOF
-@@ -13514,11 +12313,11 @@
+@@ -13490,11 +12361,11 @@
if test "$USE_PIE" = "yes" -a "$CC" != "icc" &&
{ ac_try='${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS -pie -fpie
-o conftest conftest.c 1>&5'
@@ -9099,7 +9983,7 @@ Index: pam.debian/configure
then
libc_cv_fpie=yes
PIE_CFLAGS="-fpie"
-@@ -13530,7 +12329,7 @@
+@@ -13506,7 +12377,7 @@
fi
rm -f conftest*
fi
@@ -9108,7 +9992,7 @@ Index: pam.debian/configure
$as_echo "$libc_cv_fpie" >&6; }
-@@ -13539,7 +12338,7 @@
+@@ -13515,7 +12386,7 @@
# Check whether --enable-prelude was given.
@@ -9117,7 +10001,7 @@ Index: pam.debian/configure
enableval=$enable_prelude; WITH_PRELUDE=$enableval
else
WITH_PRELUDE=yes
-@@ -13548,7 +12347,7 @@
+@@ -13524,7 +12395,7 @@
if test "$WITH_PRELUDE" == "yes" ; then
# Check whether --with-libprelude-prefix was given.
@@ -9126,7 +10010,7 @@ Index: pam.debian/configure
withval=$with_libprelude_prefix; libprelude_config_prefix="$withval"
else
libprelude_config_prefix=""
-@@ -13563,9 +12362,9 @@
+@@ -13539,9 +12410,9 @@
# Extract the first word of "libprelude-config", so it can be a program name with args.
set dummy libprelude-config; ac_word=$2
@@ -9138,7 +10022,7 @@ Index: pam.debian/configure
$as_echo_n "(cached) " >&6
else
case $LIBPRELUDE_CONFIG in
-@@ -13578,14 +12377,14 @@
+@@ -13554,14 +12425,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -9156,7 +10040,7 @@ Index: pam.debian/configure
IFS=$as_save_IFS
test -z "$ac_cv_path_LIBPRELUDE_CONFIG" && ac_cv_path_LIBPRELUDE_CONFIG="no"
-@@ -13594,16 +12393,16 @@
+@@ -13570,16 +12441,16 @@
fi
LIBPRELUDE_CONFIG=$ac_cv_path_LIBPRELUDE_CONFIG
if test -n "$LIBPRELUDE_CONFIG"; then
@@ -9176,7 +10060,7 @@ Index: pam.debian/configure
$as_echo_n "checking for libprelude - version >= $min_libprelude_version... " >&6; }
no_libprelude=""
if test "$LIBPRELUDE_CONFIG" = "no" ; then
-@@ -13625,14 +12424,10 @@
+@@ -13601,14 +12472,10 @@
LDFLAGS="$LDFLAGS $LIBPRELUDE_LDFLAGS"
LIBS="$LIBS $LIBPRELUDE_LIBS"
rm -f conf.libpreludetest
@@ -9193,7 +10077,7 @@ Index: pam.debian/configure
/* end confdefs.h. */
#include <stdio.h>
-@@ -13690,56 +12485,29 @@
+@@ -13666,56 +12533,29 @@
}
_ACEOF
@@ -9257,7 +10141,7 @@ Index: pam.debian/configure
$as_echo "no" >&6; }
fi
if test "$LIBPRELUDE_CONFIG" = "no" ; then
-@@ -13755,11 +12523,7 @@
+@@ -13731,11 +12571,7 @@
CFLAGS="$CFLAGS $LIBPRELUDE_CFLAGS"
LDFLAGS="$LDFLAGS $LIBPRELUDE_LDFLAGS"
LIBS="$LIBS $LIBPRELUDE_LIBS"
@@ -9270,7 +10154,7 @@ Index: pam.debian/configure
/* end confdefs.h. */
#include <stdio.h>
-@@ -13775,27 +12539,7 @@
+@@ -13751,27 +12587,7 @@
return 0;
}
_ACEOF
@@ -9299,7 +10183,7 @@ Index: pam.debian/configure
echo "*** The test program compiled, but did not run. This usually means"
echo "*** that the run-time linker is not finding LIBPRELUDE or finding the wrong"
echo "*** version of LIBPRELUDE. If it is not finding LIBPRELUDE, you'll need to set your"
-@@ -13807,18 +12551,13 @@
+@@ -13783,18 +12599,13 @@
echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"
echo "***"
else
@@ -9321,7 +10205,7 @@ Index: pam.debian/configure
CFLAGS="$ac_save_CFLAGS"
LDFLAGS="$ac_save_LDFLAGS"
LIBS="$ac_save_LIBS"
-@@ -13843,21 +12582,19 @@
+@@ -13819,21 +12630,19 @@
fi
# Check whether --enable-debug was given.
@@ -9346,7 +10230,7 @@ Index: pam.debian/configure
enableval=$enable_securedir; SECUREDIR=$enableval
else
SECUREDIR=$libdir/security
-@@ -13866,7 +12603,7 @@
+@@ -13842,7 +12651,7 @@
# Check whether --enable-isadir was given.
@@ -9355,7 +10239,7 @@ Index: pam.debian/configure
enableval=$enable_isadir; ISA=$enableval
else
ISA=../../`basename $libdir`/security
-@@ -13878,11 +12615,11 @@
+@@ -13854,11 +12663,11 @@
#define _PAM_ISA "$ISA"
_ACEOF
@@ -9369,7 +10253,7 @@ Index: pam.debian/configure
enableval=$enable_sconfigdir; SCONFIGDIR=$enableval
else
SCONFIGDIR=$sysconfdir/security
-@@ -13891,35 +12628,31 @@
+@@ -13867,35 +12676,31 @@
# Check whether --enable-pamlocking was given.
@@ -9410,30 +10294,19 @@ Index: pam.debian/configure
enableval=$enable_lckpwdf; WITH_LCKPWDF=$enableval
else
WITH_LCKPWDF=yes
-@@ -13927,175 +12660,35 @@
+@@ -13903,152 +12708,16 @@
if test "$WITH_LCKPWDF" == "yes" ; then
-cat >>confdefs.h <<\_ACEOF
-#define USE_LCKPWDF 1
+-_ACEOF
+$as_echo "#define USE_LCKPWDF 1" >>confdefs.h
-+
-+fi
-+
-+for ac_header in paths.h
-+do :
-+ ac_fn_c_check_header_mongrel "$LINENO" "paths.h" "ac_cv_header_paths_h" "$ac_includes_default"
-+if test "x$ac_cv_header_paths_h" = x""yes; then :
-+ cat >>confdefs.h <<_ACEOF
-+#define HAVE_PATHS_H 1
- _ACEOF
fi
-+done
-+
-
--for ac_header in paths.h
+-
+ for ac_header in paths.h
-do
-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
@@ -9570,21 +10443,22 @@ Index: pam.debian/configure
-as_val=`eval 'as_val=${'$as_ac_Header'}
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
-- cat >>confdefs.h <<_ACEOF
++do :
++ ac_fn_c_check_header_mongrel "$LINENO" "paths.h" "ac_cv_header_paths_h" "$ac_includes_default"
++if test "x$ac_cv_header_paths_h" = x""yes; then :
+ cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
--_ACEOF
--
--fi
--
--done
--
--
--# Check whether --with-mailspool was given.
++#define HAVE_PATHS_H 1
+ _ACEOF
+
+ fi
+@@ -14057,21 +12726,17 @@
+
+
+ # Check whether --with-mailspool was given.
-if test "${with_mailspool+set}" = set; then
-- withval=$with_mailspool; with_mailspool=${withval}
-+# Check whether --with-mailspool was given.
+if test "${with_mailspool+set}" = set; then :
-+ withval=$with_mailspool; with_mailspool=${withval}
+ withval=$with_mailspool; with_mailspool=${withval}
fi
if test x$with_mailspool != x ; then
@@ -9603,7 +10477,7 @@ Index: pam.debian/configure
/* end confdefs.h. */
#include <paths.h>
-@@ -14107,42 +12700,15 @@
+@@ -14083,42 +12748,15 @@
#endif
}
_ACEOF
@@ -9650,7 +10524,7 @@ Index: pam.debian/configure
fi
cat >>confdefs.h <<_ACEOF
-@@ -14152,16 +12718,16 @@
+@@ -14128,16 +12766,16 @@
# Check whether --with-xauth was given.
@@ -9670,7 +10544,7 @@ Index: pam.debian/configure
$as_echo_n "(cached) " >&6
else
case $pam_xauth_path in
-@@ -14174,14 +12740,14 @@
+@@ -14150,14 +12788,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -9688,7 +10562,7 @@ Index: pam.debian/configure
IFS=$as_save_IFS
;;
-@@ -14189,10 +12755,10 @@
+@@ -14165,10 +12803,10 @@
fi
pam_xauth_path=$ac_cv_path_pam_xauth_path
if test -n "$pam_xauth_path"; then
@@ -9701,7 +10575,7 @@ Index: pam.debian/configure
$as_echo "no" >&6; }
fi
-@@ -14210,18 +12776,14 @@
+@@ -14186,18 +12824,14 @@
fi
@@ -9723,7 +10597,7 @@ Index: pam.debian/configure
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -14239,43 +12801,18 @@
+@@ -14215,43 +12849,18 @@
return 0;
}
_ACEOF
@@ -9773,7 +10647,7 @@ Index: pam.debian/configure
LIBDL="-ldl"
else
LIBDL=""
-@@ -14285,166 +12822,28 @@
+@@ -14261,166 +12870,28 @@
# Check for cracklib
# Check whether --enable-cracklib was given.
@@ -9949,7 +10823,7 @@ Index: pam.debian/configure
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -14462,43 +12861,18 @@
+@@ -14438,43 +12909,18 @@
return 0;
}
_ACEOF
@@ -9999,7 +10873,7 @@ Index: pam.debian/configure
LIBCRACK="-lcrack"
else
LIBCRACK=""
-@@ -14522,153 +12896,23 @@
+@@ -14498,153 +12944,23 @@
# Check whether --enable-audit was given.
@@ -10159,7 +11033,7 @@ Index: pam.debian/configure
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -14686,145 +12930,26 @@
+@@ -14662,145 +12978,26 @@
return 0;
}
_ACEOF
@@ -10314,7 +11188,7 @@ Index: pam.debian/configure
HAVE_AUDIT_TTY_STATUS=yes
else
HAVE_AUDIT_TTY_STATUS=""
-@@ -14836,16 +12961,12 @@
+@@ -14812,16 +13009,12 @@
if test ! -z "$LIBAUDIT" -a "$ac_cv_header_libaudit_h" != "no" ; then
@@ -10333,7 +11207,7 @@ Index: pam.debian/configure
fi
else
-@@ -14861,145 +12982,12 @@
+@@ -14837,172 +13030,34 @@
fi
@@ -10364,7 +11238,14 @@ Index: pam.debian/configure
-/* end confdefs.h. */
-$ac_includes_default
-#include <$ac_header>
--_ACEOF
++do :
++ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
++ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
++eval as_val=\$$as_ac_Header
++ if test "x$as_val" = x""yes; then :
++ cat >>confdefs.h <<_ACEOF
++#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+ _ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
@@ -10387,14 +11268,15 @@ Index: pam.debian/configure
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
--
+
- ac_header_compiler=no
--fi
--
+ fi
+
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-$as_echo "$ac_header_compiler" >&6; }
--
++done
+
-# Is the header present?
-{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
-$as_echo_n "checking $ac_header presence... " >&6; }
@@ -10476,17 +11358,23 @@ Index: pam.debian/configure
-as_val=`eval 'as_val=${'$as_ac_Header'}
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
-+do :
-+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-+ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
-+eval as_val=\$$as_ac_Header
-+ if test "x$as_val" = x""yes; then :
- cat >>confdefs.h <<_ACEOF
- #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
- _ACEOF
-@@ -15009,17 +12997,13 @@
- done
+- cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+-_ACEOF
+-
+-fi
+-
+-done
+-
+-if test "x$ac_cv_header_xcrypt_h" = "xyes"; then
+- crypt_libs="xcrypt crypt"
++if test "x$ac_cv_header_xcrypt_h" = "xyes"; then :
++ crypt_libs="xcrypt crypt"
+ else
+ crypt_libs="crypt"
+ fi
+-
BACKUP_LIBS=$LIBS
-{ $as_echo "$as_me:$LINENO: checking for library containing crypt" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing crypt" >&5
@@ -10505,7 +11393,7 @@ Index: pam.debian/configure
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -15044,155 +13028,39 @@
+@@ -15027,155 +13082,39 @@
ac_res=-l$ac_lib
LIBS="-l$ac_lib $ac_func_search_save_LIBS"
fi
@@ -10674,7 +11562,7 @@ Index: pam.debian/configure
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
_ACEOF
-@@ -15204,15 +13072,13 @@
+@@ -15187,15 +13126,13 @@
if test "$LIBCRYPT" = "-lxcrypt" -a "$ac_cv_header_xcrypt_h" = "yes" ; then
@@ -10692,7 +11580,7 @@ Index: pam.debian/configure
withval=$with_randomdev; opt_randomdev=$withval
fi
-@@ -15230,7 +13096,7 @@
+@@ -15213,7 +13150,7 @@
fi
# Check whether --enable-db was given.
@@ -10701,7 +11589,7 @@ Index: pam.debian/configure
enableval=$enable_db; WITH_DB=$enableval
else
WITH_DB=yes
-@@ -15238,25 +13104,21 @@
+@@ -15221,25 +13158,21 @@
# Check whether --with-db-uniquename was given.
@@ -10731,7 +11619,7 @@ Index: pam.debian/configure
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -15274,47 +13136,20 @@
+@@ -15257,47 +13190,20 @@
return 0;
}
_ACEOF
@@ -10787,7 +11675,7 @@ Index: pam.debian/configure
LIBDB="-ldb$with_db_uniquename"
else
LIBDB=""
-@@ -15322,18 +13157,14 @@
+@@ -15305,18 +13211,14 @@
if test -z "$LIBDB" ; then
as_ac_Lib=`$as_echo "ac_cv_lib_db$with_db_uniquename''_dbm_store$with_db_uniquename" | $as_tr_sh`
@@ -10809,7 +11697,7 @@ Index: pam.debian/configure
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -15351,47 +13182,20 @@
+@@ -15334,47 +13236,20 @@
return 0;
}
_ACEOF
@@ -10865,7 +11753,7 @@ Index: pam.debian/configure
LIBDB="-ldb$with_db_uniquename"
else
LIBDB=""
-@@ -15400,18 +13204,14 @@
+@@ -15383,18 +13258,14 @@
fi
fi
if test -z "$LIBDB" ; then
@@ -10887,7 +11775,7 @@ Index: pam.debian/configure
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -15429,189 +13229,30 @@
+@@ -15412,367 +13283,70 @@
return 0;
}
_ACEOF
@@ -10966,7 +11854,13 @@ Index: pam.debian/configure
-/* end confdefs.h. */
-$ac_includes_default
-#include <$ac_header>
--_ACEOF
++ for ac_header in ndbm.h
++do :
++ ac_fn_c_check_header_mongrel "$LINENO" "ndbm.h" "ac_cv_header_ndbm_h" "$ac_includes_default"
++if test "x$ac_cv_header_ndbm_h" = x""yes; then :
++ cat >>confdefs.h <<_ACEOF
++#define HAVE_NDBM_H 1
+ _ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
@@ -10989,14 +11883,15 @@ Index: pam.debian/configure
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
--
+
- ac_header_compiler=no
--fi
--
+ fi
+
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-$as_echo "$ac_header_compiler" >&6; }
--
++done
+
-# Is the header present?
-{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
-$as_echo_n "checking $ac_header presence... " >&6; }
@@ -11007,7 +11902,15 @@ Index: pam.debian/configure
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <$ac_header>
--_ACEOF
++ fi
++ else
++ for ac_header in db.h
++do :
++ ac_fn_c_check_header_mongrel "$LINENO" "db.h" "ac_cv_header_db_h" "$ac_includes_default"
++if test "x$ac_cv_header_db_h" = x""yes; then :
++ cat >>confdefs.h <<_ACEOF
++#define HAVE_DB_H 1
+ _ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -11029,10 +11932,10 @@ Index: pam.debian/configure
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
--
+
- ac_header_preproc=no
--fi
--
+ fi
+
-rm -f conftest.err conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-$as_echo "$ac_header_preproc" >&6; }
@@ -11073,26 +11976,30 @@ Index: pam.debian/configure
- $as_echo "$as_val"'`
- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
--
--fi
++done
+
++ fi
+ fi
-as_val=`eval 'as_val=${'$as_ac_Header'}
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
-+ for ac_header in ndbm.h
-+do :
-+ ac_fn_c_check_header_mongrel "$LINENO" "ndbm.h" "ac_cv_header_ndbm_h" "$ac_includes_default"
-+if test "x$ac_cv_header_ndbm_h" = x""yes; then :
- cat >>confdefs.h <<_ACEOF
+- cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-+#define HAVE_NDBM_H 1
- _ACEOF
+-_ACEOF
++ if test ! -z "$LIBDB"; then
++ HAVE_LIBDB_TRUE=
++ HAVE_LIBDB_FALSE='#'
++else
++ HAVE_LIBDB_TRUE='#'
++ HAVE_LIBDB_FALSE=
fi
-@@ -15620,146 +13261,12 @@
- fi
- else
+-done
-
+- fi
+- else
+
-for ac_header in db.h
-do
-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -11100,13 +12007,16 @@ Index: pam.debian/configure
- { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
-$as_echo_n "checking for $ac_header... " >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-- $as_echo_n "(cached) " >&6
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for yp_get_default_domain in -lnsl" >&5
++$as_echo_n "checking for yp_get_default_domain in -lnsl... " >&6; }
++if test "${ac_cv_lib_nsl_yp_get_default_domain+set}" = set; then :
+ $as_echo_n "(cached) " >&6
-fi
-ac_res=`eval 'as_val=${'$as_ac_Header'}
- $as_echo "$as_val"'`
- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
--else
+ else
- # Is the header compilable?
-{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
-$as_echo_n "checking $ac_header usability... " >&6; }
@@ -11230,39 +12140,45 @@ Index: pam.debian/configure
-as_val=`eval 'as_val=${'$as_ac_Header'}
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
-+ for ac_header in db.h
-+do :
-+ ac_fn_c_check_header_mongrel "$LINENO" "db.h" "ac_cv_header_db_h" "$ac_includes_default"
-+if test "x$ac_cv_header_db_h" = x""yes; then :
- cat >>confdefs.h <<_ACEOF
+- cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-+#define HAVE_DB_H 1
- _ACEOF
-
- fi
-@@ -15778,18 +13285,14 @@
- fi
-
-
+-_ACEOF
+-
+-fi
+-
+-done
+-
+- fi
+-fi
+-
+- if test ! -z "$LIBDB"; then
+- HAVE_LIBDB_TRUE=
+- HAVE_LIBDB_FALSE='#'
+-else
+- HAVE_LIBDB_TRUE='#'
+- HAVE_LIBDB_FALSE=
+-fi
+-
+-
-{ $as_echo "$as_me:$LINENO: checking for yp_get_default_domain in -lnsl" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for yp_get_default_domain in -lnsl" >&5
- $as_echo_n "checking for yp_get_default_domain in -lnsl... " >&6; }
+-$as_echo_n "checking for yp_get_default_domain in -lnsl... " >&6; }
-if test "${ac_cv_lib_nsl_yp_get_default_domain+set}" = set; then
-+if test "${ac_cv_lib_nsl_yp_get_default_domain+set}" = set; then :
- $as_echo_n "(cached) " >&6
- else
- ac_check_lib_save_LIBS=$LIBS
- LIBS="-lnsl $LIBS"
+- $as_echo_n "(cached) " >&6
+-else
+- ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lnsl $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
++ ac_check_lib_save_LIBS=$LIBS
++LIBS="-lnsl $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -15807,43 +13310,18 @@
+@@ -15790,43 +13364,18 @@
return 0;
}
_ACEOF
@@ -11312,7 +12228,7 @@ Index: pam.debian/configure
LIBNSL="-lnsl"
else
LIBNSL=""
-@@ -15851,107 +13329,12 @@
+@@ -15834,107 +13383,12 @@
BACKUP_LIBS=$LIBS
LIBS="$LIBS $LIBNSL"
@@ -11425,7 +12341,7 @@ Index: pam.debian/configure
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
_ACEOF
-@@ -15963,25 +13346,21 @@
+@@ -15946,25 +13400,21 @@
# Check whether --enable-selinux was given.
@@ -11455,7 +12371,7 @@ Index: pam.debian/configure
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -15999,43 +13378,18 @@
+@@ -15982,43 +13432,18 @@
return 0;
}
_ACEOF
@@ -11505,7 +12421,7 @@ Index: pam.debian/configure
LIBSELINUX="-lselinux"
else
LIBSELINUX=""
-@@ -16055,210 +13409,28 @@
+@@ -16038,304 +13463,86 @@
if test ! -z "$LIBSELINUX" ; then
@@ -11540,22 +12456,31 @@ Index: pam.debian/configure
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
- For example, HP-UX 11i <limits.h> declares gettimeofday. */
-#define $ac_func innocuous_$ac_func
--
+
-/* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char $ac_func (); below.
- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
- <limits.h> exists even on freestanding compilers. */
++fi
++done
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
++ for ac_func in getseuser
++do :
++ ac_fn_c_check_func "$LINENO" "getseuser" "ac_cv_func_getseuser"
++if test "x$ac_cv_func_getseuser" = x""yes; then :
++ cat >>confdefs.h <<_ACEOF
++#define HAVE_GETSEUSER 1
++_ACEOF
+
+-#undef $ac_func
+fi
+done
--#undef $ac_func
--
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
@@ -11569,15 +12494,32 @@ Index: pam.debian/configure
-#if defined __stub_$ac_func || defined __stub___$ac_func
-choke me
-#endif
--
--int
--main ()
--{
++ LIBS=$BACKUP_LIBS
++fi
++
++ac_header_dirent=no
++for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h; do
++ as_ac_Header=`$as_echo "ac_cv_header_dirent_$ac_hdr" | $as_tr_sh`
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_hdr that defines DIR" >&5
++$as_echo_n "checking for $ac_hdr that defines DIR... " >&6; }
++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then :
++ $as_echo_n "(cached) " >&6
++else
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h. */
++#include <sys/types.h>
++#include <$ac_hdr>
+
+ int
+ main ()
+ {
-return $ac_func ();
-- ;
-- return 0;
--}
--_ACEOF
++if ((DIR *) 0)
++return 0;
+ ;
+ return 0;
+ }
+ _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
@@ -11600,31 +12542,41 @@ Index: pam.debian/configure
- $as_test_x conftest$ac_exeext
- }; then
- eval "$as_ac_var=yes"
--else
++if ac_fn_c_try_compile "$LINENO"; then :
++ eval "$as_ac_Header=yes"
+ else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- eval "$as_ac_var=no"
--fi
++ eval "$as_ac_Header=no"
+ fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
--fi
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
-ac_res=`eval 'as_val=${'$as_ac_var'}
- $as_echo "$as_val"'`
- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
++eval ac_res=\$$as_ac_Header
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+ $as_echo "$ac_res" >&6; }
-as_val=`eval 'as_val=${'$as_ac_var'}
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
-- cat >>confdefs.h <<_ACEOF
++eval as_val=\$$as_ac_Header
++ if test "x$as_val" = x""yes; then :
+ cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
--_ACEOF
--
--fi
++#define `$as_echo "HAVE_$ac_hdr" | $as_tr_cpp` 1
+ _ACEOF
+
++ac_header_dirent=$ac_hdr; break
+ fi
-done
--
+
-
-for ac_func in getseuser
-do
@@ -11632,8 +12584,14 @@ Index: pam.debian/configure
-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
-$as_echo_n "checking for $ac_func... " >&6; }
-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-- $as_echo_n "(cached) " >&6
--else
++done
++# Two versions of opendir et al. are in -ldir and -lx on SCO Xenix.
++if test $ac_header_dirent = dirent.h; then
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing opendir" >&5
++$as_echo_n "checking for library containing opendir... " >&6; }
++if test "${ac_cv_search_opendir+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
@@ -11722,48 +12680,44 @@ Index: pam.debian/configure
- cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
-+ for ac_func in getseuser
-+do :
-+ ac_fn_c_check_func "$LINENO" "getseuser" "ac_cv_func_getseuser"
-+if test "x$ac_cv_func_getseuser" = x""yes; then :
-+ cat >>confdefs.h <<_ACEOF
-+#define HAVE_GETSEUSER 1
-+_ACEOF
-
- fi
- done
-@@ -16266,24 +13438,15 @@
- LIBS=$BACKUP_LIBS
- fi
-
+-
+-fi
+-done
+-
+- LIBS=$BACKUP_LIBS
+-fi
+-
-
-
-
-
-
- ac_header_dirent=no
- for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h; do
- as_ac_Header=`$as_echo "ac_cv_header_dirent_$ac_hdr" | $as_tr_sh`
+-ac_header_dirent=no
+-for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h; do
+- as_ac_Header=`$as_echo "ac_cv_header_dirent_$ac_hdr" | $as_tr_sh`
-{ $as_echo "$as_me:$LINENO: checking for $ac_hdr that defines DIR" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_hdr that defines DIR" >&5
- $as_echo_n "checking for $ac_hdr that defines DIR... " >&6; }
+-$as_echo_n "checking for $ac_hdr that defines DIR... " >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then :
- $as_echo_n "(cached) " >&6
- else
+- $as_echo_n "(cached) " >&6
+-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
- #include <sys/types.h>
- #include <$ac_hdr>
-@@ -16297,41 +13460,18 @@
- return 0;
- }
- _ACEOF
+-/* end confdefs.h. */
+-#include <sys/types.h>
+-#include <$ac_hdr>
+-
+-int
+-main ()
+-{
+-if ((DIR *) 0)
+-return 0;
+- ;
+- return 0;
+-}
+-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
@@ -11782,54 +12736,50 @@ Index: pam.debian/configure
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
-+if ac_fn_c_try_compile "$LINENO"; then :
- eval "$as_ac_Header=yes"
- else
+- eval "$as_ac_Header=yes"
+-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- eval "$as_ac_Header=no"
-+ eval "$as_ac_Header=no"
- fi
+-fi
-
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-fi
-ac_res=`eval 'as_val=${'$as_ac_Header'}
- $as_echo "$as_val"'`
- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-+eval ac_res=\$$as_ac_Header
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
- $as_echo "$ac_res" >&6; }
+-$as_echo "$ac_res" >&6; }
-as_val=`eval 'as_val=${'$as_ac_Header'}
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
-+eval as_val=\$$as_ac_Header
-+ if test "x$as_val" = x""yes; then :
- cat >>confdefs.h <<_ACEOF
- #define `$as_echo "HAVE_$ac_hdr" | $as_tr_cpp` 1
- _ACEOF
-@@ -16342,17 +13482,13 @@
- done
- # Two versions of opendir et al. are in -ldir and -lx on SCO Xenix.
- if test $ac_header_dirent = dirent.h; then
+- cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_hdr" | $as_tr_cpp` 1
+-_ACEOF
+-
+-ac_header_dirent=$ac_hdr; break
+-fi
+-
+-done
+-# Two versions of opendir et al. are in -ldir and -lx on SCO Xenix.
+-if test $ac_header_dirent = dirent.h; then
- { $as_echo "$as_me:$LINENO: checking for library containing opendir" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing opendir" >&5
- $as_echo_n "checking for library containing opendir... " >&6; }
+-$as_echo_n "checking for library containing opendir... " >&6; }
-if test "${ac_cv_search_opendir+set}" = set; then
-+if test "${ac_cv_search_opendir+set}" = set; then :
- $as_echo_n "(cached) " >&6
- else
- ac_func_search_save_LIBS=$LIBS
+- $as_echo_n "(cached) " >&6
+-else
+- ac_func_search_save_LIBS=$LIBS
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
++ ac_func_search_save_LIBS=$LIBS
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -16377,70 +13513,39 @@
+@@ -16360,70 +13567,39 @@
ac_res=-l$ac_lib
LIBS="-l$ac_lib $ac_func_search_save_LIBS"
fi
@@ -11911,7 +12861,7 @@ Index: pam.debian/configure
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -16465,70 +13570,39 @@
+@@ -16448,70 +13624,39 @@
ac_res=-l$ac_lib
LIBS="-l$ac_lib $ac_func_search_save_LIBS"
fi
@@ -11993,7 +12943,7 @@ Index: pam.debian/configure
/* end confdefs.h. */
#include <stdlib.h>
#include <stdarg.h>
-@@ -16543,48 +13617,23 @@
+@@ -16526,48 +13671,23 @@
return 0;
}
_ACEOF
@@ -12047,7 +12997,7 @@ Index: pam.debian/configure
else
ac_cv_header_stdc=no
fi
-@@ -16594,18 +13643,14 @@
+@@ -16577,18 +13697,14 @@
if test $ac_cv_header_stdc = yes; then
# ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
@@ -12069,7 +13019,7 @@ Index: pam.debian/configure
else
ac_cv_header_stdc=no
fi
-@@ -16615,14 +13660,10 @@
+@@ -16598,14 +13714,10 @@
if test $ac_cv_header_stdc = yes; then
# /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
@@ -12086,7 +13036,7 @@ Index: pam.debian/configure
/* end confdefs.h. */
#include <ctype.h>
#include <stdlib.h>
-@@ -16649,64 +13690,31 @@
+@@ -16632,64 +13744,31 @@
return 0;
}
_ACEOF
@@ -12161,7 +13111,7 @@ Index: pam.debian/configure
/* end confdefs.h. */
#include <sys/types.h>
#include <sys/wait.h>
-@@ -16727,413 +13735,94 @@
+@@ -16710,413 +13789,94 @@
return 0;
}
_ACEOF
@@ -12302,11 +13252,33 @@ Index: pam.debian/configure
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
--
++if ac_fn_c_try_compile "$LINENO"; then :
+
- ac_header_compiler=no
--fi
++ # Check for potential -arch flags. It is not universal unless
++ # there are at least two -arch flags with different values.
++ ac_arch=
++ ac_prev=
++ for ac_word in $CC $CFLAGS $CPPFLAGS $LDFLAGS; do
++ if test -n "$ac_prev"; then
++ case $ac_word in
++ i?86 | x86_64 | ppc | ppc64)
++ if test -z "$ac_arch" || test "$ac_arch" = "$ac_word"; then
++ ac_arch=$ac_word
++ else
++ ac_cv_c_bigendian=universal
++ break
++ fi
++ ;;
++ esac
++ ac_prev=
++ elif test "x$ac_word" = "x-arch"; then
++ ac_prev=arch
++ fi
++ done
+ fi
-
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-$as_echo "$ac_header_compiler" >&6; }
-
@@ -12587,9 +13559,8 @@ Index: pam.debian/configure
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
-+if ac_fn_c_try_compile "$LINENO"; then :
-
- # Check for potential -arch flags. It is not universal unless
+-
+- # Check for potential -arch flags. It is not universal unless
- # there are some -arch flags. Note that *ppc* also matches
- # ppc64. This check is also rather less than ideal.
- case "${CC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS}" in #(
@@ -12600,41 +13571,23 @@ Index: pam.debian/configure
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
-+ # there are at least two -arch flags with different values.
-+ ac_arch=
-+ ac_prev=
-+ for ac_word in $CC $CFLAGS $CPPFLAGS $LDFLAGS; do
-+ if test -n "$ac_prev"; then
-+ case $ac_word in
-+ i?86 | x86_64 | ppc | ppc64)
-+ if test -z "$ac_arch" || test "$ac_arch" = "$ac_word"; then
-+ ac_arch=$ac_word
-+ else
-+ ac_cv_c_bigendian=universal
-+ break
-+ fi
-+ ;;
-+ esac
-+ ac_prev=
-+ elif test "x$ac_word" = "x-arch"; then
-+ ac_prev=arch
-+ fi
-+ done
- fi
+-fi
-
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- if test $ac_cv_c_bigendian = unknown; then
- # See if sys/param.h defines the BYTE_ORDER macro.
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+- if test $ac_cv_c_bigendian = unknown; then
+- # See if sys/param.h defines the BYTE_ORDER macro.
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
++ if test $ac_cv_c_bigendian = unknown; then
++ # See if sys/param.h defines the BYTE_ORDER macro.
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <sys/types.h>
#include <sys/param.h>
-@@ -17151,30 +13840,9 @@
+@@ -17134,30 +13894,9 @@
return 0;
}
_ACEOF
@@ -12667,7 +13620,7 @@ Index: pam.debian/configure
/* end confdefs.h. */
#include <sys/types.h>
#include <sys/param.h>
-@@ -17190,49 +13858,18 @@
+@@ -17173,49 +13912,18 @@
return 0;
}
_ACEOF
@@ -12720,7 +13673,7 @@ Index: pam.debian/configure
/* end confdefs.h. */
#include <limits.h>
-@@ -17247,30 +13884,9 @@
+@@ -17230,30 +13938,9 @@
return 0;
}
_ACEOF
@@ -12753,7 +13706,7 @@ Index: pam.debian/configure
/* end confdefs.h. */
#include <limits.h>
-@@ -17285,51 +13901,20 @@
+@@ -17268,51 +13955,20 @@
return 0;
}
_ACEOF
@@ -12809,7 +13762,7 @@ Index: pam.debian/configure
/* end confdefs.h. */
short int ascii_mm[] =
{ 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 };
-@@ -17355,24 +13940,7 @@
+@@ -17338,24 +13994,7 @@
return 0;
}
_ACEOF
@@ -12835,7 +13788,7 @@ Index: pam.debian/configure
if grep BIGenDianSyS conftest.$ac_objext >/dev/null; then
ac_cv_c_bigendian=yes
fi
-@@ -17384,20 +13952,10 @@
+@@ -17367,20 +14006,10 @@
ac_cv_c_bigendian=unknown
fi
fi
@@ -12857,7 +13810,7 @@ Index: pam.debian/configure
/* end confdefs.h. */
$ac_includes_default
int
-@@ -17417,79 +13975,41 @@
+@@ -17400,79 +14029,41 @@
return 0;
}
_ACEOF
@@ -12949,7 +13902,7 @@ Index: pam.debian/configure
/* end confdefs.h. */
int
-@@ -17549,60 +14069,33 @@
+@@ -17532,60 +14123,33 @@
return 0;
}
_ACEOF
@@ -13018,7 +13971,7 @@ Index: pam.debian/configure
ac_cv_type_uid_t=yes
else
ac_cv_type_uid_t=no
-@@ -17610,117 +14103,20 @@
+@@ -17593,117 +14157,20 @@
rm -f conftest*
fi
@@ -13031,12 +13984,12 @@ Index: pam.debian/configure
-#define uid_t int
-_ACEOF
-
--
++$as_echo "#define uid_t int" >>confdefs.h
+
-cat >>confdefs.h <<\_ACEOF
-#define gid_t int
-_ACEOF
-+$as_echo "#define uid_t int" >>confdefs.h
-
+-
-fi
-{ $as_echo "$as_me:$LINENO: checking for off_t" >&5
@@ -13141,7 +14094,7 @@ Index: pam.debian/configure
else
cat >>confdefs.h <<_ACEOF
-@@ -17729,102 +14125,9 @@
+@@ -17712,102 +14179,9 @@
fi
@@ -13232,11 +14185,11 @@ Index: pam.debian/configure
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
+-
+-fi
+ac_fn_c_check_type "$LINENO" "pid_t" "ac_cv_type_pid_t" "$ac_includes_default"
+if test "x$ac_cv_type_pid_t" = x""yes; then :
--fi
--
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_pid_t" >&5
@@ -13246,7 +14199,7 @@ Index: pam.debian/configure
else
cat >>confdefs.h <<_ACEOF
-@@ -17833,102 +14136,9 @@
+@@ -17816,102 +14190,9 @@
fi
@@ -13337,11 +14290,11 @@ Index: pam.debian/configure
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
--
--fi
+ac_fn_c_check_type "$LINENO" "size_t" "ac_cv_type_size_t" "$ac_includes_default"
+if test "x$ac_cv_type_size_t" = x""yes; then :
+-fi
+-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_size_t" >&5
@@ -13351,7 +14304,7 @@ Index: pam.debian/configure
else
cat >>confdefs.h <<_ACEOF
-@@ -17937,16 +14147,12 @@
+@@ -17920,16 +14201,12 @@
fi
@@ -13371,7 +14324,7 @@ Index: pam.debian/configure
/* end confdefs.h. */
#include <sys/types.h>
#include <sys/time.h>
-@@ -17961,54 +14167,27 @@
+@@ -17944,54 +14221,27 @@
return 0;
}
_ACEOF
@@ -13433,7 +14386,7 @@ Index: pam.debian/configure
/* end confdefs.h. */
#include <sys/types.h>
#include <time.h>
-@@ -18023,58 +14202,31 @@
+@@ -18006,58 +14256,31 @@
return 0;
}
_ACEOF
@@ -13500,7 +14453,7 @@ Index: pam.debian/configure
/* end confdefs.h. */
/* Thanks to Mike Rendell for this test. */
$ac_includes_default
-@@ -18100,54 +14252,23 @@
+@@ -18083,54 +14306,23 @@
return n > 0 && gidset[n] != val.gval;
}
_ACEOF
@@ -13561,7 +14514,7 @@ Index: pam.debian/configure
ac_cv_type_getgroups=gid_t
else
ac_cv_type_getgroups=int
-@@ -18156,7 +14277,7 @@
+@@ -18139,869 +14331,156 @@
fi
fi
@@ -13569,90 +14522,108 @@ Index: pam.debian/configure
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_type_getgroups" >&5
$as_echo "$ac_cv_type_getgroups" >&6; }
- cat >>confdefs.h <<_ACEOF
-@@ -18165,23 +14286,19 @@
-
-
- if test $ac_cv_c_compiler_gnu = yes; then
+-cat >>confdefs.h <<_ACEOF
+-#define GETGROUPS_T $ac_cv_type_getgroups
+-_ACEOF
+-
+-
+-if test $ac_cv_c_compiler_gnu = yes; then
- { $as_echo "$as_me:$LINENO: checking whether $CC needs -traditional" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC needs -traditional" >&5
- $as_echo_n "checking whether $CC needs -traditional... " >&6; }
+-$as_echo_n "checking whether $CC needs -traditional... " >&6; }
-if test "${ac_cv_prog_gcc_traditional+set}" = set; then
-+if test "${ac_cv_prog_gcc_traditional+set}" = set; then :
- $as_echo_n "(cached) " >&6
- else
- ac_pattern="Autoconf.*'x'"
+- $as_echo_n "(cached) " >&6
+-else
+- ac_pattern="Autoconf.*'x'"
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
- #include <sgtty.h>
- Autoconf TIOCGETP
- _ACEOF
- if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+-/* end confdefs.h. */
+-#include <sgtty.h>
+-Autoconf TIOCGETP
+-_ACEOF
+-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
- $EGREP "$ac_pattern" >/dev/null 2>&1; then
-+ $EGREP "$ac_pattern" >/dev/null 2>&1; then :
- ac_cv_prog_gcc_traditional=yes
- else
- ac_cv_prog_gcc_traditional=no
-@@ -18190,43 +14307,35 @@
-
-
- if test $ac_cv_prog_gcc_traditional = no; then
+- ac_cv_prog_gcc_traditional=yes
+-else
+- ac_cv_prog_gcc_traditional=no
+-fi
+-rm -f conftest*
+-
+-
+- if test $ac_cv_prog_gcc_traditional = no; then
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
- #include <termio.h>
- Autoconf TCGETA
- _ACEOF
- if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+-/* end confdefs.h. */
+-#include <termio.h>
+-Autoconf TCGETA
+-_ACEOF
+-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
- $EGREP "$ac_pattern" >/dev/null 2>&1; then
-+ $EGREP "$ac_pattern" >/dev/null 2>&1; then :
- ac_cv_prog_gcc_traditional=yes
- fi
- rm -f conftest*
-
- fi
- fi
+- ac_cv_prog_gcc_traditional=yes
+-fi
+-rm -f conftest*
+-
+- fi
+-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_gcc_traditional" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_gcc_traditional" >&5
- $as_echo "$ac_cv_prog_gcc_traditional" >&6; }
- if test $ac_cv_prog_gcc_traditional = yes; then
- CC="$CC -traditional"
- fi
- fi
-
+-$as_echo "$ac_cv_prog_gcc_traditional" >&6; }
+- if test $ac_cv_prog_gcc_traditional = yes; then
+- CC="$CC -traditional"
+- fi
+-fi
+-
-{ $as_echo "$as_me:$LINENO: checking for working memcmp" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for working memcmp" >&5
- $as_echo_n "checking for working memcmp... " >&6; }
+-$as_echo_n "checking for working memcmp... " >&6; }
-if test "${ac_cv_func_memcmp_working+set}" = set; then
-+if test "${ac_cv_func_memcmp_working+set}" = set; then :
- $as_echo_n "(cached) " >&6
- else
+- $as_echo_n "(cached) " >&6
+-else
- if test "$cross_compiling" = yes; then
-+ if test "$cross_compiling" = yes; then :
- ac_cv_func_memcmp_working=no
- else
+- ac_cv_func_memcmp_working=no
+-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
- $ac_includes_default
- int
-@@ -18261,44 +14370,17 @@
- return 0;
- }
- _ACEOF
+-/* end confdefs.h. */
+-$ac_includes_default
+-int
+-main ()
+-{
+-
+- /* Some versions of memcmp are not 8-bit clean. */
+- char c0 = '\100', c1 = '\200', c2 = '\201';
+- if (memcmp(&c0, &c2, 1) >= 0 || memcmp(&c1, &c2, 1) >= 0)
+- return 1;
+-
+- /* The Next x86 OpenStep bug shows up only when comparing 16 bytes
+- or more and with at least one buffer not starting on a 4-byte boundary.
+- William Lewis provided this test program. */
+- {
+- char foo[21];
+- char bar[21];
+- int i;
+- for (i = 0; i < 4; i++)
+- {
+- char *a = foo + i;
+- char *b = bar + i;
+- strcpy (a, "--------01111111");
+- strcpy (b, "--------10000000");
+- if (memcmp (a, b, 16) >= 0)
+- return 1;
+- }
+- return 0;
+- }
+-
+- ;
+- return 0;
+-}
+-_ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
@@ -13675,36 +14646,32 @@ Index: pam.debian/configure
- ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
-+if ac_fn_c_try_run "$LINENO"; then :
- ac_cv_func_memcmp_working=yes
- else
+- ac_cv_func_memcmp_working=yes
+-else
- $as_echo "$as_me: program exited with status $ac_status" >&5
-$as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-ac_cv_func_memcmp_working=no
-+ ac_cv_func_memcmp_working=no
- fi
+-fi
-rm -rf conftest.dSYM
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-+ conftest.$ac_objext conftest.beam conftest.$ac_ext
- fi
-
+-fi
-
- fi
+-
+-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_memcmp_working" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_memcmp_working" >&5
- $as_echo "$ac_cv_func_memcmp_working" >&6; }
- test $ac_cv_func_memcmp_working = no && case " $LIBOBJS " in
- *" memcmp.$ac_objext "* ) ;;
-@@ -18307,194 +14389,18 @@
- esac
-
-
+-$as_echo "$ac_cv_func_memcmp_working" >&6; }
+-test $ac_cv_func_memcmp_working = no && case " $LIBOBJS " in
+- *" memcmp.$ac_objext "* ) ;;
+- *) LIBOBJS="$LIBOBJS memcmp.$ac_objext"
+- ;;
+-esac
+-
+-
-
- for ac_func in vprintf
+-for ac_func in vprintf
-do
-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
@@ -13797,10 +14764,7 @@ Index: pam.debian/configure
-as_val=`eval 'as_val=${'$as_ac_var'}
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
-+do :
-+ ac_fn_c_check_func "$LINENO" "vprintf" "ac_cv_func_vprintf"
-+if test "x$ac_cv_func_vprintf" = x""yes; then :
- cat >>confdefs.h <<_ACEOF
+- cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
-
@@ -13853,8 +14817,7 @@ Index: pam.debian/configure
- ;
- return 0;
-}
-+#define HAVE_VPRINTF 1
- _ACEOF
+-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
@@ -13883,7 +14846,7 @@ Index: pam.debian/configure
-
- ac_cv_func__doprnt=no
-fi
-
+-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
@@ -13891,27 +14854,24 @@ Index: pam.debian/configure
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func__doprnt" >&5
-$as_echo "$ac_cv_func__doprnt" >&6; }
-if test "x$ac_cv_func__doprnt" = x""yes; then
-+ac_fn_c_check_func "$LINENO" "_doprnt" "ac_cv_func__doprnt"
-+if test "x$ac_cv_func__doprnt" = x""yes; then :
-
+-
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_DOPRNT 1
-_ACEOF
-+$as_echo "#define HAVE_DOPRNT 1" >>confdefs.h
-
- fi
-
-@@ -18502,105 +14408,12 @@
- done
-
-
+-
+-fi
+-
+-fi
+-done
+-
+-
-
-
-
-
-
-
- for ac_func in fseeko gethostname gettimeofday lckpwdf mkdir select
+-for ac_func in fseeko gethostname gettimeofday lckpwdf mkdir select
-do
-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
@@ -14004,25 +14964,20 @@ Index: pam.debian/configure
-as_val=`eval 'as_val=${'$as_ac_var'}
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
-+do :
-+ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-+eval as_val=\$$as_ac_var
-+ if test "x$as_val" = x""yes; then :
- cat >>confdefs.h <<_ACEOF
- #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
- _ACEOF
-@@ -18608,105 +14421,12 @@
- fi
- done
-
+- cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+-_ACEOF
+-
+-fi
+-done
+-
-
-
-
-
-
-
- for ac_func in strcspn strdup strspn strstr strtol uname
+-for ac_func in strcspn strdup strspn strstr strtol uname
-do
-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
@@ -14115,24 +15070,20 @@ Index: pam.debian/configure
-as_val=`eval 'as_val=${'$as_ac_var'}
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
-+do :
-+ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-+eval as_val=\$$as_ac_var
-+ if test "x$as_val" = x""yes; then :
- cat >>confdefs.h <<_ACEOF
- #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
- _ACEOF
-@@ -18714,104 +14434,12 @@
- fi
- done
-
+- cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+-_ACEOF
+-
+-fi
+-done
+-
+-
-
-
-
-
-
- for ac_func in getpwnam_r getpwuid_r getgrnam_r getgrgid_r getspnam_r
+-for ac_func in getutent_r getpwnam_r getpwuid_r getgrnam_r getgrgid_r getspnam_r
-do
-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
@@ -14225,35 +15176,39 @@ Index: pam.debian/configure
-as_val=`eval 'as_val=${'$as_ac_var'}
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
-+do :
-+ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-+eval as_val=\$$as_ac_var
-+ if test "x$as_val" = x""yes; then :
- cat >>confdefs.h <<_ACEOF
- #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
- _ACEOF
-@@ -18819,102 +14447,12 @@
- fi
- done
-
+- cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+-_ACEOF
-
+-fi
+-done
-
-
- for ac_func in getgrouplist getline getdelim
++cat >>confdefs.h <<_ACEOF
++#define GETGROUPS_T $ac_cv_type_getgroups
++_ACEOF
+
+
+-for ac_func in getgrouplist getline getdelim
-do
-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
-$as_echo_n "checking for $ac_func... " >&6; }
-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-- $as_echo_n "(cached) " >&6
--else
++if test $ac_cv_c_compiler_gnu = yes; then
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC needs -traditional" >&5
++$as_echo_n "checking whether $CC needs -traditional... " >&6; }
++if test "${ac_cv_prog_gcc_traditional+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
++ ac_pattern="Autoconf.*'x'"
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
- For example, HP-UX 11i <limits.h> declares gettimeofday. */
-#define $ac_func innocuous_$ac_func
@@ -14262,15 +15217,36 @@ Index: pam.debian/configure
- which can conflict with char $ac_func (); below.
- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
- <limits.h> exists even on freestanding compilers. */
--
++#include <sgtty.h>
++Autoconf TIOCGETP
++_ACEOF
++if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
++ $EGREP "$ac_pattern" >/dev/null 2>&1; then :
++ ac_cv_prog_gcc_traditional=yes
++else
++ ac_cv_prog_gcc_traditional=no
++fi
++rm -f conftest*
+
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
--
+
-#undef $ac_func
--
++ if test $ac_cv_prog_gcc_traditional = no; then
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h. */
++#include <termio.h>
++Autoconf TCGETA
++_ACEOF
++if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
++ $EGREP "$ac_pattern" >/dev/null 2>&1; then :
++ ac_cv_prog_gcc_traditional=yes
++fi
++rm -f conftest*
+
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
@@ -14284,15 +15260,59 @@ Index: pam.debian/configure
-#if defined __stub_$ac_func || defined __stub___$ac_func
-choke me
-#endif
--
--int
--main ()
--{
++ fi
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_gcc_traditional" >&5
++$as_echo "$ac_cv_prog_gcc_traditional" >&6; }
++ if test $ac_cv_prog_gcc_traditional = yes; then
++ CC="$CC -traditional"
++ fi
++fi
+
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for working memcmp" >&5
++$as_echo_n "checking for working memcmp... " >&6; }
++if test "${ac_cv_func_memcmp_working+set}" = set; then :
++ $as_echo_n "(cached) " >&6
++else
++ if test "$cross_compiling" = yes; then :
++ ac_cv_func_memcmp_working=no
++else
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h. */
++$ac_includes_default
+ int
+ main ()
+ {
-return $ac_func ();
-- ;
-- return 0;
--}
--_ACEOF
++
++ /* Some versions of memcmp are not 8-bit clean. */
++ char c0 = '\100', c1 = '\200', c2 = '\201';
++ if (memcmp(&c0, &c2, 1) >= 0 || memcmp(&c1, &c2, 1) >= 0)
++ return 1;
++
++ /* The Next x86 OpenStep bug shows up only when comparing 16 bytes
++ or more and with at least one buffer not starting on a 4-byte boundary.
++ William Lewis provided this test program. */
++ {
++ char foo[21];
++ char bar[21];
++ int i;
++ for (i = 0; i < 4; i++)
++ {
++ char *a = foo + i;
++ char *b = bar + i;
++ strcpy (a, "--------01111111");
++ strcpy (b, "--------10000000");
++ if (memcmp (a, b, 16) >= 0)
++ return 1;
++ }
++ return 0;
++ }
++
+ ;
+ return 0;
+ }
+ _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
@@ -14315,17 +15335,22 @@ Index: pam.debian/configure
- $as_test_x conftest$ac_exeext
- }; then
- eval "$as_ac_var=yes"
--else
++if ac_fn_c_try_run "$LINENO"; then :
++ ac_cv_func_memcmp_working=yes
+ else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- eval "$as_ac_var=no"
--fi
++ ac_cv_func_memcmp_working=no
+ fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
--fi
++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
++ conftest.$ac_objext conftest.beam conftest.$ac_ext
+ fi
-ac_res=`eval 'as_val=${'$as_ac_var'}
- $as_echo "$as_val"'`
- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
@@ -14333,22 +15358,24 @@ Index: pam.debian/configure
-as_val=`eval 'as_val=${'$as_ac_var'}
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
-+do :
-+ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-+eval as_val=\$$as_ac_var
-+ if test "x$as_val" = x""yes; then :
- cat >>confdefs.h <<_ACEOF
- #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
- _ACEOF
-@@ -18922,102 +14460,12 @@
- fi
- done
+- cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+-_ACEOF
+ fi
+-done
-
-
--
- for ac_func in inet_ntop inet_pton ruserok_af
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_memcmp_working" >&5
++$as_echo "$ac_cv_func_memcmp_working" >&6; }
++test $ac_cv_func_memcmp_working = no && case " $LIBOBJS " in
++ *" memcmp.$ac_objext "* ) ;;
++ *) LIBOBJS="$LIBOBJS memcmp.$ac_objext"
++ ;;
++esac
+
+
+-for ac_func in inet_ntop inet_pton ruserok_af
-do
-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
@@ -14358,27 +15385,37 @@ Index: pam.debian/configure
-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
--_ACEOF
++for ac_func in vprintf
++do :
++ ac_fn_c_check_func "$LINENO" "vprintf" "ac_cv_func_vprintf"
++if test "x$ac_cv_func_vprintf" = x""yes; then :
++ cat >>confdefs.h <<_ACEOF
++#define HAVE_VPRINTF 1
+ _ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
- For example, HP-UX 11i <limits.h> declares gettimeofday. */
-#define $ac_func innocuous_$ac_func
--
+
-/* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char $ac_func (); below.
- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
- <limits.h> exists even on freestanding compilers. */
--
++ac_fn_c_check_func "$LINENO" "_doprnt" "ac_cv_func__doprnt"
++if test "x$ac_cv_func__doprnt" = x""yes; then :
+
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
--
++$as_echo "#define HAVE_DOPRNT 1" >>confdefs.h
+
-#undef $ac_func
--
++fi
+
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
@@ -14392,7 +15429,9 @@ Index: pam.debian/configure
-#if defined __stub_$ac_func || defined __stub___$ac_func
-choke me
-#endif
--
++fi
++done
+
-int
-main ()
-{
@@ -14400,7 +15439,16 @@ Index: pam.debian/configure
- ;
- return 0;
-}
--_ACEOF
++
++for ac_func in fseeko gethostname gettimeofday lckpwdf mkdir select
++do :
++ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
++ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
++eval as_val=\$$as_ac_var
++ if test "x$as_val" = x""yes; then :
++ cat >>confdefs.h <<_ACEOF
++#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+ _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
@@ -14426,10 +15474,11 @@ Index: pam.debian/configure
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
--
+
- eval "$as_ac_var=no"
--fi
--
+ fi
++done
+
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
@@ -14441,6 +15490,7 @@ Index: pam.debian/configure
-as_val=`eval 'as_val=${'$as_ac_var'}
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
++for ac_func in strcspn strdup strspn strstr strtol uname
+do :
+ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
@@ -14449,12 +15499,13 @@ Index: pam.debian/configure
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
_ACEOF
-@@ -19026,102 +14474,12 @@
+@@ -19009,103 +14488,52 @@
+ fi
done
-
-
- for ac_func in unshare
+-
+-for ac_func in unshare
-do
-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
@@ -14464,7 +15515,15 @@ Index: pam.debian/configure
-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
--_ACEOF
++for ac_func in getutent_r getpwnam_r getpwuid_r getgrnam_r getgrgid_r getspnam_r
++do :
++ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
++ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
++eval as_val=\$$as_ac_var
++ if test "x$as_val" = x""yes; then :
++ cat >>confdefs.h <<_ACEOF
++#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+ _ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
@@ -14476,15 +15535,26 @@ Index: pam.debian/configure
- which can conflict with char $ac_func (); below.
- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
- <limits.h> exists even on freestanding compilers. */
--
+
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
--
++fi
++done
+
-#undef $ac_func
--
++for ac_func in getgrouplist getline getdelim
++do :
++ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
++ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
++eval as_val=\$$as_ac_var
++ if test "x$as_val" = x""yes; then :
++ cat >>confdefs.h <<_ACEOF
++#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
++_ACEOF
+
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
@@ -14498,7 +15568,9 @@ Index: pam.debian/configure
-#if defined __stub_$ac_func || defined __stub___$ac_func
-choke me
-#endif
--
++fi
++done
+
-int
-main ()
-{
@@ -14506,7 +15578,15 @@ Index: pam.debian/configure
- ;
- return 0;
-}
--_ACEOF
++for ac_func in inet_ntop inet_pton ruserok_af
++do :
++ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
++ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
++eval as_val=\$$as_ac_var
++ if test "x$as_val" = x""yes; then :
++ cat >>confdefs.h <<_ACEOF
++#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+ _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
@@ -14532,10 +15612,11 @@ Index: pam.debian/configure
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
--
+
- eval "$as_ac_var=no"
--fi
--
+ fi
++done
+
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
@@ -14547,6 +15628,8 @@ Index: pam.debian/configure
-as_val=`eval 'as_val=${'$as_ac_var'}
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
++
++for ac_func in unshare
+do :
+ ac_fn_c_check_func "$LINENO" "unshare" "ac_cv_func_unshare"
+if test "x$ac_cv_func_unshare" = x""yes; then :
@@ -14556,7 +15639,7 @@ Index: pam.debian/configure
_ACEOF
UNSHARE=yes
else
-@@ -19139,7 +14497,7 @@
+@@ -19123,7 +14551,7 @@
# Check whether --enable-regenerate-docu was given.
@@ -14565,7 +15648,7 @@ Index: pam.debian/configure
enableval=$enable_regenerate_docu; enable_docu=$enableval
else
enable_docu=yes
-@@ -19147,9 +14505,9 @@
+@@ -19131,9 +14559,9 @@
# Extract the first word of "xsltproc", so it can be a program name with args.
set dummy xsltproc; ac_word=$2
@@ -14577,7 +15660,7 @@ Index: pam.debian/configure
$as_echo_n "(cached) " >&6
else
case $XSLTPROC in
-@@ -19162,14 +14520,14 @@
+@@ -19146,14 +14574,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -14595,7 +15678,7 @@ Index: pam.debian/configure
IFS=$as_save_IFS
;;
-@@ -19177,10 +14535,10 @@
+@@ -19161,10 +14589,10 @@
fi
XSLTPROC=$ac_cv_path_XSLTPROC
if test -n "$XSLTPROC"; then
@@ -14608,7 +15691,7 @@ Index: pam.debian/configure
$as_echo "no" >&6; }
fi
-@@ -19190,9 +14548,9 @@
+@@ -19174,9 +14602,9 @@
fi
# Extract the first word of "xmllint", so it can be a program name with args.
set dummy xmllint; ac_word=$2
@@ -14620,7 +15703,7 @@ Index: pam.debian/configure
$as_echo_n "(cached) " >&6
else
case $XMLLINT in
-@@ -19205,14 +14563,14 @@
+@@ -19189,14 +14617,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -14638,7 +15721,7 @@ Index: pam.debian/configure
IFS=$as_save_IFS
test -z "$ac_cv_path_XMLLINT" && ac_cv_path_XMLLINT="/bin/true"
-@@ -19221,10 +14579,10 @@
+@@ -19205,10 +14633,10 @@
fi
XMLLINT=$ac_cv_path_XMLLINT
if test -n "$XMLLINT"; then
@@ -14651,7 +15734,7 @@ Index: pam.debian/configure
$as_echo "no" >&6; }
fi
-@@ -19233,7 +14591,7 @@
+@@ -19217,7 +14645,7 @@
# check for the presence of the XML catalog
# Check whether --with-xml-catalog was given.
@@ -14660,7 +15743,7 @@ Index: pam.debian/configure
withval=$with_xml_catalog;
else
with_xml_catalog=/etc/xml/catalog
-@@ -19242,23 +14600,23 @@
+@@ -19226,23 +14654,23 @@
jh_found_xmlcatalog=true
XML_CATALOG_FILE="$with_xml_catalog"
@@ -14689,7 +15772,7 @@ Index: pam.debian/configure
$as_echo_n "(cached) " >&6
else
case $XMLCATALOG in
-@@ -19271,14 +14629,14 @@
+@@ -19255,14 +14683,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -14707,7 +15790,7 @@ Index: pam.debian/configure
IFS=$as_save_IFS
test -z "$ac_cv_path_XMLCATALOG" && ac_cv_path_XMLCATALOG="no"
-@@ -19287,10 +14645,10 @@
+@@ -19271,10 +14699,10 @@
fi
XMLCATALOG=$ac_cv_path_XMLCATALOG
if test -n "$XMLCATALOG"; then
@@ -14720,7 +15803,7 @@ Index: pam.debian/configure
$as_echo "no" >&6; }
fi
-@@ -19306,35 +14664,35 @@
+@@ -19290,35 +14718,35 @@
fi
@@ -14768,7 +15851,7 @@ Index: pam.debian/configure
$as_echo "not found" >&6; }
enable_docu=no
fi
-@@ -19342,9 +14700,9 @@
+@@ -19326,9 +14754,9 @@
# Extract the first word of "w3m", so it can be a program name with args.
set dummy w3m; ac_word=$2
@@ -14780,7 +15863,7 @@ Index: pam.debian/configure
$as_echo_n "(cached) " >&6
else
case $BROWSER in
-@@ -19357,14 +14715,14 @@
+@@ -19341,14 +14769,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -14798,7 +15881,7 @@ Index: pam.debian/configure
IFS=$as_save_IFS
;;
-@@ -19372,10 +14730,10 @@
+@@ -19356,10 +14784,10 @@
fi
BROWSER=$ac_cv_path_BROWSER
if test -n "$BROWSER"; then
@@ -14811,7 +15894,7 @@ Index: pam.debian/configure
$as_echo "no" >&6; }
fi
-@@ -19388,9 +14746,9 @@
+@@ -19372,9 +14800,9 @@
# Extract the first word of "fop", so it can be a program name with args.
set dummy fop; ac_word=$2
@@ -14823,7 +15906,7 @@ Index: pam.debian/configure
$as_echo_n "(cached) " >&6
else
case $FO2PDF in
-@@ -19403,14 +14761,14 @@
+@@ -19387,14 +14815,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -14841,7 +15924,7 @@ Index: pam.debian/configure
IFS=$as_save_IFS
;;
-@@ -19418,10 +14776,10 @@
+@@ -19402,10 +14830,10 @@
fi
FO2PDF=$ac_cv_path_FO2PDF
if test -n "$FO2PDF"; then
@@ -14854,7 +15937,7 @@ Index: pam.debian/configure
$as_echo "no" >&6; }
fi
-@@ -19447,16 +14805,16 @@
+@@ -19431,16 +14859,16 @@
@@ -14874,7 +15957,7 @@ Index: pam.debian/configure
$as_echo "$USE_NLS" >&6; }
-@@ -19497,9 +14855,9 @@
+@@ -19481,9 +14909,9 @@
# Extract the first word of "msgfmt", so it can be a program name with args.
set dummy msgfmt; ac_word=$2
@@ -14886,7 +15969,7 @@ Index: pam.debian/configure
$as_echo_n "(cached) " >&6
else
case "$MSGFMT" in
-@@ -19529,18 +14887,18 @@
+@@ -19513,18 +14941,18 @@
fi
MSGFMT="$ac_cv_path_MSGFMT"
if test "$MSGFMT" != ":"; then
@@ -14909,7 +15992,7 @@ Index: pam.debian/configure
$as_echo_n "(cached) " >&6
else
case $GMSGFMT in
-@@ -19553,14 +14911,14 @@
+@@ -19537,14 +14965,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -14927,7 +16010,7 @@ Index: pam.debian/configure
IFS=$as_save_IFS
test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT"
-@@ -19569,10 +14927,10 @@
+@@ -19553,10 +14981,10 @@
fi
GMSGFMT=$ac_cv_path_GMSGFMT
if test -n "$GMSGFMT"; then
@@ -14940,7 +16023,7 @@ Index: pam.debian/configure
$as_echo "no" >&6; }
fi
-@@ -19620,9 +14978,9 @@
+@@ -19604,9 +15032,9 @@
# Extract the first word of "xgettext", so it can be a program name with args.
set dummy xgettext; ac_word=$2
@@ -14952,7 +16035,7 @@ Index: pam.debian/configure
$as_echo_n "(cached) " >&6
else
case "$XGETTEXT" in
-@@ -19652,10 +15010,10 @@
+@@ -19636,10 +15064,10 @@
fi
XGETTEXT="$ac_cv_path_XGETTEXT"
if test "$XGETTEXT" != ":"; then
@@ -14965,7 +16048,7 @@ Index: pam.debian/configure
$as_echo "no" >&6; }
fi
-@@ -19698,9 +15056,9 @@
+@@ -19682,9 +15110,9 @@
# Extract the first word of "msgmerge", so it can be a program name with args.
set dummy msgmerge; ac_word=$2
@@ -14977,7 +16060,7 @@ Index: pam.debian/configure
$as_echo_n "(cached) " >&6
else
case "$MSGMERGE" in
-@@ -19729,10 +15087,10 @@
+@@ -19713,10 +15141,10 @@
fi
MSGMERGE="$ac_cv_path_MSGMERGE"
if test "$MSGMERGE" != ":"; then
@@ -14990,7 +16073,7 @@ Index: pam.debian/configure
$as_echo "no" >&6; }
fi
-@@ -19764,7 +15122,7 @@
+@@ -19748,7 +15176,7 @@
# Check whether --with-gnu-ld was given.
@@ -14999,7 +16082,7 @@ Index: pam.debian/configure
withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes
else
with_gnu_ld=no
-@@ -19786,7 +15144,7 @@
+@@ -19770,7 +15198,7 @@
ac_prog=ld
if test "$GCC" = yes; then
# Check if gcc -print-prog-name=ld gives a path.
@@ -15008,7 +16091,7 @@ Index: pam.debian/configure
$as_echo_n "checking for ld used by GCC... " >&6; }
case $host in
*-*-mingw*)
-@@ -19816,13 +15174,13 @@
+@@ -19800,13 +15228,13 @@
;;
esac
elif test "$with_gnu_ld" = yes; then
@@ -15025,7 +16108,7 @@ Index: pam.debian/configure
$as_echo_n "(cached) " >&6
else
if test -z "$LD"; then
-@@ -19850,18 +15208,16 @@
+@@ -19834,18 +15262,16 @@
LD="$acl_cv_path_LD"
if test -n "$LD"; then
@@ -15049,7 +16132,7 @@ Index: pam.debian/configure
$as_echo_n "(cached) " >&6
else
# I'd rather use --version here, but apparently some GNU ld's only accept -v.
-@@ -19872,16 +15228,16 @@
+@@ -19856,16 +15282,16 @@
acl_cv_prog_gnu_ld=no ;;
esac
fi
@@ -15069,7 +16152,7 @@ Index: pam.debian/configure
$as_echo_n "(cached) " >&6
else
-@@ -19892,7 +15248,7 @@
+@@ -19876,7 +15302,7 @@
acl_cv_rpath=done
fi
@@ -15078,7 +16161,7 @@ Index: pam.debian/configure
$as_echo "$acl_cv_rpath" >&6; }
wl="$acl_cv_wl"
acl_libext="$acl_cv_libext"
-@@ -19904,7 +15260,7 @@
+@@ -19888,7 +15314,7 @@
acl_hardcode_direct="$acl_cv_hardcode_direct"
acl_hardcode_minus_L="$acl_cv_hardcode_minus_L"
# Check whether --enable-rpath was given.
@@ -15087,7 +16170,7 @@ Index: pam.debian/configure
enableval=$enable_rpath; :
else
enable_rpath=yes
-@@ -19953,7 +15309,7 @@
+@@ -19937,7 +15363,7 @@
# Check whether --with-libiconv-prefix was given.
@@ -15096,7 +16179,7 @@ Index: pam.debian/configure
withval=$with_libiconv_prefix;
if test "X$withval" = "Xno"; then
use_additional=no
-@@ -20393,18 +15749,14 @@
+@@ -20377,18 +15803,14 @@
@@ -15118,7 +16201,7 @@ Index: pam.debian/configure
/* end confdefs.h. */
#include <CoreFoundation/CFPreferences.h>
int
-@@ -20415,61 +15767,30 @@
+@@ -20399,61 +15821,30 @@
return 0;
}
_ACEOF
@@ -15189,7 +16272,7 @@ Index: pam.debian/configure
/* end confdefs.h. */
#include <CoreFoundation/CFLocale.h>
int
-@@ -20480,47 +15801,20 @@
+@@ -20464,47 +15855,20 @@
return 0;
}
_ACEOF
@@ -15243,7 +16326,7 @@ Index: pam.debian/configure
fi
INTL_MACOSX_LIBS=
-@@ -20565,16 +15859,12 @@
+@@ -20549,16 +15913,12 @@
gt_expression_test_code=
fi
@@ -15263,7 +16346,7 @@ Index: pam.debian/configure
/* end confdefs.h. */
#include <libintl.h>
$gt_revision_test_code
-@@ -20589,42 +15879,16 @@
+@@ -20573,42 +15933,16 @@
return 0;
}
_ACEOF
@@ -15312,7 +16395,7 @@ Index: pam.debian/configure
$as_echo "$ac_res" >&6; }
if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" != "yes"; }; then
-@@ -20658,19 +15922,15 @@
+@@ -20642,19 +15976,15 @@
done
@@ -15335,7 +16418,7 @@ Index: pam.debian/configure
/* end confdefs.h. */
#include <stdlib.h>
#include <iconv.h>
-@@ -20684,46 +15944,15 @@
+@@ -20668,46 +15998,15 @@
return 0;
}
_ACEOF
@@ -15386,7 +16469,7 @@ Index: pam.debian/configure
/* end confdefs.h. */
#include <stdlib.h>
#include <iconv.h>
-@@ -20737,49 +15966,22 @@
+@@ -20721,49 +16020,22 @@
return 0;
}
_ACEOF
@@ -15442,7 +16525,7 @@ Index: pam.debian/configure
$as_echo_n "(cached) " >&6
else
-@@ -20787,17 +15989,13 @@
+@@ -20771,17 +16043,13 @@
if test $am_cv_lib_iconv = yes; then
LIBS="$LIBS $LIBICONV"
fi
@@ -15462,7 +16545,7 @@ Index: pam.debian/configure
/* end confdefs.h. */
#include <iconv.h>
-@@ -20857,46 +16055,19 @@
+@@ -20841,46 +16109,19 @@
return 0;
}
_ACEOF
@@ -15514,7 +16597,7 @@ Index: pam.debian/configure
$as_echo "$am_cv_func_iconv_works" >&6; }
case "$am_cv_func_iconv_works" in
*no) am_func_iconv=no am_cv_lib_iconv=no ;;
-@@ -20907,15 +16078,13 @@
+@@ -20891,15 +16132,13 @@
fi
if test "$am_func_iconv" = yes; then
@@ -15533,7 +16616,7 @@ Index: pam.debian/configure
$as_echo "$LIBICONV" >&6; }
else
CPPFLAGS="$am_save_CPPFLAGS"
-@@ -20945,7 +16114,7 @@
+@@ -20929,7 +16168,7 @@
# Check whether --with-libintl-prefix was given.
@@ -15542,7 +16625,7 @@ Index: pam.debian/configure
withval=$with_libintl_prefix;
if test "X$withval" = "Xno"; then
use_additional=no
-@@ -21361,20 +16530,16 @@
+@@ -21345,20 +16584,16 @@
done
fi
@@ -15566,7 +16649,7 @@ Index: pam.debian/configure
/* end confdefs.h. */
#include <libintl.h>
$gt_revision_test_code
-@@ -21393,45 +16558,16 @@
+@@ -21377,45 +16612,16 @@
return 0;
}
_ACEOF
@@ -15617,7 +16700,7 @@ Index: pam.debian/configure
/* end confdefs.h. */
#include <libintl.h>
$gt_revision_test_code
-@@ -21450,48 +16586,20 @@
+@@ -21434,48 +16640,20 @@
return 0;
}
_ACEOF
@@ -15671,7 +16754,7 @@ Index: pam.debian/configure
$as_echo "$ac_res" >&6; }
fi
-@@ -21519,21 +16627,19 @@
+@@ -21503,21 +16681,19 @@
if test "$gt_use_preinstalled_gnugettext" = "yes" \
|| test "$nls_cv_use_gnu_gettext" = "yes"; then
@@ -15697,7 +16780,7 @@ Index: pam.debian/configure
$as_echo_n "checking where the gettext function comes from... " >&6; }
if test "$gt_use_preinstalled_gnugettext" = "yes"; then
if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; }; then
-@@ -21544,7 +16650,7 @@
+@@ -21528,7 +16704,7 @@
else
gt_source="included intl directory"
fi
@@ -15706,7 +16789,7 @@ Index: pam.debian/configure
$as_echo "$gt_source" >&6; }
fi
-@@ -21552,9 +16658,9 @@
+@@ -21536,9 +16712,9 @@
if test "$gt_use_preinstalled_gnugettext" = "yes"; then
if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; }; then
@@ -15718,7 +16801,7 @@ Index: pam.debian/configure
$as_echo "$LIBINTL" >&6; }
for element in $INCINTL; do
-@@ -21582,14 +16688,10 @@
+@@ -21566,14 +16742,10 @@
fi
@@ -15735,17 +16818,10 @@ Index: pam.debian/configure
fi
-@@ -21598,233 +16700,38 @@
+@@ -21589,226 +16761,31 @@
-- INTLLIBS="$LIBINTL"
--
--
--
--
--
--
-
-for ac_func in dngettext
-do
@@ -15897,11 +16973,10 @@ Index: pam.debian/configure
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-+ INTLLIBS="$LIBINTL"
-
+-
- ac_cv_have_decl___NR_keyctl=no
-fi
-
+-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_have_decl___NR_keyctl" >&5
@@ -15911,7 +16986,7 @@ Index: pam.debian/configure
-else
- have_key_syscalls=0
-fi
-
+-
-{ $as_echo "$as_me:$LINENO: checking whether ENOKEY is declared" >&5
-$as_echo_n "checking whether ENOKEY is declared... " >&6; }
-if test "${ac_cv_have_decl_ENOKEY+set}" = set; then
@@ -15924,18 +16999,17 @@ Index: pam.debian/configure
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <errno.h>
-
+-
-int
-main ()
-{
-#ifndef ENOKEY
- (void) ENOKEY;
-#endif
-
+-
- ;
- return 0;
-}
-+
+for ac_func in dngettext
+do :
+ ac_fn_c_check_func "$LINENO" "dngettext" "ac_cv_func_dngettext"
@@ -15991,7 +17065,7 @@ Index: pam.debian/configure
have_key_errors=1
else
have_key_errors=0
-@@ -21839,9 +16746,7 @@
+@@ -21823,9 +16800,7 @@
if test $HAVE_KEY_MANAGEMENT = 1; then
@@ -16002,7 +17076,7 @@ Index: pam.debian/configure
fi
HAVE_KEY_MANAGEMENT=$HAVE_KEY_MANAGEMENT
-@@ -21885,13 +16790,13 @@
+@@ -21869,13 +16844,13 @@
case $ac_val in #(
*${as_nl}*)
case $ac_var in #(
@@ -16018,7 +17092,7 @@ Index: pam.debian/configure
esac ;;
esac
done
-@@ -21899,8 +16804,8 @@
+@@ -21883,8 +16858,8 @@
(set) 2>&1 |
case $as_nl`(ac_space=' '; set) 2>&1` in #(
*${as_nl}ac_space=\ *)
@@ -16029,7 +17103,7 @@ Index: pam.debian/configure
sed -n \
"s/'/'\\\\''/g;
s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
-@@ -21923,11 +16828,11 @@
+@@ -21907,11 +16882,11 @@
if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
if test -w "$cache_file"; then
test "x$cache_file" != "x/dev/null" &&
@@ -16043,7 +17117,7 @@ Index: pam.debian/configure
$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
fi
fi
-@@ -21947,8 +16852,8 @@
+@@ -21931,114 +16906,84 @@
ac_i=`$as_echo "$ac_i" | sed "$ac_script"`
# 2. Prepend LIBOBJDIR. When used with automake>=1.10 LIBOBJDIR
# will be set to the directory where LIBOBJS objects are built.
@@ -16054,9 +17128,17 @@ Index: pam.debian/configure
done
LIBOBJS=$ac_libobjs
-@@ -21964,105 +16869,67 @@
- fi
+ LTLIBOBJS=$ac_ltlibobjs
+
++ if test -n "$EXEEXT"; then
++ am__EXEEXT_TRUE=
++ am__EXEEXT_FALSE='#'
++else
++ am__EXEEXT_TRUE='#'
++ am__EXEEXT_FALSE=
++fi
++
if test -z "${STATIC_MODULES_TRUE}" && test -z "${STATIC_MODULES_FALSE}"; then
- { { $as_echo "$as_me:$LINENO: error: conditional \"STATIC_MODULES\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
@@ -16189,7 +17271,7 @@ Index: pam.debian/configure
#! $SHELL
# Generated by $as_me.
# Run this file to recreate the current configuration.
-@@ -22072,17 +16939,18 @@
+@@ -22048,17 +16993,18 @@
debug=false
ac_cs_recheck=false
ac_cs_silent=false
@@ -16215,7 +17297,7 @@ Index: pam.debian/configure
emulate sh
NULLCMD=:
# Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
-@@ -22090,23 +16958,15 @@
+@@ -22066,23 +17012,15 @@
alias -g '${1+"$@"}'='"$@"'
setopt NO_GLOB_SUBST
else
@@ -16244,7 +17326,7 @@ Index: pam.debian/configure
as_nl='
'
export as_nl
-@@ -22114,7 +16974,13 @@
+@@ -22090,7 +17028,13 @@
as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
@@ -16259,7 +17341,7 @@ Index: pam.debian/configure
as_echo='printf %s\n'
as_echo_n='printf %s'
else
-@@ -22125,7 +16991,7 @@
+@@ -22101,7 +17045,7 @@
as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
as_echo_n_body='eval
arg=$1;
@@ -16268,7 +17350,7 @@ Index: pam.debian/configure
*"$as_nl"*)
expr "X$arg" : "X\\(.*\\)$as_nl";
arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
-@@ -22148,13 +17014,6 @@
+@@ -22124,13 +17068,6 @@
}
fi
@@ -16282,7 +17364,7 @@ Index: pam.debian/configure
# IFS
# We need space, tab and new line, in precisely that order. Quoting is
-@@ -22164,15 +17023,15 @@
+@@ -22140,15 +17077,15 @@
IFS=" "" $as_nl"
# Find who we are. Look in the path if we contain no directory separator.
@@ -16301,7 +17383,7 @@ Index: pam.debian/configure
IFS=$as_save_IFS
;;
-@@ -22184,12 +17043,16 @@
+@@ -22160,12 +17097,16 @@
fi
if test ! -f "$as_myself"; then
$as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
@@ -16322,7 +17404,7 @@ Index: pam.debian/configure
done
PS1='$ '
PS2='> '
-@@ -22201,7 +17064,89 @@
+@@ -22177,7 +17118,89 @@
LANGUAGE=C
export LANGUAGE
@@ -16413,7 +17495,7 @@ Index: pam.debian/configure
if expr a : '\(a\)' >/dev/null 2>&1 &&
test "X`expr 00001 : '.*\(...\)'`" = X001; then
as_expr=expr
-@@ -22215,8 +17160,12 @@
+@@ -22191,8 +17214,12 @@
as_basename=false
fi
@@ -16427,7 +17509,7 @@ Index: pam.debian/configure
as_me=`$as_basename -- "$0" ||
$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
X"$0" : 'X\(//\)$' \| \
-@@ -22236,76 +17185,25 @@
+@@ -22212,76 +17239,25 @@
}
s/.*/./; q'`
@@ -16515,7 +17597,7 @@ Index: pam.debian/configure
rm -f conf$$ conf$$.exe conf$$.file
if test -d conf$$.dir; then
-@@ -22334,8 +17232,56 @@
+@@ -22310,8 +17286,56 @@
rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
rmdir conf$$.dir 2>/dev/null
@@ -16573,7 +17655,7 @@ Index: pam.debian/configure
else
test -d ./-p && rmdir ./-p
as_mkdir_p=false
-@@ -22354,10 +17300,10 @@
+@@ -22330,10 +17354,10 @@
if test -d "$1"; then
test -d "$1/.";
else
@@ -16586,7 +17668,7 @@ Index: pam.debian/configure
???[sx]*):;;*)false;;esac;fi
'\'' sh
'
-@@ -22372,13 +17318,19 @@
+@@ -22348,13 +17372,19 @@
exec 6>&1
@@ -16608,7 +17690,7 @@ Index: pam.debian/configure
CONFIG_FILES = $CONFIG_FILES
CONFIG_HEADERS = $CONFIG_HEADERS
-@@ -22410,13 +17362,15 @@
+@@ -22386,13 +17416,15 @@
cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
ac_cs_usage="\
@@ -16627,7 +17709,7 @@ Index: pam.debian/configure
-q, --quiet, --silent
do not print progress messages
-d, --debug don't remove temporary files
-@@ -22435,16 +17389,17 @@
+@@ -22411,16 +17443,17 @@
Configuration commands:
$config_commands
@@ -16649,7 +17731,7 @@ Index: pam.debian/configure
This config.status script is free software; the Free Software Foundation
gives unlimited permission to copy, distribute and modify it."
-@@ -22480,6 +17435,8 @@
+@@ -22456,6 +17489,8 @@
ac_cs_recheck=: ;;
--version | --versio | --versi | --vers | --ver | --ve | --v | -V )
$as_echo "$ac_cs_version"; exit ;;
@@ -16658,7 +17740,7 @@ Index: pam.debian/configure
--debug | --debu | --deb | --de | --d | -d )
debug=: ;;
--file | --fil | --fi | --f )
-@@ -22487,20 +17444,19 @@
+@@ -22463,20 +17498,19 @@
case $ac_optarg in
*\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
esac
@@ -16683,7 +17765,7 @@ Index: pam.debian/configure
--help | --hel | -h )
$as_echo "$ac_cs_usage"; exit ;;
-q | -quiet | --quiet | --quie | --qui | --qu | --q \
-@@ -22508,11 +17464,10 @@
+@@ -22484,11 +17518,10 @@
ac_cs_silent=: ;;
# This is an error.
@@ -16698,7 +17780,7 @@ Index: pam.debian/configure
ac_need_defaults=false ;;
esac
-@@ -22893,9 +17848,7 @@
+@@ -22869,9 +17902,7 @@
"tests/Makefile") CONFIG_FILES="$CONFIG_FILES tests/Makefile" ;;
"xtests/Makefile") CONFIG_FILES="$CONFIG_FILES xtests/Makefile" ;;
@@ -16709,7 +17791,7 @@ Index: pam.debian/configure
esac
done
-@@ -22922,7 +17875,7 @@
+@@ -22898,7 +17929,7 @@
trap 'exit_status=$?
{ test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status
' 0
@@ -16718,7 +17800,7 @@ Index: pam.debian/configure
}
# Create a (secure) tmp directory for tmp files.
-@@ -22933,11 +17886,7 @@
+@@ -22909,11 +17940,7 @@
{
tmp=./conf$$-$RANDOM
(umask 077 && mkdir "$tmp")
@@ -16731,7 +17813,7 @@ Index: pam.debian/configure
# Set up the scripts for CONFIG_FILES section.
# No need to generate them if there are no CONFIG_FILES.
-@@ -22945,10 +17894,16 @@
+@@ -22921,10 +17948,16 @@
if test -n "$CONFIG_FILES"; then
@@ -16750,7 +17832,7 @@ Index: pam.debian/configure
else
ac_cs_awk_cr=$ac_cr
fi
-@@ -22962,24 +17917,18 @@
+@@ -22938,24 +17971,18 @@
echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
echo "_ACEOF"
} >conf$$subs.sh ||
@@ -16778,7 +17860,7 @@ Index: pam.debian/configure
else
ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
fi
-@@ -23001,7 +17950,7 @@
+@@ -22977,7 +18004,7 @@
t delim
:nl
h
@@ -16787,7 +17869,7 @@ Index: pam.debian/configure
t more1
s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/
p
-@@ -23015,7 +17964,7 @@
+@@ -22991,7 +18018,7 @@
t nl
:delim
h
@@ -16796,7 +17878,7 @@ Index: pam.debian/configure
t more2
s/["\\]/\\&/g; s/^/"/; s/$/"/
p
-@@ -23068,9 +18017,7 @@
+@@ -23044,9 +18071,7 @@
else
cat
fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
@@ -16807,7 +17889,7 @@ Index: pam.debian/configure
_ACEOF
# VPATH may cause trouble with some makes, so we remove $(srcdir),
-@@ -23111,9 +18058,7 @@
+@@ -23087,9 +18112,7 @@
if test -z "$ac_t"; then
break
elif $ac_last_try; then
@@ -16818,7 +17900,7 @@ Index: pam.debian/configure
else
ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
fi
-@@ -23198,9 +18143,7 @@
+@@ -23174,9 +18197,7 @@
_ACAWK
_ACEOF
cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
@@ -16829,7 +17911,7 @@ Index: pam.debian/configure
fi # test -n "$CONFIG_HEADERS"
-@@ -23213,9 +18156,7 @@
+@@ -23189,9 +18210,7 @@
esac
case $ac_mode$ac_tag in
:[FHL]*:*);;
@@ -16840,7 +17922,7 @@ Index: pam.debian/configure
:[FH]-) ac_tag=-:-;;
:[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
esac
-@@ -23243,12 +18184,10 @@
+@@ -23219,12 +18238,10 @@
[\\/$]*) false;;
*) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
esac ||
@@ -16855,7 +17937,7 @@ Index: pam.debian/configure
done
# Let's still pretend it is `configure' which instantiates (i.e., don't
-@@ -23259,7 +18198,7 @@
+@@ -23235,7 +18252,7 @@
`' by configure.'
if test x"$ac_file" != x-; then
configure_input="$ac_file. $configure_input"
@@ -16864,7 +17946,7 @@ Index: pam.debian/configure
$as_echo "$as_me: creating $ac_file" >&6;}
fi
# Neutralize special characters interpreted by sed in replacement strings.
-@@ -23272,9 +18211,7 @@
+@@ -23248,9 +18265,7 @@
case $ac_tag in
*:-:* | *:-) cat >"$tmp/stdin" \
@@ -16875,7 +17957,7 @@ Index: pam.debian/configure
esac
;;
esac
-@@ -23302,47 +18239,7 @@
+@@ -23278,47 +18293,7 @@
q
}
s/.*/./; q'`
@@ -16924,7 +18006,7 @@ Index: pam.debian/configure
ac_builddir=.
case "$ac_dir" in
-@@ -23399,7 +18296,6 @@
+@@ -23375,7 +18350,6 @@
# If the template does not know about datarootdir, expand it.
# FIXME: This hack should be removed a few years after 2.60.
ac_datarootdir_hack=; ac_datarootdir_seen=
@@ -16932,7 +18014,7 @@ Index: pam.debian/configure
ac_sed_dataroot='
/datarootdir/ {
p
-@@ -23409,12 +18305,11 @@
+@@ -23385,12 +18359,11 @@
/@docdir@/p
/@infodir@/p
/@localedir@/p
@@ -16947,7 +18029,7 @@ Index: pam.debian/configure
$as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-@@ -23424,7 +18319,7 @@
+@@ -23400,7 +18373,7 @@
s&@infodir@&$infodir&g
s&@localedir@&$localedir&g
s&@mandir@&$mandir&g
@@ -16956,7 +18038,7 @@ Index: pam.debian/configure
esac
_ACEOF
-@@ -23453,14 +18348,12 @@
+@@ -23429,14 +18402,12 @@
$ac_datarootdir_hack
"
eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \
@@ -16973,7 +18055,7 @@ Index: pam.debian/configure
which seems to be undefined. Please make sure it is defined." >&5
$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
which seems to be undefined. Please make sure it is defined." >&2;}
-@@ -23470,9 +18363,7 @@
+@@ -23446,9 +18417,7 @@
-) cat "$tmp/out" && rm -f "$tmp/out";;
*) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
esac \
@@ -16984,7 +18066,7 @@ Index: pam.debian/configure
;;
:H)
#
-@@ -23483,25 +18374,19 @@
+@@ -23459,25 +18428,19 @@
$as_echo "/* $configure_input */" \
&& eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs"
} >"$tmp/config.h" \
@@ -17014,7 +18096,7 @@ Index: pam.debian/configure
fi
# Compute "$ac_file"'s index in $config_headers.
_am_arg="$ac_file"
-@@ -23539,7 +18424,7 @@
+@@ -23515,25 +18478,35 @@
s/.*/./; q'`/stamp-h$_am_stamp_count
;;
@@ -17023,11 +18105,102 @@ Index: pam.debian/configure
$as_echo "$as_me: executing $ac_file commands" >&6;}
;;
esac
-@@ -23634,47 +18519,7 @@
+
+
+ case $ac_file$ac_mode in
+- "depfiles":C) test x"$AMDEP_TRUE" != x"" || for mf in $CONFIG_FILES; do
+- # Strip MF so we end up with the name of the file.
+- mf=`echo "$mf" | sed -e 's/:.*$//'`
+- # Check whether this is an Automake generated Makefile or not.
+- # We used to match only the files named `Makefile.in', but
+- # some people rename them; so instead we look at the file content.
+- # Grep'ing the first line is not enough: some people post-process
+- # each Makefile.in and add a new line on top of each file to say so.
+- # Grep'ing the whole file is not good either: AIX grep has a line
+- # limit of 2048, but all sed's we know have understand at least 4000.
+- if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
+- dirpart=`$as_dirname -- "$mf" ||
++ "depfiles":C) test x"$AMDEP_TRUE" != x"" || {
++ # Autoconf 2.62 quotes --file arguments for eval, but not when files
++ # are listed without --file. Let's play safe and only enable the eval
++ # if we detect the quoting.
++ case $CONFIG_FILES in
++ *\'*) eval set x "$CONFIG_FILES" ;;
++ *) set x $CONFIG_FILES ;;
++ esac
++ shift
++ for mf
++ do
++ # Strip MF so we end up with the name of the file.
++ mf=`echo "$mf" | sed -e 's/:.*$//'`
++ # Check whether this is an Automake generated Makefile or not.
++ # We used to match only the files named `Makefile.in', but
++ # some people rename them; so instead we look at the file content.
++ # Grep'ing the first line is not enough: some people post-process
++ # each Makefile.in and add a new line on top of each file to say so.
++ # Grep'ing the whole file is not good either: AIX grep has a line
++ # limit of 2048, but all sed's we know have understand at least 4000.
++ if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
++ dirpart=`$as_dirname -- "$mf" ||
+ $as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+ X"$mf" : 'X\(//\)[^/]' \| \
+ X"$mf" : 'X\(//\)$' \| \
+@@ -23556,28 +18529,28 @@
q
}
s/.*/./; q'`
-- { as_dir=$dirpart/$fdir
+- else
+- continue
+- fi
+- # Extract the definition of DEPDIR, am__include, and am__quote
+- # from the Makefile without running `make'.
+- DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
+- test -z "$DEPDIR" && continue
+- am__include=`sed -n 's/^am__include = //p' < "$mf"`
+- test -z "am__include" && continue
+- am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
+- # When using ansi2knr, U may be empty or an underscore; expand it
+- U=`sed -n 's/^U = //p' < "$mf"`
+- # Find all dependency output files, they are included files with
+- # $(DEPDIR) in their names. We invoke sed twice because it is the
+- # simplest approach to changing $(DEPDIR) to its actual value in the
+- # expansion.
+- for file in `sed -n "
+- s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
+- sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
+- # Make sure the directory exists.
+- test -f "$dirpart/$file" && continue
+- fdir=`$as_dirname -- "$file" ||
++ else
++ continue
++ fi
++ # Extract the definition of DEPDIR, am__include, and am__quote
++ # from the Makefile without running `make'.
++ DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
++ test -z "$DEPDIR" && continue
++ am__include=`sed -n 's/^am__include = //p' < "$mf"`
++ test -z "am__include" && continue
++ am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
++ # When using ansi2knr, U may be empty or an underscore; expand it
++ U=`sed -n 's/^U = //p' < "$mf"`
++ # Find all dependency output files, they are included files with
++ # $(DEPDIR) in their names. We invoke sed twice because it is the
++ # simplest approach to changing $(DEPDIR) to its actual value in the
++ # expansion.
++ for file in `sed -n "
++ s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
++ sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
++ # Make sure the directory exists.
++ test -f "$dirpart/$file" && continue
++ fdir=`$as_dirname -- "$file" ||
+ $as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+ X"$file" : 'X\(//\)[^/]' \| \
+ X"$file" : 'X\(//\)$' \| \
+@@ -23600,51 +18573,12 @@
+ q
+ }
+ s/.*/./; q'`
+- { as_dir=$dirpart/$fdir
- case $as_dir in #(
- -*) as_dir=./$as_dir;;
- esac
@@ -17063,16 +18236,23 @@ Index: pam.debian/configure
- }
- s/.*/./; q'`
- test -d "$as_dir" && break
-- done
++ as_dir=$dirpart/$fdir; as_fn_mkdir_p
++ # echo "creating $dirpart/$file"
++ echo '# dummy' > "$dirpart/$file"
+ done
- test -z "$as_dirs" || eval "mkdir $as_dirs"
- } || test -d "$as_dir" || { { $as_echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
-$as_echo "$as_me: error: cannot create directory $as_dir" >&2;}
- { (exit 1); exit 1; }; }; }
-+ as_dir=$dirpart/$fdir; as_fn_mkdir_p
- # echo "creating $dirpart/$file"
- echo '# dummy' > "$dirpart/$file"
- done
-@@ -24434,15 +19279,12 @@
+- # echo "creating $dirpart/$file"
+- echo '# dummy' > "$dirpart/$file"
+ done
+-done
++}
+ ;;
+ "libtool":C)
+
+@@ -24399,15 +19333,12 @@
done # for ac_tag
@@ -17090,7 +18270,7 @@ Index: pam.debian/configure
# configure is writing to config.log, and then calls config.status.
-@@ -24463,10 +19305,10 @@
+@@ -24428,10 +19359,10 @@
exec 5>>config.log
# Use ||, not &&, to avoid exiting from the if with $? = 1, which
# would make configure fail if this is the last instruction.
@@ -17107,30 +18287,95 @@ Index: pam.debian/Makefile.in
===================================================================
--- pam.debian.orig/Makefile.in
+++ pam.debian/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.11 from Makefile.am.
+@@ -1,8 +1,9 @@
+-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -46,7 +46,6 @@
+-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
++# Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -19,8 +20,9 @@
+ #
+ VPATH = @srcdir@
+ pkgdatadir = $(datadir)/@PACKAGE@
+-pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
++pkglibdir = $(libdir)/@PACKAGE@
++pkglibexecdir = $(libexecdir)/@PACKAGE@
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+@@ -39,7 +41,7 @@
+ DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
+ $(srcdir)/Makefile.in $(srcdir)/config.h.in \
+ $(top_srcdir)/configure ABOUT-NLS AUTHORS COPYING ChangeLog \
+- INSTALL NEWS compile config.guess config.rpath config.sub \
++ INSTALL NEWS TODO compile config.guess config.rpath config.sub \
+ depcomp install-sh ltmain.sh missing mkinstalldirs ylwrap
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
- $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \
-- $(top_srcdir)/m4/japhar_grep_cflags.m4 \
- $(top_srcdir)/m4/jh_path_xml_catalog.m4 \
- $(top_srcdir)/m4/ld-O1.m4 $(top_srcdir)/m4/ld-as-needed.m4 \
- $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
-@@ -55,7 +54,7 @@
- $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
- $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \
- $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
-- $(top_srcdir)/configure.in
-+ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
- am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
-@@ -200,6 +199,7 @@
+@@ -61,6 +63,7 @@
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ CONFIG_HEADER = config.h
+ CONFIG_CLEAN_FILES =
++CONFIG_CLEAN_VPATH_FILES =
+ SOURCES =
+ DIST_SOURCES =
+ RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
+@@ -72,6 +75,9 @@
+ ps-recursive uninstall-recursive
+ RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
+ distclean-recursive maintainer-clean-recursive
++AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
++ $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
++ distdir dist dist-all distcheck
+ ETAGS = etags
+ CTAGS = ctags
+ DIST_SUBDIRS = libpam tests libpamc libpam_misc modules po conf doc \
+@@ -80,9 +86,34 @@
+ distdir = $(PACKAGE)-$(VERSION)
+ top_distdir = $(distdir)
+ am__remove_distdir = \
+- { test ! -d $(distdir) \
+- || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \
+- && rm -fr $(distdir); }; }
++ { test ! -d "$(distdir)" \
++ || { find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \
++ && rm -fr "$(distdir)"; }; }
++am__relativize = \
++ dir0=`pwd`; \
++ sed_first='s,^\([^/]*\)/.*$$,\1,'; \
++ sed_rest='s,^[^/]*/*,,'; \
++ sed_last='s,^.*/\([^/]*\)$$,\1,'; \
++ sed_butlast='s,/*[^/]*$$,,'; \
++ while test -n "$$dir1"; do \
++ first=`echo "$$dir1" | sed -e "$$sed_first"`; \
++ if test "$$first" != "."; then \
++ if test "$$first" = ".."; then \
++ dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \
++ dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \
++ else \
++ first2=`echo "$$dir2" | sed -e "$$sed_first"`; \
++ if test "$$first2" = "$$first"; then \
++ dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \
++ else \
++ dir2="../$$dir2"; \
++ fi; \
++ dir0="$$dir0"/"$$first"; \
++ fi; \
++ fi; \
++ dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
++ done; \
++ reldir="$$dir2"
+ DIST_ARCHIVES = $(distdir).tar.gz $(distdir).tar.bz2
+ GZIP_ENV = --best
+ distuninstallcheck_listfiles = find . -type f -print
+@@ -170,6 +201,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -17138,7 +18383,59 @@ Index: pam.debian/Makefile.in
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PIE_CFLAGS = @PIE_CFLAGS@
-@@ -364,7 +364,7 @@
+@@ -272,15 +304,15 @@
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+- echo ' cd $(srcdir) && $(AUTOMAKE) --gnu '; \
+- cd $(srcdir) && $(AUTOMAKE) --gnu \
++ echo ' cd $(srcdir) && $(AUTOMAKE) --gnu'; \
++ $(am__cd) $(srcdir) && $(AUTOMAKE) --gnu \
+ && exit 0; \
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile'; \
+- cd $(top_srcdir) && \
+- $(AUTOMAKE) --gnu Makefile
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile'; \
++ $(am__cd) $(top_srcdir) && \
++ $(AUTOMAKE) --gnu Makefile
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ @case '$?' in \
+@@ -296,9 +328,10 @@
+ $(SHELL) ./config.status --recheck
+
+ $(top_srcdir)/configure: $(am__configure_deps)
+- cd $(srcdir) && $(AUTOCONF)
++ $(am__cd) $(srcdir) && $(AUTOCONF)
+ $(ACLOCAL_M4): $(am__aclocal_m4_deps)
+- cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
++ $(am__cd) $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
++$(am__aclocal_m4_deps):
+
+ config.h: stamp-h1
+ @if test ! -f $@; then \
+@@ -310,7 +343,7 @@
+ @rm -f stamp-h1
+ cd $(top_builddir) && $(SHELL) ./config.status config.h
+ $(srcdir)/config.h.in: $(am__configure_deps)
+- cd $(top_srcdir) && $(AUTOHEADER)
++ ($(am__cd) $(top_srcdir) && $(AUTOHEADER))
+ rm -f stamp-h1
+ touch $@
+
+@@ -324,7 +357,7 @@
+ -rm -rf .libs _libs
+
+ distclean-libtool:
+- -rm -f libtool
++ -rm -f libtool config.lt
+
+ # This directory's subdirectories are mostly independent; you can cd
+ # into them and run `make' without going through this Makefile.
+@@ -333,7 +366,7 @@
# (which will cause the Makefiles to be regenerated when you run `make');
# (2) otherwise, pass the desired values on the `make' command line.
$(RECURSIVE_TARGETS):
@@ -17147,7 +18444,16 @@ Index: pam.debian/Makefile.in
for f in x $$MAKEFLAGS; do \
case $$f in \
*=* | --[!k]*);; \
-@@ -389,7 +389,7 @@
+@@ -350,7 +383,7 @@
+ else \
+ local_target="$$target"; \
+ fi; \
+- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
++ ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+ || eval $$failcom; \
+ done; \
+ if test "$$dot_seen" = "no"; then \
+@@ -358,7 +391,7 @@
fi; test -z "$$fail"
$(RECURSIVE_CLEAN_TARGETS):
@@ -17156,17 +18462,184 @@ Index: pam.debian/Makefile.in
for f in x $$MAKEFLAGS; do \
case $$f in \
*=* | --[!k]*);; \
-@@ -559,7 +559,8 @@
+@@ -384,16 +417,16 @@
+ else \
+ local_target="$$target"; \
fi; \
+- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
++ ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+ || eval $$failcom; \
+ done && test -z "$$fail"
+ tags-recursive:
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+- test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
++ test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
done
- -test -n "$(am__skip_mode_fix)" \
-- || find "$(distdir)" -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
+ ctags-recursive:
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+- test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
++ test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+ done
+
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+@@ -401,14 +434,14 @@
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+- $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ mkid -fID $$unique
+ tags: TAGS
+
+ TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
+ $(TAGS_FILES) $(LISP)
+- tags=; \
++ set x; \
+ here=`pwd`; \
+ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
+ include_option=--etags-include; \
+@@ -420,7 +453,7 @@
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+ if test "$$subdir" = .; then :; else \
+ test ! -f $$subdir/TAGS || \
+- tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
++ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
+ fi; \
+ done; \
+ list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
+@@ -429,29 +462,34 @@
+ done | \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
+- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
++ shift; \
++ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+ test -n "$$unique" || unique=$$empty_fix; \
+- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+- $$tags $$unique; \
++ if test $$# -gt 0; then \
++ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
++ "$$@" $$unique; \
++ else \
++ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
++ $$unique; \
++ fi; \
+ fi
+ ctags: CTAGS
+ CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
+ $(TAGS_FILES) $(LISP)
+- tags=; \
+ list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
+- test -z "$(CTAGS_ARGS)$$tags$$unique" \
++ test -z "$(CTAGS_ARGS)$$unique" \
+ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+- $$tags $$unique
++ $$unique
+
+ GTAGS:
+ here=`$(am__cd) $(top_builddir) && pwd` \
+- && cd $(top_srcdir) \
+- && gtags -i $(GTAGS_ARGS) $$here
++ && $(am__cd) $(top_srcdir) \
++ && gtags -i $(GTAGS_ARGS) "$$here"
+
+ distclean-tags:
+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+@@ -464,7 +502,7 @@
+ exit 1;; \
+ esac
+ $(am__remove_distdir)
+- test -d $(distdir) || mkdir $(distdir)
++ test -d "$(distdir)" || mkdir "$(distdir)"
+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ list='$(DISTFILES)'; \
+@@ -480,38 +518,55 @@
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+ if test -d $$d/$$file; then \
+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
++ if test -d "$(distdir)/$$file"; then \
++ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
++ fi; \
+ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
++ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
++ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+ fi; \
+- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
++ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+ else \
+- test -f $(distdir)/$$file \
+- || cp -p $$d/$$file $(distdir)/$$file \
++ test -f "$(distdir)/$$file" \
++ || cp -p $$d/$$file "$(distdir)/$$file" \
+ || exit 1; \
+ fi; \
+ done
+- list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
++ @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+ if test "$$subdir" = .; then :; else \
+ test -d "$(distdir)/$$subdir" \
+ || $(MKDIR_P) "$(distdir)/$$subdir" \
+ || exit 1; \
+- distdir=`$(am__cd) $(distdir) && pwd`; \
+- top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
+- (cd $$subdir && \
++ fi; \
++ done
++ @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
++ if test "$$subdir" = .; then :; else \
++ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
++ $(am__relativize); \
++ new_distdir=$$reldir; \
++ dir1=$$subdir; dir2="$(top_distdir)"; \
++ $(am__relativize); \
++ new_top_distdir=$$reldir; \
++ echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
++ echo " am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \
++ ($(am__cd) $$subdir && \
+ $(MAKE) $(AM_MAKEFLAGS) \
+- top_distdir="$$top_distdir" \
+- distdir="$$distdir/$$subdir" \
++ top_distdir="$$new_top_distdir" \
++ distdir="$$new_distdir" \
+ am__remove_distdir=: \
+ am__skip_length_check=: \
++ am__skip_mode_fix=: \
+ distdir) \
+ || exit 1; \
+ fi; \
+ done
+- -find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
++ -test -n "$(am__skip_mode_fix)" \
+ || find "$(distdir)" -type d ! -perm -755 \
+ -exec chmod u+rwx,go+rx {} \; -o \
! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
! -type d ! -perm -400 -exec chmod a+r {} \; -o \
! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
-@@ -603,17 +604,17 @@
+- || chmod -R a+r $(distdir)
++ || chmod -R a+r "$(distdir)"
+ dist-gzip: distdir
+ tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
+ $(am__remove_distdir)
+@@ -523,6 +578,10 @@
+ tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma
+ $(am__remove_distdir)
+
++dist-xz: distdir
++ tardir=$(distdir) && $(am__tar) | xz -c >$(distdir).tar.xz
++ $(am__remove_distdir)
++
+ dist-tarZ: distdir
+ tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
+ $(am__remove_distdir)
+@@ -547,15 +606,17 @@
distcheck: dist
case '$(DIST_ARCHIVES)' in \
*.tar.gz*) \
@@ -17178,8 +18651,8 @@ Index: pam.debian/Makefile.in
*.tar.lzma*) \
- unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\
+ lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\
- *.tar.xz*) \
- xz -dc $(distdir).tar.xz | $(am__untar) ;;\
++ *.tar.xz*) \
++ xz -dc $(distdir).tar.xz | $(am__untar) ;;\
*.tar.Z*) \
uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
*.shar.gz*) \
@@ -17188,34 +18661,221 @@ Index: pam.debian/Makefile.in
*.zip*) \
unzip $(distdir).zip ;;\
esac
+@@ -563,9 +624,11 @@
+ mkdir $(distdir)/_build
+ mkdir $(distdir)/_inst
+ chmod a-w $(distdir)
++ test -d $(distdir)/_build || exit 0; \
+ dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
+ && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
+- && cd $(distdir)/_build \
++ && am__cwd=`pwd` \
++ && $(am__cd) $(distdir)/_build \
+ && ../configure --srcdir=.. --prefix="$$dc_install_base" \
+ $(DISTCHECK_CONFIGURE_FLAGS) \
+ && $(MAKE) $(AM_MAKEFLAGS) \
+@@ -587,13 +650,15 @@
+ && rm -rf "$$dc_destdir" \
+ && $(MAKE) $(AM_MAKEFLAGS) dist \
+ && rm -rf $(DIST_ARCHIVES) \
+- && $(MAKE) $(AM_MAKEFLAGS) distcleancheck
++ && $(MAKE) $(AM_MAKEFLAGS) distcleancheck \
++ && cd "$$am__cwd" \
++ || exit 1
+ $(am__remove_distdir)
+ @(echo "$(distdir) archives ready for distribution: "; \
+ list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
+ sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x'
+ distuninstallcheck:
+- @cd $(distuninstallcheck_dir) \
++ @$(am__cd) '$(distuninstallcheck_dir)' \
+ && test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \
+ || { echo "ERROR: files left after uninstall:" ; \
+ if test -n "$(DESTDIR)"; then \
+@@ -636,6 +701,7 @@
+
+ distclean-generic:
+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
++ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+
+ maintainer-clean-generic:
+ @echo "This command is intended for maintainers to use"
+@@ -656,6 +722,8 @@
+
+ html: html-recursive
+
++html-am:
++
+ info: info-recursive
+
+ info-am:
+@@ -664,18 +732,28 @@
+
+ install-dvi: install-dvi-recursive
+
++install-dvi-am:
++
+ install-exec-am:
+
+ install-html: install-html-recursive
+
++install-html-am:
++
+ install-info: install-info-recursive
+
++install-info-am:
++
+ install-man:
+
+ install-pdf: install-pdf-recursive
+
++install-pdf-am:
++
+ install-ps: install-ps-recursive
+
++install-ps-am:
++
+ installcheck-am:
+
+ maintainer-clean: maintainer-clean-recursive
+@@ -698,24 +776,24 @@
+
+ uninstall-am:
+
+-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
+- install-strip
++.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) all \
++ ctags-recursive install-am install-strip tags-recursive
+
+ .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
+ all all-am am--refresh check check-am clean clean-generic \
+ clean-libtool ctags ctags-recursive dist dist-all dist-bzip2 \
+- dist-gzip dist-lzma dist-shar dist-tarZ dist-zip distcheck \
+- distclean distclean-generic distclean-hdr distclean-libtool \
+- distclean-tags distcleancheck distdir distuninstallcheck dvi \
+- dvi-am html html-am info info-am install install-am \
+- install-data install-data-am install-dvi install-dvi-am \
+- install-exec install-exec-am install-html install-html-am \
+- install-info install-info-am install-man install-pdf \
+- install-pdf-am install-ps install-ps-am install-strip \
+- installcheck installcheck-am installdirs installdirs-am \
+- maintainer-clean maintainer-clean-generic mostlyclean \
+- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+- tags tags-recursive uninstall uninstall-am
++ dist-gzip dist-lzma dist-shar dist-tarZ dist-xz dist-zip \
++ distcheck distclean distclean-generic distclean-hdr \
++ distclean-libtool distclean-tags distcleancheck distdir \
++ distuninstallcheck dvi dvi-am html html-am info info-am \
++ install install-am install-data install-data-am install-dvi \
++ install-dvi-am install-exec install-exec-am install-html \
++ install-html-am install-info install-info-am install-man \
++ install-pdf install-pdf-am install-ps install-ps-am \
++ install-strip installcheck installcheck-am installdirs \
++ installdirs-am maintainer-clean maintainer-clean-generic \
++ mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
++ ps ps-am tags tags-recursive uninstall uninstall-am
+
+
+ release: dist releasedocs
+@@ -736,6 +814,7 @@
+ make -C xtests xtests
+
+ .PHONY: xtests
++
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT:
Index: pam.debian/modules/pam_namespace/Makefile.in
===================================================================
--- pam.debian.orig/modules/pam_namespace/Makefile.in
+++ pam.debian/modules/pam_namespace/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.11 from Makefile.am.
+@@ -1,8 +1,9 @@
+-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -49,7 +49,6 @@
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
- $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \
-- $(top_srcdir)/m4/japhar_grep_cflags.m4 \
- $(top_srcdir)/m4/jh_path_xml_catalog.m4 \
- $(top_srcdir)/m4/ld-O1.m4 $(top_srcdir)/m4/ld-as-needed.m4 \
- $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
-@@ -58,7 +57,7 @@
- $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
- $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \
- $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
-- $(top_srcdir)/configure.in
-+ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
+-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
++# Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -24,8 +25,9 @@
+
+ VPATH = @srcdir@
+ pkgdatadir = $(datadir)/@PACKAGE@
+-pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
++pkglibdir = $(libdir)/@PACKAGE@
++pkglibexecdir = $(libexecdir)/@PACKAGE@
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+@@ -62,17 +64,32 @@
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-@@ -206,6 +205,7 @@
+ CONFIG_HEADER = $(top_builddir)/config.h
+ CONFIG_CLEAN_FILES =
++CONFIG_CLEAN_VPATH_FILES =
+ am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+ am__vpath_adj = case $$p in \
+ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+ *) f=$$p;; \
+ esac;
+-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
++am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
++am__install_max = 40
++am__nobase_strip_setup = \
++ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
++am__nobase_strip = \
++ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
++am__nobase_list = $(am__nobase_strip_setup); \
++ for p in $$list; do echo "$$p $$p"; done | \
++ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
++ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
++ if (++n[$$2] == $(am__install_max)) \
++ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
++ END { for (dir in files) print dir, files[dir] }'
++am__base_list = \
++ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
++ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+ am__installdirs = "$(DESTDIR)$(securelibdir)" \
+ "$(DESTDIR)$(secureconfdir)" "$(DESTDIR)$(man5dir)" \
+ "$(DESTDIR)$(man8dir)" "$(DESTDIR)$(namespaceddir)" \
+ "$(DESTDIR)$(secureconfdir)"
+-securelibLTLIBRARIES_INSTALL = $(INSTALL)
+ LTLIBRARIES = $(securelib_LTLIBRARIES)
+ pam_namespace_la_DEPENDENCIES =
+ am__pam_namespace_la_SOURCES_DIST = pam_namespace.c md5.c argv_parse.c
+@@ -80,11 +97,11 @@
+ @HAVE_UNSHARE_TRUE@ md5.lo argv_parse.lo
+ pam_namespace_la_OBJECTS = $(am_pam_namespace_la_OBJECTS)
+ @HAVE_UNSHARE_TRUE@am_pam_namespace_la_rpath = -rpath $(securelibdir)
+-secureconfSCRIPT_INSTALL = $(INSTALL_SCRIPT)
+ SCRIPTS = $(secureconf_SCRIPTS)
+ DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
+ depcomp = $(SHELL) $(top_srcdir)/depcomp
+ am__depfiles_maybe = depfiles
++am__mv = mv -f
+ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+ LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+@@ -100,12 +117,12 @@
+ man8dir = $(mandir)/man8
+ NROFF = nroff
+ MANS = $(man_MANS)
+-namespacedDATA_INSTALL = $(INSTALL_DATA)
+-secureconfDATA_INSTALL = $(INSTALL_DATA)
+ DATA = $(namespaced_DATA) $(noinst_DATA) $(secureconf_DATA)
+ HEADERS = $(noinst_HEADERS)
+ ETAGS = etags
+ CTAGS = ctags
++am__tty_colors = \
++red=; grn=; lgn=; blu=; std=
+ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ ACLOCAL = @ACLOCAL@
+ AMTAR = @AMTAR@
+@@ -190,6 +207,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -17223,35 +18883,681 @@ Index: pam.debian/modules/pam_namespace/Makefile.in
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PIE_CFLAGS = @PIE_CFLAGS@
+@@ -299,14 +317,14 @@
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+- && exit 0; \
++ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
++ && { if test -f $@; then exit 0; else break; fi; }; \
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu modules/pam_namespace/Makefile'; \
+- cd $(top_srcdir) && \
+- $(AUTOMAKE) --gnu modules/pam_namespace/Makefile
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu modules/pam_namespace/Makefile'; \
++ $(am__cd) $(top_srcdir) && \
++ $(AUTOMAKE) --gnu modules/pam_namespace/Makefile
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ @case '$?' in \
+@@ -324,23 +342,28 @@
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ $(ACLOCAL_M4): $(am__aclocal_m4_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++$(am__aclocal_m4_deps):
+ install-securelibLTLIBRARIES: $(securelib_LTLIBRARIES)
+ @$(NORMAL_INSTALL)
+ test -z "$(securelibdir)" || $(MKDIR_P) "$(DESTDIR)$(securelibdir)"
+- @list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
++ @list='$(securelib_LTLIBRARIES)'; test -n "$(securelibdir)" || list=; \
++ list2=; for p in $$list; do \
+ if test -f $$p; then \
+- f=$(am__strip_dir) \
+- echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(securelibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(securelibdir)/$$f'"; \
+- $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(securelibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(securelibdir)/$$f"; \
++ list2="$$list2 $$p"; \
+ else :; fi; \
+- done
++ done; \
++ test -z "$$list2" || { \
++ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(securelibdir)'"; \
++ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(securelibdir)"; \
++ }
+
+ uninstall-securelibLTLIBRARIES:
+ @$(NORMAL_UNINSTALL)
+- @list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
+- p=$(am__strip_dir) \
+- echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$p'"; \
+- $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$p"; \
++ @list='$(securelib_LTLIBRARIES)'; test -n "$(securelibdir)" || list=; \
++ for p in $$list; do \
++ $(am__strip_dir) \
++ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$f'"; \
++ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$f"; \
+ done
+
+ clean-securelibLTLIBRARIES:
+@@ -356,22 +379,37 @@
+ install-secureconfSCRIPTS: $(secureconf_SCRIPTS)
+ @$(NORMAL_INSTALL)
+ test -z "$(secureconfdir)" || $(MKDIR_P) "$(DESTDIR)$(secureconfdir)"
+- @list='$(secureconf_SCRIPTS)'; for p in $$list; do \
++ @list='$(secureconf_SCRIPTS)'; test -n "$(secureconfdir)" || list=; \
++ for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+- if test -f $$d$$p; then \
+- f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \
+- echo " $(secureconfSCRIPT_INSTALL) '$$d$$p' '$(DESTDIR)$(secureconfdir)/$$f'"; \
+- $(secureconfSCRIPT_INSTALL) "$$d$$p" "$(DESTDIR)$(secureconfdir)/$$f"; \
+- else :; fi; \
+- done
++ if test -f "$$d$$p"; then echo "$$d$$p"; echo "$$p"; else :; fi; \
++ done | \
++ sed -e 'p;s,.*/,,;n' \
++ -e 'h;s|.*|.|' \
++ -e 'p;x;s,.*/,,;$(transform)' | sed 'N;N;N;s,\n, ,g' | \
++ $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1; } \
++ { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \
++ if ($$2 == $$4) { files[d] = files[d] " " $$1; \
++ if (++n[d] == $(am__install_max)) { \
++ print "f", d, files[d]; n[d] = 0; files[d] = "" } } \
++ else { print "f", d "/" $$4, $$1 } } \
++ END { for (d in files) print "f", d, files[d] }' | \
++ while read type dir files; do \
++ if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
++ test -z "$$files" || { \
++ echo " $(INSTALL_SCRIPT) $$files '$(DESTDIR)$(secureconfdir)$$dir'"; \
++ $(INSTALL_SCRIPT) $$files "$(DESTDIR)$(secureconfdir)$$dir" || exit $$?; \
++ } \
++ ; done
+
+ uninstall-secureconfSCRIPTS:
+ @$(NORMAL_UNINSTALL)
+- @list='$(secureconf_SCRIPTS)'; for p in $$list; do \
+- f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \
+- echo " rm -f '$(DESTDIR)$(secureconfdir)/$$f'"; \
+- rm -f "$(DESTDIR)$(secureconfdir)/$$f"; \
+- done
++ @list='$(secureconf_SCRIPTS)'; test -n "$(secureconfdir)" || exit 0; \
++ files=`for p in $$list; do echo "$$p"; done | \
++ sed -e 's,.*/,,;$(transform)'`; \
++ test -n "$$list" || exit 0; \
++ echo " ( cd '$(DESTDIR)$(secureconfdir)' && rm -f" $$files ")"; \
++ cd "$(DESTDIR)$(secureconfdir)" && rm -f $$files
+
+ mostlyclean-compile:
+ -rm -f *.$(OBJEXT)
+@@ -385,21 +423,21 @@
+
+ .c.o:
+ @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
++@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(COMPILE) -c $<
+
+ .c.obj:
+ @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
++@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
+
+ .c.lo:
+ @am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
++@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
+@@ -409,144 +447,136 @@
+
+ clean-libtool:
+ -rm -rf .libs _libs
+-install-man5: $(man5_MANS) $(man_MANS)
++install-man5: $(man_MANS)
+ @$(NORMAL_INSTALL)
+ test -z "$(man5dir)" || $(MKDIR_P) "$(DESTDIR)$(man5dir)"
+- @list='$(man5_MANS) $(dist_man5_MANS) $(nodist_man5_MANS)'; \
+- l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
+- for i in $$l2; do \
+- case "$$i" in \
+- *.5*) list="$$list $$i" ;; \
+- esac; \
++ @list=''; test -n "$(man5dir)" || exit 0; \
++ { for i in $$list; do echo "$$i"; done; \
++ l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \
++ sed -n '/\.5[a-z]*$$/p'; \
++ } | while read p; do \
++ if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
++ echo "$$d$$p"; echo "$$p"; \
++ done | \
++ sed -e 'n;s,.*/,,;p;h;s,.*\.,,;s,^[^5][0-9a-z]*$$,5,;x' \
++ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,' | \
++ sed 'N;N;s,\n, ,g' | { \
++ list=; while read file base inst; do \
++ if test "$$base" = "$$inst"; then list="$$list $$file"; else \
++ echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man5dir)/$$inst'"; \
++ $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man5dir)/$$inst" || exit $$?; \
++ fi; \
+ done; \
+- for i in $$list; do \
+- if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
+- else file=$$i; fi; \
+- ext=`echo $$i | sed -e 's/^.*\\.//'`; \
+- case "$$ext" in \
+- 5*) ;; \
+- *) ext='5' ;; \
+- esac; \
+- inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
+- inst=`echo $$inst | sed -e 's/^.*\///'`; \
+- inst=`echo $$inst | sed '$(transform)'`.$$ext; \
+- echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man5dir)/$$inst'"; \
+- $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man5dir)/$$inst"; \
+- done
++ for i in $$list; do echo "$$i"; done | $(am__base_list) | \
++ while read files; do \
++ test -z "$$files" || { \
++ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(man5dir)'"; \
++ $(INSTALL_DATA) $$files "$(DESTDIR)$(man5dir)" || exit $$?; }; \
++ done; }
++
+ uninstall-man5:
+ @$(NORMAL_UNINSTALL)
+- @list='$(man5_MANS) $(dist_man5_MANS) $(nodist_man5_MANS)'; \
+- l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
+- for i in $$l2; do \
+- case "$$i" in \
+- *.5*) list="$$list $$i" ;; \
+- esac; \
+- done; \
+- for i in $$list; do \
+- ext=`echo $$i | sed -e 's/^.*\\.//'`; \
+- case "$$ext" in \
+- 5*) ;; \
+- *) ext='5' ;; \
+- esac; \
+- inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
+- inst=`echo $$inst | sed -e 's/^.*\///'`; \
+- inst=`echo $$inst | sed '$(transform)'`.$$ext; \
+- echo " rm -f '$(DESTDIR)$(man5dir)/$$inst'"; \
+- rm -f "$(DESTDIR)$(man5dir)/$$inst"; \
+- done
+-install-man8: $(man8_MANS) $(man_MANS)
++ @list=''; test -n "$(man5dir)" || exit 0; \
++ files=`{ for i in $$list; do echo "$$i"; done; \
++ l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \
++ sed -n '/\.5[a-z]*$$/p'; \
++ } | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^5][0-9a-z]*$$,5,;x' \
++ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \
++ test -z "$$files" || { \
++ echo " ( cd '$(DESTDIR)$(man5dir)' && rm -f" $$files ")"; \
++ cd "$(DESTDIR)$(man5dir)" && rm -f $$files; }
++install-man8: $(man_MANS)
+ @$(NORMAL_INSTALL)
+ test -z "$(man8dir)" || $(MKDIR_P) "$(DESTDIR)$(man8dir)"
+- @list='$(man8_MANS) $(dist_man8_MANS) $(nodist_man8_MANS)'; \
+- l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
+- for i in $$l2; do \
+- case "$$i" in \
+- *.8*) list="$$list $$i" ;; \
+- esac; \
++ @list=''; test -n "$(man8dir)" || exit 0; \
++ { for i in $$list; do echo "$$i"; done; \
++ l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \
++ sed -n '/\.8[a-z]*$$/p'; \
++ } | while read p; do \
++ if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
++ echo "$$d$$p"; echo "$$p"; \
++ done | \
++ sed -e 'n;s,.*/,,;p;h;s,.*\.,,;s,^[^8][0-9a-z]*$$,8,;x' \
++ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,' | \
++ sed 'N;N;s,\n, ,g' | { \
++ list=; while read file base inst; do \
++ if test "$$base" = "$$inst"; then list="$$list $$file"; else \
++ echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man8dir)/$$inst'"; \
++ $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man8dir)/$$inst" || exit $$?; \
++ fi; \
+ done; \
+- for i in $$list; do \
+- if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
+- else file=$$i; fi; \
+- ext=`echo $$i | sed -e 's/^.*\\.//'`; \
+- case "$$ext" in \
+- 8*) ;; \
+- *) ext='8' ;; \
+- esac; \
+- inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
+- inst=`echo $$inst | sed -e 's/^.*\///'`; \
+- inst=`echo $$inst | sed '$(transform)'`.$$ext; \
+- echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man8dir)/$$inst'"; \
+- $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man8dir)/$$inst"; \
+- done
++ for i in $$list; do echo "$$i"; done | $(am__base_list) | \
++ while read files; do \
++ test -z "$$files" || { \
++ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(man8dir)'"; \
++ $(INSTALL_DATA) $$files "$(DESTDIR)$(man8dir)" || exit $$?; }; \
++ done; }
++
+ uninstall-man8:
+ @$(NORMAL_UNINSTALL)
+- @list='$(man8_MANS) $(dist_man8_MANS) $(nodist_man8_MANS)'; \
+- l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
+- for i in $$l2; do \
+- case "$$i" in \
+- *.8*) list="$$list $$i" ;; \
+- esac; \
+- done; \
+- for i in $$list; do \
+- ext=`echo $$i | sed -e 's/^.*\\.//'`; \
+- case "$$ext" in \
+- 8*) ;; \
+- *) ext='8' ;; \
+- esac; \
+- inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
+- inst=`echo $$inst | sed -e 's/^.*\///'`; \
+- inst=`echo $$inst | sed '$(transform)'`.$$ext; \
+- echo " rm -f '$(DESTDIR)$(man8dir)/$$inst'"; \
+- rm -f "$(DESTDIR)$(man8dir)/$$inst"; \
+- done
++ @list=''; test -n "$(man8dir)" || exit 0; \
++ files=`{ for i in $$list; do echo "$$i"; done; \
++ l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \
++ sed -n '/\.8[a-z]*$$/p'; \
++ } | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^8][0-9a-z]*$$,8,;x' \
++ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \
++ test -z "$$files" || { \
++ echo " ( cd '$(DESTDIR)$(man8dir)' && rm -f" $$files ")"; \
++ cd "$(DESTDIR)$(man8dir)" && rm -f $$files; }
+ install-namespacedDATA: $(namespaced_DATA)
+ @$(NORMAL_INSTALL)
+ test -z "$(namespaceddir)" || $(MKDIR_P) "$(DESTDIR)$(namespaceddir)"
+- @list='$(namespaced_DATA)'; for p in $$list; do \
++ @list='$(namespaced_DATA)'; test -n "$(namespaceddir)" || list=; \
++ for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+- f=$(am__strip_dir) \
+- echo " $(namespacedDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(namespaceddir)/$$f'"; \
+- $(namespacedDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(namespaceddir)/$$f"; \
++ echo "$$d$$p"; \
++ done | $(am__base_list) | \
++ while read files; do \
++ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(namespaceddir)'"; \
++ $(INSTALL_DATA) $$files "$(DESTDIR)$(namespaceddir)" || exit $$?; \
+ done
+
+ uninstall-namespacedDATA:
+ @$(NORMAL_UNINSTALL)
+- @list='$(namespaced_DATA)'; for p in $$list; do \
+- f=$(am__strip_dir) \
+- echo " rm -f '$(DESTDIR)$(namespaceddir)/$$f'"; \
+- rm -f "$(DESTDIR)$(namespaceddir)/$$f"; \
+- done
++ @list='$(namespaced_DATA)'; test -n "$(namespaceddir)" || list=; \
++ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
++ test -n "$$files" || exit 0; \
++ echo " ( cd '$(DESTDIR)$(namespaceddir)' && rm -f" $$files ")"; \
++ cd "$(DESTDIR)$(namespaceddir)" && rm -f $$files
+ install-secureconfDATA: $(secureconf_DATA)
+ @$(NORMAL_INSTALL)
+ test -z "$(secureconfdir)" || $(MKDIR_P) "$(DESTDIR)$(secureconfdir)"
+- @list='$(secureconf_DATA)'; for p in $$list; do \
++ @list='$(secureconf_DATA)'; test -n "$(secureconfdir)" || list=; \
++ for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+- f=$(am__strip_dir) \
+- echo " $(secureconfDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(secureconfdir)/$$f'"; \
+- $(secureconfDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(secureconfdir)/$$f"; \
++ echo "$$d$$p"; \
++ done | $(am__base_list) | \
++ while read files; do \
++ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(secureconfdir)'"; \
++ $(INSTALL_DATA) $$files "$(DESTDIR)$(secureconfdir)" || exit $$?; \
+ done
+
+ uninstall-secureconfDATA:
+ @$(NORMAL_UNINSTALL)
+- @list='$(secureconf_DATA)'; for p in $$list; do \
+- f=$(am__strip_dir) \
+- echo " rm -f '$(DESTDIR)$(secureconfdir)/$$f'"; \
+- rm -f "$(DESTDIR)$(secureconfdir)/$$f"; \
+- done
++ @list='$(secureconf_DATA)'; test -n "$(secureconfdir)" || list=; \
++ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
++ test -n "$$files" || exit 0; \
++ echo " ( cd '$(DESTDIR)$(secureconfdir)' && rm -f" $$files ")"; \
++ cd "$(DESTDIR)$(secureconfdir)" && rm -f $$files
+
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+- $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ mkid -fID $$unique
+ tags: TAGS
+
+ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+ $(TAGS_FILES) $(LISP)
+- tags=; \
++ set x; \
+ here=`pwd`; \
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+@@ -554,37 +584,43 @@
+ done | \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
+- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
++ shift; \
++ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+ test -n "$$unique" || unique=$$empty_fix; \
+- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+- $$tags $$unique; \
++ if test $$# -gt 0; then \
++ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
++ "$$@" $$unique; \
++ else \
++ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
++ $$unique; \
++ fi; \
+ fi
+ ctags: CTAGS
+ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+ $(TAGS_FILES) $(LISP)
+- tags=; \
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
+- test -z "$(CTAGS_ARGS)$$tags$$unique" \
++ test -z "$(CTAGS_ARGS)$$unique" \
+ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+- $$tags $$unique
++ $$unique
+
+ GTAGS:
+ here=`$(am__cd) $(top_builddir) && pwd` \
+- && cd $(top_srcdir) \
+- && gtags -i $(GTAGS_ARGS) $$here
++ && $(am__cd) $(top_srcdir) \
++ && gtags -i $(GTAGS_ARGS) "$$here"
+
+ distclean-tags:
+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+ check-TESTS: $(TESTS)
+- @failed=0; all=0; xfail=0; xpass=0; skip=0; ws='[ ]'; \
++ @failed=0; all=0; xfail=0; xpass=0; skip=0; \
+ srcdir=$(srcdir); export srcdir; \
+ list=' $(TESTS) '; \
++ $(am__tty_colors); \
+ if test -n "$$list"; then \
+ for tst in $$list; do \
+ if test -f ./$$tst; then dir=./; \
+@@ -593,49 +629,63 @@
+ if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
+ all=`expr $$all + 1`; \
+ case " $(XFAIL_TESTS) " in \
+- *$$ws$$tst$$ws*) \
++ *[\ \ ]$$tst[\ \ ]*) \
+ xpass=`expr $$xpass + 1`; \
+ failed=`expr $$failed + 1`; \
+- echo "XPASS: $$tst"; \
++ col=$$red; res=XPASS; \
+ ;; \
+ *) \
+- echo "PASS: $$tst"; \
++ col=$$grn; res=PASS; \
+ ;; \
+ esac; \
+ elif test $$? -ne 77; then \
+ all=`expr $$all + 1`; \
+ case " $(XFAIL_TESTS) " in \
+- *$$ws$$tst$$ws*) \
++ *[\ \ ]$$tst[\ \ ]*) \
+ xfail=`expr $$xfail + 1`; \
+- echo "XFAIL: $$tst"; \
++ col=$$lgn; res=XFAIL; \
+ ;; \
+ *) \
+ failed=`expr $$failed + 1`; \
+- echo "FAIL: $$tst"; \
++ col=$$red; res=FAIL; \
+ ;; \
+ esac; \
+ else \
+ skip=`expr $$skip + 1`; \
+- echo "SKIP: $$tst"; \
++ col=$$blu; res=SKIP; \
+ fi; \
++ echo "$${col}$$res$${std}: $$tst"; \
+ done; \
++ if test "$$all" -eq 1; then \
++ tests="test"; \
++ All=""; \
++ else \
++ tests="tests"; \
++ All="All "; \
++ fi; \
+ if test "$$failed" -eq 0; then \
+ if test "$$xfail" -eq 0; then \
+- banner="All $$all tests passed"; \
++ banner="$$All$$all $$tests passed"; \
+ else \
+- banner="All $$all tests behaved as expected ($$xfail expected failures)"; \
++ if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \
++ banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \
+ fi; \
+ else \
+ if test "$$xpass" -eq 0; then \
+- banner="$$failed of $$all tests failed"; \
++ banner="$$failed of $$all $$tests failed"; \
+ else \
+- banner="$$failed of $$all tests did not behave as expected ($$xpass unexpected passes)"; \
++ if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \
++ banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \
+ fi; \
+ fi; \
+ dashes="$$banner"; \
+ skipped=""; \
+ if test "$$skip" -ne 0; then \
+- skipped="($$skip tests were not run)"; \
++ if test "$$skip" -eq 1; then \
++ skipped="($$skip test was not run)"; \
++ else \
++ skipped="($$skip tests were not run)"; \
++ fi; \
+ test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \
+ dashes="$$skipped"; \
+ fi; \
+@@ -646,15 +696,32 @@
+ dashes="$$report"; \
+ fi; \
+ dashes=`echo "$$dashes" | sed s/./=/g`; \
+- echo "$$dashes"; \
++ if test "$$failed" -eq 0; then \
++ echo "$$grn$$dashes"; \
++ else \
++ echo "$$red$$dashes"; \
++ fi; \
+ echo "$$banner"; \
+ test -z "$$skipped" || echo "$$skipped"; \
+ test -z "$$report" || echo "$$report"; \
+- echo "$$dashes"; \
++ echo "$$dashes$$std"; \
+ test "$$failed" -eq 0; \
+ else :; fi
+
+ distdir: $(DISTFILES)
++ @list='$(MANS)'; if test -n "$$list"; then \
++ list=`for p in $$list; do \
++ if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
++ if test -f "$$d$$p"; then echo "$$d$$p"; else :; fi; done`; \
++ if test -n "$$list" && \
++ grep 'ab help2man is required to generate this page' $$list >/dev/null; then \
++ echo "error: found man pages containing the \`missing help2man' replacement text:" >&2; \
++ grep -l 'ab help2man is required to generate this page' $$list | sed 's/^/ /' >&2; \
++ echo " to fix them, install help2man, remove and regenerate the man pages;" >&2; \
++ echo " typically \`make maintainer-clean' will remove them" >&2; \
++ exit 1; \
++ else :; fi; \
++ else :; fi
+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ list='$(DISTFILES)'; \
+@@ -670,13 +737,17 @@
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+ if test -d $$d/$$file; then \
+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
++ if test -d "$(distdir)/$$file"; then \
++ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
++ fi; \
+ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
++ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
++ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+ fi; \
+- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
++ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+ else \
+- test -f $(distdir)/$$file \
+- || cp -p $$d/$$file $(distdir)/$$file \
++ test -f "$(distdir)/$$file" \
++ || cp -p $$d/$$file "$(distdir)/$$file" \
+ || exit 1; \
+ fi; \
+ done
+@@ -709,6 +780,7 @@
+
+ distclean-generic:
+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
++ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+
+ maintainer-clean-generic:
+ @echo "This command is intended for maintainers to use"
+@@ -731,6 +803,8 @@
+
+ html: html-am
+
++html-am:
++
+ info: info-am
+
+ info-am:
+@@ -741,18 +815,28 @@
+
+ install-dvi: install-dvi-am
+
++install-dvi-am:
++
+ install-exec-am:
+
+ install-html: install-html-am
+
++install-html-am:
++
+ install-info: install-info-am
+
++install-info-am:
++
+ install-man: install-man5 install-man8
+
+ install-pdf: install-pdf-am
+
++install-pdf-am:
++
+ install-ps: install-ps-am
+
++install-ps-am:
++
+ installcheck-am:
+
+ maintainer-clean: maintainer-clean-am
+@@ -779,7 +863,7 @@
+
+ uninstall-man: uninstall-man5 uninstall-man8
+
+-.MAKE: install-am install-strip
++.MAKE: check-am install-am install-strip
+
+ .PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \
+ clean-generic clean-libtool clean-securelibLTLIBRARIES ctags \
+@@ -802,6 +886,7 @@
+
+ @ENABLE_REGENERATE_MAN_TRUE@README: pam_namespace.8.xml namespace.conf.5.xml
+ @ENABLE_REGENERATE_MAN_TRUE@-include $(top_srcdir)/Make.xml.rules
++
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT:
Index: pam.debian/modules/pam_securetty/Makefile.in
===================================================================
--- pam.debian.orig/modules/pam_securetty/Makefile.in
+++ pam.debian/modules/pam_securetty/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.11 from Makefile.am.
+@@ -1,8 +1,9 @@
+-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -45,7 +45,6 @@
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
- $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \
-- $(top_srcdir)/m4/japhar_grep_cflags.m4 \
- $(top_srcdir)/m4/jh_path_xml_catalog.m4 \
- $(top_srcdir)/m4/ld-O1.m4 $(top_srcdir)/m4/ld-as-needed.m4 \
- $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
-@@ -54,7 +53,7 @@
- $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
- $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \
- $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
-- $(top_srcdir)/configure.in
-+ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
+-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
++# Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -21,8 +22,9 @@
+
+ VPATH = @srcdir@
+ pkgdatadir = $(datadir)/@PACKAGE@
+-pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
++pkglibdir = $(libdir)/@PACKAGE@
++pkglibexecdir = $(libexecdir)/@PACKAGE@
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+@@ -58,21 +60,37 @@
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-@@ -85,8 +84,8 @@
+ CONFIG_HEADER = $(top_builddir)/config.h
+ CONFIG_CLEAN_FILES =
++CONFIG_CLEAN_VPATH_FILES =
+ am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+ am__vpath_adj = case $$p in \
+ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+ *) f=$$p;; \
+ esac;
+-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
++am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
++am__install_max = 40
++am__nobase_strip_setup = \
++ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
++am__nobase_strip = \
++ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
++am__nobase_list = $(am__nobase_strip_setup); \
++ for p in $$list; do echo "$$p $$p"; done | \
++ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
++ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
++ if (++n[$$2] == $(am__install_max)) \
++ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
++ END { for (dir in files) print dir, files[dir] }'
++am__base_list = \
++ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
++ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
am__installdirs = "$(DESTDIR)$(securelibdir)" "$(DESTDIR)$(man8dir)"
+-securelibLTLIBRARIES_INSTALL = $(INSTALL)
LTLIBRARIES = $(securelib_LTLIBRARIES)
pam_securetty_la_DEPENDENCIES =
-pam_securetty_la_SOURCES = pam_securetty.c
@@ -17261,7 +19567,11 @@ Index: pam.debian/modules/pam_securetty/Makefile.in
DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
-@@ -100,8 +99,8 @@
++am__mv = mv -f
+ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+ LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+@@ -82,14 +100,16 @@
LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
$(LDFLAGS) -o $@
@@ -17272,7 +19582,15 @@ Index: pam.debian/modules/pam_securetty/Makefile.in
man8dir = $(mandir)/man8
NROFF = nroff
MANS = $(man_MANS)
-@@ -193,6 +192,7 @@
+ DATA = $(noinst_DATA)
+ ETAGS = etags
+ CTAGS = ctags
++am__tty_colors = \
++red=; grn=; lgn=; blu=; std=
+ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ ACLOCAL = @ACLOCAL@
+ AMTAR = @AMTAR@
+@@ -174,6 +194,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -17280,7 +19598,7 @@ Index: pam.debian/modules/pam_securetty/Makefile.in
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PIE_CFLAGS = @PIE_CFLAGS@
-@@ -283,6 +283,10 @@
+@@ -264,6 +285,10 @@
AM_LDFLAGS = -no-undefined -avoid-version -module $(am__append_1)
securelib_LTLIBRARIES = pam_securetty.la
pam_securetty_la_LIBADD = -L$(top_builddir)/libpam -lpam
@@ -17291,7 +19609,65 @@ Index: pam.debian/modules/pam_securetty/Makefile.in
@ENABLE_REGENERATE_MAN_TRUE@noinst_DATA = README
all: all-am
-@@ -359,6 +363,7 @@
+@@ -273,14 +298,14 @@
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+- && exit 0; \
++ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
++ && { if test -f $@; then exit 0; else break; fi; }; \
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu modules/pam_securetty/Makefile'; \
+- cd $(top_srcdir) && \
+- $(AUTOMAKE) --gnu modules/pam_securetty/Makefile
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu modules/pam_securetty/Makefile'; \
++ $(am__cd) $(top_srcdir) && \
++ $(AUTOMAKE) --gnu modules/pam_securetty/Makefile
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ @case '$?' in \
+@@ -298,23 +323,28 @@
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ $(ACLOCAL_M4): $(am__aclocal_m4_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++$(am__aclocal_m4_deps):
+ install-securelibLTLIBRARIES: $(securelib_LTLIBRARIES)
+ @$(NORMAL_INSTALL)
+ test -z "$(securelibdir)" || $(MKDIR_P) "$(DESTDIR)$(securelibdir)"
+- @list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
++ @list='$(securelib_LTLIBRARIES)'; test -n "$(securelibdir)" || list=; \
++ list2=; for p in $$list; do \
+ if test -f $$p; then \
+- f=$(am__strip_dir) \
+- echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(securelibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(securelibdir)/$$f'"; \
+- $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(securelibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(securelibdir)/$$f"; \
++ list2="$$list2 $$p"; \
+ else :; fi; \
+- done
++ done; \
++ test -z "$$list2" || { \
++ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(securelibdir)'"; \
++ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(securelibdir)"; \
++ }
+
+ uninstall-securelibLTLIBRARIES:
+ @$(NORMAL_UNINSTALL)
+- @list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
+- p=$(am__strip_dir) \
+- echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$p'"; \
+- $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$p"; \
++ @list='$(securelib_LTLIBRARIES)'; test -n "$(securelibdir)" || list=; \
++ for p in $$list; do \
++ $(am__strip_dir) \
++ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$f'"; \
++ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$f"; \
+ done
+
+ clean-securelibLTLIBRARIES:
+@@ -335,24 +365,25 @@
-rm -f *.tab.c
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pam_securetty.Plo@am__quote@
@@ -17299,36 +19675,434 @@ Index: pam.debian/modules/pam_securetty/Makefile.in
.c.o:
@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
++@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(COMPILE) -c $<
+
+ .c.obj:
+ @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
++@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
+
+ .c.lo:
+ @am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
++@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
+@@ -362,65 +393,58 @@
+
+ clean-libtool:
+ -rm -rf .libs _libs
+-install-man8: $(man8_MANS) $(man_MANS)
++install-man8: $(man_MANS)
+ @$(NORMAL_INSTALL)
+ test -z "$(man8dir)" || $(MKDIR_P) "$(DESTDIR)$(man8dir)"
+- @list='$(man8_MANS) $(dist_man8_MANS) $(nodist_man8_MANS)'; \
+- l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
+- for i in $$l2; do \
+- case "$$i" in \
+- *.8*) list="$$list $$i" ;; \
+- esac; \
++ @list=''; test -n "$(man8dir)" || exit 0; \
++ { for i in $$list; do echo "$$i"; done; \
++ l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \
++ sed -n '/\.8[a-z]*$$/p'; \
++ } | while read p; do \
++ if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
++ echo "$$d$$p"; echo "$$p"; \
++ done | \
++ sed -e 'n;s,.*/,,;p;h;s,.*\.,,;s,^[^8][0-9a-z]*$$,8,;x' \
++ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,' | \
++ sed 'N;N;s,\n, ,g' | { \
++ list=; while read file base inst; do \
++ if test "$$base" = "$$inst"; then list="$$list $$file"; else \
++ echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man8dir)/$$inst'"; \
++ $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man8dir)/$$inst" || exit $$?; \
++ fi; \
+ done; \
+- for i in $$list; do \
+- if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
+- else file=$$i; fi; \
+- ext=`echo $$i | sed -e 's/^.*\\.//'`; \
+- case "$$ext" in \
+- 8*) ;; \
+- *) ext='8' ;; \
+- esac; \
+- inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
+- inst=`echo $$inst | sed -e 's/^.*\///'`; \
+- inst=`echo $$inst | sed '$(transform)'`.$$ext; \
+- echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man8dir)/$$inst'"; \
+- $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man8dir)/$$inst"; \
+- done
++ for i in $$list; do echo "$$i"; done | $(am__base_list) | \
++ while read files; do \
++ test -z "$$files" || { \
++ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(man8dir)'"; \
++ $(INSTALL_DATA) $$files "$(DESTDIR)$(man8dir)" || exit $$?; }; \
++ done; }
++
+ uninstall-man8:
+ @$(NORMAL_UNINSTALL)
+- @list='$(man8_MANS) $(dist_man8_MANS) $(nodist_man8_MANS)'; \
+- l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
+- for i in $$l2; do \
+- case "$$i" in \
+- *.8*) list="$$list $$i" ;; \
+- esac; \
+- done; \
+- for i in $$list; do \
+- ext=`echo $$i | sed -e 's/^.*\\.//'`; \
+- case "$$ext" in \
+- 8*) ;; \
+- *) ext='8' ;; \
+- esac; \
+- inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
+- inst=`echo $$inst | sed -e 's/^.*\///'`; \
+- inst=`echo $$inst | sed '$(transform)'`.$$ext; \
+- echo " rm -f '$(DESTDIR)$(man8dir)/$$inst'"; \
+- rm -f "$(DESTDIR)$(man8dir)/$$inst"; \
+- done
++ @list=''; test -n "$(man8dir)" || exit 0; \
++ files=`{ for i in $$list; do echo "$$i"; done; \
++ l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \
++ sed -n '/\.8[a-z]*$$/p'; \
++ } | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^8][0-9a-z]*$$,8,;x' \
++ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \
++ test -z "$$files" || { \
++ echo " ( cd '$(DESTDIR)$(man8dir)' && rm -f" $$files ")"; \
++ cd "$(DESTDIR)$(man8dir)" && rm -f $$files; }
+
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+- $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ mkid -fID $$unique
+ tags: TAGS
+
+ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+ $(TAGS_FILES) $(LISP)
+- tags=; \
++ set x; \
+ here=`pwd`; \
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+@@ -428,37 +452,43 @@
+ done | \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
+- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
++ shift; \
++ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+ test -n "$$unique" || unique=$$empty_fix; \
+- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+- $$tags $$unique; \
++ if test $$# -gt 0; then \
++ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
++ "$$@" $$unique; \
++ else \
++ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
++ $$unique; \
++ fi; \
+ fi
+ ctags: CTAGS
+ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+ $(TAGS_FILES) $(LISP)
+- tags=; \
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
+- test -z "$(CTAGS_ARGS)$$tags$$unique" \
++ test -z "$(CTAGS_ARGS)$$unique" \
+ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+- $$tags $$unique
++ $$unique
+
+ GTAGS:
+ here=`$(am__cd) $(top_builddir) && pwd` \
+- && cd $(top_srcdir) \
+- && gtags -i $(GTAGS_ARGS) $$here
++ && $(am__cd) $(top_srcdir) \
++ && gtags -i $(GTAGS_ARGS) "$$here"
+
+ distclean-tags:
+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+ check-TESTS: $(TESTS)
+- @failed=0; all=0; xfail=0; xpass=0; skip=0; ws='[ ]'; \
++ @failed=0; all=0; xfail=0; xpass=0; skip=0; \
+ srcdir=$(srcdir); export srcdir; \
+ list=' $(TESTS) '; \
++ $(am__tty_colors); \
+ if test -n "$$list"; then \
+ for tst in $$list; do \
+ if test -f ./$$tst; then dir=./; \
+@@ -467,49 +497,63 @@
+ if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
+ all=`expr $$all + 1`; \
+ case " $(XFAIL_TESTS) " in \
+- *$$ws$$tst$$ws*) \
++ *[\ \ ]$$tst[\ \ ]*) \
+ xpass=`expr $$xpass + 1`; \
+ failed=`expr $$failed + 1`; \
+- echo "XPASS: $$tst"; \
++ col=$$red; res=XPASS; \
+ ;; \
+ *) \
+- echo "PASS: $$tst"; \
++ col=$$grn; res=PASS; \
+ ;; \
+ esac; \
+ elif test $$? -ne 77; then \
+ all=`expr $$all + 1`; \
+ case " $(XFAIL_TESTS) " in \
+- *$$ws$$tst$$ws*) \
++ *[\ \ ]$$tst[\ \ ]*) \
+ xfail=`expr $$xfail + 1`; \
+- echo "XFAIL: $$tst"; \
++ col=$$lgn; res=XFAIL; \
+ ;; \
+ *) \
+ failed=`expr $$failed + 1`; \
+- echo "FAIL: $$tst"; \
++ col=$$red; res=FAIL; \
+ ;; \
+ esac; \
+ else \
+ skip=`expr $$skip + 1`; \
+- echo "SKIP: $$tst"; \
++ col=$$blu; res=SKIP; \
+ fi; \
++ echo "$${col}$$res$${std}: $$tst"; \
+ done; \
++ if test "$$all" -eq 1; then \
++ tests="test"; \
++ All=""; \
++ else \
++ tests="tests"; \
++ All="All "; \
++ fi; \
+ if test "$$failed" -eq 0; then \
+ if test "$$xfail" -eq 0; then \
+- banner="All $$all tests passed"; \
++ banner="$$All$$all $$tests passed"; \
+ else \
+- banner="All $$all tests behaved as expected ($$xfail expected failures)"; \
++ if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \
++ banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \
+ fi; \
+ else \
+ if test "$$xpass" -eq 0; then \
+- banner="$$failed of $$all tests failed"; \
++ banner="$$failed of $$all $$tests failed"; \
+ else \
+- banner="$$failed of $$all tests did not behave as expected ($$xpass unexpected passes)"; \
++ if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \
++ banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \
+ fi; \
+ fi; \
+ dashes="$$banner"; \
+ skipped=""; \
+ if test "$$skip" -ne 0; then \
+- skipped="($$skip tests were not run)"; \
++ if test "$$skip" -eq 1; then \
++ skipped="($$skip test was not run)"; \
++ else \
++ skipped="($$skip tests were not run)"; \
++ fi; \
+ test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \
+ dashes="$$skipped"; \
+ fi; \
+@@ -520,15 +564,32 @@
+ dashes="$$report"; \
+ fi; \
+ dashes=`echo "$$dashes" | sed s/./=/g`; \
+- echo "$$dashes"; \
++ if test "$$failed" -eq 0; then \
++ echo "$$grn$$dashes"; \
++ else \
++ echo "$$red$$dashes"; \
++ fi; \
+ echo "$$banner"; \
+ test -z "$$skipped" || echo "$$skipped"; \
+ test -z "$$report" || echo "$$report"; \
+- echo "$$dashes"; \
++ echo "$$dashes$$std"; \
+ test "$$failed" -eq 0; \
+ else :; fi
+
+ distdir: $(DISTFILES)
++ @list='$(MANS)'; if test -n "$$list"; then \
++ list=`for p in $$list; do \
++ if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
++ if test -f "$$d$$p"; then echo "$$d$$p"; else :; fi; done`; \
++ if test -n "$$list" && \
++ grep 'ab help2man is required to generate this page' $$list >/dev/null; then \
++ echo "error: found man pages containing the \`missing help2man' replacement text:" >&2; \
++ grep -l 'ab help2man is required to generate this page' $$list | sed 's/^/ /' >&2; \
++ echo " to fix them, install help2man, remove and regenerate the man pages;" >&2; \
++ echo " typically \`make maintainer-clean' will remove them" >&2; \
++ exit 1; \
++ else :; fi; \
++ else :; fi
+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ list='$(DISTFILES)'; \
+@@ -544,13 +605,17 @@
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+ if test -d $$d/$$file; then \
+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
++ if test -d "$(distdir)/$$file"; then \
++ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
++ fi; \
+ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
++ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
++ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+ fi; \
+- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
++ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+ else \
+- test -f $(distdir)/$$file \
+- || cp -p $$d/$$file $(distdir)/$$file \
++ test -f "$(distdir)/$$file" \
++ || cp -p $$d/$$file "$(distdir)/$$file" \
+ || exit 1; \
+ fi; \
+ done
+@@ -583,6 +648,7 @@
+
+ distclean-generic:
+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
++ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+
+ maintainer-clean-generic:
+ @echo "This command is intended for maintainers to use"
+@@ -605,6 +671,8 @@
+
+ html: html-am
+
++html-am:
++
+ info: info-am
+
+ info-am:
+@@ -613,18 +681,28 @@
+
+ install-dvi: install-dvi-am
+
++install-dvi-am:
++
+ install-exec-am:
+
+ install-html: install-html-am
+
++install-html-am:
++
+ install-info: install-info-am
+
++install-info-am:
++
+ install-man: install-man8
+
+ install-pdf: install-pdf-am
+
++install-pdf-am:
++
+ install-ps: install-ps-am
+
++install-ps-am:
++
+ installcheck-am:
+
+ maintainer-clean: maintainer-clean-am
+@@ -649,7 +727,7 @@
+
+ uninstall-man: uninstall-man8
+
+-.MAKE: install-am install-strip
++.MAKE: check-am install-am install-strip
+
+ .PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \
+ clean-generic clean-libtool clean-securelibLTLIBRARIES ctags \
+@@ -669,6 +747,7 @@
+
+ @ENABLE_REGENERATE_MAN_TRUE@README: pam_securetty.8.xml
+ @ENABLE_REGENERATE_MAN_TRUE@-include $(top_srcdir)/Make.xml.rules
++
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT:
Index: pam.debian/modules/pam_unix/Makefile.in
===================================================================
--- pam.debian.orig/modules/pam_unix/Makefile.in
+++ pam.debian/modules/pam_unix/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.11 from Makefile.am.
+@@ -1,8 +1,9 @@
+-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -51,7 +51,6 @@
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
- $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \
-- $(top_srcdir)/m4/japhar_grep_cflags.m4 \
- $(top_srcdir)/m4/jh_path_xml_catalog.m4 \
- $(top_srcdir)/m4/ld-O1.m4 $(top_srcdir)/m4/ld-as-needed.m4 \
- $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
-@@ -60,7 +59,7 @@
- $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
- $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \
- $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
-- $(top_srcdir)/configure.in
-+ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
+-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
++# Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -23,8 +24,9 @@
+
+ VPATH = @srcdir@
+ pkgdatadir = $(datadir)/@PACKAGE@
+-pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
++pkglibdir = $(libdir)/@PACKAGE@
++pkglibexecdir = $(libexecdir)/@PACKAGE@
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+@@ -64,25 +66,39 @@
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-@@ -91,10 +90,10 @@
+ CONFIG_HEADER = $(top_builddir)/config.h
+ CONFIG_CLEAN_FILES =
++CONFIG_CLEAN_VPATH_FILES =
+ am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+ am__vpath_adj = case $$p in \
+ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+ *) f=$$p;; \
+ esac;
+-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
++am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
++am__install_max = 40
++am__nobase_strip_setup = \
++ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
++am__nobase_strip = \
++ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
++am__nobase_list = $(am__nobase_strip_setup); \
++ for p in $$list; do echo "$$p $$p"; done | \
++ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
++ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
++ if (++n[$$2] == $(am__install_max)) \
++ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
++ END { for (dir in files) print dir, files[dir] }'
++am__base_list = \
++ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
++ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
am__installdirs = "$(DESTDIR)$(securelibdir)" "$(DESTDIR)$(sbindir)" \
"$(DESTDIR)$(man8dir)"
+-securelibLTLIBRARIES_INSTALL = $(INSTALL)
LTLIBRARIES = $(securelib_LTLIBRARIES)
-pam_unix_la_DEPENDENCIES =
+pam_unix_la_DEPENDENCIES = ../pam_securetty/tty_secure.lo
@@ -17339,7 +20113,29 @@ Index: pam.debian/modules/pam_unix/Makefile.in
pam_unix_la_OBJECTS = $(am_pam_unix_la_OBJECTS)
pam_unix_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-@@ -236,6 +235,7 @@
+ $(pam_unix_la_LDFLAGS) $(LDFLAGS) -o $@
+-sbinPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
+ PROGRAMS = $(noinst_PROGRAMS) $(sbin_PROGRAMS)
+ am_bigcrypt_OBJECTS = bigcrypt-bigcrypt.$(OBJEXT) \
+ bigcrypt-bigcrypt_main.$(OBJEXT)
+@@ -114,6 +130,7 @@
+ DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
+ depcomp = $(SHELL) $(top_srcdir)/depcomp
+ am__depfiles_maybe = depfiles
++am__mv = mv -f
+ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+ LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+@@ -134,6 +151,8 @@
+ HEADERS = $(noinst_HEADERS)
+ ETAGS = etags
+ CTAGS = ctags
++am__tty_colors = \
++red=; grn=; lgn=; blu=; std=
+ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ ACLOCAL = @ACLOCAL@
+ AMTAR = @AMTAR@
+@@ -218,6 +237,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -17347,7 +20143,7 @@ Index: pam.debian/modules/pam_unix/Makefile.in
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PIE_CFLAGS = @PIE_CFLAGS@
-@@ -331,13 +331,14 @@
+@@ -313,13 +333,14 @@
pam_unix_la_LDFLAGS = -no-undefined -avoid-version -module \
$(am__append_2)
pam_unix_la_LIBADD = @LIBNSL@ -L$(top_builddir)/libpam -lpam \
@@ -17364,7 +20160,147 @@ Index: pam.debian/modules/pam_unix/Makefile.in
bigcrypt_SOURCES = bigcrypt.c bigcrypt_main.c
bigcrypt_CFLAGS = $(AM_CFLAGS)
-@@ -495,6 +496,7 @@
+@@ -345,14 +366,14 @@
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+- && exit 0; \
++ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
++ && { if test -f $@; then exit 0; else break; fi; }; \
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu modules/pam_unix/Makefile'; \
+- cd $(top_srcdir) && \
+- $(AUTOMAKE) --gnu modules/pam_unix/Makefile
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu modules/pam_unix/Makefile'; \
++ $(am__cd) $(top_srcdir) && \
++ $(AUTOMAKE) --gnu modules/pam_unix/Makefile
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ @case '$?' in \
+@@ -370,23 +391,28 @@
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ $(ACLOCAL_M4): $(am__aclocal_m4_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++$(am__aclocal_m4_deps):
+ install-securelibLTLIBRARIES: $(securelib_LTLIBRARIES)
+ @$(NORMAL_INSTALL)
+ test -z "$(securelibdir)" || $(MKDIR_P) "$(DESTDIR)$(securelibdir)"
+- @list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
++ @list='$(securelib_LTLIBRARIES)'; test -n "$(securelibdir)" || list=; \
++ list2=; for p in $$list; do \
+ if test -f $$p; then \
+- f=$(am__strip_dir) \
+- echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(securelibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(securelibdir)/$$f'"; \
+- $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(securelibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(securelibdir)/$$f"; \
++ list2="$$list2 $$p"; \
+ else :; fi; \
+- done
++ done; \
++ test -z "$$list2" || { \
++ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(securelibdir)'"; \
++ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(securelibdir)"; \
++ }
+
+ uninstall-securelibLTLIBRARIES:
+ @$(NORMAL_UNINSTALL)
+- @list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
+- p=$(am__strip_dir) \
+- echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$p'"; \
+- $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$p"; \
++ @list='$(securelib_LTLIBRARIES)'; test -n "$(securelibdir)" || list=; \
++ for p in $$list; do \
++ $(am__strip_dir) \
++ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$f'"; \
++ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$f"; \
+ done
+
+ clean-securelibLTLIBRARIES:
+@@ -401,39 +427,56 @@
+ $(pam_unix_la_LINK) -rpath $(securelibdir) $(pam_unix_la_OBJECTS) $(pam_unix_la_LIBADD) $(LIBS)
+
+ clean-noinstPROGRAMS:
+- @list='$(noinst_PROGRAMS)'; for p in $$list; do \
+- f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
+- echo " rm -f $$p $$f"; \
+- rm -f $$p $$f ; \
+- done
++ @list='$(noinst_PROGRAMS)'; test -n "$$list" || exit 0; \
++ echo " rm -f" $$list; \
++ rm -f $$list || exit $$?; \
++ test -n "$(EXEEXT)" || exit 0; \
++ list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
++ echo " rm -f" $$list; \
++ rm -f $$list
+ install-sbinPROGRAMS: $(sbin_PROGRAMS)
+ @$(NORMAL_INSTALL)
+ test -z "$(sbindir)" || $(MKDIR_P) "$(DESTDIR)$(sbindir)"
+- @list='$(sbin_PROGRAMS)'; for p in $$list; do \
+- p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
+- if test -f $$p \
+- || test -f $$p1 \
+- ; then \
+- f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
+- echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(sbinPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(sbindir)/$$f'"; \
+- $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(sbinPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(sbindir)/$$f" || exit 1; \
+- else :; fi; \
+- done
++ @list='$(sbin_PROGRAMS)'; test -n "$(sbindir)" || list=; \
++ for p in $$list; do echo "$$p $$p"; done | \
++ sed 's/$(EXEEXT)$$//' | \
++ while read p p1; do if test -f $$p || test -f $$p1; \
++ then echo "$$p"; echo "$$p"; else :; fi; \
++ done | \
++ sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \
++ -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
++ sed 'N;N;N;s,\n, ,g' | \
++ $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \
++ { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \
++ if ($$2 == $$4) files[d] = files[d] " " $$1; \
++ else { print "f", $$3 "/" $$4, $$1; } } \
++ END { for (d in files) print "f", d, files[d] }' | \
++ while read type dir files; do \
++ if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
++ test -z "$$files" || { \
++ echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(sbindir)$$dir'"; \
++ $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(sbindir)$$dir" || exit $$?; \
++ } \
++ ; done
+
+ uninstall-sbinPROGRAMS:
+ @$(NORMAL_UNINSTALL)
+- @list='$(sbin_PROGRAMS)'; for p in $$list; do \
+- f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
+- echo " rm -f '$(DESTDIR)$(sbindir)/$$f'"; \
+- rm -f "$(DESTDIR)$(sbindir)/$$f"; \
+- done
++ @list='$(sbin_PROGRAMS)'; test -n "$(sbindir)" || list=; \
++ files=`for p in $$list; do echo "$$p"; done | \
++ sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
++ -e 's/$$/$(EXEEXT)/' `; \
++ test -n "$$list" || exit 0; \
++ echo " ( cd '$(DESTDIR)$(sbindir)' && rm -f" $$files ")"; \
++ cd "$(DESTDIR)$(sbindir)" && rm -f $$files
+
+ clean-sbinPROGRAMS:
+- @list='$(sbin_PROGRAMS)'; for p in $$list; do \
+- f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
+- echo " rm -f $$p $$f"; \
+- rm -f $$p $$f ; \
+- done
++ @list='$(sbin_PROGRAMS)'; test -n "$$list" || exit 0; \
++ echo " rm -f" $$list; \
++ rm -f $$list || exit $$?; \
++ test -n "$(EXEEXT)" || exit 0; \
++ list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
++ echo " rm -f" $$list; \
++ rm -f $$list
+ bigcrypt$(EXEEXT): $(bigcrypt_OBJECTS) $(bigcrypt_DEPENDENCIES)
+ @rm -f bigcrypt$(EXEEXT)
+ $(bigcrypt_LINK) $(bigcrypt_OBJECTS) $(bigcrypt_LDADD) $(LIBS)
+@@ -455,6 +498,7 @@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bigcrypt.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/md5_broken.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/md5_good.Plo@am__quote@
@@ -17372,34 +20308,650 @@ Index: pam.debian/modules/pam_unix/Makefile.in
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pam_unix_acct.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pam_unix_auth.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pam_unix_passwd.Plo@am__quote@
+@@ -475,189 +519,189 @@
+
+ .c.o:
+ @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
++@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(COMPILE) -c $<
+
+ .c.obj:
+ @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
++@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
+
+ .c.lo:
+ @am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
++@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
+
+ bigcrypt-bigcrypt.o: bigcrypt.c
+ @am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(bigcrypt_CFLAGS) $(CFLAGS) -MT bigcrypt-bigcrypt.o -MD -MP -MF $(DEPDIR)/bigcrypt-bigcrypt.Tpo -c -o bigcrypt-bigcrypt.o `test -f 'bigcrypt.c' || echo '$(srcdir)/'`bigcrypt.c
+-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/bigcrypt-bigcrypt.Tpo $(DEPDIR)/bigcrypt-bigcrypt.Po
++@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/bigcrypt-bigcrypt.Tpo $(DEPDIR)/bigcrypt-bigcrypt.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='bigcrypt.c' object='bigcrypt-bigcrypt.o' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(bigcrypt_CFLAGS) $(CFLAGS) -c -o bigcrypt-bigcrypt.o `test -f 'bigcrypt.c' || echo '$(srcdir)/'`bigcrypt.c
+
+ bigcrypt-bigcrypt.obj: bigcrypt.c
+ @am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(bigcrypt_CFLAGS) $(CFLAGS) -MT bigcrypt-bigcrypt.obj -MD -MP -MF $(DEPDIR)/bigcrypt-bigcrypt.Tpo -c -o bigcrypt-bigcrypt.obj `if test -f 'bigcrypt.c'; then $(CYGPATH_W) 'bigcrypt.c'; else $(CYGPATH_W) '$(srcdir)/bigcrypt.c'; fi`
+-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/bigcrypt-bigcrypt.Tpo $(DEPDIR)/bigcrypt-bigcrypt.Po
++@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/bigcrypt-bigcrypt.Tpo $(DEPDIR)/bigcrypt-bigcrypt.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='bigcrypt.c' object='bigcrypt-bigcrypt.obj' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(bigcrypt_CFLAGS) $(CFLAGS) -c -o bigcrypt-bigcrypt.obj `if test -f 'bigcrypt.c'; then $(CYGPATH_W) 'bigcrypt.c'; else $(CYGPATH_W) '$(srcdir)/bigcrypt.c'; fi`
+
+ bigcrypt-bigcrypt_main.o: bigcrypt_main.c
+ @am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(bigcrypt_CFLAGS) $(CFLAGS) -MT bigcrypt-bigcrypt_main.o -MD -MP -MF $(DEPDIR)/bigcrypt-bigcrypt_main.Tpo -c -o bigcrypt-bigcrypt_main.o `test -f 'bigcrypt_main.c' || echo '$(srcdir)/'`bigcrypt_main.c
+-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/bigcrypt-bigcrypt_main.Tpo $(DEPDIR)/bigcrypt-bigcrypt_main.Po
++@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/bigcrypt-bigcrypt_main.Tpo $(DEPDIR)/bigcrypt-bigcrypt_main.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='bigcrypt_main.c' object='bigcrypt-bigcrypt_main.o' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(bigcrypt_CFLAGS) $(CFLAGS) -c -o bigcrypt-bigcrypt_main.o `test -f 'bigcrypt_main.c' || echo '$(srcdir)/'`bigcrypt_main.c
+
+ bigcrypt-bigcrypt_main.obj: bigcrypt_main.c
+ @am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(bigcrypt_CFLAGS) $(CFLAGS) -MT bigcrypt-bigcrypt_main.obj -MD -MP -MF $(DEPDIR)/bigcrypt-bigcrypt_main.Tpo -c -o bigcrypt-bigcrypt_main.obj `if test -f 'bigcrypt_main.c'; then $(CYGPATH_W) 'bigcrypt_main.c'; else $(CYGPATH_W) '$(srcdir)/bigcrypt_main.c'; fi`
+-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/bigcrypt-bigcrypt_main.Tpo $(DEPDIR)/bigcrypt-bigcrypt_main.Po
++@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/bigcrypt-bigcrypt_main.Tpo $(DEPDIR)/bigcrypt-bigcrypt_main.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='bigcrypt_main.c' object='bigcrypt-bigcrypt_main.obj' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(bigcrypt_CFLAGS) $(CFLAGS) -c -o bigcrypt-bigcrypt_main.obj `if test -f 'bigcrypt_main.c'; then $(CYGPATH_W) 'bigcrypt_main.c'; else $(CYGPATH_W) '$(srcdir)/bigcrypt_main.c'; fi`
+
+ unix_chkpwd-unix_chkpwd.o: unix_chkpwd.c
+ @am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(unix_chkpwd_CFLAGS) $(CFLAGS) -MT unix_chkpwd-unix_chkpwd.o -MD -MP -MF $(DEPDIR)/unix_chkpwd-unix_chkpwd.Tpo -c -o unix_chkpwd-unix_chkpwd.o `test -f 'unix_chkpwd.c' || echo '$(srcdir)/'`unix_chkpwd.c
+-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/unix_chkpwd-unix_chkpwd.Tpo $(DEPDIR)/unix_chkpwd-unix_chkpwd.Po
++@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/unix_chkpwd-unix_chkpwd.Tpo $(DEPDIR)/unix_chkpwd-unix_chkpwd.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='unix_chkpwd.c' object='unix_chkpwd-unix_chkpwd.o' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(unix_chkpwd_CFLAGS) $(CFLAGS) -c -o unix_chkpwd-unix_chkpwd.o `test -f 'unix_chkpwd.c' || echo '$(srcdir)/'`unix_chkpwd.c
+
+ unix_chkpwd-unix_chkpwd.obj: unix_chkpwd.c
+ @am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(unix_chkpwd_CFLAGS) $(CFLAGS) -MT unix_chkpwd-unix_chkpwd.obj -MD -MP -MF $(DEPDIR)/unix_chkpwd-unix_chkpwd.Tpo -c -o unix_chkpwd-unix_chkpwd.obj `if test -f 'unix_chkpwd.c'; then $(CYGPATH_W) 'unix_chkpwd.c'; else $(CYGPATH_W) '$(srcdir)/unix_chkpwd.c'; fi`
+-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/unix_chkpwd-unix_chkpwd.Tpo $(DEPDIR)/unix_chkpwd-unix_chkpwd.Po
++@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/unix_chkpwd-unix_chkpwd.Tpo $(DEPDIR)/unix_chkpwd-unix_chkpwd.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='unix_chkpwd.c' object='unix_chkpwd-unix_chkpwd.obj' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(unix_chkpwd_CFLAGS) $(CFLAGS) -c -o unix_chkpwd-unix_chkpwd.obj `if test -f 'unix_chkpwd.c'; then $(CYGPATH_W) 'unix_chkpwd.c'; else $(CYGPATH_W) '$(srcdir)/unix_chkpwd.c'; fi`
+
+ unix_chkpwd-md5_good.o: md5_good.c
+ @am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(unix_chkpwd_CFLAGS) $(CFLAGS) -MT unix_chkpwd-md5_good.o -MD -MP -MF $(DEPDIR)/unix_chkpwd-md5_good.Tpo -c -o unix_chkpwd-md5_good.o `test -f 'md5_good.c' || echo '$(srcdir)/'`md5_good.c
+-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/unix_chkpwd-md5_good.Tpo $(DEPDIR)/unix_chkpwd-md5_good.Po
++@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/unix_chkpwd-md5_good.Tpo $(DEPDIR)/unix_chkpwd-md5_good.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='md5_good.c' object='unix_chkpwd-md5_good.o' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(unix_chkpwd_CFLAGS) $(CFLAGS) -c -o unix_chkpwd-md5_good.o `test -f 'md5_good.c' || echo '$(srcdir)/'`md5_good.c
+
+ unix_chkpwd-md5_good.obj: md5_good.c
+ @am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(unix_chkpwd_CFLAGS) $(CFLAGS) -MT unix_chkpwd-md5_good.obj -MD -MP -MF $(DEPDIR)/unix_chkpwd-md5_good.Tpo -c -o unix_chkpwd-md5_good.obj `if test -f 'md5_good.c'; then $(CYGPATH_W) 'md5_good.c'; else $(CYGPATH_W) '$(srcdir)/md5_good.c'; fi`
+-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/unix_chkpwd-md5_good.Tpo $(DEPDIR)/unix_chkpwd-md5_good.Po
++@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/unix_chkpwd-md5_good.Tpo $(DEPDIR)/unix_chkpwd-md5_good.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='md5_good.c' object='unix_chkpwd-md5_good.obj' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(unix_chkpwd_CFLAGS) $(CFLAGS) -c -o unix_chkpwd-md5_good.obj `if test -f 'md5_good.c'; then $(CYGPATH_W) 'md5_good.c'; else $(CYGPATH_W) '$(srcdir)/md5_good.c'; fi`
+
+ unix_chkpwd-md5_broken.o: md5_broken.c
+ @am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(unix_chkpwd_CFLAGS) $(CFLAGS) -MT unix_chkpwd-md5_broken.o -MD -MP -MF $(DEPDIR)/unix_chkpwd-md5_broken.Tpo -c -o unix_chkpwd-md5_broken.o `test -f 'md5_broken.c' || echo '$(srcdir)/'`md5_broken.c
+-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/unix_chkpwd-md5_broken.Tpo $(DEPDIR)/unix_chkpwd-md5_broken.Po
++@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/unix_chkpwd-md5_broken.Tpo $(DEPDIR)/unix_chkpwd-md5_broken.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='md5_broken.c' object='unix_chkpwd-md5_broken.o' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(unix_chkpwd_CFLAGS) $(CFLAGS) -c -o unix_chkpwd-md5_broken.o `test -f 'md5_broken.c' || echo '$(srcdir)/'`md5_broken.c
+
+ unix_chkpwd-md5_broken.obj: md5_broken.c
+ @am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(unix_chkpwd_CFLAGS) $(CFLAGS) -MT unix_chkpwd-md5_broken.obj -MD -MP -MF $(DEPDIR)/unix_chkpwd-md5_broken.Tpo -c -o unix_chkpwd-md5_broken.obj `if test -f 'md5_broken.c'; then $(CYGPATH_W) 'md5_broken.c'; else $(CYGPATH_W) '$(srcdir)/md5_broken.c'; fi`
+-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/unix_chkpwd-md5_broken.Tpo $(DEPDIR)/unix_chkpwd-md5_broken.Po
++@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/unix_chkpwd-md5_broken.Tpo $(DEPDIR)/unix_chkpwd-md5_broken.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='md5_broken.c' object='unix_chkpwd-md5_broken.obj' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(unix_chkpwd_CFLAGS) $(CFLAGS) -c -o unix_chkpwd-md5_broken.obj `if test -f 'md5_broken.c'; then $(CYGPATH_W) 'md5_broken.c'; else $(CYGPATH_W) '$(srcdir)/md5_broken.c'; fi`
+
+ unix_chkpwd-bigcrypt.o: bigcrypt.c
+ @am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(unix_chkpwd_CFLAGS) $(CFLAGS) -MT unix_chkpwd-bigcrypt.o -MD -MP -MF $(DEPDIR)/unix_chkpwd-bigcrypt.Tpo -c -o unix_chkpwd-bigcrypt.o `test -f 'bigcrypt.c' || echo '$(srcdir)/'`bigcrypt.c
+-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/unix_chkpwd-bigcrypt.Tpo $(DEPDIR)/unix_chkpwd-bigcrypt.Po
++@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/unix_chkpwd-bigcrypt.Tpo $(DEPDIR)/unix_chkpwd-bigcrypt.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='bigcrypt.c' object='unix_chkpwd-bigcrypt.o' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(unix_chkpwd_CFLAGS) $(CFLAGS) -c -o unix_chkpwd-bigcrypt.o `test -f 'bigcrypt.c' || echo '$(srcdir)/'`bigcrypt.c
+
+ unix_chkpwd-bigcrypt.obj: bigcrypt.c
+ @am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(unix_chkpwd_CFLAGS) $(CFLAGS) -MT unix_chkpwd-bigcrypt.obj -MD -MP -MF $(DEPDIR)/unix_chkpwd-bigcrypt.Tpo -c -o unix_chkpwd-bigcrypt.obj `if test -f 'bigcrypt.c'; then $(CYGPATH_W) 'bigcrypt.c'; else $(CYGPATH_W) '$(srcdir)/bigcrypt.c'; fi`
+-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/unix_chkpwd-bigcrypt.Tpo $(DEPDIR)/unix_chkpwd-bigcrypt.Po
++@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/unix_chkpwd-bigcrypt.Tpo $(DEPDIR)/unix_chkpwd-bigcrypt.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='bigcrypt.c' object='unix_chkpwd-bigcrypt.obj' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(unix_chkpwd_CFLAGS) $(CFLAGS) -c -o unix_chkpwd-bigcrypt.obj `if test -f 'bigcrypt.c'; then $(CYGPATH_W) 'bigcrypt.c'; else $(CYGPATH_W) '$(srcdir)/bigcrypt.c'; fi`
+
+ unix_chkpwd-passverify.o: passverify.c
+ @am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(unix_chkpwd_CFLAGS) $(CFLAGS) -MT unix_chkpwd-passverify.o -MD -MP -MF $(DEPDIR)/unix_chkpwd-passverify.Tpo -c -o unix_chkpwd-passverify.o `test -f 'passverify.c' || echo '$(srcdir)/'`passverify.c
+-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/unix_chkpwd-passverify.Tpo $(DEPDIR)/unix_chkpwd-passverify.Po
++@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/unix_chkpwd-passverify.Tpo $(DEPDIR)/unix_chkpwd-passverify.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='passverify.c' object='unix_chkpwd-passverify.o' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(unix_chkpwd_CFLAGS) $(CFLAGS) -c -o unix_chkpwd-passverify.o `test -f 'passverify.c' || echo '$(srcdir)/'`passverify.c
+
+ unix_chkpwd-passverify.obj: passverify.c
+ @am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(unix_chkpwd_CFLAGS) $(CFLAGS) -MT unix_chkpwd-passverify.obj -MD -MP -MF $(DEPDIR)/unix_chkpwd-passverify.Tpo -c -o unix_chkpwd-passverify.obj `if test -f 'passverify.c'; then $(CYGPATH_W) 'passverify.c'; else $(CYGPATH_W) '$(srcdir)/passverify.c'; fi`
+-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/unix_chkpwd-passverify.Tpo $(DEPDIR)/unix_chkpwd-passverify.Po
++@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/unix_chkpwd-passverify.Tpo $(DEPDIR)/unix_chkpwd-passverify.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='passverify.c' object='unix_chkpwd-passverify.obj' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(unix_chkpwd_CFLAGS) $(CFLAGS) -c -o unix_chkpwd-passverify.obj `if test -f 'passverify.c'; then $(CYGPATH_W) 'passverify.c'; else $(CYGPATH_W) '$(srcdir)/passverify.c'; fi`
+
+ unix_update-unix_update.o: unix_update.c
+ @am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(unix_update_CFLAGS) $(CFLAGS) -MT unix_update-unix_update.o -MD -MP -MF $(DEPDIR)/unix_update-unix_update.Tpo -c -o unix_update-unix_update.o `test -f 'unix_update.c' || echo '$(srcdir)/'`unix_update.c
+-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/unix_update-unix_update.Tpo $(DEPDIR)/unix_update-unix_update.Po
++@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/unix_update-unix_update.Tpo $(DEPDIR)/unix_update-unix_update.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='unix_update.c' object='unix_update-unix_update.o' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(unix_update_CFLAGS) $(CFLAGS) -c -o unix_update-unix_update.o `test -f 'unix_update.c' || echo '$(srcdir)/'`unix_update.c
+
+ unix_update-unix_update.obj: unix_update.c
+ @am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(unix_update_CFLAGS) $(CFLAGS) -MT unix_update-unix_update.obj -MD -MP -MF $(DEPDIR)/unix_update-unix_update.Tpo -c -o unix_update-unix_update.obj `if test -f 'unix_update.c'; then $(CYGPATH_W) 'unix_update.c'; else $(CYGPATH_W) '$(srcdir)/unix_update.c'; fi`
+-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/unix_update-unix_update.Tpo $(DEPDIR)/unix_update-unix_update.Po
++@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/unix_update-unix_update.Tpo $(DEPDIR)/unix_update-unix_update.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='unix_update.c' object='unix_update-unix_update.obj' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(unix_update_CFLAGS) $(CFLAGS) -c -o unix_update-unix_update.obj `if test -f 'unix_update.c'; then $(CYGPATH_W) 'unix_update.c'; else $(CYGPATH_W) '$(srcdir)/unix_update.c'; fi`
+
+ unix_update-md5_good.o: md5_good.c
+ @am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(unix_update_CFLAGS) $(CFLAGS) -MT unix_update-md5_good.o -MD -MP -MF $(DEPDIR)/unix_update-md5_good.Tpo -c -o unix_update-md5_good.o `test -f 'md5_good.c' || echo '$(srcdir)/'`md5_good.c
+-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/unix_update-md5_good.Tpo $(DEPDIR)/unix_update-md5_good.Po
++@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/unix_update-md5_good.Tpo $(DEPDIR)/unix_update-md5_good.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='md5_good.c' object='unix_update-md5_good.o' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(unix_update_CFLAGS) $(CFLAGS) -c -o unix_update-md5_good.o `test -f 'md5_good.c' || echo '$(srcdir)/'`md5_good.c
+
+ unix_update-md5_good.obj: md5_good.c
+ @am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(unix_update_CFLAGS) $(CFLAGS) -MT unix_update-md5_good.obj -MD -MP -MF $(DEPDIR)/unix_update-md5_good.Tpo -c -o unix_update-md5_good.obj `if test -f 'md5_good.c'; then $(CYGPATH_W) 'md5_good.c'; else $(CYGPATH_W) '$(srcdir)/md5_good.c'; fi`
+-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/unix_update-md5_good.Tpo $(DEPDIR)/unix_update-md5_good.Po
++@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/unix_update-md5_good.Tpo $(DEPDIR)/unix_update-md5_good.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='md5_good.c' object='unix_update-md5_good.obj' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(unix_update_CFLAGS) $(CFLAGS) -c -o unix_update-md5_good.obj `if test -f 'md5_good.c'; then $(CYGPATH_W) 'md5_good.c'; else $(CYGPATH_W) '$(srcdir)/md5_good.c'; fi`
+
+ unix_update-md5_broken.o: md5_broken.c
+ @am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(unix_update_CFLAGS) $(CFLAGS) -MT unix_update-md5_broken.o -MD -MP -MF $(DEPDIR)/unix_update-md5_broken.Tpo -c -o unix_update-md5_broken.o `test -f 'md5_broken.c' || echo '$(srcdir)/'`md5_broken.c
+-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/unix_update-md5_broken.Tpo $(DEPDIR)/unix_update-md5_broken.Po
++@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/unix_update-md5_broken.Tpo $(DEPDIR)/unix_update-md5_broken.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='md5_broken.c' object='unix_update-md5_broken.o' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(unix_update_CFLAGS) $(CFLAGS) -c -o unix_update-md5_broken.o `test -f 'md5_broken.c' || echo '$(srcdir)/'`md5_broken.c
+
+ unix_update-md5_broken.obj: md5_broken.c
+ @am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(unix_update_CFLAGS) $(CFLAGS) -MT unix_update-md5_broken.obj -MD -MP -MF $(DEPDIR)/unix_update-md5_broken.Tpo -c -o unix_update-md5_broken.obj `if test -f 'md5_broken.c'; then $(CYGPATH_W) 'md5_broken.c'; else $(CYGPATH_W) '$(srcdir)/md5_broken.c'; fi`
+-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/unix_update-md5_broken.Tpo $(DEPDIR)/unix_update-md5_broken.Po
++@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/unix_update-md5_broken.Tpo $(DEPDIR)/unix_update-md5_broken.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='md5_broken.c' object='unix_update-md5_broken.obj' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(unix_update_CFLAGS) $(CFLAGS) -c -o unix_update-md5_broken.obj `if test -f 'md5_broken.c'; then $(CYGPATH_W) 'md5_broken.c'; else $(CYGPATH_W) '$(srcdir)/md5_broken.c'; fi`
+
+ unix_update-bigcrypt.o: bigcrypt.c
+ @am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(unix_update_CFLAGS) $(CFLAGS) -MT unix_update-bigcrypt.o -MD -MP -MF $(DEPDIR)/unix_update-bigcrypt.Tpo -c -o unix_update-bigcrypt.o `test -f 'bigcrypt.c' || echo '$(srcdir)/'`bigcrypt.c
+-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/unix_update-bigcrypt.Tpo $(DEPDIR)/unix_update-bigcrypt.Po
++@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/unix_update-bigcrypt.Tpo $(DEPDIR)/unix_update-bigcrypt.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='bigcrypt.c' object='unix_update-bigcrypt.o' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(unix_update_CFLAGS) $(CFLAGS) -c -o unix_update-bigcrypt.o `test -f 'bigcrypt.c' || echo '$(srcdir)/'`bigcrypt.c
+
+ unix_update-bigcrypt.obj: bigcrypt.c
+ @am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(unix_update_CFLAGS) $(CFLAGS) -MT unix_update-bigcrypt.obj -MD -MP -MF $(DEPDIR)/unix_update-bigcrypt.Tpo -c -o unix_update-bigcrypt.obj `if test -f 'bigcrypt.c'; then $(CYGPATH_W) 'bigcrypt.c'; else $(CYGPATH_W) '$(srcdir)/bigcrypt.c'; fi`
+-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/unix_update-bigcrypt.Tpo $(DEPDIR)/unix_update-bigcrypt.Po
++@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/unix_update-bigcrypt.Tpo $(DEPDIR)/unix_update-bigcrypt.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='bigcrypt.c' object='unix_update-bigcrypt.obj' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(unix_update_CFLAGS) $(CFLAGS) -c -o unix_update-bigcrypt.obj `if test -f 'bigcrypt.c'; then $(CYGPATH_W) 'bigcrypt.c'; else $(CYGPATH_W) '$(srcdir)/bigcrypt.c'; fi`
+
+ unix_update-passverify.o: passverify.c
+ @am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(unix_update_CFLAGS) $(CFLAGS) -MT unix_update-passverify.o -MD -MP -MF $(DEPDIR)/unix_update-passverify.Tpo -c -o unix_update-passverify.o `test -f 'passverify.c' || echo '$(srcdir)/'`passverify.c
+-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/unix_update-passverify.Tpo $(DEPDIR)/unix_update-passverify.Po
++@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/unix_update-passverify.Tpo $(DEPDIR)/unix_update-passverify.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='passverify.c' object='unix_update-passverify.o' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(unix_update_CFLAGS) $(CFLAGS) -c -o unix_update-passverify.o `test -f 'passverify.c' || echo '$(srcdir)/'`passverify.c
+
+ unix_update-passverify.obj: passverify.c
+ @am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(unix_update_CFLAGS) $(CFLAGS) -MT unix_update-passverify.obj -MD -MP -MF $(DEPDIR)/unix_update-passverify.Tpo -c -o unix_update-passverify.obj `if test -f 'passverify.c'; then $(CYGPATH_W) 'passverify.c'; else $(CYGPATH_W) '$(srcdir)/passverify.c'; fi`
+-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/unix_update-passverify.Tpo $(DEPDIR)/unix_update-passverify.Po
++@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/unix_update-passverify.Tpo $(DEPDIR)/unix_update-passverify.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='passverify.c' object='unix_update-passverify.obj' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(unix_update_CFLAGS) $(CFLAGS) -c -o unix_update-passverify.obj `if test -f 'passverify.c'; then $(CYGPATH_W) 'passverify.c'; else $(CYGPATH_W) '$(srcdir)/passverify.c'; fi`
+@@ -667,65 +711,58 @@
+
+ clean-libtool:
+ -rm -rf .libs _libs
+-install-man8: $(man8_MANS) $(man_MANS)
++install-man8: $(man_MANS)
+ @$(NORMAL_INSTALL)
+ test -z "$(man8dir)" || $(MKDIR_P) "$(DESTDIR)$(man8dir)"
+- @list='$(man8_MANS) $(dist_man8_MANS) $(nodist_man8_MANS)'; \
+- l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
+- for i in $$l2; do \
+- case "$$i" in \
+- *.8*) list="$$list $$i" ;; \
+- esac; \
++ @list=''; test -n "$(man8dir)" || exit 0; \
++ { for i in $$list; do echo "$$i"; done; \
++ l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \
++ sed -n '/\.8[a-z]*$$/p'; \
++ } | while read p; do \
++ if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
++ echo "$$d$$p"; echo "$$p"; \
++ done | \
++ sed -e 'n;s,.*/,,;p;h;s,.*\.,,;s,^[^8][0-9a-z]*$$,8,;x' \
++ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,' | \
++ sed 'N;N;s,\n, ,g' | { \
++ list=; while read file base inst; do \
++ if test "$$base" = "$$inst"; then list="$$list $$file"; else \
++ echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man8dir)/$$inst'"; \
++ $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man8dir)/$$inst" || exit $$?; \
++ fi; \
+ done; \
+- for i in $$list; do \
+- if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
+- else file=$$i; fi; \
+- ext=`echo $$i | sed -e 's/^.*\\.//'`; \
+- case "$$ext" in \
+- 8*) ;; \
+- *) ext='8' ;; \
+- esac; \
+- inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
+- inst=`echo $$inst | sed -e 's/^.*\///'`; \
+- inst=`echo $$inst | sed '$(transform)'`.$$ext; \
+- echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man8dir)/$$inst'"; \
+- $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man8dir)/$$inst"; \
+- done
++ for i in $$list; do echo "$$i"; done | $(am__base_list) | \
++ while read files; do \
++ test -z "$$files" || { \
++ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(man8dir)'"; \
++ $(INSTALL_DATA) $$files "$(DESTDIR)$(man8dir)" || exit $$?; }; \
++ done; }
++
+ uninstall-man8:
+ @$(NORMAL_UNINSTALL)
+- @list='$(man8_MANS) $(dist_man8_MANS) $(nodist_man8_MANS)'; \
+- l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
+- for i in $$l2; do \
+- case "$$i" in \
+- *.8*) list="$$list $$i" ;; \
+- esac; \
+- done; \
+- for i in $$list; do \
+- ext=`echo $$i | sed -e 's/^.*\\.//'`; \
+- case "$$ext" in \
+- 8*) ;; \
+- *) ext='8' ;; \
+- esac; \
+- inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
+- inst=`echo $$inst | sed -e 's/^.*\///'`; \
+- inst=`echo $$inst | sed '$(transform)'`.$$ext; \
+- echo " rm -f '$(DESTDIR)$(man8dir)/$$inst'"; \
+- rm -f "$(DESTDIR)$(man8dir)/$$inst"; \
+- done
++ @list=''; test -n "$(man8dir)" || exit 0; \
++ files=`{ for i in $$list; do echo "$$i"; done; \
++ l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \
++ sed -n '/\.8[a-z]*$$/p'; \
++ } | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^8][0-9a-z]*$$,8,;x' \
++ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \
++ test -z "$$files" || { \
++ echo " ( cd '$(DESTDIR)$(man8dir)' && rm -f" $$files ")"; \
++ cd "$(DESTDIR)$(man8dir)" && rm -f $$files; }
+
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+- $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ mkid -fID $$unique
+ tags: TAGS
+
+ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+ $(TAGS_FILES) $(LISP)
+- tags=; \
++ set x; \
+ here=`pwd`; \
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+@@ -733,37 +770,43 @@
+ done | \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
+- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
++ shift; \
++ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+ test -n "$$unique" || unique=$$empty_fix; \
+- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+- $$tags $$unique; \
++ if test $$# -gt 0; then \
++ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
++ "$$@" $$unique; \
++ else \
++ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
++ $$unique; \
++ fi; \
+ fi
+ ctags: CTAGS
+ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+ $(TAGS_FILES) $(LISP)
+- tags=; \
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
+- test -z "$(CTAGS_ARGS)$$tags$$unique" \
++ test -z "$(CTAGS_ARGS)$$unique" \
+ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+- $$tags $$unique
++ $$unique
+
+ GTAGS:
+ here=`$(am__cd) $(top_builddir) && pwd` \
+- && cd $(top_srcdir) \
+- && gtags -i $(GTAGS_ARGS) $$here
++ && $(am__cd) $(top_srcdir) \
++ && gtags -i $(GTAGS_ARGS) "$$here"
+
+ distclean-tags:
+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+ check-TESTS: $(TESTS)
+- @failed=0; all=0; xfail=0; xpass=0; skip=0; ws='[ ]'; \
++ @failed=0; all=0; xfail=0; xpass=0; skip=0; \
+ srcdir=$(srcdir); export srcdir; \
+ list=' $(TESTS) '; \
++ $(am__tty_colors); \
+ if test -n "$$list"; then \
+ for tst in $$list; do \
+ if test -f ./$$tst; then dir=./; \
+@@ -772,49 +815,63 @@
+ if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
+ all=`expr $$all + 1`; \
+ case " $(XFAIL_TESTS) " in \
+- *$$ws$$tst$$ws*) \
++ *[\ \ ]$$tst[\ \ ]*) \
+ xpass=`expr $$xpass + 1`; \
+ failed=`expr $$failed + 1`; \
+- echo "XPASS: $$tst"; \
++ col=$$red; res=XPASS; \
+ ;; \
+ *) \
+- echo "PASS: $$tst"; \
++ col=$$grn; res=PASS; \
+ ;; \
+ esac; \
+ elif test $$? -ne 77; then \
+ all=`expr $$all + 1`; \
+ case " $(XFAIL_TESTS) " in \
+- *$$ws$$tst$$ws*) \
++ *[\ \ ]$$tst[\ \ ]*) \
+ xfail=`expr $$xfail + 1`; \
+- echo "XFAIL: $$tst"; \
++ col=$$lgn; res=XFAIL; \
+ ;; \
+ *) \
+ failed=`expr $$failed + 1`; \
+- echo "FAIL: $$tst"; \
++ col=$$red; res=FAIL; \
+ ;; \
+ esac; \
+ else \
+ skip=`expr $$skip + 1`; \
+- echo "SKIP: $$tst"; \
++ col=$$blu; res=SKIP; \
+ fi; \
++ echo "$${col}$$res$${std}: $$tst"; \
+ done; \
++ if test "$$all" -eq 1; then \
++ tests="test"; \
++ All=""; \
++ else \
++ tests="tests"; \
++ All="All "; \
++ fi; \
+ if test "$$failed" -eq 0; then \
+ if test "$$xfail" -eq 0; then \
+- banner="All $$all tests passed"; \
++ banner="$$All$$all $$tests passed"; \
+ else \
+- banner="All $$all tests behaved as expected ($$xfail expected failures)"; \
++ if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \
++ banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \
+ fi; \
+ else \
+ if test "$$xpass" -eq 0; then \
+- banner="$$failed of $$all tests failed"; \
++ banner="$$failed of $$all $$tests failed"; \
+ else \
+- banner="$$failed of $$all tests did not behave as expected ($$xpass unexpected passes)"; \
++ if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \
++ banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \
+ fi; \
+ fi; \
+ dashes="$$banner"; \
+ skipped=""; \
+ if test "$$skip" -ne 0; then \
+- skipped="($$skip tests were not run)"; \
++ if test "$$skip" -eq 1; then \
++ skipped="($$skip test was not run)"; \
++ else \
++ skipped="($$skip tests were not run)"; \
++ fi; \
+ test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \
+ dashes="$$skipped"; \
+ fi; \
+@@ -825,15 +882,32 @@
+ dashes="$$report"; \
+ fi; \
+ dashes=`echo "$$dashes" | sed s/./=/g`; \
+- echo "$$dashes"; \
++ if test "$$failed" -eq 0; then \
++ echo "$$grn$$dashes"; \
++ else \
++ echo "$$red$$dashes"; \
++ fi; \
+ echo "$$banner"; \
+ test -z "$$skipped" || echo "$$skipped"; \
+ test -z "$$report" || echo "$$report"; \
+- echo "$$dashes"; \
++ echo "$$dashes$$std"; \
+ test "$$failed" -eq 0; \
+ else :; fi
+
+ distdir: $(DISTFILES)
++ @list='$(MANS)'; if test -n "$$list"; then \
++ list=`for p in $$list; do \
++ if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
++ if test -f "$$d$$p"; then echo "$$d$$p"; else :; fi; done`; \
++ if test -n "$$list" && \
++ grep 'ab help2man is required to generate this page' $$list >/dev/null; then \
++ echo "error: found man pages containing the \`missing help2man' replacement text:" >&2; \
++ grep -l 'ab help2man is required to generate this page' $$list | sed 's/^/ /' >&2; \
++ echo " to fix them, install help2man, remove and regenerate the man pages;" >&2; \
++ echo " typically \`make maintainer-clean' will remove them" >&2; \
++ exit 1; \
++ else :; fi; \
++ else :; fi
+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ list='$(DISTFILES)'; \
+@@ -849,13 +923,17 @@
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+ if test -d $$d/$$file; then \
+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
++ if test -d "$(distdir)/$$file"; then \
++ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
++ fi; \
+ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
++ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
++ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+ fi; \
+- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
++ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+ else \
+- test -f $(distdir)/$$file \
+- || cp -p $$d/$$file $(distdir)/$$file \
++ test -f "$(distdir)/$$file" \
++ || cp -p $$d/$$file "$(distdir)/$$file" \
+ || exit 1; \
+ fi; \
+ done
+@@ -888,6 +966,7 @@
+
+ distclean-generic:
+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
++ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+
+ maintainer-clean-generic:
+ @echo "This command is intended for maintainers to use"
+@@ -910,6 +989,8 @@
+
+ html: html-am
+
++html-am:
++
+ info: info-am
+
+ info-am:
+@@ -918,18 +999,28 @@
+
+ install-dvi: install-dvi-am
+
++install-dvi-am:
++
+ install-exec-am: install-sbinPROGRAMS
+
+ install-html: install-html-am
+
++install-html-am:
++
+ install-info: install-info-am
+
++install-info-am:
++
+ install-man: install-man8
+
+ install-pdf: install-pdf-am
+
++install-pdf-am:
++
+ install-ps: install-ps-am
+
++install-ps-am:
++
+ installcheck-am:
+
+ maintainer-clean: maintainer-clean-am
+@@ -955,7 +1046,7 @@
+
+ uninstall-man: uninstall-man8
+
+-.MAKE: install-am install-strip
++.MAKE: check-am install-am install-strip
+
+ .PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \
+ clean-generic clean-libtool clean-noinstPROGRAMS \
+@@ -976,6 +1067,7 @@
+
+ @ENABLE_REGENERATE_MAN_TRUE@README: pam_unix.8.xml
+ @ENABLE_REGENERATE_MAN_TRUE@-include $(top_srcdir)/Make.xml.rules
++
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT:
Index: pam.debian/modules/pam_tty_audit/Makefile.in
===================================================================
--- pam.debian.orig/modules/pam_tty_audit/Makefile.in
+++ pam.debian/modules/pam_tty_audit/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.11 from Makefile.am.
+@@ -1,8 +1,9 @@
+-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -45,7 +45,6 @@
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
- $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \
-- $(top_srcdir)/m4/japhar_grep_cflags.m4 \
- $(top_srcdir)/m4/jh_path_xml_catalog.m4 \
- $(top_srcdir)/m4/ld-O1.m4 $(top_srcdir)/m4/ld-as-needed.m4 \
- $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
-@@ -54,7 +53,7 @@
- $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
- $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \
- $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/progtest.m4 \
-- $(top_srcdir)/configure.in
-+ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
+-# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
++# Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -21,8 +22,9 @@
+
+ VPATH = @srcdir@
+ pkgdatadir = $(datadir)/@PACKAGE@
+-pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
++pkglibdir = $(libdir)/@PACKAGE@
++pkglibexecdir = $(libexecdir)/@PACKAGE@
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+@@ -58,14 +60,29 @@
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-@@ -193,6 +192,7 @@
+ CONFIG_HEADER = $(top_builddir)/config.h
+ CONFIG_CLEAN_FILES =
++CONFIG_CLEAN_VPATH_FILES =
+ am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+ am__vpath_adj = case $$p in \
+ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+ *) f=$$p;; \
+ esac;
+-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
++am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
++am__install_max = 40
++am__nobase_strip_setup = \
++ srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
++am__nobase_strip = \
++ for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
++am__nobase_list = $(am__nobase_strip_setup); \
++ for p in $$list; do echo "$$p $$p"; done | \
++ sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
++ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
++ if (++n[$$2] == $(am__install_max)) \
++ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
++ END { for (dir in files) print dir, files[dir] }'
++am__base_list = \
++ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
++ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+ am__installdirs = "$(DESTDIR)$(securelibdir)" "$(DESTDIR)$(man8dir)"
+-securelibLTLIBRARIES_INSTALL = $(INSTALL)
+ LTLIBRARIES = $(securelib_LTLIBRARIES)
+ pam_tty_audit_la_DEPENDENCIES =
+ pam_tty_audit_la_SOURCES = pam_tty_audit.c
+@@ -75,6 +92,7 @@
+ DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
+ depcomp = $(SHELL) $(top_srcdir)/depcomp
+ am__depfiles_maybe = depfiles
++am__mv = mv -f
+ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+ LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+@@ -92,6 +110,8 @@
+ DATA = $(noinst_DATA)
+ ETAGS = etags
+ CTAGS = ctags
++am__tty_colors = \
++red=; grn=; lgn=; blu=; std=
+ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ ACLOCAL = @ACLOCAL@
+ AMTAR = @AMTAR@
+@@ -176,6 +196,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -17407,45 +20959,514 @@ Index: pam.debian/modules/pam_tty_audit/Makefile.in
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PIE_CFLAGS = @PIE_CFLAGS@
-@@ -273,8 +273,8 @@
- top_srcdir = @top_srcdir@
- CLEANFILES = *~
- MAINTAINERCLEANFILES = $(MANS) README
--EXTRA_DIST = README $(MANS) $(XMLS)
--man_MANS = pam_tty_audit.8
-+EXTRA_DIST = README pam_tty_audit.8 $(XMLS)
-+@HAVE_AUDIT_TTY_STATUS_TRUE@man_MANS = pam_tty_audit.8
- XMLS = README.xml pam_tty_audit.8.xml
- securelibdir = $(SECUREDIR)
- AM_CFLAGS = -I$(top_srcdir)/libpam/include -I$(top_srcdir)/libpamc/include
+@@ -274,14 +295,14 @@
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+- && exit 0; \
++ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
++ && { if test -f $@; then exit 0; else break; fi; }; \
+ exit 1;; \
+ esac; \
+ done; \
+- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu modules/pam_tty_audit/Makefile'; \
+- cd $(top_srcdir) && \
+- $(AUTOMAKE) --gnu modules/pam_tty_audit/Makefile
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu modules/pam_tty_audit/Makefile'; \
++ $(am__cd) $(top_srcdir) && \
++ $(AUTOMAKE) --gnu modules/pam_tty_audit/Makefile
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ @case '$?' in \
+@@ -299,23 +320,28 @@
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ $(ACLOCAL_M4): $(am__aclocal_m4_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++$(am__aclocal_m4_deps):
+ install-securelibLTLIBRARIES: $(securelib_LTLIBRARIES)
+ @$(NORMAL_INSTALL)
+ test -z "$(securelibdir)" || $(MKDIR_P) "$(DESTDIR)$(securelibdir)"
+- @list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
++ @list='$(securelib_LTLIBRARIES)'; test -n "$(securelibdir)" || list=; \
++ list2=; for p in $$list; do \
+ if test -f $$p; then \
+- f=$(am__strip_dir) \
+- echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(securelibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(securelibdir)/$$f'"; \
+- $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(securelibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(securelibdir)/$$f"; \
++ list2="$$list2 $$p"; \
+ else :; fi; \
+- done
++ done; \
++ test -z "$$list2" || { \
++ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(securelibdir)'"; \
++ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(securelibdir)"; \
++ }
+
+ uninstall-securelibLTLIBRARIES:
+ @$(NORMAL_UNINSTALL)
+- @list='$(securelib_LTLIBRARIES)'; for p in $$list; do \
+- p=$(am__strip_dir) \
+- echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$p'"; \
+- $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$p"; \
++ @list='$(securelib_LTLIBRARIES)'; test -n "$(securelibdir)" || list=; \
++ for p in $$list; do \
++ $(am__strip_dir) \
++ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(securelibdir)/$$f'"; \
++ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(securelibdir)/$$f"; \
+ done
+
+ clean-securelibLTLIBRARIES:
+@@ -339,21 +365,21 @@
+
+ .c.o:
+ @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
++@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(COMPILE) -c $<
+
+ .c.obj:
+ @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
++@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
+
+ .c.lo:
+ @am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
++@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
+@@ -363,65 +389,58 @@
+
+ clean-libtool:
+ -rm -rf .libs _libs
+-install-man8: $(man8_MANS) $(man_MANS)
++install-man8: $(man_MANS)
+ @$(NORMAL_INSTALL)
+ test -z "$(man8dir)" || $(MKDIR_P) "$(DESTDIR)$(man8dir)"
+- @list='$(man8_MANS) $(dist_man8_MANS) $(nodist_man8_MANS)'; \
+- l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
+- for i in $$l2; do \
+- case "$$i" in \
+- *.8*) list="$$list $$i" ;; \
+- esac; \
++ @list=''; test -n "$(man8dir)" || exit 0; \
++ { for i in $$list; do echo "$$i"; done; \
++ l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \
++ sed -n '/\.8[a-z]*$$/p'; \
++ } | while read p; do \
++ if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
++ echo "$$d$$p"; echo "$$p"; \
++ done | \
++ sed -e 'n;s,.*/,,;p;h;s,.*\.,,;s,^[^8][0-9a-z]*$$,8,;x' \
++ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,' | \
++ sed 'N;N;s,\n, ,g' | { \
++ list=; while read file base inst; do \
++ if test "$$base" = "$$inst"; then list="$$list $$file"; else \
++ echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man8dir)/$$inst'"; \
++ $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man8dir)/$$inst" || exit $$?; \
++ fi; \
+ done; \
+- for i in $$list; do \
+- if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
+- else file=$$i; fi; \
+- ext=`echo $$i | sed -e 's/^.*\\.//'`; \
+- case "$$ext" in \
+- 8*) ;; \
+- *) ext='8' ;; \
+- esac; \
+- inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
+- inst=`echo $$inst | sed -e 's/^.*\///'`; \
+- inst=`echo $$inst | sed '$(transform)'`.$$ext; \
+- echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man8dir)/$$inst'"; \
+- $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man8dir)/$$inst"; \
+- done
++ for i in $$list; do echo "$$i"; done | $(am__base_list) | \
++ while read files; do \
++ test -z "$$files" || { \
++ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(man8dir)'"; \
++ $(INSTALL_DATA) $$files "$(DESTDIR)$(man8dir)" || exit $$?; }; \
++ done; }
++
+ uninstall-man8:
+ @$(NORMAL_UNINSTALL)
+- @list='$(man8_MANS) $(dist_man8_MANS) $(nodist_man8_MANS)'; \
+- l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
+- for i in $$l2; do \
+- case "$$i" in \
+- *.8*) list="$$list $$i" ;; \
+- esac; \
+- done; \
+- for i in $$list; do \
+- ext=`echo $$i | sed -e 's/^.*\\.//'`; \
+- case "$$ext" in \
+- 8*) ;; \
+- *) ext='8' ;; \
+- esac; \
+- inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
+- inst=`echo $$inst | sed -e 's/^.*\///'`; \
+- inst=`echo $$inst | sed '$(transform)'`.$$ext; \
+- echo " rm -f '$(DESTDIR)$(man8dir)/$$inst'"; \
+- rm -f "$(DESTDIR)$(man8dir)/$$inst"; \
+- done
++ @list=''; test -n "$(man8dir)" || exit 0; \
++ files=`{ for i in $$list; do echo "$$i"; done; \
++ l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \
++ sed -n '/\.8[a-z]*$$/p'; \
++ } | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^8][0-9a-z]*$$,8,;x' \
++ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \
++ test -z "$$files" || { \
++ echo " ( cd '$(DESTDIR)$(man8dir)' && rm -f" $$files ")"; \
++ cd "$(DESTDIR)$(man8dir)" && rm -f $$files; }
+
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+- $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ mkid -fID $$unique
+ tags: TAGS
+
+ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+ $(TAGS_FILES) $(LISP)
+- tags=; \
++ set x; \
+ here=`pwd`; \
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+@@ -429,37 +448,43 @@
+ done | \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
+- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
++ shift; \
++ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+ test -n "$$unique" || unique=$$empty_fix; \
+- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+- $$tags $$unique; \
++ if test $$# -gt 0; then \
++ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
++ "$$@" $$unique; \
++ else \
++ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
++ $$unique; \
++ fi; \
+ fi
+ ctags: CTAGS
+ CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+ $(TAGS_FILES) $(LISP)
+- tags=; \
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
+- test -z "$(CTAGS_ARGS)$$tags$$unique" \
++ test -z "$(CTAGS_ARGS)$$unique" \
+ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+- $$tags $$unique
++ $$unique
+
+ GTAGS:
+ here=`$(am__cd) $(top_builddir) && pwd` \
+- && cd $(top_srcdir) \
+- && gtags -i $(GTAGS_ARGS) $$here
++ && $(am__cd) $(top_srcdir) \
++ && gtags -i $(GTAGS_ARGS) "$$here"
+
+ distclean-tags:
+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+ check-TESTS: $(TESTS)
+- @failed=0; all=0; xfail=0; xpass=0; skip=0; ws='[ ]'; \
++ @failed=0; all=0; xfail=0; xpass=0; skip=0; \
+ srcdir=$(srcdir); export srcdir; \
+ list=' $(TESTS) '; \
++ $(am__tty_colors); \
+ if test -n "$$list"; then \
+ for tst in $$list; do \
+ if test -f ./$$tst; then dir=./; \
+@@ -468,49 +493,63 @@
+ if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
+ all=`expr $$all + 1`; \
+ case " $(XFAIL_TESTS) " in \
+- *$$ws$$tst$$ws*) \
++ *[\ \ ]$$tst[\ \ ]*) \
+ xpass=`expr $$xpass + 1`; \
+ failed=`expr $$failed + 1`; \
+- echo "XPASS: $$tst"; \
++ col=$$red; res=XPASS; \
+ ;; \
+ *) \
+- echo "PASS: $$tst"; \
++ col=$$grn; res=PASS; \
+ ;; \
+ esac; \
+ elif test $$? -ne 77; then \
+ all=`expr $$all + 1`; \
+ case " $(XFAIL_TESTS) " in \
+- *$$ws$$tst$$ws*) \
++ *[\ \ ]$$tst[\ \ ]*) \
+ xfail=`expr $$xfail + 1`; \
+- echo "XFAIL: $$tst"; \
++ col=$$lgn; res=XFAIL; \
+ ;; \
+ *) \
+ failed=`expr $$failed + 1`; \
+- echo "FAIL: $$tst"; \
++ col=$$red; res=FAIL; \
+ ;; \
+ esac; \
+ else \
+ skip=`expr $$skip + 1`; \
+- echo "SKIP: $$tst"; \
++ col=$$blu; res=SKIP; \
+ fi; \
++ echo "$${col}$$res$${std}: $$tst"; \
+ done; \
++ if test "$$all" -eq 1; then \
++ tests="test"; \
++ All=""; \
++ else \
++ tests="tests"; \
++ All="All "; \
++ fi; \
+ if test "$$failed" -eq 0; then \
+ if test "$$xfail" -eq 0; then \
+- banner="All $$all tests passed"; \
++ banner="$$All$$all $$tests passed"; \
+ else \
+- banner="All $$all tests behaved as expected ($$xfail expected failures)"; \
++ if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \
++ banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \
+ fi; \
+ else \
+ if test "$$xpass" -eq 0; then \
+- banner="$$failed of $$all tests failed"; \
++ banner="$$failed of $$all $$tests failed"; \
+ else \
+- banner="$$failed of $$all tests did not behave as expected ($$xpass unexpected passes)"; \
++ if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \
++ banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \
+ fi; \
+ fi; \
+ dashes="$$banner"; \
+ skipped=""; \
+ if test "$$skip" -ne 0; then \
+- skipped="($$skip tests were not run)"; \
++ if test "$$skip" -eq 1; then \
++ skipped="($$skip test was not run)"; \
++ else \
++ skipped="($$skip tests were not run)"; \
++ fi; \
+ test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \
+ dashes="$$skipped"; \
+ fi; \
+@@ -521,15 +560,32 @@
+ dashes="$$report"; \
+ fi; \
+ dashes=`echo "$$dashes" | sed s/./=/g`; \
+- echo "$$dashes"; \
++ if test "$$failed" -eq 0; then \
++ echo "$$grn$$dashes"; \
++ else \
++ echo "$$red$$dashes"; \
++ fi; \
+ echo "$$banner"; \
+ test -z "$$skipped" || echo "$$skipped"; \
+ test -z "$$report" || echo "$$report"; \
+- echo "$$dashes"; \
++ echo "$$dashes$$std"; \
+ test "$$failed" -eq 0; \
+ else :; fi
+
+ distdir: $(DISTFILES)
++ @list='$(MANS)'; if test -n "$$list"; then \
++ list=`for p in $$list; do \
++ if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
++ if test -f "$$d$$p"; then echo "$$d$$p"; else :; fi; done`; \
++ if test -n "$$list" && \
++ grep 'ab help2man is required to generate this page' $$list >/dev/null; then \
++ echo "error: found man pages containing the \`missing help2man' replacement text:" >&2; \
++ grep -l 'ab help2man is required to generate this page' $$list | sed 's/^/ /' >&2; \
++ echo " to fix them, install help2man, remove and regenerate the man pages;" >&2; \
++ echo " typically \`make maintainer-clean' will remove them" >&2; \
++ exit 1; \
++ else :; fi; \
++ else :; fi
+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ list='$(DISTFILES)'; \
+@@ -545,13 +601,17 @@
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+ if test -d $$d/$$file; then \
+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
++ if test -d "$(distdir)/$$file"; then \
++ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
++ fi; \
+ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
++ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
++ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+ fi; \
+- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
++ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+ else \
+- test -f $(distdir)/$$file \
+- || cp -p $$d/$$file $(distdir)/$$file \
++ test -f "$(distdir)/$$file" \
++ || cp -p $$d/$$file "$(distdir)/$$file" \
+ || exit 1; \
+ fi; \
+ done
+@@ -584,6 +644,7 @@
+
+ distclean-generic:
+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
++ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+
+ maintainer-clean-generic:
+ @echo "This command is intended for maintainers to use"
+@@ -606,6 +667,8 @@
+
+ html: html-am
+
++html-am:
++
+ info: info-am
+
+ info-am:
+@@ -614,18 +677,28 @@
+
+ install-dvi: install-dvi-am
+
++install-dvi-am:
++
+ install-exec-am:
+
+ install-html: install-html-am
+
++install-html-am:
++
+ install-info: install-info-am
+
++install-info-am:
++
+ install-man: install-man8
+
+ install-pdf: install-pdf-am
+
++install-pdf-am:
++
+ install-ps: install-ps-am
+
++install-ps-am:
++
+ installcheck-am:
+
+ maintainer-clean: maintainer-clean-am
+@@ -650,7 +723,7 @@
+
+ uninstall-man: uninstall-man8
+
+-.MAKE: install-am install-strip
++.MAKE: check-am install-am install-strip
+
+ .PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \
+ clean-generic clean-libtool clean-securelibLTLIBRARIES ctags \
+@@ -670,6 +743,7 @@
+
+ @ENABLE_REGENERATE_MAN_TRUE@README: pam_tty_audit.8.xml
+ @ENABLE_REGENERATE_MAN_TRUE@-include $(top_srcdir)/Make.xml.rules
++
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT:
Index: pam.debian/conf/Makefile.in
===================================================================
--- pam.debian.orig/conf/Makefile.in
+++ pam.debian/conf/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefil