svn commit: samba r18912 - in branches/SAMBA_3_0/source/groupdb: .

[tridge at samba.org]

Author: tridge
Date: 2006-09-26 02:49:16 +0000 (Tue, 26 Sep 2006)
New Revision: 18912

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=18912

Log:

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 :-)

Modified:
   branches/SAMBA_3_0/source/groupdb/mapping_ldb.c


Changeset:
Modified: branches/SAMBA_3_0/source/groupdb/mapping_ldb.c
===================================================================
--- branches/SAMBA_3_0/source/groupdb/mapping_ldb.c	2006-09-26 02:26:36 UTC (rev 18911)
+++ branches/SAMBA_3_0/source/groupdb/mapping_ldb.c	2006-09-26 02:49:16 UTC (rev 18912)
@@ -149,15 +149,11 @@
 			       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