summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
Diffstat (limited to 'test')
-rw-r--r--test/confs/055928
-rw-r--r--test/confs/202932
-rw-r--r--test/confs/215032
-rw-r--r--test/log/05594
-rw-r--r--test/log/20295
-rw-r--r--test/log/21504
-rw-r--r--test/scripts/0000-Basic/03003
-rw-r--r--test/scripts/0000-Basic/03013
-rw-r--r--test/scripts/0000-Basic/055944
-rw-r--r--test/scripts/2000-GnuTLS/202957
-rw-r--r--test/scripts/2100-OpenSSL/215055
-rw-r--r--test/stderr/05592
-rw-r--r--test/stderr/20292
-rw-r--r--test/stderr/21502
-rw-r--r--test/stdout/03003
-rw-r--r--test/stdout/03013
-rw-r--r--test/stdout/055947
-rw-r--r--test/stdout/202964
-rw-r--r--test/stdout/215064
19 files changed, 450 insertions, 4 deletions
diff --git a/test/confs/0559 b/test/confs/0559
new file mode 100644
index 000000000..c148d9e9d
--- /dev/null
+++ b/test/confs/0559
@@ -0,0 +1,28 @@
+# Exim test configuration 0559
+
+exim_path = EXIM_PATH
+host_lookup_order = bydns
+primary_hostname = myhost.test.ex
+rfc1413_query_timeout = 0s
+spool_directory = DIR/spool
+log_file_path = DIR/spool/log/%slog
+gecos_pattern = ""
+gecos_name = CALLER_NAME
+
+# ----- Main settings -----
+
+acl_smtp_rcpt = accept
+acl_smtp_data = check_data
+
+queue_only
+
+
+# ----- ACLs -----
+
+begin acl
+
+check_data:
+ accept delay = 1s
+
+
+# End
diff --git a/test/confs/2029 b/test/confs/2029
new file mode 100644
index 000000000..1d691be27
--- /dev/null
+++ b/test/confs/2029
@@ -0,0 +1,32 @@
+# Exim test configuration 2029
+
+exim_path = EXIM_PATH
+host_lookup_order = bydns
+primary_hostname = myhost.test.ex
+rfc1413_query_timeout = 0s
+spool_directory = DIR/spool
+log_file_path = DIR/spool/log/%slog
+gecos_pattern = ""
+gecos_name = CALLER_NAME
+
+# ----- Main settings -----
+
+acl_smtp_rcpt = accept
+acl_smtp_data = check_data
+
+queue_only
+
+tls_advertise_hosts = *
+
+tls_certificate = DIR/aux-fixed/cert1
+tls_privatekey = DIR/aux-fixed/cert1
+
+# ----- ACLs -----
+
+begin acl
+
+check_data:
+ accept delay = 1s
+
+
+# End
diff --git a/test/confs/2150 b/test/confs/2150
new file mode 100644
index 000000000..015947b71
--- /dev/null
+++ b/test/confs/2150
@@ -0,0 +1,32 @@
+# Exim test configuration 2150
+
+exim_path = EXIM_PATH
+host_lookup_order = bydns
+primary_hostname = myhost.test.ex
+rfc1413_query_timeout = 0s
+spool_directory = DIR/spool
+log_file_path = DIR/spool/log/%slog
+gecos_pattern = ""
+gecos_name = CALLER_NAME
+
+# ----- Main settings -----
+
+acl_smtp_rcpt = accept
+acl_smtp_data = check_data
+
+queue_only
+
+tls_advertise_hosts = *
+
+tls_certificate = DIR/aux-fixed/cert1
+tls_privatekey = DIR/aux-fixed/cert1
+
+# ----- ACLs -----
+
+begin acl
+
+check_data:
+ accept delay = 1s
+
+
+# End
diff --git a/test/log/0559 b/test/log/0559
new file mode 100644
index 000000000..077691e95
--- /dev/null
+++ b/test/log/0559
@@ -0,0 +1,4 @@
+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 10HmaX-0005vi-00 SMTP connection lost after final dot H=(abcd) [127.0.0.1] P=esmtp
+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 10HmaY-0005vi-00 Synchronization error (data after final dot) H=(abcd) [127.0.0.1] P=esmtp
diff --git a/test/log/2029 b/test/log/2029
new file mode 100644
index 000000000..737b6977b
--- /dev/null
+++ b/test/log/2029
@@ -0,0 +1,5 @@
+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 10HmaX-0005vi-00 TLS recv error on connection from [127.0.0.1]: A TLS packet with unexpected length was received.
+1999-03-02 09:44:33 10HmaX-0005vi-00 SMTP connection lost after final dot H=[127.0.0.1] P=smtps
+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 10HmaY-0005vi-00 Synchronization error (data after final dot) H=[127.0.0.1] P=smtps
diff --git a/test/log/2150 b/test/log/2150
new file mode 100644
index 000000000..41ada4435
--- /dev/null
+++ b/test/log/2150
@@ -0,0 +1,4 @@
+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 10HmaX-0005vi-00 SMTP connection lost after final dot H=[127.0.0.1] P=smtps
+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 10HmaY-0005vi-00 Synchronization error (data after final dot) H=[127.0.0.1] P=smtps
diff --git a/test/scripts/0000-Basic/0300 b/test/scripts/0000-Basic/0300
index 053aec804..de3be1095 100644
--- a/test/scripts/0000-Basic/0300
+++ b/test/scripts/0000-Basic/0300
@@ -23,8 +23,9 @@ rset\r\nmail from:<userx@test.ex>\r\nrcpt to:<userx@test.ex>\r\ndata
??? 250
??? 354
the message
-.\r\nmail from:<userx@test.ex>
+.
+++ 1
+mail from:<userx@test.ex>
rcpt to:<userx@test.ex>\r\ndata\r\nthe message\r\nsecond line
??? 250
??? 250
diff --git a/test/scripts/0000-Basic/0301 b/test/scripts/0000-Basic/0301
index 4add8f42c..f84244f05 100644
--- a/test/scripts/0000-Basic/0301
+++ b/test/scripts/0000-Basic/0301
@@ -26,8 +26,9 @@ mail from:<userx@test.ex>\r\nrcpt to:<userx@test.ex>\r\ndata
??? 250
??? 354
the message
-.\r\nmail from:<userx@test.ex>\r\nrcpt to:<userx@test.ex>\r\ndata\r\nthe message
+.
??? 250
+mail from:<userx@test.ex>\r\nrcpt to:<userx@test.ex>\r\ndata\r\nthe message
??? 250
??? 250
??? 354
diff --git a/test/scripts/0000-Basic/0559 b/test/scripts/0000-Basic/0559
new file mode 100644
index 000000000..01d7d99af
--- /dev/null
+++ b/test/scripts/0000-Basic/0559
@@ -0,0 +1,44 @@
+# SMTP still alive check before final response
+need_ipv4
+#
+exim -DSERVER=server -bd -oX PORT_D
+****
+client -t5 127.0.0.1 PORT_D
+??? 220
+ehlo abcd
+??? 250-
+??? 250-
+??? 250-
+??? 250
+mail from:<userx@test.ex>\r\nrcpt to:<userx@test.ex>\r\ndata
+??? 250
+??? 250
+??? 354
+This is a test message.
+.
++++ 1
+****
+sleep 1
+killdaemon
+#
+# Also check for next input sent too soon
+#
+exim -DSERVER=server -bd -oX PORT_D
+****
+client -t5 127.0.0.1 PORT_D
+??? 220
+ehlo abcd
+??? 250-
+??? 250-
+??? 250-
+??? 250
+mail from:<userx@test.ex>\r\nrcpt to:<userx@test.ex>\r\ndata
+??? 250
+??? 250
+??? 354
+This is a test message.
+.\r\nrset
+??? 550
+****
+sleep 1
+killdaemon
diff --git a/test/scripts/2000-GnuTLS/2029 b/test/scripts/2000-GnuTLS/2029
new file mode 100644
index 000000000..e371e68d7
--- /dev/null
+++ b/test/scripts/2000-GnuTLS/2029
@@ -0,0 +1,57 @@
+# TLS server: SMTP still alive check before final response
+gnutls
+#
+exim -DSERVER=server -bd -oX PORT_D
+****
+# The pause (+++ 1) at the end of this is so that we don't close the input
+# until some time after sending the dot.
+#
+client-gnutls 127.0.0.1 PORT_D
+??? 220
+ehlo abcd
+??? 250-
+??? 250-
+??? 250-
+??? 250-
+??? 250
+starttls
+??? 220
+mail from:<userx@test.ex>
+??? 250
+rcpt to:<userx@test.ex>
+??? 250
+data
+??? 354
+This is a test message.
+.
++++ 1
+****
+sleep 1
+killdaemon
+#
+# Also check for next input sent too soon
+#
+exim -DSERVER=server -bd -oX PORT_D
+****
+client-gnutls 127.0.0.1 PORT_D
+??? 220
+ehlo abcd
+??? 250-
+??? 250-
+??? 250-
+??? 250-
+??? 250
+starttls
+??? 220
+mail from:<userx@test.ex>
+??? 250
+rcpt to:<userx@test.ex>
+??? 250
+data
+??? 354
+This is a test message.
+.\r\nrset
++++ 1
+****
+sleep 1
+killdaemon
diff --git a/test/scripts/2100-OpenSSL/2150 b/test/scripts/2100-OpenSSL/2150
new file mode 100644
index 000000000..cfc6a20d7
--- /dev/null
+++ b/test/scripts/2100-OpenSSL/2150
@@ -0,0 +1,55 @@
+# TLS server: SMTP still alive check before final response
+exim -DSERVER=server -bd -oX PORT_D
+****
+# The pause (+++ 1) at the end of this is so that we don't close the input
+# until some time after sending the dot.
+#
+client-gnutls 127.0.0.1 PORT_D
+??? 220
+ehlo abcd
+??? 250-
+??? 250-
+??? 250-
+??? 250-
+??? 250
+starttls
+??? 220
+mail from:<userx@test.ex>
+??? 250
+rcpt to:<userx@test.ex>
+??? 250
+data
+??? 354
+This is a test message.
+.
++++ 1
+****
+sleep 1
+killdaemon
+#
+# Also check for next input sent too soon
+#
+exim -DSERVER=server -bd -oX PORT_D
+****
+client-gnutls 127.0.0.1 PORT_D
+??? 220
+ehlo abcd
+??? 250-
+??? 250-
+??? 250-
+??? 250-
+??? 250
+starttls
+??? 220
+mail from:<userx@test.ex>
+??? 250
+rcpt to:<userx@test.ex>
+??? 250
+data
+??? 354
+This is a test message.
+.\r\nrset
++++ 1
+****
+sleep 1
+killdaemon
diff --git a/test/stderr/0559 b/test/stderr/0559
new file mode 100644
index 000000000..045fadc9b
--- /dev/null
+++ b/test/stderr/0559
@@ -0,0 +1,2 @@
+
+******** SERVER ********
diff --git a/test/stderr/2029 b/test/stderr/2029
new file mode 100644
index 000000000..045fadc9b
--- /dev/null
+++ b/test/stderr/2029
@@ -0,0 +1,2 @@
+
+******** SERVER ********
diff --git a/test/stderr/2150 b/test/stderr/2150
new file mode 100644
index 000000000..045fadc9b
--- /dev/null
+++ b/test/stderr/2150
@@ -0,0 +1,2 @@
+
+******** SERVER ********
diff --git a/test/stdout/0300 b/test/stdout/0300
index a41df39d3..8dd5a3cc1 100644
--- a/test/stdout/0300
+++ b/test/stdout/0300
@@ -27,8 +27,9 @@ Connecting to 127.0.0.1 port 1225 ... connected
??? 354
<<< 354 Enter message, ending with "." on a line by itself
>>> the message
->>> .\r\nmail from:<userx@test.ex>
+>>> .
+++ 1
+>>> mail from:<userx@test.ex>
>>> rcpt to:<userx@test.ex>\r\ndata\r\nthe message\r\nsecond line
??? 250
<<< 250 OK id=10HmaX-0005vi-00
diff --git a/test/stdout/0301 b/test/stdout/0301
index 198962d06..964f0c17b 100644
--- a/test/stdout/0301
+++ b/test/stdout/0301
@@ -36,9 +36,10 @@ Connecting to 127.0.0.1 port 1225 ... connected
??? 354
<<< 354 Enter message, ending with "." on a line by itself
>>> the message
->>> .\r\nmail from:<userx@test.ex>\r\nrcpt to:<userx@test.ex>\r\ndata\r\nthe message
+>>> .
??? 250
<<< 250 OK id=10HmaX-0005vi-00
+>>> mail from:<userx@test.ex>\r\nrcpt to:<userx@test.ex>\r\ndata\r\nthe message
??? 250
<<< 250 OK
??? 250
diff --git a/test/stdout/0559 b/test/stdout/0559
new file mode 100644
index 000000000..eee1b2e43
--- /dev/null
+++ b/test/stdout/0559
@@ -0,0 +1,47 @@
+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
+>>> ehlo abcd
+??? 250-
+<<< 250-myhost.test.ex Hello abcd [127.0.0.1]
+??? 250-
+<<< 250-SIZE 52428800
+??? 250-
+<<< 250-PIPELINING
+??? 250
+<<< 250 HELP
+>>> mail from:<userx@test.ex>\r\nrcpt to:<userx@test.ex>\r\ndata
+??? 250
+<<< 250 OK
+??? 250
+<<< 250 Accepted
+??? 354
+<<< 354 Enter message, ending with "." on a line by itself
+>>> This is a test message.
+>>> .
++++ 1
+End of script
+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
+>>> ehlo abcd
+??? 250-
+<<< 250-myhost.test.ex Hello abcd [127.0.0.1]
+??? 250-
+<<< 250-SIZE 52428800
+??? 250-
+<<< 250-PIPELINING
+??? 250
+<<< 250 HELP
+>>> mail from:<userx@test.ex>\r\nrcpt to:<userx@test.ex>\r\ndata
+??? 250
+<<< 250 OK
+??? 250
+<<< 250 Accepted
+??? 354
+<<< 354 Enter message, ending with "." on a line by itself
+>>> This is a test message.
+>>> .\r\nrset
+??? 550
+<<< 550 Synchronization error (data after final dot)
+End of script
diff --git a/test/stdout/2029 b/test/stdout/2029
new file mode 100644
index 000000000..dd1bdaef8
--- /dev/null
+++ b/test/stdout/2029
@@ -0,0 +1,64 @@
+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
+>>> ehlo abcd
+??? 250-
+<<< 250-myhost.test.ex Hello abcd [127.0.0.1]
+??? 250-
+<<< 250-SIZE 52428800
+??? 250-
+<<< 250-PIPELINING
+??? 250-
+<<< 250-STARTTLS
+??? 250
+<<< 250 HELP
+>>> starttls
+??? 220
+<<< 220 TLS go ahead
+Attempting to start TLS
+Succeeded in starting TLS
+>>> mail from:<userx@test.ex>
+??? 250
+<<< 250 OK
+>>> rcpt to:<userx@test.ex>
+??? 250
+<<< 250 Accepted
+>>> data
+??? 354
+<<< 354 Enter message, ending with "." on a line by itself
+>>> This is a test message.
+>>> .
++++ 1
+End of script
+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
+>>> ehlo abcd
+??? 250-
+<<< 250-myhost.test.ex Hello abcd [127.0.0.1]
+??? 250-
+<<< 250-SIZE 52428800
+??? 250-
+<<< 250-PIPELINING
+??? 250-
+<<< 250-STARTTLS
+??? 250
+<<< 250 HELP
+>>> starttls
+??? 220
+<<< 220 TLS go ahead
+Attempting to start TLS
+Succeeded in starting TLS
+>>> mail from:<userx@test.ex>
+??? 250
+<<< 250 OK
+>>> rcpt to:<userx@test.ex>
+??? 250
+<<< 250 Accepted
+>>> data
+??? 354
+<<< 354 Enter message, ending with "." on a line by itself
+>>> This is a test message.
+>>> .\r\nrset
++++ 1
+End of script
diff --git a/test/stdout/2150 b/test/stdout/2150
new file mode 100644
index 000000000..dd1bdaef8
--- /dev/null
+++ b/test/stdout/2150
@@ -0,0 +1,64 @@
+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
+>>> ehlo abcd
+??? 250-
+<<< 250-myhost.test.ex Hello abcd [127.0.0.1]
+??? 250-
+<<< 250-SIZE 52428800
+??? 250-
+<<< 250-PIPELINING
+??? 250-
+<<< 250-STARTTLS
+??? 250
+<<< 250 HELP
+>>> starttls
+??? 220
+<<< 220 TLS go ahead
+Attempting to start TLS
+Succeeded in starting TLS
+>>> mail from:<userx@test.ex>
+??? 250
+<<< 250 OK
+>>> rcpt to:<userx@test.ex>
+??? 250
+<<< 250 Accepted
+>>> data
+??? 354
+<<< 354 Enter message, ending with "." on a line by itself
+>>> This is a test message.
+>>> .
++++ 1
+End of script
+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
+>>> ehlo abcd
+??? 250-
+<<< 250-myhost.test.ex Hello abcd [127.0.0.1]
+??? 250-
+<<< 250-SIZE 52428800
+??? 250-
+<<< 250-PIPELINING
+??? 250-
+<<< 250-STARTTLS
+??? 250
+<<< 250 HELP
+>>> starttls
+??? 220
+<<< 220 TLS go ahead
+Attempting to start TLS
+Succeeded in starting TLS
+>>> mail from:<userx@test.ex>
+??? 250
+<<< 250 OK
+>>> rcpt to:<userx@test.ex>
+??? 250
+<<< 250 Accepted
+>>> data
+??? 354
+<<< 354 Enter message, ending with "." on a line by itself
+>>> This is a test message.
+>>> .\r\nrset
++++ 1
+End of script