summaryrefslogtreecommitdiff
path: root/source4/scripting
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2008-03-13 09:55:06 +1100
committerAndrew Bartlett <abartlet@samba.org>2008-03-13 09:55:06 +1100
commit07a7c8fa0d76cb7cb10cc88fb5bbe5439b746d01 (patch)
tree473ca1a63f7f9c777b6e600423e3d3b1daa9e124 /source4/scripting
parent6f2935d082687eee23dbc9f1108162cf1670831a (diff)
downloadsamba-07a7c8fa0d76cb7cb10cc88fb5bbe5439b746d01.tar.gz
samba-07a7c8fa0d76cb7cb10cc88fb5bbe5439b746d01.tar.bz2
samba-07a7c8fa0d76cb7cb10cc88fb5bbe5439b746d01.zip
Update the provision scripts and selftest for LDAP
This should allow us to provision onto an OpenLDAP backend again. Also ensure we always have a sysvol and netlogon share in the selftest environment. Andrew Bartlett (This used to be commit b2d9b03ba3434e76d4d476233a198728523d17f9)
Diffstat (limited to 'source4/scripting')
-rw-r--r--source4/scripting/python/samba/provision.py12
1 files changed, 7 insertions, 5 deletions
diff --git a/source4/scripting/python/samba/provision.py b/source4/scripting/python/samba/provision.py
index 2ede4b8d3d..f9604a84b2 100644
--- a/source4/scripting/python/samba/provision.py
+++ b/source4/scripting/python/samba/provision.py
@@ -1192,16 +1192,18 @@ def provision_backend(setup_dir=None, message=None,
for i in range (0, len(res)):
linkid = res[i]["linkID"][0]
linkid = str(int(linkid) + 1)
+ expression = "(&(objectclass=attributeSchema)(linkID=" + (linkid) + "))"
target = schemadb.searchone(basedn=names.schemadn,
- expression="(&(objectclass=attributeSchema)(linkID=" + (linkid) + "))",
- attribute="lDAPDisplayName");
+ expression=expression,
+ attribute="lDAPDisplayName",
+ scope=SCOPE_SUBTREE);
if target is not None:
- refint_attributes = refint_attributes + " " + target + " " + res[i]["lDAPDisplayName"];
+ refint_attributes = refint_attributes + " " + target + " " + res[i]["lDAPDisplayName"][0];
memberof_config = memberof_config + """overlay memberof
memberof-dangling error
memberof-refint TRUE
memberof-group-oc top
-memberof-member-ad """ + res[i]["lDAPDisplayName"] + """
+memberof-member-ad """ + res[i]["lDAPDisplayName"][0] + """
memberof-memberof-ad """ + target + """
memberof-dangling-error 32
@@ -1214,7 +1216,7 @@ refint_attributes""" + refint_attributes + "\n";
if os.path.exists(paths.memberofconf):
os.unlink(paths.memberof.conf)
- open(paths.memberofconf, 'w').write(memberof_config)
+ open(paths.memberofconf, 'w').write(memberof_config)
ldapi_uri = "ldapi://" + urllib.quote(os.path.join(paths.private_dir, "ldap", "ldapi"), safe="")
message("Start slapd with: slapd -f " + paths.ldapdir + "/slapd.conf -h " + ldapi_uri)