Merge 3.8.1p1 to the trunk, minus RFC.nroff (#211640).

4 files changed, 12 insertions, 12 deletions

diff --git a/contrib/caldera/openssh.spec b/contrib/caldera/openssh.spec
index 599244b5d..e690f102f 100644
--- a/contrib/caldera/openssh.spec
+++ b/contrib/caldera/openssh.spec
@@ -17,11 +17,11 @@
 #old cvs stuff.  please update before use.  may be deprecated.
 %define use_stable      1
 %if %{use_stable}
-  %define version       3.8p1
+  %define version       3.8.1p1
   %define cvs           %{nil}
   %define release       1
 %else
-  %define version       3.8p1
+  %define version       3.8.1p1
   %define cvs           cvs20011009
   %define release       0r1
 %endif
@@ -363,4 +363,4 @@ fi
 * Mon Jan 01 1998 ...
 Template Version: 1.31
 
-$Id: openssh.spec,v 1.48 2004/02/24 05:00:04 djm Exp $
+$Id: openssh.spec,v 1.49 2004/03/21 22:40:04 djm Exp $
diff --git a/contrib/redhat/openssh.spec b/contrib/redhat/openssh.spec
index 05750e3a9..b7470092b 100644
--- a/contrib/redhat/openssh.spec
+++ b/contrib/redhat/openssh.spec
@@ -1,4 +1,4 @@
-%define ver 3.8p1
+%define ver 3.8.1p1
 %define rel 1
 
 # OpenSSH privilege separation requires a user & group ID
diff --git a/contrib/redhat/sshd.pam b/contrib/redhat/sshd.pam
index d2ab073fc..24f3b4651 100644
--- a/contrib/redhat/sshd.pam
+++ b/contrib/redhat/sshd.pam
@@ -1,8 +1,8 @@
 #%PAM-1.0
-auth       required     /lib/security/pam_stack.so service=system-auth
-auth       required     /lib/security/pam_nologin.so
-account    required     /lib/security/pam_stack.so service=system-auth
-password   required     /lib/security/pam_stack.so service=system-auth
-session    required     /lib/security/pam_stack.so service=system-auth
-session    required     /lib/security/pam_limits.so
-session    optional     /lib/security/pam_console.so
+auth       required     pam_stack.so service=system-auth
+auth       required     pam_nologin.so
+account    required     pam_stack.so service=system-auth
+password   required     pam_stack.so service=system-auth
+session    required     pam_stack.so service=system-auth
+session    required     pam_limits.so
+session    optional     pam_console.so
diff --git a/contrib/suse/openssh.spec b/contrib/suse/openssh.spec
index 7eb71adf4..2b43d0368 100644
--- a/contrib/suse/openssh.spec
+++ b/contrib/suse/openssh.spec
@@ -1,6 +1,6 @@
 Summary: OpenSSH, a free Secure Shell (SSH) protocol implementation
 Name: openssh
-Version: 3.8p1
+Version: 3.8.1p1
 URL: http://www.openssh.com/
 Release: 1
 Source0: openssh-%{version}.tar.gz