No missing token in verify_certificate_exists

Remove the missing token check from verify_certificate_exists. It was the one place that was not adopted to use blank token as default. Change-Id: Ic192e0699ff32af474976039af08e1503925dfd1 See: 17677ae Fixes: https://pagure.io/dogtagpki/issue/3073 Signed-off-by: Christian Heimes <cheimes@redhat.com>
dogtagpki · Oct 25, 2018 · 0fba3c2 · 0fba3c2
1 parent 8fe7d8b
commit 0fba3c2
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 6 deletions.
diff --git a/base/server/python/pki/server/deployment/pkihelper.py b/base/server/python/pki/server/deployment/pkihelper.py
@@ -2436,11 +2436,6 @@ def verify_certificate_exists(self, path, token, nickname,
             #   Specify the 'token'
             if token:
                 command.extend(["-h", token])
-            else:
-                config.pki_log.error(
-                    log.PKIHELPER_CERTUTIL_MISSING_TOKEN,
-                    extra=config.PKI_INDENTATION_LEVEL_2)
-                raise Exception(log.PKIHELPER_CERTUTIL_MISSING_TOKEN)
             #   Specify the nickname of this self-signed certificate
             if nickname:
                 command.extend(["-n", nickname])

diff --git a/base/server/python/pki/server/deployment/pkimessages.py b/base/server/python/pki/server/deployment/pkimessages.py
@@ -188,7 +188,6 @@
 PKIHELPER_CERTUTIL_MISSING_SERIAL_NUMBER = \
     "certutil:  Missing '-m serial-number' option!"
 PKIHELPER_CERTUTIL_MISSING_SUBJECT = "certutil:  Missing '-s subject' option!"
-PKIHELPER_CERTUTIL_MISSING_TOKEN = "certutil:  Missing '-h token' option!"
 PKIHELPER_CERTUTIL_MISSING_TRUSTARGS = \
     "certutil:  Missing '-t trustargs' option!"
 PKIHELPER_CERTUTIL_MISSING_VALIDITY_PERIOD = \