From: Michael Tremer <michael.tremer@ipfire.org>
Date: Thu, 28 Aug 2008 18:49:39 +0000 (+0200)
Subject: Moved files in pam.d to its own dir.
X-Git-Tag: v3.0-alpha1~733^2~3
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f0aa2a535ee32b9dbfcdd194516629d3961eba9d;p=ipfire-3.x.git

Moved files in pam.d to its own dir.
---

diff --git a/config/pam/dir/chage b/config/pam.d/chage
similarity index 100%
rename from config/pam/dir/chage
rename to config/pam.d/chage
diff --git a/config/pam/ftp b/config/pam.d/ftp
similarity index 100%
rename from config/pam/ftp
rename to config/pam.d/ftp
diff --git a/config/pam/imap b/config/pam.d/imap
similarity index 100%
rename from config/pam/imap
rename to config/pam.d/imap
diff --git a/config/pam/dir/login b/config/pam.d/login
similarity index 100%
rename from config/pam/dir/login
rename to config/pam.d/login
diff --git a/config/pam/dir/other b/config/pam.d/other
similarity index 100%
rename from config/pam/dir/other
rename to config/pam.d/other
diff --git a/config/pam/dir/passwd b/config/pam.d/passwd
similarity index 100%
rename from config/pam/dir/passwd
rename to config/pam.d/passwd
diff --git a/config/pam/pop b/config/pam.d/pop
similarity index 100%
rename from config/pam/pop
rename to config/pam.d/pop
diff --git a/config/pam/sieve b/config/pam.d/sieve
similarity index 100%
rename from config/pam/sieve
rename to config/pam.d/sieve
diff --git a/config/pam/smtp b/config/pam.d/smtp
similarity index 100%
rename from config/pam/smtp
rename to config/pam.d/smtp
diff --git a/config/pam/dir/su b/config/pam.d/su
similarity index 100%
rename from config/pam/dir/su
rename to config/pam.d/su
diff --git a/config/pam/other b/config/pam/other
deleted file mode 100644
index c286c823c..000000000
--- a/config/pam/other
+++ /dev/null
@@ -1,5 +0,0 @@
-#%PAM-1.0
-auth     required       pam_deny.so
-account  required       pam_deny.so
-password required       pam_deny.so
-session  required       pam_deny.so
diff --git a/lfs/pam b/lfs/pam
index 9b319688d..4c6b9c54c 100644
--- a/lfs/pam
+++ b/lfs/pam
@@ -80,43 +80,10 @@ endif
 ifeq "$(PASS)" "2"
 	useradd -D -b /home
 	sed -i 's/yes/no/' /etc/default/useradd
-	install -v -m644 /etc/login.defs /etc/login.defs.orig
-	for FUNCTION in LASTLOG_ENAB MAIL_CHECK_ENAB \
-	                PORTTIME_CHECKS_ENAB CONSOLE \
-	                MOTD_FILE NOLOGINS_FILE PASS_MIN_LEN \
-	                SU_WHEEL_ONLY MD5_CRYPT_ENAB \
-	                CONSOLE_GROUPS ENVIRON_FILE \
-	                ULIMIT ENV_TZ ENV_HZ ENV_SUPATH \
-	                ENV_PATH QMAIL_DIR MAIL_DIR MAIL_FILE \
-	                CHFN_AUTH FAILLOG_ENAB QUOTAS_ENAB FTMP_FILE \
-	                OBSCURE_CHECKS_ENAB CRACKLIB_DICTPATH \
-	                PASS_CHANGE_TRIES PASS_ALWAYS_WARN ISSUE_FILE; do \
-	    sed -i "s/^$$FUNCTION/# &/" /etc/login.defs; \
-	done
-	
+	install -v -m644 $(DIR_CONFIG)/pam/login.defs /etc/login.defs
+	install -v -m644 $(DIR_CONFIG)/pam/pam_env.conf /etc/security/pam_env.conf
 	install -v -d -m755 /etc/pam.d
-	cp $(DIR_CONFIG)/pam/dir/* /etc/pam.d
-	
-	if [ -f /etc/login.access ]; then \
-		mv -v /etc/login.access /etc/login.access.NOUSE; \
-	fi
-	
-	if [ -f /etc/limits ]; then \
-		mv -v /etc/limits /etc/limits.NOUSE; \
-	fi
-	
-	for PROGRAM in chpasswd chgpasswd groupadd groupdel groupmems \
-								groupmod newusers useradd userdel usermod; do \
-		install -v -m644 /etc/pam.d/chage /etc/pam.d/$$PROGRAM; \
-		sed -i "s/chage/$$PROGRAM/" /etc/pam.d/$$PROGRAM; \
-	done
-	
-	ENV_PATH=`grep '^ENV_PATH' /etc/login.defs.orig | \
-		awk '{ print $$2 }' | sed 's/PATH=//'` && \
-		echo 'PATH        DEFAULT='`echo "$${ENV_PATH}"` \
-		'        OVERRIDE=$${PATH}' \
-		>> /etc/security/pam_env.conf && \
-		unset ENV_PATH
+	cp -vf $(DIR_CONFIG)/pam.d/* /etc/pam.d/
 endif
 
 	@rm -rf $(DIR_APP)
diff --git a/lfs/shadow b/lfs/shadow
index 8cd929052..71ee7da38 100644
--- a/lfs/shadow
+++ b/lfs/shadow
@@ -64,13 +64,6 @@ $(TARGET) :
 	cd $(DIR_APP) && find man -name Makefile -exec sed -i 's/groups\.1 / /' {} \;
 	cd $(DIR_APP) && sed -i -e 's/ ko//' -e 's/ zh_CN zh_TW//' man/Makefile
 
-ifeq "$(STAGE)" "base"
-	cd $(DIR_APP) && sed -i -e 's@#ENCRYPT_METHOD DES@ENCRYPT_METHOD SHA512@' \
-		-e 's@# SHA_CRYPT_MIN_ROUNDS 5000@SHA_CRYPT_MIN_ROUNDS 50000@' \
-		-e 's@# SHA_CRYPT_MAX_ROUNDS 5000@SHA_CRYPT_MAX_ROUNDS 9999999@' \
-		-e 's@/var/spool/mail@/var/mail@' etc/login.defs
-endif
-
 	cd $(DIR_APP) && make $(PARALLELISMFLAGS)
 	cd $(DIR_APP) && make install
 	mv -v /usr/bin/passwd /bin
@@ -82,7 +75,11 @@ ifeq "$(STAGE)" "base"
 	touch /etc/shadow
 	chmod 600 /etc/shadow
 	pwconv
+else
+	rm -vf /etc/login.access* /etc/limits*
 endif
 
+	rm -vf /etc/{passwd,shadow}-
+
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)