From 88927fb78b5dd8df6fdccb79c84c02691c7aeb46 Mon Sep 17 00:00:00 2001 From: Martin Kosek Date: Tue, 17 Apr 2012 20:39:32 +0200 Subject: Do not fail migration because of duplicate groups When 2 groups in a remote LDAP server share the same GID number, the migration may fail entirely with incomprehensible message. This should not be taken as unrecoverable error - GID number check is just a sanity check, a warning is enough. This patch also makes sure that GID check warnings include a user name to make an investigation easier. https://fedorahosted.org/freeipa/ticket/2644 --- ipalib/plugins/migration.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'ipalib/plugins') diff --git a/ipalib/plugins/migration.py b/ipalib/plugins/migration.py index 74cdd6ce2..a7b078975 100644 --- a/ipalib/plugins/migration.py +++ b/ipalib/plugins/migration.py @@ -146,7 +146,12 @@ def _pre_migrate_user(ldap, pkey, dn, entry_attrs, failed, config, ctx, **kwargs ) valid_gids.append(entry_attrs['gidnumber'][0]) except errors.NotFound: - api.log.warn('Migrated user\'s GID number %s does not point to a known group.' % entry_attrs['gidnumber'][0]) + api.log.warn('GID number %s of migrated user %s does not point to a known group.' \ + % (entry_attrs['gidnumber'][0], pkey)) + except errors.SingleMatchExpected, e: + # GID number matched more groups, this should not happen + api.log.warn('GID number %s of migrated user %s should match 1 group, but it matched %d groups' \ + % (entry_attrs['gidnumber'][0], pkey, e.found)) # We don't want to create a UPG so set the magic value in description # to let the DS plugin know. -- cgit