From 9c547a5e5b50813f9441a96f3f8a7bd62d90f0e9 Mon Sep 17 00:00:00 2001
From: root
Date: Thu, 17 Jul 2014 15:11:20 +0200
Subject: [pam] reworked how we determine path to PAM-modules

detect the path in remote/helper/paths.inc and use that global path in the build scripts
---
 remote/modules/pam/module.build | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'remote/modules/pam/module.build')

diff --git a/remote/modules/pam/module.build b/remote/modules/pam/module.build
index 3f0d8861..067cd431 100644
--- a/remote/modules/pam/module.build
+++ b/remote/modules/pam/module.build
@@ -28,12 +28,13 @@ build() {
 	tarcopy "$(cat "$COPYLIST")" "${MODULE_BUILD_DIR}"
 
 	# build pam-script separatly since we use a source tarball
+
 	# HACK: find pam_unix.so in MODULE_BUILD_DIR to see where to put pam_script at
-	cd "$MODULE_BUILD_DIR"
-	local PAM_UNIX_LOCATION=$(find . -name pam_unix.so)
 	cd "${MODULE_DIR}/src/pam-script-${REQUIRED_PAM_SCRIPT_VERSION}" || perror "Could not cd to ${MODULE_DIR}/src/pam-script-${REQUIRED_PAM_SCRIPT_VERSION}."
-	./configure --prefix=/ --sysconfdir=/etc/pam-script --libdir="$(dirname ${PAM_UNIX_LOCATION:1})" || perror "pam-script: ./configure failed."
+	./configure --prefix=/ --sysconfdir=/etc/pam-script --libdir="$SYS_PAM_MODULES_PATH" || perror "pam-script: ./configure failed."
 	make DESTDIR="${MODULE_BUILD_DIR}" install || perror "pam-script: make install to ${MODULE_BUILD_DIR} failed."
+
+
 	# openSuse 13.1 has no package nss-pam-ldapd. So, we compile it.
 	if [ -n "$REQUIRED_NSS_LDAPD_URL" ]; then
 		cd "${MODULE_DIR}/src/$REQUIRED_NSS_LDAPD_VERSION"
-- 
cgit v1.2.3-55-g7522


From 0e24e729986217356267c30edb2b12f45869d80f Mon Sep 17 00:00:00 2001
From: Jonathan Bauer
Date: Thu, 17 Jul 2014 15:20:52 +0200
Subject: [pam] only check for nslcd if its in REQUIRED_BINARIES

quick fix for centos.

TODO: split PAM modules in sub-modules
---
 remote/modules/pam/module.build | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'remote/modules/pam/module.build')

diff --git a/remote/modules/pam/module.build b/remote/modules/pam/module.build
index 067cd431..b678fdd6 100644
--- a/remote/modules/pam/module.build
+++ b/remote/modules/pam/module.build
@@ -47,7 +47,7 @@ build() {
 		cd "$MODULE_BUILD_DIR"
 		local NSLCD_PATH=$(which nslcd)
 	fi
-	[ -z "$NSLCD_PATH" ] && perror "Could not 'which nslcd'"
+	[[ $REQUIRED_BINARIES = *nslcd* ]] && [ -z "$NSLCD_PATH" ] && perror "Could not 'which nslcd'"
 	# Build nslcd service file
 	mkdir -p "etc/systemd/system"
 	sed "s,%PATH%,$NSLCD_PATH,g" "$MODULE_DIR/templates/nslcd-systemd.service" > "etc/systemd/system/nslcd.service" || perror "Could not fill nslcd.service template"
-- 
cgit v1.2.3-55-g7522