The branch, v3-2-test has been updated via 85d20296175a288b32fbd514a019a6028ab7a983 (commit) via aed67987cac4daa56fe04c9330a8083223a48a1d (commit) from 71ed975a608126769c9669409d46c894da3ca43e (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test - Log ----------------------------------------------------------------- commit 85d20296175a288b32fbd514a019a6028ab7a983 Merge: aed67987cac4daa56fe04c9330a8083223a48a1d 71ed975a608126769c9669409d46c894da3ca43e Author: Jeremy Allison <[EMAIL PROTECTED]> Date: Tue Nov 4 04:34:30 2008 -0800 Merge branch 'v3-2-test' of ssh://[EMAIL PROTECTED]/data/git/samba into v3-2-test commit aed67987cac4daa56fe04c9330a8083223a48a1d Author: Volker Lendecke <[EMAIL PROTECTED]> Date: Tue Nov 4 04:33:36 2008 -0800 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