summaryrefslogtreecommitdiffstats
path: root/ipalib/plugins/trust.py
diff options
context:
space:
mode:
Diffstat (limited to 'ipalib/plugins/trust.py')
-rw-r--r--ipalib/plugins/trust.py10
1 files changed, 6 insertions, 4 deletions
diff --git a/ipalib/plugins/trust.py b/ipalib/plugins/trust.py
index 99acfb8f8..fe1a76719 100644
--- a/ipalib/plugins/trust.py
+++ b/ipalib/plugins/trust.py
@@ -721,11 +721,10 @@ sides.
ret['summary'] = self.msg_summary_existing % ret
return ret
-
# 2. We don't have access to the remote domain and trustdom password
# is provided. Do the work on our side and inform what to do on remote
# side.
- if 'trust_secret' in options:
+ if options.get('trust_secret'):
result = self.trustinstance.join_ad_ipa_half(
keys[-1],
self.realm_server,
@@ -740,8 +739,11 @@ sides.
if dn:
ret['summary'] = self.msg_summary_existing % ret
return ret
- raise errors.ValidationError(name=_('AD Trust setup'),
- error=_('Not enough arguments specified to perform trust setup'))
+ else:
+ raise errors.ValidationError(
+ name=_('AD Trust setup'),
+ error=_('Not enough arguments specified to perform trust '
+ 'setup'))
@register()
class trust_del(LDAPDelete):