aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrhatto <rhatto>2006-10-09 13:17:34 +0000
committerrhatto <rhatto>2006-10-09 13:17:34 +0000
commitf163a946033b67402ded675b9e9630dd16c7fd6e (patch)
treeef0331c1b08f7c1f96ef87eca791d21913194a1c
parentf43eb2af062c46cce0ae9787ccb58599734db0b4 (diff)
downloadfirma-f163a946033b67402ded675b9e9630dd16c7fd6e.tar.gz
firma-f163a946033b67402ded675b9e9630dd16c7fd6e.tar.bz2
fix on USER and GROUP evaluation
-rwxr-xr-xfirma8
1 files changed, 4 insertions, 4 deletions
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