diff options
Diffstat (limited to 'ipalib')
| -rw-r--r-- | ipalib/plugins/internal.py | 6 | ||||
| -rw-r--r-- | ipalib/plugins/realmdomains.py | 7 |
2 files changed, 10 insertions, 3 deletions
diff --git a/ipalib/plugins/internal.py b/ipalib/plugins/internal.py index ad15b5c40..85bf7d213 100644 --- a/ipalib/plugins/internal.py +++ b/ipalib/plugins/internal.py @@ -536,6 +536,12 @@ class i18n_messages(Command): "type_ad": _("Active Directory domain"), "type_local": _("Local domain"), }, + "realmdomains": { + "identity": _("Realm Domains"), + "check_dns": _("Check DNS"), + "check_dns_confirmation": _("Do you also want to perform DNS check?"), + "force_update": _("Force Update"), + }, "role": { "identity": _("Role Settings"), }, diff --git a/ipalib/plugins/realmdomains.py b/ipalib/plugins/realmdomains.py index 99ab8798b..f3dbf8dae 100644 --- a/ipalib/plugins/realmdomains.py +++ b/ipalib/plugins/realmdomains.py @@ -105,9 +105,10 @@ class realmdomains_mod(LDAPUpdate): if get_domain_name() not in associateddomain: raise errors.ValidationError(name='domain', error=_("cannot delete domain of IPA server")) if not force: - for d in associateddomain: - if not has_soa_or_ns_record(d): - raise errors.ValidationError(name='domain', error=_("no SOA or NS records found for domain %s" % d)) + bad_domains = [d for d in associateddomain if not has_soa_or_ns_record(d)] + if bad_domains: + bad_domains = ', '.join(bad_domains) + raise errors.ValidationError(name='domain', error=_("no SOA or NS records found for domains: %s" % bad_domains)) return dn # If --add-domain or --del-domain options were provided, read |