summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2006-09-26 02:49:16 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 12:14:46 -0500
commitcda3a18f2343d4c2f5ff8b08be6015eec37647c3 (patch)
tree7f9b7863800992b0aa11135b32bfeab49c3d6d44 /source3
parent45c0a4874bcfc25f6ab28531d771ba0198191bbe (diff)
downloadsamba-cda3a18f2343d4c2f5ff8b08be6015eec37647c3.tar.gz
samba-cda3a18f2343d4c2f5ff8b08be6015eec37647c3.tar.bz2
samba-cda3a18f2343d4c2f5ff8b08be6015eec37647c3.zip
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)
Diffstat (limited to 'source3')
-rw-r--r--source3/groupdb/mapping_ldb.c6
1 files changed, 1 insertions, 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