From: rhatto <rhatto>
Date: Fri, 6 Oct 2006 22:42:25 +0000 (+0000)
Subject: fixed config file creation
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=c51760f4f6f5488ca35e875a706991d7396a787e;p=firma.git

fixed config file creation
---

diff --git a/firma b/firma
index c14f3f6..a3254cc 100755
--- a/firma
+++ b/firma
@@ -874,7 +874,7 @@ function NewList {
     if [ -f "$LIST_CONFIG_FILE" ]; then
       DeclareGpgVars
       # removed: MAIL_AGENT=$MAIL_AGENT\nGPG_BINARY=$GPG_BINARY\n
-      echo -e "LIST_HOMEDIR=\'$LIST_HOMEDIR\'\nLIST_ADDRESS=\'$LIST_ADDRESS\'\nLIST_ADMIN=\'$LIST_ADMIN\'\nPASSPHRASE=\'$PASSPHRASE\'" > $LIST_CONFIG_FILE
+      echo -e "LIST_HOMEDIR='$LIST_HOMEDIR'\nLIST_ADDRESS='$LIST_ADDRESS'\nLIST_ADMIN='$LIST_ADMIN'\nPASSPHRASE='$PASSPHRASE'" > $LIST_CONFIG_FILE
       echo "Now generating your keyring..."
 
       $GPG --gen-key <<EOF
@@ -893,6 +893,7 @@ function NewList {
 
 EOF
 
+      # TODO: import admin pubkey and send list pubkey to admin
       chown -R $USER.$GROUP $LIST_HOMEDIR
 
     else
@@ -1076,9 +1077,10 @@ function CheckPermission {
   perms=${perms:4:6}
   if [ "$perms" != "------" ]; then
     ERROR_MESSAGE="WARNING: Configuration files must not be group or world writable/readable! Dying on file $file"
-    echo $ERROR_MESSAGE
     if [[ "$LOG_TO_SYSLOG" == 1 ]]; then
       echo "$ERROR_MESSAGE" | $LOGGER_BINARY -p "$SYSLOG_PRIORITY" -t "$BASENAME"
+    else
+      echo $ERROR_MESSAGE
     fi
     return 1
   fi