From a307cf68e91327ddbef4b9d7e2bbd3991354831f Mon Sep 17 00:00:00 2001
From: Matthew Harmsen <mharmsen@redhat.com>
Date: Fri, 22 Jul 2016 18:38:19 -0600
Subject: Allow PrettyPrintCert to process HEADERs and TRAILERs.

* PKI TRAC Ticket #2399 - Dogtag 10.3.5: Miscellaneous Enhancements
  Checked-in under one-liner/trivial rule.
---
 base/java-tools/templates/pretty_print_cert_command_wrapper.in | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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

diff --git a/base/java-tools/templates/pretty_print_cert_command_wrapper.in b/base/java-tools/templates/pretty_print_cert_command_wrapper.in
index 63451d0c5..882e7a17e 100644
--- a/base/java-tools/templates/pretty_print_cert_command_wrapper.in
+++ b/base/java-tools/templates/pretty_print_cert_command_wrapper.in
@@ -137,7 +137,7 @@ if [ $# -eq 1 ] ||
 then
     if [ "$1" = "-simpleinfo" ]
     then
-        file $2 | grep 'ASCII text' > /dev/null
+        file $2 | grep -E 'ASCII text|PEM certificate' > /dev/null
         if [ $? -ne 0 ] ; then
             ${JAVA} ${JAVA_OPTIONS} -cp ${CP} com.netscape.cmstools.${COMMAND}
             printf "\n"
@@ -147,7 +147,7 @@ then
             exit 255
         fi
     else
-        file $1 | grep 'ASCII text' > /dev/null
+        file $1 | grep -E 'ASCII text|PEM certificate' > /dev/null
         if [ $? -ne 0 ] ; then
             ${JAVA} ${JAVA_OPTIONS} -cp ${CP} com.netscape.cmstools.${COMMAND}
             printf "\n"
-- 
cgit