From 5b886e218558a54fd0ac2c0aa88252b511f45d2b Mon Sep 17 00:00:00 2001
From: rhatto <rhatto>
Date: Mon, 9 Oct 2006 13:43:02 +0000
Subject: fix on firma.conf permission checking

---
 firma | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

(limited to 'firma')

diff --git a/firma b/firma
index d8087b6..92cbd69 100755
--- a/firma
+++ b/firma
@@ -1339,15 +1339,18 @@ case $# in
     esac
     ;;
   2)
-    # if firma.conf exists but has wrong permissions or ownership
-    if [ -f "$FIRMA_CONFIG_FILE" ] && ! CheckPermission $FIRMA_CONFIG_FILE; then
-      EXIT_CODE="1"
     # if firma.conf exists
-    elif [ -f "$FIRMA_CONFIG_FILE" ]; then
+    if [ -f "$FIRMA_CONFIG_FILE" ]; then
 
       # evaluate its parameters
       shopt -u sourcepath && source "$FIRMA_CONFIG_FILE"
 
+      # if firma.conf exists but has wrong permissions or
+      # +ownership, simple exit
+      if ! CheckPermission $FIRMA_CONFIG_FILE; then
+        exit 1
+      fi
+
       # set SYSLOG_PRIORITY to the default value, if needed
       if [[ "$LOG_TO_SYSLOG" == 1 ]]; then
         SYSLOG_PRIORITY=${SYSLOG_PRIORITY:-"user.err"}
-- 
cgit v1.2.3