diff options
| author | Jan Cholasta <jcholast@redhat.com> | 2016-06-01 15:58:47 +0200 |
|---|---|---|
| committer | Jan Cholasta <jcholast@redhat.com> | 2016-06-03 09:00:34 +0200 |
| commit | 2f7df393fd17b115112c39c714cc6c9b0b37460c (patch) | |
| tree | 721c48e80f6511c39ab80fc8076f49fef1a2c63b /ipalib/plugins/cert.py | |
| parent | 875801d1d9406af6bcd4281962121f04b90287b7 (diff) | |
| download | freeipa-2f7df393fd17b115112c39c714cc6c9b0b37460c.tar.gz freeipa-2f7df393fd17b115112c39c714cc6c9b0b37460c.tar.xz freeipa-2f7df393fd17b115112c39c714cc6c9b0b37460c.zip | |
ipalib: move File command arguments to ipaclient
File arguments are relevant only on the client, on the server they are the
same as Str. Specify the arguments as Str in ipalib.plugins and override
them with File in ipaclient.plugins.
https://fedorahosted.org/freeipa/ticket/4739
Reviewed-By: David Kupka <dkupka@redhat.com>
Diffstat (limited to 'ipalib/plugins/cert.py')
| -rw-r--r-- | ipalib/plugins/cert.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/ipalib/plugins/cert.py b/ipalib/plugins/cert.py index 57894f5d0..cbb5382fb 100644 --- a/ipalib/plugins/cert.py +++ b/ipalib/plugins/cert.py @@ -23,7 +23,7 @@ import os import time import binascii -from ipalib import Command, Str, Int, Flag, File +from ipalib import Command, Str, Int, Flag from ipalib import api from ipalib import errors from ipalib import pkcs10 @@ -246,10 +246,12 @@ class cert_request(VirtualCommand): __doc__ = _('Submit a certificate signing request.') takes_args = ( - File('csr', validate_csr, + Str( + 'csr', validate_csr, label=_('CSR'), cli_name='csr_file', normalizer=normalize_csr, + noextrawhitespace=False, ), ) operation="request certificate" |