$FROMADDR, when used with -f to sendmail should be "QUOTED", so that a multi-word...

FROMADDR="FAX Agent <fax@example.com>"

$SENDMAIL ... -f"$FROMADDR" ...

diff --git a/util/faxrcvd.sh.in b/util/faxrcvd.sh.in
index 124b0bf6db31634de89ad372562feeb4f0650479..f0af407bd5794e8b42207f67f8fbcdac5c2b3767 100644 (file)
--- a/util/faxrcvd.sh.in
+++ b/util/faxrcvd.sh.in
@@ -157,18 +157,18 @@ MailWithFAX ()
     if [ "$FILETYPE" = "tif" ]; then
        CreateMailMessage $template                                                     \
            $FILE image/tiff "$FILENAME.tif" "FAX Document"                             \
-           2>$ERRORSTO | $SENDMAIL -f$FROMADDR -oi $SENDTO
+           2>$ERRORSTO | $SENDMAIL -f"$FROMADDR" -oi $SENDTO
     elif [ $FILETYPE = "pdf" ]; then
        $TIFF2PDF -o tmp/$FILENAME.pdf $FILE 2>$ERRORSTO
        CreateMailMessage $template                                                     \
            tmp/$FILENAME.pdf application/pdf "$FILENAME.pdf" "FAX Document"            \
-           2>$ERRORSTO | $SENDMAIL -f$FROMADDR -oi $SENDTO
+           2>$ERRORSTO | $SENDMAIL -f"$FROMADDR" -oi $SENDTO
        rm -f tmp/$FILENAME.pdf
     else
        $FAX2PS $FILE > tmp/$FILENAME.ps 2>$ERRORSTO
        CreateMailMessage $template                                                     \
            tmp/$FILENAME.ps application/postscript "$FILENAME.ps" "FAX Document"       \
-           2>$ERRORSTO | $SENDMAIL -f$FROMADDR -oi $SENDTO
+           2>$ERRORSTO | $SENDMAIL -f"$FROMADDR" -oi $SENDTO
        rm -f tmp/$FILENAME.ps
     fi
 
@@ -186,10 +186,10 @@ if [ -f $FILE ]; then
     if [ "$TOADDR" != "$SENDTO" ] && [ "$NOTIFY_FAXMASTER" != "no" ]; then
         if [ -z "$MSG" ]; then
             CreateMailMessage etc/templates/$TEMPLATE/faxrcvd-notify-success.txt \
-                       2>$ERRORSTO | $SENDMAIL -f$FROMADDR -oi $TOADDR
+                       2>$ERRORSTO | $SENDMAIL -f"$FROMADDR" -oi $TOADDR
         else
             CreateMailMessage etc/templates/$TEMPLATE/faxrcvd-notify-error.txt \
-                       2>$ERRORSTO | $SENDMAIL -f$FROMADDR -oi $TOADDR
+                       2>$ERRORSTO | $SENDMAIL -f"$FROMADDR" -oi $TOADDR
         fi
     fi
     if [ -n "$SENDTO" ]; then

diff --git a/util/notify.sh.in b/util/notify.sh.in
index a2c929a2ff887a8028a3f7cf48751033bb4c9da7..eabe0d68ffdef0ca12873f7481df5dea5f42b8d2 100644 (file)
--- a/util/notify.sh.in
+++ b/util/notify.sh.in
@@ -210,6 +210,6 @@ fi
 
 
 eval CreateMailMessage "$template" $ATTACH_ARGS \
-       2>$ERRORSTO | $SENDMAIL -f$FROMADDR -oi $mailaddr
+       2>$ERRORSTO | $SENDMAIL -f"$FROMADDR" -oi $mailaddr
 
 CleanupPrivateTmp