diff options
| author | Alexander Bokovoy <abokovoy@redhat.com> | 2014-01-17 14:09:34 +0200 |
|---|---|---|
| committer | Martin Kosek <mkosek@redhat.com> | 2014-01-20 10:35:03 +0100 |
| commit | 531ede2904608a2bfe24d09c94dc0b87d780f30a (patch) | |
| tree | b743db06b298b40b3fd24e70e887b1199a9ddf45 | |
| parent | 3264b0eaafaceaddeb7226edc35ea4ae7f7b3e30 (diff) | |
| download | freeipa.git-531ede2904608a2bfe24d09c94dc0b87d780f30a.tar.gz freeipa.git-531ede2904608a2bfe24d09c94dc0b87d780f30a.tar.xz freeipa.git-531ede2904608a2bfe24d09c94dc0b87d780f30a.zip | |
ipa-adtrust-install: configure host netbios name by default
Ensure we set host netbios name by default in smb.conf
https://fedorahosted.org/freeipa/ticket/4116
| -rw-r--r-- | install/share/smb.conf.template | 1 | ||||
| -rw-r--r-- | ipaserver/install/adtrustinstance.py | 3 |
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) |