summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorVolker Lendecke <vl@samba.org>2008-11-04 10:51:08 +0100
committerVolker Lendecke <vl@samba.org>2008-11-04 10:56:24 +0100
commit37f4c70920fb23e28a934be3e8b6b9ea1baaa13f (patch)
tree5ee9f037f673ee73d09dbcb4819e2c9e46b04997 /source3
parentbfc59f63f3c13b1499e658c30b2185c7067c5fca (diff)
downloadsamba-37f4c70920fb23e28a934be3e8b6b9ea1baaa13f.tar.gz
samba-37f4c70920fb23e28a934be3e8b6b9ea1baaa13f.tar.bz2
samba-37f4c70920fb23e28a934be3e8b6b9ea1baaa13f.zip
Ignore 3.0 style invalid group mappings during upgrade to ldb
Diffstat (limited to 'source3')
-rw-r--r--source3/groupdb/mapping_ldb.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/source3/groupdb/mapping_ldb.c b/source3/groupdb/mapping_ldb.c
index 1a6b99fa18..db3215552f 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;