diff options
Diffstat (limited to 'test')
| -rw-r--r-- | test/README | 10 | ||||
| -rw-r--r-- | test/confs/4020 | 44 | ||||
| -rw-r--r-- | test/confs/4028 | 63 | ||||
| -rw-r--r-- | test/confs/4029 | 64 | ||||
| -rw-r--r-- | test/log/4020 | 6 | ||||
| -rw-r--r-- | test/log/4028 | 9 | ||||
| -rw-r--r-- | test/log/4029 | 11 | ||||
| -rw-r--r-- | test/scripts/2000-GnuTLS/2000 | 2 | ||||
| -rw-r--r-- | test/scripts/2000-GnuTLS/2018 | 2 | ||||
| -rw-r--r-- | test/scripts/4000-scanning/4006 | 2 | ||||
| -rw-r--r-- | test/scripts/4020-socks/4020 | 85 | ||||
| -rw-r--r-- | test/scripts/4020-socks/REQUIRES | 1 | ||||
| -rw-r--r-- | test/scripts/4028-GnuTLS-socks/4028 | 30 | ||||
| -rw-r--r-- | test/scripts/4028-GnuTLS-socks/REQUIRES | 4 | ||||
| -rw-r--r-- | test/scripts/4029-OpenSSL-socks/4029 | 30 | ||||
| -rw-r--r-- | test/scripts/4029-OpenSSL-socks/REQUIRES | 4 | ||||
| -rw-r--r-- | test/src/server.c | 162 | ||||
| -rw-r--r-- | test/stdout/0259 | 2 | ||||
| -rw-r--r-- | test/stdout/4003 | 10 | ||||
| -rw-r--r-- | test/stdout/4006 | 6 | ||||
| -rw-r--r-- | test/stdout/4020 | 68 | ||||
| -rw-r--r-- | test/stdout/4028 | 12 | ||||
| -rw-r--r-- | test/stdout/4029 | 12 |
23 files changed, 589 insertions, 50 deletions
diff --git a/test/README b/test/README index e54485788..653cf951f 100644 --- a/test/README +++ b/test/README @@ -1021,7 +1021,10 @@ are of the following kinds: (d) If the line starts with ">*eof", nothing is sent and the connection is closed. - The data that is sent starts after the initial '>' sequence. + The data that is sent starts after the initial '>' sequence. Within + each line the sequence '\x' followed by two hex digits can be used + to specify an arbitrary byte value. The sequence '\\' specifies a + single backslash. (2) A line that starts with "*sleep" specifies a number of seconds to wait before proceeding. @@ -1035,7 +1038,10 @@ are of the following kinds: (5) Otherwise, the line defines the start of an input line that the client is expected to send. To allow for lines that start with digits, the line may start with '<', which is not taken as part of the input data. If the - input does not match, the server bombs out with an error message. + lines starts with '<<' then only the characters are expected; no return- + linefeed terminator. If the input does not match, the server bombs out + with an error message. Backslash-escape sequences may be used in the + line content as for output lines. Here is a simple example of server use in a test script: diff --git a/test/confs/4020 b/test/confs/4020 new file mode 100644 index 000000000..8a3a91fcc --- /dev/null +++ b/test/confs/4020 @@ -0,0 +1,44 @@ +# Exim test configuration 4020 + +OPT = + +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 + +# ----- Main settings ----- + +domainlist local_domains = test.ex : *.test.ex +acl_smtp_rcpt = accept + + +# ----- Routers ----- + +begin routers + +my_main_router: + driver = manualroute + route_list = * 127.0.0.1 + self = send + transport = my_smtp + debug_print = router_name <$router_name> + no_more + + +# ----- Transports ----- + +begin transports + +my_smtp: + driver = smtp + interface = HOSTIPV4 + port = PORT_S + socks_proxy = 127.0.0.1 port=PORT_S OPT + debug_print = transport_name <$transport_name> + + +# End diff --git a/test/confs/4028 b/test/confs/4028 new file mode 100644 index 000000000..3174e7543 --- /dev/null +++ b/test/confs/4028 @@ -0,0 +1,63 @@ +# Exim test configuration 4028 +# starttls over socks + +OPT = +SERVER= + +exim_path = EXIM_PATH +host_lookup_order = bydns +primary_hostname = myhost.test.ex +spool_directory = DIR/spool +log_file_path = DIR/spool/log/SERVER%slog +gecos_pattern = "" +gecos_name = CALLER_NAME + +# ----- Main settings ----- + +log_selector = +tls_peerdn +domainlist local_domains = test.ex : *.test.ex +acl_smtp_rcpt = accept + +tls_advertise_hosts = * + +# Set certificate only if server + +tls_certificate = ${if eq {SERVER}{server}{DIR/aux-fixed/cert1}fail} +tls_privatekey = ${if eq {SERVER}{server}{DIR/aux-fixed/cert1}fail} + +tls_verify_hosts = * +tls_verify_certificates = ${if eq {SERVER}{server}{DIR/aux-fixed/cert2}fail} + +# ----- Routers ----- + +begin routers + +client: + driver = manualroute + condition = ${if eq {SERVER}{server}{no}{yes}} + route_list = * 127.0.0.1 + self = send + transport = my_smtp + no_more + +server: + driver = redirect + data = :blackhole: + + +# ----- Transports ----- + +begin transports + +my_smtp: + driver = smtp + port = PORT_D + socks_proxy = 127.0.0.1 port=1080 OPT + tls_certificate = DIR/aux-fixed/cert2 + tls_privatekey = DIR/aux-fixed/cert2 + tls_verify_certificates = DIR/aux-fixed/cert2 + tls_try_verify_hosts = * + + + +# End diff --git a/test/confs/4029 b/test/confs/4029 new file mode 100644 index 000000000..ae4e71850 --- /dev/null +++ b/test/confs/4029 @@ -0,0 +1,64 @@ +# Exim test configuration 4029 +# starttls over socks + +OPT = +SERVER= + +exim_path = EXIM_PATH +host_lookup_order = bydns +primary_hostname = myhost.test.ex +spool_directory = DIR/spool +log_file_path = DIR/spool/log/SERVER%slog +gecos_pattern = "" +gecos_name = CALLER_NAME + +# ----- Main settings ----- + +log_selector = +tls_peerdn +domainlist local_domains = test.ex : *.test.ex +acl_smtp_rcpt = accept + +tls_advertise_hosts = * + +# Set certificate only if server + +tls_certificate = ${if eq {SERVER}{server}{DIR/aux-fixed/cert1}fail} +tls_privatekey = ${if eq {SERVER}{server}{DIR/aux-fixed/cert1}fail} + +tls_verify_hosts = * +tls_verify_certificates = ${if eq {SERVER}{server}{DIR/aux-fixed/cert2}fail} + +# ----- Routers ----- + +begin routers + +client: + driver = manualroute + condition = ${if eq {SERVER}{server}{no}{yes}} + route_list = * 127.0.0.1 + self = send + transport = my_smtp + no_more + +server: + driver = redirect + data = :blackhole: + + +# ----- Transports ----- + +begin transports + +my_smtp: + driver = smtp + port = PORT_D + socks_proxy = 127.0.0.1 port=1080 OPT + tls_certificate = DIR/aux-fixed/cert2 + tls_privatekey = DIR/aux-fixed/cert2 + tls_verify_certificates = DIR/aux-fixed/cert2 + tls_try_verify_hosts = * + + + +# End + diff --git a/test/log/4020 b/test/log/4020 new file mode 100644 index 000000000..f289beffd --- /dev/null +++ b/test/log/4020 @@ -0,0 +1,6 @@ +1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local-esmtp S=sss +1999-03-02 09:44:33 10HmaX-0005vi-00 => userx@test.ex R=my_main_router T=my_smtp H=127.0.0.1 [127.0.0.1] C="250 accepted OK" +1999-03-02 09:44:33 10HmaX-0005vi-00 Completed +1999-03-02 09:44:33 10HmaY-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local-esmtp S=sss +1999-03-02 09:44:33 10HmaY-0005vi-00 => userx@test.ex R=my_main_router T=my_smtp H=127.0.0.1 [127.0.0.1] C="250 accepted OK" +1999-03-02 09:44:33 10HmaY-0005vi-00 Completed diff --git a/test/log/4028 b/test/log/4028 new file mode 100644 index 000000000..373bdf0c8 --- /dev/null +++ b/test/log/4028 @@ -0,0 +1,9 @@ +1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local-esmtp S=sss +1999-03-02 09:44:33 10HmaX-0005vi-00 => userx@test.ex R=client T=my_smtp H=127.0.0.1 [127.0.0.1] X=TLS1.x:xxxxRSA_AES_256_CBC_SHAnnn:256 CV=no DN="C=UK,O=The Exim Maintainers,OU=Test Suite,CN=Phil Pennock" C="250 OK id=10HmaY-0005vi-00" +1999-03-02 09:44:33 10HmaX-0005vi-00 Completed + +******** SERVER ******** +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 <= CALLER@myhost.test.ex H=localhost (myhost.test.ex) [127.0.0.1] P=esmtps X=TLS1.x:xxxxRSA_AES_256_CBC_SHAnnn:256 CV=yes DN="C=UK,O=The Exim Maintainers,OU=Test Suite,CN=Phil Pennock" S=sss id=E10HmaX-0005vi-00@myhost.test.ex +1999-03-02 09:44:33 10HmaY-0005vi-00 => :blackhole: <userx@test.ex> R=server +1999-03-02 09:44:33 10HmaY-0005vi-00 Completed diff --git a/test/log/4029 b/test/log/4029 new file mode 100644 index 000000000..a2ef850f1 --- /dev/null +++ b/test/log/4029 @@ -0,0 +1,11 @@ +1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local-esmtp S=sss +1999-03-02 09:44:33 10HmaX-0005vi-00 [127.0.0.1] SSL verify error: depth=0 error=self signed certificate cert=/C=UK/O=The Exim Maintainers/OU=Test Suite/CN=Phil Pennock +1999-03-02 09:44:33 10HmaX-0005vi-00 [127.0.0.1] SSL verify error: certificate name mismatch: "/C=UK/O=The Exim Maintainers/OU=Test Suite/CN=Phil Pennock" +1999-03-02 09:44:33 10HmaX-0005vi-00 => userx@test.ex R=client T=my_smtp H=127.0.0.1 [127.0.0.1] X=TLSv1:AES256-SHA:256 CV=no DN="/C=UK/O=The Exim Maintainers/OU=Test Suite/CN=Phil Pennock" C="250 OK id=10HmaY-0005vi-00" +1999-03-02 09:44:33 10HmaX-0005vi-00 Completed + +******** SERVER ******** +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 <= CALLER@myhost.test.ex H=localhost (myhost.test.ex) [127.0.0.1] P=esmtps X=TLSv1:AES256-SHA:256 CV=yes DN="/C=UK/O=The Exim Maintainers/OU=Test Suite/CN=Phil Pennock" S=sss id=E10HmaX-0005vi-00@myhost.test.ex +1999-03-02 09:44:33 10HmaY-0005vi-00 => :blackhole: <userx@test.ex> R=server +1999-03-02 09:44:33 10HmaY-0005vi-00 Completed diff --git a/test/scripts/2000-GnuTLS/2000 b/test/scripts/2000-GnuTLS/2000 index c8dcb6a84..a1299e574 100644 --- a/test/scripts/2000-GnuTLS/2000 +++ b/test/scripts/2000-GnuTLS/2000 @@ -1,7 +1,7 @@ # TLS client: TLS setup fails - retry in clear # # For this first GnuTLS test, we do not obey "gnutls", so that Exim has to -# create the GnuTLS paramter data for itself. +# create the GnuTLS parameter data for itself. # echo ==> Creating GnuTLS parameter data ... exim -DSERVER=server -bd -oX PORT_D diff --git a/test/scripts/2000-GnuTLS/2018 b/test/scripts/2000-GnuTLS/2018 index ac6049fd8..3f06e59e8 100644 --- a/test/scripts/2000-GnuTLS/2018 +++ b/test/scripts/2000-GnuTLS/2018 @@ -1,4 +1,4 @@ -# TLS: ACL encryption test +# TLS ACL encryption test gnutls exim -DSERVER=server -bd -oX PORT_D **** diff --git a/test/scripts/4000-scanning/4006 b/test/scripts/4000-scanning/4006 index 1adf8b136..a58188c95 100644 --- a/test/scripts/4000-scanning/4006 +++ b/test/scripts/4000-scanning/4006 @@ -59,7 +59,7 @@ server DIR/eximdir/avast_sock >LF>220 ready <SCAN >LF>210 SCAN DATA ->LF>b\ l\ a\ h [L]9.9 9 VNAME +>LF>b\\ l\\ a\\ h [L]9.9 9 VNAME >LF>200 SCAN OK <QUIT <*eof diff --git a/test/scripts/4020-socks/4020 b/test/scripts/4020-socks/4020 new file mode 100644 index 000000000..49d97c05f --- /dev/null +++ b/test/scripts/4020-socks/4020 @@ -0,0 +1,85 @@ +# socks5 proxy on smtp transport +# +munge loopback +# +# auth: null +server PORT_S +<<\x05\x01\x00 +>>\x05\x00 +<<\x05\x01\x00\x01\x7f\x00\x00\x01\x04\xc8 +>>\x05\x00\x00\x01\x7f\x00\x00\x01\xbe\xef +220 Connected OK +EHLO +250-server id +250 +MAIL FROM +250 +RCPT TO +250 +DATA +354 hit me +. +250 accepted OK +QUIT +250 bye +**** +# +# +# +exim -odi -bs -DOPT= +ehlo test.ex +mail from:<> +rcpt to:<userx@test.ex> +data +Date: Fri, 17 Dec 2004 14:35:01 +0100 +Subject: message should be sent + +via null-auth proxy +. +quit +**** +# +# +# +# auth: username/password +server PORT_S +<<\x05\x01\x02 +>>\x05\x02 +<<\x01\x04fred\x05fubar +>>\x01\x00 +<<\x05\x01\x00\x01\x7f\x00\x00\x01\x04\xc8 +>>\x05\x00\x00\x01\x7f\x00\x00\x01\xbe\xef +220 Connected OK +EHLO +250-server id +250 +MAIL FROM +250 +RCPT TO +250 +DATA +354 hit me +. +250 accepted OK +QUIT +250 bye +**** +# +# +# +exim -odi -bs -DOPT="auth=name name=fred pass=fubar" +ehlo test.ex +mail from:<> +rcpt to:<userx@test.ex> +data +Date: Fri, 17 Dec 2004 14:35:01 +0100 +Subject: message should be sent + +via name/pwd-auth proxy +. +quit +**** +# +# +# + diff --git a/test/scripts/4020-socks/REQUIRES b/test/scripts/4020-socks/REQUIRES new file mode 100644 index 000000000..135603c74 --- /dev/null +++ b/test/scripts/4020-socks/REQUIRES @@ -0,0 +1 @@ +support Experimental_SOCKS diff --git a/test/scripts/4028-GnuTLS-socks/4028 b/test/scripts/4028-GnuTLS-socks/4028 new file mode 100644 index 000000000..1692beaa8 --- /dev/null +++ b/test/scripts/4028-GnuTLS-socks/4028 @@ -0,0 +1,30 @@ +# socks5 proxy on smtp/starttls transport +# +munge loopback +gnutls +# +# a TLS-capable server to receive the mail +exim -DSERVER=server -bd -oX PORT_D +**** +# +# +# THIS TEST ASSUMES we have a socks proxy +# running and listening on 1080 +# +# a mail sender +exim -odi -bs -DOPT= +ehlo test.ex +mail from:<> +rcpt to:<userx@test.ex> +data +Date: Fri, 17 Dec 2004 14:35:01 +0100 +Subject: message should be sent + +via null-auth proxy +. +quit +**** +# +# +killdaemon +no_msglog_check diff --git a/test/scripts/4028-GnuTLS-socks/REQUIRES b/test/scripts/4028-GnuTLS-socks/REQUIRES new file mode 100644 index 000000000..0b41941ac --- /dev/null +++ b/test/scripts/4028-GnuTLS-socks/REQUIRES @@ -0,0 +1,4 @@ +support Experimental_SOCKS +support GnuTLS +running IPv4 +running socks diff --git a/test/scripts/4029-OpenSSL-socks/4029 b/test/scripts/4029-OpenSSL-socks/4029 new file mode 100644 index 000000000..ac87b376f --- /dev/null +++ b/test/scripts/4029-OpenSSL-socks/4029 @@ -0,0 +1,30 @@ +# socks5 proxy on smtp/starttls transport +# +munge loopback +# +# +# a TLS-capable server to receive the mail +exim -DSERVER=server -bd -oX PORT_D +**** +# +# +# THIS TEST ASSUMES we have a socks proxy +# running and listening on 1080 +# +# a mail sender +exim -odi -bs -DOPT= +ehlo test.ex +mail from:<> +rcpt to:<userx@test.ex> +data +Date: Fri, 17 Dec 2004 14:35:01 +0100 +Subject: message should be sent + +via null-auth proxy +. +quit +**** +# +# +killdaemon +no_msglog_check diff --git a/test/scripts/4029-OpenSSL-socks/REQUIRES b/test/scripts/4029-OpenSSL-socks/REQUIRES new file mode 100644 index 000000000..b24bbd9a0 --- /dev/null +++ b/test/scripts/4029-OpenSSL-socks/REQUIRES @@ -0,0 +1,4 @@ +support Experimental_SOCKS +support OpenSSL +running IPv4 +running socks diff --git a/test/src/server.c b/test/src/server.c index f4173ecd8..e425880a8 100644 --- a/test/src/server.c +++ b/test/src/server.c @@ -57,6 +57,7 @@ on all interfaces, unless the option -noipv6 is given. */ typedef struct line { struct line *next; + unsigned len; char line[1]; } line; @@ -123,6 +124,25 @@ return buffer; } + +static void +printit(char * s, int n) +{ +while(n--) + { + unsigned char c = *s++; + if (c == '\\') + printf("\\\\"); + else if (c >= ' ' && c <= '~') /* assumes ascii */ + putchar(c); + else + printf("\\x%02x", c); + } +putchar('\n'); +} + + + /************************************************* * Main Program * *************************************************/ @@ -152,6 +172,7 @@ line *script = NULL; line *last = NULL; line *s; FILE *in, *out; +int linebuf = 1; char *sockname = NULL; unsigned char buffer[10240]; @@ -394,18 +415,39 @@ script of things to do. A line containing "++++" is treated as end of file. This is so that the Perl driving script doesn't have to close the pipe - because that would cause it to wait for this process, which it doesn't yet want to do. The driving script adds the "++++" automatically - it doesn't actually -appear in the test script. */ +appear in the test script. Within lines we interpret \xNN and \\ groups */ while (fgets(CS buffer, sizeof(buffer), stdin) != NULL) { line *next; + char * d; int n = (int)strlen(CS buffer); + + if (n > 1 && buffer[0] == '>' && buffer[1] == '>') + linebuf = 0; while (n > 0 && isspace(buffer[n-1])) n--; buffer[n] = 0; if (strcmp(CS buffer, "++++") == 0) break; next = malloc(sizeof(line) + n); next->next = NULL; - strcpy(next->line, CS buffer); + d = next->line; + { + char * s = CS buffer; + do + { + char ch; + char cl = *s; + if (cl == '\\' && (cl = *++s) == 'x') + { + if ((ch = *++s - '0') > 9 && (ch -= 'A'-'9'-1) > 15) ch -= 'a'-'A'; + if ((cl = *++s - '0') > 9 && (cl -= 'A'-'9'-1) > 15) cl -= 'a'-'A'; + cl |= ch << 4; + } + *d++ = cl; + } + while (*s++); + } + next->len = d - next->line - 1; if (last == NULL) script = last = next; else last->next = next; last = next; @@ -529,7 +571,8 @@ for (count = 0; count < connection_count; count++) if (ss[0] == '>') { char *end = "\r\n"; - printf("%s\n", ss++); + unsigned len = s->len; + printit(ss++, len--); if (strncmp(ss, "*eof", 4) == 0) { @@ -538,13 +581,14 @@ for (count = 0; count < connection_count; count++) } if (*ss == '>') - { end = ""; ss++; } + { end = ""; ss++; len--; } else if (strncmp(ss, "CR>", 3) == 0) - { end = "\r"; ss += 3; } + { end = "\r"; ss += 3; len -= 3; } else if (strncmp(ss, "LF>", 3) == 0) - { end = "\n"; ss += 3; } + { end = "\n"; ss += 3; len -= 3; } - fprintf(out, "%s%s", ss, end); + fwrite(ss, 1, len, out); + if (*end) fprintf(out, end); } else if (isdigit((unsigned char)ss[0])) @@ -569,47 +613,93 @@ for (count = 0; count < connection_count; count++) connection. Read command line or data lines; the latter are indicated by the expected line being just ".". If the line starts with '<', that doesn't form part of the expected input. (This allows for incoming data - starting with a digit.) */ + starting with a digit.) If the line starts with '<<' we operate in + unbuffered rather than line mode and assume that a single read gets the + entire message. */ else { int offset; int data = strcmp(ss, ".") == 0; - if (ss[0] == '<') + if (ss[0] != '<') + offset = 0; + else { buffer[0] = '<'; - offset = 1; + if (ss[1] != '<') + offset = 1; + else + { + buffer[1] = '<'; + offset = 2; + } } - else offset = 0; fflush(out); - for (;;) - { - int n; - alarm(timeout); - if (fgets(CS buffer+offset, sizeof(buffer)-offset, in) == NULL) - { - printf("%sxpected EOF read from client\n", - (strncmp(ss, "*eof", 4) == 0)? "E" : "Une"); - s = s->next; - goto END_OFF; - } - alarm(0); - n = (int)strlen(CS buffer); - while (n > 0 && isspace(buffer[n-1])) n--; - buffer[n] = 0; - printf("%s\n", buffer); - if (!data || strcmp(CS buffer, ".") == 0) break; - } - - if (strncmp(ss, CS buffer, (int)strlen(ss)) != 0) - { - printf("Comparison failed - bailing out\n"); - printf("Expected: %s\n", ss); - break; - } + if (!linebuf) + { + int n; + char c; + + alarm(timeout); + n = read(dup_accept_socket, CS buffer+offset, s->len - offset); + if (n == 0) + { + printf("%sxpected EOF read from client\n", + (strncmp(ss, "*eof", 4) == 0)? "E" : "Une"); + s = s->next; + goto END_OFF; + } + if (offset != 2) + while (read(dup_accept_socket, &c, 1) == 1 && c != '\n') ; + alarm(0); + n += offset; + + printit(buffer, n); + + if (data) do + { + n = (read(dup_accept_socket, &c, 1) == 1 && c == '.'); + while (c != '\n' && read(dup_accept_socket, &c, 1) == 1) + ; + } while (!n); + else if (memcmp(ss, buffer, n) != 0) + { + printf("Comparison failed - bailing out\nExpected: "); + printit(ss, n); + break; + } + } + else + { + for (;;) + { + int n; + alarm(timeout); + if (fgets(CS buffer+offset, sizeof(buffer)-offset, in) == NULL) + { + printf("%sxpected EOF read from client\n", + (strncmp(ss, "*eof", 4) == 0)? "E" : "Une"); + s = s->next; + goto END_OFF; + } + alarm(0); + n = (int)strlen(CS buffer); + while (n > 0 && isspace(buffer[n-1])) n--; + buffer[n] = 0; + printf("%s\n", buffer); + if (!data || strcmp(CS buffer, ".") == 0) break; + } + + if (strncmp(ss, CS buffer, (int)strlen(ss)) != 0) + { + printf("Comparison failed - bailing out\n"); + printf("Expected: %s\n", ss); + break; + } + } } } diff --git a/test/stdout/0259 b/test/stdout/0259 index c4f4ea083..b65d88452 100644 --- a/test/stdout/0259 +++ b/test/stdout/0259 @@ -69,7 +69,7 @@ End of script Listening on port 1413 ... Connection request from [127.0.0.1] <999 , 25 ->999 , 25 : USERID : UNIX :ab
cd +>999 , 25 : USERID : UNIX :ab\x0dcd End of script Listening on port 1413 ... Connection request from [127.0.0.1] diff --git a/test/stdout/4003 b/test/stdout/4003 index f27d19238..e705096f6 100644 --- a/test/stdout/4003 +++ b/test/stdout/4003 @@ -68,7 +68,7 @@ Connection request <SCAN TESTSUITE/spool/scan/10HmbB-0005vi-00/10HmbB-0005vi-00.eml >LF>random ignored line >LF>random ignored line 2 ->LF>OK Scan ok. +>LF>OK\x09Scan ok. Expected EOF read from client End of script Listening on TESTSUITE/eximdir/fsec_sock ... @@ -82,8 +82,8 @@ Connection request <CONFIGURE MIME 1 >ignored_response <SCAN TESTSUITE/spool/scan/10HmaZ-0005vi-00/10HmaZ-0005vi-00.eml ->LF>xxxINFECTED blah VNAME blah ->LF>OK Scan ok. +>LF>xxxINFECTED\x09blah\x09VNAME\x09blah +>LF>OK\x09Scan ok. Expected EOF read from client End of script Listening on TESTSUITE/eximdir/fsec_sock ... @@ -105,7 +105,7 @@ Connection request <CONFIGURE MIME 1 >ignored_response <SCAN TESTSUITE/spool/scan/10HmbA-0005vi-00/10HmbA-0005vi-00.eml ->LF>xxxINFECTED blah VNAME blah ->LF>OK Scan ok. +>LF>xxxINFECTED\x09blah\x09VNAME\x09blah +>LF>OK\x09Scan ok. Expected EOF read from client End of script diff --git a/test/stdout/4006 b/test/stdout/4006 index bd18c9562..19e0f305b 100644 --- a/test/stdout/4006 +++ b/test/stdout/4006 @@ -63,7 +63,7 @@ Connection request >LF>200 FLAGS OK <SCAN TESTSUITE/spool/scan/10HmbB-0005vi-00 >LF>210 SCAN DATA ->LF>blah [+] +>LF>blah\x09[+] >LF>200 SCAN OK <QUIT Unexpected EOF read from client @@ -73,7 +73,7 @@ Connection request >LF>220 ready <SCAN TESTSUITE/spool/scan/10HmaX-0005vi-00 >LF>210 SCAN DATA ->LF>blah [E] +>LF>blah\x09[E] >LF>200 SCAN OK Unexpected EOF read from client Listening on TESTSUITE/eximdir/avast_sock ... @@ -81,7 +81,7 @@ Connection request >LF>220 ready <SCAN TESTSUITE/spool/scan/10HmbA-0005vi-00 >LF>210 SCAN DATA ->LF>b\ l\ a\ h [L]9.9 9 VNAME +>LF>b\\ l\\ a\\ h\x09[L]9.9\x099 VNAME >LF>200 SCAN OK Unexpected EOF read from client Listening on TESTSUITE/eximdir/avast_sock ... diff --git a/test/stdout/4020 b/test/stdout/4020 new file mode 100644 index 000000000..720c954fd --- /dev/null +++ b/test/stdout/4020 @@ -0,0 +1,68 @@ +220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250-myhost.test.ex Hello CALLER at test.ex
+250-SIZE 52428800
+250-8BITMIME
+250-PIPELINING
+250 HELP
+250 OK
+250 Accepted
+354 Enter message, ending with "." on a line by itself
+250 OK id=10HmaX-0005vi-00
+221 myhost.test.ex closing connection
+220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250-myhost.test.ex Hello CALLER at test.ex
+250-SIZE 52428800
+250-8BITMIME
+250-PIPELINING
+250 HELP
+250 OK
+250 Accepted
+354 Enter message, ending with "." on a line by itself
+250 OK id=10HmaY-0005vi-00
+221 myhost.test.ex closing connection
+ +******** SERVER ******** +Listening on port 1224 ... +Connection request from [ip4.ip4.ip4.ip4] +<<\x05\x01\x00 +>>\x05\x00 +<<\x05\x01\x00\x01\x7f\x00\x00\x01\x04\xc8 +>>\x05\x00\x00\x01\x7f\x00\x00\x01\xbe\xef +220 Connected OK +EHLO +250-server id +250 +MAIL FROM +250 +RCPT TO +250 +DATA +354 hit me +R +250 accepted OK +QUIT +250 bye +End of script +Listening on port 1224 ... +Connection request from [ip4.ip4.ip4.ip4] +<<\x05\x01\x02 +>>\x05\x02 +<<\x01\x04fred\x05fubar +>>\x01\x00 +<<\x05\x01\x00\x01\x7f\x00\x00\x01\x04\xc8 +>>\x05\x00\x00\x01\x7f\x00\x00\x01\xbe\xef +220 Connected OK +EHLO +250-server id +250 +MAIL FROM +250 +RCPT TO +250 +DATA +354 hit me +R +250 accepted OK +QUIT +250 bye +End of script diff --git a/test/stdout/4028 b/test/stdout/4028 new file mode 100644 index 000000000..9c94d76e6 --- /dev/null +++ b/test/stdout/4028 @@ -0,0 +1,12 @@ +220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250-myhost.test.ex Hello CALLER at test.ex
+250-SIZE 52428800
+250-8BITMIME
+250-PIPELINING
+250-STARTTLS
+250 HELP
+250 OK
+250 Accepted
+354 Enter message, ending with "." on a line by itself
+250 OK id=10HmaX-0005vi-00
+221 myhost.test.ex closing connection
diff --git a/test/stdout/4029 b/test/stdout/4029 new file mode 100644 index 000000000..9c94d76e6 --- /dev/null +++ b/test/stdout/4029 @@ -0,0 +1,12 @@ +220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250-myhost.test.ex Hello CALLER at test.ex
+250-SIZE 52428800
+250-8BITMIME
+250-PIPELINING
+250-STARTTLS
+250 HELP
+250 OK
+250 Accepted
+354 Enter message, ending with "." on a line by itself
+250 OK id=10HmaX-0005vi-00
+221 myhost.test.ex closing connection
|