From dd64b253fcd9013788093f6b98ebd14ef2308619 Mon Sep 17 00:00:00 2001 From: Matthias Dieter Wallnöfer Date: Thu, 3 Jun 2010 18:25:43 +0200 Subject: s4:rdn_name LDB module - use "ldb_msg_remove_attr" for deleting attributes --- source4/lib/ldb/modules/rdn_name.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/source4/lib/ldb/modules/rdn_name.c b/source4/lib/ldb/modules/rdn_name.c index ee5ab9a4fd..38a1b6f583 100644 --- a/source4/lib/ldb/modules/rdn_name.c +++ b/source4/lib/ldb/modules/rdn_name.c @@ -116,10 +116,8 @@ static int rdn_name_add(struct ldb_module *module, struct ldb_request *req) rdn_val = ldb_val_dup(msg, ldb_dn_get_rdn_val(msg->dn)); - /* Perhaps someone above us tried to set this? */ - if ((attribute = ldb_msg_find_element(msg, "name")) != NULL ) { - attribute->num_values = 0; - } + /* Perhaps someone above us tried to set this? Then ignore it */ + ldb_msg_remove_attr(msg, "name"); ret = ldb_msg_add_value(msg, "name", &rdn_val, NULL); if (ret != LDB_SUCCESS) { -- cgit