diff options
| author | Martin Kosek <mkosek@redhat.com> | 2012-04-17 20:39:32 +0200 |
|---|---|---|
| committer | Rob Crittenden <rcritten@redhat.com> | 2012-04-17 00:20:47 -0400 |
| commit | 49f869522581d66a62e7d251739a2f758837d78e (patch) | |
| tree | 734205b9a88b510151cfe1f4e1d6c8a85715bc5a | |
| parent | 4a48efe636c0036334d4d3afadc933b0408de0f0 (diff) | |
| download | freeipa-49f869522581d66a62e7d251739a2f758837d78e.tar.gz freeipa-49f869522581d66a62e7d251739a2f758837d78e.tar.xz freeipa-49f869522581d66a62e7d251739a2f758837d78e.zip | |
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
| -rw-r--r-- | ipalib/plugins/migration.py | 7 |
1 files changed, 6 insertions, 1 deletions
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. |