check_smtp: Change MAIL FROM: command to comply with the SMTP standard

Every version of the SMTP standard (from RFC 821 to the current RFC
5321) requires the address following MAIL FROM: to follow the colon
immediately (with no space) and to be surrounded by angle brackets.

Signed-off-by: Anders Kaseorg <andersk@mit.edu>

1 files changed, 1 insertions, 1 deletions

diff --git a/plugins/check_smtp.c b/plugins/check_smtp.c
index 0af50e32..56be585e 100644
--- a/plugins/check_smtp.c
+++ b/plugins/check_smtp.c
@@ -164,7 +164,7 @@ main (int argc, char **argv)
                 printf("HELOCMD: %s", helocmd);
 
         /* initialize the MAIL command with optional FROM command  */
-        asprintf (&cmd_str, "%sFROM: %s%s", mail_command, from_arg, "\r\n");
+        asprintf (&cmd_str, "%sFROM:<%s>%s", mail_command, from_arg, "\r\n");
 
         if (verbose && smtp_use_dummycmd)
                 printf ("FROM CMD: %s", cmd_str);