summaryrefslogtreecommitdiff
path: root/source4/dsdb
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2006-09-14 07:57:49 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 14:18:40 -0500
commit595c141a69ea0744fccba477717a71fa4abeb825 (patch)
tree539cb4239cc4531625f7fbab8d70f7a1d116a5f6 /source4/dsdb
parenta9aa6d0c67985bfebb43be90a81b6d0a4fbcd8ad (diff)
downloadsamba-595c141a69ea0744fccba477717a71fa4abeb825.tar.gz
samba-595c141a69ea0744fccba477717a71fa4abeb825.tar.bz2
samba-595c141a69ea0744fccba477717a71fa4abeb825.zip
r18504: Handle mappings for RENAME and KEEP attributes better. We don't need
to mess with the values in these cases. Where we do convert the values, try and convert substrings. This isn't going to be perfect, but we should try rather than segfault. This also avoids using the wrong arm of the union for the attribute name The change in the entryUUID module is to correct the case of sAMAccountName, due to the case sensitive ldap.js test. Andrew Bartlett (This used to be commit 81d9a692c1e74ec9078bf718003eafdba85b4324)
Diffstat (limited to 'source4/dsdb')
-rw-r--r--source4/dsdb/samdb/ldb_modules/entryUUID.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/source4/dsdb/samdb/ldb_modules/entryUUID.c b/source4/dsdb/samdb/ldb_modules/entryUUID.c
index f7701b7652..ebe78f9fc4 100644
--- a/source4/dsdb/samdb/ldb_modules/entryUUID.c
+++ b/source4/dsdb/samdb/ldb_modules/entryUUID.c
@@ -284,11 +284,11 @@ const struct ldb_map_attribute entryUUID_attributes[] =
}
},
{
- .local_name = "samAccountType",
+ .local_name = "sAMAccountType",
.type = MAP_CONVERT,
.u = {
.convert = {
- .remote_name = "samAccountType",
+ .remote_name = "sAMAccountType",
.convert_local = normalise_to_signed32,
.convert_remote = val_copy,
},