IntenseWebs/freeipa
3
0
Fork 0
mirror of https://salsa.debian.org/freeipa-team/freeipa.git synced 2025-02-25 18:55:28 -06:00
Code Issues Packages Projects Releases Wiki Activity

Use PublicError instructions support for trust-add case when domain is not found

Browse Source 
https://fedorahosted.org/freeipa/ticket/3167
This commit is contained in:
Alexander Bokovoy 2012-10-12 12:14:24 +03:00 committed by Rob Crittenden
parent 88262a75ff
commit d05e297015
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
ipalib/plugins/trust.py
View File

@ -329,32 +329,33 @@ class trust_add(LDAPCreate):
try: try:
result = trustinstance.join_ad_full_credentials(keys[-1], realm_server, realm_admin, realm_passwd) result = trustinstance.join_ad_full_credentials(keys[-1], realm_server, realm_admin, realm_passwd)
except errors.NotFound, e: except errors.NotFound, e:
error_message=[_("Unable to resolve domain controller for '%s' domain. ") % (keys[-1])] error_message=_("Unable to resolve domain controller for '%s' domain. ") % (keys[-1])
instructions=[]
if dns_container_exists(self.obj.backend): if dns_container_exists(self.obj.backend):
try: try:
dns_zone = api.Command.dnszone_show(keys[-1])['result'] dns_zone = api.Command.dnszone_show(keys[-1])['result']
if ('idnsforwardpolicy' in dns_zone) and dns_zone['idnsforwardpolicy'][0] == u'only': if ('idnsforwardpolicy' in dns_zone) and dns_zone['idnsforwardpolicy'][0] == u'only':
error_message.append(_("Forward policy is defined for it in IPA DNS, " instructions.append(_("Forward policy is defined for it in IPA DNS, "
"perhaps forwarder points to incorrect host?")) "perhaps forwarder points to incorrect host?"))
except (errors.NotFound, KeyError) as e: except (errors.NotFound, KeyError) as e:
error_message.append(_("IPA manages DNS, please configure forwarder to " instructions.append(_("IPA manages DNS, please configure forwarder to "
"'%(domain)s' domain using following CLI command. " "'%(domain)s' domain using following CLI command. "
"Make sure to replace DNS_SERVER and IP_ADDRESS by " "Make sure to replace DNS_SERVER and IP_ADDRESS by "
"actual values corresponding to the trusted domain's " "actual values corresponding to the trusted domain's "
"DNS server:") % dict(domain=keys[-1])) "DNS server:") % dict(domain=keys[-1]))
# tab character at the beginning of a multiline error message will be replaced # tab character at the beginning of a multiline error message will be replaced
# in the web UI by a colorful hint. Does not affect CLI. # in the web UI by a colorful hint. Does not affect CLI.
error_message.append(_("\tipa dnszone-add %(domain)s --name-server=[DNS_SERVER] " instructions.append(_("\tipa dnszone-add %(domain)s --name-server=[DNS_SERVER] "
"--admin-email='hostmaster@%(domain)s' " "--admin-email='hostmaster@%(domain)s' "
"--force --forwarder=[IP_ADDRESS] " "--force --forwarder=[IP_ADDRESS] "
"--forward-policy=only") % dict(domain=keys[-1])) "--forward-policy=only") % dict(domain=keys[-1]))
error_message.append(_("When using Web UI, please create DNS zone for domain '%(domain)s' " instructions.append(_("When using Web UI, please create DNS zone for domain '%(domain)s' "
"first and then set forwarder and forward policy.") % dict(domain=keys[-1])) "first and then set forwarder and forward policy.") % dict(domain=keys[-1]))
else: else:
error_message.append(_("Since IPA does not manage DNS records, ensure DNS " instructions.append(_("Since IPA does not manage DNS records, ensure DNS "
"is configured to resolve '%(domain)s' domain from " "is configured to resolve '%(domain)s' domain from "
"IPA hosts and back.") % dict(domain=keys[-1])) "IPA hosts and back.") % dict(domain=keys[-1]))
raise errors.NotFound(reason=error_message) raise errors.NotFound(reason=error_message, instructions=instructions)
if result is None: if result is None:
raise errors.ValidationError(name=_('AD Trust setup'), raise errors.ValidationError(name=_('AD Trust setup'),