From 266b4c596346095f71a651e0a0231256c7409b0f Mon Sep 17 00:00:00 2001
From: Stefan Metzmacher <metze@samba.org>
Date: Tue, 16 Oct 2012 08:30:17 +0200
Subject: [PATCH] Revert "provision: Always create DNS user."

This reverts commit c2d14747d608d406de6410556807d467cd0b85ef.

samba_upgradedns handles creates/removed the dns acount.

See
https://lists.samba.org/archive/samba-technical/2012-October/thread.html#87578

metze
---
 .../scripting/python/samba/provision/__init__.py   | 31 +++++++++++++---------
 1 file changed, 18 insertions(+), 13 deletions(-)

diff --git a/source4/scripting/python/samba/provision/__init__.py b/source4/scripting/python/samba/provision/__init__.py
index d9ba90cab56..9966192a197 100644
--- a/source4/scripting/python/samba/provision/__init__.py
+++ b/source4/scripting/python/samba/provision/__init__.py
@@ -969,7 +969,7 @@ def setup_samdb_rootdse(samdb, names):
 
 
 def setup_self_join(samdb, admin_session_info, names, fill, machinepass,
-        dnspass, domainsid, next_rid, invocationid,
+        dns_backend, dnspass, domainsid, next_rid, invocationid,
         policyguid, policyguid_dc,
         domainControllerFunctionality, ntdsguid=None, dc_rid=None):
     """Join a host to its own domain."""
@@ -1048,14 +1048,17 @@ def setup_self_join(samdb, admin_session_info, names, fill, machinepass,
 
     samdb.set_session_info(admin_session_info)
 
-    setup_add_ldif(samdb, setup_path("provision_dns_add_samba.ldif"), {
-          "DNSDOMAIN": names.dnsdomain,
-          "DOMAINDN": names.domaindn,
-          "DNSPASS_B64": b64encode(dnspass.encode('utf-16-le')),
-          "HOSTNAME" : names.hostname,
-          "DNSNAME" : '%s.%s' % (
-              names.netbiosname.lower(), names.dnsdomain.lower())
-          })
+    if dns_backend != "SAMBA_INTERNAL":
+        # This is Samba4 specific and should be replaced by the correct
+        # DNS AD-style setup
+        setup_add_ldif(samdb, setup_path("provision_dns_add_samba.ldif"), {
+              "DNSDOMAIN": names.dnsdomain,
+              "DOMAINDN": names.domaindn,
+              "DNSPASS_B64": b64encode(dnspass.encode('utf-16-le')),
+              "HOSTNAME" : names.hostname,
+              "DNSNAME" : '%s.%s' % (
+                  names.netbiosname.lower(), names.dnsdomain.lower())
+              })
 
 
 def getpolicypath(sysvolpath, dnsdomain, guid):
@@ -1143,7 +1146,7 @@ def setup_samdb(path, session_info, provision_backend, lp, names,
 
 
 def fill_samdb(samdb, lp, names, logger, domainsid, domainguid, policyguid,
-        policyguid_dc, fill, adminpass, krbtgtpass, machinepass,
+        policyguid_dc, fill, adminpass, krbtgtpass, machinepass, dns_backend,
         dnspass, invocationid, ntdsguid, serverrole, am_rodc=False,
         dom_for_fun_level=None, schema=None, next_rid=None, dc_rid=None):
 
@@ -1331,6 +1334,7 @@ def fill_samdb(samdb, lp, names, logger, domainsid, domainguid, policyguid,
             logger.info("Setting up self join")
             setup_self_join(samdb, admin_session_info, names=names, fill=fill,
                 invocationid=invocationid,
+                dns_backend=dns_backend,
                 dnspass=dnspass,
                 machinepass=machinepass,
                 domainsid=domainsid,
@@ -1603,8 +1607,8 @@ def provision_fill(samdb, secrets_ldb, logger, names, paths,
                    next_rid=1000, dc_rid=None, adminpass=None, krbtgtpass=None,
                    domainguid=None, policyguid=None, policyguid_dc=None,
                    invocationid=None, machinepass=None, ntdsguid=None,
-                   dns_backend=None,
-                   dnspass=None, serverrole=None, dom_for_fun_level=None,
+                   dns_backend=None, dnspass=None,
+                   serverrole=None, dom_for_fun_level=None,
                    am_rodc=False, lp=None, use_ntvfs=False, skip_sysvolacl=False):
     # create/adapt the group policy GUIDs
     # Default GUID for default policy are described at
@@ -1632,7 +1636,8 @@ def provision_fill(samdb, secrets_ldb, logger, names, paths,
                    policyguid=policyguid, policyguid_dc=policyguid_dc,
                    fill=samdb_fill, adminpass=adminpass, krbtgtpass=krbtgtpass,
                    invocationid=invocationid, machinepass=machinepass,
-                   dnspass=dnspass, ntdsguid=ntdsguid, serverrole=serverrole,
+                   dns_backend=dns_backend, dnspass=dnspass,
+                   ntdsguid=ntdsguid, serverrole=serverrole,
                    dom_for_fun_level=dom_for_fun_level, am_rodc=am_rodc,
                    next_rid=next_rid, dc_rid=dc_rid)
 
-- 
2.11.4.GIT