Testsuite: move testcase (requires plaintext authenticator)

diff --git a/test/confs/0568 b/test/confs/0568
deleted file mode 100644 (file)
index dec5b0d..0000000
--- a/test/confs/0568
+++ /dev/null
@@ -1,70 +0,0 @@
-# Exim test configuration 0568
-# Recipient callout with AUTH
-
-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 = check_rcpt
-
-queue_only
-
-
-# ----- Authentication -----
-
-begin authenticators
-
-plain:
-  driver = plaintext
-  public_name = PLAIN
-  client_send = ^userx^secret
-  server_advertise_condition = yes
-  server_prompts =             :
-  server_condition =           yes
-  server_set_id =              $auth2
-
-
-# ----- ACLs -----
-
-begin acl
-
-check_rcpt:
-  accept  verify = recipient/callout
-
-
-# ----- Routers -----
-
-begin routers
-
-r1:
-  driver = accept
-  transport = ${if eq{force}{$domain} {t2}{t1}}
-
-
-# ----- Transports -----
-
-begin transports
-
-t1:
-  driver = smtp
-  hosts = 127.0.0.1
-  port = PORT_S
-  allow_localhost
-  hosts_try_auth = *
-
-t2:
-  driver = smtp
-  hosts = 127.0.0.1
-  port = PORT_S
-  allow_localhost
-  hosts_try_auth = *
-  authenticated_sender= brian
-
-# End

diff --git a/test/confs/3416 b/test/confs/3416
new file mode 100644 (file)
index 0000000..c5589de
--- /dev/null
+++ b/test/confs/3416
@@ -0,0 +1,70 @@
+# Exim test configuration 3416
+# Recipient callout with AUTH
+
+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 = check_rcpt
+
+queue_only
+
+
+# ----- Authentication -----
+
+begin authenticators
+
+plain:
+  driver = plaintext
+  public_name = PLAIN
+  client_send = ^userx^secret
+  server_advertise_condition = yes
+  server_prompts =             :
+  server_condition =           yes
+  server_set_id =              $auth2
+
+
+# ----- ACLs -----
+
+begin acl
+
+check_rcpt:
+  accept  verify = recipient/callout
+
+
+# ----- Routers -----
+
+begin routers
+
+r1:
+  driver = accept
+  transport = ${if eq{force}{$domain} {t2}{t1}}
+
+
+# ----- Transports -----
+
+begin transports
+
+t1:
+  driver = smtp
+  hosts = 127.0.0.1
+  port = PORT_S
+  allow_localhost
+  hosts_try_auth = *
+
+t2:
+  driver = smtp
+  hosts = 127.0.0.1
+  port = PORT_S
+  allow_localhost
+  hosts_try_auth = *
+  authenticated_sender= brian
+
+# End

diff --git a/test/scripts/0000-Basic/0568 b/test/scripts/0000-Basic/0568
deleted file mode 100644 (file)
index 2aa86f4..0000000
--- a/test/scripts/0000-Basic/0568
+++ /dev/null
@@ -1,76 +0,0 @@
-# Recipient callout with AUTH
-need_ipv4
-#
-# Variant 1: using authenticated_sender on the transport.
-server PORT_S 1
-220 Welcome
-EHLO
-250-wotcher mate
-250-AUTH PLAIN
-250 Hi
-AUTH
-250 Oh alright then
-MAIL FROM
-250 OK
-RCPT TO
-250 OK
-QUIT
-250 OK
-****
-exim -odq -bs
-EHLO the.client
-mail from:<>
-RCPT TO:<abc@force> 
-quit
-****
-#
-#
-# Variant 2: Passing through an authenticated_sender from the MAIL FROM:
-server PORT_S 1
-220 Welcome
-EHLO
-250-wotcher mate
-250-AUTH PLAIN
-250 Hi
-AUTH
-250 Oh alright then
-MAIL FROM
-250 OK
-RCPT TO
-250 OK
-QUIT
-250 OK
-****
-exim -odq -bs
-EHLO the.client
-AUTH PLAIN AHVzZXJ4AHNlY3JldA==
-mail from:<> AUTH=freddy
-RCPT TO:<abc@normal> 
-quit
-****
-#
-#
-# Variant 3: An authenticated_sender option on the transport should override
-# a value set by the MAIL FROM:
-server PORT_S 1
-220 Welcome
-EHLO
-250-wotcher mate
-250-AUTH PLAIN
-250 Hi
-AUTH
-250 Oh alright then
-MAIL FROM
-250 OK
-RCPT TO
-250 OK
-QUIT
-250 OK
-****
-exim -odq -bs
-EHLO the.client
-AUTH PLAIN AHVzZXJ4AHNlY3JldA==
-mail from:<> AUTH=freddy
-RCPT TO:<def@force> 
-quit
-****

diff --git a/test/scripts/3400-plaintext/3416 b/test/scripts/3400-plaintext/3416
new file mode 100644 (file)
index 0000000..2aa86f4
--- /dev/null
+++ b/test/scripts/3400-plaintext/3416
@@ -0,0 +1,76 @@
+# Recipient callout with AUTH
+need_ipv4
+#
+# Variant 1: using authenticated_sender on the transport.
+server PORT_S 1
+220 Welcome
+EHLO
+250-wotcher mate
+250-AUTH PLAIN
+250 Hi
+AUTH
+250 Oh alright then
+MAIL FROM
+250 OK
+RCPT TO
+250 OK
+QUIT
+250 OK
+****
+exim -odq -bs
+EHLO the.client
+mail from:<>
+RCPT TO:<abc@force> 
+quit
+****
+#
+#
+# Variant 2: Passing through an authenticated_sender from the MAIL FROM:
+server PORT_S 1
+220 Welcome
+EHLO
+250-wotcher mate
+250-AUTH PLAIN
+250 Hi
+AUTH
+250 Oh alright then
+MAIL FROM
+250 OK
+RCPT TO
+250 OK
+QUIT
+250 OK
+****
+exim -odq -bs
+EHLO the.client
+AUTH PLAIN AHVzZXJ4AHNlY3JldA==
+mail from:<> AUTH=freddy
+RCPT TO:<abc@normal> 
+quit
+****
+#
+#
+# Variant 3: An authenticated_sender option on the transport should override
+# a value set by the MAIL FROM:
+server PORT_S 1
+220 Welcome
+EHLO
+250-wotcher mate
+250-AUTH PLAIN
+250 Hi
+AUTH
+250 Oh alright then
+MAIL FROM
+250 OK
+RCPT TO
+250 OK
+QUIT
+250 OK
+****
+exim -odq -bs
+EHLO the.client
+AUTH PLAIN AHVzZXJ4AHNlY3JldA==
+mail from:<> AUTH=freddy
+RCPT TO:<def@force> 
+quit
+****

diff --git a/test/stdout/0568 b/test/stdout/0568
deleted file mode 100644 (file)
index 671998a..0000000
--- a/test/stdout/0568
+++ /dev/null
@@ -1,82 +0,0 @@
-220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
-250-myhost.test.ex Hello CALLER at the.client\r
-250-SIZE 52428800\r
-250-8BITMIME\r
-250-PIPELINING\r
-250-AUTH PLAIN\r
-250 HELP\r
-250 OK\r
-250 Accepted\r
-221 myhost.test.ex closing connection\r
-220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
-250-myhost.test.ex Hello CALLER at the.client\r
-250-SIZE 52428800\r
-250-8BITMIME\r
-250-PIPELINING\r
-250-AUTH PLAIN\r
-250 HELP\r
-235 Authentication succeeded\r
-250 OK\r
-250 Accepted\r
-221 myhost.test.ex closing connection\r
-220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
-250-myhost.test.ex Hello CALLER at the.client\r
-250-SIZE 52428800\r
-250-8BITMIME\r
-250-PIPELINING\r
-250-AUTH PLAIN\r
-250 HELP\r
-235 Authentication succeeded\r
-250 OK\r
-250 Accepted\r
-221 myhost.test.ex closing connection\r
-
-******** SERVER ********
-Listening on port 1224 ... 
-Connection request from [127.0.0.1]
-220 Welcome
-EHLO myhost.test.ex
-250-wotcher mate
-250-AUTH PLAIN
-250 Hi
-AUTH PLAIN AHVzZXJ4AHNlY3JldA==
-250 Oh alright then
-MAIL FROM:<> AUTH=brian
-250 OK
-RCPT TO:<abc@force>
-250 OK
-QUIT
-250 OK
-End of script
-Listening on port 1224 ... 
-Connection request from [127.0.0.1]
-220 Welcome
-EHLO myhost.test.ex
-250-wotcher mate
-250-AUTH PLAIN
-250 Hi
-AUTH PLAIN AHVzZXJ4AHNlY3JldA==
-250 Oh alright then
-MAIL FROM:<> AUTH=freddy
-250 OK
-RCPT TO:<abc@normal>
-250 OK
-QUIT
-250 OK
-End of script
-Listening on port 1224 ... 
-Connection request from [127.0.0.1]
-220 Welcome
-EHLO myhost.test.ex
-250-wotcher mate
-250-AUTH PLAIN
-250 Hi
-AUTH PLAIN AHVzZXJ4AHNlY3JldA==
-250 Oh alright then
-MAIL FROM:<> AUTH=brian
-250 OK
-RCPT TO:<def@force>
-250 OK
-QUIT
-250 OK
-End of script

diff --git a/test/stdout/3416 b/test/stdout/3416
new file mode 100644 (file)
index 0000000..671998a
--- /dev/null
+++ b/test/stdout/3416
@@ -0,0 +1,82 @@
+220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
+250-myhost.test.ex Hello CALLER at the.client\r
+250-SIZE 52428800\r
+250-8BITMIME\r
+250-PIPELINING\r
+250-AUTH PLAIN\r
+250 HELP\r
+250 OK\r
+250 Accepted\r
+221 myhost.test.ex closing connection\r
+220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
+250-myhost.test.ex Hello CALLER at the.client\r
+250-SIZE 52428800\r
+250-8BITMIME\r
+250-PIPELINING\r
+250-AUTH PLAIN\r
+250 HELP\r
+235 Authentication succeeded\r
+250 OK\r
+250 Accepted\r
+221 myhost.test.ex closing connection\r
+220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
+250-myhost.test.ex Hello CALLER at the.client\r
+250-SIZE 52428800\r
+250-8BITMIME\r
+250-PIPELINING\r
+250-AUTH PLAIN\r
+250 HELP\r
+235 Authentication succeeded\r
+250 OK\r
+250 Accepted\r
+221 myhost.test.ex closing connection\r
+
+******** SERVER ********
+Listening on port 1224 ... 
+Connection request from [127.0.0.1]
+220 Welcome
+EHLO myhost.test.ex
+250-wotcher mate
+250-AUTH PLAIN
+250 Hi
+AUTH PLAIN AHVzZXJ4AHNlY3JldA==
+250 Oh alright then
+MAIL FROM:<> AUTH=brian
+250 OK
+RCPT TO:<abc@force>
+250 OK
+QUIT
+250 OK
+End of script
+Listening on port 1224 ... 
+Connection request from [127.0.0.1]
+220 Welcome
+EHLO myhost.test.ex
+250-wotcher mate
+250-AUTH PLAIN
+250 Hi
+AUTH PLAIN AHVzZXJ4AHNlY3JldA==
+250 Oh alright then
+MAIL FROM:<> AUTH=freddy
+250 OK
+RCPT TO:<abc@normal>
+250 OK
+QUIT
+250 OK
+End of script
+Listening on port 1224 ... 
+Connection request from [127.0.0.1]
+220 Welcome
+EHLO myhost.test.ex
+250-wotcher mate
+250-AUTH PLAIN
+250 Hi
+AUTH PLAIN AHVzZXJ4AHNlY3JldA==
+250 Oh alright then
+MAIL FROM:<> AUTH=brian
+250 OK
+RCPT TO:<def@force>
+250 OK
+QUIT
+250 OK
+End of script