From 326fd6a70dc9fc9cb4b8bc45f76fe3f6092ee2a2 Mon Sep 17 00:00:00 2001
From: amitkuma <amitkuma@redhat.com>
Date: Mon, 25 Dec 2017 16:21:01 +0530
Subject: [PATCH] Match Common Name attribute in Subject

ipa cert_find command has an option called --subject.
The option is documented as --subject=STR Subject.
It is expected that a --subject option searches by X.509 subject field but it does not do so.
It searches for CN not cert subject. Hence changing content of --subject help option.

Resolves: https://pagure.io/freeipa/issue/7322
Reviewed-By: Rob Crittenden <rcritten@redhat.com>
---
 ipaclient/remote_plugins/2_114/cert.py | 2 +-
 ipaclient/remote_plugins/2_156/cert.py | 2 +-
 ipaclient/remote_plugins/2_164/cert.py | 2 +-
 ipaserver/plugins/cert.py              | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ipaclient/remote_plugins/2_114/cert.py b/ipaclient/remote_plugins/2_114/cert.py
index 763f63e37..4177dd13a 100644
--- a/ipaclient/remote_plugins/2_114/cert.py
+++ b/ipaclient/remote_plugins/2_114/cert.py
@@ -132,7 +132,7 @@ class cert_find(Command):
         parameters.Str(
             'subject',
             required=False,
-            label=_(u'Subject'),
+            label=_(u'Match cn attribute in subject'),
         ),
         parameters.Int(
             'revocation_reason',
diff --git a/ipaclient/remote_plugins/2_156/cert.py b/ipaclient/remote_plugins/2_156/cert.py
index de760fdcb..a443ffdd2 100644
--- a/ipaclient/remote_plugins/2_156/cert.py
+++ b/ipaclient/remote_plugins/2_156/cert.py
@@ -132,7 +132,7 @@ class cert_find(Command):
         parameters.Str(
             'subject',
             required=False,
-            label=_(u'Subject'),
+            label=_(u'Match cn attribute in subject'),
         ),
         parameters.Int(
             'revocation_reason',
diff --git a/ipaclient/remote_plugins/2_164/cert.py b/ipaclient/remote_plugins/2_164/cert.py
index de760fdcb..a443ffdd2 100644
--- a/ipaclient/remote_plugins/2_164/cert.py
+++ b/ipaclient/remote_plugins/2_164/cert.py
@@ -132,7 +132,7 @@ class cert_find(Command):
         parameters.Str(
             'subject',
             required=False,
-            label=_(u'Subject'),
+            label=_(u'Match cn attribute in subject'),
         ),
         parameters.Int(
             'revocation_reason',
diff --git a/ipaserver/plugins/cert.py b/ipaserver/plugins/cert.py
index db624357a..f7ddd8157 100644
--- a/ipaserver/plugins/cert.py
+++ b/ipaserver/plugins/cert.py
@@ -1307,7 +1307,7 @@ class cert_find(Search, CertMethod):
     takes_options = (
         Str('subject?',
             label=_('Subject'),
-            doc=_('Subject'),
+            doc=_('Match cn attribute in subject'),
             autofill=False,
         ),
         Int('min_serial_number?',