diff options
| author | Jan Cholasta <jcholast@redhat.com> | 2017-02-23 13:21:59 +0000 |
|---|---|---|
| committer | David Kupka <dkupka@redhat.com> | 2017-03-08 15:52:41 +0100 |
| commit | 1e912f5b83166154806e0382f3f028d0eac81731 (patch) | |
| tree | 38be9b09b3f8d8de03f235362e615ca01486a845 | |
| parent | 25fa2bb6c9fa1b498330b13c9a6116b646eb75ba (diff) | |
| download | freeipa-1e912f5b83166154806e0382f3f028d0eac81731.tar.gz freeipa-1e912f5b83166154806e0382f3f028d0eac81731.tar.xz freeipa-1e912f5b83166154806e0382f3f028d0eac81731.zip | |
dns: fix `dnsrecord_add` interactive mode
`dnsrecord_add` interactive mode might prompt for value of non-existent
arguments `a_part_create_reverse` and `aaaa_part_create_reverse`. This
happens because `dnsrecord_add` extra flags are incorrectly defined as
parts of the respective DNS records.
Remove extra flags from DNS record parts to fix the interactive mode on old
clients talking to new servers. Skip non-existent arguments in the
interactive mode to fix new clients talking to old servers.
https://fedorahosted.org/freeipa/ticket/6457
Reviewed-By: Martin Basti <mbasti@redhat.com>
| -rw-r--r-- | ipaclient/plugins/dns.py | 6 | ||||
| -rw-r--r-- | ipaserver/plugins/dns.py | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/ipaclient/plugins/dns.py b/ipaclient/plugins/dns.py index 2d3c5e238..f67189757 100644 --- a/ipaclient/plugins/dns.py +++ b/ipaclient/plugins/dns.py @@ -73,6 +73,10 @@ def prompt_parts(rrtype, cmd, mod_dnsvalue=None): return user_options for part_id, part in enumerate(rrobj.params()): + name = part_name_format % (rrtype.lower(), part.name) + if name not in cmd.params: + continue + if mod_parts: default = mod_parts[part_id] else: @@ -92,6 +96,8 @@ def prompt_missing_parts(rrtype, cmd, kw, prompt_optional=False): for part in rrobj.params(): name = part_name_format % (rrtype.lower(), part.name) + if name not in cmd.params: + continue if name in kw: continue diff --git a/ipaserver/plugins/dns.py b/ipaserver/plugins/dns.py index 40c9b5124..7007928f3 100644 --- a/ipaserver/plugins/dns.py +++ b/ipaserver/plugins/dns.py @@ -3531,7 +3531,7 @@ for param in _dns_records: 'dns{}record'.format(param.rrtype.lower()), (Object,), dict( - takes_params=(param.parts or ()) + (param.extra or ()), + takes_params=param.parts or (), ) ) ) |