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/upgrade.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/upgrade.py')
| -rw-r--r-- | python/samba/upgrade.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/python/samba/upgrade.py b/python/samba/upgrade.py index 6b55ed76a7..ff5990c667 100644 --- a/python/samba/upgrade.py +++ b/python/samba/upgrade.py @@ -26,7 +26,8 @@ import pwd from samba import Ldb, registry from samba.param import LoadParm -from samba.provision import provision, FILL_FULL, ProvisioningError, setsysvolacl +from samba.provision import provision, ProvisioningError, setsysvolacl +from samba.provision.common import FILL_FULL from samba.samba3 import passdb from samba.samba3 import param as s3param from samba.dcerpc import lsa, samr, security |