summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--install/share/smb.conf.template1
-rw-r--r--ipaserver/install/adtrustinstance.py3
2 files changed, 4 insertions, 0 deletions
diff --git a/install/share/smb.conf.template b/install/share/smb.conf.template
index 086b0fcf..2908b998 100644
--- a/install/share/smb.conf.template
+++ b/install/share/smb.conf.template
@@ -1,5 +1,6 @@
[global]
workgroup = $NETBIOS_NAME
+netbios name = $HOST_NETBIOS_NAME
realm = $REALM
kerberos method = dedicated keytab
dedicated keytab file = FILE:/etc/samba/samba.keytab
diff --git a/ipaserver/install/adtrustinstance.py b/ipaserver/install/adtrustinstance.py
index 2f1c9994..5eb61574 100644
--- a/ipaserver/install/adtrustinstance.py
+++ b/ipaserver/install/adtrustinstance.py
@@ -124,6 +124,7 @@ class ADTRUSTInstance(service.Service):
self.secondary_rid_base = None
self.fqdn = None
+ self.host_netbios_name = None
self.realm = None
self.domain_name = None
@@ -151,6 +152,7 @@ class ADTRUSTInstance(service.Service):
# Values obtained from API.env
self.fqdn = self.fqdn or api.env.host
+ self.host_netbios_name = make_netbios_name(self.fqdn)
self.realm = self.realm or api.env.realm
self.domain_name = self.domain_name or api.env.domain
@@ -769,6 +771,7 @@ class ADTRUSTInstance(service.Service):
self.sub_dict = dict(REALM = self.realm,
SUFFIX = self.suffix,
NETBIOS_NAME = self.netbios_name,
+ HOST_NETBIOS_NAME = self.host_netbios_name,
SMB_DN = self.smb_dn,
LDAPI_SOCKET = self.ldapi_socket,
FQDN = self.fqdn)