From: rhatto <rhatto>
Date: Mon, 9 Oct 2006 13:17:34 +0000 (+0000)
Subject: fix on USER and GROUP evaluation
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=f163a946033b67402ded675b9e9630dd16c7fd6e;p=firma.git

fix on USER and GROUP evaluation
---

diff --git a/firma b/firma
index d676bd6..f44446e 100755
--- a/firma
+++ b/firma
@@ -184,11 +184,11 @@ WARNING: Setting LOG_TO_SYSLOG to '0'."
     fi
   fi
 
-  if [ -z "$USER" ]; then
+  if [ ! grep -q -e "^USER=" $FIRMA_CONFIG_FILE ]; then
     USER="nobody"
   fi
 
-  if [ -z "$GROUP" ]; then
+  if [ ! grep -q -e "^GROUP=" $FIRMA_CONFIG_FILE ]; then
     GROUP="nobody"
   fi
 
@@ -1078,7 +1078,7 @@ EOF
 function CheckPermission {
   #-------------------------------------------------------------
   # check if file has correct permissions (600) and also
-  # + if the file is owned by $USER
+  # +if the file is owned by $USER
   # +got the idea for this function from backupninja
   #
   # parameter(s): file name
@@ -1106,7 +1106,7 @@ function CheckPermission {
 function CheckListPermissions {
   #-------------------------------------------------------------
   # check if list files has correct permissions (600) and also
-  # + if the files are owned by $USER
+  # +if the files are owned by $USER
   #
   # parameter(s): list config file
   # depends on function(s): CheckPermission