s4-join: setup DNS forest name on join context

diff --git a/source4/scripting/python/samba/join.py b/source4/scripting/python/samba/join.py
index 00f2c54211f8abe7bb7720a91840213d66a7f567..b42367844874c7f8d8163b391bb72007dcb33382 100644 (file)
--- a/source4/scripting/python/samba/join.py
+++ b/source4/scripting/python/samba/join.py
@@ -100,22 +100,22 @@ class dc_join(object):
         else:
             ctx.topology_dn = None
 
-        ctx.dnsdomain = ldb.Dn(ctx.samdb, ctx.base_dn).canonical_str().split('/')[0]
+        ctx.dnsdomain = ctx.samdb.domain_dns_name()
+        ctx.dnsforest = ctx.samdb.forest_dns_name()
+        ctx.dnshostname = ctx.samdb.host_dns_name()
 
         ctx.realm = ctx.dnsdomain
         lp.set("realm", ctx.realm)
 
         print("realm is %s" % ctx.realm)
 
-        ctx.dnshostname = "%s.%s" % (ctx.myname.lower(), ctx.dnsdomain)
-
         ctx.acct_dn = "CN=%s,OU=Domain Controllers,%s" % (ctx.myname, ctx.base_dn)
 
         ctx.tmp_samdb = None
 
         ctx.SPNs = [ "HOST/%s" % ctx.myname,
                      "HOST/%s" % ctx.dnshostname,
-                     "GC/%s/%s" % (ctx.dnshostname, ctx.dnsdomain) ]
+                     "GC/%s/%s" % (ctx.dnshostname, ctx.dnsforest) ]
 
         # these elements are optional
         ctx.never_reveal_sid = None