From bbc8ed07111bfc0ef3a5d24aa6318f0f307e41ca Mon Sep 17 00:00:00 2001 From: Jeremy Harris Date: Thu, 19 Jan 2017 13:12:02 +0000 Subject: VRFY: advertise in EHLO response, if there is an ACL defined --- src/src/smtp_in.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) (limited to 'src') diff --git a/src/src/smtp_in.c b/src/src/smtp_in.c index 890c7c517..04cbbe465 100644 --- a/src/src/smtp_in.c +++ b/src/src/smtp_in.c @@ -3903,19 +3903,20 @@ while (done <= 0) dsn_advertised = TRUE; } - /* Advertise ETRN if there's an ACL checking whether a host is - permitted to issue it; a check is made when any host actually tries. */ + /* Advertise ETRN/VRFY/EXPN if there's are ACL checking whether a host is + permitted to issue them; a check is made when any host actually tries. */ - if (acl_smtp_etrn != NULL) + if (acl_smtp_etrn) { s = string_catn(s, &size, &ptr, smtp_code, 3); s = string_catn(s, &size, &ptr, US"-ETRN\r\n", 7); } - - /* Advertise EXPN if there's an ACL checking whether a host is - permitted to issue it; a check is made when any host actually tries. */ - - if (acl_smtp_expn != NULL) + if (acl_smtp_vrfy) + { + s = string_catn(s, &size, &ptr, smtp_code, 3); + s = string_catn(s, &size, &ptr, US"-VRFY\r\n", 7); + } + if (acl_smtp_expn) { s = string_catn(s, &size, &ptr, smtp_code, 3); s = string_catn(s, &size, &ptr, US"-EXPN\r\n", 7); -- cgit v1.2.3