From 33f3d54de4ffab239e107cb8c92a8454080adbf3 Mon Sep 17 00:00:00 2001 From: Matthias Dieter Wallnöfer Date: Wed, 21 Oct 2009 19:38:52 +0200 Subject: 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). --- source4/setup/provision.smb.conf.dc | 2 +- source4/setup/provision.smb.conf.member | 2 +- source4/setup/provision.smb.conf.standalone | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'source4/setup') 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} -- cgit