added SIGNED_BY variable

1 files changed, 11 insertions, 5 deletions

diff --git a/firma b/firma
index ea097f4..f5a16e9 100755
--- a/firma
+++ b/firma
@@ -344,7 +344,6 @@ function ParseGpgDecryptStderr {
   #-------------------------------------------------------------
 
   local gpg_decrypt_stderr
-  local sender_address
 
   # get GPG_DECRYPT STDERR, discarding its STDOUT
   gpg_decrypt_stderr="$(
@@ -374,9 +373,9 @@ function ParseGpgDecryptStderr {
         GetSenderAddress  
       fi
 
-      sender_address="`echo "$gpg_decrypt_stderr" | grep '^\[GNUPG:] GOODSIG' | awk '{ print $4 }'`"
+      SIGNED_BY="`echo "$gpg_decrypt_stderr" | grep '^\[GNUPG:] GOODSIG' | awk '{ print $4 }'`"
 
-      if [ "$sender_address" == "$SENDER_ADDRESS" ]; then
+      if [ "$SIGNED_BY" == "$SENDER_ADDRESS" ]; then
         SIGNATURE_MADE_BY_SENDER="1"
       else
         SIGNATURE_MADE_BY_SENDER="0"
@@ -841,7 +840,10 @@ function ProcessMessage {
               # this is the body of the message to be sent, so no indentation here
               MESSAGE_BODY="\
  It was not possible to process this message. Message was
- not sent by the person who signed it."
+ not sent by the person who signed it.
+
+ Sent by: $SENDER_ADDRESS
+ Signed by: $SIGNED_BY"
                 ComposeAndSendBounceMessage
 
               fi
@@ -1663,6 +1665,8 @@ ${MESSAGE_BODY}
     echo "$MESSAGE" | $MAIL_AGENT $MAIL_AGENT_ARGS $recipients
   done
 
+  FixListOwnerShip
+
 }
 
 
@@ -1700,6 +1704,7 @@ function GetSubscribersInfo {
     fi
   done
 
+  FixListOwnerShip
   return $?
 }
 
@@ -1849,7 +1854,8 @@ GLOBAL_VARS="
   KEYSERVER
   MODE
   ADMIN_MESSAGE
-  SIGNATURE_MADE_BY_SENDER"
+  SIGNATURE_MADE_BY_SENDER
+  SIGNED_BY"
 
 FUNCTIONS="
   Usage