X-Git-Url: http://git.plutz.net/?a=blobdiff_plain;f=modules%2Fsmb_nis.mk;h=dcd068fafdd828e3102650a580318e6177dd5c05;hb=7a46fc3a2bc5f776df137194bb38481211713105;hp=b3516989d07f588b668c6254d05d306cf9870229;hpb=e5ba91757e0373ca08386feb7463ef88f8b433bf;p=blast

diff --git a/modules/smb_nis.mk b/modules/smb_nis.mk
index b351698..dcd068f 100644
--- a/modules/smb_nis.mk
+++ b/modules/smb_nis.mk
@@ -3,10 +3,16 @@ PACKAGES += cifs-utils libpam-mount libpam-script lxdm nis nscd samba-common-bin
 ifndef nis_server
   nis_server := nismaster
 endif
+ifndef nis_domain
+  nis_domain := ${nis_server}
+endif
+ifndef smb_server
+  smb_server := ${nis_server}
+endif
 
 define DEBCONF +=
 
-nis	nis/domain	string	.${nis_server}
+nis	nis/domain	string	${nis_domain}
 endef
 
 export smb_nis_pamscript smb_nis_pammount
@@ -17,7 +23,7 @@ define smb_nis_pamscript :=
 # forced through bash, to hide euid from smbpasswd
 /bin/bash -c '
   printf "%s\n" "$$PAM_OLDAUTHTOK" "$$PAM_AUTHTOK" "$$PAM_AUTHTOK" \
-  | smbpasswd -sr ${nis_server} -U "$$PAM_USER"
+  | smbpasswd -sr ${smb_server} -U "$$PAM_USER"
 '
 
 exit $?
@@ -27,7 +33,7 @@ endef
 define smb_nis_pammount :=
 <pam_mount> <debug enable="0" />
   <!-- Volume definitions -->
-  <volume options="user=%(USER)" fstype="cifs" server="${nis_server}"     path="%(USER)" mountpoint="~" />
+  <volume options="user=%(USER)" fstype="cifs" server="${smb_server}"     path="%(USER)" mountpoint="~" />
   <mntoptions require="nosuid,nodev" />
   <logout wait="0" hup="no" term="no" kill="no" />
   <mkmountpoint enable="1" remove="true" />
@@ -42,7 +48,8 @@ _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
 	printf '\npassword	required	pam_script.so dir=/opt/pam_script\n'  >$${CFGROOT}/etc/pam.d/common-password
@@ -59,4 +66,4 @@ ${CFGROOT}/etc/yp.conf: ${CFGROOT} .FORCE
 	printf 'ypserver	%s\n' "${nis_server}" >"$@"
 
 ${CFGROOT}/etc/defaultdomain: ${CFGROOT} .FORCE
-	printf '.%s\n' "${nis_server}" >"$@"
+	printf '.%s\n' "${nis_domain}" >"$@"