summaryrefslogtreecommitdiff
path: root/source4/setup
diff options
context:
space:
mode:
authorMatthias Dieter Wallnöfer <mwallnoefer@yahoo.de>2009-10-21 19:38:52 +0200
committerMatthias Dieter Wallnöfer <mwallnoefer@yahoo.de>2009-10-21 23:43:04 +0200
commit33f3d54de4ffab239e107cb8c92a8454080adbf3 (patch)
tree50b92224090ade2d08324da0cfafb3f33adc6976 /source4/setup
parent78a5e26783aa7a1beff5cd6674e9ff305a0a6390 (diff)
downloadsamba-33f3d54de4ffab239e107cb8c92a8454080adbf3.tar.gz
samba-33f3d54de4ffab239e107cb8c92a8454080adbf3.tar.bz2
samba-33f3d54de4ffab239e107cb8c92a8454080adbf3.zip
s4:provision - rework the "guess_names" and "make_smbconf" method
- Cleans it up from unnecessary "lower()/upper()" and parameters which can be derived through "lp" calls. - Substitute the "HOSTNAME" caption in the "smb.conf" templates with "NETBIOS_NAME" which fits better. - Now the "realm" and "domain" parameter of the provision are totally case insensitive and the script itself up/downcases them appropriately depending on the use (e.g. "realm" upcase for KERBEROS, lowcase for DNS domainname).
Diffstat (limited to 'source4/setup')
-rw-r--r--source4/setup/provision.smb.conf.dc2
-rw-r--r--source4/setup/provision.smb.conf.member2
-rw-r--r--source4/setup/provision.smb.conf.standalone2
3 files changed, 3 insertions, 3 deletions
diff --git a/source4/setup/provision.smb.conf.dc b/source4/setup/provision.smb.conf.dc
index ad06be4301..f489f59ff9 100644
--- a/source4/setup/provision.smb.conf.dc
+++ b/source4/setup/provision.smb.conf.dc
@@ -1,5 +1,5 @@
[globals]
- netbios name = ${HOSTNAME}
+ netbios name = ${NETBIOS_NAME}
workgroup = ${DOMAIN}
realm = ${REALM}
server role = ${SERVERROLE}
diff --git a/source4/setup/provision.smb.conf.member b/source4/setup/provision.smb.conf.member
index 0d742fb903..96e5d0c2e5 100644
--- a/source4/setup/provision.smb.conf.member
+++ b/source4/setup/provision.smb.conf.member
@@ -1,5 +1,5 @@
[globals]
- netbios name = ${HOSTNAME}
+ netbios name = ${NETBIOS_NAME}
workgroup = ${DOMAIN}
realm = ${REALM}
server role = ${SERVERROLE}
diff --git a/source4/setup/provision.smb.conf.standalone b/source4/setup/provision.smb.conf.standalone
index 0d742fb903..96e5d0c2e5 100644
--- a/source4/setup/provision.smb.conf.standalone
+++ b/source4/setup/provision.smb.conf.standalone
@@ -1,5 +1,5 @@
[globals]
- netbios name = ${HOSTNAME}
+ netbios name = ${NETBIOS_NAME}
workgroup = ${DOMAIN}
realm = ${REALM}
server role = ${SERVERROLE}