From: Andrew Bartlett Date: Tue, 2 Dec 2008 03:22:24 +0000 (+1100) Subject: Don't treat the DN+binary syntax as a DN. X-Git-Tag: samba-4.0.0alpha6~480^2~10 X-Git-Url: http://git.samba.org/samba.git/?a=commitdiff_plain;h=6c298c06f35c132dfd6df854e8fac524e4c80376;p=bbaumbach%2Fsamba-autobuild%2F.git Don't treat the DN+binary syntax as a DN. This should fix the OpenLDAP backend --- diff --git a/source4/dsdb/schema/schema_syntax.c b/source4/dsdb/schema/schema_syntax.c index cee74c05931..7aed08605be 100644 --- a/source4/dsdb/schema/schema_syntax.c +++ b/source4/dsdb/schema/schema_syntax.c @@ -1278,9 +1278,9 @@ static const struct dsdb_syntax dsdb_syntaxes[] = { .attributeSyntax_oid = "2.5.5.7", .drsuapi_to_ldb = dsdb_syntax_DN_BINARY_drsuapi_to_ldb, .ldb_to_drsuapi = dsdb_syntax_DN_BINARY_ldb_to_drsuapi, - .equality = "distinguishedNameMatch", + .equality = "octetStringMatch", .comment = "OctetString: Binary+DN", - .ldb_syntax = LDB_SYNTAX_DN, + .ldb_syntax = LDB_SYNTAX_OCTET_STRING, },{ /* not used in w2k3 schema */ .name = "Object(OR-Name)", diff --git a/source4/setup/schema-map-fedora-ds-1.0 b/source4/setup/schema-map-fedora-ds-1.0 index e55ef0a9e79..74d9e2ac5af 100644 --- a/source4/setup/schema-map-fedora-ds-1.0 +++ b/source4/setup/schema-map-fedora-ds-1.0 @@ -23,9 +23,9 @@ aci 1.2.840.113556.1.4.906:1.3.6.1.4.1.1466.115.121.1.27 #This case insensitive string isn't available 1.2.840.113556.1.4.905:1.3.6.1.4.1.1466.115.121.1.15 -#This type of DN isn't in OpenLDAP -1.2.840.113556.1.4.903:1.3.6.1.4.1.1466.115.121.1.12 #Treat Security Descriptors as binary 1.2.840.113556.1.4.907:1.3.6.1.4.1.1466.115.121.1.40 #NumbericString is not supported in Fedora DS 1.0, map to a directory string 1.3.6.1.4.1.1466.115.121.1.36:1.3.6.1.4.1.1466.115.121.1.15 +#Treat Object(DN-Binary) as a binary blob +1.2.840.113556.1.4.903:1.3.6.1.4.1.1466.115.121.1.40 diff --git a/source4/setup/schema-map-openldap-2.3 b/source4/setup/schema-map-openldap-2.3 index 7de2e67b5e2..bff1695c8f8 100644 --- a/source4/setup/schema-map-openldap-2.3 +++ b/source4/setup/schema-map-openldap-2.3 @@ -35,10 +35,10 @@ modifyTimeStamp:samba4ModifyTimestamp 1.2.840.113556.1.4.906:1.3.6.1.4.1.1466.115.121.1.27 #This case insensitive string isn't available 1.2.840.113556.1.4.905:1.3.6.1.4.1.1466.115.121.1.44 -#This type of DN isn't in OpenLDAP -1.2.840.113556.1.4.903:1.3.6.1.4.1.1466.115.121.1.12 #Treat Security Descriptors as binary 1.2.840.113556.1.4.907:1.3.6.1.4.1.1466.115.121.1.40 #Treat OIDs as case insensitive strings (as otherwise ldap class and #attribute names, declared at OIDs fail 1.3.6.1.4.1.1466.115.121.1.38:1.3.6.1.4.1.1466.115.121.1.44 +#Treat Object(DN-Binary) as a binary blob +1.2.840.113556.1.4.903:1.3.6.1.4.1.1466.115.121.1.40