From cda3a18f2343d4c2f5ff8b08be6015eec37647c3 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Tue, 26 Sep 2006 02:49:16 +0000 Subject: r18912: we don't need the special case for comments now in the This also fixes comments in group mappings, as the code accidentially put in "ntName" in the comment field :-) (This used to be commit 7f1f5d6056da8ac55a41db54b68bf25967f81aaf) --- source3/groupdb/mapping_ldb.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/source3/groupdb/mapping_ldb.c b/source3/groupdb/mapping_ldb.c index c6ff6ca2af..fd59e0f438 100644 --- a/source3/groupdb/mapping_ldb.c +++ b/source3/groupdb/mapping_ldb.c @@ -149,15 +149,11 @@ static struct ldb_dn *mapping_dn(TALLOC_CTX *mem_ctx, const DOM_SID *sid) sid_to_string(string_sid, &map->sid)) != LDB_SUCCESS || ldb_msg_add_fmt(msg, "gidNumber", "%u", (unsigned)map->gid) != LDB_SUCCESS || ldb_msg_add_fmt(msg, "sidNameUse", "%u", (unsigned)map->sid_name_use) != LDB_SUCCESS || + ldb_msg_add_string(msg, "comment", map->comment) != LDB_SUCCESS || ldb_msg_add_string(msg, "ntName", map->nt_name) != LDB_SUCCESS) { goto failed; } - if ((map->comment[0] != '\0') && - (ldb_msg_add_string(msg, "ntName", map->nt_name) != LDB_SUCCESS)) { - goto failed; - } - ret = ldb_add(ldb, msg); /* if it exists we update it. This is a hangover from the semantics the -- cgit