X-Git-Url: http://git.plutz.net/?a=blobdiff_plain;f=modules%2Fsmb_nis.mk;h=9eed7d380d84cfdf6efa81f8e5bb42c19f3fd16c;hb=0cd61a621980ae12eb30c3a30c0bc48e8b96bbed;hp=2771d8257cf1e2e71957ca21c8ec538204cfa772;hpb=e4b8a57190572c28482380fc49fd6ff4dc9b108a;p=blast

diff --git a/modules/smb_nis.mk b/modules/smb_nis.mk
index 2771d82..9eed7d3 100644
--- a/modules/smb_nis.mk
+++ b/modules/smb_nis.mk
@@ -1,4 +1,4 @@
-PACKAGES += cifs-utils libpam-mount libpam-script lxdm nis nscd samba-common-bin usermode
+PACKAGES += cifs-utils libpam-mount libpam-script lightdm nis nscd samba-common-bin usermode
 
 ifndef nis_server
   nis_server := nismaster
@@ -48,7 +48,7 @@ _smb_nis: ${CFGROOT}/opt/pam_script/pam_script_passwd ${CFGROOT}/etc/security/pa
 _smb_nis: ${CFGROOT}/etc/yp.conf ${CFGROOT}/etc/defaultdomain
 
 _smb_nis: ${CFGROOT}
-	sed -Ei 's;^(passwd:|group:|shadow:|gshadow:) *;\1	nis ;' $${CFGROOT}/etc/nsswitch.conf
+	sed -Ei 's;^(passwd:|group:|shadow:|gshadow:).*$$;\1	files nis;' $${CFGROOT}/etc/nsswitch.conf
 	sed -Ei '/pam_(script|mount).so/d' $${CFGROOT}/etc/pam.d/common-*
 	printf '\nauth		optional	pam_mount.so\n' >>$${CFGROOT}/etc/pam.d/common-auth
 	printf '\nsession	optional	pam_mount.so\n' >>$${CFGROOT}/etc/pam.d/common-session
@@ -57,6 +57,7 @@ _smb_nis: ${CFGROOT}
 ${CFGROOT}/opt/pam_script/pam_script_passwd: ${CFGROOT} .FORCE
 	mkdir -p "$(dir $@)"
 	printf '%s' "$${smb_nis_pamscript}" >"$@"
+	chmod a+x "$@"
 
 ${CFGROOT}/etc/security/pam_mount.conf.xml: ${CFGROOT} .FORCE
 	mkdir -p "$(dir $@)"
@@ -66,4 +67,4 @@ ${CFGROOT}/etc/yp.conf: ${CFGROOT} .FORCE
 	printf 'ypserver	%s\n' "${nis_server}" >"$@"
 
 ${CFGROOT}/etc/defaultdomain: ${CFGROOT} .FORCE
-	printf '.%s\n' "${nis_domain}" >"$@"
+	printf '%s\n' "${nis_domain}" >"$@"