summaryrefslogtreecommitdiff
path: root/source4/scripting
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2012-06-20 12:51:43 +1000
committerAndrew Bartlett <abartlet@samba.org>2012-06-20 16:22:41 +1000
commit352dbddb6d3c1324862409dcfa8a8bee5c111b7c (patch)
treedfe9d66462f90688fd96960e3e2c53438d5ec63f /source4/scripting
parent2b50e8c534872117e7687d643dd8a849e8c044d7 (diff)
downloadsamba-352dbddb6d3c1324862409dcfa8a8bee5c111b7c.tar.gz
samba-352dbddb6d3c1324862409dcfa8a8bee5c111b7c.tar.bz2
samba-352dbddb6d3c1324862409dcfa8a8bee5c111b7c.zip
s4-idmap: Add parameter 'idmap_ldb:use rfc2307' and correct implementation errors
Diffstat (limited to 'source4/scripting')
-rw-r--r--source4/scripting/python/samba/provision/__init__.py6
-rw-r--r--source4/scripting/python/samba/upgrade.py2
2 files changed, 6 insertions, 2 deletions
diff --git a/source4/scripting/python/samba/provision/__init__.py b/source4/scripting/python/samba/provision/__init__.py
index e0e5e4b6f7..c95db4e639 100644
--- a/source4/scripting/python/samba/provision/__init__.py
+++ b/source4/scripting/python/samba/provision/__init__.py
@@ -1604,7 +1604,8 @@ def provision(logger, session_info, credentials, smbconf=None,
backend_type=None, sitename=None,
ol_mmr_urls=None, ol_olc=None, slapd_path="/bin/false",
useeadb=False, am_rodc=False,
- lp=None, use_ntvfs=False):
+ lp=None, use_ntvfs=False,
+ use_rfc2307=False):
"""Provision samba4
:note: caution, this wipes all existing data!
@@ -1648,6 +1649,9 @@ def provision(logger, session_info, credentials, smbconf=None,
server_services = []
global_param = {}
+ if use_rfc2307:
+ global_param["idmap_ldb:use rfc2307"] = ["yes"]
+
if dns_backend == "SAMBA_INTERNAL":
server_services.append("+dns")
diff --git a/source4/scripting/python/samba/upgrade.py b/source4/scripting/python/samba/upgrade.py
index 09a52c182c..3ef79ed646 100644
--- a/source4/scripting/python/samba/upgrade.py
+++ b/source4/scripting/python/samba/upgrade.py
@@ -702,7 +702,7 @@ Please fix this account before attempting to upgrade again
dom_for_fun_level=dsdb.DS_DOMAIN_FUNCTION_2003,
hostname=netbiosname.lower(), machinepass=machinepass,
serverrole=serverrole, samdb_fill=FILL_FULL,
- useeadb=useeadb, dns_backend=dns_backend)
+ useeadb=useeadb, dns_backend=dns_backend, use_rfc2307=True)
result.report_logger(logger)
# Import WINS database