From ce3258931d05becb2c87f17d80ee7c4b01f5a55a Mon Sep 17 00:00:00 2001 From: Jeremy Harris Date: Thu, 17 Dec 2015 23:22:09 +0000 Subject: Fix hosts_connection_nolog ensuring that sender_host_cache is not incorrectly filled in by the daemon, where the sender_host will be varying. --- test/confs/0614 | 20 ++++++++++++++++++++ test/log/0614 | 3 +++ test/scripts/0000-Basic/0614 | 17 +++++++++++++++++ test/stdout/0614 | 10 ++++++++++ 4 files changed, 50 insertions(+) create mode 100644 test/confs/0614 create mode 100644 test/log/0614 create mode 100644 test/scripts/0000-Basic/0614 create mode 100644 test/stdout/0614 (limited to 'test') diff --git a/test/confs/0614 b/test/confs/0614 new file mode 100644 index 000000000..2b2361747 --- /dev/null +++ b/test/confs/0614 @@ -0,0 +1,20 @@ +# Exim test configuration 0614 +# hosts_connection_nolog versus sender_host lists caching + +exim_path = EXIM_PATH +host_lookup_order = bydns +primary_hostname = myhost.test.ex +spool_directory = DIR/spool +log_file_path = DIR/spool/log/%slog +gecos_pattern = "" +gecos_name = CALLER_NAME +tls_advertise_hosts = + +# ----- Main settings ----- + +log_selector = +smtp_connection +hostlist nolog = 127.0.0.1 +hosts_connection_nolog = +nolog +queue_only + +# End diff --git a/test/log/0614 b/test/log/0614 new file mode 100644 index 000000000..f52733f62 --- /dev/null +++ b/test/log/0614 @@ -0,0 +1,3 @@ +1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port 1225 +1999-03-02 09:44:33 SMTP connection from [ip4.ip4.ip4.ip4] (TCP/IP connection count = 1) +1999-03-02 09:44:33 SMTP connection from [ip4.ip4.ip4.ip4] closed by QUIT diff --git a/test/scripts/0000-Basic/0614 b/test/scripts/0000-Basic/0614 new file mode 100644 index 000000000..ff3931b16 --- /dev/null +++ b/test/scripts/0000-Basic/0614 @@ -0,0 +1,17 @@ +# hosts_connection_nolog versus sender_host lists caching +exim -bd -DSERVER=server -oX PORT_D +**** +# +# Will not log connection due to hosts_connection_nolog +client 127.0.0.1 PORT_D +??? 220 +QUIT +**** +# +# Connection should be logged +client HOSTIPV4 PORT_D +??? 220 +QUIT +**** +# +killdaemon diff --git a/test/stdout/0614 b/test/stdout/0614 new file mode 100644 index 000000000..f670e1e23 --- /dev/null +++ b/test/stdout/0614 @@ -0,0 +1,10 @@ +Connecting to 127.0.0.1 port 1225 ... connected +??? 220 +<<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 +>>> QUIT +End of script +Connecting to ip4.ip4.ip4.ip4 port 1225 ... connected +??? 220 +<<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 +>>> QUIT +End of script -- cgit v1.2.3