small fixes

1 files changed, 3 insertions, 2 deletions

diff --git a/firma b/firma
index 2de359f..cf9eb57 100755
--- a/firma
+++ b/firma
@@ -824,7 +824,7 @@ function ProcessMessage {
 
               # then, if signature can't be checked, then probably the sender is not subscribed to the list
               # send a bounce, if possible
-              if [[ $SIGNATURE_CHECKING_FAILED == 1 ]]; then
+              if [ "$SIGNATURE_CHECKING_FAILED" == "1" ] && [ "$REQUIRE_SIGNATURE" == "yes" ]; then
 
                 # this is the body of the message to be sent, so no indentation here
                 MESSAGE_BODY="\
@@ -844,7 +844,7 @@ function ProcessMessage {
  questions."
                 ComposeAndSendBounceMessage
 
-              elif [[ SIGNATURE_MADE_BY_SENDER != 1 ]]; then
+              elif [ "$SIGNATURE_MADE_BY_SENDER" != "1" ] && [ "$REQUIRE_SIGNATURE" == "yes" ]; then
 
               # this is the body of the message to be sent, so no indentation here
               MESSAGE_BODY="\
@@ -1806,6 +1806,7 @@ function EmailAdminTask {
     #+then, parse and process admin tasks
     # TODO: - parse commands
     # TODO: - call admin functions
+    # TODO: - email result back to sender
     command_list="`echo $DECRYPTED_MESSAGE`"
   else
     # message was sent by a normal subscriber