diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2012-06-24 16:31:37 +1000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2012-06-24 23:46:09 +1000 |
| commit | f199c5dbc09912a185feda5aa87dc82e2800ad6a (patch) | |
| tree | 220f951306ebc010935793b23c75ec33083d1715 /source4/scripting/python/samba/upgrade.py | |
| parent | 73a33be036fd7a903c9fecf077534cafe360e427 (diff) | |
| download | samba-f199c5dbc09912a185feda5aa87dc82e2800ad6a.tar.gz samba-f199c5dbc09912a185feda5aa87dc82e2800ad6a.tar.xz samba-f199c5dbc09912a185feda5aa87dc82e2800ad6a.zip | |
s4-classicupgrade: Allow DNS backend to be specified
Diffstat (limited to 'source4/scripting/python/samba/upgrade.py')
| -rw-r--r-- | source4/scripting/python/samba/upgrade.py | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/source4/scripting/python/samba/upgrade.py b/source4/scripting/python/samba/upgrade.py index 3ef79ed646..8ecc6026a6 100644 --- a/source4/scripting/python/samba/upgrade.py +++ b/source4/scripting/python/samba/upgrade.py @@ -485,7 +485,7 @@ def import_registry(samba4_registry, samba3_regdb): key_handle.set_value(value_name, value_type, value_data) -def upgrade_from_samba3(samba3, logger, targetdir, session_info=None, useeadb=False): +def upgrade_from_samba3(samba3, logger, targetdir, session_info=None, useeadb=False, dns_backend=None): """Upgrade from samba3 database to samba4 AD database :param samba3: samba3 object @@ -689,9 +689,7 @@ Please fix this account before attempting to upgrade again logger.error(" %s" % str(sid)) raise ProvisioningError("Please remove duplicate sid entries before upgrade.") - if serverrole == "ROLE_DOMAIN_BDC" or serverrole == "ROLE_DOMAIN_PDC": - dns_backend = "BIND9_DLZ" - else: + if not (serverrole == "ROLE_DOMAIN_BDC" or serverrole == "ROLE_DOMAIN_PDC"): dns_backend = "NONE" # Do full provision |