some fixes

10 files changed, 55 insertions, 23 deletions

diff --git a/sys-apps/shadow/files/cracklib/cracklib_dict.hwm b/sys-apps/shadow/files/cracklib/cracklib_dict.hwm
new file mode 100644
index 000000000000..2840153c3e93
--- /dev/null
+++ b/sys-apps/shadow/files/cracklib/cracklib_dict.hwm
diff --git a/sys-apps/shadow/files/cracklib/cracklib_dict.pwd b/sys-apps/shadow/files/cracklib/cracklib_dict.pwd
new file mode 100644
index 000000000000..46e083386a49
--- /dev/null
+++ b/sys-apps/shadow/files/cracklib/cracklib_dict.pwd
diff --git a/sys-apps/shadow/files/cracklib/cracklib_dict.pwi b/sys-apps/shadow/files/cracklib/cracklib_dict.pwi
new file mode 100644
index 000000000000..cbb17cfda7e5
--- /dev/null
+++ b/sys-apps/shadow/files/cracklib/cracklib_dict.pwi
diff --git a/sys-apps/shadow/files/pam.d/login b/sys-apps/shadow/files/pam.d/login
index 6adeff7bbf57..7c9ad5938634 100644
--- a/sys-apps/shadow/files/pam.d/login
+++ b/sys-apps/shadow/files/pam.d/login
@@ -1,8 +1,12 @@
 #%PAM-1.0
+
 auth       required	/lib/security/pam_securetty.so
 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    optional	/lib/security/pam_console.so
+session    optional	/lib/security/pam_console.so
diff --git a/sys-apps/shadow/files/pam.d/other b/sys-apps/shadow/files/pam.d/other
index 0b1f6a887248..a6a5605332dd 100644
--- a/sys-apps/shadow/files/pam.d/other
+++ b/sys-apps/shadow/files/pam.d/other
@@ -1,5 +1,9 @@
 #%PAM-1.0
-auth     required       /lib/security/pam_deny.so
-account  required       /lib/security/pam_deny.so
-password required       /lib/security/pam_deny.so
-session  required       /lib/security/pam_deny.so
+
+auth       required	/lib/security/pam_deny.so
+
+account    required	/lib/security/pam_deny.so
+
+password   required	/lib/security/pam_deny.so
+
+session    required	/lib/security/pam_deny.so
diff --git a/sys-apps/shadow/files/pam.d/passwd b/sys-apps/shadow/files/pam.d/passwd
index d1a1c3b88340..38250aeb5a70 100644
--- a/sys-apps/shadow/files/pam.d/passwd
+++ b/sys-apps/shadow/files/pam.d/passwd
@@ -1,4 +1,7 @@
 #%PAM-1.0
+
 auth       required	/lib/security/pam_stack.so service=system-auth
+
 account    required	/lib/security/pam_stack.so service=system-auth
+
 password   required	/lib/security/pam_stack.so service=system-auth
diff --git a/sys-apps/shadow/files/pam.d/shadow b/sys-apps/shadow/files/pam.d/shadow
index c7f064396b7e..12cabadafb10 100644
--- a/sys-apps/shadow/files/pam.d/shadow
+++ b/sys-apps/shadow/files/pam.d/shadow
@@ -1,5 +1,8 @@
 #%PAM-1.0 
-auth		sufficient	/lib/security/pam_rootok.so
-auth		required	/lib/security/pam_permit.so
-account		required	/lib/security/pam_permit.so
-password	required	/lib/security/pam_permit.so
+
+auth       sufficient	/lib/security/pam_rootok.so
+auth       required	/lib/security/pam_permit.so
+
+account    required	/lib/security/pam_stack.so service=system-auth
+
+password   required	/lib/security/pam_permit.so
diff --git a/sys-apps/shadow/files/pam.d/su b/sys-apps/shadow/files/pam.d/su
index 71d16e907a15..13862c3003f4 100644
--- a/sys-apps/shadow/files/pam.d/su
+++ b/sys-apps/shadow/files/pam.d/su
@@ -1,8 +1,13 @@
 #%PAM-1.0
-auth       sufficient   /lib/security/pam_rootok.so
-auth       required     /lib/security/pam_wheel.so use_uid
+
+auth       sufficient	/lib/security/pam_rootok.so
+auth       required	/lib/security/pam_wheel.so use_uid
 auth       required	/lib/security/pam_stack.so service=system-auth
+
 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    optional	/lib/security/pam_xauth.so
+
diff --git a/sys-apps/shadow/files/pam.d/system-auth b/sys-apps/shadow/files/pam.d/system-auth
index 888138809e18..7fdf7b660894 100644
--- a/sys-apps/shadow/files/pam.d/system-auth
+++ b/sys-apps/shadow/files/pam.d/system-auth
@@ -1,13 +1,14 @@
 #%PAM-1.0
-auth        required      /lib/security/pam_env.so
-auth        sufficient    /lib/security/pam_pwdb.so likeauth nullok
-auth        required      /lib/security/pam_deny.so
 
-account     required      /lib/security/pam_pwdb.so
+auth       required	/lib/security/pam_env.so
+auth       sufficient	/lib/security/pam_pwdb.so likeauth nullok
+auth       required	/lib/security/pam_deny.so
 
-#password    required      /lib/security/pam_cracklib.so retry=3
-password    sufficient    /lib/security/pam_pwdb.so nullok md5 shadow #use_authtok
-password    required      /lib/security/pam_deny.so
+account    required	/lib/security/pam_pwdb.so
 
-session     required      /lib/security/pam_limits.so
-session     required      /lib/security/pam_pwdb.so
+password   required	/lib/security/pam_cracklib.so retry=3
+password   sufficient	/lib/security/pam_pwdb.so nullok md5 shadow use_authtok
+password   required	/lib/security/pam_deny.so
+
+session    required	/lib/security/pam_limits.so
+session    required	/lib/security/pam_pwdb.so
diff --git a/sys-apps/shadow/shadow-4.0.2.ebuild b/sys-apps/shadow/shadow-4.0.2.ebuild
index 973cf7302991..1f3d7f1c434d 100644
--- a/sys-apps/shadow/shadow-4.0.2.ebuild
+++ b/sys-apps/shadow/shadow-4.0.2.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Maintainer: Daniel Robbins <drobbins@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/shadow/shadow-4.0.2.ebuild,v 1.1 2002/03/03 08:35:07 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/shadow/shadow-4.0.2.ebuild,v 1.2 2002/03/03 12:37:00 azarah Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="Utilities to deal with user accounts"
@@ -13,8 +13,7 @@ DEPEND=">=sys-libs/pam-0.75-r4
 RDEPEND=">=sys-libs/pam-0.75-r4"
 
 src_compile() {
-	./configure \
-		--disable-desrpc \
+	./configure	--disable-desrpc \
 		--with-libcrypt \
 		--with-libcrack \
 		--with-libpam \
@@ -42,6 +41,9 @@ src_install() {
 	# remove dead links
 	rm -f ${D}/bin/{sg,vipw}
 
+	insinto /usr/lib
+	doins ${FILESDIR}/cracklib/cracklib_dict.*
+
 	insinto /etc
 	# Using a securetty with devfs device names added
 	# (compat names kept for non-devfs compatibility)
@@ -75,3 +77,13 @@ src_install() {
 	dodoc HOWTO LSM README.* *.txt
 }
 
+pkg_postinst() {
+	echo
+	echo "****************************************************"
+	echo "  This version of shadow uses CRACKLIB to check"
+	echo "  passwords, and for it to work properly, a reboot"
+	echo "  is needed, sorry."
+	echo "****************************************************"
+	echo
+}
+