From 71f960457ed2e2fe53c4c8ea5c37b50180d89a6a Mon Sep 17 00:00:00 2001 From: Jan Cholasta Date: Thu, 19 May 2016 14:19:07 +0200 Subject: ipalib: make optional positional command arguments actually optional Fix several plugins not to assume optional positional arguments have a value of None when not specified. https://fedorahosted.org/freeipa/ticket/4739 Reviewed-By: David Kupka --- ipalib/plugins/dns.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'ipalib/plugins/dns.py') diff --git a/ipalib/plugins/dns.py b/ipalib/plugins/dns.py index 8a31dcfeb..d30f50b29 100644 --- a/ipalib/plugins/dns.py +++ b/ipalib/plugins/dns.py @@ -1654,8 +1654,8 @@ def _convert_to_idna(value): pass return None -def _create_idn_filter(cmd, ldap, *args, **options): - term = args[-1] + +def _create_idn_filter(cmd, ldap, term=None, **options): if term: #include idna values to search term_idna = _convert_to_idna(term) @@ -4191,11 +4191,12 @@ class dnsrecord_find(LDAPSearch): continue yield option - def pre_callback(self, ldap, filter, attrs_list, base_dn, scope, *args, **options): + def pre_callback(self, ldap, filter, attrs_list, base_dn, scope, + dnszoneidnsname, *args, **options): assert isinstance(base_dn, DN) # validate if zone is master zone - self.obj.check_zone(args[-2], **options) + self.obj.check_zone(dnszoneidnsname, **options) filter = _create_idn_filter(self, ldap, *args, **options) return (filter, base_dn, ldap.SCOPE_SUBTREE) -- cgit