diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2013-09-09 11:54:23 +1200 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2013-10-11 10:27:49 +0200 |
| commit | af3138e9b6813ef88698c3e6eeb280c6e988c4cc (patch) | |
| tree | fb924ffb5400d0125776850b82743274efd45c2b /python/samba/join.py | |
| parent | d5077baee26c593eb55cedf90ae440f50aa32e14 (diff) | |
| download | samba-af3138e9b6813ef88698c3e6eeb280c6e988c4cc.tar.gz samba-af3138e9b6813ef88698c3e6eeb280c6e988c4cc.tar.bz2 samba-af3138e9b6813ef88698c3e6eeb280c6e988c4cc.zip | |
samba-tool domain join subdomain: Rework sambadns.py to allow setup of DomainDNSZone only
This skips handling the ForestDNSZone when we are setting up a subdomain.
Andrew Bartlett
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
Autobuild-User(master): Stefan Metzmacher <metze@samba.org>
Autobuild-Date(master): Fri Oct 11 10:27:49 CEST 2013 on sn-devel-104
Diffstat (limited to 'python/samba/join.py')
| -rw-r--r-- | python/samba/join.py | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/python/samba/join.py b/python/samba/join.py index 1785ab3e88..9cac8f5ed2 100644 --- a/python/samba/join.py +++ b/python/samba/join.py @@ -24,6 +24,7 @@ from samba import gensec, Ldb, drs_utils import ldb, samba, sys, uuid from samba.ndr import ndr_pack from samba.dcerpc import security, drsuapi, misc, nbt, lsa, drsblobs +from samba.dsdb import DS_DOMAIN_FUNCTION_2003 from samba.credentials import Credentials, DONT_USE_KERBEROS from samba.provision import secretsdb_self_join, provision, provision_fill, FILL_DRS, FILL_SUBDOMAIN from samba.provision.common import setup_path @@ -765,6 +766,7 @@ class dc_join(object): presult = provision_fill(ctx.local_samdb, secrets_ldb, ctx.logger, ctx.names, ctx.paths, domainsid=security.dom_sid(ctx.domsid), domainguid=domguid, + dom_for_fun_level=DS_DOMAIN_FUNCTION_2003, targetdir=ctx.targetdir, samdb_fill=FILL_SUBDOMAIN, machinepass=ctx.acct_pass, serverrole="active directory domain controller", lp=ctx.lp, hostip=ctx.names.hostip, hostip6=ctx.names.hostip6, |