From 595c141a69ea0744fccba477717a71fa4abeb825 Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Thu, 14 Sep 2006 07:57:49 +0000 Subject: 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) --- source4/dsdb/samdb/ldb_modules/entryUUID.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'source4/dsdb/samdb/ldb_modules') 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, }, -- cgit