The branch, v3-3-test has been updated
via 1b71b12259d1a123c96a75c88202a59cae475b2a (commit)
from de16b8982f76e82ffd00d3ad66b24d239c5e8c9f (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-3-test
- Log -----------------------------------------------------------------
commit 1b71b12259d1a123c96a75c88202a59cae475b2a
Author: Volker Lendecke <[EMAIL PROTECTED]>
Date: Tue Nov 4 10:51:08 2008 +0100
Ignore 3.0 style invalid group mappings during upgrade to ldb
-----------------------------------------------------------------------
Summary of changes:
source/groupdb/mapping_ldb.c | 7 +++++++
1 files changed, 7 insertions(+), 0 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/groupdb/mapping_ldb.c b/source/groupdb/mapping_ldb.c
index 7ce879f..68e5b4c 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;
--
Samba Shared Repository
