diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2009-01-09 12:06:18 +1100 | 
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2009-01-09 12:08:11 +1100 | 
| commit | 447f2668879e91990c985bdb8f0c5d5db2719a91 (patch) | |
| tree | 0462347d31f481b5d0755b309ca035ae9252bb19 /source4/scripting/python | |
| parent | 590c9b7b6df643f0ff3e8f36bdc535ef00b30073 (diff) | |
| download | samba-447f2668879e91990c985bdb8f0c5d5db2719a91.tar.gz samba-447f2668879e91990c985bdb8f0c5d5db2719a91.tar.bz2 samba-447f2668879e91990c985bdb8f0c5d5db2719a91.zip | |
Only do special DN tracking for normal DNs in OpenLDAP backend.
This means trying (again, harder), not to do this for DN+Binary and
DN+String attributes.
Andrew Bartlett
Diffstat (limited to 'source4/scripting/python')
| -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 ff957b647d..6becc78dc7 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)(omSyntax=127))", base=names.schemadn, scope=SCOPE_SUBTREE, attrs=attrs) +        res = schemadb.search(expression="(&(linkID=*)(!(linkID:1.2.840.113556.1.4.803:=1))(objectclass=attributeSchema)(attributeSyntax=2.5.5.1))", 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)(omSyntax=127))" % (int(res[i]["linkID"][0])+1) +            expression = "(&(objectclass=attributeSchema)(linkID=%d)(attributeSyntax=2.5.5.1))" % (int(res[i]["linkID"][0])+1)              target = schemadb.searchone(basedn=names.schemadn,                                           expression=expression,                                           attribute="lDAPDisplayName",  | 
