[SCM] Samba Shared Repository - branch v3-2-stable updated - release-3-2-0pre2-434-ga548e73

[Karolin Seeger]

The branch, v3-2-stable has been updated
       via  a548e730771b1a9c1b320e2a1739c05dbafc54a2 (commit)
       via  5f8b085b78a56c33d23a5c1b6cc810ffff10fcfd (commit)
      from  82d259b9753faf5326690e44790d34bf49d39653 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-stable


- Log -----------------------------------------------------------------
commit a548e730771b1a9c1b320e2a1739c05dbafc54a2
Author: Michael Adam <obnox at samba.org>
Date:   Fri Apr 4 16:56:02 2008 +0200

    mapping_tdb: fix enumeration of mappings.
    
    db->traverse_read returns the number of traversed object on success.
    
    Michael
    (cherry picked from commit 2be2188a97060f04c2dea3ca9ed0fd3db0b3df7c)

commit 5f8b085b78a56c33d23a5c1b6cc810ffff10fcfd
Author: Michael Adam <obnox at samba.org>
Date:   Fri Apr 4 15:27:51 2008 +0200

    mapping.tdb: fix creation of entries with GROUP_PREFIX
    
    Macro is no expanded inside literal string.
    
    Michael
    (cherry picked from commit 872a3d3d38287ab9cbb260d05777481d94e03539)

-----------------------------------------------------------------------

Summary of changes:
 source/groupdb/mapping_tdb.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/groupdb/mapping_tdb.c b/source/groupdb/mapping_tdb.c
index 9f2b250..2f0981e 100644
--- a/source/groupdb/mapping_tdb.c
+++ b/source/groupdb/mapping_tdb.c
@@ -111,7 +111,7 @@ static char *group_mapping_key(TALLOC_CTX *mem_ctx, const DOM_SID *sid)
 		return NULL;
 	}
 
-	result = talloc_asprintf(mem_ctx, "GROUP_PREFIX%s", sidstr);
+	result = talloc_asprintf(mem_ctx, "%s%s", GROUP_PREFIX, sidstr);
 
 	TALLOC_FREE(sidstr);
 	return result;
@@ -363,7 +363,7 @@ static bool enum_group_mapping(const DOM_SID *domsid,
 	state.num_maps = 0;
 	state.maps = NULL;
 
-	if (db->traverse_read(db, collect_map, (void *)&state) != 0) {
+	if (db->traverse_read(db, collect_map, (void *)&state) < 0) {
 		return false;
 	}
 


-- 
Samba Shared Repository