From 9976876584e5a1df6e1c9315212c3d274df7a12e Mon Sep 17 00:00:00 2001 From: Anders Kaseorg Date: Fri, 29 Jun 2012 06:26:16 -0400 Subject: check_smtp: Strip angle brackets from -f argument, if provided Apparently some people used -f '' 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 --- plugins/check_smtp.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'plugins/check_smtp.c') diff --git a/plugins/check_smtp.c b/plugins/check_smtp.c index 56be585e..77ac5ced 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': -- cgit v1.2.3