diff options
| author | Jeremy Harris <jgh146exb@wizmail.org> | 2018-04-04 16:15:22 +0100 |
|---|---|---|
| committer | Jeremy Harris <jgh146exb@wizmail.org> | 2018-04-04 16:15:22 +0100 |
| commit | d31eceff66d5dfc5a901846c6c3fd60f13ca8718 (patch) | |
| tree | f9efc3a3f72226e9b6a8cd2ca46991046b8fbfc1 | |
| parent | 4398228719841b08524520b8c07faeb3bee89705 (diff) | |
Add client-ip info to iprev ${authres } line
| -rw-r--r-- | src/src/expand.c | 4 | ||||
| -rw-r--r-- | test/mail/3700.smtps | 4 | ||||
| -rw-r--r-- | test/mail/3700.x | 4 |
3 files changed, 7 insertions, 5 deletions
diff --git a/src/src/expand.c b/src/src/expand.c index 10fadfd89..a5ddb277d 100644 --- a/src/src/expand.c +++ b/src/src/expand.c @@ -1672,7 +1672,9 @@ static gstring * authres_iprev(gstring * g) { if (sender_host_name) - return string_append(g, 3, US";\n\tiprev=pass (", sender_host_name, US")"); + return string_append(g, sender_host_address ? 5 : 3, + US";\n\tiprev=pass (", sender_host_name, US")", + US" smtp.client-ip=", sender_host_address); if (host_lookup_deferred) return string_catn(g, US";\n\tiprev=temperror", 19); if (host_lookup_failed) diff --git a/test/mail/3700.smtps b/test/mail/3700.smtps index 60a3d234b..ff57e01ed 100644 --- a/test/mail/3700.smtps +++ b/test/mail/3700.smtps @@ -1,9 +1,9 @@ From ok@test.ex Tue Mar 02 09:44:33 1999 Authentication-Results: myhost.test.ex; - iprev=pass (localhost); + iprev=pass (localhost) smtp.client-ip=127.0.0.1; auth=pass (tls) x509.auth="Phil Pennock" Received: from localhost ([127.0.0.1] helo=myhost.test.ex) - by myhost.test.ex with esmtpsa (TLSv1:ke-RSA-AES256-SHA:xxx) + by myhost.test.ex with esmtpsa (TLS1.x:ke_RSA_AES_256_CBC_SHAnnn:256) (Exim x.yz) (envelope-from <ok@test.ex>) id 10HmbA-0005vi-00 diff --git a/test/mail/3700.x b/test/mail/3700.x index 81544998d..d1f269a37 100644 --- a/test/mail/3700.x +++ b/test/mail/3700.x @@ -1,9 +1,9 @@ From ok@test.ex Tue Mar 02 09:44:33 1999 Authentication-Results: myhost.test.ex; - iprev=pass (localhost); + iprev=pass (localhost) smtp.client-ip=127.0.0.1; auth=pass (tls) x509.auth="Phil Pennock" Received: from localhost ([127.0.0.1] helo=myhost.test.ex) - by myhost.test.ex with esmtpsa (TLSv1:ke-RSA-AES256-SHA:xxx) + by myhost.test.ex with esmtpsa (TLS1.x:ke_RSA_AES_256_CBC_SHAnnn:256) (Exim x.yz) (envelope-from <ok@test.ex>) id 10HmaZ-0005vi-00 |