rpms/crypto-utils/devel certwatch.cron,1.5,1.6

[Elio Maldonado (emaldonado)]

Author: emaldonado

Update of /cvs/extras/rpms/crypto-utils/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12105

Modified Files:
	certwatch.cron 
Log Message:
Support usage of database prefix (# 346731)


Index: certwatch.cron
===================================================================
RCS file: /cvs/extras/rpms/crypto-utils/devel/certwatch.cron,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- certwatch.cron	1 May 2008 01:15:32 -0000	1.5
+++ certwatch.cron	6 May 2008 16:21:49 -0000	1.6
@@ -34,6 +34,9 @@
         
     # find path to mod_nss' database
     database=`/usr/bin/gawk '/^NSSCertificateDatabase/ { print $2 }' /etc/httpd/conf.d/nss.conf`
+    
+    # find the database prefix if any from the mod_nss config file
+    dbprefix=`/usr/bin/gawk '/^NSSDBPrefix/ { print $2 }' /etc/httpd/conf.d/nss.conf`
 
     set -o pipefail # pick up exit code of certutil not gawk
     nicknames=`certutil -L -d $database | /usr/bin/gawk '{ print $1 }'`
@@ -42,8 +45,8 @@
     
     for n in $nicknames; do
         # Check whether a warning message is needed, then issue one if so.
-        /usr/bin/certwatch $CERTWATCH_OPTS -q -d "$database" "$n" && 
-          /usr/bin/certwatch $CERTWATCH_OPTS -d "$database" "$n" | /usr/sbin/sendmail -oem -oi -t 2>/dev/null
+        /usr/bin/certwatch $CERTWATCH_OPTS -q -d "$database" -c "$dbprefix" -k "$dbprefix" "$n" && 
+          /usr/bin/certwatch $CERTWATCH_OPTS -d "$database" -c "$dbprefix" -k "$dbprefix" "$n" | /usr/sbin/sendmail -oem -oi -t 2>/dev/null
     done
 }