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

frontend: do not forward argument defaults to server

Browse Source 
When forwarding a command call to a server, use only arguments which were
explicitly specified by the caller.

This increases compatibility between new clients and old servers.

https://fedorahosted.org/freeipa/ticket/4739

Reviewed-By: David Kupka <dkupka@redhat.com>
This commit is contained in:
Jan Cholasta
2016-04-06 15:26:48 +02:00
parent 213237c7fe
commit ac2e9e84cf
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ipalib/cli.py
View File

@@ -1243,6 +1243,8 @@ class cli(backend.Executioner):
if param.autofill: if param.autofill:
kw[param.name] = cmd.get_default_of(param.name, **kw) kw[param.name] = cmd.get_default_of(param.name, **kw)
if param.name in kw and kw[param.name] is not None: if param.name in kw and kw[param.name] is not None:
if param.autofill:
del kw[param.name]
continue continue
if param.password: if param.password:
kw[param.name] = self.Backend.textui.prompt_password( kw[param.name] = self.Backend.textui.prompt_password(

3
ipalib/frontend.py
View File

@@ -442,6 +442,7 @@ class Command(HasParam):
self.debug( self.debug(
'raw: %s(%s)', self.name, ', '.join(self._repr_iter(**params)) 'raw: %s(%s)', self.name, ', '.join(self._repr_iter(**params))
) )
if self.api.env.in_server:
params.update(self.get_default(**params)) params.update(self.get_default(**params))
params = self.normalize(**params) params = self.normalize(**params)
params = self.convert(**params) params = self.convert(**params)
@@ -598,7 +599,7 @@ class Command(HasParam):
# Backend.textui.prompt does not fill in the default value, # Backend.textui.prompt does not fill in the default value,
# we have to do it ourselves # we have to do it ourselves
if not raw.strip(): if not raw.strip():
raw = default return None
try: try:
return param(raw, **kw) return param(raw, **kw)