From: Michael Tremer <michael.tremer@ipfire.org>
Date: Tue, 12 May 2009 12:31:46 +0000 (+0200)
Subject: Dropped second pass of pam.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ae0bdda5516b7f8efe245085d1ea88104022c9ee;p=ipfire-3.x.git

Dropped second pass of pam.
---

diff --git a/lfs/pam b/lfs/pam
index 53253b423..dfdc0061b 100644
--- a/lfs/pam
+++ b/lfs/pam
@@ -37,7 +37,7 @@ DEBUG      = no
 
 DEPS       = cracklib
 
-OBJECT     = $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/$(THISAPP)-pass$(PASS)
+OBJECT     = $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/$(THISAPP)
 
 ###############################################################################
 # Top-level Rules
@@ -66,7 +66,6 @@ $(OBJECT): $(objects)
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && $(EXTRACTOR) $(DIR_DL)/$(DL_FILE)	
 
-ifeq "$(PASS)" "1"
 	cd $(DIR_APP) && \
 		./configure \
 			$(CONFIGURE_ARCH) \
@@ -91,16 +90,13 @@ ifeq "$(PASS)" "1"
 	       rm -v /lib/$${LINK}; \
 	   done; \
 	fi
-endif
 
-ifeq "$(PASS)" "2"
 	useradd -D -b /home
 	sed -i 's/yes/no/' /etc/default/useradd
 	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 -vf $(DIR_CONFIG)/pam.d/* /etc/pam.d/
-endif
+	cp -vf $(DIR_CONFIG)/pam.d/{other,system-auth} /etc/pam.d/
 
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)
diff --git a/make.sh b/make.sh
index 4ab36ca03..ef21b37e3 100755
--- a/make.sh
+++ b/make.sh
@@ -244,9 +244,8 @@ ipfire_build() {
 	ipfire_make libgcrypt
 	ipfire_make libksba
 	ipfire_make cracklib
-	ipfire_make pam					PASS=1
+	ipfire_make pam
 	ipfire_make shadow-pam
-	ipfire_make pam					PASS=2
 	ipfire_make slang
 	ipfire_make newt
 	ipfire_make cyrus-sasl