s4-dns/spn: fixed DNS and SPN scripts to setup forest DNS name

diff --git a/source4/scripting/bin/samba_dnsupdate b/source4/scripting/bin/samba_dnsupdate
index 9f3703482792854d50a9d742c20e4af92e6aa895..9609fe992bc0d9c3eabcedea80f2023a44f2e4e3 100755 (executable)
--- a/source4/scripting/bin/samba_dnsupdate
+++ b/source4/scripting/bin/samba_dnsupdate
@@ -225,9 +225,9 @@ def get_subst_vars():
     samdb = SamDB(url=lp.samdb_url(), session_info=system_session(),
                   lp=lp)
 
-    vars['DNSDOMAIN'] = lp.get('realm').lower()
-    vars['DNSFOREST'] = lp.get('realm').lower()
-    vars['HOSTNAME']  = lp.get('netbios name').lower() + "." + vars['DNSDOMAIN']
+    vars['DNSDOMAIN'] = samdb.domain_dns_name()
+    vars['DNSFOREST'] = samdb.forest_dns_name()
+    vars['HOSTNAME']  = samdb.host_dns_name()
     vars['NTDSGUID']  = samdb.get_ntds_GUID()
     vars['SITE']      = samdb.server_site_name()
     res = samdb.search(base=samdb.get_default_basedn(), scope=SCOPE_BASE, attrs=["objectGUID"])

diff --git a/source4/scripting/bin/samba_spnupdate b/source4/scripting/bin/samba_spnupdate
index d99461a9fc3e6136c4d9a2d348b35de29f3e16cf..10da1d917b651bbda47bae6f8427dfdb9a87b8cf 100755 (executable)
--- a/source4/scripting/bin/samba_spnupdate
+++ b/source4/scripting/bin/samba_spnupdate
@@ -70,8 +70,9 @@ def get_subst_vars(samdb):
     global lp
     vars = {}
 
-    vars['DNSDOMAIN'] = lp.get('realm').lower()
-    vars['HOSTNAME']  = lp.get('netbios name').lower() + "." + vars['DNSDOMAIN']
+    vars['DNSDOMAIN'] = samdb.domain_dns_name()
+    vars['DNSFOREST'] = samdb.forest_dns_name()
+    vars['HOSTNAME']  = samdb.host_dns_name()
     vars['NETBIOSNAME'] = lp.get('netbios name').upper()
     vars['WORKGROUP'] = lp.get('workgroup')
     vars['NTDSGUID']  = samdb.get_ntds_GUID()