From 60e63e6aed3782cf583010e0ac8fb9bd15b9a1f9 Mon Sep 17 00:00:00 2001
From: rhatto <rhatto>
Date: Wed, 11 Oct 2006 15:59:50 +0000
Subject: removed SIGNED_BY variable, changed MESSAGE_SIGNED_BY_SENDER
 determination

---
 firma | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

(limited to 'firma')

diff --git a/firma b/firma
index f5a16e9..4bb007c 100755
--- a/firma
+++ b/firma
@@ -373,9 +373,11 @@ function ParseGpgDecryptStderr {
         GetSenderAddress  
       fi
 
-      SIGNED_BY="`echo "$gpg_decrypt_stderr" | grep '^\[GNUPG:] GOODSIG' | awk '{ print $4 }'`"
-
-      if [ "$SIGNED_BY" == "$SENDER_ADDRESS" ]; then
+      if
+       echo "$gpg_decrypt_stderr" | \
+       grep '^\[GNUPG:] GOODSIG' | \
+       grep -q $SENDER_ADDRESS
+      then
         SIGNATURE_MADE_BY_SENDER="1"
       else
         SIGNATURE_MADE_BY_SENDER="0"
@@ -840,10 +842,7 @@ 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.
-
- Sent by: $SENDER_ADDRESS
- Signed by: $SIGNED_BY"
+ not sent by the person who signed it."
                 ComposeAndSendBounceMessage
 
               fi
@@ -1854,8 +1853,7 @@ GLOBAL_VARS="
   KEYSERVER
   MODE
   ADMIN_MESSAGE
-  SIGNATURE_MADE_BY_SENDER
-  SIGNED_BY"
+  SIGNATURE_MADE_BY_SENDER"
 
 FUNCTIONS="
   Usage
-- 
cgit v1.2.3