summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRob Crittenden <rcritten@redhat.com>2012-04-04 14:57:22 -0400
committerMartin Kosek <mkosek@redhat.com>2012-04-05 08:51:30 +0200
commit51b34d5c4249e540510993fe600d222f22fcda16 (patch)
tree108a287be6cd08cc8ec1443e3fbd09361e43e2d2
parent17a0738d2d352f9c3d73167b3fb22cd566fd98d4 (diff)
downloadfreeipa-51b34d5c4249e540510993fe600d222f22fcda16.tar.gz
freeipa-51b34d5c4249e540510993fe600d222f22fcda16.tar.xz
freeipa-51b34d5c4249e540510993fe600d222f22fcda16.zip
Make revocation_reason required when revoking a certificate.
This will prevent errors if an empty reason is provided and it is set by default one doesn't have to always set it on the command-line. https://fedorahosted.org/freeipa/ticket/2597
-rw-r--r--API.txt2
-rw-r--r--VERSION2
-rw-r--r--ipalib/plugins/cert.py2
3 files changed, 3 insertions, 3 deletions
diff --git a/API.txt b/API.txt
index 1464bc60f..c2b17942f 100644
--- a/API.txt
+++ b/API.txt
@@ -433,7 +433,7 @@ output: Output('result', <type 'dict'>, None)
command: cert_revoke
args: 1,1,1
arg: Str('serial_number')
-option: Int('revocation_reason?', autofill=True, default=0, maxvalue=10, minvalue=0)
+option: Int('revocation_reason', autofill=True, default=0, maxvalue=10, minvalue=0)
output: Output('result', None, None)
command: cert_show
args: 1,1,1
diff --git a/VERSION b/VERSION
index 46d98eedc..77572ea68 100644
--- a/VERSION
+++ b/VERSION
@@ -79,4 +79,4 @@ IPA_DATA_VERSION=20100614120000
# #
########################################################
IPA_API_VERSION_MAJOR=2
-IPA_API_VERSION_MINOR=32
+IPA_API_VERSION_MINOR=33
diff --git a/ipalib/plugins/cert.py b/ipalib/plugins/cert.py
index 7a3888121..75eace246 100644
--- a/ipalib/plugins/cert.py
+++ b/ipalib/plugins/cert.py
@@ -526,7 +526,7 @@ class cert_revoke(VirtualCommand):
# FIXME: The default is 0. Is this really an Int param?
takes_options = (
- Int('revocation_reason?',
+ Int('revocation_reason',
label=_('Reason'),
doc=_('Reason for revoking the certificate (0-10)'),
minvalue=0,