samba-tool domain join: remove sub domain join code

Remove the unused sub domain join code, the option was removed by commit
5583208aed0e4647269e48aa1d3c5c48a73001ac. This commit completely removes
the now unused code.

Signed-off-by: Gary Lockyer <gary@catalyst.net.nz>
Reviewed-by: Andreas Schneider <asn@samba.org>
Autobuild-User(master): Andreas Schneider <asn@cryptomilk.org>
Autobuild-Date(master): Tue Feb 11 17:41:32 UTC 2020 on sn-devel-184

diff --git a/python/samba/join.py b/python/samba/join.py
index 40920f4f8e5c599f98742426e127f78594f9b921..20cbab4255c866d61960a1c35df456bf0b91cec1 100644 (file)
--- a/python/samba/join.py
+++ b/python/samba/join.py
@@ -1581,62 +1581,6 @@ def join_clone(logger=None, server=None, creds=None, lp=None,
     return ctx
 
 
-def join_subdomain(logger=None, server=None, creds=None, lp=None, site=None,
-                   netbios_name=None, targetdir=None, parent_domain=None, dnsdomain=None,
-                   netbios_domain=None, machinepass=None, adminpass=None, use_ntvfs=False,
-                   dns_backend=None, plaintext_secrets=False,
-                   backend_store=None, backend_store_size=None):
-    """Join as a DC."""
-    ctx = DCJoinContext(logger, server, creds, lp, site, netbios_name,
-                        targetdir, parent_domain, machinepass, use_ntvfs,
-                        dns_backend, plaintext_secrets,
-                        backend_store=backend_store,
-                        backend_store_size=backend_store_size)
-    ctx.subdomain = True
-    if adminpass is None:
-        ctx.adminpass = samba.generate_random_password(12, 32)
-    else:
-        ctx.adminpass = adminpass
-    ctx.parent_domain_name = ctx.domain_name
-    ctx.domain_name = netbios_domain
-    ctx.realm = dnsdomain
-    ctx.parent_dnsdomain = ctx.dnsdomain
-    ctx.parent_partition_dn = ctx.get_parent_partition_dn()
-    ctx.dnsdomain = dnsdomain
-    ctx.partition_dn = "CN=%s,CN=Partitions,%s" % (ctx.domain_name, ctx.config_dn)
-    ctx.naming_master = ctx.get_naming_master()
-    if ctx.naming_master != ctx.server:
-        logger.info("Reconnecting to naming master %s" % ctx.naming_master)
-        ctx.server = ctx.naming_master
-        ctx.samdb = SamDB(url="ldap://%s" % ctx.server,
-                          session_info=system_session(),
-                          credentials=ctx.creds, lp=ctx.lp)
-        res = ctx.samdb.search(base="", scope=ldb.SCOPE_BASE, attrs=['dnsHostName'],
-                               controls=[])
-        ctx.server = res[0]["dnsHostName"]
-        logger.info("DNS name of new naming master is %s" % ctx.server)
-
-    ctx.base_dn = samba.dn_from_dns_name(dnsdomain)
-    ctx.forestsid = ctx.domsid
-    ctx.domsid = security.random_sid()
-    ctx.acct_dn = None
-    ctx.dnshostname = "%s.%s" % (ctx.myname.lower(), ctx.dnsdomain)
-    # Windows uses 240 bytes as UTF16 so we do
-    ctx.trustdom_pass = samba.generate_random_machine_password(120, 120)
-
-    ctx.userAccountControl = samba.dsdb.UF_SERVER_TRUST_ACCOUNT | samba.dsdb.UF_TRUSTED_FOR_DELEGATION
-
-    ctx.SPNs.append('E3514235-4B06-11D1-AB04-00C04FC2DCD2/$NTDSGUID/%s' % ctx.dnsdomain)
-    ctx.secure_channel_type = misc.SEC_CHAN_BDC
-
-    ctx.replica_flags |= (drsuapi.DRSUAPI_DRS_WRIT_REP |
-                          drsuapi.DRSUAPI_DRS_FULL_SYNC_IN_PROGRESS)
-    ctx.domain_replica_flags = ctx.replica_flags
-
-    ctx.do_join()
-    ctx.logger.info("Created domain %s (SID %s) as a DC" % (ctx.domain_name, ctx.domsid))
-
-
 class DCCloneContext(DCJoinContext):
     """Clones a remote DC."""
 

diff --git a/python/samba/netcmd/domain.py b/python/samba/netcmd/domain.py
index bea6482f99e699ac4b3b9e03b31829fbac47cbcd..4cb873fd6348b4c3b14b8dfe640785afd992f79c 100644 (file)
--- a/python/samba/netcmd/domain.py
+++ b/python/samba/netcmd/domain.py
@@ -41,7 +41,7 @@ from samba import werror
 from getpass import getpass
 from samba.net import Net, LIBNET_JOIN_AUTOMATIC
 import samba.ntacls
-from samba.join import join_RODC, join_DC, join_subdomain
+from samba.join import join_RODC, join_DC
 from samba.auth import system_session
 from samba.samdb import SamDB, get_default_backend_store
 from samba.ndr import ndr_pack, ndr_print
@@ -571,7 +571,7 @@ class cmd_domain_dcpromo(Command):
 
     def run(self, domain, role=None, sambaopts=None, credopts=None,
             versionopts=None, server=None, site=None, targetdir=None,
-            domain_critical_only=False, parent_domain=None, machinepass=None,
+            domain_critical_only=False, machinepass=None,
             use_ntvfs=False, dns_backend=None,
             quiet=False, verbose=False, plaintext_secrets=False,
             backend_store=None, backend_store_size=None):
@@ -618,16 +618,13 @@ class cmd_domain_join(Command):
         "credopts": options.CredentialsOptions,
     }
 
-    takes_options = [
-        Option("--parent-domain", help="parent domain to create subdomain under", type=str),
-        Option("--adminpass", type="string", metavar="PASSWORD",
-               help="choose adminstrator password when joining as a subdomain (otherwise random)"),
-    ]
-
     ntvfs_options = [
-        Option("--use-ntvfs", help="Use NTVFS for the fileserver (default = no)",
-               action="store_true")
+        Option(
+            "--use-ntvfs", help="Use NTVFS for the fileserver (default = no)",
+            action="store_true")
     ]
+
+    takes_options = []
     takes_options.extend(common_join_options)
     takes_options.extend(common_provision_join_options)
 
@@ -638,11 +635,11 @@ class cmd_domain_join(Command):
 
     def run(self, domain, role=None, sambaopts=None, credopts=None,
             versionopts=None, server=None, site=None, targetdir=None,
-            domain_critical_only=False, parent_domain=None, machinepass=None,
-            use_ntvfs=False, dns_backend=None, adminpass=None,
+            domain_critical_only=False, machinepass=None,
+            use_ntvfs=False, dns_backend=None,
             quiet=False, verbose=False,
             plaintext_secrets=False,
-            backend_store=None,backend_store_size=None):
+            backend_store=None, backend_store_size=None):
         lp = sambaopts.get_loadparm()
         creds = credopts.get_credentials(lp)
         net = Net(creds, lp, server=credopts.ipaddress)
@@ -678,9 +675,6 @@ class cmd_domain_join(Command):
                       plaintext_secrets=plaintext_secrets,
                       backend_store=backend_store,
                       backend_store_size=backend_store_size)
-        # elif role == "SUBDOMAIN":
-        # subdomain command removed by Gary Lockyer <gary@catalyst.net.nz>
-        # on the 28th June 2019.
         else:
             raise CommandError("Invalid role '%s' (possible values: MEMBER, DC, RODC)" % role)