sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-15 23:24:37 +03:00
Code

s4/provision: another fix for breakage from b1dabb1133

Browse Source
This commit is contained in:
Andrew Tridgell 2009-09-10 12:42:57 +10:00
parent 22c4ffa398
commit c0efa51929
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
source4/scripting/python/samba/provision.py
View File

@ -1114,6 +1114,7 @@ def provision(setup_dir, message, session_info,
# Now use the backend credentials to access the databases
credentials = provision_backend.credentials
secrets_credentials = provision_backend.adminCredentials
ldapi_url = provision_backend.ldapi_uri
# only install a new shares config db if there is none
if not os.path.exists(paths.shareconf):
@ -1219,17 +1220,18 @@ def provision(setup_dir, message, session_info,
message("A Kerberos configuration suitable for Samba 4 has been generated at %s" % paths.krb5conf)
ldapi_db = Ldb(provision_backend.ldapi_uri, lp=lp, credentials=credentials)
if provision_backend is not None:
ldapi_db = Ldb(provision_backend.ldapi_uri, lp=lp, credentials=credentials)
# delete default SASL mappings
res = ldapi_db.search(expression="(!(cn=samba-admin mapping))", base="cn=mapping,cn=sasl,cn=config", scope=SCOPE_ONELEVEL, attrs=["dn"])
# delete default SASL mappings
res = ldapi_db.search(expression="(!(cn=samba-admin mapping))", base="cn=mapping,cn=sasl,cn=config", scope=SCOPE_ONELEVEL, attrs=["dn"])
for i in range (0, len(res)):
for i in range (0, len(res)):
dn = str(res[i]["dn"])
ldapi_db.delete(dn)
# configure aci
if ldap_backend_type == "fedora-ds":
# configure aci
if ldap_backend_type == "fedora-ds":
aci = """(targetattr = "*") (version 3.0;acl "full access to all by samba-admin";allow (all)(userdn = "ldap:///CN=samba-admin,%s");)""" % names.sambadn