From 4eda1958a62b283b2a058aaf053ebda9a0036957 Mon Sep 17 00:00:00 2001
From: Volker Lendecke <vl@samba.org>
Date: Tue, 4 Nov 2008 04:33:36 -0800
Subject: [PATCH] Ignore 3.0 style invalid group mappings during upgrade to ldb
 (cherry picked from commit aed67987cac4daa56fe04c9330a8083223a48a1d)

---
 source/groupdb/mapping_ldb.c | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/source/groupdb/mapping_ldb.c b/source/groupdb/mapping_ldb.c
index 7ce879fb6ed..68e5b4cd5e9 100644
--- a/source/groupdb/mapping_ldb.c
+++ b/source/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;
-- 
2.11.4.GIT