[nagiosplug] check_smtp: Strip angle brackets from -f ...

    Module: nagiosplug
    Branch: master
    Commit: 9976876584e5a1df6e1c9315212c3d274df7a12e
    Author: Anders Kaseorg <[email protected]>
 Committer: Holger Weiss <[email protected]>
      Date: Fri Jun 29 06:26:16 2012 -0400
       URL: http://nagiosplug.git.sf.net/git/gitweb.cgi?p=nagiosplug/nagiosplug;a=commit;h=9976876

check_smtp: Strip angle brackets from -f argument, if provided

Apparently some people used -f '<[email protected]>' to work around
the bug I just fixed in the MAIL FROM: command generation.  Although
the resulting command wasn't RFC-compliant, it was working with some
MTAs, so let's continue to support this syntax now that we generate
RFC-compliant commands.

Signed-off-by: Anders Kaseorg <[email protected]>

---

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

diff --git a/plugins/check_smtp.c b/plugins/check_smtp.c
index 56be585..77ac5ce 100644
--- a/plugins/check_smtp.c
+++ b/plugins/check_smtp.c
@@ -521,7 +521,8 @@ process_arguments (int argc, char **argv)
 			localhostname = strdup(optarg);
 			break;
 		case 'f':									/* from argument */
-			from_arg = optarg;
+			from_arg = optarg + strspn(optarg, "<");
+			from_arg = strndup(from_arg, strcspn(from_arg, ">"));
 			smtp_use_dummycmd = 1;
 			break;
 		case 'A':


------------------------------------------------------------------------------
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/