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/provision/__init__.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/provision/__init__.py')
| -rw-r--r-- | python/samba/provision/__init__.py | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/python/samba/provision/__init__.py b/python/samba/provision/__init__.py index 698df94f34..d8f353f54a 100644 --- a/python/samba/provision/__init__.py +++ b/python/samba/provision/__init__.py @@ -101,7 +101,11 @@ from samba.provision.common import ( setup_path, setup_add_ldif, setup_modify_ldif, - ) + FILL_FULL, + FILL_SUBDOMAIN, + FILL_NT4SYNC, + FILL_DRS +) from samba.provision.sambadns import ( get_dnsadmins_sid, setup_ad_dns, @@ -1462,10 +1466,6 @@ def fill_samdb(samdb, lp, names, logger, domainsid, domainguid, policyguid, return samdb -FILL_FULL = "FULL" -FILL_SUBDOMAIN = "SUBDOMAIN" -FILL_NT4SYNC = "NT4SYNC" -FILL_DRS = "DRS" SYSVOL_ACL = "O:LAG:BAD:P(A;OICI;0x001f01ff;;;BA)(A;OICI;0x001200a9;;;SO)(A;OICI;0x001f01ff;;;SY)(A;OICI;0x001200a9;;;AU)" POLICIES_ACL = "O:LAG:BAD:P(A;OICI;0x001f01ff;;;BA)(A;OICI;0x001200a9;;;SO)(A;OICI;0x001f01ff;;;SY)(A;OICI;0x001200a9;;;AU)(A;OICI;0x001301bf;;;PA)" SYSVOL_SERVICE="sysvol" @@ -1795,7 +1795,7 @@ def provision_fill(samdb, secrets_ldb, logger, names, paths, setup_ad_dns(samdb, secrets_ldb, domainsid, names, paths, lp, logger, hostip=hostip, hostip6=hostip6, dns_backend=dns_backend, dnspass=dnspass, os_level=dom_for_fun_level, - targetdir=targetdir, site=DEFAULTSITE) + targetdir=targetdir, site=DEFAULTSITE, fill_level=samdb_fill) domainguid = samdb.searchone(basedn=samdb.get_default_basedn(), attribute="objectGUID") |