aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrhatto <rhatto>2006-10-09 13:45:30 +0000
committerrhatto <rhatto>2006-10-09 13:45:30 +0000
commit23621e74b24374f51dc5cb66702a84eb31d62abf (patch)
tree0d4b93ade7bf5d9da0f934a695e7f24c8f544608
parent5b886e218558a54fd0ac2c0aa88252b511f45d2b (diff)
downloadfirma-23621e74b24374f51dc5cb66702a84eb31d62abf.tar.gz
firma-23621e74b24374f51dc5cb66702a84eb31d62abf.tar.bz2
fix on firma.conf permission checking
-rwxr-xr-xfirma10
1 files changed, 2 insertions, 8 deletions
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"