diff options
author | Andrew Tridgell <tridge@samba.org> | 2006-09-26 02:49:16 +0000 |
---|---|---|
committer | Andrew Tridgell <tridge@samba.org> | 2006-09-26 02:49:16 +0000 |
commit | 2db896029a67f85dd9e279ba240b2245896b0f14 (patch) | |
tree | 17b663096833f05081fd9f6131a59c6cec0e8c5b /source/groupdb | |
parent | 181acf4802f17792070f70eb0621a7145e4e978f (diff) | |
download | samba-2db896029a67f85dd9e279ba240b2245896b0f14.tar.gz samba-2db896029a67f85dd9e279ba240b2245896b0f14.tar.xz samba-2db896029a67f85dd9e279ba240b2245896b0f14.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 :-)
Diffstat (limited to 'source/groupdb')
-rw-r--r-- | source/groupdb/mapping_ldb.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/source/groupdb/mapping_ldb.c b/source/groupdb/mapping_ldb.c index c6ff6ca2af8..fd59e0f4384 100644 --- a/source/groupdb/mapping_ldb.c +++ b/source/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 |