1
0
mirror of https://github.com/samba-team/samba.git synced 2025-07-16 20:59:12 +03:00

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 b2d9b03ba3)
This commit is contained in:
Andrew Bartlett
2008-03-13 09:55:06 +11:00
parent 6f2935d082
commit 07a7c8fa0d
3 changed files with 19 additions and 9 deletions

View File

@ -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)