From 23621e74b24374f51dc5cb66702a84eb31d62abf Mon Sep 17 00:00:00 2001
From: rhatto <rhatto>
Date: Mon, 9 Oct 2006 13:45:30 +0000
Subject: fix on firma.conf permission checking

---
 firma | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

(limited to 'firma')

diff --git a/firma b/firma
index 92cbd69..7806d15 100755
--- a/firma
+++ b/firma
@@ -1345,19 +1345,13 @@ case $# in
       # 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"}
       fi
 
-      # and finally check firma.conf
-      if CheckFirmaConfigFile; then
+      # and finally check firma.conf parameters and pessmissions
+      if CheckFirmaConfigFile && CheckPermission $FIRMA_CONFIG_FILE; then
 
         LIST_NAME="$2"
         LIST_PATH="$LISTS_DIR/$LIST_NAME"
-- 
cgit v1.2.3