summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2010-04-22 11:39:21 +1000
committerAndrew Bartlett <abartlet@samba.org>2010-04-22 18:37:19 +1000
commit47e7e487469fa1f3fafe0a52560e0049801a5ac7 (patch)
tree8e9ce20d29bd3e1ea6298a51573f1d5c179bb6a7
parent466fbe278a6f96f1b9942954a164262a14894bfe (diff)
downloadsamba-47e7e487469fa1f3fafe0a52560e0049801a5ac7.tar.gz
samba-47e7e487469fa1f3fafe0a52560e0049801a5ac7.tar.bz2
samba-47e7e487469fa1f3fafe0a52560e0049801a5ac7.zip
s4:ldap-backend Fix LSA test failures with OpenLDAP backend - convert SIDs
The SIDs in some queries were not being passed as binary, but as strings in comparison with the securityIdentifer object. We need to recognise that these are SIDs in the simple_ldap_map. Andrew Bartlett
-rw-r--r--source4/dsdb/samdb/ldb_modules/simple_ldap_map.c24
1 files changed, 24 insertions, 0 deletions
diff --git a/source4/dsdb/samdb/ldb_modules/simple_ldap_map.c b/source4/dsdb/samdb/ldb_modules/simple_ldap_map.c
index 592cd01b22..1bf72d9710 100644
--- a/source4/dsdb/samdb/ldb_modules/simple_ldap_map.c
+++ b/source4/dsdb/samdb/ldb_modules/simple_ldap_map.c
@@ -282,6 +282,18 @@ static const struct ldb_map_attribute entryuuid_attributes[] =
},
},
},
+ /* securityIdentifier */
+ {
+ .local_name = "securityIdentifier",
+ .type = LDB_MAP_CONVERT,
+ .u = {
+ .convert = {
+ .remote_name = "securityIdentifier",
+ .convert_local = sid_always_binary,
+ .convert_remote = val_copy,
+ },
+ },
+ },
{
.local_name = "name",
.type = LDB_MAP_RENAME,
@@ -492,6 +504,18 @@ static const struct ldb_map_attribute nsuniqueid_attributes[] =
}
}
},
+ /* securityIdentifier */
+ {
+ .local_name = "securityIdentifier",
+ .type = LDB_MAP_CONVERT,
+ .u = {
+ .convert = {
+ .remote_name = "securityIdentifier",
+ .convert_local = sid_always_binary,
+ .convert_remote = val_copy,
+ },
+ },
+ },
{
.local_name = "whenCreated",
.type = LDB_MAP_RENAME,