distinguished nis_server nis_domain and smb_server

diff --git a/config.example b/config.example
index 5aee80440888c9c1659042273e066b45d6c6a592..faf448586e8940bccce5f2f05dfec4080a3302db 100644 (file)
--- a/config.example
+++ b/config.example
@@ -53,8 +53,12 @@
 ## In nodm, use full screen chromium web browser as session
 # webui=http://localhost/
 
-## When using NIS modules the directory server should be given
+## When using NIS modules the directory server and NIS domain should be given
 # nis_server=nismaster
+# nis_domain=example.com
+
+## also when using SMB the main server must be given
+# smb_server=smbmaster
 
 ## If the approxmodule is enabled, then one (and only one) apt-source
 ## can be choosen to install packages from

diff --git a/modules/smb_nis.mk b/modules/smb_nis.mk
index 320c97ab892a505476eb91923868ce9aab0e63e5..2771d8257cf1e2e71957ca21c8ec538204cfa772 100644 (file)
--- 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" />
@@ -60,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}" >"$@"