diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2009-01-05 12:24:35 +1100 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2009-01-05 12:38:47 +1100 |
| commit | d22adc14a91b7be323ff79c1b464e2b0bf400478 (patch) | |
| tree | 906734d58037a25294d51c127ccaab42bc89f99b /source4/scripting | |
| parent | 2c0faaf5d921fe57a88d3b999067458e8774c6f6 (diff) | |
| download | samba-d22adc14a91b7be323ff79c1b464e2b0bf400478.tar.gz samba-d22adc14a91b7be323ff79c1b464e2b0bf400478.tar.bz2 samba-d22adc14a91b7be323ff79c1b464e2b0bf400478.zip | |
More work to have OpenLDAP accept the full AD schema
We need to avoid handling DN+Binary and DN+String with the refint
module for now, as this is a currently unsupported syntax.
Also rename entryTTL to avoid a conflict with the operational
attribute of the same name.
Andrew Bartlett
Diffstat (limited to 'source4/scripting')
| -rw-r--r-- | source4/scripting/python/samba/provision.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source4/scripting/python/samba/provision.py b/source4/scripting/python/samba/provision.py index 150e5c00df..763140b486 100644 --- a/source4/scripting/python/samba/provision.py +++ b/source4/scripting/python/samba/provision.py @@ -1255,12 +1255,12 @@ def provision_backend(setup_dir=None, message=None, elif ldap_backend_type == "openldap": attrs = ["linkID", "lDAPDisplayName"] - res = schemadb.search(expression="(&(&(linkID=*)(!(linkID:1.2.840.113556.1.4.803:=1)))(objectclass=attributeSchema))", base=names.schemadn, scope=SCOPE_SUBTREE, attrs=attrs) + res = schemadb.search(expression="(&(linkID=*)(!(linkID:1.2.840.113556.1.4.803:=1))(objectclass=attributeSchema)(omSyntax=127))", base=names.schemadn, scope=SCOPE_SUBTREE, attrs=attrs) memberof_config = "# Generated from schema in %s\n" % schemadb_path refint_attributes = "" for i in range (0, len(res)): - expression = "(&(objectclass=attributeSchema)(linkID=%d))" % (int(res[i]["linkID"][0])+1) + expression = "(&(objectclass=attributeSchema)(linkID=%d)(omSyntax=127))" % (int(res[i]["linkID"][0])+1) target = schemadb.searchone(basedn=names.schemadn, expression=expression, attribute="lDAPDisplayName", |