From 709457876a6d5e4aea281a35350667492bc34df8 Mon Sep 17 00:00:00 2001
From: "Endi S. Dewata" <edewata@redhat.com>
Date: Tue, 9 Feb 2016 18:41:40 +0100
Subject: Added CLIs to inspect PKCS #12 file.

The pki pkcs12-cert-find and pki pkcs12-key-find commands have
been added to list the certificates and keys in a PKCS #12 file.

https://fedorahosted.org/pki/ticket/1742
---
 base/java-tools/bin/pki | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

(limited to 'base/java-tools/bin')

diff --git a/base/java-tools/bin/pki b/base/java-tools/bin/pki
index 4b8e69a55..ce322a2ec 100644
--- a/base/java-tools/bin/pki
+++ b/base/java-tools/bin/pki
@@ -29,10 +29,16 @@ def run_java_cli(args):
 
     # read RESTEasy library path
     value = subprocess.check_output(
-        '. /etc/pki/pki.conf && echo $RESTEASY_LIB',
+        '. /usr/share/pki/etc/pki.conf && . /etc/pki/pki.conf && echo $RESTEASY_LIB',
         shell=True)
     resteasy_lib = value.decode(sys.getfilesystemencoding()).strip()
 
+    # read logging configuration path
+    value = subprocess.check_output(
+        '. /usr/share/pki/etc/pki.conf && . /etc/pki/pki.conf && echo $LOGGING_CONFIG',
+        shell=True)
+    logging_config = value.decode(sys.getfilesystemencoding()).strip()
+
     # construct classpath
     classpath = [
         '/usr/share/java/commons-cli.jar',
@@ -71,6 +77,7 @@ def run_java_cli(args):
         'java',
         '-cp',
         ':'.join(classpath),
+        '-Djava.util.logging.config.file=' + logging_config,
         'com.netscape.cmstools.cli.MainCLI'
     ]
 
-- 
cgit