From 1f9d9de5dd0e5935bb71060d867b46f675977163 Mon Sep 17 00:00:00 2001 From: Florence Blanc-Renaud Date: Tue, 28 Mar 2017 16:02:45 +0200 Subject: [PATCH] idrange-add: properly handle empty --dom-name option When idrange-add is called with --dom-name=, the CLI exits with ipa: ERROR: an internal error has occurred This happens because the code checks if the option is provided but does not check if the value is None. We need to handle empty dom-name as if the option was not specified. https://pagure.io/freeipa/issue/6404 Reviewed-By: Stanislav Laznicka --- ipaserver/plugins/idrange.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ipaserver/plugins/idrange.py b/ipaserver/plugins/idrange.py index 5b88a6b0fd91271eaeb19c8315e23299a13ff7e4..c8ea95af801a86dd0180497964ddbd1b2741f279 100644 --- a/ipaserver/plugins/idrange.py +++ b/ipaserver/plugins/idrange.py @@ -411,7 +411,7 @@ class idrange_add(LDAPCreate): # This needs to stay in options since there is no # ipanttrusteddomainname attribute in LDAP - if 'ipanttrusteddomainname' in options: + if options.get('ipanttrusteddomainname'): if is_set('ipanttrusteddomainsid'): raise errors.ValidationError(name='ID Range setup', error=_('Options dom-sid and dom-name ' -- 2.9.3