[SCM] Samba Shared Repository - branch master updated - 37f4c70920fb23e28a934be3e8b6b9ea1baaa13f

Volker Lendecke vlendec at samba.org
Tue Nov 4 10:13:36 GMT 2008


The branch, master has been updated
       via  37f4c70920fb23e28a934be3e8b6b9ea1baaa13f (commit)
      from  bfc59f63f3c13b1499e658c30b2185c7067c5fca (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 37f4c70920fb23e28a934be3e8b6b9ea1baaa13f
Author: Volker Lendecke <vl at samba.org>
Date:   Tue Nov 4 10:51:08 2008 +0100

    Ignore 3.0 style invalid group mappings during upgrade to ldb

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

Summary of changes:
 source3/groupdb/mapping_ldb.c |    7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/groupdb/mapping_ldb.c b/source3/groupdb/mapping_ldb.c
index 1a6b99f..db32155 100644
--- a/source3/groupdb/mapping_ldb.c
+++ b/source3/groupdb/mapping_ldb.c
@@ -574,6 +574,13 @@ static int upgrade_map_record(TDB_CONTEXT *tdb_ctx, TDB_DATA key,
 		return -1;
 	}
 
+	if ((int)map.gid == -1) {
+		/*
+		 * Ignore old invalid mappings
+		 */
+		return 0;
+	}
+
 	if (!add_mapping_entry(&map, 0)) {
 		DEBUG(0,("Failed to add mapping entry during upgrade\n"));
 		*(int *)state = -1;


-- 
Samba Shared Repository


More information about the samba-cvs mailing list