diff options
| author | Tomas Babej <tbabej@redhat.com> | 2015-09-03 14:03:09 +0200 |
|---|---|---|
| committer | Martin Basti <mbasti@redhat.com> | 2015-10-12 13:34:20 +0200 |
| commit | dae9c6cbc164c8d1d5da22013193f2b1778e4d17 (patch) | |
| tree | d3e224ecf7a1466ba28ef68df1dd139a812bdafa | |
| parent | 1e1d6d15c65357b1475917597ffa715ad9d6c8c1 (diff) | |
| download | freeipa-dae9c6cbc164c8d1d5da22013193f2b1778e4d17.tar.gz freeipa-dae9c6cbc164c8d1d5da22013193f2b1778e4d17.tar.xz freeipa-dae9c6cbc164c8d1d5da22013193f2b1778e4d17.zip | |
realmdomains: Do not fail due the ValidationError when adding _kerberos TXT record
https://fedorahosted.org/freeipa/ticket/5278
Reviewed-By: Martin Basti <mbasti@redhat.com>
| -rw-r--r-- | ipalib/plugins/realmdomains.py | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/ipalib/plugins/realmdomains.py b/ipalib/plugins/realmdomains.py index db9c5ccc2..78fdfc937 100644 --- a/ipalib/plugins/realmdomains.py +++ b/ipalib/plugins/realmdomains.py @@ -289,7 +289,9 @@ class realmdomains_mod(LDAPUpdate): u'_kerberos', txtrecord=api.env.realm ) - except (errors.EmptyModlist, errors.NotFound) as error: + except (errors.EmptyModlist, errors.NotFound, + errors.ValidationError) as error: + # If creation of the _kerberos TXT record failed, prompt # for manual intervention messages.add_message( @@ -316,7 +318,8 @@ class realmdomains_mod(LDAPUpdate): u'_kerberos', txtrecord=api.env.realm ) - except (errors.AttrValueNotFound, errors.NotFound) as error: + except (errors.AttrValueNotFound, errors.NotFound, + errors.ValidationError) as error: # If deletion of the _kerberos TXT record failed, prompt # for manual intervention messages.add_message( |