[nagiosplug] check_smtp: Change MAIL FROM: command to comply ...

    Module: nagiosplug
    Branch: master
    Commit: dd1e9eb5eadffa4a1519c7b67f65f5aa9c586145
    Author: Anders Kaseorg <[email protected]>
 Committer: Holger Weiss <[email protected]>
      Date: Thu Jun 28 23:56:59 2012 -0400
       URL: http://nagiosplug.git.sf.net/git/gitweb.cgi?p=nagiosplug/nagiosplug;a=commit;h=dd1e9eb

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 <[email protected]>

---

 plugins/check_smtp.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/plugins/check_smtp.c b/plugins/check_smtp.c
index 0af50e3..56be585 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);


------------------------------------------------------------------------------
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and 
threat landscape has changed and how IT managers can respond. Discussions 
will include endpoint security, mobile security and the latest in malware 
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/