hosts_require_helo

diff --git a/doc/doc-docbook/spec.xfpt b/doc/doc-docbook/spec.xfpt
index b462f675869364e900e5ad4963bf1a9b715c5422..0915da3e67329db3b5b237cf5d71c02e91835304 100644 (file)
--- a/doc/doc-docbook/spec.xfpt
+++ b/doc/doc-docbook/spec.xfpt
@@ -25641,6 +25641,11 @@ There will be no fallback to in-clear communication.
 See the &%dnssec_request_domains%& router and transport options.
 See section &<<SECDANE>>&.
 
 See the &%dnssec_request_domains%& router and transport options.
 See section &<<SECDANE>>&.
 

+.option hosts_require_helo smtp "host list&!!" *
+.cindex "HELO/EHLO" requiring
+Exim will require an accepted HELO or EHLO command from a host matching
+this list, before accepting a MAIL command.
+

 .option hosts_require_ocsp smtp "host list&!!" unset
 .cindex "TLS" "requiring for certain servers"
 Exim will request, and check for a valid Certificate Status being given, on a
 .option hosts_require_ocsp smtp "host list&!!" unset
 .cindex "TLS" "requiring for certain servers"
 Exim will request, and check for a valid Certificate Status being given, on a

diff --git a/doc/doc-txt/NewStuff b/doc/doc-txt/NewStuff
index c5a70da539d3c7f7b8fb1b4fbdc1d132bc3b44ec..46a69c1d7e2cc7e6603e89e4d372e0cfb2c8b5a0 100644 (file)
--- a/doc/doc-txt/NewStuff
+++ b/doc/doc-txt/NewStuff
@@ -54,6 +54,8 @@ Version 4.95
 15. Main option "smtp_backlog_monitor", to set a level abve which listen
     socket backlogs are logged.
 
 15. Main option "smtp_backlog_monitor", to set a level abve which listen
     socket backlogs are logged.
 

+16. Main option "hosts_require_helo", requiring HELO or EHLO before MAIL.
+

 Version 4.94
 ------------
 
 Version 4.94
 ------------
 

diff --git a/doc/doc-txt/OptionLists.txt b/doc/doc-txt/OptionLists.txt
index 2f3435f1214d7a041a250cb5a986594bae5f4584..d7362efbe694e17fd659acf4655b174858550ef4 100644 (file)
--- a/doc/doc-txt/OptionLists.txt
+++ b/doc/doc-txt/OptionLists.txt
@@ -314,6 +314,7 @@ hosts_randomize                      boolean         false         manualroute
                                                      false         smtp              3.14
 hosts_require_auth                   host list       unset         smtp              4.00
 hosts_require_dane                   host list       unset         smtp              4.91 (4.85 experimental)
                                                      false         smtp              3.14
 hosts_require_auth                   host list       unset         smtp              4.00
 hosts_require_dane                   host list       unset         smtp              4.91 (4.85 experimental)

+hosts_require_helo                  host list       "*"           main              4.95

 hosts_require_ocsp                   host list       unset         smtp              4.82 if experimental_ocsp
 hosts_require_tls                    host list       unset         smtp              3.20
 hosts_treat_as_local                 domain list     unset         main              1.95
 hosts_require_ocsp                   host list       unset         smtp              4.82 if experimental_ocsp
 hosts_require_tls                    host list       unset         smtp              3.20
 hosts_treat_as_local                 domain list     unset         main              1.95

diff --git a/src/src/globals.c b/src/src/globals.c
index ef7063ddd7674a86a9ffbca13111a351b157ead8..e96586048a1998d845b5b6d1c2502ccfe4b69b7c 100644 (file)
--- a/src/src/globals.c
+++ b/src/src/globals.c
@@ -994,6 +994,7 @@ uschar *host_reject_connection = NULL;
 tree_node *hostlist_anchor     = NULL;
 int     hostlist_count         = 0;
 uschar *hosts_treat_as_local   = NULL;
 tree_node *hostlist_anchor     = NULL;
 int     hostlist_count         = 0;
 uschar *hosts_treat_as_local   = NULL;

+uschar *hosts_require_helo     = US"*";

 uschar *hosts_connection_nolog = NULL;
 
 int     ignore_bounce_errors_after = 10*7*24*60*60;  /* 10 weeks */
 uschar *hosts_connection_nolog = NULL;
 
 int     ignore_bounce_errors_after = 10*7*24*60*60;  /* 10 weeks */


@@ -1487,6 +1488,7 @@ FILE   *smtp_in                = NULL;
 int     smtp_listen_backlog    = 0;
 int     smtp_load_reserve      = -1;
 int     smtp_mailcmd_count     = 0;
 int     smtp_listen_backlog    = 0;
 int     smtp_load_reserve      = -1;
 int     smtp_mailcmd_count     = 0;

+int     smtp_mailcmd_max       = -1;

 FILE   *smtp_out               = NULL;
 uschar *smtp_etrn_command      = NULL;
 int     smtp_max_synprot_errors= 3;
 FILE   *smtp_out               = NULL;
 uschar *smtp_etrn_command      = NULL;
 int     smtp_max_synprot_errors= 3;

diff --git a/src/src/globals.h b/src/src/globals.h
index c7a2635afef0067ff70094345fa67d7f166aa654..937cce776c43d2e484675a1745c0a9806fb0f99c 100644 (file)
--- a/src/src/globals.h
+++ b/src/src/globals.h
@@ -640,6 +640,7 @@ extern uschar *host_lookup_order;      /* Order of host lookup types */
 extern uschar *host_lookup_msg;        /* Text for why it failed */
 extern int     host_number;            /* For sharing spools */
 extern uschar *host_number_string;     /* For expanding */
 extern uschar *host_lookup_msg;        /* Text for why it failed */
 extern int     host_number;            /* For sharing spools */
 extern uschar *host_number_string;     /* For expanding */

+extern uschar *hosts_require_helo;     /* check for HELO/EHLO before MAIL */

 extern uschar *host_reject_connection; /* Reject these hosts */
 extern tree_node *hostlist_anchor;     /* Tree of defined host lists */
 extern int     hostlist_count;         /* Number defined */
 extern uschar *host_reject_connection; /* Reject these hosts */
 extern tree_node *hostlist_anchor;     /* Tree of defined host lists */
 extern int     hostlist_count;         /* Number defined */


@@ -963,6 +964,7 @@ extern FILE   *smtp_in;                /* Incoming SMTP input file */
 extern int     smtp_listen_backlog;    /* Current listener socket backlog, if monitored */
 extern int     smtp_load_reserve;      /* Only from reserved if load > this */
 extern int     smtp_mailcmd_count;     /* Count of MAIL commands */
 extern int     smtp_listen_backlog;    /* Current listener socket backlog, if monitored */
 extern int     smtp_load_reserve;      /* Only from reserved if load > this */
 extern int     smtp_mailcmd_count;     /* Count of MAIL commands */

+extern int     smtp_mailcmd_max;       /* Limit for MAIL commands */

 extern int     smtp_max_synprot_errors;/* Max syntax/protocol errors */
 extern int     smtp_max_unknown_commands; /* As it says */
 extern uschar *smtp_names[];          /* decode for command codes */
 extern int     smtp_max_synprot_errors;/* Max syntax/protocol errors */
 extern int     smtp_max_unknown_commands; /* As it says */
 extern uschar *smtp_names[];          /* decode for command codes */

diff --git a/src/src/readconf.c b/src/src/readconf.c
index 6d7e7a19e884ed35051f542d4ee8b2f08b6eb72c..ae36fa0c5601db9e2872b91f56dcc7425775d2ca 100644 (file)
--- a/src/src/readconf.c
+++ b/src/src/readconf.c
@@ -181,6 +181,7 @@ static optionlist optionlist_config[] = {
 #ifdef SUPPORT_PROXY
   { "hosts_proxy",              opt_stringptr,   {&hosts_proxy} },
 #endif
 #ifdef SUPPORT_PROXY
   { "hosts_proxy",              opt_stringptr,   {&hosts_proxy} },
 #endif

+  { "hosts_require_helo",       opt_stringptr,   {&hosts_require_helo} },

   { "hosts_treat_as_local",     opt_stringptr,   {&hosts_treat_as_local} },
 #ifdef LOOKUP_IBASE
   { "ibase_servers",            opt_stringptr,   {&ibase_servers} },
   { "hosts_treat_as_local",     opt_stringptr,   {&hosts_treat_as_local} },
 #ifdef LOOKUP_IBASE
   { "ibase_servers",            opt_stringptr,   {&ibase_servers} },

diff --git a/src/src/smtp_in.c b/src/src/smtp_in.c
index 8e9b93ab39becb029e42667b79dd346ded61539e..1d7b222547485f2486d78405bbf776203f78b103 100644 (file)
--- a/src/src/smtp_in.c
+++ b/src/src/smtp_in.c
@@ -139,7 +139,7 @@ static struct {
 #endif
   BOOL dsn_advertised                  :1;
   BOOL esmtp                           :1;
 #endif
   BOOL dsn_advertised                  :1;
   BOOL esmtp                           :1;

-  BOOL helo_required                   :1;
+  BOOL helo_verify_required            :1;

   BOOL helo_verify                     :1;
   BOOL helo_seen                       :1;
   BOOL helo_accept_junk                        :1;
   BOOL helo_verify                     :1;
   BOOL helo_seen                       :1;
   BOOL helo_accept_junk                        :1;


@@ -153,7 +153,7 @@ static struct {
   BOOL smtputf8_advertised             :1;
 #endif
 } fl = {
   BOOL smtputf8_advertised             :1;
 #endif
 } fl = {

-  .helo_required = FALSE,
+  .helo_verify_required = FALSE,

   .helo_verify = FALSE,
   .smtp_exit_function_called = FALSE,
 };
   .helo_verify = FALSE,
   .smtp_exit_function_called = FALSE,
 };


@@ -2936,8 +2936,8 @@ if (!f.sender_host_unknown)
   /* Determine whether HELO/EHLO is required for this host. The requirement
   can be hard or soft. */
 
   /* Determine whether HELO/EHLO is required for this host. The requirement
   can be hard or soft. */
 

-  fl.helo_required = verify_check_host(&helo_verify_hosts) == OK;
-  if (!fl.helo_required)
+  fl.helo_verify_required = verify_check_host(&helo_verify_hosts) == OK;
+  if (!fl.helo_verify_required)

     fl.helo_verify = verify_check_host(&helo_try_verify_hosts) == OK;
 
   /* Determine whether this hosts is permitted to send syntactic junk
     fl.helo_verify = verify_check_host(&helo_try_verify_hosts) == OK;
 
   /* Determine whether this hosts is permitted to send syntactic junk


@@ -3981,7 +3981,6 @@ int
 smtp_setup_msg(void)
 {
 int done = 0;
 smtp_setup_msg(void)
 {
 int done = 0;

-int mailmax = -1;

 BOOL toomany = FALSE;
 BOOL discarded = FALSE;
 BOOL last_was_rej_mail = FALSE;
 BOOL toomany = FALSE;
 BOOL discarded = FALSE;
 BOOL last_was_rej_mail = FALSE;


@@ -4251,7 +4250,7 @@ while (done <= 0)
       /* If sender_host_unknown is true, we have got here via the -bs interface,
       not called from inetd. Otherwise, we are running an IP connection and the
       host address will be set. If the helo name is the primary name of this
       /* If sender_host_unknown is true, we have got here via the -bs interface,
       not called from inetd. Otherwise, we are running an IP connection and the
       host address will be set. If the helo name is the primary name of this

-      host and we haven't done a reverse lookup, force one now. If helo_required
+      host and we haven't done a reverse lookup, force one now. If helo_verify_required

       is set, ensure that the HELO name matches the actual host. If helo_verify
       is set, do the same check, but softly. */
 
       is set, ensure that the HELO name matches the actual host. If helo_verify
       is set, do the same check, but softly. */
 


@@ -4279,19 +4278,19 @@ while (done <= 0)
          tls_in.active.sock >= 0 ? " TLS" : "", host_and_ident(FALSE));
 
        /* Verify if configured. This doesn't give much security, but it does
          tls_in.active.sock >= 0 ? " TLS" : "", host_and_ident(FALSE));
 
        /* Verify if configured. This doesn't give much security, but it does

-       make some people happy to be able to do it. If helo_required is set,
+       make some people happy to be able to do it. If helo_verify_required is set,

        (host matches helo_verify_hosts) failure forces rejection. If helo_verify
        is set (host matches helo_try_verify_hosts), it does not. This is perhaps
        now obsolescent, since the verification can now be requested selectively
        at ACL time. */
 
        f.helo_verified = f.helo_verify_failed = sender_helo_dnssec = FALSE;
        (host matches helo_verify_hosts) failure forces rejection. If helo_verify
        is set (host matches helo_try_verify_hosts), it does not. This is perhaps
        now obsolescent, since the verification can now be requested selectively
        at ACL time. */
 
        f.helo_verified = f.helo_verify_failed = sender_helo_dnssec = FALSE;

-       if (fl.helo_required || fl.helo_verify)
+       if (fl.helo_verify_required || fl.helo_verify)

          {
          BOOL tempfail = !smtp_verify_helo();
          if (!f.helo_verified)
            {
          {
          BOOL tempfail = !smtp_verify_helo();
          if (!f.helo_verified)
            {

-           if (fl.helo_required)
+           if (fl.helo_verify_required)

              {
              smtp_printf("%d %s argument does not match calling host\r\n", FALSE,
                tempfail? 451 : 550, hello);
              {
              smtp_printf("%d %s argument does not match calling host\r\n", FALSE,
                tempfail? 451 : 550, hello);


@@ -4348,7 +4347,7 @@ while (done <= 0)
 #endif
 
       /* Expand the per-connection message count limit option */
 #endif
 
       /* Expand the per-connection message count limit option */

-      mailmax = expand_mailmax(smtp_accept_max_per_connection);
+      smtp_mailcmd_max = expand_mailmax(smtp_accept_max_per_connection);

 
       smtp_code = US"250 ";        /* Default response code plus space*/
       if (!user_msg)
 
       smtp_code = US"250 ";        /* Default response code plus space*/
       if (!user_msg)


@@ -4410,12 +4409,12 @@ while (done <= 0)
          }
 
 #ifdef EXPERIMENTAL_ESMTP_LIMITS
          }
 
 #ifdef EXPERIMENTAL_ESMTP_LIMITS

-       if (  (mailmax > 0 || recipients_max)
+       if (  (smtp_mailcmd_max > 0 || recipients_max)

           && verify_check_host(&limits_advertise_hosts) == OK)
          {
          g = string_fmt_append(g, "%.3s-LIMITS", smtp_code);
           && verify_check_host(&limits_advertise_hosts) == OK)
          {
          g = string_fmt_append(g, "%.3s-LIMITS", smtp_code);

-         if (mailmax > 0)
-           g = string_fmt_append(g, " MAILMAX=%d", mailmax);
+         if (smtp_mailcmd_max > 0)
+           g = string_fmt_append(g, " MAILMAX=%d", smtp_mailcmd_max);

          if (recipients_max)
            g = string_fmt_append(g, " RCPTMAX=%d", recipients_max);
          g = string_catn(g, US"\r\n", 2);
          if (recipients_max)
            g = string_fmt_append(g, " RCPTMAX=%d", recipients_max);
          g = string_catn(g, US"\r\n", 2);


@@ -4639,15 +4638,16 @@ while (done <= 0)
       env_mail_type_t * mail_args;       /* Sanity check & validate args */
 
       if (!fl.helo_seen)
       env_mail_type_t * mail_args;       /* Sanity check & validate args */
 
       if (!fl.helo_seen)

-       if (fl.helo_required)
+       if (  fl.helo_verify_required
+          || verify_check_host(&hosts_require_helo) == OK)

          {
          smtp_printf("503 HELO or EHLO required\r\n", FALSE);
          log_write(0, LOG_MAIN|LOG_REJECT, "rejected MAIL from %s: no "
            "HELO/EHLO given", host_and_ident(FALSE));
          break;
          }
          {
          smtp_printf("503 HELO or EHLO required\r\n", FALSE);
          log_write(0, LOG_MAIN|LOG_REJECT, "rejected MAIL from %s: no "
            "HELO/EHLO given", host_and_ident(FALSE));
          break;
          }

-       else if (mailmax < 0)
-         mailmax = expand_mailmax(smtp_accept_max_per_connection);
+       else if (smtp_mailcmd_max < 0)
+         smtp_mailcmd_max = expand_mailmax(smtp_accept_max_per_connection);

 
       if (sender_address)
        {
 
       if (sender_address)
        {


@@ -4666,7 +4666,7 @@ while (done <= 0)
       /* Check to see if the limit for messages per connection would be
       exceeded by accepting further messages. */
 
       /* Check to see if the limit for messages per connection would be
       exceeded by accepting further messages. */
 

-      if (mailmax > 0 && smtp_mailcmd_count > mailmax)
+      if (smtp_mailcmd_max > 0 && smtp_mailcmd_count > smtp_mailcmd_max)

        {
        smtp_printf("421 too many messages in this connection\r\n", FALSE);
        log_write(0, LOG_MAIN|LOG_REJECT, "rejected MAIL command %s: too many "
        {
        smtp_printf("421 too many messages in this connection\r\n", FALSE);
        log_write(0, LOG_MAIN|LOG_REJECT, "rejected MAIL command %s: too many "

diff --git a/test/aux-fixed/0258.m3 b/test/aux-fixed/0258.m3
index aa97035ced65f5c815668eb57a55d4e278d07a48..c8a66222a24b01f817a86988d9daac1252f58dee 100644 (file)
--- a/test/aux-fixed/0258.m3
+++ b/test/aux-fixed/0258.m3
@@ -1,3 +1,4 @@
+helo test

 Mail from: x@y
 rcpt to: userx@test.ex
 data
 Mail from: x@y
 rcpt to: userx@test.ex
 data

diff --git a/test/aux-fixed/0258.m4 b/test/aux-fixed/0258.m4
index 7ba96f4fae81362be1e973e43c67f2b7a7d9f99c..14938dcc3aaa359e80c6622b6d12bed4057ed0fa 100644 (file)
--- a/test/aux-fixed/0258.m4
+++ b/test/aux-fixed/0258.m4
@@ -1,3 +1,4 @@
+helo test

 Mail from: x@y\r
 rcpt to: userx@test.ex\r
 data\r
 Mail from: x@y\r
 rcpt to: userx@test.ex\r
 data\r

diff --git a/test/aux-fixed/5101.script b/test/aux-fixed/5101.script
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/test/confs/0021 b/test/confs/0021
index cf0ac21d265c4f06c7a35f2872f13a17e5d126b5..8d252e884ccdd1e294f8b22e7044651aabade6a7 100644 (file)
--- a/test/confs/0021
+++ b/test/confs/0021
@@ -2,6 +2,7 @@
 
 SERVER=
 BR=
 
 SERVER=
 BR=

+HVH=

 LOG_SELECTOR=
 
 .include DIR/aux-var/std_conf_prefix
 LOG_SELECTOR=
 
 .include DIR/aux-var/std_conf_prefix


@@ -22,6 +23,7 @@ acl_smtp_mail = mail
 acl_smtp_rcpt = rcpt
 
 BR
 acl_smtp_rcpt = rcpt
 
 BR

+HVH

 log_selector = LOG_SELECTOR
 
 qualify_domain = test.ex
 log_selector = LOG_SELECTOR
 
 qualify_domain = test.ex

diff --git a/test/confs/0070 b/test/confs/0070
index 9ef3b2ad825fbfd2fd16dc9860188cc03d871e45..81c28811f9ce3412c9de738d4bc6b5b8062a853e 100644 (file)
--- a/test/confs/0070
+++ b/test/confs/0070
@@ -9,6 +9,7 @@ primary_hostname = myhost.test.ex
 # ----- Main settings -----
 
 acl_smtp_rcpt = rcpt
 # ----- Main settings -----
 
 acl_smtp_rcpt = rcpt

+hosts_require_helo =

 helo_verify_hosts = ten-1.test.ex : ten-3.test.ex : HVH
 helo_try_verify_hosts = ten-2.test.ex
 log_selector = -host_lookup_failed
 helo_verify_hosts = ten-1.test.ex : ten-3.test.ex : HVH
 helo_try_verify_hosts = ten-2.test.ex
 log_selector = -host_lookup_failed

diff --git a/test/confs/0139 b/test/confs/0139
index 0c195c1f2c303427ea5e245a0b571815a8b53843..34ebb911e22558fcfe188d39d092e4b64ca44d21 100644 (file)
--- a/test/confs/0139
+++ b/test/confs/0139
@@ -7,6 +7,7 @@
 
 domainlist local_domains = exim.test.ex
 trusted_users = CALLER
 
 domainlist local_domains = exim.test.ex
 trusted_users = CALLER

+hosts_require_helo =

 
 acl_smtp_helo = check_helo
 acl_smtp_rcpt = check_recipient
 
 acl_smtp_helo = check_helo
 acl_smtp_rcpt = check_recipient

diff --git a/test/confs/0416 b/test/confs/0416
index 752ba0495476aa3403cee8aa7ef7cdd8e7bbdc8f..63964b7916760abbe02c3bdc33eae0f5448e195c 100644 (file)
--- a/test/confs/0416
+++ b/test/confs/0416
@@ -7,6 +7,7 @@
 
 primary_hostname = mail.test.ex
 qualify_domain = test.ex
 
 primary_hostname = mail.test.ex
 qualify_domain = test.ex

+hosts_require_helo =

 queue_only
 no_queue_only_override
 
 queue_only
 no_queue_only_override
 

diff --git a/test/confs/0457 b/test/confs/0457
index 866950e9a067e44f873c15f5e91b8fb85f7a8484..d36c5f84ae4dd901c859d7667e6c0d1651295a58 100644 (file)
--- a/test/confs/0457
+++ b/test/confs/0457
@@ -2,6 +2,7 @@
 
 .include DIR/aux-var/std_conf_prefix
 
 
 .include DIR/aux-var/std_conf_prefix
 

+hosts_require_helo =

 
 # ----- Main settings -----
 
 
 # ----- Main settings -----
 

diff --git a/test/confs/3453 b/test/confs/3453
index 8d8a008eb1c8d1de64dadea61e70e10d92c6458d..ca6a3a7423fd892fe55ae36ab855441202aad47f 100644 (file)
--- a/test/confs/3453
+++ b/test/confs/3453
@@ -14,6 +14,7 @@ tls_advertise_hosts = *
 tls_certificate = DIR/aux-fixed/cert1
 tls_privatekey = DIR/aux-fixed/cert1
 tls_remember_esmtp = REMEMBER
 tls_certificate = DIR/aux-fixed/cert1
 tls_privatekey = DIR/aux-fixed/cert1
 tls_remember_esmtp = REMEMBER

+hosts_require_helo =

 
 
 # ----- Authenticators -----
 
 
 # ----- Authenticators -----

diff --git a/test/confs/3463 b/test/confs/3463
index ab15af2257a3d51da920c22844e536ab9e571ae3..5b77277847e060352639595d4635f1a8a59d9362 100644 (file)
--- a/test/confs/3463
+++ b/test/confs/3463
@@ -15,6 +15,7 @@ tls_certificate = DIR/aux-fixed/cert1
 tls_privatekey = DIR/aux-fixed/cert1
 tls_remember_esmtp = REMEMBER
 
 tls_privatekey = DIR/aux-fixed/cert1
 tls_remember_esmtp = REMEMBER
 

+hosts_require_helo =

 
 # ----- Authenticators -----
 
 
 # ----- Authenticators -----
 

diff --git a/test/log/0014 b/test/log/0014
index b4805063b5b3e3e99e8abb446e9de4f0d1bda761..53e69a40ed6450a42a88f852d5fdf38bab31b323 100644 (file)
--- a/test/log/0014
+++ b/test/log/0014
@@ -5,5 +5,5 @@
 1999-03-02 09:44:33 10HmaZ-0005vi-00 <= J.Caesar@plc.example U=CALLER P=local S=sss
 1999-03-02 09:44:33 10HmaZ-0005vi-00 => userx <userx@myhost.test.ex> R=userx T=appendfile
 1999-03-02 09:44:33 10HmaZ-0005vi-00 Completed
 1999-03-02 09:44:33 10HmaZ-0005vi-00 <= J.Caesar@plc.example U=CALLER P=local S=sss
 1999-03-02 09:44:33 10HmaZ-0005vi-00 => userx <userx@myhost.test.ex> R=userx T=appendfile
 1999-03-02 09:44:33 10HmaZ-0005vi-00 Completed

-1999-03-02 09:44:33 H=[10.0.0.2] U=CALLER sender verify fail for <"jules@box3.plc.example-is-not-known"@plc.example>: Unrouteable mail domain "plc.example"
-1999-03-02 09:44:33 H=[10.0.0.2] U=CALLER F=<jules@box3.plc.example> rejected RCPT <userx@test.ex>: Sender verify failed
+1999-03-02 09:44:33 H=(test) [10.0.0.2] U=CALLER sender verify fail for <"jules@box3.plc.example-is-not-known"@plc.example>: Unrouteable mail domain "plc.example"
+1999-03-02 09:44:33 H=(test) [10.0.0.2] U=CALLER F=<jules@box3.plc.example> rejected RCPT <userx@test.ex>: Sender verify failed

diff --git a/test/log/0022 b/test/log/0022
index 4fc91830d7a63fa48462572252b671edc62b1515..a3a1c3ec50ac5f5e452167c41a463f8505335366 100644 (file)
--- a/test/log/0022
+++ b/test/log/0022
@@ -13,9 +13,9 @@
 ******** SERVER ********
 1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D
 1999-03-02 09:44:33 Connections=1
 ******** SERVER ********
 1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D
 1999-03-02 09:44:33 Connections=1

-1999-03-02 09:44:33 10HmbB-0005vi-00 <= x@y H=[127.0.0.1] P=smtp S=sss
+1999-03-02 09:44:33 10HmbB-0005vi-00 <= x@y H=(test) [127.0.0.1] P=smtp S=sss

 1999-03-02 09:44:33 10HmbB-0005vi-00 frozen by ACL
 1999-03-02 09:44:33 10HmbB-0005vi-00 frozen by ACL

-1999-03-02 09:44:33 10HmbC-0005vi-00 <= x@y H=[127.0.0.1] P=smtp S=sss
-1999-03-02 09:44:33 10HmbD-0005vi-00 <= x@y H=[127.0.0.1] P=smtp S=sss
+1999-03-02 09:44:33 10HmbC-0005vi-00 <= x@y H=(test) [127.0.0.1] P=smtp S=sss
+1999-03-02 09:44:33 10HmbD-0005vi-00 <= x@y H=(test) [127.0.0.1] P=smtp S=sss

 1999-03-02 09:44:33 10HmbD-0005vi-00 no immediate delivery: queued by ACL
 1999-03-02 09:44:33 10HmbD-0005vi-00 no immediate delivery: queued by ACL

-1999-03-02 09:44:33 10HmbE-0005vi-00 <= x@y H=[127.0.0.1] P=smtp S=sss
+1999-03-02 09:44:33 10HmbE-0005vi-00 <= x@y H=(test) [127.0.0.1] P=smtp S=sss

diff --git a/test/log/0023 b/test/log/0023
index 422944aeed57c514a7cdb5e24f288afbfd1cba57..3ea6e2f46371349d66c082feaaa09cc8cfb0a80a 100644 (file)
--- a/test/log/0023
+++ b/test/log/0023
@@ -1,61 +1,61 @@
-1999-03-02 09:44:33 10HmaX-0005vi-00 <= userx@test.ex H=[32.32.32.32] U=CALLER P=smtp S=sss
+1999-03-02 09:44:33 10HmaX-0005vi-00 <= userx@test.ex H=(test) [32.32.32.32] U=CALLER P=smtp S=sss

 1999-03-02 09:44:33 10HmaX-0005vi-00 => userx-vs <userx-vs@test.ex> R=r1 T=t1
 1999-03-02 09:44:33 10HmaX-0005vi-00 Completed
 1999-03-02 09:44:33 10HmaX-0005vi-00 => userx-vs <userx-vs@test.ex> R=r1 T=t1
 1999-03-02 09:44:33 10HmaX-0005vi-00 Completed

-1999-03-02 09:44:33 10HmaY-0005vi-00 <= userx@test.ex H=[32.32.32.32] U=CALLER P=smtp S=sss
+1999-03-02 09:44:33 10HmaY-0005vi-00 <= userx@test.ex H=(test) [32.32.32.32] U=CALLER P=smtp S=sss

 1999-03-02 09:44:33 10HmaY-0005vi-00 => userx <userx@test.ex> R=r1 T=t1
 1999-03-02 09:44:33 10HmaY-0005vi-00 Completed
 1999-03-02 09:44:33 10HmaY-0005vi-00 => userx <userx@test.ex> R=r1 T=t1
 1999-03-02 09:44:33 10HmaY-0005vi-00 Completed

-1999-03-02 09:44:33 10HmaZ-0005vi-00 <= userx@test.ex H=[55.55.55.55] U=CALLER P=smtp S=sss
+1999-03-02 09:44:33 10HmaZ-0005vi-00 <= userx@test.ex H=(test) [55.55.55.55] U=CALLER P=smtp S=sss

 1999-03-02 09:44:33 10HmaZ-0005vi-00 => userx <userx@test.ex> R=r1 T=t1
 1999-03-02 09:44:33 10HmaZ-0005vi-00 Completed
 1999-03-02 09:44:33 10HmaZ-0005vi-00 => userx <userx@test.ex> R=r1 T=t1
 1999-03-02 09:44:33 10HmaZ-0005vi-00 Completed

-1999-03-02 09:44:33 10HmbA-0005vi-00 <= userx@test.ex H=[56.56.56.56] U=CALLER P=smtp S=sss
+1999-03-02 09:44:33 10HmbA-0005vi-00 <= userx@test.ex H=(test) [56.56.56.56] U=CALLER P=smtp S=sss

 1999-03-02 09:44:33 10HmbA-0005vi-00 => cond-yes <cond-yes@test.ex> R=r1 T=t1
 1999-03-02 09:44:33 10HmbA-0005vi-00 Completed
 1999-03-02 09:44:33 10HmbA-0005vi-00 => cond-yes <cond-yes@test.ex> R=r1 T=t1
 1999-03-02 09:44:33 10HmbA-0005vi-00 Completed

-1999-03-02 09:44:33 10HmbB-0005vi-00 <= userx@test.ex H=[56.56.56.56] U=CALLER P=smtp S=sss
+1999-03-02 09:44:33 10HmbB-0005vi-00 <= userx@test.ex H=(test) [56.56.56.56] U=CALLER P=smtp S=sss

 1999-03-02 09:44:33 10HmbB-0005vi-00 => cond-1 <cond-1@test.ex> R=r1 T=t1
 1999-03-02 09:44:33 10HmbB-0005vi-00 Completed
 1999-03-02 09:44:33 10HmbB-0005vi-00 => cond-1 <cond-1@test.ex> R=r1 T=t1
 1999-03-02 09:44:33 10HmbB-0005vi-00 Completed

-1999-03-02 09:44:33 10HmbC-0005vi-00 <= userx@test.ex H=[56.56.56.56] U=CALLER P=smtp S=sss
+1999-03-02 09:44:33 10HmbC-0005vi-00 <= userx@test.ex H=(test) [56.56.56.56] U=CALLER P=smtp S=sss

 1999-03-02 09:44:33 10HmbC-0005vi-00 => cond-10 <cond-10@test.ex> R=r1 T=t1
 1999-03-02 09:44:33 10HmbC-0005vi-00 Completed
 1999-03-02 09:44:33 10HmbC-0005vi-00 => cond-10 <cond-10@test.ex> R=r1 T=t1
 1999-03-02 09:44:33 10HmbC-0005vi-00 Completed

-1999-03-02 09:44:33 10HmbD-0005vi-00 <= userx@test.ex H=[56.56.56.56] U=CALLER P=smtp S=sss
+1999-03-02 09:44:33 10HmbD-0005vi-00 <= userx@test.ex H=(test) [56.56.56.56] U=CALLER P=smtp S=sss

 1999-03-02 09:44:33 10HmbD-0005vi-00 => cond-true <cond-true@test.ex> R=r1 T=t1
 1999-03-02 09:44:33 10HmbD-0005vi-00 Completed
 1999-03-02 09:44:33 10HmbD-0005vi-00 => cond-true <cond-true@test.ex> R=r1 T=t1
 1999-03-02 09:44:33 10HmbD-0005vi-00 Completed

-1999-03-02 09:44:33 H=[56.56.56.56] U=CALLER Warning: ACL "warn" statement skipped: condition test deferred: invalid "condition" value "rhubarb"
-1999-03-02 09:44:33 10HmbE-0005vi-00 <= userx@test.ex H=[56.56.56.56] U=CALLER P=smtp S=sss
+1999-03-02 09:44:33 H=(test) [56.56.56.56] U=CALLER Warning: ACL "warn" statement skipped: condition test deferred: invalid "condition" value "rhubarb"
+1999-03-02 09:44:33 10HmbE-0005vi-00 <= userx@test.ex H=(test) [56.56.56.56] U=CALLER P=smtp S=sss

 1999-03-02 09:44:33 10HmbE-0005vi-00 => cond-rhubarb <cond-rhubarb@test.ex> R=r1 T=t1
 1999-03-02 09:44:33 10HmbE-0005vi-00 Completed
 1999-03-02 09:44:33 10HmbE-0005vi-00 => cond-rhubarb <cond-rhubarb@test.ex> R=r1 T=t1
 1999-03-02 09:44:33 10HmbE-0005vi-00 Completed

-1999-03-02 09:44:33 10HmbF-0005vi-00 <= userx@test.ex H=[56.56.56.56] U=CALLER P=smtp S=sss
+1999-03-02 09:44:33 10HmbF-0005vi-00 <= userx@test.ex H=(test) [56.56.56.56] U=CALLER P=smtp S=sss

 1999-03-02 09:44:33 10HmbF-0005vi-00 => cond- <cond-@test.ex> R=r1 T=t1
 1999-03-02 09:44:33 10HmbF-0005vi-00 Completed
 1999-03-02 09:44:33 10HmbF-0005vi-00 => cond- <cond-@test.ex> R=r1 T=t1
 1999-03-02 09:44:33 10HmbF-0005vi-00 Completed

-1999-03-02 09:44:33 10HmbG-0005vi-00 <= userx@test.ex H=[56.56.56.56] U=CALLER P=smtp S=sss
+1999-03-02 09:44:33 10HmbG-0005vi-00 <= userx@test.ex H=(test) [56.56.56.56] U=CALLER P=smtp S=sss

 1999-03-02 09:44:33 10HmbG-0005vi-00 => cond-no <cond-no@test.ex> R=r1 T=t1
 1999-03-02 09:44:33 10HmbG-0005vi-00 Completed
 1999-03-02 09:44:33 10HmbG-0005vi-00 => cond-no <cond-no@test.ex> R=r1 T=t1
 1999-03-02 09:44:33 10HmbG-0005vi-00 Completed

-1999-03-02 09:44:33 10HmbH-0005vi-00 <= userx@test.ex H=[56.56.56.56] U=CALLER P=smtp S=sss
+1999-03-02 09:44:33 10HmbH-0005vi-00 <= userx@test.ex H=(test) [56.56.56.56] U=CALLER P=smtp S=sss

 1999-03-02 09:44:33 10HmbH-0005vi-00 => cond-0 <cond-0@test.ex> R=r1 T=t1
 1999-03-02 09:44:33 10HmbH-0005vi-00 Completed
 1999-03-02 09:44:33 10HmbH-0005vi-00 => cond-0 <cond-0@test.ex> R=r1 T=t1
 1999-03-02 09:44:33 10HmbH-0005vi-00 Completed

-1999-03-02 09:44:33 10HmbI-0005vi-00 <= userx@test.ex H=[56.56.56.56] U=CALLER P=smtp S=sss
+1999-03-02 09:44:33 10HmbI-0005vi-00 <= userx@test.ex H=(test) [56.56.56.56] U=CALLER P=smtp S=sss

 1999-03-02 09:44:33 10HmbI-0005vi-00 => cond-00 <cond-00@test.ex> R=r1 T=t1
 1999-03-02 09:44:33 10HmbI-0005vi-00 Completed
 1999-03-02 09:44:33 10HmbI-0005vi-00 => cond-00 <cond-00@test.ex> R=r1 T=t1
 1999-03-02 09:44:33 10HmbI-0005vi-00 Completed

-1999-03-02 09:44:33 10HmbJ-0005vi-00 <= userx@test.ex H=[56.56.56.56] U=CALLER P=smtp S=sss
+1999-03-02 09:44:33 10HmbJ-0005vi-00 <= userx@test.ex H=(test) [56.56.56.56] U=CALLER P=smtp S=sss

 1999-03-02 09:44:33 10HmbJ-0005vi-00 => cond-false <cond-false@test.ex> R=r1 T=t1
 1999-03-02 09:44:33 10HmbJ-0005vi-00 Completed
 1999-03-02 09:44:33 10HmbJ-0005vi-00 => cond-false <cond-false@test.ex> R=r1 T=t1
 1999-03-02 09:44:33 10HmbJ-0005vi-00 Completed

-1999-03-02 09:44:33 10HmbK-0005vi-00 <= userx@test.ex H=[56.56.57.57] U=CALLER P=smtp S=sss
+1999-03-02 09:44:33 10HmbK-0005vi-00 <= userx@test.ex H=(test) [56.56.57.57] U=CALLER P=smtp S=sss

 1999-03-02 09:44:33 10HmbK-0005vi-00 => cond-yes <cond-yes@test.ex> R=r1 T=t1
 1999-03-02 09:44:33 10HmbK-0005vi-00 Completed
 1999-03-02 09:44:33 10HmbK-0005vi-00 => cond-yes <cond-yes@test.ex> R=r1 T=t1
 1999-03-02 09:44:33 10HmbK-0005vi-00 Completed

-1999-03-02 09:44:33 H=[56.56.57.57] U=CALLER F=<userx@test.ex> temporarily rejected RCPT <cond-rhubarb@test.ex>: invalid "condition" value "rhubarb"
-1999-03-02 09:44:33 10HmbL-0005vi-00 <= userx@test.ex H=[56.56.57.57] U=CALLER P=smtp S=sss
+1999-03-02 09:44:33 H=(test) [56.56.57.57] U=CALLER F=<userx@test.ex> temporarily rejected RCPT <cond-rhubarb@test.ex>: invalid "condition" value "rhubarb"
+1999-03-02 09:44:33 10HmbL-0005vi-00 <= userx@test.ex H=(test) [56.56.57.57] U=CALLER P=smtp S=sss

 1999-03-02 09:44:33 10HmbL-0005vi-00 => cond--1 <cond--1@test.ex> R=r1 T=t1
 1999-03-02 09:44:33 10HmbL-0005vi-00 Completed
 1999-03-02 09:44:33 10HmbL-0005vi-00 => cond--1 <cond--1@test.ex> R=r1 T=t1
 1999-03-02 09:44:33 10HmbL-0005vi-00 Completed

-1999-03-02 09:44:33 10HmbM-0005vi-00 <= userx@test.ex H=[56.56.56.56] U=CALLER P=smtp S=sss
+1999-03-02 09:44:33 10HmbM-0005vi-00 <= userx@test.ex H=(test) [56.56.56.56] U=CALLER P=smtp S=sss

 1999-03-02 09:44:33 10HmbM-0005vi-00 => cond-rhubarb <cond-rhubarb@test.ex> R=r1 T=t1
 1999-03-02 09:44:33 10HmbM-0005vi-00 Completed
 1999-03-02 09:44:33 10HmbM-0005vi-00 => cond-rhubarb <cond-rhubarb@test.ex> R=r1 T=t1
 1999-03-02 09:44:33 10HmbM-0005vi-00 Completed

-1999-03-02 09:44:33 H=[56.56.58.58] U=CALLER F=<rcpttest@test.ex> rejected RCPT <bad1@test.ex>
-1999-03-02 09:44:33 H=[56.56.58.58] U=CALLER F=<rcpttest@test.ex> rejected RCPT <bad2@test.ex>
-1999-03-02 09:44:33 H=[56.56.58.58] U=CALLER F=<rcpttest@test.ex> rejected RCPT <bad3@test.ex>
-1999-03-02 09:44:33 10HmbN-0005vi-00 <= rcpttest@test.ex H=[56.56.58.58] U=CALLER P=smtp S=sss
+1999-03-02 09:44:33 H=(test) [56.56.58.58] U=CALLER F=<rcpttest@test.ex> rejected RCPT <bad1@test.ex>
+1999-03-02 09:44:33 H=(test) [56.56.58.58] U=CALLER F=<rcpttest@test.ex> rejected RCPT <bad2@test.ex>
+1999-03-02 09:44:33 H=(test) [56.56.58.58] U=CALLER F=<rcpttest@test.ex> rejected RCPT <bad3@test.ex>
+1999-03-02 09:44:33 10HmbN-0005vi-00 <= rcpttest@test.ex H=(test) [56.56.58.58] U=CALLER P=smtp S=sss

 1999-03-02 09:44:33 10HmbN-0005vi-00 => ok1 <ok1@test.ex> R=r0 T=t2
 1999-03-02 09:44:33 10HmbN-0005vi-00 -> ok2 <ok2@test.ex> R=r0 T=t2
 1999-03-02 09:44:33 10HmbN-0005vi-00 -> ok3 <ok3@test.ex> R=r0 T=t2
 1999-03-02 09:44:33 10HmbN-0005vi-00 Completed
 1999-03-02 09:44:33 10HmbN-0005vi-00 => ok1 <ok1@test.ex> R=r0 T=t2
 1999-03-02 09:44:33 10HmbN-0005vi-00 -> ok2 <ok2@test.ex> R=r0 T=t2
 1999-03-02 09:44:33 10HmbN-0005vi-00 -> ok3 <ok3@test.ex> R=r0 T=t2
 1999-03-02 09:44:33 10HmbN-0005vi-00 Completed

-1999-03-02 09:44:33 H=[56.56.59.59] U=CALLER F=<rcpttest@test.ex> rejected RCPT <fail@test.ex>: here is a fail message
-1999-03-02 09:44:33 H=[V4NET.11.12.13] U=CALLER F=<x@y> rejected RCPT <x@y>: DNSLIST (rbl.test.ex: This is a test blacklisting message)
-1999-03-02 09:44:33 H=[V4NET.11.12.13] U=CALLER F=<x@y> rejected RCPT <x1@y>: DNSLIST (rbl.test.ex: This is a test blacklisting message)
+1999-03-02 09:44:33 H=(test) [56.56.59.59] U=CALLER F=<rcpttest@test.ex> rejected RCPT <fail@test.ex>: here is a fail message
+1999-03-02 09:44:33 H=(test) [V4NET.11.12.13] U=CALLER F=<x@y> rejected RCPT <x@y>: DNSLIST (rbl.test.ex: This is a test blacklisting message)
+1999-03-02 09:44:33 H=(test) [V4NET.11.12.13] U=CALLER F=<x@y> rejected RCPT <x1@y>: DNSLIST (rbl.test.ex: This is a test blacklisting message)

diff --git a/test/log/0024 b/test/log/0024
index 60ddc65a7809e5477250e0273ddfbba9518b0bb5..3cf8db2f77981f9d9614e1cb9251e4da4c642a79 100644 (file)
--- a/test/log/0024
+++ b/test/log/0024
@@ -1,32 +1,32 @@
-1999-03-02 09:44:33 H=[V4NET.0.0.0] U=CALLER sender verify fail for <x@y>: Unrouteable address
-1999-03-02 09:44:33 H=[V4NET.0.0.0] U=CALLER F=<x@y> rejected RCPT <userx@test.ex>: Sender verify failed
-1999-03-02 09:44:33 H=[V4NET.0.0.0] U=CALLER F=<x@y> rejected RCPT <x@y>: Sender verify failed
-1999-03-02 09:44:33 H=[V4NET.0.0.0] U=CALLER F=<x@y> rejected RCPT <x@ten-1.test.ex>: Sender verify failed
-1999-03-02 09:44:33 H=[V4NET.0.0.0] U=CALLER F=<x@y> rejected RCPT <x@ten-2.test.ex>: Sender verify failed
-1999-03-02 09:44:33 10HmaX-0005vi-00 <= x@y H=[V4NET.0.0.0] U=CALLER P=smtp S=sss
+1999-03-02 09:44:33 H=(test) [V4NET.0.0.0] U=CALLER sender verify fail for <x@y>: Unrouteable address
+1999-03-02 09:44:33 H=(test) [V4NET.0.0.0] U=CALLER F=<x@y> rejected RCPT <userx@test.ex>: Sender verify failed
+1999-03-02 09:44:33 H=(test) [V4NET.0.0.0] U=CALLER F=<x@y> rejected RCPT <x@y>: Sender verify failed
+1999-03-02 09:44:33 H=(test) [V4NET.0.0.0] U=CALLER F=<x@y> rejected RCPT <x@ten-1.test.ex>: Sender verify failed
+1999-03-02 09:44:33 H=(test) [V4NET.0.0.0] U=CALLER F=<x@y> rejected RCPT <x@ten-2.test.ex>: Sender verify failed
+1999-03-02 09:44:33 10HmaX-0005vi-00 <= x@y H=(test) [V4NET.0.0.0] U=CALLER P=smtp S=sss

 1999-03-02 09:44:33 10HmaX-0005vi-00 => postmaster <postmaster@test.ex> R=r2 T=local_delivery
 1999-03-02 09:44:33 10HmaX-0005vi-00 Completed
 1999-03-02 09:44:33 10HmaX-0005vi-00 => postmaster <postmaster@test.ex> R=r2 T=local_delivery
 1999-03-02 09:44:33 10HmaX-0005vi-00 Completed

-1999-03-02 09:44:33 H=[V4NET.0.0.0] U=CALLER F=<userx@test.ex> rejected RCPT <x@y>: Unrouteable address
-1999-03-02 09:44:33 H=[V4NET.0.0.0] U=CALLER F=<userx@test.ex> rejected RCPT <x@ten-2.test.ex>: relay not permitted
-1999-03-02 09:44:33 10HmaY-0005vi-00 <= userx@test.ex H=[V4NET.0.0.0] U=CALLER P=smtp S=sss
+1999-03-02 09:44:33 H=(test) [V4NET.0.0.0] U=CALLER F=<userx@test.ex> rejected RCPT <x@y>: Unrouteable address
+1999-03-02 09:44:33 H=(test) [V4NET.0.0.0] U=CALLER F=<userx@test.ex> rejected RCPT <x@ten-2.test.ex>: relay not permitted
+1999-03-02 09:44:33 10HmaY-0005vi-00 <= userx@test.ex H=(test) [V4NET.0.0.0] U=CALLER P=smtp S=sss

 1999-03-02 09:44:33 10HmaY-0005vi-00 => userx@myhost.test.ex <føø@test.ex> R=r1 T=dev_null H=myhost.test.ex
 1999-03-02 09:44:33 10HmaY-0005vi-00 => postmaster <postmaster@test.ex> R=r2 T=local_delivery
 1999-03-02 09:44:33 10HmaY-0005vi-00 => userx <userx@test.ex> R=r2 T=local_delivery
 1999-03-02 09:44:33 10HmaY-0005vi-00 => x@ten-1.test.ex R=r1 T=dev_null H=ten-1.test.ex
 1999-03-02 09:44:33 10HmaY-0005vi-00 Completed
 1999-03-02 09:44:33 10HmaY-0005vi-00 => userx@myhost.test.ex <føø@test.ex> R=r1 T=dev_null H=myhost.test.ex
 1999-03-02 09:44:33 10HmaY-0005vi-00 => postmaster <postmaster@test.ex> R=r2 T=local_delivery
 1999-03-02 09:44:33 10HmaY-0005vi-00 => userx <userx@test.ex> R=r2 T=local_delivery
 1999-03-02 09:44:33 10HmaY-0005vi-00 => x@ten-1.test.ex R=r1 T=dev_null H=ten-1.test.ex
 1999-03-02 09:44:33 10HmaY-0005vi-00 Completed

-1999-03-02 09:44:33 H=[V4NET.255.255.0] U=CALLER F=<userx@test.ex> rejected RCPT <bad@test.ex>: unknown user
-1999-03-02 09:44:33 H=[V4NET.255.255.0] U=CALLER F=<userx@test.ex> rejected RCPT <x@y>: Unrouteable address
-1999-03-02 09:44:33 10HmaZ-0005vi-00 <= userx@test.ex H=[V4NET.255.255.0] U=CALLER P=smtp S=sss
+1999-03-02 09:44:33 H=(test) [V4NET.255.255.0] U=CALLER F=<userx@test.ex> rejected RCPT <bad@test.ex>: unknown user
+1999-03-02 09:44:33 H=(test) [V4NET.255.255.0] U=CALLER F=<userx@test.ex> rejected RCPT <x@y>: Unrouteable address
+1999-03-02 09:44:33 10HmaZ-0005vi-00 <= userx@test.ex H=(test) [V4NET.255.255.0] U=CALLER P=smtp S=sss

 1999-03-02 09:44:33 10HmaZ-0005vi-00 => x@ten-1.test.ex R=r1 T=dev_null H=ten-1.test.ex
 1999-03-02 09:44:33 10HmaZ-0005vi-00 => x@ten-2.test.ex R=r1 T=dev_null H=ten-2.test.ex
 1999-03-02 09:44:33 10HmaZ-0005vi-00 Completed
 1999-03-02 09:44:33 10HmaZ-0005vi-00 => x@ten-1.test.ex R=r1 T=dev_null H=ten-1.test.ex
 1999-03-02 09:44:33 10HmaZ-0005vi-00 => x@ten-2.test.ex R=r1 T=dev_null H=ten-2.test.ex
 1999-03-02 09:44:33 10HmaZ-0005vi-00 Completed

-1999-03-02 09:44:33 H=[V4NET.11.12.13] U=CALLER F=<userx@test.ex> rejected RCPT <userx@test.ex>: rejected because V4NET.11.12.13 is in a black list at rbl.test.ex
-1999-03-02 09:44:33 H=[V4NET.11.12.13] U=CALLER F=<userx@test.ex> rejected RCPT <x@ten-1.test.ex>: rejected because V4NET.11.12.13 is in a black list at rbl.test.ex
-1999-03-02 09:44:33 10HmbA-0005vi-00 <= userx@test.ex H=[V4NET.11.12.13] U=CALLER P=smtp S=sss
+1999-03-02 09:44:33 H=(test) [V4NET.11.12.13] U=CALLER F=<userx@test.ex> rejected RCPT <userx@test.ex>: rejected because V4NET.11.12.13 is in a black list at rbl.test.ex
+1999-03-02 09:44:33 H=(test) [V4NET.11.12.13] U=CALLER F=<userx@test.ex> rejected RCPT <x@ten-1.test.ex>: rejected because V4NET.11.12.13 is in a black list at rbl.test.ex
+1999-03-02 09:44:33 10HmbA-0005vi-00 <= userx@test.ex H=(test) [V4NET.11.12.13] U=CALLER P=smtp S=sss

 1999-03-02 09:44:33 10HmbA-0005vi-00 => postmaster <postmaster@test.ex> R=r2 T=local_delivery
 1999-03-02 09:44:33 10HmbA-0005vi-00 Completed
 1999-03-02 09:44:33 10HmbA-0005vi-00 => postmaster <postmaster@test.ex> R=r2 T=local_delivery
 1999-03-02 09:44:33 10HmbA-0005vi-00 Completed

-1999-03-02 09:44:33 H=[V4NET.11.12.16] U=CALLER Warning: found in rbl2.test.ex
-1999-03-02 09:44:33 10HmbB-0005vi-00 <= userx@test.ex H=[V4NET.11.12.16] U=CALLER P=smtp S=sss
+1999-03-02 09:44:33 H=(test) [V4NET.11.12.16] U=CALLER Warning: found in rbl2.test.ex
+1999-03-02 09:44:33 10HmbB-0005vi-00 <= userx@test.ex H=(test) [V4NET.11.12.16] U=CALLER P=smtp S=sss

 1999-03-02 09:44:33 10HmbB-0005vi-00 => postmaster <postmaster@test.ex> R=r2 T=local_delivery
 1999-03-02 09:44:33 10HmbB-0005vi-00 => userx <userx@test.ex> R=r2 T=local_delivery
 1999-03-02 09:44:33 10HmbB-0005vi-00 => x@ten-1.test.ex R=r1 T=dev_null H=ten-1.test.ex
 1999-03-02 09:44:33 10HmbB-0005vi-00 => postmaster <postmaster@test.ex> R=r2 T=local_delivery
 1999-03-02 09:44:33 10HmbB-0005vi-00 => userx <userx@test.ex> R=r2 T=local_delivery
 1999-03-02 09:44:33 10HmbB-0005vi-00 => x@ten-1.test.ex R=r1 T=dev_null H=ten-1.test.ex

diff --git a/test/log/0094 b/test/log/0094
index 9325a3459d25d41cef9661307d845ebe15e82579..43e20a9902a242880a6212400f88175de32b4fa1 100644 (file)
--- a/test/log/0094
+++ b/test/log/0094
@@ -1,10 +1,10 @@
 1999-03-02 09:44:33 no host name found for IP address V4NET.11.12.13
 1999-03-02 09:44:33 no host name found for IP address V4NET.11.12.13

-1999-03-02 09:44:33 10HmaX-0005vi-00 <= userx@test.ex H=[V4NET.11.12.13] U=root P=smtp S=sss
+1999-03-02 09:44:33 10HmaX-0005vi-00 <= userx@test.ex H=(test) [V4NET.11.12.13] U=root P=smtp S=sss

 1999-03-02 09:44:33 10HmaX-0005vi-00 => userx <userx@test.ex> R=localuser T=appendfile
 1999-03-02 09:44:33 10HmaX-0005vi-00 Completed
 1999-03-02 09:44:33 10HmaX-0005vi-00 => userx <userx@test.ex> R=localuser T=appendfile
 1999-03-02 09:44:33 10HmaX-0005vi-00 Completed

-1999-03-02 09:44:33 10HmaY-0005vi-00 <= userx@test.ex H=[99.99.99.99] U=root P=smtp S=sss
+1999-03-02 09:44:33 10HmaY-0005vi-00 <= userx@test.ex H=(test) [99.99.99.99] U=root P=smtp S=sss

 1999-03-02 09:44:33 10HmaY-0005vi-00 => userx <userx@test.ex> R=localuser T=appendfile
 1999-03-02 09:44:33 10HmaY-0005vi-00 Completed
 1999-03-02 09:44:33 10HmaY-0005vi-00 => userx <userx@test.ex> R=localuser T=appendfile
 1999-03-02 09:44:33 10HmaY-0005vi-00 Completed

-1999-03-02 09:44:33 10HmaZ-0005vi-00 <= userx@test.ex H=[V4NET.99.99.96] U=root P=smtp S=sss
+1999-03-02 09:44:33 10HmaZ-0005vi-00 <= userx@test.ex H=(test) [V4NET.99.99.96] U=root P=smtp S=sss

 1999-03-02 09:44:33 10HmaZ-0005vi-00 => userx <userx@test.ex> R=localuser T=appendfile
 1999-03-02 09:44:33 10HmaZ-0005vi-00 Completed
 1999-03-02 09:44:33 10HmaZ-0005vi-00 => userx <userx@test.ex> R=localuser T=appendfile
 1999-03-02 09:44:33 10HmaZ-0005vi-00 Completed

diff --git a/test/log/0212 b/test/log/0212
index 9d42f2f8a8cc03ab41d927707ac1a411743356d0..f0e07e975fced9ccf9d383ba455f7f130424f08a 100644 (file)
--- a/test/log/0212
+++ b/test/log/0212
@@ -1,8 +1,8 @@
-1999-03-02 09:44:33 H=[V4NET.0.0.0] U=CALLER F=<userx@test.ex> rejected RCPT <b@test.ex>: Unrouteable address
-1999-03-02 09:44:33 H=[V4NET.0.0.0] U=CALLER F=<userx@test.ex> rejected RCPT <f@test.ex>: bad user
-1999-03-02 09:44:33 H=[V4NET.0.0.0] U=CALLER F=<userx@test.ex> rejected RCPT <x@test.ex>: Unrouteable address
-1999-03-02 09:44:33 H=[V4NET.0.0.0] U=CALLER F=<userx@test.ex> rejected RCPT <"smartuser.b@test.ex"@test.ex>: Unrouteable address
-1999-03-02 09:44:33 VRFY failed for <b@test.ex> H=[V4NET.0.0.0] U=CALLER
-1999-03-02 09:44:33 VRFY failed for <f@test.ex> H=[V4NET.0.0.0] U=CALLER
-1999-03-02 09:44:33 VRFY failed for <x@test.ex> H=[V4NET.0.0.0] U=CALLER
-1999-03-02 09:44:33 VRFY failed for <"smartuser.b@test.ex"@test.ex> H=[V4NET.0.0.0] U=CALLER
+1999-03-02 09:44:33 H=(test) [V4NET.0.0.0] U=CALLER F=<userx@test.ex> rejected RCPT <b@test.ex>: Unrouteable address
+1999-03-02 09:44:33 H=(test) [V4NET.0.0.0] U=CALLER F=<userx@test.ex> rejected RCPT <f@test.ex>: bad user
+1999-03-02 09:44:33 H=(test) [V4NET.0.0.0] U=CALLER F=<userx@test.ex> rejected RCPT <x@test.ex>: Unrouteable address
+1999-03-02 09:44:33 H=(test) [V4NET.0.0.0] U=CALLER F=<userx@test.ex> rejected RCPT <"smartuser.b@test.ex"@test.ex>: Unrouteable address
+1999-03-02 09:44:33 VRFY failed for <b@test.ex> H=(test) [V4NET.0.0.0] U=CALLER
+1999-03-02 09:44:33 VRFY failed for <f@test.ex> H=(test) [V4NET.0.0.0] U=CALLER
+1999-03-02 09:44:33 VRFY failed for <x@test.ex> H=(test) [V4NET.0.0.0] U=CALLER
+1999-03-02 09:44:33 VRFY failed for <"smartuser.b@test.ex"@test.ex> H=(test) [V4NET.0.0.0] U=CALLER

diff --git a/test/log/0214 b/test/log/0214
index daede29d6a5b7e38c39701677da4dae743886a46..685bccb1d911661e53c56dc13951f4d5233942d6 100644 (file)
--- a/test/log/0214
+++ b/test/log/0214
@@ -1,4 +1,4 @@
 
 ******** SERVER ********
 1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D
 
 ******** SERVER ********
 1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D

-1999-03-02 09:44:33 10HmaX-0005vi-00 H=[127.0.0.1] F=<x@y.x> rejected after DATA: malformed address: ;bad@address;bad@address;bad@add may not follow bad@address: failing address in "To:" header begins: bad@address;bad@address;bad@address;bad@address;bad@address;bad@address;\n    bad@address;bad@address;bad@address;bad@address;bad@address;bad@address;\n    bad@address;bad@address;bad@address;bad@address;bad@address;bad@address;\n    bad@address;bad@address;bad@address;bad@address;bad@address;bad@address;\n    bad@address;bad@address;bad@address;bad@address;bad@address;bad@address;\n    bad@address;bad@address;bad@address;bad@address;bad@address;bad@address;\n    bad@address;bad@address;bad@address;bad@address;bad@address;bad@address;\n    bad@address;bad@address;bad@address;bad@address;bad@address;bad@address;\n    bad@address;bad@address;bad@address;bad@address;bad@address;bad@address;\n    bad@address;bad@address;bad@address;bad@address;bad@address;bad@address;\n    bad@address;bad@address;bad@address;bad@address;bad@address;bad@address;\n    bad@address;bad@address;bad@address;bad@address;bad@address;bad@address;\n    bad@address;bad@address;bad@address;bad@address;bad@address;bad@address;\n    bad@address;bad@address
+1999-03-02 09:44:33 10HmaX-0005vi-00 H=(test) [127.0.0.1] F=<x@y.x> rejected after DATA: malformed address: ;bad@address;bad@address;bad@add may not follow bad@address: failing address in "To:" header begins: bad@address;bad@address;bad@address;bad@address;bad@address;bad@address;\n    bad@address;bad@address;bad@address;bad@address;bad@address;bad@address;\n    bad@address;bad@address;bad@address;bad@address;bad@address;bad@address;\n    bad@address;bad@address;bad@address;bad@address;bad@address;bad@address;\n    bad@address;bad@address;bad@address;bad@address;bad@address;bad@address;\n    bad@address;bad@address;bad@address;bad@address;bad@address;bad@address;\n    bad@address;bad@address;bad@address;bad@address;bad@address;bad@address;\n    bad@address;bad@address;bad@address;bad@address;bad@address;bad@address;\n    bad@address;bad@address;bad@address;bad@address;bad@address;bad@address;\n    bad@address;bad@address;bad@address;bad@address;bad@address;bad@address;\n    bad@address;bad@address;bad@address;bad@address;bad@address;bad@address;\n    bad@address;bad@address;bad@address;bad@address;bad@address;bad@address;\n    bad@address;bad@address;bad@address;bad@address;bad@address;bad@address;\n    bad@address;bad@address

diff --git a/test/log/0227 b/test/log/0227
index 4ca892aa070d5dd0039771786c627b553307f929..3cd4a10483d19ac54f9d5d1f63f39be5e45d0f04 100644 (file)
--- a/test/log/0227
+++ b/test/log/0227
@@ -1,27 +1,27 @@
-1999-03-02 09:44:33 H=[V4NET.0.0.1] U=root sender verify fail for <bad@localhost>: 127.0.0.1 [127.0.0.1] : SMTP error from remote mail server after RCPT TO:<bad@localhost>: 550 Unknown user
-1999-03-02 09:44:33 H=[V4NET.0.0.1] U=root F=<bad@localhost> rejected RCPT <z@test.ex>: Sender verify failed
-1999-03-02 09:44:33 H=[V4NET.0.0.1] U=root sender verify defer for <uncheckable@localhost1>: Could not complete sender verify callout: 127.0.0.1 [127.0.0.1] : SMTP error from remote mail server after RCPT TO:<uncheckable@localhost1>: 450 Temporary error
-1999-03-02 09:44:33 H=[V4NET.0.0.1] U=root F=<uncheckable@localhost1> temporarily rejected RCPT <z@test.ex>: Could not complete sender verify callout
-1999-03-02 09:44:33 H=[V4NET.0.0.1] U=root sender verify fail for <uncheckable2@localhost1>: 127.0.0.1 [127.0.0.1] : response to "MAIL FROM:<>" was: 550 Error for <>
-1999-03-02 09:44:33 H=[V4NET.0.0.1] U=root F=<uncheckable2@localhost1> rejected RCPT <z@test.ex>: Sender verify failed
-1999-03-02 09:44:33 H=[V4NET.0.0.1] U=root sender verify fail for <uncheckable@localhost1>: 127.0.0.1 [127.0.0.1] : response to "MAIL FROM:<>" was: 550-Multiline error for <>\n550 Here's the second line
-1999-03-02 09:44:33 H=[V4NET.0.0.1] U=root F=<uncheckable@localhost1> rejected RCPT <z@test.ex>: Sender verify failed
-1999-03-02 09:44:33 H=[V4NET.0.0.1] U=root sender verify fail for <uncheckable2@localhost1>: 127.0.0.1 [127.0.0.1] : response to "MAIL FROM:<>" was: 550 Bad-char error for <> topbitchar:\200\377\377
-1999-03-02 09:44:33 H=[V4NET.0.0.1] U=root F=<uncheckable2@localhost1> rejected RCPT <z@test.ex>: Sender verify failed
-1999-03-02 09:44:33 H=[V4NET.0.0.3] U=root F=<uncheckable@localhost1> rejected RCPT <z@remote.domain>: 127.0.0.1 [127.0.0.1] : SMTP error from remote mail server after RCPT TO:<z@remote.domain>: 550 Recipient not liked
-1999-03-02 09:44:33 H=[V4NET.0.0.3] U=root F=<uncheckable@localhost1> rejected RCPT <z@remote.domain>: 127.0.0.1 [127.0.0.1] : SMTP error from remote mail server after RCPT TO:<z@remote.domain>: 550-Recipient not liked on two lines\n550 Here's the second
-1999-03-02 09:44:33 H=[V4NET.0.0.3] U=root F=<uncheckable@localhost1> rejected RCPT <z@remote.domain>: 127.0.0.1 [127.0.0.1] : SMTP error from remote mail server after RCPT TO:<z@remote.domain>: 550 Recipient not liked, with bad char:\200\377\377
-1999-03-02 09:44:33 H=[V4NET.0.0.3] U=root F=<uncheckable@localhost1> temporarily rejected RCPT <z@remote.domain>: Could not complete recipient verify callout
-1999-03-02 09:44:33 10HmaX-0005vi-00 H=[V4NET.0.0.4] U=root F=<uncheckable@localhost1> rejected after DATA: there is no valid sender in any header line
-1999-03-02 09:44:33 10HmaY-0005vi-00 H=[V4NET.0.0.4] U=root F=<uncheckable@localhost1> rejected after DATA: there is no valid sender in any header line
-1999-03-02 09:44:33 H=[V4NET.0.0.5] U=root F=<ok@localhost1> rejected RCPT <z@remote.domain>: relay not permitted
-1999-03-02 09:44:33 H=[V4NET.0.0.5] U=root sender verify fail for <ok@localhost1>: 127.0.0.1 [127.0.0.1] : SMTP error from remote mail server after RCPT TO:<postmaster@localhost1>: 550 Don't like postmaster
-1999-03-02 09:44:33 H=[V4NET.0.0.5] U=root F=<ok@localhost1> rejected RCPT <z@remote.domain>: Sender verify failed
+1999-03-02 09:44:33 H=(test) [V4NET.0.0.1] U=root sender verify fail for <bad@localhost>: 127.0.0.1 [127.0.0.1] : SMTP error from remote mail server after RCPT TO:<bad@localhost>: 550 Unknown user
+1999-03-02 09:44:33 H=(test) [V4NET.0.0.1] U=root F=<bad@localhost> rejected RCPT <z@test.ex>: Sender verify failed
+1999-03-02 09:44:33 H=(test) [V4NET.0.0.1] U=root sender verify defer for <uncheckable@localhost1>: Could not complete sender verify callout: 127.0.0.1 [127.0.0.1] : SMTP error from remote mail server after RCPT TO:<uncheckable@localhost1>: 450 Temporary error
+1999-03-02 09:44:33 H=(test) [V4NET.0.0.1] U=root F=<uncheckable@localhost1> temporarily rejected RCPT <z@test.ex>: Could not complete sender verify callout
+1999-03-02 09:44:33 H=(test) [V4NET.0.0.1] U=root sender verify fail for <uncheckable2@localhost1>: 127.0.0.1 [127.0.0.1] : response to "MAIL FROM:<>" was: 550 Error for <>
+1999-03-02 09:44:33 H=(test) [V4NET.0.0.1] U=root F=<uncheckable2@localhost1> rejected RCPT <z@test.ex>: Sender verify failed
+1999-03-02 09:44:33 H=(test) [V4NET.0.0.1] U=root sender verify fail for <uncheckable@localhost1>: 127.0.0.1 [127.0.0.1] : response to "MAIL FROM:<>" was: 550-Multiline error for <>\n550 Here's the second line
+1999-03-02 09:44:33 H=(test) [V4NET.0.0.1] U=root F=<uncheckable@localhost1> rejected RCPT <z@test.ex>: Sender verify failed
+1999-03-02 09:44:33 H=(test) [V4NET.0.0.1] U=root sender verify fail for <uncheckable2@localhost1>: 127.0.0.1 [127.0.0.1] : response to "MAIL FROM:<>" was: 550 Bad-char error for <> topbitchar:\200\377\377
+1999-03-02 09:44:33 H=(test) [V4NET.0.0.1] U=root F=<uncheckable2@localhost1> rejected RCPT <z@test.ex>: Sender verify failed
+1999-03-02 09:44:33 H=(test) [V4NET.0.0.3] U=root F=<uncheckable@localhost1> rejected RCPT <z@remote.domain>: 127.0.0.1 [127.0.0.1] : SMTP error from remote mail server after RCPT TO:<z@remote.domain>: 550 Recipient not liked
+1999-03-02 09:44:33 H=(test) [V4NET.0.0.3] U=root F=<uncheckable@localhost1> rejected RCPT <z@remote.domain>: 127.0.0.1 [127.0.0.1] : SMTP error from remote mail server after RCPT TO:<z@remote.domain>: 550-Recipient not liked on two lines\n550 Here's the second
+1999-03-02 09:44:33 H=(test) [V4NET.0.0.3] U=root F=<uncheckable@localhost1> rejected RCPT <z@remote.domain>: 127.0.0.1 [127.0.0.1] : SMTP error from remote mail server after RCPT TO:<z@remote.domain>: 550 Recipient not liked, with bad char:\200\377\377
+1999-03-02 09:44:33 H=(test) [V4NET.0.0.3] U=root F=<uncheckable@localhost1> temporarily rejected RCPT <z@remote.domain>: Could not complete recipient verify callout
+1999-03-02 09:44:33 10HmaX-0005vi-00 H=(test) [V4NET.0.0.4] U=root F=<uncheckable@localhost1> rejected after DATA: there is no valid sender in any header line
+1999-03-02 09:44:33 10HmaY-0005vi-00 H=(test) [V4NET.0.0.4] U=root F=<uncheckable@localhost1> rejected after DATA: there is no valid sender in any header line
+1999-03-02 09:44:33 H=(test) [V4NET.0.0.5] U=root F=<ok@localhost1> rejected RCPT <z@remote.domain>: relay not permitted
+1999-03-02 09:44:33 H=(test) [V4NET.0.0.5] U=root sender verify fail for <ok@localhost1>: 127.0.0.1 [127.0.0.1] : SMTP error from remote mail server after RCPT TO:<postmaster@localhost1>: 550 Don't like postmaster
+1999-03-02 09:44:33 H=(test) [V4NET.0.0.5] U=root F=<ok@localhost1> rejected RCPT <z@remote.domain>: Sender verify failed

 1999-03-02 09:44:33 H=(me) [V4NET.0.0.3] U=root F=<ok@localhost1> rejected RCPT <z@remote.domain>: relay not permitted
 1999-03-02 09:44:33 H=(me) [V4NET.0.0.3] U=root F=<ok@localhost1> rejected RCPT <z@remote.domain>: relay not permitted
 1999-03-02 09:44:33 H=(me) [V4NET.0.0.7] U=root F=<ok@localhost1> rejected RCPT <z@remote.domain>: relay not permitted
 1999-03-02 09:44:33 H=(me) [V4NET.0.0.3] U=root F=<ok@localhost1> rejected RCPT <z@remote.domain>: relay not permitted
 1999-03-02 09:44:33 H=(me) [V4NET.0.0.3] U=root F=<ok@localhost1> rejected RCPT <z@remote.domain>: relay not permitted
 1999-03-02 09:44:33 H=(me) [V4NET.0.0.7] U=root F=<ok@localhost1> rejected RCPT <z@remote.domain>: relay not permitted

-1999-03-02 09:44:33 H=[V4NET.0.0.3] U=root F=<uncheckable@localhost1> rejected RCPT <z@remote.lmtp>: 127.0.0.1 [127.0.0.1] : SMTP error from remote mail server after RCPT TO:<z@remote.lmtp>: 550 Recipient not liked
-1999-03-02 09:44:33 H=[V4NET.0.0.1] U=root sender verify defer for <bad@localhost1>: Could not complete sender verify callout: 127.0.0.1 [127.0.0.1] : Remote host closed connection in response to initial connection
-1999-03-02 09:44:33 H=[V4NET.0.0.1] U=root F=<bad@localhost1> temporarily rejected RCPT <z@test.ex>: Could not complete sender verify callout
-1999-03-02 09:44:33 H=[V4NET.0.0.1] U=root sender verify defer for <bad@localhost1>: Could not complete sender verify callout: 127.0.0.1 [127.0.0.1] : Connection refused
-1999-03-02 09:44:33 H=[V4NET.0.0.1] U=root F=<bad@localhost1> temporarily rejected RCPT <z@test.ex>: Could not complete sender verify callout
+1999-03-02 09:44:33 H=(test) [V4NET.0.0.3] U=root F=<uncheckable@localhost1> rejected RCPT <z@remote.lmtp>: 127.0.0.1 [127.0.0.1] : SMTP error from remote mail server after RCPT TO:<z@remote.lmtp>: 550 Recipient not liked
+1999-03-02 09:44:33 H=(test) [V4NET.0.0.1] U=root sender verify defer for <bad@localhost1>: Could not complete sender verify callout: 127.0.0.1 [127.0.0.1] : Remote host closed connection in response to initial connection
+1999-03-02 09:44:33 H=(test) [V4NET.0.0.1] U=root F=<bad@localhost1> temporarily rejected RCPT <z@test.ex>: Could not complete sender verify callout
+1999-03-02 09:44:33 H=(test) [V4NET.0.0.1] U=root sender verify defer for <bad@localhost1>: Could not complete sender verify callout: 127.0.0.1 [127.0.0.1] : Connection refused
+1999-03-02 09:44:33 H=(test) [V4NET.0.0.1] U=root F=<bad@localhost1> temporarily rejected RCPT <z@test.ex>: Could not complete sender verify callout

diff --git a/test/log/0230 b/test/log/0230
index 801445053188765d5c97232916cc8d9993d1c87e..59e94c4ee5599b6ab462c18e5f31c61a509a1a78 100644 (file)
--- a/test/log/0230
+++ b/test/log/0230
@@ -1,5 +1,5 @@
 1999-03-02 09:44:33 SMTP connection from root
 1999-03-02 09:44:33 SMTP connection from root

-1999-03-02 09:44:33 10HmaX-0005vi-00 <= x@y.x H=[V4NET.9.8.7]:1111 U=root P=smtp S=sss
+1999-03-02 09:44:33 10HmaX-0005vi-00 <= x@y.x H=(test) [V4NET.9.8.7]:1111 U=root P=smtp S=sss

 1999-03-02 09:44:33 SMTP connection from root closed by QUIT
 1999-03-02 09:44:33 Start queue run: pid=pppp -qf
 1999-03-02 09:44:33 10HmaY-0005vi-00 => x <x@test.ex> R=server T=local_delivery
 1999-03-02 09:44:33 SMTP connection from root closed by QUIT
 1999-03-02 09:44:33 Start queue run: pid=pppp -qf
 1999-03-02 09:44:33 10HmaY-0005vi-00 => x <x@test.ex> R=server T=local_delivery


@@ -12,7 +12,7 @@
 1999-03-02 09:44:33 10HmaX-0005vi-00 Completed
 1999-03-02 09:44:33 End queue run: pid=pppp -qf
 1999-03-02 09:44:33 SMTP connection from root
 1999-03-02 09:44:33 10HmaX-0005vi-00 Completed
 1999-03-02 09:44:33 End queue run: pid=pppp -qf
 1999-03-02 09:44:33 SMTP connection from root

-1999-03-02 09:44:33 10HmbB-0005vi-00 <= x@y.x H=[V4NET.9.8.7]:1112 U=root P=smtp S=sss
+1999-03-02 09:44:33 10HmbB-0005vi-00 <= x@y.x H=(test) [V4NET.9.8.7]:1112 U=root P=smtp S=sss

 1999-03-02 09:44:33 SMTP connection from root closed by QUIT
 1999-03-02 09:44:33 Start queue run: pid=pppp -qf
 1999-03-02 09:44:33 10HmbB-0005vi-00 => x@test.ex R=to_server T=remote H=127.0.0.1 [127.0.0.1] I=[127.0.0.1] C="250 OK id=10HmbC-0005vi-00"
 1999-03-02 09:44:33 SMTP connection from root closed by QUIT
 1999-03-02 09:44:33 Start queue run: pid=pppp -qf
 1999-03-02 09:44:33 10HmbB-0005vi-00 => x@test.ex R=to_server T=remote H=127.0.0.1 [127.0.0.1] I=[127.0.0.1] C="250 OK id=10HmbC-0005vi-00"


@@ -22,11 +22,11 @@
 ******** SERVER ********
 1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D
 1999-03-02 09:44:33 SMTP connection from [ip4.ip4.ip4.ip4]:1113 I=[ip4.ip4.ip4.ip4]:PORT_D (TCP/IP connection count = 1)
 ******** SERVER ********
 1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D
 1999-03-02 09:44:33 SMTP connection from [ip4.ip4.ip4.ip4]:1113 I=[ip4.ip4.ip4.ip4]:PORT_D (TCP/IP connection count = 1)

-1999-03-02 09:44:33 10HmaY-0005vi-00 <= x@y.x H=[ip4.ip4.ip4.ip4]:1113 I=[ip4.ip4.ip4.ip4]:PORT_D P=smtp S=sss
-1999-03-02 09:44:33 SMTP connection from [ip4.ip4.ip4.ip4]:1113 I=[ip4.ip4.ip4.ip4]:PORT_D closed by QUIT
+1999-03-02 09:44:33 10HmaY-0005vi-00 <= x@y.x H=(test) [ip4.ip4.ip4.ip4]:1113 I=[ip4.ip4.ip4.ip4]:PORT_D P=smtp S=sss
+1999-03-02 09:44:33 SMTP connection from (test) [ip4.ip4.ip4.ip4]:1113 I=[ip4.ip4.ip4.ip4]:PORT_D closed by QUIT

 1999-03-02 09:44:33 SMTP connection from [127.0.0.1]:1114 I=[127.0.0.1]:PORT_D (TCP/IP connection count = 1)
 1999-03-02 09:44:33 SMTP connection from [127.0.0.1]:1114 I=[127.0.0.1]:PORT_D (TCP/IP connection count = 1)

-1999-03-02 09:44:33 10HmaZ-0005vi-00 <= x@y.x H=[127.0.0.1]:1114 I=[127.0.0.1]:PORT_D P=smtp S=sss
-1999-03-02 09:44:33 SMTP connection from [127.0.0.1]:1114 I=[127.0.0.1]:PORT_D closed by QUIT
+1999-03-02 09:44:33 10HmaZ-0005vi-00 <= x@y.x H=(test) [127.0.0.1]:1114 I=[127.0.0.1]:PORT_D P=smtp S=sss
+1999-03-02 09:44:33 SMTP connection from (test) [127.0.0.1]:1114 I=[127.0.0.1]:PORT_D closed by QUIT

 1999-03-02 09:44:33 SMTP connection from [ip4.ip4.ip4.ip4]:1115 I=[ip4.ip4.ip4.ip4]:PORT_D (TCP/IP connection count = 1)
 1999-03-02 09:44:33 10HmbA-0005vi-00 <= x@y.x H=(rhubarb) [ip4.ip4.ip4.ip4]:1115 I=[ip4.ip4.ip4.ip4]:PORT_D P=smtp S=sss
 1999-03-02 09:44:33 SMTP connection from (rhubarb) [ip4.ip4.ip4.ip4]:1115 I=[ip4.ip4.ip4.ip4]:PORT_D closed by QUIT
 1999-03-02 09:44:33 SMTP connection from [ip4.ip4.ip4.ip4]:1115 I=[ip4.ip4.ip4.ip4]:PORT_D (TCP/IP connection count = 1)
 1999-03-02 09:44:33 10HmbA-0005vi-00 <= x@y.x H=(rhubarb) [ip4.ip4.ip4.ip4]:1115 I=[ip4.ip4.ip4.ip4]:PORT_D P=smtp S=sss
 1999-03-02 09:44:33 SMTP connection from (rhubarb) [ip4.ip4.ip4.ip4]:1115 I=[ip4.ip4.ip4.ip4]:PORT_D closed by QUIT

diff --git a/test/log/0234 b/test/log/0234
index fc68dfd94551ca4e3844c7bf8089f353d4ebe645..c0adabacb0e364f8431dfbc4b85c7e2aa501b3b0 100644 (file)
--- a/test/log/0234
+++ b/test/log/0234
@@ -1 +1 @@
-1999-03-02 09:44:33 H=[V4NET.0.0.0] U=root F=<a@b> rejected RCPT <c@d>: relay not permitted
+1999-03-02 09:44:33 H=(test) [V4NET.0.0.0] U=root F=<a@b> rejected RCPT <c@d>: relay not permitted

diff --git a/test/log/0293 b/test/log/0293
index 703dbc11fd9e014448682be97d73d13381317425..7b60ffa548092e00e91e55adfd86bbb3717eb4aa 100644 (file)
--- a/test/log/0293
+++ b/test/log/0293
@@ -1,7 +1,7 @@
-1999-03-02 09:44:33 10HmaX-0005vi-00 <= x@y U=CALLER P=local-smtp S=sss
+1999-03-02 09:44:33 10HmaX-0005vi-00 <= x1@y U=CALLER P=local-smtp S=sss

 1999-03-02 09:44:33 10HmaX-0005vi-00 => one <one@z> R=r1 T=t1
 1999-03-02 09:44:33 10HmaX-0005vi-00 Completed
 1999-03-02 09:44:33 10HmaX-0005vi-00 => one <one@z> R=r1 T=t1
 1999-03-02 09:44:33 10HmaX-0005vi-00 Completed

-1999-03-02 09:44:33 10HmaY-0005vi-00 <= x@y U=CALLER P=local-smtp S=sss
+1999-03-02 09:44:33 10HmaY-0005vi-00 <= x2@y U=CALLER P=local-smtp S=sss

 1999-03-02 09:44:33 10HmaY-0005vi-00 no immediate delivery: more than 1 messages received in one connection
 1999-03-02 09:44:33 rejected MAIL command U=CALLER: too many messages in one connection
 1999-03-02 09:44:33 rejected MAIL command U=CALLER: too many messages in one connection
 1999-03-02 09:44:33 10HmaY-0005vi-00 no immediate delivery: more than 1 messages received in one connection
 1999-03-02 09:44:33 rejected MAIL command U=CALLER: too many messages in one connection
 1999-03-02 09:44:33 rejected MAIL command U=CALLER: too many messages in one connection

diff --git a/test/log/0372 b/test/log/0372
index b4a7cbe3c643ce5ae3589602518fe9410c8c8264..034cdf9bf7359f0b60ae3d0c630aa145597971d9 100644 (file)
--- a/test/log/0372
+++ b/test/log/0372
@@ -1,10 +1,10 @@
-1999-03-02 09:44:33 10HmaY-0005vi-00 <= <> H=host.name [1.2.3.4] U=CALLER P=smtp S=sss
+1999-03-02 09:44:33 10HmaY-0005vi-00 <= <> H=host.name (test) [1.2.3.4] U=CALLER P=smtp S=sss

 1999-03-02 09:44:33 10HmaY-0005vi-00 => x <x@y> R=r1 T=t1
 1999-03-02 09:44:33 10HmaY-0005vi-00 Completed
 1999-03-02 09:44:33 10HmaY-0005vi-00 => x <x@y> R=r1 T=t1
 1999-03-02 09:44:33 10HmaY-0005vi-00 Completed

-1999-03-02 09:44:33 10HmaZ-0005vi-00 <= <> H=host.name [1.2.3.4] U=CALLER P=smtp S=sss
+1999-03-02 09:44:33 10HmaZ-0005vi-00 <= <> H=host.name (test) [1.2.3.4] U=CALLER P=smtp S=sss

 1999-03-02 09:44:33 10HmaZ-0005vi-00 => a <a@b> R=r1 T=t1
 1999-03-02 09:44:33 10HmaZ-0005vi-00 Completed
 1999-03-02 09:44:33 10HmaZ-0005vi-00 => a <a@b> R=r1 T=t1
 1999-03-02 09:44:33 10HmaZ-0005vi-00 Completed

-1999-03-02 09:44:33 10HmaX-0005vi-00 <= <> H=host2.name [4.3.2.1] U=CALLER P=smtp S=sss
+1999-03-02 09:44:33 10HmaX-0005vi-00 <= <> H=host2.name (test) [4.3.2.1] U=CALLER P=smtp S=sss

 1999-03-02 09:44:33 10HmaX-0005vi-00 Error in system filter: failed to expand "  acl_c0="$acl_c0"\n  acl_c1="$acl_c1"\n  acl_c2="$acl_c2"\n  acl_c3="$acl_c3"\n  acl_c4="$acl_c4"\n  acl_c5="$acl_c5"\n  acl_c6="$acl_c6"\n  acl_c7="$acl_c7"\n  acl_c8="$acl_c8"\n  acl_c9="$acl_c9"\n  acl_m0="$acl_m0"\n  acl_m1="$acl_m1"\n  acl_m2="$acl_m2"\n  acl_m3="$acl_m3"\n  acl_m4="$acl_m4"\n  acl_m5="$acl_m5"\n  acl_m6="$acl_m6"\n  acl_m7="$acl_m7"\n  acl_m8="$acl_m8"\n  acl_m9="$acl_m9"\n  acl_m_foo="$acl_m_foo"\n  acl_m_bar="$acl_m_bar"\n  acl_c_foo="$acl_c_foo"\n  acl_c_bar="$acl_c_bar"\n" in logwrite command: unknown variable name "acl_c1" (strict_acl_vars is set)
 
 ******** SERVER ********
 1999-03-02 09:44:33 10HmaX-0005vi-00 Error in system filter: failed to expand "  acl_c0="$acl_c0"\n  acl_c1="$acl_c1"\n  acl_c2="$acl_c2"\n  acl_c3="$acl_c3"\n  acl_c4="$acl_c4"\n  acl_c5="$acl_c5"\n  acl_c6="$acl_c6"\n  acl_c7="$acl_c7"\n  acl_c8="$acl_c8"\n  acl_c9="$acl_c9"\n  acl_m0="$acl_m0"\n  acl_m1="$acl_m1"\n  acl_m2="$acl_m2"\n  acl_m3="$acl_m3"\n  acl_m4="$acl_m4"\n  acl_m5="$acl_m5"\n  acl_m6="$acl_m6"\n  acl_m7="$acl_m7"\n  acl_m8="$acl_m8"\n  acl_m9="$acl_m9"\n  acl_m_foo="$acl_m_foo"\n  acl_m_bar="$acl_m_bar"\n  acl_c_foo="$acl_c_foo"\n  acl_c_bar="$acl_c_bar"\n" in logwrite command: unknown variable name "acl_c1" (strict_acl_vars is set)
 
 ******** SERVER ********

diff --git a/test/log/0376 b/test/log/0376
index 69e8326de563f84c9585e3363b80f6a56f929d3d..e6da43bab7fdd11dc53cf4a55cf56d55cee27d83 100644 (file)
--- a/test/log/0376
+++ b/test/log/0376
@@ -1,22 +1,22 @@
-1999-03-02 09:44:33 H=[V4NET.0.0.1] U=root sender verify defer for <ok@localhost>: Could not complete sender verify callout: 127.0.0.1 [127.0.0.1] : Connection refused
-1999-03-02 09:44:33 H=[V4NET.0.0.1] U=root F=<ok@localhost> temporarily rejected RCPT <z@test.ex>: Could not complete sender verify callout
-1999-03-02 09:44:33 H=[V4NET.0.0.1] U=root sender verify fail for <bad@localhost>: 127.0.0.1 [127.0.0.1] : SMTP error from remote mail server after RCPT TO:<bad@localhost>: 550 REJECTED
-1999-03-02 09:44:33 H=[V4NET.0.0.1] U=root F=<bad@localhost> rejected RCPT <z@test.ex>: (recipient): Sender verify failed
-1999-03-02 09:44:33 H=[V4NET.0.0.1] U=root sender verify fail for <bad@localhost>
-1999-03-02 09:44:33 H=[V4NET.0.0.1] U=root F=<bad@localhost> rejected RCPT <z@test.ex>: (recipient): Sender verify failed
-1999-03-02 09:44:33 H=[V4NET.0.0.1] U=root sender verify fail for <ok@localhost>: 127.0.0.1 [127.0.0.1] : response to "MAIL FROM:<>" was: 550 REJECT MAIL FROM
-1999-03-02 09:44:33 H=[V4NET.0.0.1] U=root F=<ok@localhost> rejected RCPT <z@test.ex>: (mail): Sender verify failed
-1999-03-02 09:44:33 H=[V4NET.0.0.1] U=root sender verify fail for <ok@localhost>
-1999-03-02 09:44:33 H=[V4NET.0.0.1] U=root F=<ok@localhost> rejected RCPT <z@test.ex>: (mail): Sender verify failed
-1999-03-02 09:44:33 H=[V4NET.0.0.2] U=root sender verify fail for <ok@otherhost>: 127.0.0.1 [127.0.0.1] : SMTP error from remote mail server after RCPT TO:<postmaster@otherhost>: 550 NOT OK
-1999-03-02 09:44:33 H=[V4NET.0.0.2] U=root F=<ok@otherhost> rejected RCPT <z@test.ex>: Sender verify failed
-1999-03-02 09:44:33 H=[V4NET.0.0.2] U=root sender verify fail for <ok@otherhost>
-1999-03-02 09:44:33 H=[V4NET.0.0.2] U=root F=<ok@otherhost> rejected RCPT <z@test.ex>: Sender verify failed
+1999-03-02 09:44:33 H=(test) [V4NET.0.0.1] U=root sender verify defer for <ok@localhost>: Could not complete sender verify callout: 127.0.0.1 [127.0.0.1] : Connection refused
+1999-03-02 09:44:33 H=(test) [V4NET.0.0.1] U=root F=<ok@localhost> temporarily rejected RCPT <z@test.ex>: Could not complete sender verify callout
+1999-03-02 09:44:33 H=(test) [V4NET.0.0.1] U=root sender verify fail for <bad@localhost>: 127.0.0.1 [127.0.0.1] : SMTP error from remote mail server after RCPT TO:<bad@localhost>: 550 REJECTED
+1999-03-02 09:44:33 H=(test) [V4NET.0.0.1] U=root F=<bad@localhost> rejected RCPT <z@test.ex>: (recipient): Sender verify failed
+1999-03-02 09:44:33 H=(test) [V4NET.0.0.1] U=root sender verify fail for <bad@localhost>
+1999-03-02 09:44:33 H=(test) [V4NET.0.0.1] U=root F=<bad@localhost> rejected RCPT <z@test.ex>: (recipient): Sender verify failed
+1999-03-02 09:44:33 H=(test) [V4NET.0.0.1] U=root sender verify fail for <ok@localhost>: 127.0.0.1 [127.0.0.1] : response to "MAIL FROM:<>" was: 550 REJECT MAIL FROM
+1999-03-02 09:44:33 H=(test) [V4NET.0.0.1] U=root F=<ok@localhost> rejected RCPT <z@test.ex>: (mail): Sender verify failed
+1999-03-02 09:44:33 H=(test) [V4NET.0.0.1] U=root sender verify fail for <ok@localhost>
+1999-03-02 09:44:33 H=(test) [V4NET.0.0.1] U=root F=<ok@localhost> rejected RCPT <z@test.ex>: (mail): Sender verify failed
+1999-03-02 09:44:33 H=(test) [V4NET.0.0.2] U=root sender verify fail for <ok@otherhost>: 127.0.0.1 [127.0.0.1] : SMTP error from remote mail server after RCPT TO:<postmaster@otherhost>: 550 NOT OK
+1999-03-02 09:44:33 H=(test) [V4NET.0.0.2] U=root F=<ok@otherhost> rejected RCPT <z@test.ex>: Sender verify failed
+1999-03-02 09:44:33 H=(test) [V4NET.0.0.2] U=root sender verify fail for <ok@otherhost>
+1999-03-02 09:44:33 H=(test) [V4NET.0.0.2] U=root F=<ok@otherhost> rejected RCPT <z@test.ex>: Sender verify failed

 1999-03-02 09:44:33 (random)
 1999-03-02 09:44:33 (random)
 1999-03-02 09:44:33 (random)
 1999-03-02 09:44:33 (random)
 1999-03-02 09:44:33 (random)
 1999-03-02 09:44:33 (random)
 1999-03-02 09:44:33 (random)
 1999-03-02 09:44:33 (random)

-1999-03-02 09:44:33 H=[V4NET.0.0.5] U=root sender verify defer for <okok@otherhost51>: Could not complete sender verify callout: 127.0.0.1 [127.0.0.1] : SMTP timeout after RCPT TO:<myhost.test.ex-dddddddd-testing@otherhost51>
-1999-03-02 09:44:33 H=[V4NET.0.0.5] U=root F=<okok@otherhost51> temporarily rejected RCPT <z@test.ex>: Could not complete sender verify callout
-1999-03-02 09:44:33 10HmaX-0005vi-00 <= ok7@otherhost53 H=[V4NET.0.0.7] U=root P=smtp S=sss
-1999-03-02 09:44:33 10HmaY-0005vi-00 <= ok7@otherhost53 H=[V4NET.0.0.8] U=root P=smtp S=sss
+1999-03-02 09:44:33 H=(test) [V4NET.0.0.5] U=root sender verify defer for <okok@otherhost51>: Could not complete sender verify callout: 127.0.0.1 [127.0.0.1] : SMTP timeout after RCPT TO:<myhost.test.ex-dddddddd-testing@otherhost51>
+1999-03-02 09:44:33 H=(test) [V4NET.0.0.5] U=root F=<okok@otherhost51> temporarily rejected RCPT <z@test.ex>: Could not complete sender verify callout
+1999-03-02 09:44:33 10HmaX-0005vi-00 <= ok7@otherhost53 H=(test) [V4NET.0.0.7] U=root P=smtp S=sss
+1999-03-02 09:44:33 10HmaY-0005vi-00 <= ok7@otherhost53 H=(test) [V4NET.0.0.8] U=root P=smtp S=sss

diff --git a/test/log/0386 b/test/log/0386
index 7f0426442259cb901ef51f89945df43beb50d5c1..bbed208e483919b464ed8e2499bba9611ad0314a 100644 (file)
--- a/test/log/0386
+++ b/test/log/0386
@@ -1,8 +1,8 @@
-1999-03-02 09:44:33 H=[V4NET.11.12.13] U=CALLER Warning: found in rbl.test.ex: This is a test blacklisting message
-1999-03-02 09:44:33 10HmaX-0005vi-00 <= x@y H=[V4NET.11.12.13] U=CALLER P=smtp S=sss
+1999-03-02 09:44:33 H=(test) [V4NET.11.12.13] U=CALLER Warning: found in rbl.test.ex: This is a test blacklisting message
+1999-03-02 09:44:33 10HmaX-0005vi-00 <= x@y H=(test) [V4NET.11.12.13] U=CALLER P=smtp S=sss

 1999-03-02 09:44:33 10HmaX-0005vi-00 => 2 <2@b> R=r1 T=t1
 1999-03-02 09:44:33 10HmaX-0005vi-00 Completed
 1999-03-02 09:44:33 10HmaX-0005vi-00 => 2 <2@b> R=r1 T=t1
 1999-03-02 09:44:33 10HmaX-0005vi-00 Completed

-1999-03-02 09:44:33 H=[V4NET.11.12.13] U=CALLER Warning: found in rbl.test.ex: This is a test blacklisting message
-1999-03-02 09:44:33 10HmaY-0005vi-00 <= x@y H=[V4NET.11.12.13] U=CALLER P=smtp S=sss
+1999-03-02 09:44:33 H=(test) [V4NET.11.12.13] U=CALLER Warning: found in rbl.test.ex: This is a test blacklisting message
+1999-03-02 09:44:33 10HmaY-0005vi-00 <= x@y H=(test) [V4NET.11.12.13] U=CALLER P=smtp S=sss

 1999-03-02 09:44:33 10HmaY-0005vi-00 => 2 <2@b> R=r1 T=t1
 1999-03-02 09:44:33 10HmaY-0005vi-00 Completed
 1999-03-02 09:44:33 10HmaY-0005vi-00 => 2 <2@b> R=r1 T=t1
 1999-03-02 09:44:33 10HmaY-0005vi-00 Completed

diff --git a/test/log/0387 b/test/log/0387
index d83ecc3cc667c806dfa7f67f03f53d4c5fd12df9..04163ff30236ba02b1335398787278ac3025231a 100644 (file)
--- a/test/log/0387
+++ b/test/log/0387
@@ -1,2 +1,2 @@
 1999-03-02 09:44:33 U=CALLER F=<x@b.c.a> rejected RCPT <x@y>
 1999-03-02 09:44:33 U=CALLER F=<x@b.c.a> rejected RCPT <x@y>

-1999-03-02 09:44:33 H=[1.2.3.4] U=CALLER F=<x@b.c.a> rejected RCPT <x@y>
+1999-03-02 09:44:33 H=(test) [1.2.3.4] U=CALLER F=<x@b.c.a> rejected RCPT <x@y>

diff --git a/test/log/0453 b/test/log/0453
index 4ca61142b89986566d53d2fb997cff9d1b2bf75c..c191382ecd102f502f4f27764bdd70010bc5433c 100644 (file)
--- a/test/log/0453
+++ b/test/log/0453
@@ -3,4 +3,4 @@
 1999-03-02 09:44:33 rejected HELO from CALLER: syntactically invalid argument(s): (no argument given)
 1999-03-02 09:44:33 rejected HELO from CALLER: syntactically invalid argument(s): (no argument given)
 1999-03-02 09:44:33 SMTP call from CALLER dropped: too many syntax or protocol errors (last command was "helo",  C=HELO,HELO,HELO,HELO)
 1999-03-02 09:44:33 rejected HELO from CALLER: syntactically invalid argument(s): (no argument given)
 1999-03-02 09:44:33 rejected HELO from CALLER: syntactically invalid argument(s): (no argument given)
 1999-03-02 09:44:33 SMTP call from CALLER dropped: too many syntax or protocol errors (last command was "helo",  C=HELO,HELO,HELO,HELO)

-1999-03-02 09:44:33 SMTP call from CALLER dropped: too many syntax or protocol errors (last command was "mail from:<>",  C=MAIL,MAIL,MAIL)
+1999-03-02 09:44:33 SMTP call from CALLER dropped: too many syntax or protocol errors (last command was "mail from:<>",  C=HELO,MAIL,MAIL,MAIL)

diff --git a/test/log/0462 b/test/log/0462
index d0a04dacba48a05853ba9c4f57e6549d8cb00487..bdb6e0c144b6d24cde2a3eb4dd6975f48c796ea5 100644 (file)
--- a/test/log/0462
+++ b/test/log/0462
@@ -1,5 +1,5 @@
-1999-03-02 09:44:33 H=[V4NET.0.0.1] U=root sender verify fail for <Ok@localhost>: 127.0.0.1 [127.0.0.1] : SMTP error from remote mail server after RCPT TO:<postmaster@localhost>: 550 NO
-1999-03-02 09:44:33 H=[V4NET.0.0.1] U=root F=<Ok@localhost> rejected RCPT <checkpm@test.ex>: Sender verify failed
-1999-03-02 09:44:33 H=[V4NET.0.0.2] U=root sender verify fail for <NOTok@elsewhere>: 127.0.0.1 [127.0.0.1] : SMTP error from remote mail server after RCPT TO:<NOTok@elsewhere>: 550 NO
-1999-03-02 09:44:33 H=[V4NET.0.0.2] U=root F=<NOTok@elsewhere> rejected RCPT <nocheckpm@test.ex>: Sender verify failed
-1999-03-02 09:44:33 H=[V4NET.0.0.2] U=root F=<NOTok2@elsewhere> rejected RCPT <nocheckpm@test.ex>: Sender verify failed
+1999-03-02 09:44:33 H=(test) [V4NET.0.0.1] U=root sender verify fail for <Ok@localhost>: 127.0.0.1 [127.0.0.1] : SMTP error from remote mail server after RCPT TO:<postmaster@localhost>: 550 NO
+1999-03-02 09:44:33 H=(test) [V4NET.0.0.1] U=root F=<Ok@localhost> rejected RCPT <checkpm@test.ex>: Sender verify failed
+1999-03-02 09:44:33 H=(test) [V4NET.0.0.2] U=root sender verify fail for <NOTok@elsewhere>: 127.0.0.1 [127.0.0.1] : SMTP error from remote mail server after RCPT TO:<NOTok@elsewhere>: 550 NO
+1999-03-02 09:44:33 H=(test) [V4NET.0.0.2] U=root F=<NOTok@elsewhere> rejected RCPT <nocheckpm@test.ex>: Sender verify failed
+1999-03-02 09:44:33 H=(test) [V4NET.0.0.2] U=root F=<NOTok2@elsewhere> rejected RCPT <nocheckpm@test.ex>: Sender verify failed

diff --git a/test/log/0578 b/test/log/0578
index faa062ecbade92e22e2a0547147f134d5bd37278..7940de6c10b1dd0e2cb2a3fdc6e3355b1577b86e 100644 (file)
--- a/test/log/0578
+++ b/test/log/0578
@@ -1,22 +1,22 @@
-1999-03-02 09:44:33 H=[V4NET.0.0.1] U=root sender verify defer for <ok@localhost>: Could not complete sender verify callout: 127.0.0.1 [127.0.0.1] : Connection refused
-1999-03-02 09:44:33 H=[V4NET.0.0.1] U=root F=<ok@localhost> temporarily rejected RCPT <z@test.ex>: Could not complete sender verify callout
-1999-03-02 09:44:33 H=[V4NET.0.0.1] U=root sender verify fail for <bad@localhost>: 127.0.0.1 [127.0.0.1] : SMTP error from remote mail server after RCPT TO:<bad@localhost>: 550 REJECTED rcpt
-1999-03-02 09:44:33 H=[V4NET.0.0.1] U=root F=<bad@localhost> rejected RCPT <z@test.ex>: (recipient): Sender verify failed
-1999-03-02 09:44:33 H=[V4NET.0.0.1] U=root sender verify fail for <bad@localhost>
-1999-03-02 09:44:33 H=[V4NET.0.0.1] U=root F=<bad@localhost> rejected RCPT <z@test.ex>: (recipient): Sender verify failed
-1999-03-02 09:44:33 H=[V4NET.0.0.1] U=root sender verify fail for <ok@localhost>: 127.0.0.1 [127.0.0.1] : response to "MAIL FROM:<>" was: 550 REJECT mail from
-1999-03-02 09:44:33 H=[V4NET.0.0.1] U=root F=<ok@localhost> rejected RCPT <z@test.ex>: (mail): Sender verify failed
-1999-03-02 09:44:33 H=[V4NET.0.0.1] U=root sender verify fail for <ok@localhost>
-1999-03-02 09:44:33 H=[V4NET.0.0.1] U=root F=<ok@localhost> rejected RCPT <z@test.ex>: (mail): Sender verify failed
-1999-03-02 09:44:33 H=[V4NET.0.0.2] U=root sender verify fail for <ok@otherhost>: 127.0.0.1 [127.0.0.1] : SMTP error from remote mail server after RCPT TO:<postmaster@otherhost>: 550 NOT OK rcpt postmaster
-1999-03-02 09:44:33 H=[V4NET.0.0.2] U=root F=<ok@otherhost> rejected RCPT <z@test.ex>: Sender verify failed
-1999-03-02 09:44:33 H=[V4NET.0.0.2] U=root sender verify fail for <ok@otherhost>
-1999-03-02 09:44:33 H=[V4NET.0.0.2] U=root F=<ok@otherhost> rejected RCPT <z@test.ex>: Sender verify failed
+1999-03-02 09:44:33 H=(test) [V4NET.0.0.1] U=root sender verify defer for <ok@localhost>: Could not complete sender verify callout: 127.0.0.1 [127.0.0.1] : Connection refused
+1999-03-02 09:44:33 H=(test) [V4NET.0.0.1] U=root F=<ok@localhost> temporarily rejected RCPT <z@test.ex>: Could not complete sender verify callout
+1999-03-02 09:44:33 H=(test) [V4NET.0.0.1] U=root sender verify fail for <bad@localhost>: 127.0.0.1 [127.0.0.1] : SMTP error from remote mail server after RCPT TO:<bad@localhost>: 550 REJECTED rcpt
+1999-03-02 09:44:33 H=(test) [V4NET.0.0.1] U=root F=<bad@localhost> rejected RCPT <z@test.ex>: (recipient): Sender verify failed
+1999-03-02 09:44:33 H=(test) [V4NET.0.0.1] U=root sender verify fail for <bad@localhost>
+1999-03-02 09:44:33 H=(test) [V4NET.0.0.1] U=root F=<bad@localhost> rejected RCPT <z@test.ex>: (recipient): Sender verify failed
+1999-03-02 09:44:33 H=(test) [V4NET.0.0.1] U=root sender verify fail for <ok@localhost>: 127.0.0.1 [127.0.0.1] : response to "MAIL FROM:<>" was: 550 REJECT mail from
+1999-03-02 09:44:33 H=(test) [V4NET.0.0.1] U=root F=<ok@localhost> rejected RCPT <z@test.ex>: (mail): Sender verify failed
+1999-03-02 09:44:33 H=(test) [V4NET.0.0.1] U=root sender verify fail for <ok@localhost>
+1999-03-02 09:44:33 H=(test) [V4NET.0.0.1] U=root F=<ok@localhost> rejected RCPT <z@test.ex>: (mail): Sender verify failed
+1999-03-02 09:44:33 H=(test) [V4NET.0.0.2] U=root sender verify fail for <ok@otherhost>: 127.0.0.1 [127.0.0.1] : SMTP error from remote mail server after RCPT TO:<postmaster@otherhost>: 550 NOT OK rcpt postmaster
+1999-03-02 09:44:33 H=(test) [V4NET.0.0.2] U=root F=<ok@otherhost> rejected RCPT <z@test.ex>: Sender verify failed
+1999-03-02 09:44:33 H=(test) [V4NET.0.0.2] U=root sender verify fail for <ok@otherhost>
+1999-03-02 09:44:33 H=(test) [V4NET.0.0.2] U=root F=<ok@otherhost> rejected RCPT <z@test.ex>: Sender verify failed

 1999-03-02 09:44:33 (random)
 1999-03-02 09:44:33 (random)
 1999-03-02 09:44:33 (random)
 1999-03-02 09:44:33 (random)
 1999-03-02 09:44:33 (random)
 1999-03-02 09:44:33 (random)
 1999-03-02 09:44:33 (random)
 1999-03-02 09:44:33 (random)

-1999-03-02 09:44:33 H=[V4NET.0.0.5] U=root sender verify defer for <okok@otherhost51>: Could not complete sender verify callout: 127.0.0.1 [127.0.0.1] : SMTP timeout after RCPT TO:<myhost.test.ex-dddddddd-testing@otherhost51>
-1999-03-02 09:44:33 H=[V4NET.0.0.5] U=root F=<okok@otherhost51> temporarily rejected RCPT <z@test.ex>: Could not complete sender verify callout
-1999-03-02 09:44:33 10HmaX-0005vi-00 <= ok7@otherhost53 H=[V4NET.0.0.7] U=root P=smtp S=sss
-1999-03-02 09:44:33 10HmaY-0005vi-00 <= ok7@otherhost53 H=[V4NET.0.0.8] U=root P=smtp S=sss
+1999-03-02 09:44:33 H=(test) [V4NET.0.0.5] U=root sender verify defer for <okok@otherhost51>: Could not complete sender verify callout: 127.0.0.1 [127.0.0.1] : SMTP timeout after RCPT TO:<myhost.test.ex-dddddddd-testing@otherhost51>
+1999-03-02 09:44:33 H=(test) [V4NET.0.0.5] U=root F=<okok@otherhost51> temporarily rejected RCPT <z@test.ex>: Could not complete sender verify callout
+1999-03-02 09:44:33 10HmaX-0005vi-00 <= ok7@otherhost53 H=(test) [V4NET.0.0.7] U=root P=smtp S=sss
+1999-03-02 09:44:33 10HmaY-0005vi-00 <= ok7@otherhost53 H=(test) [V4NET.0.0.8] U=root P=smtp S=sss

diff --git a/test/log/0609 b/test/log/0609
index 55c0476c6c627800c46c73c7e583c027b9daf17c..10e8e5959a6e1de87dada93ea0540ddde0400617 100644 (file)
--- a/test/log/0609
+++ b/test/log/0609
@@ -2,6 +2,6 @@
 ******** SERVER ********
 1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D
 1999-03-02 09:44:33 SMTP connection from [127.0.0.1] (TCP/IP connection count = 1)
 ******** SERVER ********
 1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D
 1999-03-02 09:44:33 SMTP connection from [127.0.0.1] (TCP/IP connection count = 1)

-1999-03-02 09:44:33 SMTP connection from [127.0.0.1] closed by QUIT
+1999-03-02 09:44:33 SMTP connection from (test) [127.0.0.1] closed by QUIT

 1999-03-02 09:44:33 SMTP connection from [127.0.0.1] (TCP/IP connection count = 1)
 1999-03-02 09:44:33 SMTP connection from [127.0.0.1] (TCP/IP connection count = 1)

-1999-03-02 09:44:33 unexpected disconnection while reading SMTP command from [127.0.0.1] D=qqs
+1999-03-02 09:44:33 unexpected disconnection while reading SMTP command from (test) [127.0.0.1] D=qqs

diff --git a/test/log/1103 b/test/log/1103
index fb09e79fc5e28299ac5fb4798a3bb4838bf0269b..8c21fd63de02143d9fb4a632d074eb3d10dc0d7e 100644 (file)
--- a/test/log/1103
+++ b/test/log/1103
@@ -5,5 +5,5 @@
 
 ******** SERVER ********
 1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D
 
 ******** SERVER ********
 1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D

-1999-03-02 09:44:33 H=[ip4.ip4.ip4.ip4] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no F=<userx@test.ex> rejected RCPT <userx@test.ex>: unacceptable cipher TLS1.x:ke-RSA-AES256-SHAnnn:xxx
+1999-03-02 09:44:33 H=(test) [ip4.ip4.ip4.ip4] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no F=<userx@test.ex> rejected RCPT <userx@test.ex>: unacceptable cipher TLS1.x:ke-RSA-AES256-SHAnnn:xxx

 1999-03-02 09:44:33 10HmaX-0005vi-00 <= userx@test.ex H=(rhu.barb) [127.0.0.1] P=smtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss
 1999-03-02 09:44:33 10HmaX-0005vi-00 <= userx@test.ex H=(rhu.barb) [127.0.0.1] P=smtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss

diff --git a/test/log/1105 b/test/log/1105
index cfe8981bd68f16fe1864ed8606e4dddb80c0b364..3e13156f375aac152015b9323fb6a224fa99156a 100644 (file)
--- a/test/log/1105
+++ b/test/log/1105
@@ -3,4 +3,4 @@
 
 ******** SERVER ********
 1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D
 
 ******** SERVER ********
 1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D

-1999-03-02 09:44:33 H=[127.0.0.1] F=<userx@test.ex> rejected RCPT <userx@remote.test.ex>: encryption required
+1999-03-02 09:44:33 H=(test) [127.0.0.1] F=<userx@test.ex> rejected RCPT <userx@remote.test.ex>: encryption required

diff --git a/test/log/1108 b/test/log/1108
index f45aba39198efc65f3a5f02538e89376b158efef..5f19de341128c9700eb3c8a0855971db6f02f303 100644 (file)
--- a/test/log/1108
+++ b/test/log/1108
@@ -1,5 +1,5 @@
 
 ******** SERVER ********
 1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D
 
 ******** SERVER ********
 1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D

-1999-03-02 09:44:33 10HmaX-0005vi-00 <= userx@test.ex H=[127.0.0.1] P=smtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss
+1999-03-02 09:44:33 10HmaX-0005vi-00 <= userx@test.ex H=(rhu.barb) [127.0.0.1] P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss

 1999-03-02 09:44:33 H=(rhu.barb) [127.0.0.1] F=<userx@test.ex> rejected RCPT <userx@test.ex>: "You must encrypt"
 1999-03-02 09:44:33 H=(rhu.barb) [127.0.0.1] F=<userx@test.ex> rejected RCPT <userx@test.ex>: "You must encrypt"

diff --git a/test/log/1110 b/test/log/1110
index fc4b59e3cabc8e4a035a6995b3f07d098695e971..450b9b46f0f6bf9b78b2b9db6f140b6776d472e8 100644 (file)
--- a/test/log/1110
+++ b/test/log/1110
@@ -8,4 +8,4 @@
 ******** SERVER ********
 1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTPS on port PORT_D
 1999-03-02 09:44:33 10HmaX-0005vi-00 <= userx@test.ex H=(rhu.barb) [127.0.0.1] P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss
 ******** SERVER ********
 1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTPS on port PORT_D
 1999-03-02 09:44:33 10HmaX-0005vi-00 <= userx@test.ex H=(rhu.barb) [127.0.0.1] P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss

-1999-03-02 09:44:33 10HmaY-0005vi-00 <= userx@test.ex H=[ip4.ip4.ip4.ip4] P=smtp X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=yes S=sss
+1999-03-02 09:44:33 10HmaY-0005vi-00 <= userx@test.ex H=(test) [ip4.ip4.ip4.ip4] P=smtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=yes S=sss

diff --git a/test/log/2002 b/test/log/2002
index 0641b50836034bcd7d5abf0ce35f883f0a93324c..7289b2caa70900f52c08c58549a772e5d23d23b7 100644 (file)
--- a/test/log/2002
+++ b/test/log/2002
@@ -15,10 +15,10 @@
 1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D
 1999-03-02 09:44:33 Our cert SN: <CN=server1.example.com>
 1999-03-02 09:44:33 Peer did not present a cert
 1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D
 1999-03-02 09:44:33 Our cert SN: <CN=server1.example.com>
 1999-03-02 09:44:33 Peer did not present a cert

-1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@test.ex H=[127.0.0.1] P=smtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss
+1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@test.ex H=(rhu.barb) [127.0.0.1] P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss

 1999-03-02 09:44:33 Our cert SN: <CN=server1.example.com>
 1999-03-02 09:44:33 Peer did not present a cert
 1999-03-02 09:44:33 Our cert SN: <CN=server1.example.com>
 1999-03-02 09:44:33 Peer did not present a cert

-1999-03-02 09:44:33 10HmaY-0005vi-00 <= "name with spaces"@test.ex H=[127.0.0.1] P=smtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss
+1999-03-02 09:44:33 10HmaY-0005vi-00 <= "name with spaces"@test.ex H=(test) [127.0.0.1] P=smtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss

 1999-03-02 09:44:33 TLS error on connection from (rhu.barb) [ip4.ip4.ip4.ip4] (gnutls_handshake): The peer did not send any certificate.
 1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D
 1999-03-02 09:44:33 Our cert SN: <CN=server1.example.com>
 1999-03-02 09:44:33 TLS error on connection from (rhu.barb) [ip4.ip4.ip4.ip4] (gnutls_handshake): The peer did not send any certificate.
 1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D
 1999-03-02 09:44:33 Our cert SN: <CN=server1.example.com>


@@ -44,10 +44,10 @@
 1999-03-02 09:44:33 cipher: TLS1.x:ke-RSA-AES256-SHAnnn:xxx
 1999-03-02 09:44:33 cipher_ TLS1.x:ke_RSA_WITH_ci_mac
 1999-03-02 09:44:33 ver:    TLS1.x
 1999-03-02 09:44:33 cipher: TLS1.x:ke-RSA-AES256-SHAnnn:xxx
 1999-03-02 09:44:33 cipher_ TLS1.x:ke_RSA_WITH_ci_mac
 1999-03-02 09:44:33 ver:    TLS1.x

-1999-03-02 09:44:33 10HmaZ-0005vi-00 <= CALLER@test.ex H=[ip4.ip4.ip4.ip4] P=smtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=yes DN="CN=server2.example.com" S=sss
+1999-03-02 09:44:33 10HmaZ-0005vi-00 <= CALLER@test.ex H=(test) [ip4.ip4.ip4.ip4] P=smtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=yes DN="CN=server2.example.com" S=sss

 1999-03-02 09:44:33 Our cert SN: <CN=server1.example.com>
 1999-03-02 09:44:33 Peer did not present a cert
 1999-03-02 09:44:33 Our cert SN: <CN=server1.example.com>
 1999-03-02 09:44:33 Peer did not present a cert

-1999-03-02 09:44:33 10HmbA-0005vi-00 <= CALLER@test.ex H=[127.0.0.1] P=smtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss
+1999-03-02 09:44:33 10HmbA-0005vi-00 <= CALLER@test.ex H=(test) [127.0.0.1] P=smtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss

 1999-03-02 09:44:33 Our cert SN: <CN=server1.example_ec.com>
 1999-03-02 09:44:33 Peer did not present a cert
 1999-03-02 09:44:33 Our cert SN: <CN=server1.example_ec.com>
 1999-03-02 09:44:33 Peer did not present a cert

-1999-03-02 09:44:33 10HmbB-0005vi-00 <= CALLER@test.ex H=[127.0.0.1] P=smtps X=TLS1.x:ke-ECDSA-AES256-SHAnnn:xxx CV=no S=sss
+1999-03-02 09:44:33 10HmbB-0005vi-00 <= CALLER@test.ex H=(test) [127.0.0.1] P=smtps X=TLS1.x:ke-ECDSA-AES256-SHAnnn:xxx CV=no S=sss

diff --git a/test/log/2014 b/test/log/2014
index 1fa2acec8128aa70565d3bcfcc21cbe41ff77831..c800ab7bca3c63dd0f07ac33014871168eff42ae 100644 (file)
--- a/test/log/2014
+++ b/test/log/2014
@@ -4,7 +4,7 @@
 1999-03-02 09:44:33 TLS error on connection from (rhu1.barb) [ip4.ip4.ip4.ip4] (gnutls_handshake): The peer did not send any certificate.
 1999-03-02 09:44:33 H=(rhu2tls.barb) [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no F=<userx@test.ex> rejected RCPT <userx@test.ex>: certificate not verified: peerdn=
 1999-03-02 09:44:33 TLS error on connection from (rhu5.barb) [ip4.ip4.ip4.ip4] (gnutls_handshake): The peer did not send any certificate.
 1999-03-02 09:44:33 TLS error on connection from (rhu1.barb) [ip4.ip4.ip4.ip4] (gnutls_handshake): The peer did not send any certificate.
 1999-03-02 09:44:33 H=(rhu2tls.barb) [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no F=<userx@test.ex> rejected RCPT <userx@test.ex>: certificate not verified: peerdn=
 1999-03-02 09:44:33 TLS error on connection from (rhu5.barb) [ip4.ip4.ip4.ip4] (gnutls_handshake): The peer did not send any certificate.

-1999-03-02 09:44:33 H=[127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no F=<userx@test.ex> rejected RCPT <userx@test.ex>: certificate not verified: peerdn=
+1999-03-02 09:44:33 H=(test) [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no F=<userx@test.ex> rejected RCPT <userx@test.ex>: certificate not verified: peerdn=

 1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D
 1999-03-02 09:44:33 TLS error on connection from (rhu7.barb) [ip4.ip4.ip4.ip4] (certificate verification failed): certificate revoked
 1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D
 1999-03-02 09:44:33 TLS error on connection from (rhu7.barb) [ip4.ip4.ip4.ip4] (certificate verification failed): certificate revoked

-1999-03-02 09:44:33 H=[127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no DN="CN=revoked1.example.com" F=<userx@test.ex> rejected RCPT <userx@test.ex>: certificate not verified: peerdn=CN=revoked1.example.com
+1999-03-02 09:44:33 H=(test) [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no DN="CN=revoked1.example.com" F=<userx@test.ex> rejected RCPT <userx@test.ex>: certificate not verified: peerdn=CN=revoked1.example.com

diff --git a/test/log/2029 b/test/log/2029
index 6d1107c7d7d7a7eadab87274f9522c61d5d12be5..8100e40dad38190117bf51bf6b8ed54e808ab51a 100644 (file)
--- a/test/log/2029
+++ b/test/log/2029
@@ -1,5 +1,5 @@
 
 ******** SERVER ********
 1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D
 
 ******** SERVER ********
 1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D

-1999-03-02 09:44:33 10HmaX-0005vi-00 TLS error on connection from [127.0.0.1] (recv): The TLS connection was non-properly terminated.
-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 10HmaX-0005vi-00 TLS error on connection from (test) [127.0.0.1] (recv): The TLS connection was non-properly terminated.
+1999-03-02 09:44:33 10HmaX-0005vi-00 SMTP connection lost after final dot H=(test) [127.0.0.1] P=smtps

diff --git a/test/log/2102.openssl_1_1_1 b/test/log/2102.openssl_1_1_1
index 67d6c7ea65113f411c376af343aea9f9ca860cf7..0863d2536440a81548a5884958224d163e86ffe1 100644 (file)
--- a/test/log/2102.openssl_1_1_1
+++ b/test/log/2102.openssl_1_1_1
@@ -13,10 +13,10 @@
 1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D
 1999-03-02 09:44:33 Our cert SN: <CN=server1.example.com>
 1999-03-02 09:44:33 Peer did not present a cert
 1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D
 1999-03-02 09:44:33 Our cert SN: <CN=server1.example.com>
 1999-03-02 09:44:33 Peer did not present a cert

-1999-03-02 09:44:33 10HmaX-0005vi-00 <= a@test.ex H=[127.0.0.1] P=smtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss
+1999-03-02 09:44:33 10HmaX-0005vi-00 <= a@test.ex H=(rhu.barb) [127.0.0.1] P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss

 1999-03-02 09:44:33 Our cert SN: <CN=server1.example.com>
 1999-03-02 09:44:33 Peer did not present a cert
 1999-03-02 09:44:33 Our cert SN: <CN=server1.example.com>
 1999-03-02 09:44:33 Peer did not present a cert

-1999-03-02 09:44:33 10HmaY-0005vi-00 <= "name with spaces"@test.ex H=[127.0.0.1] P=smtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss
+1999-03-02 09:44:33 10HmaY-0005vi-00 <= "name with spaces"@test.ex H=(rhu.barb) [127.0.0.1] P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss

 1999-03-02 09:44:33 TLS error on connection from (rhu.barb) [ip4.ip4.ip4.ip4] (SSL_accept): error: <<detail omitted>>
 1999-03-02 09:44:33 Our cert SN: <CN=server1.example.com>
 1999-03-02 09:44:33 Peer cert:
 1999-03-02 09:44:33 TLS error on connection from (rhu.barb) [ip4.ip4.ip4.ip4] (SSL_accept): error: <<detail omitted>>
 1999-03-02 09:44:33 Our cert SN: <CN=server1.example.com>
 1999-03-02 09:44:33 Peer cert:


@@ -42,8 +42,8 @@
 1999-03-02 09:44:33 cipher: TLS1.x:ke-RSA-AES256-SHAnnn:xxx
 1999-03-02 09:44:33 cipher_ TLS1.x:ke_RSA_WITH_ci_mac
 1999-03-02 09:44:33 ver:    TLS1.x
 1999-03-02 09:44:33 cipher: TLS1.x:ke-RSA-AES256-SHAnnn:xxx
 1999-03-02 09:44:33 cipher_ TLS1.x:ke_RSA_WITH_ci_mac
 1999-03-02 09:44:33 ver:    TLS1.x

-1999-03-02 09:44:33 10HmaZ-0005vi-00 <= b@test.ex H=[ip4.ip4.ip4.ip4] P=smtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=yes DN="/CN=server2.example.com" S=sss
+1999-03-02 09:44:33 10HmaZ-0005vi-00 <= b@test.ex H=(rhu.barb) [ip4.ip4.ip4.ip4] P=esmtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=yes DN="/CN=server2.example.com" S=sss

 1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D
 1999-03-02 09:44:33 Our cert SN: <CN=server1.example_ec.com>
 1999-03-02 09:44:33 Peer did not present a cert
 1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D
 1999-03-02 09:44:33 Our cert SN: <CN=server1.example_ec.com>
 1999-03-02 09:44:33 Peer did not present a cert

-1999-03-02 09:44:33 10HmbA-0005vi-00 <= c@test.ex H=[127.0.0.1] P=smtps X=TLS1.x:ke-ECDSA-AES256-SHAnnn:xxx CV=no S=sss
+1999-03-02 09:44:33 10HmbA-0005vi-00 <= c@test.ex H=(rhu.barb) [127.0.0.1] P=esmtps X=TLS1.x:ke-ECDSA-AES256-SHAnnn:xxx CV=no S=sss

diff --git a/test/log/2114 b/test/log/2114
index 149442fd3b264e57d0cf8d4335dcf735b217d201..511cdc9664c1e3f86ee158e212187d042b6e365f 100644 (file)
--- a/test/log/2114
+++ b/test/log/2114
@@ -7,9 +7,9 @@
 1999-03-02 09:44:33 TLS error on connection from (rhu.barb) [ip4.ip4.ip4.ip4] (SSL_accept): error: <<detail omitted>>
 1999-03-02 09:44:33 [127.0.0.1] SSL verify error: depth=0 error=unable to get local issuer certificate cert=/CN=server1.example.net
 1999-03-02 09:44:33 [127.0.0.1] SSL verify error: depth=0 error=unable to verify the first certificate cert=/CN=server1.example.net
 1999-03-02 09:44:33 TLS error on connection from (rhu.barb) [ip4.ip4.ip4.ip4] (SSL_accept): error: <<detail omitted>>
 1999-03-02 09:44:33 [127.0.0.1] SSL verify error: depth=0 error=unable to get local issuer certificate cert=/CN=server1.example.net
 1999-03-02 09:44:33 [127.0.0.1] SSL verify error: depth=0 error=unable to verify the first certificate cert=/CN=server1.example.net

-1999-03-02 09:44:33 H=[127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no DN="/CN=server1.example.net" F=<userx@test.ex> rejected RCPT <userx@test.ex>: certificate not verified: peerdn=/CN=server1.example.net
+1999-03-02 09:44:33 H=(test) [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no DN="/CN=server1.example.net" F=<userx@test.ex> rejected RCPT <userx@test.ex>: certificate not verified: peerdn=/CN=server1.example.net

 1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D
 1999-03-02 09:44:33 [ip4.ip4.ip4.ip4] SSL verify error: depth=0 error=certificate revoked cert=/CN=revoked1.example.com
 1999-03-02 09:44:33 TLS error on connection from (rhu.barb) [ip4.ip4.ip4.ip4] (SSL_accept): error: <<detail omitted>>
 1999-03-02 09:44:33 [127.0.0.1] SSL verify error: depth=0 error=certificate revoked cert=/CN=revoked1.example.com
 1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D
 1999-03-02 09:44:33 [ip4.ip4.ip4.ip4] SSL verify error: depth=0 error=certificate revoked cert=/CN=revoked1.example.com
 1999-03-02 09:44:33 TLS error on connection from (rhu.barb) [ip4.ip4.ip4.ip4] (SSL_accept): error: <<detail omitted>>
 1999-03-02 09:44:33 [127.0.0.1] SSL verify error: depth=0 error=certificate revoked cert=/CN=revoked1.example.com

-1999-03-02 09:44:33 H=[127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no DN="/CN=revoked1.example.com" F=<userx@test.ex> rejected RCPT <userx@test.ex>: certificate not verified: peerdn=/CN=revoked1.example.com
+1999-03-02 09:44:33 H=(test) [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no DN="/CN=revoked1.example.com" F=<userx@test.ex> rejected RCPT <userx@test.ex>: certificate not verified: peerdn=/CN=revoked1.example.com

diff --git a/test/log/2132 b/test/log/2132
index f38f0a12769c7814b64cb6d7e1c737ef700f0f51..605f750f7a004eeda633da8db528be3c15a24452 100644 (file)
--- a/test/log/2132
+++ b/test/log/2132
@@ -11,11 +11,11 @@
 1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D
 1999-03-02 09:44:33 Our cert SN: <CN=server2.example.com>
 1999-03-02 09:44:33 Peer did not present a cert
 1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D
 1999-03-02 09:44:33 Our cert SN: <CN=server2.example.com>
 1999-03-02 09:44:33 Peer did not present a cert

-1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@test.ex H=[127.0.0.1] P=smtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss
+1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@test.ex H=(test) [127.0.0.1] P=smtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss

 1999-03-02 09:44:33 Our cert SN: <CN=server2.example.com>
 1999-03-02 09:44:33 Peer did not present a cert
 1999-03-02 09:44:33 Our cert SN: <CN=server2.example.com>
 1999-03-02 09:44:33 Peer did not present a cert

-1999-03-02 09:44:33 10HmaY-0005vi-00 <= "name with spaces"@test.ex H=[127.0.0.1] P=smtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss
+1999-03-02 09:44:33 10HmaY-0005vi-00 <= "name with spaces"@test.ex H=(test) [127.0.0.1] P=smtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no S=sss

 1999-03-02 09:44:33 TLS error on connection from (rhu.barb) [ip4.ip4.ip4.ip4] (SSL_accept): error: <<detail omitted>>
 1999-03-02 09:44:33 Our cert SN: <CN=server2.example.com>
 1999-03-02 09:44:33 SN  <CN=server1.example.com>
 1999-03-02 09:44:33 TLS error on connection from (rhu.barb) [ip4.ip4.ip4.ip4] (SSL_accept): error: <<detail omitted>>
 1999-03-02 09:44:33 Our cert SN: <CN=server2.example.com>
 1999-03-02 09:44:33 SN  <CN=server1.example.com>

-1999-03-02 09:44:33 10HmaZ-0005vi-00 <= CALLER@test.ex H=[ip4.ip4.ip4.ip4] P=smtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=yes DN="/CN=server1.example.com" S=sss
+1999-03-02 09:44:33 10HmaZ-0005vi-00 <= CALLER@test.ex H=(test) [ip4.ip4.ip4.ip4] P=smtps X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=yes DN="/CN=server1.example.com" S=sss

diff --git a/test/log/2150 b/test/log/2150
index 55c8b0edc44c8eb318f0b3cd54e7841477f865c0..5bafd09b8049990fa6f7c24f1ec7b9b00bd7dbb8 100644 (file)
--- a/test/log/2150
+++ b/test/log/2150
@@ -1,4 +1,4 @@
 
 ******** SERVER ********
 1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D
 
 ******** SERVER ********
 1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D

-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 10HmaX-0005vi-00 SMTP connection lost after final dot H=(test) [127.0.0.1] P=smtps

diff --git a/test/mail/0005.CALLER b/test/mail/0005.CALLER
index cde2b58c501c9f5f463d524164d66a5e3a6e121c..5494e4bda14b9bd7990daead7d2fefee14afa608 100644 (file)
--- a/test/mail/0005.CALLER
+++ b/test/mail/0005.CALLER
@@ -2,7 +2,8 @@ From someone@some.domain Tue Mar 02 09:44:33 1999
 Return-path: <someone@some.domain>
 Envelope-to: CALLER@the.local.host.name
 Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Return-path: <someone@some.domain>
 Envelope-to: CALLER@the.local.host.name
 Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000

-Received: from CALLER by the.local.host.name with local-smtp (Exim x.yz)
+Received: from CALLER (helo=test)
+       by the.local.host.name with local-smtp (Exim x.yz)

        (envelope-from <someone@some.domain>)
        id 10HmaX-0005vi-00
        for CALLER@the.local.host.name;
        (envelope-from <someone@some.domain>)
        id 10HmaX-0005vi-00
        for CALLER@the.local.host.name;


@@ -13,7 +14,7 @@ Date: Tue, 2 Mar 1999 09:44:33 +0000
 X-acl-message-linecount: 4
 X-local-user: uid=CALLER_UID gid=CALLER_GID
 X-body-linecount: 3
 X-acl-message-linecount: 4
 X-local-user: uid=CALLER_UID gid=CALLER_GID
 X-body-linecount: 3

-X-message-linecount: 12
+X-message-linecount: 13

 X-received-count: 1
 
 This is a test message.
 X-received-count: 1
 
 This is a test message.


@@ -24,7 +25,8 @@ From someone@some.domain Tue Mar 02 09:44:33 1999
 Return-path: <someone@some.domain>
 Envelope-to: CALLER@the.local.host.name
 Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Return-path: <someone@some.domain>
 Envelope-to: CALLER@the.local.host.name
 Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000

-Received: from CALLER by the.local.host.name with local-smtp (Exim x.yz)
+Received: from CALLER (helo=test)
+       by the.local.host.name with local-smtp (Exim x.yz)

        (envelope-from <someone@some.domain>)
        id 10HmaY-0005vi-00
        for CALLER@the.local.host.name;
        (envelope-from <someone@some.domain>)
        id 10HmaY-0005vi-00
        for CALLER@the.local.host.name;


@@ -36,7 +38,7 @@ Date: Tue, 2 Mar 1999 09:44:33 +0000
 X-acl-message-linecount: 3
 X-local-user: uid=CALLER_UID gid=CALLER_GID
 X-body-linecount: 1
 X-acl-message-linecount: 3
 X-local-user: uid=CALLER_UID gid=CALLER_GID
 X-body-linecount: 1

-X-message-linecount: 11
+X-message-linecount: 12

 X-received-count: 1
 
 This is a second test message.
 X-received-count: 1
 
 This is a second test message.


@@ -45,7 +47,8 @@ From someone@some.domain Tue Mar 02 09:44:33 1999
 Return-path: <someone@some.domain>
 Envelope-to: CALLER@the.local.host.name
 Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Return-path: <someone@some.domain>
 Envelope-to: CALLER@the.local.host.name
 Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000

-Received: from CALLER by the.local.host.name with local-smtp (Exim x.yz)
+Received: from CALLER (helo=test)
+       by the.local.host.name with local-smtp (Exim x.yz)

        (envelope-from <someone@some.domain>)
        id 10HmaZ-0005vi-00
        for CALLER@the.local.host.name;
        (envelope-from <someone@some.domain>)
        id 10HmaZ-0005vi-00
        for CALLER@the.local.host.name;


@@ -58,7 +61,7 @@ Date: Tue, 2 Mar 1999 09:44:33 +0000
 X-acl-message-linecount: 4
 X-local-user: uid=CALLER_UID gid=CALLER_GID
 X-body-linecount: 1
 X-acl-message-linecount: 4
 X-local-user: uid=CALLER_UID gid=CALLER_GID
 X-body-linecount: 1

-X-message-linecount: 12
+X-message-linecount: 13

 X-received-count: 1
 
 This is a third test message.
 X-received-count: 1
 
 This is a third test message.

diff --git a/test/mail/0023.cond- b/test/mail/0023.cond-
index da5322b291d56aa5ac01c8741a366876ab41c36b..8fd4eacf76bf840c3b3671d17f86a501bf3663ed 100644 (file)
--- a/test/mail/0023.cond-
+++ b/test/mail/0023.cond-
@@ -1,5 +1,5 @@
 From userx@test.ex Tue Mar 02 09:44:33 1999
 From userx@test.ex Tue Mar 02 09:44:33 1999

-Received: from [56.56.56.56] (ident=CALLER)
+Received: from [56.56.56.56] (helo=test ident=CALLER)

        by myhost.test.ex with smtp (Exim x.yz)
        (envelope-from <userx@test.ex>)
        id 10HmbF-0005vi-00
        by myhost.test.ex with smtp (Exim x.yz)
        (envelope-from <userx@test.ex>)
        id 10HmbF-0005vi-00

diff --git a/test/mail/0023.cond--1 b/test/mail/0023.cond--1
index 334186fff70d81acff79878263957ca8d08e4e33..56557acc9a449f027ef9f44e8792aeba11bc09d1 100644 (file)
--- a/test/mail/0023.cond--1
+++ b/test/mail/0023.cond--1
@@ -1,5 +1,5 @@
 From userx@test.ex Tue Mar 02 09:44:33 1999
 From userx@test.ex Tue Mar 02 09:44:33 1999

-Received: from [56.56.57.57] (ident=CALLER)
+Received: from [56.56.57.57] (helo=test ident=CALLER)

        by myhost.test.ex with smtp (Exim x.yz)
        (envelope-from <userx@test.ex>)
        id 10HmbL-0005vi-00
        by myhost.test.ex with smtp (Exim x.yz)
        (envelope-from <userx@test.ex>)
        id 10HmbL-0005vi-00

diff --git a/test/mail/0023.cond-0 b/test/mail/0023.cond-0
index 8b99af1f93b3ec138a8b76c37a4df66f5e7de05b..39d3f9f3ccfe9d2ca8e4472591fa029c62ef9377 100644 (file)
--- a/test/mail/0023.cond-0
+++ b/test/mail/0023.cond-0
@@ -1,5 +1,5 @@
 From userx@test.ex Tue Mar 02 09:44:33 1999
 From userx@test.ex Tue Mar 02 09:44:33 1999

-Received: from [56.56.56.56] (ident=CALLER)
+Received: from [56.56.56.56] (helo=test ident=CALLER)

        by myhost.test.ex with smtp (Exim x.yz)
        (envelope-from <userx@test.ex>)
        id 10HmbH-0005vi-00
        by myhost.test.ex with smtp (Exim x.yz)
        (envelope-from <userx@test.ex>)
        id 10HmbH-0005vi-00

diff --git a/test/mail/0023.cond-00 b/test/mail/0023.cond-00
index c84870654654bb2c0a701b9644a6ab11783c2591..793280ce8063b9b2f7fb5e9096e0d5c02fe25d59 100644 (file)
--- a/test/mail/0023.cond-00
+++ b/test/mail/0023.cond-00
@@ -1,5 +1,5 @@
 From userx@test.ex Tue Mar 02 09:44:33 1999
 From userx@test.ex Tue Mar 02 09:44:33 1999

-Received: from [56.56.56.56] (ident=CALLER)
+Received: from [56.56.56.56] (helo=test ident=CALLER)

        by myhost.test.ex with smtp (Exim x.yz)
        (envelope-from <userx@test.ex>)
        id 10HmbI-0005vi-00
        by myhost.test.ex with smtp (Exim x.yz)
        (envelope-from <userx@test.ex>)
        id 10HmbI-0005vi-00

diff --git a/test/mail/0023.cond-1 b/test/mail/0023.cond-1
index d5ebc3646104ce8321a9c6830cfe7b5efbe1db97..9694276910921574c675fc0bdc1de84112ba687e 100644 (file)
--- a/test/mail/0023.cond-1
+++ b/test/mail/0023.cond-1
@@ -1,5 +1,5 @@
 From userx@test.ex Tue Mar 02 09:44:33 1999
 From userx@test.ex Tue Mar 02 09:44:33 1999

-Received: from [56.56.56.56] (ident=CALLER)
+Received: from [56.56.56.56] (helo=test ident=CALLER)

        by myhost.test.ex with smtp (Exim x.yz)
        (envelope-from <userx@test.ex>)
        id 10HmbB-0005vi-00
        by myhost.test.ex with smtp (Exim x.yz)
        (envelope-from <userx@test.ex>)
        id 10HmbB-0005vi-00

diff --git a/test/mail/0023.cond-10 b/test/mail/0023.cond-10
index 7bc0533b7d9a2ebd3aa2cdf07ef84963e5cd811f..9c6dd1d3c7898329d37d8d470edc63869fb773ab 100644 (file)
--- a/test/mail/0023.cond-10
+++ b/test/mail/0023.cond-10
@@ -1,5 +1,5 @@
 From userx@test.ex Tue Mar 02 09:44:33 1999
 From userx@test.ex Tue Mar 02 09:44:33 1999

-Received: from [56.56.56.56] (ident=CALLER)
+Received: from [56.56.56.56] (helo=test ident=CALLER)

        by myhost.test.ex with smtp (Exim x.yz)
        (envelope-from <userx@test.ex>)
        id 10HmbC-0005vi-00
        by myhost.test.ex with smtp (Exim x.yz)
        (envelope-from <userx@test.ex>)
        id 10HmbC-0005vi-00

diff --git a/test/mail/0023.cond-false b/test/mail/0023.cond-false
index 05fdd3f5beefebb03e2dc4eefeab5aa932cc69bb..7be8d56c17d7cf5e2e7048930872f9f3e68fd668 100644 (file)
--- a/test/mail/0023.cond-false
+++ b/test/mail/0023.cond-false
@@ -1,5 +1,5 @@
 From userx@test.ex Tue Mar 02 09:44:33 1999
 From userx@test.ex Tue Mar 02 09:44:33 1999

-Received: from [56.56.56.56] (ident=CALLER)
+Received: from [56.56.56.56] (helo=test ident=CALLER)

        by myhost.test.ex with smtp (Exim x.yz)
        (envelope-from <userx@test.ex>)
        id 10HmbJ-0005vi-00
        by myhost.test.ex with smtp (Exim x.yz)
        (envelope-from <userx@test.ex>)
        id 10HmbJ-0005vi-00

diff --git a/test/mail/0023.cond-no b/test/mail/0023.cond-no
index eb22c8e260e4cd89909e38b2bc911a49740826ab..b28aa57ec15fcd0baa354842cb1bed20ca9e8406 100644 (file)
--- a/test/mail/0023.cond-no
+++ b/test/mail/0023.cond-no
@@ -1,5 +1,5 @@
 From userx@test.ex Tue Mar 02 09:44:33 1999
 From userx@test.ex Tue Mar 02 09:44:33 1999

-Received: from [56.56.56.56] (ident=CALLER)
+Received: from [56.56.56.56] (helo=test ident=CALLER)

        by myhost.test.ex with smtp (Exim x.yz)
        (envelope-from <userx@test.ex>)
        id 10HmbG-0005vi-00
        by myhost.test.ex with smtp (Exim x.yz)
        (envelope-from <userx@test.ex>)
        id 10HmbG-0005vi-00

diff --git a/test/mail/0023.cond-rhubarb b/test/mail/0023.cond-rhubarb
index 030ca9d6ea45ea6ab19f0595f35b54b8472e39fd..fd8c33cd299e92144b86dc839b8fe3624e08766f 100644 (file)
--- a/test/mail/0023.cond-rhubarb
+++ b/test/mail/0023.cond-rhubarb
@@ -1,5 +1,5 @@
 From userx@test.ex Tue Mar 02 09:44:33 1999
 From userx@test.ex Tue Mar 02 09:44:33 1999

-Received: from [56.56.56.56] (ident=CALLER)
+Received: from [56.56.56.56] (helo=test ident=CALLER)

        by myhost.test.ex with smtp (Exim x.yz)
        (envelope-from <userx@test.ex>)
        id 10HmbE-0005vi-00
        by myhost.test.ex with smtp (Exim x.yz)
        (envelope-from <userx@test.ex>)
        id 10HmbE-0005vi-00


@@ -9,7 +9,7 @@ X-message-body-size: 0
 
 
 From userx@test.ex Tue Mar 02 09:44:33 1999
 
 
 From userx@test.ex Tue Mar 02 09:44:33 1999

-Received: from [56.56.56.56] (ident=CALLER)
+Received: from [56.56.56.56] (helo=test ident=CALLER)

        by myhost.test.ex with smtp (Exim x.yz)
        (envelope-from <userx@test.ex>)
        id 10HmbM-0005vi-00
        by myhost.test.ex with smtp (Exim x.yz)
        (envelope-from <userx@test.ex>)
        id 10HmbM-0005vi-00

diff --git a/test/mail/0023.cond-true b/test/mail/0023.cond-true
index 7e82414959c47cc4293d41412b4029b8bb7d77cb..46815502f54bad35bf80fd403fed7651e396cc22 100644 (file)
--- a/test/mail/0023.cond-true
+++ b/test/mail/0023.cond-true
@@ -1,5 +1,5 @@
 From userx@test.ex Tue Mar 02 09:44:33 1999
 From userx@test.ex Tue Mar 02 09:44:33 1999

-Received: from [56.56.56.56] (ident=CALLER)
+Received: from [56.56.56.56] (helo=test ident=CALLER)

        by myhost.test.ex with smtp (Exim x.yz)
        (envelope-from <userx@test.ex>)
        id 10HmbD-0005vi-00
        by myhost.test.ex with smtp (Exim x.yz)
        (envelope-from <userx@test.ex>)
        id 10HmbD-0005vi-00

diff --git a/test/mail/0023.cond-yes b/test/mail/0023.cond-yes
index 967ff7ce333bf527dd3643178107647616c65635..d20f426ca6c12557c17ad048b23c979a77f1b73c 100644 (file)
--- a/test/mail/0023.cond-yes
+++ b/test/mail/0023.cond-yes
@@ -1,5 +1,5 @@
 From userx@test.ex Tue Mar 02 09:44:33 1999
 From userx@test.ex Tue Mar 02 09:44:33 1999

-Received: from [56.56.56.56] (ident=CALLER)
+Received: from [56.56.56.56] (helo=test ident=CALLER)

        by myhost.test.ex with smtp (Exim x.yz)
        (envelope-from <userx@test.ex>)
        id 10HmbA-0005vi-00
        by myhost.test.ex with smtp (Exim x.yz)
        (envelope-from <userx@test.ex>)
        id 10HmbA-0005vi-00


@@ -10,7 +10,7 @@ X-message-body-size: 0
 
 
 From userx@test.ex Tue Mar 02 09:44:33 1999
 
 
 From userx@test.ex Tue Mar 02 09:44:33 1999

-Received: from [56.56.57.57] (ident=CALLER)
+Received: from [56.56.57.57] (helo=test ident=CALLER)

        by myhost.test.ex with smtp (Exim x.yz)
        (envelope-from <userx@test.ex>)
        id 10HmbK-0005vi-00
        by myhost.test.ex with smtp (Exim x.yz)
        (envelope-from <userx@test.ex>)
        id 10HmbK-0005vi-00

diff --git a/test/mail/0023.okbatch b/test/mail/0023.okbatch
index 700461cc79513678a5876e555c3e00c99ee82921..710164287a48b4fe96845cf54eb69f26594c94ad 100644 (file)
--- a/test/mail/0023.okbatch
+++ b/test/mail/0023.okbatch
@@ -2,7 +2,7 @@ From rcpttest@test.ex Tue Mar 02 09:44:33 1999
 Envelope-to: ok1@test.ex,
  ok2@test.ex,
  ok3@test.ex
 Envelope-to: ok1@test.ex,
  ok2@test.ex,
  ok3@test.ex

-Received: from [56.56.58.58] (ident=CALLER)
+Received: from [56.56.58.58] (helo=test ident=CALLER)

        by myhost.test.ex with smtp (Exim x.yz)
        (envelope-from <rcpttest@test.ex>)
        id 10HmbN-0005vi-00;
        by myhost.test.ex with smtp (Exim x.yz)
        (envelope-from <rcpttest@test.ex>)
        id 10HmbN-0005vi-00;

diff --git a/test/mail/0023.userx b/test/mail/0023.userx
index 02a958b00c8601b92f99e4cb7ad95e244873558d..b95124b5467a7f9640d3c79a76db4374b4443ec6 100644 (file)
--- a/test/mail/0023.userx
+++ b/test/mail/0023.userx
@@ -1,5 +1,5 @@
 From userx@test.ex Tue Mar 02 09:44:33 1999
 From userx@test.ex Tue Mar 02 09:44:33 1999

-Received: from [32.32.32.32] (ident=CALLER)
+Received: from [32.32.32.32] (helo=test ident=CALLER)

        by myhost.test.ex with smtp (Exim x.yz)
        (envelope-from <userx@test.ex>)
        id 10HmaY-0005vi-00
        by myhost.test.ex with smtp (Exim x.yz)
        (envelope-from <userx@test.ex>)
        id 10HmaY-0005vi-00


@@ -12,7 +12,7 @@ X-message-body-size: 28
 Test without verify sender.
 
 From userx@test.ex Tue Mar 02 09:44:33 1999
 Test without verify sender.
 
 From userx@test.ex Tue Mar 02 09:44:33 1999

-Received: from [55.55.55.55] (ident=CALLER)
+Received: from [55.55.55.55] (helo=test ident=CALLER)

        by myhost.test.ex with smtp (Exim x.yz)
        (envelope-from <userx@test.ex>)
        id 10HmaZ-0005vi-00
        by myhost.test.ex with smtp (Exim x.yz)
        (envelope-from <userx@test.ex>)
        id 10HmaZ-0005vi-00

diff --git a/test/mail/0023.userx-vs b/test/mail/0023.userx-vs
index d5e8cd1ed73b833020be7ea494605acad8aa6d43..ffd2ef8788dec5a14e30afb53d07882ccf34c411 100644 (file)
--- a/test/mail/0023.userx-vs
+++ b/test/mail/0023.userx-vs
@@ -1,5 +1,5 @@
 From userx@test.ex Tue Mar 02 09:44:33 1999
 From userx@test.ex Tue Mar 02 09:44:33 1999

-Received: from [32.32.32.32] (ident=CALLER)
+Received: from [32.32.32.32] (helo=test ident=CALLER)

        by myhost.test.ex with smtp (Exim x.yz)
        (envelope-from <userx@test.ex>)
        id 10HmaX-0005vi-00
        by myhost.test.ex with smtp (Exim x.yz)
        (envelope-from <userx@test.ex>)
        id 10HmaX-0005vi-00

diff --git a/test/mail/0024.postmaster b/test/mail/0024.postmaster
index ea1c5d5d4e78a1abbe13898a12849a7b6e8dab4a..cba2de24b2941ec9590642f52e01d55b119c5928 100644 (file)
--- a/test/mail/0024.postmaster
+++ b/test/mail/0024.postmaster
@@ -1,5 +1,5 @@
 From x@y Tue Mar 02 09:44:33 1999
 From x@y Tue Mar 02 09:44:33 1999

-Received: from [V4NET.0.0.0] (ident=CALLER)
+Received: from [V4NET.0.0.0] (helo=test ident=CALLER)

        by myhost.test.ex with smtp (Exim x.yz)
        (envelope-from <x@y>)
        id 10HmaX-0005vi-00
        by myhost.test.ex with smtp (Exim x.yz)
        (envelope-from <x@y>)
        id 10HmaX-0005vi-00


@@ -9,7 +9,7 @@ Received: from [V4NET.0.0.0] (ident=CALLER)
 Message 1
 
 From userx@test.ex Tue Mar 02 09:44:33 1999
 Message 1
 
 From userx@test.ex Tue Mar 02 09:44:33 1999

-Received: from [V4NET.0.0.0] (ident=CALLER)
+Received: from [V4NET.0.0.0] (helo=test ident=CALLER)

        by myhost.test.ex with smtp (Exim x.yz)
        (envelope-from <userx@test.ex>)
        id 10HmaY-0005vi-00;
        by myhost.test.ex with smtp (Exim x.yz)
        (envelope-from <userx@test.ex>)
        id 10HmaY-0005vi-00;


@@ -18,7 +18,7 @@ Received: from [V4NET.0.0.0] (ident=CALLER)
 Message 2
 
 From userx@test.ex Tue Mar 02 09:44:33 1999
 Message 2
 
 From userx@test.ex Tue Mar 02 09:44:33 1999

-Received: from [V4NET.11.12.13] (ident=CALLER)
+Received: from [V4NET.11.12.13] (helo=test ident=CALLER)

        by myhost.test.ex with smtp (Exim x.yz)
        (envelope-from <userx@test.ex>)
        id 10HmbA-0005vi-00
        by myhost.test.ex with smtp (Exim x.yz)
        (envelope-from <userx@test.ex>)
        id 10HmbA-0005vi-00


@@ -28,7 +28,7 @@ Received: from [V4NET.11.12.13] (ident=CALLER)
 Message 4
 
 From userx@test.ex Tue Mar 02 09:44:33 1999
 Message 4
 
 From userx@test.ex Tue Mar 02 09:44:33 1999

-Received: from [V4NET.11.12.16] (ident=CALLER)
+Received: from [V4NET.11.12.16] (helo=test ident=CALLER)

        by myhost.test.ex with smtp (Exim x.yz)
        (envelope-from <userx@test.ex>)
        id 10HmbB-0005vi-00;
        by myhost.test.ex with smtp (Exim x.yz)
        (envelope-from <userx@test.ex>)
        id 10HmbB-0005vi-00;

diff --git a/test/mail/0024.userx b/test/mail/0024.userx
index d4b2247a3ab5c9fa87c682eddd0ecc0d46e6ef0e..519bd3f6cd3d1b8da0aea58dc9eeefa5b515b2bf 100644 (file)
--- a/test/mail/0024.userx
+++ b/test/mail/0024.userx
@@ -1,5 +1,5 @@
 From userx@test.ex Tue Mar 02 09:44:33 1999
 From userx@test.ex Tue Mar 02 09:44:33 1999

-Received: from [V4NET.0.0.0] (ident=CALLER)
+Received: from [V4NET.0.0.0] (helo=test ident=CALLER)

        by myhost.test.ex with smtp (Exim x.yz)
        (envelope-from <userx@test.ex>)
        id 10HmaY-0005vi-00;
        by myhost.test.ex with smtp (Exim x.yz)
        (envelope-from <userx@test.ex>)
        id 10HmaY-0005vi-00;


@@ -8,7 +8,7 @@ Received: from [V4NET.0.0.0] (ident=CALLER)
 Message 2
 
 From userx@test.ex Tue Mar 02 09:44:33 1999
 Message 2
 
 From userx@test.ex Tue Mar 02 09:44:33 1999

-Received: from [V4NET.11.12.16] (ident=CALLER)
+Received: from [V4NET.11.12.16] (helo=test ident=CALLER)

        by myhost.test.ex with smtp (Exim x.yz)
        (envelope-from <userx@test.ex>)
        id 10HmbB-0005vi-00;
        by myhost.test.ex with smtp (Exim x.yz)
        (envelope-from <userx@test.ex>)
        id 10HmbB-0005vi-00;

diff --git a/test/mail/0025.userx b/test/mail/0025.userx
index a845d2ddde22d839bbba9eeeafcc1102b9f755b5..b1fa7dcf8773ebfc57b22744e1d578fe972d8978 100644 (file)
--- a/test/mail/0025.userx
+++ b/test/mail/0025.userx
@@ -1,5 +1,6 @@
 From CALLER@myhost.test.ex Tue Mar 02 09:44:33 1999
 From CALLER@myhost.test.ex Tue Mar 02 09:44:33 1999

-Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
+Received: from CALLER (helo=test)
+       by myhost.test.ex with local-smtp (Exim x.yz)

        (envelope-from <CALLER@myhost.test.ex>)
        id 10HmaX-0005vi-00;
        Tue, 2 Mar 1999 09:44:33 +0000
        (envelope-from <CALLER@myhost.test.ex>)
        id 10HmaX-0005vi-00;
        Tue, 2 Mar 1999 09:44:33 +0000

diff --git a/test/mail/0026.userx b/test/mail/0026.userx
index 21b9abc156c1517b35908b4d155e734182f1f1c9..2560fd0da2c6860bcc3e2b8fa4dd54e6a71433d3 100644 (file)
--- a/test/mail/0026.userx
+++ b/test/mail/0026.userx
@@ -1,5 +1,6 @@
 From x@y Tue Mar 02 09:44:33 1999
 From x@y Tue Mar 02 09:44:33 1999

-Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
+Received: from CALLER (helo=test)
+       by myhost.test.ex with local-smtp (Exim x.yz)

        (envelope-from <x@y>)
        id 10HmbF-0005vi-00
        for userx@test.ex;
        (envelope-from <x@y>)
        id 10HmbF-0005vi-00
        for userx@test.ex;


@@ -12,7 +13,8 @@ X-warning: this is a test warning
 Message 7
 
 From x@y Tue Mar 02 09:44:33 1999
 Message 7
 
 From x@y Tue Mar 02 09:44:33 1999

-Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
+Received: from CALLER (helo=test)
+       by myhost.test.ex with local-smtp (Exim x.yz)

        (envelope-from <x@y>)
        id 10HmbG-0005vi-00
        for userx@test.ex;
        (envelope-from <x@y>)
        id 10HmbG-0005vi-00
        for userx@test.ex;


@@ -27,7 +29,8 @@ X-warning: this is a test warning
 Message 10
 
 From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Message 10
 
 From MAILER-DAEMON Tue Mar 02 09:44:33 1999

-Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
+Received: from CALLER (helo=test)
+       by myhost.test.ex with local-smtp (Exim x.yz)

        id 10HmbH-0005vi-00
        for userx@test.ex;
        Tue, 2 Mar 1999 09:44:33 +0000
        id 10HmbH-0005vi-00
        for userx@test.ex;
        Tue, 2 Mar 1999 09:44:33 +0000

diff --git a/test/mail/0049.userx b/test/mail/0049.userx
index cb34feac9f419d8b25f60302c04d20587143c9a3..059429e43e2fd00709fe42d410751fcc0d9f285c 100644 (file)
--- a/test/mail/0049.userx
+++ b/test/mail/0049.userx
@@ -62,7 +62,8 @@ From CALLER@myhost.ex Tue Mar 02 09:44:33 1999
 Return-path: <CALLER@myhost.ex>
 Envelope-to: userx@test.ex
 Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Return-path: <CALLER@myhost.ex>
 Envelope-to: userx@test.ex
 Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000

-Received: from CALLER by myhost.ex with local-smtp (Exim x.yz)
+Received: from CALLER (helo=test)
+       by myhost.ex with local-smtp (Exim x.yz)

        (envelope-from <CALLER@myhost.ex>)
        id 10HmbB-0005vi-00
        for userx@test.ex;
        (envelope-from <CALLER@myhost.ex>)
        id 10HmbB-0005vi-00
        for userx@test.ex;


@@ -141,7 +142,8 @@ From CALLER@myhost.ex Tue Mar 02 09:44:33 1999
 Return-path: <CALLER@myhost.ex>
 Envelope-to: userx@test.ex
 Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Return-path: <CALLER@myhost.ex>
 Envelope-to: userx@test.ex
 Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000

-Received: from CALLER by myhost.ex with local-smtp (Exim x.yz)
+Received: from CALLER (helo=test)
+       by myhost.ex with local-smtp (Exim x.yz)

        (envelope-from <CALLER@myhost.ex>)
        id 10HmbG-0005vi-00
        for userx@test.ex;
        (envelope-from <CALLER@myhost.ex>)
        id 10HmbG-0005vi-00
        for userx@test.ex;

diff --git a/test/mail/0050.userx b/test/mail/0050.userx
index bcc824b534a7cc045df820e4da4b8444a482c2be..a68883047f161238facc0f44a49d251179ee5ae7 100644 (file)
--- a/test/mail/0050.userx
+++ b/test/mail/0050.userx
@@ -66,7 +66,8 @@ From userx@cus.cam.ac.uk Tue Mar 02 09:44:33 1999
 Return-path: <userx@cus.cam.ac.uk>
 Envelope-to: userx@test.ex
 Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Return-path: <userx@cus.cam.ac.uk>
 Envelope-to: userx@test.ex
 Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000

-Received: from CALLER by myhost.ex with local-smtp (Exim x.yz)
+Received: from CALLER (helo=test)
+       by myhost.ex with local-smtp (Exim x.yz)

        (envelope-from <userx@cus.cam.ac.uk>)
        id 10HmbB-0005vi-00
        for userx@test.ex;
        (envelope-from <userx@cus.cam.ac.uk>)
        id 10HmbB-0005vi-00
        for userx@test.ex;


@@ -161,7 +162,8 @@ From userx@somehost.test.ex Tue Mar 02 09:44:33 1999
 Return-path: <userx@somehost.test.ex>
 Envelope-to: userx@test.ex
 Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Return-path: <userx@somehost.test.ex>
 Envelope-to: userx@test.ex
 Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000

-Received: from CALLER by myhost.ex with local-smtp (Exim x.yz)
+Received: from CALLER (helo=test)
+       by myhost.ex with local-smtp (Exim x.yz)

        (envelope-from <userx@somehost.test.ex>)
        id 10HmbH-0005vi-00
        for userx@test.ex;
        (envelope-from <userx@somehost.test.ex>)
        id 10HmbH-0005vi-00
        for userx@test.ex;

diff --git a/test/mail/0079.userx b/test/mail/0079.userx
index 7587d5f483182e31f74ffae9ef3c277661d5e71f..b60764ea51671817fe6f54ebdfa2702caa046fbc 100644 (file)
--- a/test/mail/0079.userx
+++ b/test/mail/0079.userx
@@ -31,7 +31,8 @@ From postmaster@exim.test.ex Tue Mar 02 09:44:33 1999
 Return-path: <postmaster@exim.test.ex>
 Envelope-to: userx@exim.test.ex
 Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Return-path: <postmaster@exim.test.ex>
 Envelope-to: userx@exim.test.ex
 Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000

-Received: from CALLER by the.local.host.name with local-smtp (Exim x.yz)
+Received: from CALLER (helo=test)
+       by the.local.host.name with local-smtp (Exim x.yz)

        (envelope-from <postmaster@exim.test.ex>)
        id 10HmaZ-0005vi-00
        for userx@exim.test.ex;
        (envelope-from <postmaster@exim.test.ex>)
        id 10HmaZ-0005vi-00
        for userx@exim.test.ex;

diff --git a/test/mail/0094.userx b/test/mail/0094.userx
index 122fc97ebabb5be0ca3274033d5b29c896ba59a6..dd97d4c61ddcfdbf47b95c1cb76361bc57b6d10a 100644 (file)
--- a/test/mail/0094.userx
+++ b/test/mail/0094.userx
@@ -1,5 +1,5 @@
 From userx@test.ex Tue Mar 02 09:44:33 1999
 From userx@test.ex Tue Mar 02 09:44:33 1999

-Received: from [V4NET.11.12.13] (ident=root)
+Received: from [V4NET.11.12.13] (helo=test ident=root)

        by the.local.host.name with smtp (Exim x.yz)
        (envelope-from <userx@test.ex>)
        id 10HmaX-0005vi-00
        by the.local.host.name with smtp (Exim x.yz)
        (envelope-from <userx@test.ex>)
        id 10HmaX-0005vi-00


@@ -11,7 +11,7 @@ host_lookup_deferred: 0
 This is a test message
 
 From userx@test.ex Tue Mar 02 09:44:33 1999
 This is a test message
 
 From userx@test.ex Tue Mar 02 09:44:33 1999

-Received: from [99.99.99.99] (ident=root)
+Received: from [99.99.99.99] (helo=test ident=root)

        by the.local.host.name with smtp (Exim x.yz)
        (envelope-from <userx@test.ex>)
        id 10HmaY-0005vi-00
        by the.local.host.name with smtp (Exim x.yz)
        (envelope-from <userx@test.ex>)
        id 10HmaY-0005vi-00


@@ -23,7 +23,7 @@ host_lookup_deferred: 1
 This is a test message
 
 From userx@test.ex Tue Mar 02 09:44:33 1999
 This is a test message
 
 From userx@test.ex Tue Mar 02 09:44:33 1999

-Received: from [V4NET.99.99.96] (ident=root)
+Received: from [V4NET.99.99.96] (helo=test ident=root)

        by the.local.host.name with smtp (Exim x.yz)
        (envelope-from <userx@test.ex>)
        id 10HmaZ-0005vi-00
        by the.local.host.name with smtp (Exim x.yz)
        (envelope-from <userx@test.ex>)
        id 10HmaZ-0005vi-00

diff --git a/test/mail/0127.userx b/test/mail/0127.userx
index 0f5f1860c639a58b982954bb3a01fff91eb8295f..65393eae9826a23e3c74a3c38bb06a2b303e0e05 100644 (file)
--- a/test/mail/0127.userx
+++ b/test/mail/0127.userx
@@ -66,7 +66,8 @@ From CALLER@myhost.ex Tue Mar 02 09:44:33 1999
 Return-path: <CALLER@myhost.ex>
 Envelope-to: userx@test.ex
 Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Return-path: <CALLER@myhost.ex>
 Envelope-to: userx@test.ex
 Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000

-Received: from CALLER by myhost.ex with local-smtp (Exim x.yz)
+Received: from CALLER (helo=test)
+       by myhost.ex with local-smtp (Exim x.yz)

        (envelope-from <CALLER@myhost.ex>)
        id 10HmbB-0005vi-00
        for userx@test.ex;
        (envelope-from <CALLER@myhost.ex>)
        id 10HmbB-0005vi-00
        for userx@test.ex;


@@ -146,7 +147,8 @@ From CALLER@myhost.ex Tue Mar 02 09:44:33 1999
 Return-path: <CALLER@myhost.ex>
 Envelope-to: userx@test.ex
 Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Return-path: <CALLER@myhost.ex>
 Envelope-to: userx@test.ex
 Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000

-Received: from CALLER by myhost.ex with local-smtp (Exim x.yz)
+Received: from CALLER (helo=test)
+       by myhost.ex with local-smtp (Exim x.yz)

        (envelope-from <CALLER@myhost.ex>)
        id 10HmbG-0005vi-00
        for userx@test.ex;
        (envelope-from <CALLER@myhost.ex>)
        id 10HmbG-0005vi-00
        for userx@test.ex;

diff --git a/test/mail/0136.forwarder b/test/mail/0136.forwarder
index 2fb7c15513cff93f360344ba9c44c23318b80d95..2a978a7fd5561a137c756c85ab728a410170b629 100644 (file)
--- a/test/mail/0136.forwarder
+++ b/test/mail/0136.forwarder
@@ -43,7 +43,8 @@ Status: 5.0.0
 Content-type: message/rfc822
 
 Return-path: <abcd@x.y.z>
 Content-type: message/rfc822
 
 Return-path: <abcd@x.y.z>

-Received: from CALLER by the.local.host.name with local-smtp (Exim x.yz)
+Received: from CALLER (helo=test)
+       by the.local.host.name with local-smtp (Exim x.yz)

        (envelope-from <abcd@x.y.z>)
        id 10HmaX-0005vi-00;
        Tue, 2 Mar 1999 09:44:33 +0000
        (envelope-from <abcd@x.y.z>)
        id 10HmaX-0005vi-00;
        Tue, 2 Mar 1999 09:44:33 +0000


@@ -100,7 +101,8 @@ Status: 5.0.0
 Content-type: text/rfc822-headers
 
 Return-path: <abcd@x.y.z>
 Content-type: text/rfc822-headers
 
 Return-path: <abcd@x.y.z>

-Received: from CALLER by the.local.host.name with local-smtp (Exim x.yz)
+Received: from CALLER (helo=test)
+       by the.local.host.name with local-smtp (Exim x.yz)

        (envelope-from <abcd@x.y.z>)
        id 10HmbA-0005vi-00;
        Tue, 2 Mar 1999 09:44:33 +0000
        (envelope-from <abcd@x.y.z>)
        id 10HmbA-0005vi-00;
        Tue, 2 Mar 1999 09:44:33 +0000

diff --git a/test/mail/0197.copies b/test/mail/0197.copies
index 164beddda299bd078358e232ae91168f5fe2d0dd..d5251f7c4b22ca9ec2f0a17e8db5c6fb722bb9ea 100644 (file)
--- a/test/mail/0197.copies
+++ b/test/mail/0197.copies
@@ -16,7 +16,8 @@ MAIL FROM:<doesn't@matter>
 RCPT TO:<x@copy.domain>
 RCPT TO:<y@copy.domain>
 DATA
 RCPT TO:<x@copy.domain>
 RCPT TO:<y@copy.domain>
 DATA

-Received: from CALLER by the.local.host.name with local-smtp (Exim x.yz)
+Received: from CALLER (helo=test)
+       by the.local.host.name with local-smtp (Exim x.yz)

        (envelope-from <doesn't@matter>)
        id 10HmaY-0005vi-00;
        Tue, 2 Mar 1999 09:44:33 +0000
        (envelope-from <doesn't@matter>)
        id 10HmaY-0005vi-00;
        Tue, 2 Mar 1999 09:44:33 +0000

diff --git a/test/mail/0202.userx b/test/mail/0202.userx
index 3d5baab14829386d9b6ec8fa98f03472ed4b9104..9d1ba77a57e29153c90bb387223cba5eb08fdfe3 100644 (file)
--- a/test/mail/0202.userx
+++ b/test/mail/0202.userx
@@ -1,5 +1,6 @@
 From CALLER@test.ex Tue Mar 02 09:44:33 1999
 From CALLER@test.ex Tue Mar 02 09:44:33 1999

-Received: from CALLER by the.local.host.name with local-smtp (Exim x.yz)
+Received: from CALLER (helo=test)
+       by the.local.host.name with local-smtp (Exim x.yz)

        (envelope-from <CALLER@test.ex>)
        id 10HmaX-0005vi-00
        for userx@test.ex;
        (envelope-from <CALLER@test.ex>)
        id 10HmaX-0005vi-00
        for userx@test.ex;


@@ -14,7 +15,8 @@ Date: Tue, 2 Mar 1999 09:44:33 +0000
 This line follows ..
 
 From CALLER@test.ex Tue Mar 02 09:44:33 1999
 This line follows ..
 
 From CALLER@test.ex Tue Mar 02 09:44:33 1999

-Received: from CALLER by the.local.host.name with local-smtp (Exim x.yz)
+Received: from CALLER (helo=test)
+       by the.local.host.name with local-smtp (Exim x.yz)

        (envelope-from <CALLER@test.ex>)
        id 10HmaY-0005vi-00
        for userx@test.ex;
        (envelope-from <CALLER@test.ex>)
        id 10HmaY-0005vi-00
        for userx@test.ex;

diff --git a/test/mail/0220.userx b/test/mail/0220.userx
index 4b893ffcd22a73dbf485305207eb9f986af94e57..e8662a6244d14b23a4fcd40d7b6899eebd6a68b6 100644 (file)
--- a/test/mail/0220.userx
+++ b/test/mail/0220.userx
@@ -23,7 +23,8 @@ Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 
 From foo@bar Tue Mar 02 09:44:33 1999
 
 
 From foo@bar Tue Mar 02 09:44:33 1999

-Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
+Received: from CALLER (helo=test)
+       by myhost.test.ex with local-smtp (Exim x.yz)

        (envelope-from <foo@bar>)
        id 10HmbA-0005vi-00
        for userx@test.ex;
        (envelope-from <foo@bar>)
        id 10HmbA-0005vi-00
        for userx@test.ex;

diff --git a/test/mail/0221.userx b/test/mail/0221.userx
index 35f5435f140e64f663c05ffd2df4a05eee21b220..1387ea3579dfed190028d3af1881919f55ae80ef 100644 (file)
--- a/test/mail/0221.userx
+++ b/test/mail/0221.userx
@@ -21,7 +21,8 @@ Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 
 From CALLER@myhost.test.ex Tue Mar 02 09:44:33 1999
 
 
 From CALLER@myhost.test.ex Tue Mar 02 09:44:33 1999

-Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
+Received: from CALLER (helo=test)
+       by myhost.test.ex with local-smtp (Exim x.yz)

        (envelope-from <CALLER@myhost.test.ex>)
        id 10HmbA-0005vi-00
        for userx@test.ex;
        (envelope-from <CALLER@myhost.test.ex>)
        id 10HmbA-0005vi-00
        for userx@test.ex;

diff --git a/test/mail/0230.x b/test/mail/0230.x
index bef6df0d0a32b9a9ed3592ce09e48f8b4a2e93ec..02272d375fade8e7d60f4e39d0a654d7cf189a97 100644 (file)
--- a/test/mail/0230.x
+++ b/test/mail/0230.x
@@ -1,5 +1,5 @@
 From x@y.x Tue Mar 02 09:44:33 1999
 From x@y.x Tue Mar 02 09:44:33 1999

-Received: from [ip4.ip4.ip4.ip4] (port=1113)
+Received: from [ip4.ip4.ip4.ip4] (port=1113 helo=test)

        by myhost.test.ex with smtp (Exim x.yz)
        (envelope-from <x@y.x>)
        id 10HmaY-0005vi-00
        by myhost.test.ex with smtp (Exim x.yz)
        (envelope-from <x@y.x>)
        id 10HmaY-0005vi-00


@@ -9,7 +9,7 @@ Port: 1113
 
 
 From x@y.x Tue Mar 02 09:44:33 1999
 
 
 From x@y.x Tue Mar 02 09:44:33 1999

-Received: from [127.0.0.1] (port=1114)
+Received: from [127.0.0.1] (port=1114 helo=test)

        by myhost.test.ex with smtp (Exim x.yz)
        (envelope-from <x@y.x>)
        id 10HmaZ-0005vi-00
        by myhost.test.ex with smtp (Exim x.yz)
        (envelope-from <x@y.x>)
        id 10HmaZ-0005vi-00


@@ -29,7 +29,7 @@ Port: 1115
 
 
 From x@y.x Tue Mar 02 09:44:33 1999
 
 
 From x@y.x Tue Mar 02 09:44:33 1999

-Received: from [V4NET.9.8.7] (port=1111 ident=root)
+Received: from [V4NET.9.8.7] (port=1111 helo=test ident=root)

        by myhost.test.ex with smtp (Exim x.yz)
        (envelope-from <x@y.x>)
        id 10HmaX-0005vi-00
        by myhost.test.ex with smtp (Exim x.yz)
        (envelope-from <x@y.x>)
        id 10HmaX-0005vi-00

diff --git a/test/mail/0256.abc@def b/test/mail/0256.abc@def
index 80a36c35a82ba16411e3857513dddae49eaabc55..6eab476539ebe6b1b4644ce32b7315b42977b76e 100644 (file)
--- a/test/mail/0256.abc@def
+++ b/test/mail/0256.abc@def
@@ -37,7 +37,8 @@ Status: 5.0.0
 Content-type: message/rfc822
 
 Return-path: <"abc@def"@unknown.domain>
 Content-type: message/rfc822
 
 Return-path: <"abc@def"@unknown.domain>

-Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
+Received: from CALLER (helo=test)
+       by myhost.test.ex with local-smtp (Exim x.yz)

        (envelope-from <"abc@def"@unknown.domain>)
        id 10HmaZ-0005vi-00
        for unknown@test.ex;
        (envelope-from <"abc@def"@unknown.domain>)
        id 10HmaZ-0005vi-00
        for unknown@test.ex;

diff --git a/test/mail/0256.abcd+unknown.domain+"abc@def" b/test/mail/0256.abcd+unknown.domain+"abc@def"
index 80a36c35a82ba16411e3857513dddae49eaabc55..6eab476539ebe6b1b4644ce32b7315b42977b76e 100644 (file)
--- a/test/mail/0256.abcd+unknown.domain+"abc@def"
+++ b/test/mail/0256.abcd+unknown.domain+"abc@def"
@@ -37,7 +37,8 @@ Status: 5.0.0
 Content-type: message/rfc822
 
 Return-path: <"abc@def"@unknown.domain>
 Content-type: message/rfc822
 
 Return-path: <"abc@def"@unknown.domain>

-Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
+Received: from CALLER (helo=test)
+       by myhost.test.ex with local-smtp (Exim x.yz)

        (envelope-from <"abc@def"@unknown.domain>)
        id 10HmaZ-0005vi-00
        for unknown@test.ex;
        (envelope-from <"abc@def"@unknown.domain>)
        id 10HmaZ-0005vi-00
        for unknown@test.ex;

diff --git a/test/mail/0258.userx b/test/mail/0258.userx
index 1cc37c54ded48acf16ff7f92bd6eac4e904ec5ad..722707bce9af50fd8e17298c7b99258ec9870e8e 100644 (file)
--- a/test/mail/0258.userx
+++ b/test/mail/0258.userx
@@ -128,7 +128,8 @@ Date: Tue, 2 Mar 1999 09:44:33 +0000
 Not: a header line
 
 From CALLER@myhost.test.ex Tue Mar 02 09:44:33 1999
 Not: a header line
 
 From CALLER@myhost.test.ex Tue Mar 02 09:44:33 1999

-Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
+Received: from CALLER (helo=test)
+       by myhost.test.ex with local-smtp (Exim x.yz)

        (envelope-from <CALLER@myhost.test.ex>)
        id 10HmbF-0005vi-00
        for userx@test.ex;
        (envelope-from <CALLER@myhost.test.ex>)
        id 10HmbF-0005vi-00
        for userx@test.ex;


@@ -145,7 +146,8 @@ CR.CR
 terminate the message
 
 From CALLER@myhost.test.ex Tue Mar 02 09:44:33 1999
 terminate the message
 
 From CALLER@myhost.test.ex Tue Mar 02 09:44:33 1999

-Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
+Received: from CALLER (helo=test)
+       by myhost.test.ex with local-smtp (Exim x.yz)

        (envelope-from <CALLER@myhost.test.ex>)
        id 10HmbG-0005vi-00
        for userx@test.ex;
        (envelope-from <CALLER@myhost.test.ex>)
        id 10HmbG-0005vi-00
        for userx@test.ex;

diff --git a/test/mail/0386.2 b/test/mail/0386.2
index 79c2eea4af6cd2af3b9a3fcbc0cb5557883a8b2d..fbfcae1fbbcb21363a7d3617356a50dd63d58a82 100644 (file)
--- a/test/mail/0386.2
+++ b/test/mail/0386.2
@@ -1,5 +1,5 @@
 From x@y Tue Mar 02 09:44:33 1999
 From x@y Tue Mar 02 09:44:33 1999

-Received: from [V4NET.11.12.13] (ident=CALLER)
+Received: from [V4NET.11.12.13] (helo=test ident=CALLER)

        by myhost.test.ex with smtp (Exim x.yz)
        (envelope-from <x@y>)
        id 10HmaX-0005vi-00
        by myhost.test.ex with smtp (Exim x.yz)
        (envelope-from <x@y>)
        id 10HmaX-0005vi-00


@@ -11,7 +11,7 @@ X-Warning: This is a test blacklisting message
 Message 1
 
 From x@y Tue Mar 02 09:44:33 1999
 Message 1
 
 From x@y Tue Mar 02 09:44:33 1999

-Received: from [V4NET.11.12.13] (ident=CALLER)
+Received: from [V4NET.11.12.13] (helo=test ident=CALLER)

        by myhost.test.ex with smtp (Exim x.yz)
        (envelope-from <x@y>)
        id 10HmaY-0005vi-00
        by myhost.test.ex with smtp (Exim x.yz)
        (envelope-from <x@y>)
        id 10HmaY-0005vi-00

diff --git a/test/mail/0395.userx b/test/mail/0395.userx
index 69b311ed17f30397c01772b13498a3ac675aefe5..f9dde9899cb2627f5a0bfde4c97abb739b756801 100644 (file)
--- a/test/mail/0395.userx
+++ b/test/mail/0395.userx
@@ -50,7 +50,8 @@ Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 
 From CALLER@test.ex Tue Mar 02 09:44:33 1999
 
 
 From CALLER@test.ex Tue Mar 02 09:44:33 1999

-Received: from CALLER by the.local.host.name with local-bsmtp (Exim x.yz)
+Received: from CALLER (helo=test)
+       by the.local.host.name with local-bsmtp (Exim x.yz)

        (envelope-from <CALLER@test.ex>)
        id 10HmbC-0005vi-00
        for userx@test.ex;
        (envelope-from <CALLER@test.ex>)
        id 10HmbC-0005vi-00
        for userx@test.ex;


@@ -63,7 +64,8 @@ Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 
 From CALLER@test.ex Tue Mar 02 09:44:33 1999
 
 
 From CALLER@test.ex Tue Mar 02 09:44:33 1999

-Received: from CALLER by the.local.host.name with local-bsmtp (Exim x.yz)
+Received: from CALLER (helo=test)
+       by the.local.host.name with local-bsmtp (Exim x.yz)

        (envelope-from <CALLER@test.ex>)
        id 10HmbD-0005vi-00
        for userx@test.ex;
        (envelope-from <CALLER@test.ex>)
        id 10HmbD-0005vi-00
        for userx@test.ex;


@@ -76,7 +78,8 @@ Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 
 From CALLER@test.ex Tue Mar 02 09:44:33 1999
 
 
 From CALLER@test.ex Tue Mar 02 09:44:33 1999

-Received: from CALLER by the.local.host.name with local-smtp (Exim x.yz)
+Received: from CALLER (helo=test)
+       by the.local.host.name with local-smtp (Exim x.yz)

        (envelope-from <CALLER@test.ex>)
        id 10HmbE-0005vi-00
        for userx@test.ex;
        (envelope-from <CALLER@test.ex>)
        id 10HmbE-0005vi-00
        for userx@test.ex;


@@ -89,7 +92,8 @@ Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 
 From CALLER@test.ex Tue Mar 02 09:44:33 1999
 
 
 From CALLER@test.ex Tue Mar 02 09:44:33 1999

-Received: from CALLER by the.local.host.name with local-smtp (Exim x.yz)
+Received: from CALLER (helo=test)
+       by the.local.host.name with local-smtp (Exim x.yz)

        (envelope-from <CALLER@test.ex>)
        id 10HmbF-0005vi-00
        for userx@test.ex;
        (envelope-from <CALLER@test.ex>)
        id 10HmbF-0005vi-00
        for userx@test.ex;

diff --git a/test/mail/0398.x b/test/mail/0398.x
index 081d38b6d63e53216dc394cd3d1cecd019f380ee..ac339e4f7f577d3a1f0eb4763430050271d5b2ff 100644 (file)
--- a/test/mail/0398.x
+++ b/test/mail/0398.x
@@ -1,5 +1,6 @@
 From CALLER@test.ex Tue Mar 02 09:44:33 1999
 From CALLER@test.ex Tue Mar 02 09:44:33 1999

-Received: from CALLER by mail.test.ex with local-smtp (Exim x.yz)
+Received: from CALLER (helo=test)
+       by mail.test.ex with local-smtp (Exim x.yz)

        (envelope-from <CALLER@test.ex>)
        id 10HmaX-0005vi-00
        for x@local;
        (envelope-from <CALLER@test.ex>)
        id 10HmaX-0005vi-00
        for x@local;

diff --git a/test/mail/0446.userx b/test/mail/0446.userx
index 416fabca417e152682cabbe8ee903a562a5e566e..8e2ee546c395d2a9c17726bca5872491463b2da2 100644 (file)
--- a/test/mail/0446.userx
+++ b/test/mail/0446.userx
@@ -14,7 +14,8 @@ X-Router: 3
 
 
 From CALLER@test.ex Tue Mar 02 09:44:33 1999
 
 
 From CALLER@test.ex Tue Mar 02 09:44:33 1999

-Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
+Received: from CALLER (helo=test)
+       by myhost.test.ex with local-smtp (Exim x.yz)

        (envelope-from <CALLER@test.ex>)
        id 10HmaY-0005vi-00
        for userx@test.ex;
        (envelope-from <CALLER@test.ex>)
        id 10HmaY-0005vi-00
        for userx@test.ex;

diff --git a/test/mail/0496.someone b/test/mail/0496.someone
index c0010e1a514b8dddd8f4b74ca053b14b25ceff78..ded6dfb184af38f659e3649a485342233ed014a2 100644 (file)
--- a/test/mail/0496.someone
+++ b/test/mail/0496.someone
@@ -1,6 +1,7 @@
 From CALLER@myhost.test.ex Tue Mar 02 09:44:33 1999
 At-Start: some text
 From CALLER@myhost.test.ex Tue Mar 02 09:44:33 1999
 At-Start: some text

-Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
+Received: from CALLER (helo=test)
+       by myhost.test.ex with local-smtp (Exim x.yz)

        (envelope-from <CALLER@myhost.test.ex>)
        id 10HmaX-0005vi-00
        for someone@el.se;
        (envelope-from <CALLER@myhost.test.ex>)
        id 10HmaX-0005vi-00
        for someone@el.se;

diff --git a/test/mail/0500.userx b/test/mail/0500.userx
index e8882eb56637d94f8d815922bb564e687fcbf123..54e22662391dc65ce4a857bdec183aabacf4ba67 100644 (file)
--- a/test/mail/0500.userx
+++ b/test/mail/0500.userx
@@ -1,5 +1,6 @@
 From postmaster@y Tue Mar 02 09:44:33 1999
 From postmaster@y Tue Mar 02 09:44:33 1999

-Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
+Received: from CALLER (helo=test)
+       by myhost.test.ex with local-smtp (Exim x.yz)

        (envelope-from <postmaster@y>)
        id 10HmaX-0005vi-00
        for userx@y;
        (envelope-from <postmaster@y>)
        id 10HmaX-0005vi-00
        for userx@y;

diff --git a/test/mail/0517.userx b/test/mail/0517.userx
index 67462d318c3b317f4542999ccdff17b7622c594f..b94223394708db9f9c7848e4b1f0b5118e1cd0d9 100644 (file)
--- a/test/mail/0517.userx
+++ b/test/mail/0517.userx
@@ -1,5 +1,6 @@
 From CALLER@myhost.test.ex Tue Mar 02 09:44:33 1999
 From CALLER@myhost.test.ex Tue Mar 02 09:44:33 1999

-Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
+Received: from CALLER (helo=test)
+       by myhost.test.ex with local-smtp (Exim x.yz)

        (envelope-from <CALLER@myhost.test.ex>)
        id 10HmaX-0005vi-00
        for userx@dom.com;
        (envelope-from <CALLER@myhost.test.ex>)
        id 10HmaX-0005vi-00
        for userx@dom.com;

diff --git a/test/mail/0517.usery b/test/mail/0517.usery
index 3afba6d553c592921082a91dfd1294056795d324..3a2a64b93e787a307d343772122e0c304ae7c046 100644 (file)
--- a/test/mail/0517.usery
+++ b/test/mail/0517.usery
@@ -1,5 +1,6 @@
 From CALLER@myhost.test.ex Tue Mar 02 09:44:33 1999
 From CALLER@myhost.test.ex Tue Mar 02 09:44:33 1999

-Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
+Received: from CALLER (helo=test)
+       by myhost.test.ex with local-smtp (Exim x.yz)

        (envelope-from <CALLER@myhost.test.ex>)
        id 10HmaY-0005vi-00
        for usery@dom.com;
        (envelope-from <CALLER@myhost.test.ex>)
        id 10HmaY-0005vi-00
        for usery@dom.com;

diff --git a/test/mail/0532.rcptok b/test/mail/0532.rcptok
index 5411418250e482ea6a36bdeeaefd4cd19472692f..e0e7f97f4604a84d607f4cdc1a11a6fb7c80c86b 100644 (file)
--- a/test/mail/0532.rcptok
+++ b/test/mail/0532.rcptok
@@ -1,5 +1,6 @@
 From mailok@test.ex Tue Mar 02 09:44:33 1999
 From mailok@test.ex Tue Mar 02 09:44:33 1999

-Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
+Received: from CALLER (helo=test)
+       by myhost.test.ex with local-smtp (Exim x.yz)

        (envelope-from <mailok@test.ex>)
        id 10HmaX-0005vi-00
        for rcptok@test.ex;
        (envelope-from <mailok@test.ex>)
        id 10HmaX-0005vi-00
        for rcptok@test.ex;

diff --git a/test/mail/0567.rcptok b/test/mail/0567.rcptok
index 5c0c1854be0ab742b20d7b1cff4edf1e9067b8fc..48d5f3cbe4a3953f1eb42a9edc8f6142b5af9369 100644 (file)
--- a/test/mail/0567.rcptok
+++ b/test/mail/0567.rcptok
@@ -1,5 +1,6 @@
 From mailok@test.ex Tue Mar 02 09:44:33 1999
 From mailok@test.ex Tue Mar 02 09:44:33 1999

-Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
+Received: from CALLER (helo=test)
+       by myhost.test.ex with local-smtp (Exim x.yz)

        (envelope-from <mailok@test.ex>)
        id 10HmaX-0005vi-00
        for rcptok@test.ex;
        (envelope-from <mailok@test.ex>)
        id 10HmaX-0005vi-00
        for rcptok@test.ex;

diff --git a/test/mail/0580.local b/test/mail/0580.local
index 9df481db92fa62eebf18c0492583f4a7c543b60e..16b65d2b7a9424ce4f7d1273b71a4b9b259b1599 100644 (file)
--- a/test/mail/0580.local
+++ b/test/mail/0580.local
@@ -1,5 +1,6 @@
 From CALLER@myhost.test.ex Tue Mar 02 09:44:33 1999
 From CALLER@myhost.test.ex Tue Mar 02 09:44:33 1999

-Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
+Received: from CALLER (helo=test)
+       by myhost.test.ex with local-smtp (Exim x.yz)

        (envelope-from <CALLER@myhost.test.ex>)
        id 10HmbB-0005vi-00;
        Tue, 2 Mar 1999 09:44:33 +0000
        (envelope-from <CALLER@myhost.test.ex>)
        id 10HmbB-0005vi-00;
        Tue, 2 Mar 1999 09:44:33 +0000

diff --git a/test/mail/0600.CALLER b/test/mail/0600.CALLER
index 2cd5947d52778ac1744f40294c5b0da28a454505..987765ebee9a1b8b5db80008f5387a1653ace600 100644 (file)
--- a/test/mail/0600.CALLER
+++ b/test/mail/0600.CALLER
@@ -2,7 +2,8 @@ From CALLER@the.local.host.name Tue Mar 02 09:44:33 1999
 Return-path: <CALLER@the.local.host.name>
 Envelope-to: CALLER@the.local.host.name
 Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Return-path: <CALLER@the.local.host.name>
 Envelope-to: CALLER@the.local.host.name
 Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000

-Received: from CALLER by the.local.host.name with local-smtp (Exim x.yz)
+Received: from CALLER (helo=test)
+       by the.local.host.name with local-smtp (Exim x.yz)

        (envelope-from <CALLER@the.local.host.name>)
        id 10HmaX-0005vi-00
        for CALLER@the.local.host.name;
        (envelope-from <CALLER@the.local.host.name>)
        id 10HmaX-0005vi-00
        for CALLER@the.local.host.name;


@@ -19,7 +20,7 @@ From: CALLER@the.local.host.name
 Date: Tue, 2 Mar 1999 09:44:33 +0000
 X-local-user: uid=CALLER_UID gid=CALLER_GID
 X-body-linecount: 3
 Date: Tue, 2 Mar 1999 09:44:33 +0000
 X-local-user: uid=CALLER_UID gid=CALLER_GID
 X-body-linecount: 3

-X-message-linecount: 18
+X-message-linecount: 19

 X-received-count: 1
 
 This is a test message.
 X-received-count: 1
 
 This is a test message.


@@ -30,7 +31,8 @@ From CALLER@the.local.host.name Tue Mar 02 09:44:33 1999
 Return-path: <CALLER@the.local.host.name>
 Envelope-to: CALLER@the.local.host.name
 Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Return-path: <CALLER@the.local.host.name>
 Envelope-to: CALLER@the.local.host.name
 Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000

-Received: from CALLER by the.local.host.name with local-smtp (Exim x.yz)
+Received: from CALLER (helo=test)
+       by the.local.host.name with local-smtp (Exim x.yz)

        (envelope-from <CALLER@the.local.host.name>)
        id 10HmaY-0005vi-00
        for CALLER@the.local.host.name;
        (envelope-from <CALLER@the.local.host.name>)
        id 10HmaY-0005vi-00
        for CALLER@the.local.host.name;


@@ -41,7 +43,7 @@ From: CALLER@the.local.host.name
 Date: Tue, 2 Mar 1999 09:44:33 +0000
 X-local-user: uid=CALLER_UID gid=CALLER_GID
 X-body-linecount: 1
 Date: Tue, 2 Mar 1999 09:44:33 +0000
 X-local-user: uid=CALLER_UID gid=CALLER_GID
 X-body-linecount: 1

-X-message-linecount: 10
+X-message-linecount: 11

 X-received-count: 1
 
 This is a second test message.
 X-received-count: 1
 
 This is a second test message.

diff --git a/test/mail/1110.userx b/test/mail/1110.userx
index cfc50295f16f8d8a04099813b035aa4a56107351..a0aa956202d1859767024697087bc9211d7a7361 100644 (file)
--- a/test/mail/1110.userx
+++ b/test/mail/1110.userx
@@ -11,8 +11,8 @@ TLS: cipher=TLS1.x:ke-RSA-AES256-SHAnnn:xxx peerdn/cn ''
 This is a test encrypted message.
 
 From userx@test.ex Tue Mar 02 09:44:33 1999
 This is a test encrypted message.
 
 From userx@test.ex Tue Mar 02 09:44:33 1999

-Received: from [ip4.ip4.ip4.ip4]
-       by myhost.test.ex with smtp (TLS1.x:ke-RSA-AES256-SHAnnn:xxx)
+Received: from [ip4.ip4.ip4.ip4] (helo=test)
+       by myhost.test.ex with smtps (TLS1.x:ke-RSA-AES256-SHAnnn:xxx)

        (Exim x.yz)
        (envelope-from <userx@test.ex>)
        id 10HmaY-0005vi-00
        (Exim x.yz)
        (envelope-from <userx@test.ex>)
        id 10HmaY-0005vi-00

diff --git a/test/mail/2002.CALLER b/test/mail/2002.CALLER
index adeef5a8d4398b8131f324e875b07116daba7550..2203c8e2b992d6727f4e6b3c1a2881c69c86b0d0 100644 (file)
--- a/test/mail/2002.CALLER
+++ b/test/mail/2002.CALLER
@@ -1,6 +1,6 @@
 From CALLER@test.ex Tue Mar 02 09:44:33 1999
 From CALLER@test.ex Tue Mar 02 09:44:33 1999

-Received: from [127.0.0.1]
-       by myhost.test.ex with smtps (TLS1.x:ke-RSA-AES256-SHAnnn:xxx)
+Received: from [127.0.0.1] (helo=rhu.barb)
+       by myhost.test.ex with esmtps (TLS1.x:ke-RSA-AES256-SHAnnn:xxx)

        (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        id 10HmaX-0005vi-00
        (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        id 10HmaX-0005vi-00


@@ -12,7 +12,7 @@ TLS: cipher=TLS1.x:ke-RSA-AES256-SHAnnn:xxx peerdn=
 This is a test encrypted message.
 
 From "name with spaces"@test.ex Tue Mar 02 09:44:33 1999
 This is a test encrypted message.
 
 From "name with spaces"@test.ex Tue Mar 02 09:44:33 1999

-Received: from [127.0.0.1]
+Received: from [127.0.0.1] (helo=test)

        by myhost.test.ex with smtps (TLS1.x:ke-RSA-AES256-SHAnnn:xxx)
        (Exim x.yz)
        (envelope-from <"name with spaces"@test.ex>)
        by myhost.test.ex with smtps (TLS1.x:ke-RSA-AES256-SHAnnn:xxx)
        (Exim x.yz)
        (envelope-from <"name with spaces"@test.ex>)


@@ -25,7 +25,7 @@ TLS: cipher=TLS1.x:ke-RSA-AES256-SHAnnn:xxx peerdn=
 This is a test encrypted message.
 
 From CALLER@test.ex Tue Mar 02 09:44:33 1999
 This is a test encrypted message.
 
 From CALLER@test.ex Tue Mar 02 09:44:33 1999

-Received: from [ip4.ip4.ip4.ip4]
+Received: from [ip4.ip4.ip4.ip4] (helo=test)

        by myhost.test.ex with smtps (TLS1.x:ke-RSA-AES256-SHAnnn:xxx)
        (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        by myhost.test.ex with smtps (TLS1.x:ke-RSA-AES256-SHAnnn:xxx)
        (Exim x.yz)
        (envelope-from <CALLER@test.ex>)


@@ -38,7 +38,7 @@ TLS: cipher=TLS1.x:ke-RSA-AES256-SHAnnn:xxx peerdn=CN=server2.example.com
 This is a test encrypted message from a verified host.
 
 From CALLER@test.ex Tue Mar 02 09:44:33 1999
 This is a test encrypted message from a verified host.
 
 From CALLER@test.ex Tue Mar 02 09:44:33 1999

-Received: from [127.0.0.1]
+Received: from [127.0.0.1] (helo=test)

        by myhost.test.ex with smtps (TLS1.x:ke-RSA-AES256-SHAnnn:xxx)
        (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        by myhost.test.ex with smtps (TLS1.x:ke-RSA-AES256-SHAnnn:xxx)
        (Exim x.yz)
        (envelope-from <CALLER@test.ex>)


@@ -52,7 +52,7 @@ This is a test encrypted message.
 It should be sent under the RSA server cert and with an RSA cipher.
 
 From CALLER@test.ex Tue Mar 02 09:44:33 1999
 It should be sent under the RSA server cert and with an RSA cipher.
 
 From CALLER@test.ex Tue Mar 02 09:44:33 1999

-Received: from [127.0.0.1]
+Received: from [127.0.0.1] (helo=test)

        by myhost.test.ex with smtps (TLS1.x:ke-ECDSA-AES256-SHAnnn:xxx)
        (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        by myhost.test.ex with smtps (TLS1.x:ke-ECDSA-AES256-SHAnnn:xxx)
        (Exim x.yz)
        (envelope-from <CALLER@test.ex>)

diff --git a/test/mail/2102.CALLER b/test/mail/2102.CALLER
index 13dcbf247a5780ddd6eca3905a16eedff50a2665..4cde3748226675825e2b5ed3d9f4a69a2c1ea536 100644 (file)
--- a/test/mail/2102.CALLER
+++ b/test/mail/2102.CALLER
@@ -1,6 +1,6 @@
 From a@test.ex Tue Mar 02 09:44:33 1999
 From a@test.ex Tue Mar 02 09:44:33 1999

-Received: from [127.0.0.1]
-       by myhost.test.ex with smtps (TLS1.x:ke-RSA-AES256-SHAnnn:xxx)
+Received: from [127.0.0.1] (helo=rhu.barb)
+       by myhost.test.ex with esmtps (TLS1.x:ke-RSA-AES256-SHAnnn:xxx)

        (Exim x.yz)
        (envelope-from <a@test.ex>)
        id 10HmaX-0005vi-00
        (Exim x.yz)
        (envelope-from <a@test.ex>)
        id 10HmaX-0005vi-00


@@ -12,8 +12,8 @@ TLS: cipher=TLS1.x:ke-RSA-AES256-SHAnnn:xxx peerdn=
 This is a test encrypted message.
 
 From "name with spaces"@test.ex Tue Mar 02 09:44:33 1999
 This is a test encrypted message.
 
 From "name with spaces"@test.ex Tue Mar 02 09:44:33 1999

-Received: from [127.0.0.1]
-       by myhost.test.ex with smtps (TLS1.x:ke-RSA-AES256-SHAnnn:xxx)
+Received: from [127.0.0.1] (helo=rhu.barb)
+       by myhost.test.ex with esmtps (TLS1.x:ke-RSA-AES256-SHAnnn:xxx)

        (Exim x.yz)
        (envelope-from <"name with spaces"@test.ex>)
        id 10HmaY-0005vi-00
        (Exim x.yz)
        (envelope-from <"name with spaces"@test.ex>)
        id 10HmaY-0005vi-00


@@ -25,8 +25,8 @@ TLS: cipher=TLS1.x:ke-RSA-AES256-SHAnnn:xxx peerdn=
 This is a test encrypted message.
 
 From b@test.ex Tue Mar 02 09:44:33 1999
 This is a test encrypted message.
 
 From b@test.ex Tue Mar 02 09:44:33 1999

-Received: from [ip4.ip4.ip4.ip4]
-       by myhost.test.ex with smtps (TLS1.x:ke-RSA-AES256-SHAnnn:xxx)
+Received: from [ip4.ip4.ip4.ip4] (helo=rhu.barb)
+       by myhost.test.ex with esmtps (TLS1.x:ke-RSA-AES256-SHAnnn:xxx)

        (Exim x.yz)
        (envelope-from <b@test.ex>)
        id 10HmaZ-0005vi-00
        (Exim x.yz)
        (envelope-from <b@test.ex>)
        id 10HmaZ-0005vi-00


@@ -38,8 +38,8 @@ TLS: cipher=TLS1.x:ke-RSA-AES256-SHAnnn:xxx peerdn=/CN=server2.example.com
 This is a test encrypted message from a verified host.
 
 From c@test.ex Tue Mar 02 09:44:33 1999
 This is a test encrypted message from a verified host.
 
 From c@test.ex Tue Mar 02 09:44:33 1999

-Received: from [127.0.0.1]
-       by myhost.test.ex with smtps (TLS1.x:ke-ECDSA-AES256-SHAnnn:xxx)
+Received: from [127.0.0.1] (helo=rhu.barb)
+       by myhost.test.ex with esmtps (TLS1.x:ke-ECDSA-AES256-SHAnnn:xxx)

        (Exim x.yz)
        (envelope-from <c@test.ex>)
        id 10HmbA-0005vi-00
        (Exim x.yz)
        (envelope-from <c@test.ex>)
        id 10HmbA-0005vi-00

diff --git a/test/mail/2132.CALLER b/test/mail/2132.CALLER
index 4e35082dca6de28577325bb6154108bb9370439f..abe23c5fb525b5b4951f343a4feb950792f9c92f 100644 (file)
--- a/test/mail/2132.CALLER
+++ b/test/mail/2132.CALLER
@@ -1,5 +1,5 @@
 From CALLER@test.ex Tue Mar 02 09:44:33 1999
 From CALLER@test.ex Tue Mar 02 09:44:33 1999

-Received: from [127.0.0.1]
+Received: from [127.0.0.1] (helo=test)

        by myhost.test.ex with smtps (TLS1.x:ke-RSA-AES256-SHAnnn:xxx)
        (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        by myhost.test.ex with smtps (TLS1.x:ke-RSA-AES256-SHAnnn:xxx)
        (Exim x.yz)
        (envelope-from <CALLER@test.ex>)


@@ -12,7 +12,7 @@ TLS: cipher=TLS1.x:ke-RSA-AES256-SHAnnn:xxx peerdn=
 This is a test encrypted message.
 
 From "name with spaces"@test.ex Tue Mar 02 09:44:33 1999
 This is a test encrypted message.
 
 From "name with spaces"@test.ex Tue Mar 02 09:44:33 1999

-Received: from [127.0.0.1]
+Received: from [127.0.0.1] (helo=test)

        by myhost.test.ex with smtps (TLS1.x:ke-RSA-AES256-SHAnnn:xxx)
        (Exim x.yz)
        (envelope-from <"name with spaces"@test.ex>)
        by myhost.test.ex with smtps (TLS1.x:ke-RSA-AES256-SHAnnn:xxx)
        (Exim x.yz)
        (envelope-from <"name with spaces"@test.ex>)


@@ -25,7 +25,7 @@ TLS: cipher=TLS1.x:ke-RSA-AES256-SHAnnn:xxx peerdn=
 This is a test encrypted message.
 
 From CALLER@test.ex Tue Mar 02 09:44:33 1999
 This is a test encrypted message.
 
 From CALLER@test.ex Tue Mar 02 09:44:33 1999

-Received: from [ip4.ip4.ip4.ip4]
+Received: from [ip4.ip4.ip4.ip4] (helo=test)

        by myhost.test.ex with smtps (TLS1.x:ke-RSA-AES256-SHAnnn:xxx)
        (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        by myhost.test.ex with smtps (TLS1.x:ke-RSA-AES256-SHAnnn:xxx)
        (Exim x.yz)
        (envelope-from <CALLER@test.ex>)

diff --git a/test/rejectlog/0014 b/test/rejectlog/0014
index 7827437881574c1a04ce801297b57770d7157205..5b8e2eeceda1ae2418365acfb752c5ae7042e175 100644 (file)
--- a/test/rejectlog/0014
+++ b/test/rejectlog/0014
@@ -1,2 +1,2 @@
-1999-03-02 09:44:33 H=[10.0.0.2] U=CALLER sender verify fail for <"jules@box3.plc.example-is-not-known"@plc.example>: Unrouteable mail domain "plc.example"
-1999-03-02 09:44:33 H=[10.0.0.2] U=CALLER F=<jules@box3.plc.example> rejected RCPT <userx@test.ex>: Sender verify failed
+1999-03-02 09:44:33 H=(test) [10.0.0.2] U=CALLER sender verify fail for <"jules@box3.plc.example-is-not-known"@plc.example>: Unrouteable mail domain "plc.example"
+1999-03-02 09:44:33 H=(test) [10.0.0.2] U=CALLER F=<jules@box3.plc.example> rejected RCPT <userx@test.ex>: Sender verify failed

diff --git a/test/rejectlog/0023 b/test/rejectlog/0023
index dc6c7e9ba987073bf3bf852130330d7a0b5c4eaf..74b4db5ef0b9c8e129947556d624fc70d106e039 100644 (file)
--- a/test/rejectlog/0023
+++ b/test/rejectlog/0023
@@ -1,7 +1,7 @@
-1999-03-02 09:44:33 H=[56.56.57.57] U=CALLER F=<userx@test.ex> temporarily rejected RCPT <cond-rhubarb@test.ex>: invalid "condition" value "rhubarb"
-1999-03-02 09:44:33 H=[56.56.58.58] U=CALLER F=<rcpttest@test.ex> rejected RCPT <bad1@test.ex>
-1999-03-02 09:44:33 H=[56.56.58.58] U=CALLER F=<rcpttest@test.ex> rejected RCPT <bad2@test.ex>
-1999-03-02 09:44:33 H=[56.56.58.58] U=CALLER F=<rcpttest@test.ex> rejected RCPT <bad3@test.ex>
-1999-03-02 09:44:33 H=[56.56.59.59] U=CALLER F=<rcpttest@test.ex> rejected RCPT <fail@test.ex>: here is a fail message
-1999-03-02 09:44:33 H=[V4NET.11.12.13] U=CALLER F=<x@y> rejected RCPT <x@y>: DNSLIST (rbl.test.ex: This is a test blacklisting message)
-1999-03-02 09:44:33 H=[V4NET.11.12.13] U=CALLER F=<x@y> rejected RCPT <x1@y>: DNSLIST (rbl.test.ex: This is a test blacklisting message)
+1999-03-02 09:44:33 H=(test) [56.56.57.57] U=CALLER F=<userx@test.ex> temporarily rejected RCPT <cond-rhubarb@test.ex>: invalid "condition" value "rhubarb"
+1999-03-02 09:44:33 H=(test) [56.56.58.58] U=CALLER F=<rcpttest@test.ex> rejected RCPT <bad1@test.ex>
+1999-03-02 09:44:33 H=(test) [56.56.58.58] U=CALLER F=<rcpttest@test.ex> rejected RCPT <bad2@test.ex>
+1999-03-02 09:44:33 H=(test) [56.56.58.58] U=CALLER F=<rcpttest@test.ex> rejected RCPT <bad3@test.ex>
+1999-03-02 09:44:33 H=(test) [56.56.59.59] U=CALLER F=<rcpttest@test.ex> rejected RCPT <fail@test.ex>: here is a fail message
+1999-03-02 09:44:33 H=(test) [V4NET.11.12.13] U=CALLER F=<x@y> rejected RCPT <x@y>: DNSLIST (rbl.test.ex: This is a test blacklisting message)
+1999-03-02 09:44:33 H=(test) [V4NET.11.12.13] U=CALLER F=<x@y> rejected RCPT <x1@y>: DNSLIST (rbl.test.ex: This is a test blacklisting message)

diff --git a/test/rejectlog/0024 b/test/rejectlog/0024
index be36148dae3e955dbceac9e2f30899714096505a..f995b18c60abc4ccf9604c35d744c365b751435d 100644 (file)
--- a/test/rejectlog/0024
+++ b/test/rejectlog/0024
@@ -1,11 +1,11 @@
-1999-03-02 09:44:33 H=[V4NET.0.0.0] U=CALLER sender verify fail for <x@y>: Unrouteable address
-1999-03-02 09:44:33 H=[V4NET.0.0.0] U=CALLER F=<x@y> rejected RCPT <userx@test.ex>: Sender verify failed
-1999-03-02 09:44:33 H=[V4NET.0.0.0] U=CALLER F=<x@y> rejected RCPT <x@y>: Sender verify failed
-1999-03-02 09:44:33 H=[V4NET.0.0.0] U=CALLER F=<x@y> rejected RCPT <x@ten-1.test.ex>: Sender verify failed
-1999-03-02 09:44:33 H=[V4NET.0.0.0] U=CALLER F=<x@y> rejected RCPT <x@ten-2.test.ex>: Sender verify failed
-1999-03-02 09:44:33 H=[V4NET.0.0.0] U=CALLER F=<userx@test.ex> rejected RCPT <x@y>: Unrouteable address
-1999-03-02 09:44:33 H=[V4NET.0.0.0] U=CALLER F=<userx@test.ex> rejected RCPT <x@ten-2.test.ex>: relay not permitted
-1999-03-02 09:44:33 H=[V4NET.255.255.0] U=CALLER F=<userx@test.ex> rejected RCPT <bad@test.ex>: unknown user
-1999-03-02 09:44:33 H=[V4NET.255.255.0] U=CALLER F=<userx@test.ex> rejected RCPT <x@y>: Unrouteable address
-1999-03-02 09:44:33 H=[V4NET.11.12.13] U=CALLER F=<userx@test.ex> rejected RCPT <userx@test.ex>: rejected because V4NET.11.12.13 is in a black list at rbl.test.ex
-1999-03-02 09:44:33 H=[V4NET.11.12.13] U=CALLER F=<userx@test.ex> rejected RCPT <x@ten-1.test.ex>: rejected because V4NET.11.12.13 is in a black list at rbl.test.ex
+1999-03-02 09:44:33 H=(test) [V4NET.0.0.0] U=CALLER sender verify fail for <x@y>: Unrouteable address
+1999-03-02 09:44:33 H=(test) [V4NET.0.0.0] U=CALLER F=<x@y> rejected RCPT <userx@test.ex>: Sender verify failed
+1999-03-02 09:44:33 H=(test) [V4NET.0.0.0] U=CALLER F=<x@y> rejected RCPT <x@y>: Sender verify failed
+1999-03-02 09:44:33 H=(test) [V4NET.0.0.0] U=CALLER F=<x@y> rejected RCPT <x@ten-1.test.ex>: Sender verify failed
+1999-03-02 09:44:33 H=(test) [V4NET.0.0.0] U=CALLER F=<x@y> rejected RCPT <x@ten-2.test.ex>: Sender verify failed
+1999-03-02 09:44:33 H=(test) [V4NET.0.0.0] U=CALLER F=<userx@test.ex> rejected RCPT <x@y>: Unrouteable address
+1999-03-02 09:44:33 H=(test) [V4NET.0.0.0] U=CALLER F=<userx@test.ex> rejected RCPT <x@ten-2.test.ex>: relay not permitted
+1999-03-02 09:44:33 H=(test) [V4NET.255.255.0] U=CALLER F=<userx@test.ex> rejected RCPT <bad@test.ex>: unknown user
+1999-03-02 09:44:33 H=(test) [V4NET.255.255.0] U=CALLER F=<userx@test.ex> rejected RCPT <x@y>: Unrouteable address
+1999-03-02 09:44:33 H=(test) [V4NET.11.12.13] U=CALLER F=<userx@test.ex> rejected RCPT <userx@test.ex>: rejected because V4NET.11.12.13 is in a black list at rbl.test.ex
+1999-03-02 09:44:33 H=(test) [V4NET.11.12.13] U=CALLER F=<userx@test.ex> rejected RCPT <x@ten-1.test.ex>: rejected because V4NET.11.12.13 is in a black list at rbl.test.ex

diff --git a/test/rejectlog/0026 b/test/rejectlog/0026
index 96682c4f36890ffb78e2bc13dfb984f360410e14..0499db2f61b6e554b428e074180d4ffa0a70f420 100644 (file)
--- a/test/rejectlog/0026
+++ b/test/rejectlog/0026
@@ -1,7 +1,8 @@
 1999-03-02 09:44:33 10HmaX-0005vi-00 U=CALLER F=<x@y> rejected after DATA: domain missing or malformed: failing address in "From:" header is: @
 Envelope-from: <x@y>
 Envelope-to: <x@y>
 1999-03-02 09:44:33 10HmaX-0005vi-00 U=CALLER F=<x@y> rejected after DATA: domain missing or malformed: failing address in "From:" header is: @
 Envelope-from: <x@y>
 Envelope-to: <x@y>

-P Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
+P Received: from CALLER (helo=test)
+       by myhost.test.ex with local-smtp (Exim x.yz)

        (envelope-from <x@y>)
        id 10HmaX-0005vi-00
        for x@y;
        (envelope-from <x@y>)
        id 10HmaX-0005vi-00
        for x@y;


@@ -12,7 +13,8 @@ I Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 1999-03-02 09:44:33 10HmaY-0005vi-00 U=CALLER F=<x@y> rejected after DATA: '>' missing at end of address: failing address in "To:" header is: <dummy@gmail.com
 Envelope-from: <x@y>
 Envelope-to: <x@y>
 1999-03-02 09:44:33 10HmaY-0005vi-00 U=CALLER F=<x@y> rejected after DATA: '>' missing at end of address: failing address in "To:" header is: <dummy@gmail.com
 Envelope-from: <x@y>
 Envelope-to: <x@y>

-P Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
+P Received: from CALLER (helo=test)
+       by myhost.test.ex with local-smtp (Exim x.yz)

        (envelope-from <x@y>)
        id 10HmaY-0005vi-00
        for x@y;
        (envelope-from <x@y>)
        id 10HmaY-0005vi-00
        for x@y;


@@ -25,7 +27,8 @@ I Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
 1999-03-02 09:44:33 10HmaZ-0005vi-00 U=CALLER F=<> rejected after DATA: domain missing or malformed: failing address in "From:" header is: @
 Envelope-from: <>
 Envelope-to: <x@y>
 1999-03-02 09:44:33 10HmaZ-0005vi-00 U=CALLER F=<> rejected after DATA: domain missing or malformed: failing address in "From:" header is: @
 Envelope-from: <>
 Envelope-to: <x@y>

-P Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
+P Received: from CALLER (helo=test)
+       by myhost.test.ex with local-smtp (Exim x.yz)

        id 10HmaZ-0005vi-00
        for x@y;
        Tue, 2 Mar 1999 09:44:33 +0000
        id 10HmaZ-0005vi-00
        for x@y;
        Tue, 2 Mar 1999 09:44:33 +0000


@@ -35,7 +38,8 @@ I Message-Id: <E10HmaZ-0005vi-00@myhost.test.ex>
 1999-03-02 09:44:33 10HmbA-0005vi-00 U=CALLER F=<> rejected after DATA: there is no valid sender in any header line
 Envelope-from: <>
 Envelope-to: <x@y>
 1999-03-02 09:44:33 10HmbA-0005vi-00 U=CALLER F=<> rejected after DATA: there is no valid sender in any header line
 Envelope-from: <>
 Envelope-to: <x@y>

-P Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
+P Received: from CALLER (helo=test)
+       by myhost.test.ex with local-smtp (Exim x.yz)

        id 10HmbA-0005vi-00
        for x@y;
        Tue, 2 Mar 1999 09:44:33 +0000
        id 10HmbA-0005vi-00
        for x@y;
        Tue, 2 Mar 1999 09:44:33 +0000


@@ -46,7 +50,8 @@ I Message-Id: <E10HmbA-0005vi-00@myhost.test.ex>
 1999-03-02 09:44:33 10HmbB-0005vi-00 U=CALLER F=<x@y> rejected after DATA: body contains trigger
 Envelope-from: <x@y>
 Envelope-to: <x@y>
 1999-03-02 09:44:33 10HmbB-0005vi-00 U=CALLER F=<x@y> rejected after DATA: body contains trigger
 Envelope-from: <x@y>
 Envelope-to: <x@y>

-P Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
+P Received: from CALLER (helo=test)
+       by myhost.test.ex with local-smtp (Exim x.yz)

        (envelope-from <x@y>)
        id 10HmbB-0005vi-00
        for x@y;
        (envelope-from <x@y>)
        id 10HmbB-0005vi-00
        for x@y;


@@ -57,7 +62,8 @@ F From: x@y
 1999-03-02 09:44:33 10HmbC-0005vi-00 U=CALLER F=<> rejected after DATA: there is no valid sender in any header line
 Envelope-from: <>
 Envelope-to: <userx@test.ex>
 1999-03-02 09:44:33 10HmbC-0005vi-00 U=CALLER F=<> rejected after DATA: there is no valid sender in any header line
 Envelope-from: <>
 Envelope-to: <userx@test.ex>

-P Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
+P Received: from CALLER (helo=test)
+       by myhost.test.ex with local-smtp (Exim x.yz)

        id 10HmbC-0005vi-00
        for userx@test.ex;
        Tue, 2 Mar 1999 09:44:33 +0000
        id 10HmbC-0005vi-00
        for userx@test.ex;
        Tue, 2 Mar 1999 09:44:33 +0000

diff --git a/test/rejectlog/0027 b/test/rejectlog/0027
index 9ae0806fba49fd1a4183d8be7e6b3a72f841a528..e4d8e5ded7d0e5582cc54cf17a69967ad6b93249 100644 (file)
--- a/test/rejectlog/0027
+++ b/test/rejectlog/0027
@@ -10,7 +10,8 @@
 1999-03-02 09:44:33 10HmaX-0005vi-00 U=CALLER F=<> temporarily rejected after DATA: cannot verify recipient in ACL for DATA
 Envelope-from: <>
 Envelope-to: <data@test.ex>
 1999-03-02 09:44:33 10HmaX-0005vi-00 U=CALLER F=<> temporarily rejected after DATA: cannot verify recipient in ACL for DATA
 Envelope-from: <>
 Envelope-to: <data@test.ex>

-P Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
+P Received: from CALLER (helo=test)
+       by myhost.test.ex with local-smtp (Exim x.yz)

        id 10HmaX-0005vi-00
        for data@test.ex;
        Tue, 2 Mar 1999 09:44:33 +0000
        id 10HmaX-0005vi-00
        for data@test.ex;
        Tue, 2 Mar 1999 09:44:33 +0000


@@ -20,7 +21,8 @@ I Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 1999-03-02 09:44:33 10HmaY-0005vi-00 U=CALLER F=<> temporarily rejected after DATA: cannot test domains condition in DATA ACL
 Envelope-from: <>
 Envelope-to: <data@test.ex>
 1999-03-02 09:44:33 10HmaY-0005vi-00 U=CALLER F=<> temporarily rejected after DATA: cannot test domains condition in DATA ACL
 Envelope-from: <>
 Envelope-to: <data@test.ex>

-P Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
+P Received: from CALLER (helo=test)
+       by myhost.test.ex with local-smtp (Exim x.yz)

        id 10HmaY-0005vi-00
        for data@test.ex;
        Tue, 2 Mar 1999 09:44:33 +0000
        id 10HmaY-0005vi-00
        for data@test.ex;
        Tue, 2 Mar 1999 09:44:33 +0000


@@ -30,7 +32,8 @@ I Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
 1999-03-02 09:44:33 10HmaZ-0005vi-00 U=CALLER F=<> temporarily rejected after DATA: cannot test local_parts condition in DATA ACL
 Envelope-from: <>
 Envelope-to: <data@test.ex>
 1999-03-02 09:44:33 10HmaZ-0005vi-00 U=CALLER F=<> temporarily rejected after DATA: cannot test local_parts condition in DATA ACL
 Envelope-from: <>
 Envelope-to: <data@test.ex>

-P Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
+P Received: from CALLER (helo=test)
+       by myhost.test.ex with local-smtp (Exim x.yz)

        id 10HmaZ-0005vi-00
        for data@test.ex;
        Tue, 2 Mar 1999 09:44:33 +0000
        id 10HmaZ-0005vi-00
        for data@test.ex;
        Tue, 2 Mar 1999 09:44:33 +0000

diff --git a/test/rejectlog/0028 b/test/rejectlog/0028
index 1e5600b4f869b1025b0780913564df977d47861c..94dc5626ce38a8f3dc14f3bcbf32ba80247a4570 100644 (file)
--- a/test/rejectlog/0028
+++ b/test/rejectlog/0028
@@ -1,7 +1,8 @@
 1999-03-02 09:44:33 10HmaX-0005vi-00 U=CALLER F=<CALLER@myhost.test.ex> rejected after DATA: message too big - $recipients=userx@test.ex (1)
 Envelope-from: <CALLER@myhost.test.ex>
 Envelope-to: <userx@test.ex>
 1999-03-02 09:44:33 10HmaX-0005vi-00 U=CALLER F=<CALLER@myhost.test.ex> rejected after DATA: message too big - $recipients=userx@test.ex (1)
 Envelope-from: <CALLER@myhost.test.ex>
 Envelope-to: <userx@test.ex>

-P Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
+P Received: from CALLER (helo=test)
+       by myhost.test.ex with local-smtp (Exim x.yz)

        (envelope-from <CALLER@myhost.test.ex>)
        id 10HmaX-0005vi-00
        for userx@test.ex;
        (envelope-from <CALLER@myhost.test.ex>)
        id 10HmaX-0005vi-00
        for userx@test.ex;

diff --git a/test/rejectlog/0162 b/test/rejectlog/0162
index 89361d3183e37399364f2a41fe967bb3eb48107b..1bef1ef517374a2b1399464634c7782fd7301862 100644 (file)
--- a/test/rejectlog/0162
+++ b/test/rejectlog/0162
@@ -1,7 +1,8 @@
 1999-03-02 09:44:33 10HmaX-0005vi-00 U=CALLER F=<CALLER@myhost.test.ex> rejected after DATA: malformed address: ">,\n  <u213@shrike.depaul.edu>,\n may not follow <u212@shrike.depaul.edu: failing address in "To:" header begins: <u212@shrike.depaul.edu">,\n  <u213@shrike.depaul.edu>,\n  <u214@hotmail.com>,\n  <u215@hotmail.com>,\n  <u216@hotmail.com>,\n  <u217@hotmail.com>,\n  <u218@hotmail.com>,\n  <u219@angelfire.com>,\n  <u220@chickmail.com>,\n  <u221@excite.com>,\n  <u222@chickmail.com>,\n  <u223@eudoramail.com>,\n  <u224@alleyne.demon.co.uk>,\n  <u225@dial.pipex.com>,\n  <u226@hotmail.com>,\n  <u227@gpu.srv.ualberta.ca>,\n  <u228@ulst.ac.uk>,\n  <u229@worldnet.att.net>,\n  <u230@hotmail.com>,\n  <u231@careerbuildermail.com>,\n  <u232@MSN.COM>,\n  <u233@angelfire.com>,\n  <u234@hotmail.com>,\n  <u235@hotmail.com>,\n  <u236@compuserve.com>,\n  <u237@compuserve.com>,\n  <u238@hotmail.com>,\n  <u239@bellsouth.net>,\n  <u240@n64rocks.com>,\n  <u241@mailexcite.com>,\n  <u242@mailexcite.com>,\n  <u243@mailcity.com>,\n  <u244@bigfoot.com>,\n  <u245@sunbeach.net>,\n  <u246@mailcity.com>,\n  <u247@pacbell.net>,\n  <u248@hotmail.com>,\n  <u249@worldnet.att.net>,\n  <u250@bigfoot.com>,\n  <u251@mailexcite.com>,\n  <u252@netnoir.net>,\n  <u253@cablecomm1.pcs.mot.com>,\n  <u254@compu
 Envelope-from: <CALLER@myhost.test.ex>
 Envelope-to: <u3@test.ex>
 1999-03-02 09:44:33 10HmaX-0005vi-00 U=CALLER F=<CALLER@myhost.test.ex> rejected after DATA: malformed address: ">,\n  <u213@shrike.depaul.edu>,\n may not follow <u212@shrike.depaul.edu: failing address in "To:" header begins: <u212@shrike.depaul.edu">,\n  <u213@shrike.depaul.edu>,\n  <u214@hotmail.com>,\n  <u215@hotmail.com>,\n  <u216@hotmail.com>,\n  <u217@hotmail.com>,\n  <u218@hotmail.com>,\n  <u219@angelfire.com>,\n  <u220@chickmail.com>,\n  <u221@excite.com>,\n  <u222@chickmail.com>,\n  <u223@eudoramail.com>,\n  <u224@alleyne.demon.co.uk>,\n  <u225@dial.pipex.com>,\n  <u226@hotmail.com>,\n  <u227@gpu.srv.ualberta.ca>,\n  <u228@ulst.ac.uk>,\n  <u229@worldnet.att.net>,\n  <u230@hotmail.com>,\n  <u231@careerbuildermail.com>,\n  <u232@MSN.COM>,\n  <u233@angelfire.com>,\n  <u234@hotmail.com>,\n  <u235@hotmail.com>,\n  <u236@compuserve.com>,\n  <u237@compuserve.com>,\n  <u238@hotmail.com>,\n  <u239@bellsouth.net>,\n  <u240@n64rocks.com>,\n  <u241@mailexcite.com>,\n  <u242@mailexcite.com>,\n  <u243@mailcity.com>,\n  <u244@bigfoot.com>,\n  <u245@sunbeach.net>,\n  <u246@mailcity.com>,\n  <u247@pacbell.net>,\n  <u248@hotmail.com>,\n  <u249@worldnet.att.net>,\n  <u250@bigfoot.com>,\n  <u251@mailexcite.com>,\n  <u252@netnoir.net>,\n  <u253@cablecomm1.pcs.mot.com>,\n  <u254@compu
 Envelope-from: <CALLER@myhost.test.ex>
 Envelope-to: <u3@test.ex>

-P Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
+P Received: from CALLER (helo=test)
+       by myhost.test.ex with local-smtp (Exim x.yz)

        (envelope-from <CALLER@myhost.test.ex>)
        id 10HmaX-0005vi-00
        for u3@test.ex;
        (envelope-from <CALLER@myhost.test.ex>)
        id 10HmaX-0005vi-00
        for u3@test.ex;

diff --git a/test/rejectlog/0212 b/test/rejectlog/0212
index 2d6823473e699c5cf987fbcf44cded4e758db660..6debd3df579bfa9496b7c34897e7d4f4b05a1e49 100644 (file)
--- a/test/rejectlog/0212
+++ b/test/rejectlog/0212
@@ -1,4 +1,4 @@
-1999-03-02 09:44:33 H=[V4NET.0.0.0] U=CALLER F=<userx@test.ex> rejected RCPT <b@test.ex>: Unrouteable address
-1999-03-02 09:44:33 H=[V4NET.0.0.0] U=CALLER F=<userx@test.ex> rejected RCPT <f@test.ex>: bad user
-1999-03-02 09:44:33 H=[V4NET.0.0.0] U=CALLER F=<userx@test.ex> rejected RCPT <x@test.ex>: Unrouteable address
-1999-03-02 09:44:33 H=[V4NET.0.0.0] U=CALLER F=<userx@test.ex> rejected RCPT <"smartuser.b@test.ex"@test.ex>: Unrouteable address
+1999-03-02 09:44:33 H=(test) [V4NET.0.0.0] U=CALLER F=<userx@test.ex> rejected RCPT <b@test.ex>: Unrouteable address
+1999-03-02 09:44:33 H=(test) [V4NET.0.0.0] U=CALLER F=<userx@test.ex> rejected RCPT <f@test.ex>: bad user
+1999-03-02 09:44:33 H=(test) [V4NET.0.0.0] U=CALLER F=<userx@test.ex> rejected RCPT <x@test.ex>: Unrouteable address
+1999-03-02 09:44:33 H=(test) [V4NET.0.0.0] U=CALLER F=<userx@test.ex> rejected RCPT <"smartuser.b@test.ex"@test.ex>: Unrouteable address

diff --git a/test/rejectlog/0214 b/test/rejectlog/0214
index 59443bddb36728ca98b535ef2dab700e56d6365f..5da7cf1142d09822163217e582e7901f7481fa7f 100644 (file)
--- a/test/rejectlog/0214
+++ b/test/rejectlog/0214
@@ -1,9 +1,9 @@
 
 ******** SERVER ********
 
 ******** SERVER ********

-1999-03-02 09:44:33 10HmaX-0005vi-00 H=[127.0.0.1] F=<x@y.x> rejected after DATA: malformed address: ;bad@address;bad@address;bad@add may not follow bad@address: failing address in "To:" header begins: bad@address;bad@address;bad@address;bad@address;bad@address;bad@address;\n    bad@address;bad@address;bad@address;bad@address;bad@address;bad@address;\n    bad@address;bad@address;bad@address;bad@address;bad@address;bad@address;\n    bad@address;bad@address;bad@address;bad@address;bad@address;bad@address;\n    bad@address;bad@address;bad@address;bad@address;bad@address;bad@address;\n    bad@address;bad@address;bad@address;bad@address;bad@address;bad@address;\n    bad@address;bad@address;bad@address;bad@address;bad@address;bad@address;\n    bad@address;bad@address;bad@address;bad@address;bad@address;bad@address;\n    bad@address;bad@address;bad@address;bad@address;bad@address;bad@address;\n    bad@address;bad@address;bad@address;bad@address;bad@address;bad@address;\n    bad@address;bad@address;bad@address;bad@address;bad@address;bad@address;\n    bad@address;bad@address;bad@address;bad@address;bad@address;bad@address;\n    bad@address;bad@address;bad@address;bad@address;bad@address;bad@address;\n    bad@address;bad@address
+1999-03-02 09:44:33 10HmaX-0005vi-00 H=(test) [127.0.0.1] F=<x@y.x> rejected after DATA: malformed address: ;bad@address;bad@address;bad@add may not follow bad@address: failing address in "To:" header begins: bad@address;bad@address;bad@address;bad@address;bad@address;bad@address;\n    bad@address;bad@address;bad@address;bad@address;bad@address;bad@address;\n    bad@address;bad@address;bad@address;bad@address;bad@address;bad@address;\n    bad@address;bad@address;bad@address;bad@address;bad@address;bad@address;\n    bad@address;bad@address;bad@address;bad@address;bad@address;bad@address;\n    bad@address;bad@address;bad@address;bad@address;bad@address;bad@address;\n    bad@address;bad@address;bad@address;bad@address;bad@address;bad@address;\n    bad@address;bad@address;bad@address;bad@address;bad@address;bad@address;\n    bad@address;bad@address;bad@address;bad@address;bad@address;bad@address;\n    bad@address;bad@address;bad@address;bad@address;bad@address;bad@address;\n    bad@address;bad@address;bad@address;bad@address;bad@address;bad@address;\n    bad@address;bad@address;bad@address;bad@address;bad@address;bad@address;\n    bad@address;bad@address;bad@address;bad@address;bad@address;bad@address;\n    bad@address;bad@address

 Envelope-from: <x@y.x>
 Envelope-to: <x@test.ex>
 Envelope-from: <x@y.x>
 Envelope-to: <x@test.ex>

-P Received: from [127.0.0.1]
+P Received: from [127.0.0.1] (helo=test)

        by myhost.test.ex with smtp (Exim x.yz)
        (envelope-from <x@y.x>)
        id 10HmaX-0005vi-00
        by myhost.test.ex with smtp (Exim x.yz)
        (envelope-from <x@y.x>)
        id 10HmaX-0005vi-00

diff --git a/test/rejectlog/0227 b/test/rejectlog/0227
index 0246789ddb3b12a8c62880b53c39322882a14888..d0312f3aa5001ac2fa4aa6a73cec2f43aef226ca 100644 (file)
--- a/test/rejectlog/0227
+++ b/test/rejectlog/0227
@@ -1,45 +1,45 @@
-1999-03-02 09:44:33 H=[V4NET.0.0.1] U=root sender verify fail for <bad@localhost>: 127.0.0.1 [127.0.0.1] : SMTP error from remote mail server after RCPT TO:<bad@localhost>: 550 Unknown user
-1999-03-02 09:44:33 H=[V4NET.0.0.1] U=root F=<bad@localhost> rejected RCPT <z@test.ex>: Sender verify failed
-1999-03-02 09:44:33 H=[V4NET.0.0.1] U=root sender verify defer for <uncheckable@localhost1>: Could not complete sender verify callout: 127.0.0.1 [127.0.0.1] : SMTP error from remote mail server after RCPT TO:<uncheckable@localhost1>: 450 Temporary error
-1999-03-02 09:44:33 H=[V4NET.0.0.1] U=root F=<uncheckable@localhost1> temporarily rejected RCPT <z@test.ex>: Could not complete sender verify callout
-1999-03-02 09:44:33 H=[V4NET.0.0.1] U=root sender verify fail for <uncheckable2@localhost1>: 127.0.0.1 [127.0.0.1] : response to "MAIL FROM:<>" was: 550 Error for <>
-1999-03-02 09:44:33 H=[V4NET.0.0.1] U=root F=<uncheckable2@localhost1> rejected RCPT <z@test.ex>: Sender verify failed
-1999-03-02 09:44:33 H=[V4NET.0.0.1] U=root sender verify fail for <uncheckable@localhost1>: 127.0.0.1 [127.0.0.1] : response to "MAIL FROM:<>" was: 550-Multiline error for <>\n550 Here's the second line
-1999-03-02 09:44:33 H=[V4NET.0.0.1] U=root F=<uncheckable@localhost1> rejected RCPT <z@test.ex>: Sender verify failed
-1999-03-02 09:44:33 H=[V4NET.0.0.1] U=root sender verify fail for <uncheckable2@localhost1>: 127.0.0.1 [127.0.0.1] : response to "MAIL FROM:<>" was: 550 Bad-char error for <> topbitchar:\200\377\377
-1999-03-02 09:44:33 H=[V4NET.0.0.1] U=root F=<uncheckable2@localhost1> rejected RCPT <z@test.ex>: Sender verify failed
-1999-03-02 09:44:33 H=[V4NET.0.0.3] U=root F=<uncheckable@localhost1> rejected RCPT <z@remote.domain>: 127.0.0.1 [127.0.0.1] : SMTP error from remote mail server after RCPT TO:<z@remote.domain>: 550 Recipient not liked
-1999-03-02 09:44:33 H=[V4NET.0.0.3] U=root F=<uncheckable@localhost1> rejected RCPT <z@remote.domain>: 127.0.0.1 [127.0.0.1] : SMTP error from remote mail server after RCPT TO:<z@remote.domain>: 550-Recipient not liked on two lines\n550 Here's the second
-1999-03-02 09:44:33 H=[V4NET.0.0.3] U=root F=<uncheckable@localhost1> rejected RCPT <z@remote.domain>: 127.0.0.1 [127.0.0.1] : SMTP error from remote mail server after RCPT TO:<z@remote.domain>: 550 Recipient not liked, with bad char:\200\377\377
-1999-03-02 09:44:33 H=[V4NET.0.0.3] U=root F=<uncheckable@localhost1> temporarily rejected RCPT <z@remote.domain>: Could not complete recipient verify callout
-1999-03-02 09:44:33 10HmaX-0005vi-00 H=[V4NET.0.0.4] U=root F=<uncheckable@localhost1> rejected after DATA: there is no valid sender in any header line
+1999-03-02 09:44:33 H=(test) [V4NET.0.0.1] U=root sender verify fail for <bad@localhost>: 127.0.0.1 [127.0.0.1] : SMTP error from remote mail server after RCPT TO:<bad@localhost>: 550 Unknown user
+1999-03-02 09:44:33 H=(test) [V4NET.0.0.1] U=root F=<bad@localhost> rejected RCPT <z@test.ex>: Sender verify failed
+1999-03-02 09:44:33 H=(test) [V4NET.0.0.1] U=root sender verify defer for <uncheckable@localhost1>: Could not complete sender verify callout: 127.0.0.1 [127.0.0.1] : SMTP error from remote mail server after RCPT TO:<uncheckable@localhost1>: 450 Temporary error
+1999-03-02 09:44:33 H=(test) [V4NET.0.0.1] U=root F=<uncheckable@localhost1> temporarily rejected RCPT <z@test.ex>: Could not complete sender verify callout
+1999-03-02 09:44:33 H=(test) [V4NET.0.0.1] U=root sender verify fail for <uncheckable2@localhost1>: 127.0.0.1 [127.0.0.1] : response to "MAIL FROM:<>" was: 550 Error for <>
+1999-03-02 09:44:33 H=(test) [V4NET.0.0.1] U=root F=<uncheckable2@localhost1> rejected RCPT <z@test.ex>: Sender verify failed
+1999-03-02 09:44:33 H=(test) [V4NET.0.0.1] U=root sender verify fail for <uncheckable@localhost1>: 127.0.0.1 [127.0.0.1] : response to "MAIL FROM:<>" was: 550-Multiline error for <>\n550 Here's the second line
+1999-03-02 09:44:33 H=(test) [V4NET.0.0.1] U=root F=<uncheckable@localhost1> rejected RCPT <z@test.ex>: Sender verify failed
+1999-03-02 09:44:33 H=(test) [V4NET.0.0.1] U=root sender verify fail for <uncheckable2@localhost1>: 127.0.0.1 [127.0.0.1] : response to "MAIL FROM:<>" was: 550 Bad-char error for <> topbitchar:\200\377\377
+1999-03-02 09:44:33 H=(test) [V4NET.0.0.1] U=root F=<uncheckable2@localhost1> rejected RCPT <z@test.ex>: Sender verify failed
+1999-03-02 09:44:33 H=(test) [V4NET.0.0.3] U=root F=<uncheckable@localhost1> rejected RCPT <z@remote.domain>: 127.0.0.1 [127.0.0.1] : SMTP error from remote mail server after RCPT TO:<z@remote.domain>: 550 Recipient not liked
+1999-03-02 09:44:33 H=(test) [V4NET.0.0.3] U=root F=<uncheckable@localhost1> rejected RCPT <z@remote.domain>: 127.0.0.1 [127.0.0.1] : SMTP error from remote mail server after RCPT TO:<z@remote.domain>: 550-Recipient not liked on two lines\n550 Here's the second
+1999-03-02 09:44:33 H=(test) [V4NET.0.0.3] U=root F=<uncheckable@localhost1> rejected RCPT <z@remote.domain>: 127.0.0.1 [127.0.0.1] : SMTP error from remote mail server after RCPT TO:<z@remote.domain>: 550 Recipient not liked, with bad char:\200\377\377
+1999-03-02 09:44:33 H=(test) [V4NET.0.0.3] U=root F=<uncheckable@localhost1> temporarily rejected RCPT <z@remote.domain>: Could not complete recipient verify callout
+1999-03-02 09:44:33 10HmaX-0005vi-00 H=(test) [V4NET.0.0.4] U=root F=<uncheckable@localhost1> rejected after DATA: there is no valid sender in any header line

 Envelope-from: <uncheckable@localhost1>
 Envelope-to: <z@remote.domain>
 Envelope-from: <uncheckable@localhost1>
 Envelope-to: <z@remote.domain>

-P Received: from [V4NET.0.0.4] (ident=root)
+P Received: from [V4NET.0.0.4] (helo=test ident=root)

        by myhost.test.ex with smtp (Exim x.yz)
        (envelope-from <uncheckable@localhost1>)
        id 10HmaX-0005vi-00
        for z@remote.domain;
        Tue, 2 Mar 1999 09:44:33 +0000
 F From: abcd@x.y.z
        by myhost.test.ex with smtp (Exim x.yz)
        (envelope-from <uncheckable@localhost1>)
        id 10HmaX-0005vi-00
        for z@remote.domain;
        Tue, 2 Mar 1999 09:44:33 +0000
 F From: abcd@x.y.z

-1999-03-02 09:44:33 10HmaY-0005vi-00 H=[V4NET.0.0.4] U=root F=<uncheckable@localhost1> rejected after DATA: there is no valid sender in any header line
+1999-03-02 09:44:33 10HmaY-0005vi-00 H=(test) [V4NET.0.0.4] U=root F=<uncheckable@localhost1> rejected after DATA: there is no valid sender in any header line

 Envelope-from: <uncheckable@localhost1>
 Envelope-to: <z@remote.domain>
 Envelope-from: <uncheckable@localhost1>
 Envelope-to: <z@remote.domain>

-P Received: from [V4NET.0.0.4] (ident=root)
+P Received: from [V4NET.0.0.4] (helo=test ident=root)

        by myhost.test.ex with smtp (Exim x.yz)
        (envelope-from <uncheckable@localhost1>)
        id 10HmaY-0005vi-00
        for z@remote.domain;
        Tue, 2 Mar 1999 09:44:33 +0000
 F From: abcd@x.y.z
        by myhost.test.ex with smtp (Exim x.yz)
        (envelope-from <uncheckable@localhost1>)
        id 10HmaY-0005vi-00
        for z@remote.domain;
        Tue, 2 Mar 1999 09:44:33 +0000
 F From: abcd@x.y.z

-1999-03-02 09:44:33 H=[V4NET.0.0.5] U=root F=<ok@localhost1> rejected RCPT <z@remote.domain>: relay not permitted
-1999-03-02 09:44:33 H=[V4NET.0.0.5] U=root sender verify fail for <ok@localhost1>: 127.0.0.1 [127.0.0.1] : SMTP error from remote mail server after RCPT TO:<postmaster@localhost1>: 550 Don't like postmaster
-1999-03-02 09:44:33 H=[V4NET.0.0.5] U=root F=<ok@localhost1> rejected RCPT <z@remote.domain>: Sender verify failed
+1999-03-02 09:44:33 H=(test) [V4NET.0.0.5] U=root F=<ok@localhost1> rejected RCPT <z@remote.domain>: relay not permitted
+1999-03-02 09:44:33 H=(test) [V4NET.0.0.5] U=root sender verify fail for <ok@localhost1>: 127.0.0.1 [127.0.0.1] : SMTP error from remote mail server after RCPT TO:<postmaster@localhost1>: 550 Don't like postmaster
+1999-03-02 09:44:33 H=(test) [V4NET.0.0.5] U=root F=<ok@localhost1> rejected RCPT <z@remote.domain>: Sender verify failed

 1999-03-02 09:44:33 H=(me) [V4NET.0.0.3] U=root F=<ok@localhost1> rejected RCPT <z@remote.domain>: relay not permitted
 1999-03-02 09:44:33 H=(me) [V4NET.0.0.3] U=root F=<ok@localhost1> rejected RCPT <z@remote.domain>: relay not permitted
 1999-03-02 09:44:33 H=(me) [V4NET.0.0.7] U=root F=<ok@localhost1> rejected RCPT <z@remote.domain>: relay not permitted
 1999-03-02 09:44:33 H=(me) [V4NET.0.0.3] U=root F=<ok@localhost1> rejected RCPT <z@remote.domain>: relay not permitted
 1999-03-02 09:44:33 H=(me) [V4NET.0.0.3] U=root F=<ok@localhost1> rejected RCPT <z@remote.domain>: relay not permitted
 1999-03-02 09:44:33 H=(me) [V4NET.0.0.7] U=root F=<ok@localhost1> rejected RCPT <z@remote.domain>: relay not permitted

-1999-03-02 09:44:33 H=[V4NET.0.0.3] U=root F=<uncheckable@localhost1> rejected RCPT <z@remote.lmtp>: 127.0.0.1 [127.0.0.1] : SMTP error from remote mail server after RCPT TO:<z@remote.lmtp>: 550 Recipient not liked
-1999-03-02 09:44:33 H=[V4NET.0.0.1] U=root sender verify defer for <bad@localhost1>: Could not complete sender verify callout: 127.0.0.1 [127.0.0.1] : Remote host closed connection in response to initial connection
-1999-03-02 09:44:33 H=[V4NET.0.0.1] U=root F=<bad@localhost1> temporarily rejected RCPT <z@test.ex>: Could not complete sender verify callout
-1999-03-02 09:44:33 H=[V4NET.0.0.1] U=root sender verify defer for <bad@localhost1>: Could not complete sender verify callout: 127.0.0.1 [127.0.0.1] : Connection refused
-1999-03-02 09:44:33 H=[V4NET.0.0.1] U=root F=<bad@localhost1> temporarily rejected RCPT <z@test.ex>: Could not complete sender verify callout
+1999-03-02 09:44:33 H=(test) [V4NET.0.0.3] U=root F=<uncheckable@localhost1> rejected RCPT <z@remote.lmtp>: 127.0.0.1 [127.0.0.1] : SMTP error from remote mail server after RCPT TO:<z@remote.lmtp>: 550 Recipient not liked
+1999-03-02 09:44:33 H=(test) [V4NET.0.0.1] U=root sender verify defer for <bad@localhost1>: Could not complete sender verify callout: 127.0.0.1 [127.0.0.1] : Remote host closed connection in response to initial connection
+1999-03-02 09:44:33 H=(test) [V4NET.0.0.1] U=root F=<bad@localhost1> temporarily rejected RCPT <z@test.ex>: Could not complete sender verify callout
+1999-03-02 09:44:33 H=(test) [V4NET.0.0.1] U=root sender verify defer for <bad@localhost1>: Could not complete sender verify callout: 127.0.0.1 [127.0.0.1] : Connection refused
+1999-03-02 09:44:33 H=(test) [V4NET.0.0.1] U=root F=<bad@localhost1> temporarily rejected RCPT <z@test.ex>: Could not complete sender verify callout

diff --git a/test/rejectlog/0234 b/test/rejectlog/0234
index fc68dfd94551ca4e3844c7bf8089f353d4ebe645..c0adabacb0e364f8431dfbc4b85c7e2aa501b3b0 100644 (file)
--- a/test/rejectlog/0234
+++ b/test/rejectlog/0234
@@ -1 +1 @@
-1999-03-02 09:44:33 H=[V4NET.0.0.0] U=root F=<a@b> rejected RCPT <c@d>: relay not permitted
+1999-03-02 09:44:33 H=(test) [V4NET.0.0.0] U=root F=<a@b> rejected RCPT <c@d>: relay not permitted

diff --git a/test/rejectlog/0365 b/test/rejectlog/0365
index 5b3680db73c67222762ca9ab6d66df21b458c3df..5335915e3d0ca1730f7aff33313a53b098000a8f 100644 (file)
--- a/test/rejectlog/0365
+++ b/test/rejectlog/0365
@@ -1,7 +1,8 @@
 1999-03-02 09:44:33 10HmaX-0005vi-00 U=CALLER F=<> rejected after DATA: '>' missing at end of address: failing address in "From:" header is: <bad@syntax
 Envelope-from: <>
 Envelope-to: <x@y>
 1999-03-02 09:44:33 10HmaX-0005vi-00 U=CALLER F=<> rejected after DATA: '>' missing at end of address: failing address in "From:" header is: <bad@syntax
 Envelope-from: <>
 Envelope-to: <x@y>

-P Received: from CALLER by the.local.host.name with local-smtp (Exim x.yz)
+P Received: from CALLER (helo=test)
+       by the.local.host.name with local-smtp (Exim x.yz)

        id 10HmaX-0005vi-00
        for x@y;
        Tue, 2 Mar 1999 09:44:33 +0000
        id 10HmaX-0005vi-00
        for x@y;
        Tue, 2 Mar 1999 09:44:33 +0000


@@ -11,7 +12,8 @@ I Message-Id: <E10HmaX-0005vi-00@the.local.host.name>
 1999-03-02 09:44:33 10HmaY-0005vi-00 U=CALLER F=<> rejected after DATA: there is no valid sender in any header line
 Envelope-from: <>
 Envelope-to: <x@y>
 1999-03-02 09:44:33 10HmaY-0005vi-00 U=CALLER F=<> rejected after DATA: there is no valid sender in any header line
 Envelope-from: <>
 Envelope-to: <x@y>

-P Received: from CALLER by the.local.host.name with local-smtp (Exim x.yz)
+P Received: from CALLER (helo=test)
+       by the.local.host.name with local-smtp (Exim x.yz)

        id 10HmaY-0005vi-00
        for x@y;
        Tue, 2 Mar 1999 09:44:33 +0000
        id 10HmaY-0005vi-00
        for x@y;
        Tue, 2 Mar 1999 09:44:33 +0000


@@ -23,7 +25,8 @@ I Message-Id: <E10HmaY-0005vi-00@the.local.host.name>
 1999-03-02 09:44:33 10HmaZ-0005vi-00 U=CALLER F=<nosyntax@x> rejected after DATA
 Envelope-from: <nosyntax@x>
 Envelope-to: <x@y>
 1999-03-02 09:44:33 10HmaZ-0005vi-00 U=CALLER F=<nosyntax@x> rejected after DATA
 Envelope-from: <nosyntax@x>
 Envelope-to: <x@y>

-P Received: from CALLER by the.local.host.name with local-smtp (Exim x.yz)
+P Received: from CALLER (helo=test)
+       by the.local.host.name with local-smtp (Exim x.yz)

        (envelope-from <nosyntax@x>)
        id 10HmaZ-0005vi-00
        for x@y;
        (envelope-from <nosyntax@x>)
        id 10HmaZ-0005vi-00
        for x@y;


@@ -34,7 +37,8 @@ I Message-Id: <E10HmaZ-0005vi-00@the.local.host.name>
 1999-03-02 09:44:33 10HmbA-0005vi-00 U=CALLER F=<> rejected after DATA: there is no valid sender in any header line
 Envelope-from: <>
 Envelope-to: <x@y>
 1999-03-02 09:44:33 10HmbA-0005vi-00 U=CALLER F=<> rejected after DATA: there is no valid sender in any header line
 Envelope-from: <>
 Envelope-to: <x@y>

-P Received: from CALLER by the.local.host.name with local-smtp (Exim x.yz)
+P Received: from CALLER (helo=test)
+       by the.local.host.name with local-smtp (Exim x.yz)

        id 10HmbA-0005vi-00
        for x@y;
        Tue, 2 Mar 1999 09:44:33 +0000
        id 10HmbA-0005vi-00
        for x@y;
        Tue, 2 Mar 1999 09:44:33 +0000

diff --git a/test/rejectlog/0376 b/test/rejectlog/0376
index 17d806f765f23cbdf4cfd1690a112126a88ab4d7..a0b8d31b7bb79236bcd5514f830d6d72194041f7 100644 (file)
--- a/test/rejectlog/0376
+++ b/test/rejectlog/0376
@@ -1,16 +1,16 @@
-1999-03-02 09:44:33 H=[V4NET.0.0.1] U=root sender verify defer for <ok@localhost>: Could not complete sender verify callout: 127.0.0.1 [127.0.0.1] : Connection refused
-1999-03-02 09:44:33 H=[V4NET.0.0.1] U=root F=<ok@localhost> temporarily rejected RCPT <z@test.ex>: Could not complete sender verify callout
-1999-03-02 09:44:33 H=[V4NET.0.0.1] U=root sender verify fail for <bad@localhost>: 127.0.0.1 [127.0.0.1] : SMTP error from remote mail server after RCPT TO:<bad@localhost>: 550 REJECTED
-1999-03-02 09:44:33 H=[V4NET.0.0.1] U=root F=<bad@localhost> rejected RCPT <z@test.ex>: (recipient): Sender verify failed
-1999-03-02 09:44:33 H=[V4NET.0.0.1] U=root sender verify fail for <bad@localhost>
-1999-03-02 09:44:33 H=[V4NET.0.0.1] U=root F=<bad@localhost> rejected RCPT <z@test.ex>: (recipient): Sender verify failed
-1999-03-02 09:44:33 H=[V4NET.0.0.1] U=root sender verify fail for <ok@localhost>: 127.0.0.1 [127.0.0.1] : response to "MAIL FROM:<>" was: 550 REJECT MAIL FROM
-1999-03-02 09:44:33 H=[V4NET.0.0.1] U=root F=<ok@localhost> rejected RCPT <z@test.ex>: (mail): Sender verify failed
-1999-03-02 09:44:33 H=[V4NET.0.0.1] U=root sender verify fail for <ok@localhost>
-1999-03-02 09:44:33 H=[V4NET.0.0.1] U=root F=<ok@localhost> rejected RCPT <z@test.ex>: (mail): Sender verify failed
-1999-03-02 09:44:33 H=[V4NET.0.0.2] U=root sender verify fail for <ok@otherhost>: 127.0.0.1 [127.0.0.1] : SMTP error from remote mail server after RCPT TO:<postmaster@otherhost>: 550 NOT OK
-1999-03-02 09:44:33 H=[V4NET.0.0.2] U=root F=<ok@otherhost> rejected RCPT <z@test.ex>: Sender verify failed
-1999-03-02 09:44:33 H=[V4NET.0.0.2] U=root sender verify fail for <ok@otherhost>
-1999-03-02 09:44:33 H=[V4NET.0.0.2] U=root F=<ok@otherhost> rejected RCPT <z@test.ex>: Sender verify failed
-1999-03-02 09:44:33 H=[V4NET.0.0.5] U=root sender verify defer for <okok@otherhost51>: Could not complete sender verify callout: 127.0.0.1 [127.0.0.1] : SMTP timeout after RCPT TO:<myhost.test.ex-dddddddd-testing@otherhost51>
-1999-03-02 09:44:33 H=[V4NET.0.0.5] U=root F=<okok@otherhost51> temporarily rejected RCPT <z@test.ex>: Could not complete sender verify callout
+1999-03-02 09:44:33 H=(test) [V4NET.0.0.1] U=root sender verify defer for <ok@localhost>: Could not complete sender verify callout: 127.0.0.1 [127.0.0.1] : Connection refused
+1999-03-02 09:44:33 H=(test) [V4NET.0.0.1] U=root F=<ok@localhost> temporarily rejected RCPT <z@test.ex>: Could not complete sender verify callout
+1999-03-02 09:44:33 H=(test) [V4NET.0.0.1] U=root sender verify fail for <bad@localhost>: 127.0.0.1 [127.0.0.1] : SMTP error from remote mail server after RCPT TO:<bad@localhost>: 550 REJECTED
+1999-03-02 09:44:33 H=(test) [V4NET.0.0.1] U=root F=<bad@localhost> rejected RCPT <z@test.ex>: (recipient): Sender verify failed
+1999-03-02 09:44:33 H=(test) [V4NET.0.0.1] U=root sender verify fail for <bad@localhost>
+1999-03-02 09:44:33 H=(test) [V4NET.0.0.1] U=root F=<bad@localhost> rejected RCPT <z@test.ex>: (recipient): Sender verify failed
+1999-03-02 09:44:33 H=(test) [V4NET.0.0.1] U=root sender verify fail for <ok@localhost>: 127.0.0.1 [127.0.0.1] : response to "MAIL FROM:<>" was: 550 REJECT MAIL FROM
+1999-03-02 09:44:33 H=(test) [V4NET.0.0.1] U=root F=<ok@localhost> rejected RCPT <z@test.ex>: (mail): Sender verify failed
+1999-03-02 09:44:33 H=(test) [V4NET.0.0.1] U=root sender verify fail for <ok@localhost>
+1999-03-02 09:44:33 H=(test) [V4NET.0.0.1] U=root F=<ok@localhost> rejected RCPT <z@test.ex>: (mail): Sender verify failed
+1999-03-02 09:44:33 H=(test) [V4NET.0.0.2] U=root sender verify fail for <ok@otherhost>: 127.0.0.1 [127.0.0.1] : SMTP error from remote mail server after RCPT TO:<postmaster@otherhost>: 550 NOT OK
+1999-03-02 09:44:33 H=(test) [V4NET.0.0.2] U=root F=<ok@otherhost> rejected RCPT <z@test.ex>: Sender verify failed
+1999-03-02 09:44:33 H=(test) [V4NET.0.0.2] U=root sender verify fail for <ok@otherhost>
+1999-03-02 09:44:33 H=(test) [V4NET.0.0.2] U=root F=<ok@otherhost> rejected RCPT <z@test.ex>: Sender verify failed
+1999-03-02 09:44:33 H=(test) [V4NET.0.0.5] U=root sender verify defer for <okok@otherhost51>: Could not complete sender verify callout: 127.0.0.1 [127.0.0.1] : SMTP timeout after RCPT TO:<myhost.test.ex-dddddddd-testing@otherhost51>
+1999-03-02 09:44:33 H=(test) [V4NET.0.0.5] U=root F=<okok@otherhost51> temporarily rejected RCPT <z@test.ex>: Could not complete sender verify callout

diff --git a/test/rejectlog/0387 b/test/rejectlog/0387
index d83ecc3cc667c806dfa7f67f03f53d4c5fd12df9..04163ff30236ba02b1335398787278ac3025231a 100644 (file)
--- a/test/rejectlog/0387
+++ b/test/rejectlog/0387
@@ -1,2 +1,2 @@
 1999-03-02 09:44:33 U=CALLER F=<x@b.c.a> rejected RCPT <x@y>
 1999-03-02 09:44:33 U=CALLER F=<x@b.c.a> rejected RCPT <x@y>

-1999-03-02 09:44:33 H=[1.2.3.4] U=CALLER F=<x@b.c.a> rejected RCPT <x@y>
+1999-03-02 09:44:33 H=(test) [1.2.3.4] U=CALLER F=<x@b.c.a> rejected RCPT <x@y>

diff --git a/test/rejectlog/0453 b/test/rejectlog/0453
index 4ca61142b89986566d53d2fb997cff9d1b2bf75c..c191382ecd102f502f4f27764bdd70010bc5433c 100644 (file)
--- a/test/rejectlog/0453
+++ b/test/rejectlog/0453
@@ -3,4 +3,4 @@
 1999-03-02 09:44:33 rejected HELO from CALLER: syntactically invalid argument(s): (no argument given)
 1999-03-02 09:44:33 rejected HELO from CALLER: syntactically invalid argument(s): (no argument given)
 1999-03-02 09:44:33 SMTP call from CALLER dropped: too many syntax or protocol errors (last command was "helo",  C=HELO,HELO,HELO,HELO)
 1999-03-02 09:44:33 rejected HELO from CALLER: syntactically invalid argument(s): (no argument given)
 1999-03-02 09:44:33 rejected HELO from CALLER: syntactically invalid argument(s): (no argument given)
 1999-03-02 09:44:33 SMTP call from CALLER dropped: too many syntax or protocol errors (last command was "helo",  C=HELO,HELO,HELO,HELO)

-1999-03-02 09:44:33 SMTP call from CALLER dropped: too many syntax or protocol errors (last command was "mail from:<>",  C=MAIL,MAIL,MAIL)
+1999-03-02 09:44:33 SMTP call from CALLER dropped: too many syntax or protocol errors (last command was "mail from:<>",  C=HELO,MAIL,MAIL,MAIL)

diff --git a/test/rejectlog/0462 b/test/rejectlog/0462
index d0a04dacba48a05853ba9c4f57e6549d8cb00487..bdb6e0c144b6d24cde2a3eb4dd6975f48c796ea5 100644 (file)
--- a/test/rejectlog/0462
+++ b/test/rejectlog/0462
@@ -1,5 +1,5 @@
-1999-03-02 09:44:33 H=[V4NET.0.0.1] U=root sender verify fail for <Ok@localhost>: 127.0.0.1 [127.0.0.1] : SMTP error from remote mail server after RCPT TO:<postmaster@localhost>: 550 NO
-1999-03-02 09:44:33 H=[V4NET.0.0.1] U=root F=<Ok@localhost> rejected RCPT <checkpm@test.ex>: Sender verify failed
-1999-03-02 09:44:33 H=[V4NET.0.0.2] U=root sender verify fail for <NOTok@elsewhere>: 127.0.0.1 [127.0.0.1] : SMTP error from remote mail server after RCPT TO:<NOTok@elsewhere>: 550 NO
-1999-03-02 09:44:33 H=[V4NET.0.0.2] U=root F=<NOTok@elsewhere> rejected RCPT <nocheckpm@test.ex>: Sender verify failed
-1999-03-02 09:44:33 H=[V4NET.0.0.2] U=root F=<NOTok2@elsewhere> rejected RCPT <nocheckpm@test.ex>: Sender verify failed
+1999-03-02 09:44:33 H=(test) [V4NET.0.0.1] U=root sender verify fail for <Ok@localhost>: 127.0.0.1 [127.0.0.1] : SMTP error from remote mail server after RCPT TO:<postmaster@localhost>: 550 NO
+1999-03-02 09:44:33 H=(test) [V4NET.0.0.1] U=root F=<Ok@localhost> rejected RCPT <checkpm@test.ex>: Sender verify failed
+1999-03-02 09:44:33 H=(test) [V4NET.0.0.2] U=root sender verify fail for <NOTok@elsewhere>: 127.0.0.1 [127.0.0.1] : SMTP error from remote mail server after RCPT TO:<NOTok@elsewhere>: 550 NO
+1999-03-02 09:44:33 H=(test) [V4NET.0.0.2] U=root F=<NOTok@elsewhere> rejected RCPT <nocheckpm@test.ex>: Sender verify failed
+1999-03-02 09:44:33 H=(test) [V4NET.0.0.2] U=root F=<NOTok2@elsewhere> rejected RCPT <nocheckpm@test.ex>: Sender verify failed

diff --git a/test/rejectlog/0465 b/test/rejectlog/0465
index 2f16fd3498f969e64afc2dce7c1b87aefee40c2b..9636ffa70d36c13ea9d92d6fef0596636037ab67 100644 (file)
--- a/test/rejectlog/0465
+++ b/test/rejectlog/0465
@@ -1,7 +1,8 @@
 1999-03-02 09:44:33 10HmaX-0005vi-00 U=CALLER F=<> rejected after DATA: domain missing or malformed: failing address in "To:" header is: abc@xyz.
 Envelope-from: <>
 Envelope-to: <abc@xyz>
 1999-03-02 09:44:33 10HmaX-0005vi-00 U=CALLER F=<> rejected after DATA: domain missing or malformed: failing address in "To:" header is: abc@xyz.
 Envelope-from: <>
 Envelope-to: <abc@xyz>

-P Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
+P Received: from CALLER (helo=test)
+       by myhost.test.ex with local-smtp (Exim x.yz)

        id 10HmaX-0005vi-00
        for abc@xyz;
        Tue, 2 Mar 1999 09:44:33 +0000
        id 10HmaX-0005vi-00
        for abc@xyz;
        Tue, 2 Mar 1999 09:44:33 +0000

diff --git a/test/rejectlog/0468 b/test/rejectlog/0468
index e78a7a14d49b351b93de9afe9d32b7f3921a0730..71c552e718b4caa92cce5360ba8ca3097c9ff2f7 100644 (file)
--- a/test/rejectlog/0468
+++ b/test/rejectlog/0468
@@ -1,7 +1,8 @@
 1999-03-02 09:44:33 10HmaX-0005vi-00 U=CALLER F=<CALLER@myhost.test.ex> rejected after DATA: message body <This is the FIRST message body. > message end <This is the FIRST message body. >
 Envelope-from: <CALLER@myhost.test.ex>
 Envelope-to: <x@y>
 1999-03-02 09:44:33 10HmaX-0005vi-00 U=CALLER F=<CALLER@myhost.test.ex> rejected after DATA: message body <This is the FIRST message body. > message end <This is the FIRST message body. >
 Envelope-from: <CALLER@myhost.test.ex>
 Envelope-to: <x@y>

-P Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
+P Received: from CALLER (helo=test)
+       by myhost.test.ex with local-smtp (Exim x.yz)

        (envelope-from <CALLER@myhost.test.ex>)
        id 10HmaX-0005vi-00
        for x@y;
        (envelope-from <CALLER@myhost.test.ex>)
        id 10HmaX-0005vi-00
        for x@y;


@@ -12,7 +13,8 @@ F From: CALLER_NAME <CALLER@myhost.test.ex>
 1999-03-02 09:44:33 10HmaY-0005vi-00 U=CALLER F=<CALLER@myhost.test.ex> rejected after DATA: message body <This is the SECOND message body. > message end <This is the SECOND message body. >
 Envelope-from: <CALLER@myhost.test.ex>
 Envelope-to: <x@y>
 1999-03-02 09:44:33 10HmaY-0005vi-00 U=CALLER F=<CALLER@myhost.test.ex> rejected after DATA: message body <This is the SECOND message body. > message end <This is the SECOND message body. >
 Envelope-from: <CALLER@myhost.test.ex>
 Envelope-to: <x@y>

-P Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
+P Received: from CALLER (helo=test)
+       by myhost.test.ex with local-smtp (Exim x.yz)

        (envelope-from <CALLER@myhost.test.ex>)
        id 10HmaY-0005vi-00
        for x@y;
        (envelope-from <CALLER@myhost.test.ex>)
        id 10HmaY-0005vi-00
        for x@y;

diff --git a/test/rejectlog/0490 b/test/rejectlog/0490
index 5ae8529d8179846e55ba349f7e6cb15db5607ae6..89cfc1b04f8a5092a46b070c08d281fb4a7e3c3e 100644 (file)
--- a/test/rejectlog/0490
+++ b/test/rejectlog/0490
@@ -1,7 +1,8 @@
 1999-03-02 09:44:33 10HmaX-0005vi-00 U=CALLER F=<CALLER@myhost.test.ex> rejected after DATA: body contains 2 binary zero characters
 Envelope-from: <CALLER@myhost.test.ex>
 Envelope-to: <aa@test.ex>
 1999-03-02 09:44:33 10HmaX-0005vi-00 U=CALLER F=<CALLER@myhost.test.ex> rejected after DATA: body contains 2 binary zero characters
 Envelope-from: <CALLER@myhost.test.ex>
 Envelope-to: <aa@test.ex>

-P Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
+P Received: from CALLER (helo=test)
+       by myhost.test.ex with local-smtp (Exim x.yz)

        (envelope-from <CALLER@myhost.test.ex>)
        id 10HmaX-0005vi-00
        for aa@test.ex;
        (envelope-from <CALLER@myhost.test.ex>)
        id 10HmaX-0005vi-00
        for aa@test.ex;

diff --git a/test/rejectlog/0505 b/test/rejectlog/0505
index b6ec7ace5b678c26449a9d53efd7701effbcefe5..232e4ad24697b7e8b330c5cac5ee395052077248 100644 (file)
--- a/test/rejectlog/0505
+++ b/test/rejectlog/0505
@@ -1,7 +1,8 @@
 1999-03-02 09:44:33 10HmaX-0005vi-00 U=CALLER F=<CALLER@myhost.test.ex> temporarily rejected after DATA: cannot use "control=submission" in DATA ACL
 Envelope-from: <CALLER@myhost.test.ex>
 Envelope-to: <userx@x.y>
 1999-03-02 09:44:33 10HmaX-0005vi-00 U=CALLER F=<CALLER@myhost.test.ex> temporarily rejected after DATA: cannot use "control=submission" in DATA ACL
 Envelope-from: <CALLER@myhost.test.ex>
 Envelope-to: <userx@x.y>

-P Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
+P Received: from CALLER (helo=test)
+       by myhost.test.ex with local-smtp (Exim x.yz)

        (envelope-from <CALLER@myhost.test.ex>)
        id 10HmaX-0005vi-00
        for userx@x.y;
        (envelope-from <CALLER@myhost.test.ex>)
        id 10HmaX-0005vi-00
        for userx@x.y;

diff --git a/test/rejectlog/0507 b/test/rejectlog/0507
index 2f186fd25a89e1a1df242c85c512d72a4a63a204..3c72ebdfdeb1ceb8d9c416f7e448bca308b2e01b 100644 (file)
--- a/test/rejectlog/0507
+++ b/test/rejectlog/0507
@@ -1,7 +1,8 @@
 1999-03-02 09:44:33 10HmaX-0005vi-00 U=CALLER F=<CALLER@myhost.test.ex> rejected after DATA: bcc recipient detected
 Envelope-from: <CALLER@myhost.test.ex>
 Envelope-to: <userx@dom.com>
 1999-03-02 09:44:33 10HmaX-0005vi-00 U=CALLER F=<CALLER@myhost.test.ex> rejected after DATA: bcc recipient detected
 Envelope-from: <CALLER@myhost.test.ex>
 Envelope-to: <userx@dom.com>

-P Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
+P Received: from CALLER (helo=test)
+       by myhost.test.ex with local-smtp (Exim x.yz)

        (envelope-from <CALLER@myhost.test.ex>)
        id 10HmaX-0005vi-00
        for userx@dom.com;
        (envelope-from <CALLER@myhost.test.ex>)
        id 10HmaX-0005vi-00
        for userx@dom.com;


@@ -13,7 +14,8 @@ F From: CALLER_NAME <CALLER@myhost.test.ex>
 1999-03-02 09:44:33 10HmaY-0005vi-00 U=CALLER F=<CALLER@myhost.test.ex> rejected after DATA: bcc recipient detected
 Envelope-from: <CALLER@myhost.test.ex>
 Envelope-to: <userx@dom.com>
 1999-03-02 09:44:33 10HmaY-0005vi-00 U=CALLER F=<CALLER@myhost.test.ex> rejected after DATA: bcc recipient detected
 Envelope-from: <CALLER@myhost.test.ex>
 Envelope-to: <userx@dom.com>

-P Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
+P Received: from CALLER (helo=test)
+       by myhost.test.ex with local-smtp (Exim x.yz)

        (envelope-from <CALLER@myhost.test.ex>)
        id 10HmaY-0005vi-00
        for userx@dom.com;
        (envelope-from <CALLER@myhost.test.ex>)
        id 10HmaY-0005vi-00
        for userx@dom.com;


@@ -27,7 +29,8 @@ Envelope-from: <CALLER@myhost.test.ex>
 Envelope-to: <userx@dom.com>
     <usery@dom.com>
     <userz@dom.com>
 Envelope-to: <userx@dom.com>
     <usery@dom.com>
     <userz@dom.com>

-P Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
+P Received: from CALLER (helo=test)
+       by myhost.test.ex with local-smtp (Exim x.yz)

        (envelope-from <CALLER@myhost.test.ex>)
        id 10HmaZ-0005vi-00;
        Tue, 2 Mar 1999 09:44:33 +0000
        (envelope-from <CALLER@myhost.test.ex>)
        id 10HmaZ-0005vi-00;
        Tue, 2 Mar 1999 09:44:33 +0000

diff --git a/test/rejectlog/0578 b/test/rejectlog/0578
index f6efe3ba391c361850654199092ac73c639c1b10..1826e9c69a23af482a8f5c5731b1e5a88cd0991e 100644 (file)
--- a/test/rejectlog/0578
+++ b/test/rejectlog/0578
@@ -1,16 +1,16 @@
-1999-03-02 09:44:33 H=[V4NET.0.0.1] U=root sender verify defer for <ok@localhost>: Could not complete sender verify callout: 127.0.0.1 [127.0.0.1] : Connection refused
-1999-03-02 09:44:33 H=[V4NET.0.0.1] U=root F=<ok@localhost> temporarily rejected RCPT <z@test.ex>: Could not complete sender verify callout
-1999-03-02 09:44:33 H=[V4NET.0.0.1] U=root sender verify fail for <bad@localhost>: 127.0.0.1 [127.0.0.1] : SMTP error from remote mail server after RCPT TO:<bad@localhost>: 550 REJECTED rcpt
-1999-03-02 09:44:33 H=[V4NET.0.0.1] U=root F=<bad@localhost> rejected RCPT <z@test.ex>: (recipient): Sender verify failed
-1999-03-02 09:44:33 H=[V4NET.0.0.1] U=root sender verify fail for <bad@localhost>
-1999-03-02 09:44:33 H=[V4NET.0.0.1] U=root F=<bad@localhost> rejected RCPT <z@test.ex>: (recipient): Sender verify failed
-1999-03-02 09:44:33 H=[V4NET.0.0.1] U=root sender verify fail for <ok@localhost>: 127.0.0.1 [127.0.0.1] : response to "MAIL FROM:<>" was: 550 REJECT mail from
-1999-03-02 09:44:33 H=[V4NET.0.0.1] U=root F=<ok@localhost> rejected RCPT <z@test.ex>: (mail): Sender verify failed
-1999-03-02 09:44:33 H=[V4NET.0.0.1] U=root sender verify fail for <ok@localhost>
-1999-03-02 09:44:33 H=[V4NET.0.0.1] U=root F=<ok@localhost> rejected RCPT <z@test.ex>: (mail): Sender verify failed
-1999-03-02 09:44:33 H=[V4NET.0.0.2] U=root sender verify fail for <ok@otherhost>: 127.0.0.1 [127.0.0.1] : SMTP error from remote mail server after RCPT TO:<postmaster@otherhost>: 550 NOT OK rcpt postmaster
-1999-03-02 09:44:33 H=[V4NET.0.0.2] U=root F=<ok@otherhost> rejected RCPT <z@test.ex>: Sender verify failed
-1999-03-02 09:44:33 H=[V4NET.0.0.2] U=root sender verify fail for <ok@otherhost>
-1999-03-02 09:44:33 H=[V4NET.0.0.2] U=root F=<ok@otherhost> rejected RCPT <z@test.ex>: Sender verify failed
-1999-03-02 09:44:33 H=[V4NET.0.0.5] U=root sender verify defer for <okok@otherhost51>: Could not complete sender verify callout: 127.0.0.1 [127.0.0.1] : SMTP timeout after RCPT TO:<myhost.test.ex-dddddddd-testing@otherhost51>
-1999-03-02 09:44:33 H=[V4NET.0.0.5] U=root F=<okok@otherhost51> temporarily rejected RCPT <z@test.ex>: Could not complete sender verify callout
+1999-03-02 09:44:33 H=(test) [V4NET.0.0.1] U=root sender verify defer for <ok@localhost>: Could not complete sender verify callout: 127.0.0.1 [127.0.0.1] : Connection refused
+1999-03-02 09:44:33 H=(test) [V4NET.0.0.1] U=root F=<ok@localhost> temporarily rejected RCPT <z@test.ex>: Could not complete sender verify callout
+1999-03-02 09:44:33 H=(test) [V4NET.0.0.1] U=root sender verify fail for <bad@localhost>: 127.0.0.1 [127.0.0.1] : SMTP error from remote mail server after RCPT TO:<bad@localhost>: 550 REJECTED rcpt
+1999-03-02 09:44:33 H=(test) [V4NET.0.0.1] U=root F=<bad@localhost> rejected RCPT <z@test.ex>: (recipient): Sender verify failed
+1999-03-02 09:44:33 H=(test) [V4NET.0.0.1] U=root sender verify fail for <bad@localhost>
+1999-03-02 09:44:33 H=(test) [V4NET.0.0.1] U=root F=<bad@localhost> rejected RCPT <z@test.ex>: (recipient): Sender verify failed
+1999-03-02 09:44:33 H=(test) [V4NET.0.0.1] U=root sender verify fail for <ok@localhost>: 127.0.0.1 [127.0.0.1] : response to "MAIL FROM:<>" was: 550 REJECT mail from
+1999-03-02 09:44:33 H=(test) [V4NET.0.0.1] U=root F=<ok@localhost> rejected RCPT <z@test.ex>: (mail): Sender verify failed
+1999-03-02 09:44:33 H=(test) [V4NET.0.0.1] U=root sender verify fail for <ok@localhost>
+1999-03-02 09:44:33 H=(test) [V4NET.0.0.1] U=root F=<ok@localhost> rejected RCPT <z@test.ex>: (mail): Sender verify failed
+1999-03-02 09:44:33 H=(test) [V4NET.0.0.2] U=root sender verify fail for <ok@otherhost>: 127.0.0.1 [127.0.0.1] : SMTP error from remote mail server after RCPT TO:<postmaster@otherhost>: 550 NOT OK rcpt postmaster
+1999-03-02 09:44:33 H=(test) [V4NET.0.0.2] U=root F=<ok@otherhost> rejected RCPT <z@test.ex>: Sender verify failed
+1999-03-02 09:44:33 H=(test) [V4NET.0.0.2] U=root sender verify fail for <ok@otherhost>
+1999-03-02 09:44:33 H=(test) [V4NET.0.0.2] U=root F=<ok@otherhost> rejected RCPT <z@test.ex>: Sender verify failed
+1999-03-02 09:44:33 H=(test) [V4NET.0.0.5] U=root sender verify defer for <okok@otherhost51>: Could not complete sender verify callout: 127.0.0.1 [127.0.0.1] : SMTP timeout after RCPT TO:<myhost.test.ex-dddddddd-testing@otherhost51>
+1999-03-02 09:44:33 H=(test) [V4NET.0.0.5] U=root F=<okok@otherhost51> temporarily rejected RCPT <z@test.ex>: Could not complete sender verify callout

diff --git a/test/rejectlog/0585 b/test/rejectlog/0585
index ef368aff7b644efb77ca8e054c0b5ab0bcff08e8..5adcf37270bd3801185210236fd0709713ad070d 100644 (file)
--- a/test/rejectlog/0585
+++ b/test/rejectlog/0585
@@ -1,7 +1,8 @@
 1999-03-02 09:44:33 10HmaX-0005vi-00 U=CALLER F=<CALLER@myhost.test.ex> rejected after DATA: bcc recipient detected
 Envelope-from: <CALLER@myhost.test.ex>
 Envelope-to: <userx@dom.com>
 1999-03-02 09:44:33 10HmaX-0005vi-00 U=CALLER F=<CALLER@myhost.test.ex> rejected after DATA: bcc recipient detected
 Envelope-from: <CALLER@myhost.test.ex>
 Envelope-to: <userx@dom.com>

-P Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
+P Received: from CALLER (helo=test)
+       by myhost.test.ex with local-smtp (Exim x.yz)

        (envelope-from <CALLER@myhost.test.ex>)
        id 10HmaX-0005vi-00
        for userx@dom.com;
        (envelope-from <CALLER@myhost.test.ex>)
        id 10HmaX-0005vi-00
        for userx@dom.com;


@@ -13,7 +14,8 @@ F From: CALLER_NAME <CALLER@myhost.test.ex>
 1999-03-02 09:44:33 10HmaY-0005vi-00 U=CALLER F=<CALLER@myhost.test.ex> rejected after DATA: bcc recipient detected
 Envelope-from: <CALLER@myhost.test.ex>
 Envelope-to: <userx@dom.com>
 1999-03-02 09:44:33 10HmaY-0005vi-00 U=CALLER F=<CALLER@myhost.test.ex> rejected after DATA: bcc recipient detected
 Envelope-from: <CALLER@myhost.test.ex>
 Envelope-to: <userx@dom.com>

-P Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
+P Received: from CALLER (helo=test)
+       by myhost.test.ex with local-smtp (Exim x.yz)

        (envelope-from <CALLER@myhost.test.ex>)
        id 10HmaY-0005vi-00
        for userx@dom.com;
        (envelope-from <CALLER@myhost.test.ex>)
        id 10HmaY-0005vi-00
        for userx@dom.com;


@@ -27,7 +29,8 @@ Envelope-from: <CALLER@myhost.test.ex>
 Envelope-to: <userx@dom.com>
     <usery@dom.com>
     <userz@dom.com>
 Envelope-to: <userx@dom.com>
     <usery@dom.com>
     <userz@dom.com>

-P Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
+P Received: from CALLER (helo=test)
+       by myhost.test.ex with local-smtp (Exim x.yz)

        (envelope-from <CALLER@myhost.test.ex>)
        id 10HmaZ-0005vi-00;
        Tue, 2 Mar 1999 09:44:33 +0000
        (envelope-from <CALLER@myhost.test.ex>)
        id 10HmaZ-0005vi-00;
        Tue, 2 Mar 1999 09:44:33 +0000

diff --git a/test/rejectlog/1103 b/test/rejectlog/1103
index da1a81fcec4917bfa17a77c8fd7d3b0917b5835a..b4a6bcc2bef42ace50b9194d86cc84ac819fd4c8 100644 (file)
--- a/test/rejectlog/1103
+++ b/test/rejectlog/1103
@@ -1,3 +1,3 @@
 
 ******** SERVER ********
 
 ******** SERVER ********

-1999-03-02 09:44:33 H=[ip4.ip4.ip4.ip4] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no F=<userx@test.ex> rejected RCPT <userx@test.ex>: unacceptable cipher TLS1.x:ke-RSA-AES256-SHAnnn:xxx
+1999-03-02 09:44:33 H=(test) [ip4.ip4.ip4.ip4] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no F=<userx@test.ex> rejected RCPT <userx@test.ex>: unacceptable cipher TLS1.x:ke-RSA-AES256-SHAnnn:xxx

diff --git a/test/rejectlog/1105 b/test/rejectlog/1105
index f6ad104da8ccf3fbd84b6ddc052fe0318a19394f..de6f3c934cd960094f8748d7fdeeaed81c533c90 100644 (file)
--- a/test/rejectlog/1105
+++ b/test/rejectlog/1105
@@ -1,3 +1,3 @@
 
 ******** SERVER ********
 
 ******** SERVER ********

-1999-03-02 09:44:33 H=[127.0.0.1] F=<userx@test.ex> rejected RCPT <userx@remote.test.ex>: encryption required
+1999-03-02 09:44:33 H=(test) [127.0.0.1] F=<userx@test.ex> rejected RCPT <userx@remote.test.ex>: encryption required

diff --git a/test/rejectlog/2014 b/test/rejectlog/2014
index 62fa8d8e27332e6b24787c828ca9edc0218d1082..e57d3e9b57474af2338f79cfcfd67c80800c19de 100644 (file)
--- a/test/rejectlog/2014
+++ b/test/rejectlog/2014
@@ -1,5 +1,5 @@
 
 ******** SERVER ********
 1999-03-02 09:44:33 H=(rhu2tls.barb) [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no F=<userx@test.ex> rejected RCPT <userx@test.ex>: certificate not verified: peerdn=
 
 ******** SERVER ********
 1999-03-02 09:44:33 H=(rhu2tls.barb) [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no F=<userx@test.ex> rejected RCPT <userx@test.ex>: certificate not verified: peerdn=

-1999-03-02 09:44:33 H=[127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no F=<userx@test.ex> rejected RCPT <userx@test.ex>: certificate not verified: peerdn=
-1999-03-02 09:44:33 H=[127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no DN="CN=revoked1.example.com" F=<userx@test.ex> rejected RCPT <userx@test.ex>: certificate not verified: peerdn=CN=revoked1.example.com
+1999-03-02 09:44:33 H=(test) [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no F=<userx@test.ex> rejected RCPT <userx@test.ex>: certificate not verified: peerdn=
+1999-03-02 09:44:33 H=(test) [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no DN="CN=revoked1.example.com" F=<userx@test.ex> rejected RCPT <userx@test.ex>: certificate not verified: peerdn=CN=revoked1.example.com

diff --git a/test/rejectlog/2037 b/test/rejectlog/2037
index 36ff193601fb32935f3f69e6aacbb8fea51fb468..76545a37da5c9d5391b140647e04d779e092b456 100644 (file)
--- a/test/rejectlog/2037
+++ b/test/rejectlog/2037
@@ -11,7 +11,8 @@ P Received: from localhost ([127.0.0.1] helo=myhost.test.ex)
        id 10HmaX-0005vi-00
        for data_defer@test.ex;
        Tue, 2 Mar 1999 09:44:33 +0000
        id 10HmaX-0005vi-00
        for data_defer@test.ex;
        Tue, 2 Mar 1999 09:44:33 +0000

-P Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
+P Received: from CALLER (helo=test)
+       by myhost.test.ex with local-smtp (Exim x.yz)

        (envelope-from <CALLER@myhost.test.ex>)
        id 10HmaY-0005vi-00
        for data_defer@test.ex;
        (envelope-from <CALLER@myhost.test.ex>)
        id 10HmaY-0005vi-00
        for data_defer@test.ex;

diff --git a/test/rejectlog/2114 b/test/rejectlog/2114
index 40fe9ac6561b983ba02fc1d1a69e2a9a8a0d66fa..0180dd4d8070a750238b2d7ba0eacd0b182ff643 100644 (file)
--- a/test/rejectlog/2114
+++ b/test/rejectlog/2114
@@ -1,5 +1,5 @@
 
 ******** SERVER ********
 1999-03-02 09:44:33 H=(rhu.barb) [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no F=<userx@test.ex> rejected RCPT <userx@test.ex>: certificate not verified: peerdn=
 
 ******** SERVER ********
 1999-03-02 09:44:33 H=(rhu.barb) [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no F=<userx@test.ex> rejected RCPT <userx@test.ex>: certificate not verified: peerdn=

-1999-03-02 09:44:33 H=[127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no DN="/CN=server1.example.net" F=<userx@test.ex> rejected RCPT <userx@test.ex>: certificate not verified: peerdn=/CN=server1.example.net
-1999-03-02 09:44:33 H=[127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no DN="/CN=revoked1.example.com" F=<userx@test.ex> rejected RCPT <userx@test.ex>: certificate not verified: peerdn=/CN=revoked1.example.com
+1999-03-02 09:44:33 H=(test) [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no DN="/CN=server1.example.net" F=<userx@test.ex> rejected RCPT <userx@test.ex>: certificate not verified: peerdn=/CN=server1.example.net
+1999-03-02 09:44:33 H=(test) [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no DN="/CN=revoked1.example.com" F=<userx@test.ex> rejected RCPT <userx@test.ex>: certificate not verified: peerdn=/CN=revoked1.example.com

diff --git a/test/rejectlog/2137 b/test/rejectlog/2137
index 36ff193601fb32935f3f69e6aacbb8fea51fb468..76545a37da5c9d5391b140647e04d779e092b456 100644 (file)
--- a/test/rejectlog/2137
+++ b/test/rejectlog/2137
@@ -11,7 +11,8 @@ P Received: from localhost ([127.0.0.1] helo=myhost.test.ex)
        id 10HmaX-0005vi-00
        for data_defer@test.ex;
        Tue, 2 Mar 1999 09:44:33 +0000
        id 10HmaX-0005vi-00
        for data_defer@test.ex;
        Tue, 2 Mar 1999 09:44:33 +0000

-P Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
+P Received: from CALLER (helo=test)
+       by myhost.test.ex with local-smtp (Exim x.yz)

        (envelope-from <CALLER@myhost.test.ex>)
        id 10HmaY-0005vi-00
        for data_defer@test.ex;
        (envelope-from <CALLER@myhost.test.ex>)
        id 10HmaY-0005vi-00
        for data_defer@test.ex;

diff --git a/test/scripts/0000-Basic/0002 b/test/scripts/0000-Basic/0002
index d3b4984fe13c2c9ffcd2b95c9f66eec198c8886d..cc289e04eeb9618b960cbb84bf97cec9f9899e5c 100644 (file)
--- a/test/scripts/0000-Basic/0002
+++ b/test/scripts/0000-Basic/0002
@@ -1051,6 +1051,7 @@ exim -d -bh V4NET.0.0.2
 ****
 # Test $reply_address
 exim -bh V4NET.0.0.0
 ****
 # Test $reply_address
 exim -bh V4NET.0.0.0

+helo test

 mail from:<>
 rcpt to:<some@body>
 data
 mail from:<>
 rcpt to:<some@body>
 data


@@ -1081,6 +1082,7 @@ quit
 ****
 # Check RFC 2047 decoding with (default) length check
 exim -bh V4NET.0.0.0
 ****
 # Check RFC 2047 decoding with (default) length check
 exim -bh V4NET.0.0.0

+helo test

 mail from:<>
 rcpt to:<some@body>
 data
 mail from:<>
 rcpt to:<some@body>
 data


@@ -1090,6 +1092,7 @@ quit
 ****
 # Check RFC 2047 decoding with length check disabled
 exim -DLENCHECK=check_rfc2047_length=false -bh V4NET.0.0.0
 ****
 # Check RFC 2047 decoding with length check disabled
 exim -DLENCHECK=check_rfc2047_length=false -bh V4NET.0.0.0

+helo test

 mail from:<>
 rcpt to:<some@body>
 data
 mail from:<>
 rcpt to:<some@body>
 data

diff --git a/test/scripts/0000-Basic/0003 b/test/scripts/0000-Basic/0003
index b3b3f89a31c258833c913b78f1215cae7c16cad9..97ec254a08751b14f1bdbc6da7355f3b2e46f1ef 100644 (file)
--- a/test/scripts/0000-Basic/0003
+++ b/test/scripts/0000-Basic/0003
@@ -1,5 +1,6 @@
 # Caseless address blocking
 exim -bh 1.1.1.1
 # Caseless address blocking
 exim -bh 1.1.1.1

+helo test

 mail from:<a@b.c>
 rcpt to:<x@test.ex>
 rset
 mail from:<a@b.c>
 rcpt to:<x@test.ex>
 rset

diff --git a/test/scripts/0000-Basic/0004 b/test/scripts/0000-Basic/0004
index 2732d001e8004a8ba1d2efeb630c8c58268ebaaf..fe1029c634854d98283153c3f1301a371a6f830a 100644 (file)
--- a/test/scripts/0000-Basic/0004
+++ b/test/scripts/0000-Basic/0004
@@ -1,5 +1,6 @@
 # Caseful address blocking
 exim -bh 1.1.1.1
 # Caseful address blocking
 exim -bh 1.1.1.1

+helo test

 mail from:<a@b.c>
 rcpt to:<x@test.ex>
 rset
 mail from:<a@b.c>
 rcpt to:<x@test.ex>
 rset

diff --git a/test/scripts/0000-Basic/0005 b/test/scripts/0000-Basic/0005
index 8e7b0d8c18946a7126c9802c449fa44de5ee1728..ea8a9f228e63001fd5504c5fcfb6196bac7a10fd 100644 (file)
--- a/test/scripts/0000-Basic/0005
+++ b/test/scripts/0000-Basic/0005
@@ -1,5 +1,6 @@
 # -bs to simple local delivery
 exim -bs -odi
 # -bs to simple local delivery
 exim -bs -odi

+helo test

 mail from:someone@some.domain
 rcpt to:CALLER@HOSTNAME
 data
 mail from:someone@some.domain
 rcpt to:CALLER@HOSTNAME
 data


@@ -10,6 +11,7 @@ This is the last line.
 quit
 ****
 exim -bs -odi
 quit
 ****
 exim -bs -odi

+helo test

 mail from:someone@some.domain
 rcpt to:CALLER@HOSTNAME
 data
 mail from:someone@some.domain
 rcpt to:CALLER@HOSTNAME
 data


@@ -20,6 +22,7 @@ This is a second test message.
 quit
 ****
 exim_exim -bs -odq
 quit
 ****
 exim_exim -bs -odq

+helo test

 mail from:someone@some.domain
 rcpt to:CALLER@HOSTNAME
 data
 mail from:someone@some.domain
 rcpt to:CALLER@HOSTNAME
 data

diff --git a/test/scripts/0000-Basic/0014 b/test/scripts/0000-Basic/0014
index a3c939a1b0f56ed80dc7ac79a42e9fc7dcffb134..84fe7a3bc505fe5a3b009b3ac3e18087c562cd79 100644 (file)
--- a/test/scripts/0000-Basic/0014
+++ b/test/scripts/0000-Basic/0014
@@ -29,6 +29,7 @@ To: userx, jules@box1.plc.example,
 Reply-to: jules@box3.plc.example   
 ****
 exim -odi -bs -oMa 10.0.0.2
 Reply-to: jules@box3.plc.example   
 ****
 exim -odi -bs -oMa 10.0.0.2

+helo test

 mail from:<jules@box3.plc.example>
 rcpt to:<userx@test.ex>
 quit
 mail from:<jules@box3.plc.example>
 rcpt to:<userx@test.ex>
 quit

diff --git a/test/scripts/0000-Basic/0021 b/test/scripts/0000-Basic/0021
index 6e4b8474e020e269f869b1b73f6016b24501895f..2980133410623191d64e70a1477ca0231e1af7ef 100644 (file)
--- a/test/scripts/0000-Basic/0021
+++ b/test/scripts/0000-Basic/0021
@@ -26,7 +26,7 @@ exim -bs -oMa 10.9.8.7
 ****
 exim -DLOG_SELECTOR=-connection_reject -bs -oMa 10.9.8.7
 ****
 ****
 exim -DLOG_SELECTOR=-connection_reject -bs -oMa 10.9.8.7
 ****

-exim -d-all+acl+lists -bs -oMa 10.9.8.8
+exim -d-all+acl+lists -DHVH=hosts_require_helo=: -bs -oMa 10.9.8.8

 mail from:<bad@test1>
 mail from:<ok@test1>
 rcpt to:<x@y>
 mail from:<bad@test1>
 mail from:<ok@test1>
 rcpt to:<x@y>


@@ -42,7 +42,7 @@ exim -bs -oMa 10.9.8.10
 helo x.y.z
 quit
 ****
 helo x.y.z
 quit
 ****

-exim -d-all+acl+lists -odi -bs -oMa 10.9.8.8
+exim -d-all+acl+lists -DHVH=hosts_require_helo=: -odi -bs -oMa 10.9.8.8

 mail from:<ok@test3>
 rcpt to:<x@y>
 data
 mail from:<ok@test3>
 rcpt to:<x@y>
 data


@@ -63,7 +63,7 @@ exim -DBR=no_bounce_return_body -odi -f userx@test1 userx
 Test message 1.
 .
 ****
 Test message 1.
 .
 ****

-exim -odi -bs -oMa 10.9.8.8
+exim -DHVH=hosts_require_helo=: -odi -bs -oMa 10.9.8.8

 ehlo test.ex
 mail from: <ok@test3> SIZE=1234
 rcpt to:<x@y>
 ehlo test.ex
 mail from: <ok@test3> SIZE=1234
 rcpt to:<x@y>


@@ -73,7 +73,7 @@ Some message
 quit
 ****
 #
 quit
 ****
 #

-# Test returncode and logginf for no extractable recipients
+# Test returncode and logging for no extractable recipients

 1
 exim -odi -t
 From: userx@test1
 1
 exim -odi -t
 From: userx@test1

diff --git a/test/scripts/0000-Basic/0022 b/test/scripts/0000-Basic/0022
index dd11aa23687b37abe24eb9c03f4fc50baeff465a..9c7837304749a0036bd326cf14c41f17501a6abb 100644 (file)
--- a/test/scripts/0000-Basic/0022
+++ b/test/scripts/0000-Basic/0022
@@ -1,5 +1,6 @@
 # Extra ACLs: freeze/defer/drop/queue/delay/$host_data
 exim -d -bh V4NET.9.8.7
 # Extra ACLs: freeze/defer/drop/queue/delay/$host_data
 exim -d -bh V4NET.9.8.7

+helo test

 mail from:<x@y>
 rcpt to:<warn_empty@test.ex>
 data
 mail from:<x@y>
 rcpt to:<warn_empty@test.ex>
 data


@@ -9,6 +10,7 @@ Testing
 quit
 ****
 exim -d -bh V4NET.9.8.7
 quit
 ****
 exim -d -bh V4NET.9.8.7

+helo test

 mail from:<x@y>
 rcpt to:<warn_log@test.ex>
 data
 mail from:<x@y>
 rcpt to:<warn_log@test.ex>
 data


@@ -18,6 +20,7 @@ Testing
 quit
 ****
 exim -d -bh V4NET.9.8.7
 quit
 ****
 exim -d -bh V4NET.9.8.7

+helo test

 mail from:<x@y>
 rcpt to:<warn_user@test.ex>
 data
 mail from:<x@y>
 rcpt to:<warn_user@test.ex>
 data


@@ -27,6 +30,7 @@ Testing
 quit
 ****
 exim -bh V4NET.9.8.7
 quit
 ****
 exim -bh V4NET.9.8.7

+helo test

 mail from:<x@y>
 rcpt to:<defer@y>
 rcpt to:<accept@y>
 mail from:<x@y>
 rcpt to:<defer@y>
 rcpt to:<accept@y>


@@ -35,17 +39,20 @@ rcpt to:<rhubarb@y>
 quit
 ****
 exim -bh V4NET.9.8.7
 quit
 ****
 exim -bh V4NET.9.8.7

+helo test

 mail from:<>
 rcpt to:<defer_senders@y>
 quit
 ****
 exim -bh V4NET.9.8.7
 mail from:<>
 rcpt to:<defer_senders@y>
 quit
 ****
 exim -bh V4NET.9.8.7

+helo test

 mail from:<x@y>
 rcpt to:<delay_accept@y>
 rcpt to:<delay_warn@y>
 quit
 ****
 exim -bh V4NET.9.8.7
 mail from:<x@y>
 rcpt to:<delay_accept@y>
 rcpt to:<delay_warn@y>
 quit
 ****
 exim -bh V4NET.9.8.7

+helo test

 mail from:<x@y>
 rcpt to:<host_check@y>
 rcpt to:<host_check@y>
 mail from:<x@y>
 rcpt to:<host_check@y>
 rcpt to:<host_check@y>


@@ -54,6 +61,7 @@ rcpt to:<host_check2@y>
 quit
 ****
 exim -bs -N -odi
 quit
 ****
 exim -bs -N -odi

+helo test

 mail from:<x@y>
 rcpt to:<accept@y>
 rcpt to:<freeze@y>
 mail from:<x@y>
 rcpt to:<accept@y>
 rcpt to:<freeze@y>


@@ -83,12 +91,14 @@ Testing 4
 quit
 ****
 exim -bh V4NET.9.8.7
 quit
 ****
 exim -bh V4NET.9.8.7

+helo test

 mail from:<x@y>
 rcpt to:<nested_drop@y>
 rcpt to:<rhubarb@y>
 quit
 ****
 exim -bh V4NET.9.8.7
 mail from:<x@y>
 rcpt to:<nested_drop@y>
 rcpt to:<rhubarb@y>
 quit
 ****
 exim -bh V4NET.9.8.7

+helo test

 mail from:<x@y>
 rcpt to:<nested_drop_require@y>
 rcpt to:<rhubarb@y>
 mail from:<x@y>
 rcpt to:<nested_drop_require@y>
 rcpt to:<rhubarb@y>


@@ -100,6 +110,8 @@ exim -DSERVER=server -odq -bd -oX PORT_D
 ****
 client -t5 127.0.0.1 PORT_D
 ??? 220
 ****
 client -t5 127.0.0.1 PORT_D
 ??? 220

+helo test
+??? 250

 mail from:<x@y>
 ??? 250
 rcpt to:<accept@y>
 mail from:<x@y>
 ??? 250
 rcpt to:<accept@y>

diff --git a/test/scripts/0000-Basic/0023 b/test/scripts/0000-Basic/0023
index 40a5bd90940340cea5558858fe3901450f6cb3a5..109037f69ce1ce3c0aa946c8b1fcdec60b33f9af 100644 (file)
--- a/test/scripts/0000-Basic/0023
+++ b/test/scripts/0000-Basic/0023
@@ -2,6 +2,7 @@
 need_ipv4
 #
 exim -bh 1.2.3.4
 need_ipv4
 #
 exim -bh 1.2.3.4

+helo test

 mail from:<x@y>
 rcpt to:<postmaster@test.ex>
 rcpt to:<z@z>
 mail from:<x@y>
 rcpt to:<postmaster@test.ex>
 rcpt to:<z@z>


@@ -15,6 +16,7 @@ rcpt to:<x@wontpass>
 quit
 ****
 exim -bh 5.6.7.8
 quit
 ****
 exim -bh 5.6.7.8

+helo test

 mail from:<x@y>
 rcpt to:<x@y>
 rcpt to:<x@test.ex>
 mail from:<x@y>
 rcpt to:<x@y>
 rcpt to:<x@test.ex>


@@ -23,24 +25,28 @@ rcpt to:<spqr@test.ex>
 quit
 ****
 exim -bh 9.9.9.9
 quit
 ****
 exim -bh 9.9.9.9

+helo test

 mail from:<x@y>
 rcpt to:<x@y>
 rcpt to:<a@b>
 quit
 ****
 exim -bh 9.9.9.8
 mail from:<x@y>
 rcpt to:<x@y>
 rcpt to:<a@b>
 quit
 ****
 exim -bh 9.9.9.8

+helo test

 mail from:<x@y>
 rcpt to:<x@y>
 rcpt to:<a@b>
 quit
 ****
 exim -bh 9.9.9.255
 mail from:<x@y>
 rcpt to:<x@y>
 rcpt to:<a@b>
 quit
 ****
 exim -bh 9.9.9.255

+helo test

 mail from:<x@y>
 rcpt to:<x@y>
 rcpt to:<a@b>
 quit
 ****
 exim -bh 5.6.8.1
 mail from:<x@y>
 rcpt to:<x@y>
 rcpt to:<a@b>
 quit
 ****
 exim -bh 5.6.8.1

+helo test

 mail from:<x@y>
 rcpt to:<x@y>
 rcpt to:<y@x>
 mail from:<x@y>
 rcpt to:<x@y>
 rcpt to:<y@x>


@@ -61,6 +67,7 @@ rset
 quit
 ****
 exim -bh 5.6.11.1
 quit
 ****
 exim -bh 5.6.11.1

+helo test

 mail from:<x@y>
 rcpt to:<x@y>
 rcpt to:<x2@y>
 mail from:<x@y>
 rcpt to:<x@y>
 rcpt to:<x2@y>


@@ -68,23 +75,27 @@ rcpt to:<y2@y>
 quit
 ****
 exim -bh 5.6.12.1
 quit
 ****
 exim -bh 5.6.12.1

+helo test

 mail from:<x@y>
 rcpt to:<x@ok>
 rcpt to:<x@y>
 quit
 ****
 exim -bh 5.6.12.2
 mail from:<x@y>
 rcpt to:<x@ok>
 rcpt to:<x@y>
 quit
 ****
 exim -bh 5.6.12.2

+helo test

 mail from:<x@y>
 rcpt to:<x@ok>
 rcpt to:<x@y>
 quit
 ****
 exim -bh 8.8.8.8
 mail from:<x@y>
 rcpt to:<x@ok>
 rcpt to:<x@y>
 quit
 ****
 exim -bh 8.8.8.8

+helo test

 mail from:<x@y>
 rcpt to:<x@y>
 quit
 ****
 exim -bh 5.6.13.1
 mail from:<x@y>
 rcpt to:<x@y>
 quit
 ****
 exim -bh 5.6.13.1

+helo test

 mail from:<x@y>
 rcpt to:<x@y>
 rcpt to:<x1@y>
 mail from:<x@y>
 rcpt to:<x@y>
 rcpt to:<x1@y>


@@ -92,30 +103,35 @@ rcpt to:<x2@y>
 quit
 ****
 exim -bh V4NET.11.12.13
 quit
 ****
 exim -bh V4NET.11.12.13

+helo test

 mail from:<x@y>
 rcpt to:<x@y>
 rcpt to:<x1@y>
 quit
 ****
 exim -bh V4NET.11.12.12
 mail from:<x@y>
 rcpt to:<x@y>
 rcpt to:<x1@y>
 quit
 ****
 exim -bh V4NET.11.12.12

+helo test

 mail from:<x@y>
 rcpt to:<x@y>
 rcpt to:<x1@y>
 quit
 ****
 exim -bh 20.20.20.20
 mail from:<x@y>
 rcpt to:<x@y>
 rcpt to:<x1@y>
 quit
 ****
 exim -bh 20.20.20.20

+helo test

 mail from:<x@y>
 rcpt to:<x1@y>
 rcpt to:<x2@y>
 quit
 ****
 exim -bh 20.20.20.20
 mail from:<x@y>
 rcpt to:<x1@y>
 rcpt to:<x2@y>
 quit
 ****
 exim -bh 20.20.20.20

+helo test

 mail from:<userx@y>
 rcpt to:<x1@y>
 rcpt to:<userx@y>
 quit
 ****
 exim -bh 21.21.21.21
 mail from:<userx@y>
 rcpt to:<x1@y>
 rcpt to:<userx@y>
 quit
 ****
 exim -bh 21.21.21.21

+helo test

 mail from:<userx@y>
 rcpt to:<x1@y>
 rcpt to:<userx@y>
 mail from:<userx@y>
 rcpt to:<x1@y>
 rcpt to:<userx@y>


@@ -130,12 +146,14 @@ rcpt to:<x@y>
 quit
 ****
 exim -bh 22.22.22.22
 quit
 ****
 exim -bh 22.22.22.22

+helo test

 mail from:<userx@y>
 rcpt to:<userx@y>
 rcpt to:<x@y>
 quit
 ****
 exim -bh 23.23.23.0
 mail from:<userx@y>
 rcpt to:<userx@y>
 rcpt to:<x@y>
 quit
 ****
 exim -bh 23.23.23.0

+helo test

 mail from:<x@y>
 rcpt to:<userx@y>
 rset
 mail from:<x@y>
 rcpt to:<userx@y>
 rset


@@ -144,21 +162,25 @@ rcpt to:<userx@y>
 quit
 ****
 exim -bh 23.23.23.1
 quit
 ****
 exim -bh 23.23.23.1

+helo test

 mail from:<x@y>
 rcpt to:<userx@y>
 quit
 ****
 exim -bh 24.24.24.24
 mail from:<x@y>
 rcpt to:<userx@y>
 quit
 ****
 exim -bh 24.24.24.24

+helo test

 mail from:<x@y>
 rcpt to:<userx@y>
 quit
 ****
 exim -bh 25.25.25.25
 mail from:<x@y>
 rcpt to:<userx@y>
 quit
 ****
 exim -bh 25.25.25.25

+helo test

 mail from:<x@y>
 rcpt to:<x@y>
 quit
 ****
 exim -bh 26.26.26.26
 mail from:<x@y>
 rcpt to:<x@y>
 quit
 ****
 exim -bh 26.26.26.26

+helo test

 mail from:<>
 rcpt to:<x@y>
 rcpt to:<y@y>
 mail from:<>
 rcpt to:<x@y>
 rcpt to:<y@y>


@@ -166,11 +188,13 @@ rcpt to:<z@y>
 quit
 ****
 exim -bh 27.27.27.27
 quit
 ****
 exim -bh 27.27.27.27

+helo test

 mail from:<>
 rcpt to:<x@y>
 quit
 ****
 exim -bh 28.28.28.28
 mail from:<>
 rcpt to:<x@y>
 quit
 ****
 exim -bh 28.28.28.28

+helo test

 mail from:<>
 rcpt to:<x@y>
 rset
 mail from:<>
 rcpt to:<x@y>
 rset


@@ -182,27 +206,32 @@ rcpt to:<x@y>
 quit
 ****
 exim -bh V4NET.0.0.3
 quit
 ****
 exim -bh V4NET.0.0.3

+helo test

 mail from:<>
 rcpt to:<x@y>
 quit
 ****
 exim -bh V4NET.0.0.97
 mail from:<>
 rcpt to:<x@y>
 quit
 ****
 exim -bh V4NET.0.0.97

+helo test

 mail from:<>
 rcpt to:<x@y>
 quit
 ****
 # This resolves to a name which will give `try again' when looked up
 exim -bh V4NET.99.99.96
 mail from:<>
 rcpt to:<x@y>
 quit
 ****
 # This resolves to a name which will give `try again' when looked up
 exim -bh V4NET.99.99.96

+helo test

 mail from:<>
 rcpt to:<x@y>
 quit
 ****
 exim -bh V4NET.99.99.96
 mail from:<>
 rcpt to:<x@y>
 quit
 ****
 exim -bh V4NET.99.99.96

+helo test

 mail from:<>
 rcpt to:<defer_ok@y>
 quit
 ****
 exim -bh 29.29.29.29
 mail from:<>
 rcpt to:<defer_ok@y>
 quit
 ****
 exim -bh 29.29.29.29

+helo test

 mail from:<a@localhost>
 rcpt to:<x@y>
 rset
 mail from:<a@localhost>
 rcpt to:<x@y>
 rset


@@ -211,6 +240,7 @@ rcpt to:<x@y>
 quit
 ****
 exim -bh 30.30.30.30
 quit
 ****
 exim -bh 30.30.30.30

+helo test

 mail from:<a@ten-1>
 rcpt to:<x@y>
 rset
 mail from:<a@ten-1>
 rcpt to:<x@y>
 rset


@@ -222,11 +252,13 @@ rcpt to:<x@y>
 quit
 ****
 exim -bh 31.31.31.31
 quit
 ****
 exim -bh 31.31.31.31

+helo test

 mail from:<x@y>
 rcpt to:<x@y>
 quit
 ****
 exim -odi -bs -oMa 32.32.32.32
 mail from:<x@y>
 rcpt to:<x@y>
 quit
 ****
 exim -odi -bs -oMa 32.32.32.32

+helo test

 mail from:<userx@test.ex>
 rcpt to:<userx-vs@test.ex>
 data
 mail from:<userx@test.ex>
 rcpt to:<userx-vs@test.ex>
 data


@@ -235,6 +267,7 @@ Test with verify sender.
 quit
 ****
 exim -odi -bs -oMa 32.32.32.32
 quit
 ****
 exim -odi -bs -oMa 32.32.32.32

+helo test

 mail from:<userx@test.ex>
 rcpt to:<userx@test.ex>
 data
 mail from:<userx@test.ex>
 rcpt to:<userx@test.ex>
 data


@@ -243,6 +276,7 @@ Test without verify sender.
 quit
 ****
 exim -bh 33.33.33.33
 quit
 ****
 exim -bh 33.33.33.33

+helo test

 mail from:<x@y>
 rcpt to:<x1@y>
 rcpt to:<x2@y>
 mail from:<x@y>
 rcpt to:<x1@y>
 rcpt to:<x2@y>


@@ -250,11 +284,13 @@ quit
 ****
 # The 1 causes a 1-second delay in the test.again.dns lookup
 exim -bh 44.44.44.1
 ****
 # The 1 causes a 1-second delay in the test.again.dns lookup
 exim -bh 44.44.44.1

+helo test

 mail from:<x@y>
 rcpt to:<x@y>
 quit
 ****
 exim -odi -bs -oMa 55.55.55.55
 mail from:<x@y>
 rcpt to:<x@y>
 quit
 ****
 exim -odi -bs -oMa 55.55.55.55

+helo test

 mail from:<userx@test.ex>
 rcpt to:<userx@test.ex>
 data
 mail from:<userx@test.ex>
 rcpt to:<userx@test.ex>
 data


@@ -263,6 +299,7 @@ ACL header adding test.
 quit
 ****
 exim -odi -bs -oMa 56.56.56.56
 quit
 ****
 exim -odi -bs -oMa 56.56.56.56

+helo test

 mail from:<userx@test.ex>
 rcpt to:<cond-yes@test.ex>
 data
 mail from:<userx@test.ex>
 rcpt to:<cond-yes@test.ex>
 data


@@ -306,6 +343,7 @@ data
 quit
 ****
 exim -odi -bs -oMa 56.56.57.57
 quit
 ****
 exim -odi -bs -oMa 56.56.57.57

+helo test

 mail from:<userx@test.ex>
 rcpt to:<cond-yes@test.ex>
 data
 mail from:<userx@test.ex>
 rcpt to:<cond-yes@test.ex>
 data


@@ -320,6 +358,7 @@ data
 quit
 ****
 exim -DLOG_SELECTOR=log_selector=-acl_warn_skipped -odi -bs -oMa 56.56.56.56
 quit
 ****
 exim -DLOG_SELECTOR=log_selector=-acl_warn_skipped -odi -bs -oMa 56.56.56.56

+helo test

 mail from:<userx@test.ex>
 rcpt to:<cond-rhubarb@test.ex>
 data
 mail from:<userx@test.ex>
 rcpt to:<cond-rhubarb@test.ex>
 data


@@ -327,6 +366,7 @@ data
 quit
 ****
 exim -odi -bs -oMa 56.56.58.58
 quit
 ****
 exim -odi -bs -oMa 56.56.58.58

+helo test

 mail from:<rcpttest@test.ex>
 rcpt to:<ok1@test.ex>
 rcpt to:<bad1@test.ex>
 mail from:<rcpttest@test.ex>
 rcpt to:<ok1@test.ex>
 rcpt to:<bad1@test.ex>


@@ -339,17 +379,20 @@ data
 quit
 ****
 exim -odi -bs -oMa 56.56.59.59
 quit
 ****
 exim -odi -bs -oMa 56.56.59.59

+helo test

 mail from:<rcpttest@test.ex>
 rcpt to:<fail@test.ex>
 quit
 ****
 exim -odi -bs -oMa V4NET.11.12.13
 mail from:<rcpttest@test.ex>
 rcpt to:<fail@test.ex>
 quit
 ****
 exim -odi -bs -oMa V4NET.11.12.13

+helo test

 mail from:<x@y>
 rcpt to:<x@y>
 rcpt to:<x1@y>
 quit
 ****
 exim -bh 60.60.60.60
 mail from:<x@y>
 rcpt to:<x@y>
 rcpt to:<x1@y>
 quit
 ****
 exim -bh 60.60.60.60

+helo test

 mail from:<x@y>
 rcpt to:<x@y>
 rcpt to:<a@b>
 mail from:<x@y>
 rcpt to:<x@y>
 rcpt to:<a@b>

diff --git a/test/scripts/0000-Basic/0024 b/test/scripts/0000-Basic/0024
index e0cdc556b3393c3825615ca9f85860a9009041c7..862c6e35b4da3e417bcc3b9026712bd3a575cc62 100644 (file)
--- a/test/scripts/0000-Basic/0024
+++ b/test/scripts/0000-Basic/0024
@@ -8,6 +8,7 @@
 # deny   x@ten-2.test.ex (good address, but sender verify failed)
 #
 exim -odi -oMa V4NET.0.0.0 -bs
 # deny   x@ten-2.test.ex (good address, but sender verify failed)
 #
 exim -odi -oMa V4NET.0.0.0 -bs

+helo test

 mail from:<x@y>
 rcpt to:<postmaster@test.ex>
 rcpt to:<userx@test.ex>
 mail from:<x@y>
 rcpt to:<postmaster@test.ex>
 rcpt to:<userx@test.ex>


@@ -27,6 +28,7 @@ quit
 # deny   x@ten-2.test.ex (good address, but not relay domain or host)
 # accept EAI local part
 exim -odi -oMa V4NET.0.0.0 -bs
 # deny   x@ten-2.test.ex (good address, but not relay domain or host)
 # accept EAI local part
 exim -odi -oMa V4NET.0.0.0 -bs

+helo test

 mail from:<userx@test.ex>
 rcpt to:<postmaster@test.ex>
 rcpt to:<userx@test.ex>
 mail from:<userx@test.ex>
 rcpt to:<postmaster@test.ex>
 rcpt to:<userx@test.ex>


@@ -45,6 +47,7 @@ quit
 # accept x@ten-1.test.ex (good relay address)
 # accept x@ten-2.test.ex (good non-relay address, relay host)
 exim -odi -oMa V4NET.255.255.0 -bs
 # accept x@ten-1.test.ex (good relay address)
 # accept x@ten-2.test.ex (good non-relay address, relay host)
 exim -odi -oMa V4NET.255.255.0 -bs

+helo test

 mail from:<userx@test.ex>
 rcpt to:<bad@test.ex>
 rcpt to:<x@y>
 mail from:<userx@test.ex>
 rcpt to:<bad@test.ex>
 rcpt to:<x@y>


@@ -59,6 +62,7 @@ quit
 # accept postmaster@test.ex (postmaster at local domain)
 # deny   anything else
 exim -odi -oMa V4NET.11.12.13 -bs
 # accept postmaster@test.ex (postmaster at local domain)
 # deny   anything else
 exim -odi -oMa V4NET.11.12.13 -bs

+helo test

 mail from:<userx@test.ex>
 rcpt to:<postmaster@test.ex>
 rcpt to:<userx@test.ex>
 mail from:<userx@test.ex>
 rcpt to:<postmaster@test.ex>
 rcpt to:<userx@test.ex>


@@ -72,6 +76,7 @@ quit
 # accept postmaster@test.ex (postmaster at local domain)
 # deny   anything else
 exim -odi -oMa V4NET.11.12.16 -bs
 # accept postmaster@test.ex (postmaster at local domain)
 # deny   anything else
 exim -odi -oMa V4NET.11.12.16 -bs

+helo test

 mail from:<userx@test.ex>
 rcpt to:<postmaster@test.ex>
 rcpt to:<userx@test.ex>
 mail from:<userx@test.ex>
 rcpt to:<postmaster@test.ex>
 rcpt to:<userx@test.ex>


@@ -84,6 +89,7 @@ quit
 # Local SMTP - should accept everything
 #
 exim -odi -bs
 # Local SMTP - should accept everything
 #
 exim -odi -bs

+helo test

 mail from:<x@y>
 rcpt to:<postmaster@test.ex>
 rcpt to:<userx@test.ex>
 mail from:<x@y>
 rcpt to:<postmaster@test.ex>
 rcpt to:<userx@test.ex>

diff --git a/test/scripts/0000-Basic/0025 b/test/scripts/0000-Basic/0025
index 8d5e00512ce9fd61dbdf9827169c7eb03cba4c99..3ed7cf6df26206c20b42267165f4939a7c517b1d 100644 (file)
--- a/test/scripts/0000-Basic/0025
+++ b/test/scripts/0000-Basic/0025
@@ -1,5 +1,6 @@
 # ACL with -bs
 exim -odi -bs
 # ACL with -bs
 exim -odi -bs

+helo test

 mail from:<x@y>
 rcpt to:<userx@test.ex>
 rcpt to:<x@y>
 mail from:<x@y>
 rcpt to:<userx@test.ex>
 rcpt to:<x@y>

diff --git a/test/scripts/0000-Basic/0026 b/test/scripts/0000-Basic/0026
index 9d30d2d07858a6edde482720b9241302141c207c..cb1a3081ff567bfda9cb34fcf555bfcbfd84b964 100644 (file)
--- a/test/scripts/0000-Basic/0026
+++ b/test/scripts/0000-Basic/0026
@@ -2,6 +2,7 @@
 #
 # Syntax OK, non-null sender => should be accepted
 exim -odq -bs
 #
 # Syntax OK, non-null sender => should be accepted
 exim -odq -bs

+helo test

 mail from:<x@y>
 rcpt to:<x@y>
 data
 mail from:<x@y>
 rcpt to:<x@y>
 data


@@ -11,6 +12,7 @@ quit
 ****
 # Syntax error in header => should fail
 exim -odq -bs
 ****
 # Syntax error in header => should fail
 exim -odq -bs

+helo test

 mail from:<x@y>
 rcpt to:<x@y>
 data
 mail from:<x@y>
 rcpt to:<x@y>
 data


@@ -22,6 +24,7 @@ quit
 ****
 # Syntax error (version 2) in header => should fail
 exim -odq -bs
 ****
 # Syntax error (version 2) in header => should fail
 exim -odq -bs

+helo test

 mail from:<x@y>
 rcpt to:<x@y>
 data
 mail from:<x@y>
 rcpt to:<x@y>
 data


@@ -35,6 +38,7 @@ quit
 ****
 # Syntax error in header => should fail even with null sender
 exim -odq -bs
 ****
 # Syntax error in header => should fail even with null sender
 exim -odq -bs

+helo test

 mail from:<>
 rcpt to:<x@y>
 data
 mail from:<>
 rcpt to:<x@y>
 data


@@ -46,6 +50,7 @@ quit
 ****
 # Null sender, invalid sender in header => fail
 exim -odq -bs
 ****
 # Null sender, invalid sender in header => fail
 exim -odq -bs

+helo test

 mail from:<>
 rcpt to:<x@y>
 data
 mail from:<>
 rcpt to:<x@y>
 data


@@ -57,6 +62,7 @@ quit
 ****
 # Null sender, valid sender in header => accept
 exim -odq -bs
 ****
 # Null sender, valid sender in header => accept
 exim -odq -bs

+helo test

 mail from:<>
 rcpt to:<x@y>
 data
 mail from:<>
 rcpt to:<x@y>
 data


@@ -69,6 +75,7 @@ quit
 ****
 # Syntax OK, non-null sender, but bad data => reject
 exim -odq -bs
 ****
 # Syntax OK, non-null sender, but bad data => reject
 exim -odq -bs

+helo test

 mail from:<x@y>
 rcpt to:<x@y>
 data
 mail from:<x@y>
 rcpt to:<x@y>
 data


@@ -78,6 +85,7 @@ quit
 ****
 # Syntax OK, non-null sender, good data
 exim -odi -bs
 ****
 # Syntax OK, non-null sender, good data
 exim -odi -bs

+helo test

 mail from:<x@y>
 rcpt to:<userx@test.ex>
 data
 mail from:<x@y>
 rcpt to:<userx@test.ex>
 data


@@ -87,6 +95,7 @@ quit
 ****
 # -bh test: Syntax error in header => should fail
 exim -bh 10.0.0.0
 ****
 # -bh test: Syntax error in header => should fail
 exim -bh 10.0.0.0

+helo test

 mail from:<x@y>
 rcpt to:<x@y>
 data
 mail from:<x@y>
 rcpt to:<x@y>
 data


@@ -98,6 +107,7 @@ quit
 ****
 # -bh test: Syntax OK, non-null sender, but bad data => reject
 exim -bh 10.0.0.0
 ****
 # -bh test: Syntax OK, non-null sender, but bad data => reject
 exim -bh 10.0.0.0

+helo test

 mail from:<x@y>
 rcpt to:<x@y>
 data
 mail from:<x@y>
 rcpt to:<x@y>
 data


@@ -107,6 +117,7 @@ quit
 ****
 # Group syntax in reply-to header
 exim -odi -bs
 ****
 # Group syntax in reply-to header
 exim -odi -bs

+helo test

 mail from:<x@y>
 rcpt to:<userx@test.ex>
 data
 mail from:<x@y>
 rcpt to:<userx@test.ex>
 data


@@ -120,6 +131,7 @@ quit
 # Group syntax in reply-to header, but no address (falls back to From: for
 # header_sender check - From: is valid)
 exim -odi -bs
 # Group syntax in reply-to header, but no address (falls back to From: for
 # header_sender check - From: is valid)
 exim -odi -bs

+helo test

 mail from:<>
 rcpt to:<userx@test.ex>
 data
 mail from:<>
 rcpt to:<userx@test.ex>
 data


@@ -134,6 +146,7 @@ quit
 # Group syntax in reply-to header, but no address (falls back to From: for
 # header_sender check - but there is no From:)
 exim -odi -bs
 # Group syntax in reply-to header, but no address (falls back to From: for
 # header_sender check - but there is no From:)
 exim -odi -bs

+helo test

 mail from:<>
 rcpt to:<userx@test.ex>
 data
 mail from:<>
 rcpt to:<userx@test.ex>
 data

diff --git a/test/scripts/0000-Basic/0027 b/test/scripts/0000-Basic/0027
index 606c1095ffc9d092b6edba1d1e4bee6387a07f91..ca4be73ead99f55ad5fd0fa394870315a2e24ede 100644 (file)
--- a/test/scripts/0000-Basic/0027
+++ b/test/scripts/0000-Basic/0027
@@ -2,6 +2,7 @@
 #
 # Invalid sender, should reject both
 exim -bs
 #
 # Invalid sender, should reject both
 exim -bs

+helo test

 mail from:<x@y>
 rcpt to:<userx@test.ex>
 rcpt to:<postmaster@test.ex>
 mail from:<x@y>
 rcpt to:<userx@test.ex>
 rcpt to:<postmaster@test.ex>


@@ -9,6 +10,7 @@ quit
 ****
 # Valid sender, should only reject userx
 exim -bs
 ****
 # Valid sender, should only reject userx
 exim -bs

+helo test

 mail from:<userx@test.ex>
 rcpt to:<userx@test.ex>
 rcpt to:<postmaster@test.ex>
 mail from:<userx@test.ex>
 rcpt to:<userx@test.ex>
 rcpt to:<postmaster@test.ex>


@@ -16,6 +18,7 @@ quit
 ****
 # ACL misconfigurations at RCPT time
 exim -bs
 ****
 # ACL misconfigurations at RCPT time
 exim -bs

+helo test

 mail from:<>
 rcpt to:<"deny verify = header_syntax"@test.ex>
 rcpt to:<"deny verify = junk"@test.ex>
 mail from:<>
 rcpt to:<"deny verify = header_syntax"@test.ex>
 rcpt to:<"deny verify = junk"@test.ex>


@@ -26,6 +29,7 @@ quit
 ****
 # ACL misconfiguration at DATA time
 exim -bs
 ****
 # ACL misconfiguration at DATA time
 exim -bs

+helo test

 mail from:<>
 rcpt to:<data@test.ex>
 data
 mail from:<>
 rcpt to:<data@test.ex>
 data


@@ -35,6 +39,7 @@ quit
 ****
 # ACL misconfiguration at DATA time
 exim -bs
 ****
 # ACL misconfiguration at DATA time
 exim -bs

+helo test

 mail from:<>
 rcpt to:<data@test.ex>
 data
 mail from:<>
 rcpt to:<data@test.ex>
 data


@@ -44,6 +49,7 @@ quit
 ****
 # ACL misconfiguration at DATA time
 exim -bs
 ****
 # ACL misconfiguration at DATA time
 exim -bs

+helo test

 mail from:<>
 rcpt to:<data@test.ex>
 data
 mail from:<>
 rcpt to:<data@test.ex>
 data

diff --git a/test/scripts/0000-Basic/0028 b/test/scripts/0000-Basic/0028
index 4cf458d4e4f0c4c4aea0859e805122ca3c7b77d3..d3fb0f7d25fccaa91ffc293bbb2e32f9b7d600bb 100644 (file)
--- a/test/scripts/0000-Basic/0028
+++ b/test/scripts/0000-Basic/0028
@@ -2,6 +2,7 @@
 #
 # SIZE unset - should reject at DATA time
 exim -bs
 #
 # SIZE unset - should reject at DATA time
 exim -bs

+helo test

 mail from:<x@y>
 rcpt to:<userx@test.ex>
 data
 mail from:<x@y>
 rcpt to:<userx@test.ex>
 data

diff --git a/test/scripts/0000-Basic/0029 b/test/scripts/0000-Basic/0029
index d1f297e24485e2271f49e2f8a64af64c2148fc54..eea2dc7b4799b1687aaad088b82b74336223c0ac 100644 (file)
--- a/test/scripts/0000-Basic/0029
+++ b/test/scripts/0000-Basic/0029
@@ -1,5 +1,6 @@
 # ACL with sender=address
 exim -bs
 # ACL with sender=address
 exim -bs

+helo test

 mail from:<ok@test.ex>
 rcpt to:<a@b1>
 rset
 mail from:<ok@test.ex>
 rcpt to:<a@b1>
 rset

diff --git a/test/scripts/0000-Basic/0030 b/test/scripts/0000-Basic/0030
index b200e2704545be32812dfef087870a0c28bc1b9e..f6c3adda008a135b5649039091238b552eced6b8 100644 (file)
--- a/test/scripts/0000-Basic/0030
+++ b/test/scripts/0000-Basic/0030
@@ -1,5 +1,6 @@
 # Use of $address_data in ACL
 exim -bs
 # Use of $address_data in ACL
 exim -bs

+helo test

 mail from:<>
 rcpt to:<ok@test.ex>
 rcpt to:<notok@test.ex>
 mail from:<>
 rcpt to:<ok@test.ex>
 rcpt to:<notok@test.ex>

diff --git a/test/scripts/0000-Basic/0034 b/test/scripts/0000-Basic/0034
index 1c8c38016d5fabf798dc9ae558e4f519b84dc10c..879298c128d3443ddcf8362832af5f3c7c4f56f0 100644 (file)
--- a/test/scripts/0000-Basic/0034
+++ b/test/scripts/0000-Basic/0034
@@ -16,6 +16,7 @@ ehlo a.b.c
 ehlo a.b.c
 ****
 exim -bs
 ehlo a.b.c
 ****
 exim -bs

+helo test

 rset
 mail from:<x@y>
 rcpt to:<x@y>
 rset
 mail from:<x@y>
 rcpt to:<x@y>

diff --git a/test/scripts/0000-Basic/0049 b/test/scripts/0000-Basic/0049
index e3146a083242e7e941de7559ac9c232359a2ed4f..855d936b2f0b10f104c0b0718c907ddd499b61f2 100644 (file)
--- a/test/scripts/0000-Basic/0049
+++ b/test/scripts/0000-Basic/0049
@@ -22,6 +22,7 @@ Sender: Sender in original <sender@original.ex>
 This is a test message.
 ****
 exim -bs -odi
 This is a test message.
 ****
 exim -bs -odi

+helo test

 mail from:userx@cus.cam.ac.uk
 rcpt to:userx@test.ex
 data
 mail from:userx@cus.cam.ac.uk
 rcpt to:userx@test.ex
 data


@@ -58,6 +59,7 @@ From: From person <from@some.where>
 This is a test message.
 ****
 exim -bs -odi
 This is a test message.
 ****
 exim -bs -odi

+helo test

 mail from:userx@somehost.test.ex
 rcpt to:userx@test.ex
 data
 mail from:userx@somehost.test.ex
 rcpt to:userx@test.ex
 data

diff --git a/test/scripts/0000-Basic/0050 b/test/scripts/0000-Basic/0050
index 82e5cad0eda5664477b036571a79014362d03aa0..8f69599b4dc51bb30fd40181227e813e14793fc2 100644 (file)
--- a/test/scripts/0000-Basic/0050
+++ b/test/scripts/0000-Basic/0050
@@ -22,6 +22,7 @@ Sender: Sender in original <sender@original.ex>
 This is a test message 4.
 ****
 exim -bs -odi
 This is a test message 4.
 ****
 exim -bs -odi

+helo test

 mail from:userx@cus.cam.ac.uk
 rcpt to:userx@test.ex
 data
 mail from:userx@cus.cam.ac.uk
 rcpt to:userx@test.ex
 data


@@ -63,6 +64,7 @@ From: From person <from@some.where>
 This is a test message 10.
 ****
 exim -bs -odi
 This is a test message 10.
 ****
 exim -bs -odi

+helo test

 mail from:userx@somehost.test.ex
 rcpt to:userx@test.ex
 data
 mail from:userx@somehost.test.ex
 rcpt to:userx@test.ex
 data

diff --git a/test/scripts/0000-Basic/0056 b/test/scripts/0000-Basic/0056
index 5e033ce1e19055480aad593868f18e643cab660d..86354532a3afd6af620bb01570f2099dc1eae95a 100644 (file)
--- a/test/scripts/0000-Basic/0056
+++ b/test/scripts/0000-Basic/0056
@@ -1,5 +1,6 @@
 # domain list set to *
 exim -bh V4NET.0.0.1
 # domain list set to *
 exim -bh V4NET.0.0.1

+helo test

 mail from:<userx@somehost.example.com>
 rcpt to:<userx@test.ex>
 rcpt to:<userx@otherhost.example.com>
 mail from:<userx@somehost.example.com>
 rcpt to:<userx@test.ex>
 rcpt to:<userx@otherhost.example.com>

diff --git a/test/scripts/0000-Basic/0057 b/test/scripts/0000-Basic/0057
index 0c39e13ecd777e5fea756caffa31cf199e387f1a..5e9fc782136fffd04ada81a14069e6b7cc741d11 100644 (file)
--- a/test/scripts/0000-Basic/0057
+++ b/test/scripts/0000-Basic/0057
@@ -1,5 +1,6 @@
 # domain list = !* and other ! and percent_hack domains
 exim -bh V4NET.0.0.1
 # domain list = !* and other ! and percent_hack domains
 exim -bh V4NET.0.0.1

+helo test

 mail from:<userx@somehost.example.com>
 rcpt to:<userx@test.ex>
 rcpt to:<userx@anotherhost.example.com>
 mail from:<userx@somehost.example.com>
 rcpt to:<userx@test.ex>
 rcpt to:<userx@anotherhost.example.com>

diff --git a/test/scripts/0000-Basic/0058 b/test/scripts/0000-Basic/0058
index 4b0771444653c3ed98fc8dd38c10c7759b721d97..60f2248e1c1a7b86a6077465c780283ebeee145d 100644 (file)
--- a/test/scripts/0000-Basic/0058
+++ b/test/scripts/0000-Basic/0058
@@ -1,5 +1,6 @@
 # Relay by hostlist *
 exim -bh V4NET.0.0.1
 # Relay by hostlist *
 exim -bh V4NET.0.0.1

+helo test

 mail from:<userx@somehost.example.com>
 rcpt to:<userx@anotherhost.example.com>
 data
 mail from:<userx@somehost.example.com>
 rcpt to:<userx@anotherhost.example.com>
 data

diff --git a/test/scripts/0000-Basic/0059 b/test/scripts/0000-Basic/0059
index 85c971651871c82d8855ed647cdafb3733555658..a3c045652d46d21357afc45f554a15655e583505 100644 (file)
--- a/test/scripts/0000-Basic/0059
+++ b/test/scripts/0000-Basic/0059
@@ -1,5 +1,6 @@
 # Relay by hostlist !*
 exim -bh V4NET.0.0.1
 # Relay by hostlist !*
 exim -bh V4NET.0.0.1

+helo test

 mail from:<userx@somehost.example.com>
 rcpt to:<userx@test.ex>
 rcpt to:<userx@anotherhost.example.com>
 mail from:<userx@somehost.example.com>
 rcpt to:<userx@test.ex>
 rcpt to:<userx@anotherhost.example.com>

diff --git a/test/scripts/0000-Basic/0060 b/test/scripts/0000-Basic/0060
index 87981047ca566337837489d7841c759b30a4ea0d..84b8fc4c1f2d9c93d037e07c3e08d92541173915 100644 (file)
--- a/test/scripts/0000-Basic/0060
+++ b/test/scripts/0000-Basic/0060
@@ -1,5 +1,6 @@
 # Relay by hostlist match for host name or IP address
 exim -bh V4NET.0.0.1
 # Relay by hostlist match for host name or IP address
 exim -bh V4NET.0.0.1

+helo test

 mail from:<userx@somehost.example.com>
 rcpt to:<userx@test.ex>
 rcpt to:<userx@anotherhost.example.com>
 mail from:<userx@somehost.example.com>
 rcpt to:<userx@test.ex>
 rcpt to:<userx@anotherhost.example.com>


@@ -8,6 +9,7 @@ data
 quit
 ****
 exim -bh V4NET.0.0.2
 quit
 ****
 exim -bh V4NET.0.0.2

+helo test

 mail from:<userx@somehost.example.com>
 rcpt to:<userx@test.ex>
 rcpt to:<userx@anotherhost.example.com>
 mail from:<userx@somehost.example.com>
 rcpt to:<userx@test.ex>
 rcpt to:<userx@anotherhost.example.com>


@@ -16,6 +18,7 @@ data
 quit
 ****
 exim -bh V4NET.0.0.5
 quit
 ****
 exim -bh V4NET.0.0.5

+helo test

 mail from:<userx@somehost.example.com>
 rcpt to:<userx@test.ex>
 rcpt to:<userx@anotherhost.example.com>
 mail from:<userx@somehost.example.com>
 rcpt to:<userx@test.ex>
 rcpt to:<userx@anotherhost.example.com>


@@ -24,6 +27,7 @@ data
 quit
 ****
 exim -bh V4NET.0.0.6
 quit
 ****
 exim -bh V4NET.0.0.6

+helo test

 mail from:<userx@somehost.example.com>
 rcpt to:<userx@test.ex>
 rcpt to:<userx@anotherhost.example.com>
 mail from:<userx@somehost.example.com>
 rcpt to:<userx@test.ex>
 rcpt to:<userx@anotherhost.example.com>


@@ -32,6 +36,7 @@ data
 quit
 ****
 exim -bh V4NET.255.0.1
 quit
 ****
 exim -bh V4NET.255.0.1

+helo test

 mail from:<userx@somehost.example.com>
 rcpt to:<userx@test.ex>
 rcpt to:<userx@anotherhost.example.com>
 mail from:<userx@somehost.example.com>
 rcpt to:<userx@test.ex>
 rcpt to:<userx@anotherhost.example.com>


@@ -40,6 +45,7 @@ data
 quit
 ****
 exim -bh V4NET.255.0.2
 quit
 ****
 exim -bh V4NET.255.0.2

+helo test

 mail from:<userx@somehost.example.com>
 rcpt to:<userx@test.ex>
 rcpt to:<userx@anotherhost.example.com>
 mail from:<userx@somehost.example.com>
 rcpt to:<userx@test.ex>
 rcpt to:<userx@anotherhost.example.com>


@@ -48,6 +54,7 @@ data
 quit
 ****
 exim -bh V4NET.255.0.3
 quit
 ****
 exim -bh V4NET.255.0.3

+helo test

 mail from:<userx@somehost.example.com>
 rcpt to:<userx@test.ex>
 rcpt to:<userx@anotherhost.example.com>
 mail from:<userx@somehost.example.com>
 rcpt to:<userx@test.ex>
 rcpt to:<userx@anotherhost.example.com>


@@ -56,6 +63,7 @@ data
 quit
 ****
 exim -bh V4NET.255.0.4
 quit
 ****
 exim -bh V4NET.255.0.4

+helo test

 mail from:<userx@somehost.example.com>
 rcpt to:<userx@test.ex>
 rcpt to:<userx@anotherhost.example.com>
 mail from:<userx@somehost.example.com>
 rcpt to:<userx@test.ex>
 rcpt to:<userx@anotherhost.example.com>

diff --git a/test/scripts/0000-Basic/0061 b/test/scripts/0000-Basic/0061
index 5177f8eacb14c87035b26043484f8fc1f1b9300f..90d58642902d530e2ced74539a473a2f557ae6f3 100644 (file)
--- a/test/scripts/0000-Basic/0061
+++ b/test/scripts/0000-Basic/0061
@@ -1,5 +1,6 @@
 # Relay by hostlist @
 exim -bh V4NET.0.0.1
 # Relay by hostlist @
 exim -bh V4NET.0.0.1

+helo test

 mail from:<userx@somehost.example.com>
 rcpt to:<userx@test.ex>
 rcpt to:<userx@anotherhost.example.com>
 mail from:<userx@somehost.example.com>
 rcpt to:<userx@test.ex>
 rcpt to:<userx@anotherhost.example.com>


@@ -8,6 +9,7 @@ data
 quit
 ****
 exim -bh V4NET.0.0.2
 quit
 ****
 exim -bh V4NET.0.0.2

+helo test

 mail from:<userx@somehost.example.com>
 rcpt to:<userx@test.ex>
 rcpt to:<userx@anotherhost.example.com>
 mail from:<userx@somehost.example.com>
 rcpt to:<userx@test.ex>
 rcpt to:<userx@anotherhost.example.com>

diff --git a/test/scripts/0000-Basic/0062 b/test/scripts/0000-Basic/0062
index b5802a0f4d8d02c31ed1c1722fa94f6eb46c205b..5cff10c80827f7a7a51e07999848cf1a9cb7f941 100644 (file)
--- a/test/scripts/0000-Basic/0062
+++ b/test/scripts/0000-Basic/0062
@@ -1,5 +1,6 @@
 # Relay by hostlist end name match
 exim -bh V4NET.0.0.1
 # Relay by hostlist end name match
 exim -bh V4NET.0.0.1

+helo test

 mail from:<userx@somehost.example.com>
 rcpt to:<userx@test.ex>
 rcpt to:<userx@anotherhost.example.com>
 mail from:<userx@somehost.example.com>
 rcpt to:<userx@test.ex>
 rcpt to:<userx@anotherhost.example.com>


@@ -8,6 +9,7 @@ data
 quit
 ****
 exim -bh V4NET.0.0.2
 quit
 ****
 exim -bh V4NET.0.0.2

+helo test

 mail from:<userx@somehost.example.com>
 rcpt to:<userx@test.ex>
 rcpt to:<userx@anotherhost.example.com>
 mail from:<userx@somehost.example.com>
 rcpt to:<userx@test.ex>
 rcpt to:<userx@anotherhost.example.com>


@@ -16,6 +18,7 @@ data
 quit
 ****
 exim -bh V4NET.0.0.3
 quit
 ****
 exim -bh V4NET.0.0.3

+helo test

 mail from:<userx@somehost.example.com>
 rcpt to:<userx@test.ex>
 rcpt to:<userx@anotherhost.example.com>
 mail from:<userx@somehost.example.com>
 rcpt to:<userx@test.ex>
 rcpt to:<userx@anotherhost.example.com>

diff --git a/test/scripts/0000-Basic/0063 b/test/scripts/0000-Basic/0063
index 61abb6ef148809c6778c37d3e36482ff9a0e52f5..d34dfa3d9f0ab4dfcfba8b6190da99fa91e7f1fd 100644 (file)
--- a/test/scripts/0000-Basic/0063
+++ b/test/scripts/0000-Basic/0063
@@ -1,5 +1,6 @@
 # Relay by hostlist regex match
 exim -bh V4NET.0.0.1
 # Relay by hostlist regex match
 exim -bh V4NET.0.0.1

+helo test

 mail from:<userx@somehost.example.com>
 rcpt to:<userx@test.ex>
 rcpt to:<userx@anotherhost.example.com>
 mail from:<userx@somehost.example.com>
 rcpt to:<userx@test.ex>
 rcpt to:<userx@anotherhost.example.com>


@@ -8,6 +9,7 @@ data
 quit
 ****
 exim -bh V4NET.0.0.2
 quit
 ****
 exim -bh V4NET.0.0.2

+helo test

 mail from:<userx@somehost.example.com>
 rcpt to:<userx@test.ex>
 rcpt to:<userx@anotherhost.example.com>
 mail from:<userx@somehost.example.com>
 rcpt to:<userx@test.ex>
 rcpt to:<userx@anotherhost.example.com>

diff --git a/test/scripts/0000-Basic/0064 b/test/scripts/0000-Basic/0064
index a6ff0df12a7acd2216ae9bd6bd696ffa9dd47bb7..5d027c3c12bd0ce1a205fad2c5c8a513ad674c86 100644 (file)
--- a/test/scripts/0000-Basic/0064
+++ b/test/scripts/0000-Basic/0064
@@ -1,5 +1,6 @@
 # Relay by hostlist lsearch
 exim -bh V4NET.0.0.1
 # Relay by hostlist lsearch
 exim -bh V4NET.0.0.1

+helo test

 mail from:<userx@somehost.example.com>
 rcpt to:<userx@test.ex>
 rcpt to:<userx@anotherhost.example.com>
 mail from:<userx@somehost.example.com>
 rcpt to:<userx@test.ex>
 rcpt to:<userx@anotherhost.example.com>


@@ -8,6 +9,7 @@ data
 quit
 ****
 exim -bh V4NET.0.0.2
 quit
 ****
 exim -bh V4NET.0.0.2

+helo test

 mail from:<userx@somehost.example.com>
 rcpt to:<userx@test.ex>
 rcpt to:<userx@anotherhost.example.com>
 mail from:<userx@somehost.example.com>
 rcpt to:<userx@test.ex>
 rcpt to:<userx@anotherhost.example.com>

diff --git a/test/scripts/0000-Basic/0065 b/test/scripts/0000-Basic/0065
index d7862004ce44875dc88e092a5a9ced845d4bb2e0..df45d9313f003a0e3d8a2536d2b264c5a9902bb3 100644 (file)
--- a/test/scripts/0000-Basic/0065
+++ b/test/scripts/0000-Basic/0065
@@ -1,5 +1,6 @@
 # Relay by hostlist matching by network
 exim -bh 1.2.3.4
 # Relay by hostlist matching by network
 exim -bh 1.2.3.4

+helo test

 mail from:<userx@somehost.example.com>
 rcpt to:<userx@test.ex>
 rcpt to:<userx@anotherhost.example.com>
 mail from:<userx@somehost.example.com>
 rcpt to:<userx@test.ex>
 rcpt to:<userx@anotherhost.example.com>


@@ -8,6 +9,7 @@ data
 quit
 ****
 exim -bh 1.2.3.5
 quit
 ****
 exim -bh 1.2.3.5

+helo test

 mail from:<userx@somehost.example.com>
 rcpt to:<userx@test.ex>
 rcpt to:<userx@anotherhost.example.com>
 mail from:<userx@somehost.example.com>
 rcpt to:<userx@test.ex>
 rcpt to:<userx@anotherhost.example.com>


@@ -16,6 +18,7 @@ data
 quit
 ****
 exim -bh 1.2.4.5
 quit
 ****
 exim -bh 1.2.4.5

+helo test

 mail from:<userx@somehost.example.com>
 rcpt to:<userx@test.ex>
 rcpt to:<userx@anotherhost.example.com>
 mail from:<userx@somehost.example.com>
 rcpt to:<userx@test.ex>
 rcpt to:<userx@anotherhost.example.com>


@@ -24,6 +27,7 @@ data
 quit
 ****
 exim -bh 1.3.2.4
 quit
 ****
 exim -bh 1.3.2.4

+helo test

 mail from:<userx@somehost.example.com>
 rcpt to:<userx@test.ex>
 rcpt to:<userx@anotherhost.example.com>
 mail from:<userx@somehost.example.com>
 rcpt to:<userx@test.ex>
 rcpt to:<userx@anotherhost.example.com>


@@ -32,6 +36,7 @@ data
 quit
 ****
 exim -bh 131.111.8.2
 quit
 ****
 exim -bh 131.111.8.2

+helo test

 mail from:<userx@somehost.example.com>
 rcpt to:<userx@test.ex>
 rcpt to:<userx@anotherhost.example.com>
 mail from:<userx@somehost.example.com>
 rcpt to:<userx@test.ex>
 rcpt to:<userx@anotherhost.example.com>


@@ -40,6 +45,7 @@ data
 quit
 ****
 exim -bh 192.152.98.3
 quit
 ****
 exim -bh 192.152.98.3

+helo test

 mail from:<userx@somehost.example.com>
 rcpt to:<userx@test.ex>
 rcpt to:<userx@anotherhost.example.com>
 mail from:<userx@somehost.example.com>
 rcpt to:<userx@test.ex>
 rcpt to:<userx@anotherhost.example.com>


@@ -48,6 +54,7 @@ data
 quit
 ****
 exim -bh 192.153.98.4
 quit
 ****
 exim -bh 192.153.98.4

+helo test

 mail from:<userx@somehost.example.com>
 rcpt to:<userx@test.ex>
 rcpt to:<userx@anotherhost.example.com>
 mail from:<userx@somehost.example.com>
 rcpt to:<userx@test.ex>
 rcpt to:<userx@anotherhost.example.com>

diff --git a/test/scripts/0000-Basic/0066 b/test/scripts/0000-Basic/0066
index cb4492ed1e247d0f9daf0ddce417877baa2cdc7b..09db4f920dc10e33f77add6d6dacddf1e5864ad9 100644 (file)
--- a/test/scripts/0000-Basic/0066
+++ b/test/scripts/0000-Basic/0066
@@ -1,5 +1,6 @@
 # Relay by hostlist matching host or network
 exim -bh 1.2.3.4
 # Relay by hostlist matching host or network
 exim -bh 1.2.3.4

+helo test

 mail from:<userx@somehost.example.com>
 rcpt to:<userx@test.ex>
 rcpt to:<userx@anotherhost.example.com>
 mail from:<userx@somehost.example.com>
 rcpt to:<userx@test.ex>
 rcpt to:<userx@anotherhost.example.com>


@@ -8,6 +9,7 @@ data
 quit
 ****
 exim -bh 1.2.3.5
 quit
 ****
 exim -bh 1.2.3.5

+helo test

 mail from:<userx@somehost.example.com>
 rcpt to:<userx@test.ex>
 rcpt to:<userx@anotherhost.example.com>
 mail from:<userx@somehost.example.com>
 rcpt to:<userx@test.ex>
 rcpt to:<userx@anotherhost.example.com>


@@ -16,6 +18,7 @@ data
 quit
 ****
 exim -bh 1.2.4.5
 quit
 ****
 exim -bh 1.2.4.5

+helo test

 mail from:<userx@somehost.example.com>
 rcpt to:<userx@test.ex>
 rcpt to:<userx@anotherhost.example.com>
 mail from:<userx@somehost.example.com>
 rcpt to:<userx@test.ex>
 rcpt to:<userx@anotherhost.example.com>


@@ -24,6 +27,7 @@ data
 quit
 ****
 exim -bh 1.3.2.4
 quit
 ****
 exim -bh 1.3.2.4

+helo test

 mail from:<userx@somehost.example.com>
 rcpt to:<userx@test.ex>
 rcpt to:<userx@anotherhost.example.com>
 mail from:<userx@somehost.example.com>
 rcpt to:<userx@test.ex>
 rcpt to:<userx@anotherhost.example.com>


@@ -32,6 +36,7 @@ data
 quit
 ****
 exim -bh 131.111.8.2
 quit
 ****
 exim -bh 131.111.8.2

+helo test

 mail from:<userx@somehost.example.com>
 rcpt to:<userx@test.ex>
 rcpt to:<userx@anotherhost.example.com>
 mail from:<userx@somehost.example.com>
 rcpt to:<userx@test.ex>
 rcpt to:<userx@anotherhost.example.com>


@@ -40,6 +45,7 @@ data
 quit
 ****
 exim -bh 192.152.98.3
 quit
 ****
 exim -bh 192.152.98.3

+helo test

 mail from:<userx@somehost.example.com>
 rcpt to:<userx@test.ex>
 rcpt to:<userx@anotherhost.example.com>
 mail from:<userx@somehost.example.com>
 rcpt to:<userx@test.ex>
 rcpt to:<userx@anotherhost.example.com>


@@ -48,6 +54,7 @@ data
 quit
 ****
 exim -bh V4NET.0.0.1
 quit
 ****
 exim -bh V4NET.0.0.1

+helo test

 mail from:<userx@somehost.example.com>
 rcpt to:<userx@test.ex>
 rcpt to:<userx@anotherhost.example.com>
 mail from:<userx@somehost.example.com>
 rcpt to:<userx@test.ex>
 rcpt to:<userx@anotherhost.example.com>


@@ -56,6 +63,7 @@ data
 quit
 ****
 exim -bh V4NET.11.12.13
 quit
 ****
 exim -bh V4NET.11.12.13

+helo test

 mail from:<userx@somehost.example.com>
 rcpt to:<userx@test.ex>
 rcpt to:<userx@anotherhost.example.com>
 mail from:<userx@somehost.example.com>
 rcpt to:<userx@test.ex>
 rcpt to:<userx@anotherhost.example.com>


@@ -64,6 +72,7 @@ data
 quit
 ****
 exim -bh V4NET.0.0.3
 quit
 ****
 exim -bh V4NET.0.0.3

+helo test

 mail from:<userx@somehost.example.com>
 rcpt to:<userx@test.ex>
 rcpt to:<userx@anotherhost.example.com>
 mail from:<userx@somehost.example.com>
 rcpt to:<userx@test.ex>
 rcpt to:<userx@anotherhost.example.com>

diff --git a/test/scripts/0000-Basic/0067 b/test/scripts/0000-Basic/0067
index 5212719c3939d41deeb901e65140c6b6d88d84d6..0ff4ef84cafb7509eb1c5f05342f72d65145dd37 100644 (file)
--- a/test/scripts/0000-Basic/0067
+++ b/test/scripts/0000-Basic/0067
@@ -1,5 +1,6 @@
 # sender_reject (various, including @@)
 exim -bh 1.2.3.4
 # sender_reject (various, including @@)
 exim -bh 1.2.3.4

+helo test

 mail from:<userx@somehost.example.com>
 rcpt to:<x@test.ex>
 rset
 mail from:<userx@somehost.example.com>
 rcpt to:<x@test.ex>
 rset

diff --git a/test/scripts/0000-Basic/0068 b/test/scripts/0000-Basic/0068
index dd8cce03358596d6b2e44ca5881b0d84c35cbe8e..8243dc5fff5b89f37bc4b27d82a731ae8132ad5d 100644 (file)
--- a/test/scripts/0000-Basic/0068
+++ b/test/scripts/0000-Basic/0068
@@ -1,5 +1,6 @@
 # recipients_max_reject
 exim -bh V4NET.10.10.10
 # recipients_max_reject
 exim -bh V4NET.10.10.10

+helo test

 mail from:<x@y>
 rcpt to:<a@b>
 rcpt to:<a@b>
 mail from:<x@y>
 rcpt to:<a@b>
 rcpt to:<a@b>

diff --git a/test/scripts/0000-Basic/0069 b/test/scripts/0000-Basic/0069
index 9170dfc58eebbd8259715d05b27069db796a9773..729d19f5ee2284b4edfe5aff6fc058a21fdf4afb 100644 (file)
--- a/test/scripts/0000-Basic/0069
+++ b/test/scripts/0000-Basic/0069
@@ -2,41 +2,49 @@
 need_ipv4
 #
 exim -bh V4NET.0.0.1
 need_ipv4
 #
 exim -bh V4NET.0.0.1

+helo test

 mail from:<x@y>
 rcpt to:<x@test.ex>
 quit
 ****
 exim -bh V4NET.0.0.13
 mail from:<x@y>
 rcpt to:<x@test.ex>
 quit
 ****
 exim -bh V4NET.0.0.13

+helo test

 MAIL FROM:<userx>
 rcpt to:<x@test.ex>
 quit
 ****
 exim -bh V4NET.0.0.13
 MAIL FROM:<userx>
 rcpt to:<x@test.ex>
 quit
 ****
 exim -bh V4NET.0.0.13

+helo test

 MAIL FROM:<userx@test.ex>
 rcpt to:<y@test.ex>
 quit
 ****
 exim -bh V4NET.0.0.13
 MAIL FROM:<userx@test.ex>
 rcpt to:<y@test.ex>
 quit
 ****
 exim -bh V4NET.0.0.13

+helo test

 MAIL FROM:<userx@test.ex>
 rcpt to:<z@test.ex>
 quit
 ****
 exim -bh V4NET.0.0.13 -DLOG_SELECTOR=log_selector=+unknown_in_list
 MAIL FROM:<userx@test.ex>
 rcpt to:<z@test.ex>
 quit
 ****
 exim -bh V4NET.0.0.13 -DLOG_SELECTOR=log_selector=+unknown_in_list

+helo test

 MAIL FROM:<userx@test.ex>
 rcpt to:<y@test.ex>
 quit
 ****
 exim -bh V4NET.0.0.13
 MAIL FROM:<userx@test.ex>
 rcpt to:<y@test.ex>
 quit
 ****
 exim -bh V4NET.0.0.13

+helo test

 MAIL FROM:<userx>
 rcpt to:<a@test.ex>
 quit
 ****
 exim -bh V4NET.0.0.13
 MAIL FROM:<userx>
 rcpt to:<a@test.ex>
 quit
 ****
 exim -bh V4NET.0.0.13

+helo test

 MAIL FROM:<userx@test.ex>
 rcpt to:<b@test.ex>
 quit
 ****
 exim -bh V4NET.0.0.13
 MAIL FROM:<userx@test.ex>
 rcpt to:<b@test.ex>
 quit
 ****
 exim -bh V4NET.0.0.13

+helo test

 MAIL FROM:<userx@test.ex>
 rcpt to:<c@test.ex>
 quit
 MAIL FROM:<userx@test.ex>
 rcpt to:<c@test.ex>
 quit

diff --git a/test/scripts/0000-Basic/0077 b/test/scripts/0000-Basic/0077
index 715bd289ec06ac7e70fa3fb2977169c5205fb26e..493a7ae6e623cfecd66ab1a6a1793aceb314fa70 100644 (file)
--- a/test/scripts/0000-Basic/0077
+++ b/test/scripts/0000-Basic/0077
@@ -1,15 +1,18 @@
 # host_reject !@ : !localhost
 exim -bh 127.0.0.1
 # host_reject !@ : !localhost
 exim -bh 127.0.0.1

+helo test

 mail from:<x@test.ex>
 rcpt to:<x@test.ex>
 quit
 ****
 exim -bh V4NET.10.10.10
 mail from:<x@test.ex>
 rcpt to:<x@test.ex>
 quit
 ****
 exim -bh V4NET.10.10.10

+helo test

 mail from:<x@test.ex>
 rcpt to:<x@test.ex>
 quit
 ****
 exim -bh V4NET.0.0.1
 mail from:<x@test.ex>
 rcpt to:<x@test.ex>
 quit
 ****
 exim -bh V4NET.0.0.1

+helo test

 mail from:<x@test.ex>
 rcpt to:<x@test.ex>
 quit
 mail from:<x@test.ex>
 rcpt to:<x@test.ex>
 quit

diff --git a/test/scripts/0000-Basic/0079 b/test/scripts/0000-Basic/0079
index 0875ed0c46b839563b4d1b464ee09b63fd040471..3ade8af3a98d6924250a44a7586297e28c645bdc 100644 (file)
--- a/test/scripts/0000-Basic/0079
+++ b/test/scripts/0000-Basic/0079
@@ -29,6 +29,7 @@ test message data
 quit
 ****
 exim -odi -bs
 quit
 ****
 exim -odi -bs

+helo test

 mail from:<postmaster@exim.test.ex>
 rcpt to:<userx@exim.test.ex>
 data
 mail from:<postmaster@exim.test.ex>
 rcpt to:<userx@exim.test.ex>
 data

diff --git a/test/scripts/0000-Basic/0086 b/test/scripts/0000-Basic/0086
index 0a7582ebe5fe9ea57b15292ed1408ff92c6c5399..639b24d232ec761e576b23b1db932e3d586c5701 100644 (file)
--- a/test/scripts/0000-Basic/0086
+++ b/test/scripts/0000-Basic/0086
@@ -1,5 +1,6 @@
 # verify = header_syntax
 exim -bh V4NET.10.10.10
 # verify = header_syntax
 exim -bh V4NET.10.10.10

+helo test

 mail from:<userx@exim.test.ex>
 rcpt to:<userx@test.ex>
 data
 mail from:<userx@exim.test.ex>
 rcpt to:<userx@test.ex>
 data


@@ -12,6 +13,7 @@ Subject: testing
 QUIT
 ****
 exim -bh V4NET.10.10.10
 QUIT
 ****
 exim -bh V4NET.10.10.10

+helo test

 mail from:<userx@exim.test.ex>
 rcpt to:<userx@test.ex>
 data
 mail from:<userx@exim.test.ex>
 rcpt to:<userx@test.ex>
 data


@@ -26,6 +28,7 @@ Subject: testing
 QUIT
 ****
 exim -bh V4NET.10.10.10
 QUIT
 ****
 exim -bh V4NET.10.10.10

+helo test

 mail from:<userx@exim.test.ex>
 rcpt to:<userx@test.ex>
 data
 mail from:<userx@exim.test.ex>
 rcpt to:<userx@test.ex>
 data


@@ -40,6 +43,7 @@ Subject: testing
 QUIT
 ****
 exim -bh V4NET.10.10.10
 QUIT
 ****
 exim -bh V4NET.10.10.10

+helo test

 mail from:<userx@exim.test.ex>
 rcpt to:<userx@test.ex>
 data
 mail from:<userx@exim.test.ex>
 rcpt to:<userx@test.ex>
 data


@@ -94,6 +98,7 @@ Cc: "abcd@x.y.z (missing quote),
 QUIT
 ****
 exim -bh V4NET.10.10.10
 QUIT
 ****
 exim -bh V4NET.10.10.10

+helo test

 mail from:<userx@exim.test.ex>
 rcpt to:<userx@test.ex>
 data
 mail from:<userx@exim.test.ex>
 rcpt to:<userx@test.ex>
 data


@@ -106,6 +111,7 @@ Subject: testing
 QUIT
 ****
 exim -bh V4NET.10.10.9
 QUIT
 ****
 exim -bh V4NET.10.10.9

+helo test

 mail from:<userx@exim.test.ex>
 rcpt to:<userx@test.ex>
 data
 mail from:<userx@exim.test.ex>
 rcpt to:<userx@test.ex>
 data

diff --git a/test/scripts/0000-Basic/0087 b/test/scripts/0000-Basic/0087
index 8e65e8006d456493947869f4674848ac23662c25..d2a0daf2a72b9b471cbcd10c3d3f141213d38de6 100644 (file)
--- a/test/scripts/0000-Basic/0087
+++ b/test/scripts/0000-Basic/0087
@@ -1,5 +1,6 @@
 # verify = header_sender & sender
 exim -bh V4NET.10.10.10
 # verify = header_sender & sender
 exim -bh V4NET.10.10.10

+helo test

 mail from:<userx@test.ex>
 rcpt to:<userx@test.ex>
 data
 mail from:<userx@test.ex>
 rcpt to:<userx@test.ex>
 data


@@ -12,6 +13,7 @@ Subject: testing
 QUIT
 ****
 exim -bh V4NET.10.10.10
 QUIT
 ****
 exim -bh V4NET.10.10.10

+helo test

 mail from:<userx@test.ex>
 rcpt to:<userx@test.ex>
 data
 mail from:<userx@test.ex>
 rcpt to:<userx@test.ex>
 data


@@ -25,6 +27,7 @@ Subject: testing
 QUIT
 ****
 exim -bh V4NET.10.10.10
 QUIT
 ****
 exim -bh V4NET.10.10.10

+helo test

 mail from:<userx@test.ex>
 rcpt to:<userx@test.ex>
 data
 mail from:<userx@test.ex>
 rcpt to:<userx@test.ex>
 data


@@ -37,6 +40,7 @@ Subject: testing
 QUIT
 ****
 exim -bh V4NET.10.10.10
 QUIT
 ****
 exim -bh V4NET.10.10.10

+helo test

 mail from:<userx@test.ex>
 rcpt to:<userx@test.ex>
 data
 mail from:<userx@test.ex>
 rcpt to:<userx@test.ex>
 data


@@ -49,6 +53,7 @@ Subject: testing
 QUIT
 ****
 exim -bh V4NET.10.10.10
 QUIT
 ****
 exim -bh V4NET.10.10.10

+helo test

 mail from:<userx@test.ex>
 rcpt to:<userx@test.ex>
 data
 mail from:<userx@test.ex>
 rcpt to:<userx@test.ex>
 data

diff --git a/test/scripts/0000-Basic/0091 b/test/scripts/0000-Basic/0091
index 89025e75788e8eb22b51d064acc42b9cef86cdf5..a97cf16beb22c272f7465adc73e65a2842e490a7 100644 (file)
--- a/test/scripts/0000-Basic/0091
+++ b/test/scripts/0000-Basic/0091
@@ -1,5 +1,6 @@
 # sender_verify_hosts
 exim -bh V4NET.0.0.1
 # sender_verify_hosts
 exim -bh V4NET.0.0.1

+helo test

 mail from:<junk@jink.jonk.test.ex>
 rcpt to:<root@test.ex>
 data
 mail from:<junk@jink.jonk.test.ex>
 rcpt to:<root@test.ex>
 data


@@ -8,6 +9,7 @@ From: <junk@jink.jonk.test.ex>
 quit
 ****
 exim -bh V4NET.0.0.2
 quit
 ****
 exim -bh V4NET.0.0.2

+helo test

 mail from:<junk@jink.jonk.test.ex>
 rcpt to:<root@test.ex>
 data
 mail from:<junk@jink.jonk.test.ex>
 rcpt to:<root@test.ex>
 data


@@ -15,6 +17,7 @@ data
 quit
 ****
 exim -bh V4NET.0.0.2
 quit
 ****
 exim -bh V4NET.0.0.2

+helo test

 mail from:<userx@test.ex>
 rcpt to:<root@test.ex>
 data
 mail from:<userx@test.ex>
 rcpt to:<root@test.ex>
 data


@@ -23,6 +26,7 @@ From: <junk@jink.jonk.test.ex>
 quit
 ****
 exim -bh V4NET.0.0.2
 quit
 ****
 exim -bh V4NET.0.0.2

+helo test

 mail from:<userx@test.ex>
 rcpt to:<root@test.ex>
 data
 mail from:<userx@test.ex>
 rcpt to:<root@test.ex>
 data

diff --git a/test/scripts/0000-Basic/0092 b/test/scripts/0000-Basic/0092
index d22feebb3653c02f1d880e65ebdc20bc1adbca92..f7ab4e42cdc141037782d70a68a79a50fabb8001 100644 (file)
--- a/test/scripts/0000-Basic/0092
+++ b/test/scripts/0000-Basic/0092
@@ -8,6 +8,7 @@
 # stdin-smtp, cmds then pause in dataphase, smtp command timeout 2s
 1
 3 exim -bs
 # stdin-smtp, cmds then pause in dataphase, smtp command timeout 2s
 1
 3 exim -bs

+helo test

 mail from: userx@test.ex
 rcpt to: userx@test.ex
 data
 mail from: userx@test.ex
 rcpt to: userx@test.ex
 data


@@ -21,6 +22,7 @@ data
 # stdin-smtp, cmds then pause in dataphase, smtp command timeout 2s
 1
 3 exim -bh V4NET.0.0.1
 # stdin-smtp, cmds then pause in dataphase, smtp command timeout 2s
 1
 3 exim -bh V4NET.0.0.1

+helo test

 mail from:userx@test.ex
 rcpt to:userx@test.ex
 data
 mail from:userx@test.ex
 rcpt to:userx@test.ex
 data


@@ -31,6 +33,7 @@ The quick brown fox
 # late-expansion of smtp_receive_timeout
 1
 3 exim -d+expand '-DOPT=${if eq {V4NET.0.0.1} {$sender_host_address} {2} {30}}s' -bh V4NET.0.0.1
 # late-expansion of smtp_receive_timeout
 1
 3 exim -d+expand '-DOPT=${if eq {V4NET.0.0.1} {$sender_host_address} {2} {30}}s' -bh V4NET.0.0.1

+helo test

 mail from:userx@test.ex
 rcpt to:userx@test.ex
 data
 mail from:userx@test.ex
 rcpt to:userx@test.ex
 data


@@ -52,6 +55,7 @@ jumps over the lazy dog.
 # stdin-smtp, cmds then pause before dataphase, smtp command timeout 2s
 1
 3 exim -bh V4NET.0.0.1
 # stdin-smtp, cmds then pause before dataphase, smtp command timeout 2s
 1
 3 exim -bh V4NET.0.0.1

+helo test

 mail from: userx@test.ex
 rcpt to: verify@test.ex
 **** 
 mail from: userx@test.ex
 rcpt to: verify@test.ex
 **** 

diff --git a/test/scripts/0000-Basic/0094 b/test/scripts/0000-Basic/0094
index 87fb5309fc3b6561a10664c22f2f4937d0ea7636..1e9021cd1b8cf01a8ce38a8b67addba6145774cb 100644 (file)
--- a/test/scripts/0000-Basic/0094
+++ b/test/scripts/0000-Basic/0094
@@ -1,16 +1,19 @@
 # Reverse lookup failures
 munge dnssec
 exim -bh V4NET.11.12.13
 # Reverse lookup failures
 munge dnssec
 exim -bh V4NET.11.12.13

+helo test

 mail from:<userx@cam.ac.uk>
 rcpt to:<userx@cam.ac.uk>
 quit
 ****
 exim -bh V4NET.0.0.1
 mail from:<userx@cam.ac.uk>
 rcpt to:<userx@cam.ac.uk>
 quit
 ****
 exim -bh V4NET.0.0.1

+helo test

 mail from:<userx@cam.ac.uk>
 rcpt to:<userx@cam.ac.uk>
 quit
 ****
 sudo exim -odi -oMa V4NET.11.12.13 -bs
 mail from:<userx@cam.ac.uk>
 rcpt to:<userx@cam.ac.uk>
 quit
 ****
 sudo exim -odi -oMa V4NET.11.12.13 -bs

+helo test

 mail from:<userx@test.ex>
 rcpt to:<userx@test.ex>
 data
 mail from:<userx@test.ex>
 rcpt to:<userx@test.ex>
 data


@@ -19,12 +22,14 @@ This is a test message
 quit
 ****
 exim -d -bh V4NET.99.99.90
 quit
 ****
 exim -d -bh V4NET.99.99.90

+helo test

 mail from:<userx@test.ex>
 rcpt to:<userx@test.ex>
 rcpt to:<userx@cam.ac.uk>
 quit
 ****
 sudo exim -odi -oMa 99.99.99.99 -bs
 mail from:<userx@test.ex>
 rcpt to:<userx@test.ex>
 rcpt to:<userx@cam.ac.uk>
 quit
 ****
 sudo exim -odi -oMa 99.99.99.99 -bs

+helo test

 mail from:<userx@test.ex>
 rcpt to:<userx@test.ex>
 data
 mail from:<userx@test.ex>
 rcpt to:<userx@test.ex>
 data


@@ -33,6 +38,7 @@ This is a test message
 quit
 ****
 sudo exim -odi -oMa V4NET.99.99.96 -bs
 quit
 ****
 sudo exim -odi -oMa V4NET.99.99.96 -bs

+helo test

 mail from:<userx@test.ex>
 rcpt to:<userx@test.ex>
 data
 mail from:<userx@test.ex>
 rcpt to:<userx@test.ex>
 data

diff --git a/test/scripts/0000-Basic/0121 b/test/scripts/0000-Basic/0121
index 9daae64480976735b98a67ad085c806c9460e261..85392b6a68c4569ae8130a2da221adf8cf42ec5b 100644 (file)
--- a/test/scripts/0000-Basic/0121
+++ b/test/scripts/0000-Basic/0121
@@ -1,5 +1,6 @@
 # Sender verification SMTP (envelope and header)
 exim -bh 127.0.0.1
 # Sender verification SMTP (envelope and header)
 exim -bh 127.0.0.1

+helo test

 mail from:<unknown@test.ex>
 rcpt to:<userx@test.ex>
 rset
 mail from:<unknown@test.ex>
 rcpt to:<userx@test.ex>
 rset

diff --git a/test/scripts/0000-Basic/0124 b/test/scripts/0000-Basic/0124
index fccedda6b35e850f9b0f006ad9bc1f6ce1722643..3274b613301407ecc0a7a0f123122b42a11977f4 100644 (file)
--- a/test/scripts/0000-Basic/0124
+++ b/test/scripts/0000-Basic/0124
@@ -1,5 +1,6 @@
 # host lookup failure error message
 exim -bh V4NET.0.0.97
 # host lookup failure error message
 exim -bh V4NET.0.0.97

+helo test

 mail from:<userx@test.ex>
 rcpt to:<userx@external.test.ex>
 rset
 mail from:<userx@test.ex>
 rcpt to:<userx@external.test.ex>
 rset

diff --git a/test/scripts/0000-Basic/0127 b/test/scripts/0000-Basic/0127
index 430d425cebe2705f0b35174c57ee1897644347d9..c87989df59faca35dfe8186d1d81da399ded9d2d 100644 (file)
--- a/test/scripts/0000-Basic/0127
+++ b/test/scripts/0000-Basic/0127
@@ -22,6 +22,7 @@ Sender: Sender in original <sender@original.ex>
 This is a test message.
 ****
 exim -bs -odi
 This is a test message.
 ****
 exim -bs -odi

+helo test

 mail from:userx@cus.cam.ac.uk
 rcpt to:userx@test.ex
 data
 mail from:userx@cus.cam.ac.uk
 rcpt to:userx@test.ex
 data


@@ -58,6 +59,7 @@ From: From person <from@some.where>
 This is a test message.
 ****
 exim -bs -odi
 This is a test message.
 ****
 exim -bs -odi

+helo test

 mail from:userx@cus.cam.ac.uk
 rcpt to:userx@test.ex
 data
 mail from:userx@cus.cam.ac.uk
 rcpt to:userx@test.ex
 data

diff --git a/test/scripts/0000-Basic/0130 b/test/scripts/0000-Basic/0130
index 11f0fb71763f93c023208844dacff59271867304..13eb7c2cb21fd87e34c3a489aa5279461595275a 100644 (file)
--- a/test/scripts/0000-Basic/0130
+++ b/test/scripts/0000-Basic/0130
@@ -2,6 +2,7 @@
 need_ipv4
 #
 exim -bh V4NET.0.0.0
 need_ipv4
 #
 exim -bh V4NET.0.0.0

+helo test

 mail from:<userx@test.ex>
 rcpt to:<userx@not.test.ex>
 quit
 mail from:<userx@test.ex>
 rcpt to:<userx@not.test.ex>
 quit

diff --git a/test/scripts/0000-Basic/0136 b/test/scripts/0000-Basic/0136
index 61afd6df6489fe906527a1a6ab71cebbe74e21cc..ebe4ded30a3f7ca52046e296f42dad350b3b037c 100644 (file)
--- a/test/scripts/0000-Basic/0136
+++ b/test/scripts/0000-Basic/0136
@@ -1,5 +1,6 @@
 # errors_to in user filters and bounce_return_body
 exim -odi -bs
 # errors_to in user filters and bounce_return_body
 exim -odi -bs

+helo test

 mail from:<abcd@x.y.z>
 rcpt to:<forwarder@test.ex>
 rcpt to:<forwarder2@test.ex>
 mail from:<abcd@x.y.z>
 rcpt to:<forwarder@test.ex>
 rcpt to:<forwarder2@test.ex>


@@ -9,6 +10,7 @@ Test message.
 quit
 ****
 exim -DBRB=false -odi -bs
 quit
 ****
 exim -DBRB=false -odi -bs

+helo test

 mail from:<abcd@x.y.z>
 rcpt to:<forwarder@test.ex>
 rcpt to:<forwarder2@test.ex>
 mail from:<abcd@x.y.z>
 rcpt to:<forwarder@test.ex>
 rcpt to:<forwarder2@test.ex>

diff --git a/test/scripts/0000-Basic/0145 b/test/scripts/0000-Basic/0145
index 44a37c329f02518833a262c16874591cd67bfbc6..1c624ab42188512d4fef765e0b76ef21c2e4ab85 100644 (file)
--- a/test/scripts/0000-Basic/0145
+++ b/test/scripts/0000-Basic/0145
@@ -3,11 +3,13 @@
 exim -bt x@mxt10.test.ex
 ****
 exim -bh V4NET.9.8.7
 exim -bt x@mxt10.test.ex
 ****
 exim -bh V4NET.9.8.7

+helo test

 mail from:<x@mxt10.test.ex>
 rcpt to:<x@y>
 quit
 ****
 exim -bh V4NET.9.8.7
 mail from:<x@mxt10.test.ex>
 rcpt to:<x@y>
 quit
 ****
 exim -bh V4NET.9.8.7

+helo test

 mail from:<x@ten-1.test.ex>
 rcpt to:<x@mxt10.test.ex>
 quit
 mail from:<x@ten-1.test.ex>
 rcpt to:<x@mxt10.test.ex>
 quit

diff --git a/test/scripts/0000-Basic/0157 b/test/scripts/0000-Basic/0157
index 03d3978930bfce82bcc677904c8f5995d49c6a8f..291cb444be04888db563d3b3d8b16e3057bb124b 100644 (file)
--- a/test/scripts/0000-Basic/0157
+++ b/test/scripts/0000-Basic/0157
@@ -1,5 +1,6 @@
 # relay by sender and host
 exim -bh V4NET.0.0.1
 # relay by sender and host
 exim -bh V4NET.0.0.1

+helo test

 mail from:<x@y.z>
 rcpt to:<a@b.c>
 rset
 mail from:<x@y.z>
 rcpt to:<a@b.c>
 rset


@@ -8,6 +9,7 @@ rcpt to:<a@b.c>
 quit
 ****
 exim -bh V4NET.0.0.2
 quit
 ****
 exim -bh V4NET.0.0.2

+helo test

 mail from:<x@y.z>
 rcpt to:<a@b.c>
 rset
 mail from:<x@y.z>
 rcpt to:<a@b.c>
 rset


@@ -16,6 +18,7 @@ rcpt to:<a@b.c>
 quit
 ****
 exim -bh V4NET.0.0.3
 quit
 ****
 exim -bh V4NET.0.0.3

+helo test

 mail from:<x@y.z>
 rcpt to:<a@b.c>
 rset
 mail from:<x@y.z>
 rcpt to:<a@b.c>
 rset

diff --git a/test/scripts/0000-Basic/0162 b/test/scripts/0000-Basic/0162
index 6b24b20bb126e4daddb1aa056322d17546f90e20..f9f169cbe65ec776370e2a1c46bbb895982c9372 100644 (file)
--- a/test/scripts/0000-Basic/0162
+++ b/test/scripts/0000-Basic/0162
@@ -1,5 +1,6 @@
 # failing header with very long apparent address
 exim -odq -bs
 # failing header with very long apparent address
 exim -odq -bs

+helo test

 mail from:<u2@test.ex>
 rcpt to:<u3@test.ex>
 data
 mail from:<u2@test.ex>
 rcpt to:<u3@test.ex>
 data

diff --git a/test/scripts/0000-Basic/0175 b/test/scripts/0000-Basic/0175
index ef40985867ec5934daba92edf2b4f5f6487c09e4..a1ffcc60bab91b8a0259db204e3178360c1e2cd4 100644 (file)
--- a/test/scripts/0000-Basic/0175
+++ b/test/scripts/0000-Basic/0175
@@ -2,6 +2,7 @@
 need_ipv4
 #
 exim -bh V4NET.0.0.0
 need_ipv4
 #
 exim -bh V4NET.0.0.0

+helo test

 mail from:<user@bad.domain>
 rcpt to:<userx@test.ex>
 data
 mail from:<user@bad.domain>
 rcpt to:<userx@test.ex>
 data


@@ -9,6 +10,7 @@ data
 quit
 ****
 exim -bh V4NET.0.0.0
 quit
 ****
 exim -bh V4NET.0.0.0

+helo test

 mail from:<user@bad.domain2>
 rcpt to:<userx@test.ex>
 data
 mail from:<user@bad.domain2>
 rcpt to:<userx@test.ex>
 data


@@ -16,6 +18,7 @@ data
 quit
 ****
 exim -bh V4NET.0.0.0
 quit
 ****
 exim -bh V4NET.0.0.0

+helo test

 mail from:<user@ten-1.test.ex>
 rcpt to:<userx@test.ex>
 data
 mail from:<user@ten-1.test.ex>
 rcpt to:<userx@test.ex>
 data

diff --git a/test/scripts/0000-Basic/0197 b/test/scripts/0000-Basic/0197
index dc6bb520ec0c7381a07d0e63ba711096f54e5eb7..717b5da5036dd97a60f8c86f04d477385935c135 100644 (file)
--- a/test/scripts/0000-Basic/0197
+++ b/test/scripts/0000-Basic/0197
@@ -6,6 +6,7 @@ Test one.
 .
 ****
 exim -odi -bs
 .
 ****
 exim -odi -bs

+helo test

 mail from:<doesn't@matter>
 rcpt to:<x@copy.domain>
 rcpt to:<y@copy.domain>
 mail from:<doesn't@matter>
 rcpt to:<x@copy.domain>
 rcpt to:<y@copy.domain>

diff --git a/test/scripts/0000-Basic/0202 b/test/scripts/0000-Basic/0202
index 0bba061e78f4c1e50138cf282c820cec349d1fde..04d3f20064942b1b25cf4ef19a44deb30c8ed888 100644 (file)
--- a/test/scripts/0000-Basic/0202
+++ b/test/scripts/0000-Basic/0202
@@ -1,5 +1,6 @@
 # .. in header lines (SMTP and otherwise)
 exim -bs
 # .. in header lines (SMTP and otherwise)
 exim -bs

+HELO test

 MAIL FROM:<userx@test.ex>
 RCPT TO:<userx@test.ex>
 DATA
 MAIL FROM:<userx@test.ex>
 RCPT TO:<userx@test.ex>
 DATA


@@ -11,6 +12,7 @@ This line follows ..
 quit
 ****
 exim -bs
 quit
 ****
 exim -bs

+HELO test

 MAIL FROM:<userx@test.ex>
 RCPT TO:<userx@test.ex>
 DATA
 MAIL FROM:<userx@test.ex>
 RCPT TO:<userx@test.ex>
 DATA

diff --git a/test/scripts/0000-Basic/0212 b/test/scripts/0000-Basic/0212
index 29a8d25aaf455f6b5b55df31e0ed1f342e81f978..b21177ae938799b23f13ab866e37d9af0f58509f 100644 (file)
--- a/test/scripts/0000-Basic/0212
+++ b/test/scripts/0000-Basic/0212
@@ -14,6 +14,7 @@ file
 "smartuser.b@test.ex,a@test.ex"@test.ex
 ****
 exim -bs -oMa V4NET.0.0.0
 "smartuser.b@test.ex,a@test.ex"@test.ex
 ****
 exim -bs -oMa V4NET.0.0.0

+helo test

 mail from:<userx@test.ex>
 rcpt to:<a@test.ex>
 rcpt to:<b@test.ex>
 mail from:<userx@test.ex>
 rcpt to:<a@test.ex>
 rcpt to:<b@test.ex>

diff --git a/test/scripts/0000-Basic/0214 b/test/scripts/0000-Basic/0214
index 7a58a624c909bd100bb844ed448220d7fbc505c7..fb282780e5337c680e1d289700f5f1865e08f03e 100644 (file)
--- a/test/scripts/0000-Basic/0214
+++ b/test/scripts/0000-Basic/0214
@@ -5,6 +5,8 @@ exim -DSERVER=server -bd -oX PORT_D
 ****
 client 127.0.0.1 PORT_D
 ??? 220
 ****
 client 127.0.0.1 PORT_D
 ??? 220

+helo test
+??? 250

 mail from:<x@y.x>
 ??? 250
 rcpt to:<x@test.ex>
 mail from:<x@y.x>
 ??? 250
 rcpt to:<x@test.ex>

diff --git a/test/scripts/0000-Basic/0220 b/test/scripts/0000-Basic/0220
index 2ac40c98da5a4d6f26eb794879b39b02dce6b1f8..b1e81918d6520eabaaa60f7c60ade276bdcb1894 100644 (file)
--- a/test/scripts/0000-Basic/0220
+++ b/test/scripts/0000-Basic/0220
@@ -5,6 +5,7 @@ exim -odi userx
 From foo@bar Fri Jan  5 12:35 GMT 1996
 ****
 exim -odi -bs
 From foo@bar Fri Jan  5 12:35 GMT 1996
 ****
 exim -odi -bs

+HELO test

 MAIL FROM:<foo@bar>
 RCPT TO:<userx@test.ex>
 DATA
 MAIL FROM:<foo@bar>
 RCPT TO:<userx@test.ex>
 DATA

diff --git a/test/scripts/0000-Basic/0221 b/test/scripts/0000-Basic/0221
index d08fc4abd983f0559da65de44a382bdb7ca86ad7..2d4c51978de8687e2acbe97025c3ea8dc52b82ef 100644 (file)
--- a/test/scripts/0000-Basic/0221
+++ b/test/scripts/0000-Basic/0221
@@ -5,6 +5,7 @@ exim -odi userx
 From foo@bar Fri Jan  5 12:35 GMT 1996
 ****
 exim -odi -bs
 From foo@bar Fri Jan  5 12:35 GMT 1996
 ****
 exim -odi -bs

+HELO test

 MAIL FROM:<foo@bar>
 RCPT TO:<userx@test.ex>
 DATA
 MAIL FROM:<foo@bar>
 RCPT TO:<userx@test.ex>
 DATA

diff --git a/test/scripts/0000-Basic/0227 b/test/scripts/0000-Basic/0227
index ac7bcb05cb294567ab974108506d51223c80d30e..e7b6d1ee9df69570a1f732a21791ada8047ee7f5 100644 (file)
--- a/test/scripts/0000-Basic/0227
+++ b/test/scripts/0000-Basic/0227
@@ -14,12 +14,14 @@ QUIT
 ****
 # sender
 sudo exim -v -bs -oMa V4NET.0.0.1
 ****
 # sender
 sudo exim -v -bs -oMa V4NET.0.0.1

+HELO test

 MAIL FROM:<ok@localhost>
 RCPT TO:<z@test.ex>
 QUIT
 ****
 # sender, no callout
 sudo exim -v -bs -oMa V4NET.0.0.2
 MAIL FROM:<ok@localhost>
 RCPT TO:<z@test.ex>
 QUIT
 ****
 # sender, no callout
 sudo exim -v -bs -oMa V4NET.0.0.2

+HELO test

 MAIL FROM:<unchecked@localhost>
 RCPT TO:<z@test.ex>
 QUIT
 MAIL FROM:<unchecked@localhost>
 RCPT TO:<z@test.ex>
 QUIT


@@ -37,6 +39,7 @@ QUIT
 ****
 # sender, refused
 sudo exim -v -bs -oMa V4NET.0.0.1
 ****
 # sender, refused
 sudo exim -v -bs -oMa V4NET.0.0.1

+HELO test

 MAIL FROM:<bad@localhost>
 RCPT TO:<z@test.ex>
 QUIT
 MAIL FROM:<bad@localhost>
 RCPT TO:<z@test.ex>
 QUIT


@@ -54,6 +57,7 @@ QUIT
 ****
 # sender, tmperr
 sudo exim -v -bs -oMa V4NET.0.0.1
 ****
 # sender, tmperr
 sudo exim -v -bs -oMa V4NET.0.0.1

+HELO test

 MAIL FROM:<uncheckable@localhost1>
 RCPT TO:<z@test.ex>
 QUIT
 MAIL FROM:<uncheckable@localhost1>
 RCPT TO:<z@test.ex>
 QUIT


@@ -69,6 +73,7 @@ QUIT
 ****
 # sender, err on mailfrom
 sudo exim -v -bs -oMa V4NET.0.0.1
 ****
 # sender, err on mailfrom
 sudo exim -v -bs -oMa V4NET.0.0.1

+HELO test

 MAIL FROM:<uncheckable2@localhost1>
 RCPT TO:<z@test.ex>
 QUIT
 MAIL FROM:<uncheckable2@localhost1>
 RCPT TO:<z@test.ex>
 QUIT


@@ -85,6 +90,7 @@ QUIT
 ****
 # sender, multiline err on mailfrom
 sudo exim -v -bs -oMa V4NET.0.0.1
 ****
 # sender, multiline err on mailfrom
 sudo exim -v -bs -oMa V4NET.0.0.1

+HELO test

 MAIL FROM:<uncheckable@localhost1>
 RCPT TO:<z@test.ex>
 QUIT
 MAIL FROM:<uncheckable@localhost1>
 RCPT TO:<z@test.ex>
 QUIT


@@ -100,6 +106,7 @@ QUIT
 ****
 # sender, err on mailfrom, with bad char
 sudo exim -v -bs -oMa V4NET.0.0.1
 ****
 # sender, err on mailfrom, with bad char
 sudo exim -v -bs -oMa V4NET.0.0.1

+HELO test

 MAIL FROM:<uncheckable2@localhost1>
 RCPT TO:<z@test.ex>
 QUIT
 MAIL FROM:<uncheckable2@localhost1>
 RCPT TO:<z@test.ex>
 QUIT


@@ -117,6 +124,7 @@ QUIT
 ****
 # recipient, refused
 sudo exim -v -bs -oMa V4NET.0.0.3
 ****
 # recipient, refused
 sudo exim -v -bs -oMa V4NET.0.0.3

+HELO test

 MAIL FROM:<uncheckable@localhost1>
 RCPT TO:<z@remote.domain>
 QUIT
 MAIL FROM:<uncheckable@localhost1>
 RCPT TO:<z@remote.domain>
 QUIT


@@ -135,6 +143,7 @@ QUIT
 ****
 # recipient, refused
 sudo exim -v -bs -oMa V4NET.0.0.3
 ****
 # recipient, refused
 sudo exim -v -bs -oMa V4NET.0.0.3

+HELO test

 MAIL FROM:<uncheckable@localhost1>
 RCPT TO:<z@remote.domain>
 QUIT
 MAIL FROM:<uncheckable@localhost1>
 RCPT TO:<z@remote.domain>
 QUIT


@@ -152,12 +161,14 @@ QUIT
 ****
 # recipient, refused, badchar in resp
 sudo exim -v -bs -oMa V4NET.0.0.3
 ****
 # recipient, refused, badchar in resp
 sudo exim -v -bs -oMa V4NET.0.0.3

+HELO test

 MAIL FROM:<uncheckable@localhost1>
 RCPT TO:<z@remote.domain>
 QUIT
 ****
 # recipient, no conneect
 sudo exim -v -bs -oMa V4NET.0.0.3
 MAIL FROM:<uncheckable@localhost1>
 RCPT TO:<z@remote.domain>
 QUIT
 ****
 # recipient, no conneect
 sudo exim -v -bs -oMa V4NET.0.0.3

+HELO test

 MAIL FROM:<uncheckable@localhost1>
 RCPT TO:<z@remote.domain>
 QUIT
 MAIL FROM:<uncheckable@localhost1>
 RCPT TO:<z@remote.domain>
 QUIT


@@ -174,6 +185,7 @@ QUIT
 250 OK
 ****
 sudo exim -v -bs -oMa V4NET.0.0.4
 250 OK
 ****
 sudo exim -v -bs -oMa V4NET.0.0.4

+HELO test

 MAIL FROM:<uncheckable@localhost1>
 RCPT TO:<z@remote.domain>
 DATA
 MAIL FROM:<uncheckable@localhost1>
 RCPT TO:<z@remote.domain>
 DATA


@@ -193,6 +205,7 @@ QUIT
 250 OK
 ****
 sudo exim -v -bs -oMa V4NET.0.0.4
 250 OK
 ****
 sudo exim -v -bs -oMa V4NET.0.0.4

+HELO test

 MAIL FROM:<uncheckable@localhost1>
 RCPT TO:<z@remote.domain>
 DATA
 MAIL FROM:<uncheckable@localhost1>
 RCPT TO:<z@remote.domain>
 DATA


@@ -218,6 +231,7 @@ QUIT
 250 OK
 ****
 sudo exim -v -bs -oMa V4NET.0.0.5
 250 OK
 ****
 sudo exim -v -bs -oMa V4NET.0.0.5

+HELO test

 MAIL FROM:<ok@localhost1>
 RCPT TO:<z@remote.domain>
 QUIT
 MAIL FROM:<ok@localhost1>
 RCPT TO:<z@remote.domain>
 QUIT


@@ -240,6 +254,7 @@ QUIT
 250 OK
 ****
 sudo exim -v -bs -oMa V4NET.0.0.5
 250 OK
 ****
 sudo exim -v -bs -oMa V4NET.0.0.5

+HELO test

 MAIL FROM:<ok@localhost1>
 RCPT TO:<z@remote.domain>
 QUIT
 MAIL FROM:<ok@localhost1>
 RCPT TO:<z@remote.domain>
 QUIT


@@ -348,6 +363,7 @@ QUIT
 250 OK
 ****
 sudo exim -v -bs -oMa V4NET.0.0.3
 250 OK
 ****
 sudo exim -v -bs -oMa V4NET.0.0.3

+HELO test

 MAIL FROM:<uncheckable@localhost1>
 RCPT TO:<z@remote.lmtp>
 QUIT
 MAIL FROM:<uncheckable@localhost1>
 RCPT TO:<z@remote.lmtp>
 QUIT


@@ -355,11 +371,13 @@ QUIT
 server PORT_S
 ****
 sudo exim -v -bs -oMa V4NET.0.0.1
 server PORT_S
 ****
 sudo exim -v -bs -oMa V4NET.0.0.1

+HELO test

 MAIL FROM:<bad@localhost1>
 RCPT TO:<z@test.ex>
 QUIT
 ****
 sudo exim -v -bs -oMa V4NET.0.0.1
 MAIL FROM:<bad@localhost1>
 RCPT TO:<z@test.ex>
 QUIT
 ****
 sudo exim -v -bs -oMa V4NET.0.0.1

+HELO test

 MAIL FROM:<bad@localhost1>
 RCPT TO:<z@test.ex>
 QUIT
 MAIL FROM:<bad@localhost1>
 RCPT TO:<z@test.ex>
 QUIT

diff --git a/test/scripts/0000-Basic/0230 b/test/scripts/0000-Basic/0230
index 92ef10c51cdb69564bf1aab5df69513a5571ead9..11df58621b76bd5f1bca0a8508b334104e990c76 100644 (file)
--- a/test/scripts/0000-Basic/0230
+++ b/test/scripts/0000-Basic/0230
@@ -5,6 +5,8 @@ exim -DSERVER=server -bd -oX PORT_D
 ****
 client HOSTIPV4 PORT_D
 ??? 220
 ****
 client HOSTIPV4 PORT_D
 ??? 220

+helo test
+??? 250

 mail from:<x@y.x>
 ??? 250
 rcpt to:<x@test.ex>
 mail from:<x@y.x>
 ??? 250
 rcpt to:<x@test.ex>


@@ -19,6 +21,8 @@ quit
 ****
 client 127.0.0.1 PORT_D
 ??? 220
 ****
 client 127.0.0.1 PORT_D
 ??? 220

+helo test
+??? 250

 mail from:<x@y.x>
 ??? 250
 rcpt to:<x@test.ex>
 mail from:<x@y.x>
 ??? 250
 rcpt to:<x@test.ex>


@@ -48,6 +52,7 @@ quit
 ****
 killdaemon
 sudo exim -bs -oMa V4NET.9.8.7.1234
 ****
 killdaemon
 sudo exim -bs -oMa V4NET.9.8.7.1234

+helo test

 mail from:<x@y.x>
 rcpt to:<x@test.ex>
 data
 mail from:<x@y.x>
 rcpt to:<x@test.ex>
 data


@@ -68,6 +73,7 @@ quit
 exim -DSERVER=server -bd -oX PORT_D
 ****
 sudo exim -DOPT -bs -oMa V4NET.9.8.7.1225
 exim -DSERVER=server -bd -oX PORT_D
 ****
 sudo exim -DOPT -bs -oMa V4NET.9.8.7.1225

+helo test

 mail from:<x@y.x>
 rcpt to:<x@test.ex>
 data
 mail from:<x@y.x>
 rcpt to:<x@test.ex>
 data

diff --git a/test/scripts/0000-Basic/0233 b/test/scripts/0000-Basic/0233
index 13726815c6a8724ef6f741c0b21862ec06abe572..bda2e689aea6b9e631c7f685565bb034946de6a7 100644 (file)
--- a/test/scripts/0000-Basic/0233
+++ b/test/scripts/0000-Basic/0233
@@ -5,6 +5,7 @@ Rhubarb
 ****
 # ACL freezes these two, tell for the second, and third, not for the first
 exim -odi -bs
 ****
 # ACL freezes these two, tell for the second, and third, not for the first
 exim -odi -bs

+helo test

 mail from:<a@test.ex>
 rcpt to:<userz@test.ex>
 data
 mail from:<a@test.ex>
 rcpt to:<userz@test.ex>
 data

diff --git a/test/scripts/0000-Basic/0234 b/test/scripts/0000-Basic/0234
index 41eaafa722c8871153459314cbb2e678bc80d960..018421333652da48b8863fc33bbdcc4ace90570c 100644 (file)
--- a/test/scripts/0000-Basic/0234
+++ b/test/scripts/0000-Basic/0234
@@ -2,6 +2,7 @@
 need_ipv4
 #
 exim -bh V4NET.0.0.0
 need_ipv4
 #
 exim -bh V4NET.0.0.0

+helo test

 mail from:<a@b>
 rcpt to:<c@d>
 rcpt to:<e@mxt1.test.ex>
 mail from:<a@b>
 rcpt to:<c@d>
 rcpt to:<e@mxt1.test.ex>


@@ -9,6 +10,7 @@ rcpt to:<f@mxt6.test.ex>
 quit
 ****
 sudo exim -bs -oMa V4NET.0.0.0
 quit
 ****
 sudo exim -bs -oMa V4NET.0.0.0

+helo test

 mail from:<a@b>
 rcpt to:<c@d>
 rcpt to:<e@mxt1.test.ex>
 mail from:<a@b>
 rcpt to:<c@d>
 rcpt to:<e@mxt1.test.ex>

diff --git a/test/scripts/0000-Basic/0251 b/test/scripts/0000-Basic/0251
index 457154389f9ea5ff5b8d96bf3d6e447fc8e507c6..dad25e39a5bcf3f0912bf534404523a4cc0efb60 100644 (file)
--- a/test/scripts/0000-Basic/0251
+++ b/test/scripts/0000-Basic/0251
@@ -2,6 +2,7 @@
 need_ipv4
 #
 exim -bh V4NET.0.0.0
 need_ipv4
 #
 exim -bh V4NET.0.0.0

+helo test

 mail from:<ok@sender>
 rcpt to:<oklist@listr.test.ex>
 rset
 mail from:<ok@sender>
 rcpt to:<oklist@listr.test.ex>
 rset


@@ -13,6 +14,8 @@ exim -DSERVER=server -bd -oX PORT_D
 ****
 client HOSTIPV4 PORT_D
 ??? 220
 ****
 client HOSTIPV4 PORT_D
 ??? 220

+helo test
+??? 250

 mail from:<ok@sender>
 ??? 250
 rcpt to:<oklist@listr.test.ex>
 mail from:<ok@sender>
 ??? 250
 rcpt to:<oklist@listr.test.ex>

diff --git a/test/scripts/0000-Basic/0256 b/test/scripts/0000-Basic/0256
index bdab73b3365889b765e7d3dd9982dfd8c123e14f..b29dabf263d9ffa893745302dc2394d0505546a0 100644 (file)
--- a/test/scripts/0000-Basic/0256
+++ b/test/scripts/0000-Basic/0256
@@ -3,6 +3,7 @@ exim -odi unknown
 .
 ****
 exim -odi -bs
 .
 ****
 exim -odi -bs

+helo test

 mail from:<"abc@def"@unknown.domain>
 rcpt to:<unknown@test.ex>
 data
 mail from:<"abc@def"@unknown.domain>
 rcpt to:<unknown@test.ex>
 data

diff --git a/test/scripts/0000-Basic/0281 b/test/scripts/0000-Basic/0281
index ae5624792ab2fbc58a7e3d2376f05f69c24a866e..f8de7f7f58bbecbfda9d85fcff5dfe8e436701a1 100644 (file)
--- a/test/scripts/0000-Basic/0281
+++ b/test/scripts/0000-Basic/0281
@@ -1,5 +1,6 @@
 # @ items in domain lists and host lists
 exim -bh V4NET.1.1.1
 # @ items in domain lists and host lists
 exim -bh V4NET.1.1.1

+helo test

 mail from:<x@y>
 rcpt to:<1@myhost.test.ex>
 rcpt to:<1@[127.0.0.1]>
 mail from:<x@y>
 rcpt to:<1@myhost.test.ex>
 rcpt to:<1@[127.0.0.1]>


@@ -21,16 +22,19 @@ rcpt to:<5@myhost.test.ex>
 quit
 ****
 exim -bh V4NET.10.10.10
 quit
 ****
 exim -bh V4NET.10.10.10

+helo test

 mail from:<x@y>
 rcpt to:<5@myhost.test.ex>
 quit
 ****
 exim -bh 127.0.0.1
 mail from:<x@y>
 rcpt to:<5@myhost.test.ex>
 quit
 ****
 exim -bh 127.0.0.1

+helo test

 mail from:<x@y>
 rcpt to:<5@myhost.test.ex>
 quit
 ****
 exim -bh V4NET.1.1.1
 mail from:<x@y>
 rcpt to:<5@myhost.test.ex>
 quit
 ****
 exim -bh V4NET.1.1.1

+helo test

 mail from:<x@y>
 rcpt to:<2@mxt3.test.ex>
 rcpt to:<3@mxt3.test.ex>
 mail from:<x@y>
 rcpt to:<2@mxt3.test.ex>
 rcpt to:<3@mxt3.test.ex>

diff --git a/test/scripts/0000-Basic/0293 b/test/scripts/0000-Basic/0293
index 1593535301a9afde428b145db06c851c52b9a429..2e50aad835e7bf59dc9fcbae0082ba2f055d8eb4 100644 (file)
--- a/test/scripts/0000-Basic/0293
+++ b/test/scripts/0000-Basic/0293
@@ -1,17 +1,19 @@
 # smtp_accept_{max,queue}_per_connection
 exim -odi -v -bs
 # smtp_accept_{max,queue}_per_connection
 exim -odi -v -bs

-mail from:<x@y>
+helo test
+mail from:<x1@y>

 rcpt to:<one@z>
 data
 .
 rcpt to:<one@z>
 data
 .

-mail from:<x@y>
+mail from:<x2@y>

 rcpt to:<two@z>
 data
 .
 rcpt to:<two@z>
 data
 .

-mail from:<x@y>
+mail from:<x3@y>

 quit
 ****
 exim -odi -v -bs
 quit
 ****
 exim -odi -v -bs

+helo test

 mail from:<x@y>
 rset
 mail from:<x@y>
 mail from:<x@y>
 rset
 mail from:<x@y>

diff --git a/test/scripts/0000-Basic/0294 b/test/scripts/0000-Basic/0294
index bbb595dddf08307199500c2f3986ff9b26cec41c..62f8ae2099d675d13488887f85b2fdf683709e87 100644 (file)
--- a/test/scripts/0000-Basic/0294
+++ b/test/scripts/0000-Basic/0294
@@ -1,5 +1,6 @@
 # SMTP rate limiting using smtp_ratelimit_xxx settings
 exim -d-all+receive -odq -bs
 # SMTP rate limiting using smtp_ratelimit_xxx settings
 exim -d-all+receive -odq -bs

+helo test

 mail from:<x@y>
 rcpt to:<one@z>
 rcpt to:<one@z>
 mail from:<x@y>
 rcpt to:<one@z>
 rcpt to:<one@z>


@@ -16,18 +17,21 @@ mail from:<x@y>
 quit
 ****
 exim -d-all+receive -bh 1.2.3.4
 quit
 ****
 exim -d-all+receive -bh 1.2.3.4

+helo test

 mail from:<x@y>
 rcpt to:<one@z>
 rcpt to:<one@z>
 quit
 ****
 exim -d-all+receive -bh V4NET.9.8.7
 mail from:<x@y>
 rcpt to:<one@z>
 rcpt to:<one@z>
 quit
 ****
 exim -d-all+receive -bh V4NET.9.8.7

+helo test

 mail from:<x@y>
 rcpt to:<one@z>
 rcpt to:<one@z>
 quit
 ****
 exim -d-all+receive -odq -bs
 mail from:<x@y>
 rcpt to:<one@z>
 rcpt to:<one@z>
 quit
 ****
 exim -d-all+receive -odq -bs

+helo test

 mail from:<x@y>
 rcpt to:<reject@z>
 rcpt to:<reject@z>
 mail from:<x@y>
 rcpt to:<reject@z>
 rcpt to:<reject@z>

diff --git a/test/scripts/0000-Basic/0304 b/test/scripts/0000-Basic/0304
index 8b1c39d0f9280881e0f7818b39458b7f1a2fd14e..3de690733ad5bd20753784b410572fa0d7d6287a 100644 (file)
--- a/test/scripts/0000-Basic/0304
+++ b/test/scripts/0000-Basic/0304
@@ -1,5 +1,6 @@
 # address lists
 exim -bh 1.2.3.4
 # address lists
 exim -bh 1.2.3.4

+helo test

 mail from:<>
 rcpt to:<b1@x>
 rcpt to:<b2@x>
 mail from:<>
 rcpt to:<b1@x>
 rcpt to:<b2@x>

diff --git a/test/scripts/0000-Basic/0305 b/test/scripts/0000-Basic/0305
index e6b752363ea27eecb73979212f858b62b051f5bc..191470cfc703fe78bcab23b969c853dbeb3fef3e 100644 (file)
--- a/test/scripts/0000-Basic/0305
+++ b/test/scripts/0000-Basic/0305
@@ -1,5 +1,6 @@
 # expansion in domain lists
 exim -bh V4NET.2.3.4
 # expansion in domain lists
 exim -bh V4NET.2.3.4

+helo test

 mail from:<x@y>
 rcpt to:<x@ten-1.test.ex>
 rcpt to:<x@junk.junk>
 mail from:<x@y>
 rcpt to:<x@ten-1.test.ex>
 rcpt to:<x@junk.junk>

diff --git a/test/scripts/0000-Basic/0306 b/test/scripts/0000-Basic/0306
index 8a2dc91104eb32b9b94d007cace8dc42b2047365..9aeb02b60514f0633b8918827fb80a0c0937b464 100644 (file)
--- a/test/scripts/0000-Basic/0306
+++ b/test/scripts/0000-Basic/0306
@@ -8,6 +8,7 @@ exim -odi -f anyone@anywhere list1@lists.test.ex
 exim -odi -f anyone@anywhere nonlist@lists.test.ex
 ****
 exim -bh 1.2.3.4
 exim -odi -f anyone@anywhere nonlist@lists.test.ex
 ****
 exim -bh 1.2.3.4

+helo test

 mail from:<anyone@anywhere>
 rcpt to:<list1-request@lists.test.ex>
 rset
 mail from:<anyone@anywhere>
 rcpt to:<list1-request@lists.test.ex>
 rset

diff --git a/test/scripts/0000-Basic/0308 b/test/scripts/0000-Basic/0308
index 39b9ba259f891ad27aa633bfebf4464c2c42b1de..4e0a2040843711bd8297e0243df4f8399dfc5089 100644 (file)
--- a/test/scripts/0000-Basic/0308
+++ b/test/scripts/0000-Basic/0308
@@ -1,10 +1,12 @@
 # host lists and unknown host names - maximal checking
 exim -bh V4NET.0.0.97
 # host lists and unknown host names - maximal checking
 exim -bh V4NET.0.0.97

+helo test

 mail from:<x@y>
 rcpt to:<z@z>
 quit
 ****
 exim -bh V4NET.0.0.1
 mail from:<x@y>
 rcpt to:<z@z>
 quit
 ****
 exim -bh V4NET.0.0.1

+helo test

 mail from:<x@y>
 rcpt to:<z@z>
 quit
 mail from:<x@y>
 rcpt to:<z@z>
 quit

diff --git a/test/scripts/0000-Basic/0312 b/test/scripts/0000-Basic/0312
index 19cab2c0ab5728369aae2c0b4dba348b1e00e152..757aab2260fd60d035d63a3d37338587e974da8a 100644 (file)
--- a/test/scripts/0000-Basic/0312
+++ b/test/scripts/0000-Basic/0312
@@ -1,5 +1,6 @@
 # RBL timeout logging
 exim -bh V4NET.0.0.1
 # RBL timeout logging
 exim -bh V4NET.0.0.1

+helo test

 mail from:<userx@x>
 rcpt to:<userx@y>
 quit
 mail from:<userx@x>
 rcpt to:<userx@y>
 quit

diff --git a/test/scripts/0000-Basic/0320 b/test/scripts/0000-Basic/0320
index c031567effdf36a83954cea676ae1db4ae5a4512..0da983742529ed1c6262a59cd3f3c7208cfaf872 100644 (file)
--- a/test/scripts/0000-Basic/0320
+++ b/test/scripts/0000-Basic/0320
@@ -1,5 +1,6 @@
 # comments and +caseful in local part lists
 exim -odq -bs
 # comments and +caseful in local part lists
 exim -odq -bs

+helo test

 mail from:<x@y>
 rcpt to:<lp1@z>
 rcpt to:<LP1@z>
 mail from:<x@y>
 rcpt to:<lp1@z>
 rcpt to:<LP1@z>

diff --git a/test/scripts/0000-Basic/0325 b/test/scripts/0000-Basic/0325
index a81abd6bcdec58e1562ad2b05ae3a16e1168eec0..76577f5236ee96c182c7847d92700ae4c6f9e878 100644 (file)
--- a/test/scripts/0000-Basic/0325
+++ b/test/scripts/0000-Basic/0325
@@ -2,6 +2,7 @@
 exim -v -bt xxx@a.b.c
 ****
 exim -bh V4NET.0.0.0
 exim -v -bt xxx@a.b.c
 ****
 exim -bh V4NET.0.0.0

+helo test

 mail from:a@b.c
 rcpt to:xxx@a.b.c
 quit
 mail from:a@b.c
 rcpt to:xxx@a.b.c
 quit

diff --git a/test/scripts/0000-Basic/0340 b/test/scripts/0000-Basic/0340
index a4ee6ad66ca87587ac6c66f7c8a389b6832a6b97..c6e36cea4091409ccee2ff8d30a67da3a90b0953 100644 (file)
--- a/test/scripts/0000-Basic/0340
+++ b/test/scripts/0000-Basic/0340
@@ -1,5 +1,6 @@
 # dnslist when no host address
 exim -bs
 # dnslist when no host address
 exim -bs

+helo test

 mail from:<userx@test.ex>
 rcpt to:<userx@test.again.dns>
 quit
 mail from:<userx@test.ex>
 rcpt to:<userx@test.again.dns>
 quit

diff --git a/test/scripts/0000-Basic/0342 b/test/scripts/0000-Basic/0342
index 0b4016293184f31763620a961d68aa20645389cb..e3332e78e3ddff77156fa64f2a9010ba757be617 100644 (file)
--- a/test/scripts/0000-Basic/0342
+++ b/test/scripts/0000-Basic/0342
@@ -2,6 +2,7 @@
 need_ipv4
 #
 exim -bh 1.2.3.4
 need_ipv4
 #
 exim -bh 1.2.3.4

+helo test

 mail from:<x@y>
 rcpt to:<x@ten-1>
 quit
 mail from:<x@y>
 rcpt to:<x@ten-1>
 quit

diff --git a/test/scripts/0000-Basic/0362 b/test/scripts/0000-Basic/0362
index 60d5155e30d282a3b0bb0c1d755120b467032a7d..904e4c93697018ff25bd70b670a6ea71494ecd31 100644 (file)
--- a/test/scripts/0000-Basic/0362
+++ b/test/scripts/0000-Basic/0362
@@ -2,6 +2,7 @@
 need_ipv4
 #
 exim -d -bh V4NET.0.0.0
 need_ipv4
 #
 exim -d -bh V4NET.0.0.0

+helo test

 mail from:<x@y>
 rcpt to:<x@a.b.c>
 quit
 mail from:<x@y>
 rcpt to:<x@a.b.c>
 quit

diff --git a/test/scripts/0000-Basic/0365 b/test/scripts/0000-Basic/0365
index 0697f1e0d165884c0d952d98fc0f39e6420ff262..81cef224a4536f89dada2948768ae289dce30c5a 100644 (file)
--- a/test/scripts/0000-Basic/0365
+++ b/test/scripts/0000-Basic/0365
@@ -2,6 +2,7 @@
 need_ipv4
 #
 exim -bs
 need_ipv4
 #
 exim -bs

+helo test

 mail from:<>
 rcpt to:<x@y>
 data
 mail from:<>
 rcpt to:<x@y>
 data


@@ -37,6 +38,7 @@ rset
 quit
 ****
 exim -DDETAILS=true -DSELECTOR=-rejected_header -bs
 quit
 ****
 exim -DDETAILS=true -DSELECTOR=-rejected_header -bs

+helo test

 mail from:<>
 rcpt to:<x@y>
 data
 mail from:<>
 rcpt to:<x@y>
 data

diff --git a/test/scripts/0000-Basic/0372 b/test/scripts/0000-Basic/0372
index 1bd39c758f3e6afb8837007e5f576f305ebb9c4e..4c77759cd6f5ccc18c8602c4d00afbc8f5a5f11b 100644 (file)
--- a/test/scripts/0000-Basic/0372
+++ b/test/scripts/0000-Basic/0372
@@ -1,5 +1,6 @@
 # Preservation of ACL variables
 exim -v -odi -bs -oMa 1.2.3.4 -oMs host.name
 # Preservation of ACL variables
 exim -v -odi -bs -oMa 1.2.3.4 -oMs host.name

+helo test

 mail from:<>
 rcpt to:<x@y>
 data
 mail from:<>
 rcpt to:<x@y>
 data


@@ -11,6 +12,7 @@ data
 quit
 ****
 exim -DSTRICT=strict_acl_vars -odi -bs -oMa 4.3.2.1 -oMs host2.name
 quit
 ****
 exim -DSTRICT=strict_acl_vars -odi -bs -oMa 4.3.2.1 -oMs host2.name

+helo test

 mail from:<>
 rcpt to:<a@b>
 data
 mail from:<>
 rcpt to:<a@b>
 data

diff --git a/test/scripts/0000-Basic/0376 b/test/scripts/0000-Basic/0376
index 88eec49f50f4bf788e43fcd4bdfda25420e23198..d6107e0461e49e0a8f3baf90506da09440113fd8 100644 (file)
--- a/test/scripts/0000-Basic/0376
+++ b/test/scripts/0000-Basic/0376
@@ -13,11 +13,13 @@ QUIT
 250 OK
 ****
 sudo exim -d-all+verify -v -bs -oMa V4NET.0.0.1
 250 OK
 ****
 sudo exim -d-all+verify -v -bs -oMa V4NET.0.0.1

+HELO test

 MAIL FROM:<ok@localhost>
 RCPT TO:<z@test.ex>
 QUIT
 ****
 sudo exim -d-all+verify -v -bs -oMa V4NET.0.0.1
 MAIL FROM:<ok@localhost>
 RCPT TO:<z@test.ex>
 QUIT
 ****
 sudo exim -d-all+verify -v -bs -oMa V4NET.0.0.1

+HELO test

 MAIL FROM:<ok@localhost>
 RCPT TO:<z@test.ex>
 QUIT
 MAIL FROM:<ok@localhost>
 RCPT TO:<z@test.ex>
 QUIT


@@ -26,6 +28,7 @@ QUIT
 sleep 2
 # Should want to connect, but fail
 sudo exim -d-all+verify -v -bs -oMa V4NET.0.0.1
 sleep 2
 # Should want to connect, but fail
 sudo exim -d-all+verify -v -bs -oMa V4NET.0.0.1

+HELO test

 MAIL FROM:<ok@localhost>
 RCPT TO:<z@test.ex>
 QUIT
 MAIL FROM:<ok@localhost>
 RCPT TO:<z@test.ex>
 QUIT


@@ -43,11 +46,13 @@ QUIT
 250 OK
 ****
 sudo exim -d-all+verify -v -bs -oMa V4NET.0.0.1
 250 OK
 ****
 sudo exim -d-all+verify -v -bs -oMa V4NET.0.0.1

+HELO test

 MAIL FROM:<bad@localhost>
 RCPT TO:<z@test.ex>
 QUIT
 ****
 sudo exim -d-all+verify -v -bs -oMa V4NET.0.0.1
 MAIL FROM:<bad@localhost>
 RCPT TO:<z@test.ex>
 QUIT
 ****
 sudo exim -d-all+verify -v -bs -oMa V4NET.0.0.1

+HELO test

 MAIL FROM:<bad@localhost>
 RCPT TO:<z@test.ex>
 QUIT
 MAIL FROM:<bad@localhost>
 RCPT TO:<z@test.ex>
 QUIT


@@ -63,11 +68,13 @@ QUIT
 250 OK
 ****
 sudo exim -d-all+verify -v -bs -oMa V4NET.0.0.1
 250 OK
 ****
 sudo exim -d-all+verify -v -bs -oMa V4NET.0.0.1

+HELO test

 MAIL FROM:<ok@localhost>
 RCPT TO:<z@test.ex>
 QUIT
 ****
 sudo exim -d-all+verify -v -bs -oMa V4NET.0.0.1
 MAIL FROM:<ok@localhost>
 RCPT TO:<z@test.ex>
 QUIT
 ****
 sudo exim -d-all+verify -v -bs -oMa V4NET.0.0.1

+HELO test

 MAIL FROM:<ok@localhost>
 RCPT TO:<z@test.ex>
 QUIT
 MAIL FROM:<ok@localhost>
 RCPT TO:<z@test.ex>
 QUIT


@@ -91,11 +98,13 @@ QUIT
 250 OK
 ****
 sudo exim -d-all+verify -v -bs -oMa V4NET.0.0.2
 250 OK
 ****
 sudo exim -d-all+verify -v -bs -oMa V4NET.0.0.2

+HELO test

 MAIL FROM:<ok@otherhost>
 RCPT TO:<z@test.ex>
 QUIT
 ****
 sudo exim -d-all+verify -v -bs -oMa V4NET.0.0.2
 MAIL FROM:<ok@otherhost>
 RCPT TO:<z@test.ex>
 QUIT
 ****
 sudo exim -d-all+verify -v -bs -oMa V4NET.0.0.2

+HELO test

 MAIL FROM:<ok@otherhost>
 RCPT TO:<z@test.ex>
 QUIT
 MAIL FROM:<ok@otherhost>
 RCPT TO:<z@test.ex>
 QUIT


@@ -119,11 +128,13 @@ QUIT
 250 OK
 ****
 sudo exim -d-all+verify -v -bs -oMa V4NET.0.0.2
 250 OK
 ****
 sudo exim -d-all+verify -v -bs -oMa V4NET.0.0.2

+HELO test

 MAIL FROM:<ok@otherhost2>
 RCPT TO:<z@test.ex>
 QUIT
 ****
 sudo exim -d-all+verify -v -bs -oMa V4NET.0.0.2
 MAIL FROM:<ok@otherhost2>
 RCPT TO:<z@test.ex>
 QUIT
 ****
 sudo exim -d-all+verify -v -bs -oMa V4NET.0.0.2

+HELO test

 MAIL FROM:<ok@otherhost2>
 RCPT TO:<z@test.ex>
 QUIT
 MAIL FROM:<ok@otherhost2>
 RCPT TO:<z@test.ex>
 QUIT


@@ -141,11 +152,13 @@ QUIT
 250 OK
 ****
 sudo exim -d-all+verify -v -bs -oMa V4NET.0.0.3
 250 OK
 ****
 sudo exim -d-all+verify -v -bs -oMa V4NET.0.0.3

+HELO test

 MAIL FROM:<ok@otherhost3>
 RCPT TO:<z@test.ex>
 QUIT
 ****
 sudo exim -d-all+verify -v -bs -oMa V4NET.0.0.3
 MAIL FROM:<ok@otherhost3>
 RCPT TO:<z@test.ex>
 QUIT
 ****
 sudo exim -d-all+verify -v -bs -oMa V4NET.0.0.3

+HELO test

 MAIL FROM:<otherok@otherhost3>
 RCPT TO:<z@test.ex>
 QUIT
 MAIL FROM:<otherok@otherhost3>
 RCPT TO:<z@test.ex>
 QUIT


@@ -163,11 +176,13 @@ QUIT
 250 OK
 ****
 sudo exim -d-all+verify -v -bs -oMa V4NET.0.0.4
 250 OK
 ****
 sudo exim -d-all+verify -v -bs -oMa V4NET.0.0.4

+HELO test

 MAIL FROM:<ok@otherhost4>
 RCPT TO:<z@test.ex>
 QUIT
 ****
 sudo exim -d-all+verify -v -bs -oMa V4NET.0.0.4
 MAIL FROM:<ok@otherhost4>
 RCPT TO:<z@test.ex>
 QUIT
 ****
 sudo exim -d-all+verify -v -bs -oMa V4NET.0.0.4

+HELO test

 MAIL FROM:<ok@otherhost4>
 RCPT TO:<z@test.ex>
 QUIT
 MAIL FROM:<ok@otherhost4>
 RCPT TO:<z@test.ex>
 QUIT


@@ -197,11 +212,13 @@ QUIT
 250 OK
 ****
 sudo exim -d-all+verify -v -bs -oMa V4NET.0.0.4
 250 OK
 ****
 sudo exim -d-all+verify -v -bs -oMa V4NET.0.0.4

+HELO test

 MAIL FROM:<ok@otherhost41>
 RCPT TO:<z@test.ex>
 QUIT
 ****
 sudo exim -d-all+verify -v -bs -oMa V4NET.0.0.4
 MAIL FROM:<ok@otherhost41>
 RCPT TO:<z@test.ex>
 QUIT
 ****
 sudo exim -d-all+verify -v -bs -oMa V4NET.0.0.4

+HELO test

 MAIL FROM:<ok@otherhost41>
 RCPT TO:<z@test.ex>
 QUIT
 MAIL FROM:<ok@otherhost41>
 RCPT TO:<z@test.ex>
 QUIT


@@ -226,6 +243,7 @@ QUIT
 250 OK
 ****
 sudo exim -d-all+verify -v -bs -oMa V4NET.0.0.2
 250 OK
 ****
 sudo exim -d-all+verify -v -bs -oMa V4NET.0.0.2

+HELO test

 MAIL FROM:<ok@otherhost21>
 RCPT TO:<z@test.ex>
 QUIT
 MAIL FROM:<ok@otherhost21>
 RCPT TO:<z@test.ex>
 QUIT


@@ -242,6 +260,7 @@ QUIT
 250 OK
 ****
 sudo exim -d-all+verify -v -bs -oMa V4NET.0.0.2
 250 OK
 ****
 sudo exim -d-all+verify -v -bs -oMa V4NET.0.0.2

+HELO test

 MAIL FROM:<ok2@otherhost21>
 RCPT TO:<z@test.ex>
 QUIT
 MAIL FROM:<ok2@otherhost21>
 RCPT TO:<z@test.ex>
 QUIT


@@ -265,6 +284,7 @@ QUIT
 250 OK
 ****
 sudo exim -d-all+verify -v -bs -oMa V4NET.0.0.3
 250 OK
 ****
 sudo exim -d-all+verify -v -bs -oMa V4NET.0.0.3

+HELO test

 MAIL FROM:<ok@otherhost31>
 RCPT TO:<z@test.ex>
 QUIT
 MAIL FROM:<ok@otherhost31>
 RCPT TO:<z@test.ex>
 QUIT


@@ -281,6 +301,7 @@ QUIT
 250 OK
 ****
 sudo exim -d-all+verify -v -bs -oMa V4NET.0.0.3
 250 OK
 ****
 sudo exim -d-all+verify -v -bs -oMa V4NET.0.0.3

+HELO test

 MAIL FROM:<okok@otherhost31>
 RCPT TO:<z@test.ex>
 QUIT
 MAIL FROM:<okok@otherhost31>
 RCPT TO:<z@test.ex>
 QUIT


@@ -305,6 +326,7 @@ QUIT
 250 OK
 ****
 sudo exim -DPEX=1s -d-all+verify -v -bs -oMa V4NET.0.0.3
 250 OK
 ****
 sudo exim -DPEX=1s -d-all+verify -v -bs -oMa V4NET.0.0.3

+HELO test

 MAIL FROM:<okokok@otherhost31>
 RCPT TO:<z@test.ex>
 QUIT
 MAIL FROM:<okokok@otherhost31>
 RCPT TO:<z@test.ex>
 QUIT


@@ -320,6 +342,7 @@ RCPT TO
 *sleep 2
 ****
 sudo exim -d-all+verify -v -bs -oMa V4NET.0.0.5
 *sleep 2
 ****
 sudo exim -d-all+verify -v -bs -oMa V4NET.0.0.5

+HELO test

 MAIL FROM:<okok@otherhost51>
 RCPT TO:<z@test.ex>
 QUIT
 MAIL FROM:<okok@otherhost51>
 RCPT TO:<z@test.ex>
 QUIT


@@ -343,6 +366,7 @@ QUIT
 250 OK
 ****
 sudo exim -d-all+verify -v -bs -oMa V4NET.0.0.6
 250 OK
 ****
 sudo exim -d-all+verify -v -bs -oMa V4NET.0.0.6

+HELO test

 MAIL FROM:<okokok@otherhost52>
 RCPT TO:<z@test.ex>
 QUIT
 MAIL FROM:<okokok@otherhost52>
 RCPT TO:<z@test.ex>
 QUIT


@@ -360,6 +384,7 @@ QUIT
 250 OK
 ****
 sudo exim -d-all+verify -odq -v -bs -oMa V4NET.0.0.7
 250 OK
 ****
 sudo exim -d-all+verify -odq -v -bs -oMa V4NET.0.0.7

+HELO test

 MAIL FROM:<ok7@otherhost53>
 RCPT TO:<z@test.ex>
 DATA
 MAIL FROM:<ok7@otherhost53>
 RCPT TO:<z@test.ex>
 DATA


@@ -378,6 +403,7 @@ RCPT TO
 *sleep 2
 ****
 sudo exim -d-all+verify -odq -v -bs -oMa V4NET.0.0.8
 *sleep 2
 ****
 sudo exim -d-all+verify -odq -v -bs -oMa V4NET.0.0.8

+HELO test

 MAIL FROM:<ok7@otherhost53>
 RCPT TO:<z@test.ex>
 DATA
 MAIL FROM:<ok7@otherhost53>
 RCPT TO:<z@test.ex>
 DATA


@@ -406,6 +432,7 @@ QUIT
 250 OK
 ****
 sudo exim -d-all+verify -v -bs -oMa V4NET.0.0.9
 250 OK
 ****
 sudo exim -d-all+verify -v -bs -oMa V4NET.0.0.9

+HELO test

 MAIL FROM:<ok@otherhost9>
 RCPT TO:<z@test.ex>
 QUIT
 MAIL FROM:<ok@otherhost9>
 RCPT TO:<z@test.ex>
 QUIT


@@ -435,6 +462,7 @@ QUIT
 250 OK
 ****
 sudo exim -d-all+verify -v -bs -oMa V4NET.0.0.10
 250 OK
 ****
 sudo exim -d-all+verify -v -bs -oMa V4NET.0.0.10

+HELO test

 MAIL FROM:<ok@otherhost10>
 RCPT TO:<z@test.ex>
 QUIT
 MAIL FROM:<ok@otherhost10>
 RCPT TO:<z@test.ex>
 QUIT

diff --git a/test/scripts/0000-Basic/0381 b/test/scripts/0000-Basic/0381
index 738b0661de934f0d268c1471b05ae4992f9f148e..28dfbcdfab2918baaad1d36b148521f79b2591ea 100644 (file)
--- a/test/scripts/0000-Basic/0381
+++ b/test/scripts/0000-Basic/0381
@@ -1,6 +1,7 @@
 # negatives with wildcard hosts when host has multiple names
 munge dnssec
 exim -d -bs -oMa V4NET.99.99.97
 # negatives with wildcard hosts when host has multiple names
 munge dnssec
 exim -d -bs -oMa V4NET.99.99.97

+helo test

 mail from:<notgov@test.ex>
 rcpt to:<x@test.ex>
 quit
 mail from:<notgov@test.ex>
 rcpt to:<x@test.ex>
 quit

diff --git a/test/scripts/0000-Basic/0386 b/test/scripts/0000-Basic/0386
index 7adc4fbebe1a95cd048b3de28c4308a625fee729..6c342637b2f18b8d5e2cb2cc2942cabc28d1f571 100644 (file)
--- a/test/scripts/0000-Basic/0386
+++ b/test/scripts/0000-Basic/0386
@@ -1,5 +1,6 @@
 # ACLs and multiple messages
 exim -d -bh V4NET.9.8.7
 # ACLs and multiple messages
 exim -d -bh V4NET.9.8.7

+helo test

 mail from:<x@y>
 rcpt to:<1@b>
 rset
 mail from:<x@y>
 rcpt to:<1@b>
 rset


@@ -8,6 +9,7 @@ rcpt to:<1@b>
 quit
 ****
 exim -d -odi -bs -oMa V4NET.11.12.13 userx
 quit
 ****
 exim -d -odi -bs -oMa V4NET.11.12.13 userx

+helo test

 mail from:<x@y>
 rcpt to:<2@b>
 data
 mail from:<x@y>
 rcpt to:<2@b>
 data

diff --git a/test/scripts/0000-Basic/0387 b/test/scripts/0000-Basic/0387
index 155ad0235f02ae7685b8a1497adfac0c609d3262..24cb0eda77132d2eb73ce56fa11459dcec938dc8 100644 (file)
--- a/test/scripts/0000-Basic/0387
+++ b/test/scripts/0000-Basic/0387
@@ -1,5 +1,6 @@
 # Partial matching and lookup name decoding
 exim -bs
 # Partial matching and lookup name decoding
 exim -bs

+helo test

 mail from:<x@a.b.c>
 rcpt to:<x@y>
 rset
 mail from:<x@a.b.c>
 rcpt to:<x@y>
 rset


@@ -8,16 +9,19 @@ rcpt to:<x@y>
 quit
 ****
 exim -bs -oMa 10.9.8.7
 quit
 ****
 exim -bs -oMa 10.9.8.7

+helo test

 mail from:<x@b.c.a>
 rcpt to:<x@y>
 quit
 ****
 exim -bs -oMa 192.168.4.5
 mail from:<x@b.c.a>
 rcpt to:<x@y>
 quit
 ****
 exim -bs -oMa 192.168.4.5

+helo test

 mail from:<x@b.c.a>
 rcpt to:<x@y>
 quit
 ****
 exim -bs -oMa 1.2.3.4
 mail from:<x@b.c.a>
 rcpt to:<x@y>
 quit
 ****
 exim -bs -oMa 1.2.3.4

+helo test

 mail from:<x@b.c.a>
 rcpt to:<x@y>
 quit
 mail from:<x@b.c.a>
 rcpt to:<x@y>
 quit

diff --git a/test/scripts/0000-Basic/0389 b/test/scripts/0000-Basic/0389
index d23af20c39759e6b89f6193eea24b1efea3cc7e2..85855d6ff2588128b11f2106817b202c36e43f74 100644 (file)
--- a/test/scripts/0000-Basic/0389
+++ b/test/scripts/0000-Basic/0389
@@ -1,5 +1,6 @@
 # warn with log_message but no message
 exim -bs
 # warn with log_message but no message
 exim -bs

+helo test

 mail from:x@y
 rcpt to:x@y
 data
 mail from:x@y
 rcpt to:x@y
 data

diff --git a/test/scripts/0000-Basic/0391 b/test/scripts/0000-Basic/0391
index bbb0fb57754990be695b08ea3b1bfa18fedb645c..5d459eb9d84c5572dfd7077e4ac87255f540672d 100644 (file)
--- a/test/scripts/0000-Basic/0391
+++ b/test/scripts/0000-Basic/0391
@@ -1,5 +1,6 @@
 # Sender verify rewrite and $sender_address
 exim -d -bh 1.2.3.4
 # Sender verify rewrite and $sender_address
 exim -d -bh 1.2.3.4

+helo test

 mail from:<U@W.x.y>
 rcpt to:<B@a.b.c>
 quit
 mail from:<U@W.x.y>
 rcpt to:<B@a.b.c>
 quit

diff --git a/test/scripts/0000-Basic/0395 b/test/scripts/0000-Basic/0395
index 01afebdf40ed7684397ec43fa85cdf464c9bab55..51dc6ba503a01a1fea214e2a365f78c1f39b1821 100644 (file)
--- a/test/scripts/0000-Basic/0395
+++ b/test/scripts/0000-Basic/0395
@@ -23,6 +23,7 @@ To: userx
 # Same tests for BSMTP
 2
 exim -odi -bnq -bS
 # Same tests for BSMTP
 2
 exim -odi -bnq -bS

+helo test

 mail from: userx
 rcpt to: userx
 data
 mail from: userx
 rcpt to: userx
 data


@@ -33,6 +34,7 @@ quit
 ****
 2
 exim -odi -bnq -bS
 ****
 2
 exim -odi -bnq -bS

+helo test

 mail from: userx@origin.ex
 rcpt to: userx
 data
 mail from: userx@origin.ex
 rcpt to: userx
 data


@@ -42,6 +44,7 @@ To: userx
 quit
 ****
 exim -odi -bnq -bS
 quit
 ****
 exim -odi -bnq -bS

+helo test

 mail from: userx@origin.ex
 rcpt to: userx@test.ex
 data
 mail from: userx@origin.ex
 rcpt to: userx@test.ex
 data


@@ -51,6 +54,7 @@ To: userx
 quit
 ****
 exim -odi -bS
 quit
 ****
 exim -odi -bS

+helo test

 mail from: userx@origin.ex
 rcpt to: userx@test.ex
 data
 mail from: userx@origin.ex
 rcpt to: userx@test.ex
 data


@@ -60,6 +64,7 @@ To: userx
 quit
 ****
 exim -odi -bnq -bs
 quit
 ****
 exim -odi -bnq -bs

+helo test

 mail from: userx@origin.ex
 rcpt to: userx
 data
 mail from: userx@origin.ex
 rcpt to: userx
 data


@@ -69,6 +74,7 @@ To: userx
 quit
 ****
 exim -odi -bnq -bs
 quit
 ****
 exim -odi -bnq -bs

+helo test

 mail from: userx@origin.ex
 rcpt to: userx@test.ex
 data
 mail from: userx@origin.ex
 rcpt to: userx@test.ex
 data


@@ -78,6 +84,7 @@ To: userx
 quit
 ****
 exim -odi -bs
 quit
 ****
 exim -odi -bs

+helo test

 mail from: userx@origin.ex
 rcpt to: userx@test.ex
 data
 mail from: userx@origin.ex
 rcpt to: userx@test.ex
 data

diff --git a/test/scripts/0000-Basic/0396 b/test/scripts/0000-Basic/0396
index 356021a24672fc493c2947fc1a9f7d28aacabc41..da9afcec424a5a96c161948869e213de9f09c4df 100644 (file)
--- a/test/scripts/0000-Basic/0396
+++ b/test/scripts/0000-Basic/0396
@@ -1,5 +1,6 @@
 # forced failure in named list
 exim -d -bs
 # forced failure in named list
 exim -d -bs

+helo test

 mail from:<x@y>
 rcpt to:<x@y>
 quit
 mail from:<x@y>
 rcpt to:<x@y>
 quit

diff --git a/test/scripts/0000-Basic/0398 b/test/scripts/0000-Basic/0398
index 3465e26d605fb5404a77c69ea1ca5f6d392010c5..023515d30b0aa29336936b214b25badb78319022 100644 (file)
--- a/test/scripts/0000-Basic/0398
+++ b/test/scripts/0000-Basic/0398
@@ -13,6 +13,7 @@ QUIT
 250 OK
 ****
 exim -odi -bs
 250 OK
 ****
 exim -odi -bs

+helo test

 mail from:<x@remote>
 rcpt to:<x@local>
 data
 mail from:<x@remote>
 rcpt to:<x@local>
 data


@@ -32,6 +33,7 @@ QUIT
 250 OK
 ****
 exim -odi -bs
 250 OK
 ****
 exim -odi -bs

+helo test

 mail from:<z@remote>
 rcpt to:<deny@local>
 quit
 mail from:<z@remote>
 rcpt to:<deny@local>
 quit


@@ -48,12 +50,14 @@ QUIT
 250 OK
 ****
 exim -d -odi -bs
 250 OK
 ****
 exim -d -odi -bs

+helo test

 mail from:<qq@remote>
 rcpt to:<abc@local>
 rcpt to:<xyz@local>
 quit
 ****
 exim -odi -bs
 mail from:<qq@remote>
 rcpt to:<abc@local>
 rcpt to:<xyz@local>
 quit
 ****
 exim -odi -bs

+helo test

 mail from:<>
 rcpt to:<abc@local>
 rcpt to:<xyz@local>
 mail from:<>
 rcpt to:<abc@local>
 rcpt to:<xyz@local>

diff --git a/test/scripts/0000-Basic/0407 b/test/scripts/0000-Basic/0407
index 0d8e7ca37e16a5ab8edde902e62a2a0aa9b4c3a7..1fecef5e21b8241f585c7e84c0fc163156f64a98 100644 (file)
--- a/test/scripts/0000-Basic/0407
+++ b/test/scripts/0000-Basic/0407
@@ -15,6 +15,7 @@ exim -DHEADER_MAXSIZE=header_maxsize=2M x@y <DIR/test-data
 exim -DHEADER_MAXSIZE=header_maxsize=2M -DHEADER_LINE_MAXSIZE=header_line_maxsize=1024 x@y <DIR/test-data
 ****
 exim -DHEADER_LINE_MAXSIZE=header_line_maxsize=20 -bs
 exim -DHEADER_MAXSIZE=header_maxsize=2M -DHEADER_LINE_MAXSIZE=header_line_maxsize=1024 x@y <DIR/test-data
 ****
 exim -DHEADER_LINE_MAXSIZE=header_line_maxsize=20 -bs

+helo test

 mail from:<x@y>
 rcpt to:<x@y>
 data
 mail from:<x@y>
 rcpt to:<x@y>
 data

diff --git a/test/scripts/0000-Basic/0410 b/test/scripts/0000-Basic/0410
index 8d9c240eef8a2ada4728d07cc5d1faf3e7f85af4..1b3cf0f9a7e642fe691ab0416148a1895f109802 100644 (file)
--- a/test/scripts/0000-Basic/0410
+++ b/test/scripts/0000-Basic/0410
@@ -1,5 +1,6 @@
 # address_data and router_name in ACLs after verification
 exim -bs
 # address_data and router_name in ACLs after verification
 exim -bs

+helo test

 MAIL FROM:<oksender@y>
 rcpt to:<child@test.ex>
 rcpt to:<orig@test.ex>
 MAIL FROM:<oksender@y>
 rcpt to:<child@test.ex>
 rcpt to:<orig@test.ex>

diff --git a/test/scripts/0000-Basic/0413 b/test/scripts/0000-Basic/0413
index eb805808ee2ea94b100d66df64ad0eea42c4983c..d72a32bd76688fb1110d3add14177f2f833fac1f 100644 (file)
--- a/test/scripts/0000-Basic/0413
+++ b/test/scripts/0000-Basic/0413
@@ -33,6 +33,7 @@ QUIT
 250 OK
 ****
 exim -odi -bs
 250 OK
 ****
 exim -odi -bs

+helo test

 mail from:<r1@domain1>
 rset
 mail from:<r2@domain2>
 mail from:<r1@domain1>
 rset
 mail from:<r2@domain2>

diff --git a/test/scripts/0000-Basic/0417 b/test/scripts/0000-Basic/0417
index ac3da7d32d8411c14ec6aa363e901af20140fd4c..70d9b805a7ea8f4c05858195ba2154eaa666681e 100644 (file)
--- a/test/scripts/0000-Basic/0417
+++ b/test/scripts/0000-Basic/0417
@@ -2,12 +2,14 @@
 need_ipv4
 #
 exim -bs
 need_ipv4
 #
 exim -bs

+helo test

 mail from:<x@host.test.again.dns>
 rcpt to:<x@y>
 rcpt to:<a@b>
 quit
 ****
 exim -DRETURN_ERROR_DETAILS=true -bs
 mail from:<x@host.test.again.dns>
 rcpt to:<x@y>
 rcpt to:<a@b>
 quit
 ****
 exim -DRETURN_ERROR_DETAILS=true -bs

+helo test

 mail from:<x@host.test.again.dns>
 rcpt to:<x@y>
 rcpt to:<a@b>
 mail from:<x@host.test.again.dns>
 rcpt to:<x@y>
 rcpt to:<a@b>

diff --git a/test/scripts/0000-Basic/0418 b/test/scripts/0000-Basic/0418
index 147ae559acc6055fc85a657d308befd02d892cf6..4a9e26047215f1af6aa2be7a690ff65e16883a21 100644 (file)
--- a/test/scripts/0000-Basic/0418
+++ b/test/scripts/0000-Basic/0418
@@ -1,5 +1,6 @@
 # Continuations in file ACL
 exim -odq -bs
 # Continuations in file ACL
 exim -odq -bs

+helo test

 mail from:<>
 rcpt to:<x@y>
 quit
 mail from:<>
 rcpt to:<x@y>
 quit

diff --git a/test/scripts/0000-Basic/0425 b/test/scripts/0000-Basic/0425
index 725900a2f036702926d057ab08ebff93e7d244a7..396921508975e350258b0b75c366c1e503a01695 100644 (file)
--- a/test/scripts/0000-Basic/0425
+++ b/test/scripts/0000-Basic/0425
@@ -2,6 +2,7 @@
 need_ipv4
 #
 exim -bs
 need_ipv4
 #
 exim -bs

+helo test

 mail from:<BAD@y>
 rcpt to:<OK@x>
 rcpt to:<BAD@x>
 mail from:<BAD@y>
 rcpt to:<OK@x>
 rcpt to:<BAD@x>

diff --git a/test/scripts/0000-Basic/0432 b/test/scripts/0000-Basic/0432
index e83626ca3c2bea601dd8e697e8cf16dfd9bb4733..c4a2330b1ca1d94ebeb7a8a5e37d959f4154ede5 100644 (file)
--- a/test/scripts/0000-Basic/0432
+++ b/test/scripts/0000-Basic/0432
@@ -2,6 +2,7 @@
 need_ipv4
 #
 exim -bh 1.2.3.4
 need_ipv4
 #
 exim -bh 1.2.3.4

+helo test

 mail from:<x@y>
 quit
 ****
 mail from:<x@y>
 quit
 ****


@@ -17,14 +18,17 @@ QUIT
 220 OK
 ****
 exim -d -bhc 1.2.3.4
 220 OK
 ****
 exim -d -bhc 1.2.3.4

+helo test

 mail from:<x@y>
 quit
 ****
 exim -d -bhc 1.2.3.4
 mail from:<x@y>
 quit
 ****
 exim -d -bhc 1.2.3.4

+helo test

 mail from:<x@y>
 quit
 ****
 exim -bhc 1.2.3.4
 mail from:<x@y>
 quit
 ****
 exim -bhc 1.2.3.4

+helo test

 mail from:<x@y>
 quit
 ****
 mail from:<x@y>
 quit
 ****


@@ -40,6 +44,7 @@ QUIT
 220 OK
 ****
 exim -bhc 1.2.3.4
 220 OK
 ****
 exim -bhc 1.2.3.4

+helo test

 mail from:<a@b>
 quit
 ****
 mail from:<a@b>
 quit
 ****


@@ -51,6 +56,7 @@ EHLO
 *eof
 ****
 exim -bhc 1.2.3.4
 *eof
 ****
 exim -bhc 1.2.3.4

+helo test

 mail from:<p1@q>
 quit
 ****
 mail from:<p1@q>
 quit
 ****

diff --git a/test/scripts/0000-Basic/0443 b/test/scripts/0000-Basic/0443
index 8e3b03779b28f8f860a3b837e837e75af7859dd3..bc39dab190d2e0a32a56e9a9f09769882709f11f 100644 (file)
--- a/test/scripts/0000-Basic/0443
+++ b/test/scripts/0000-Basic/0443
@@ -1,5 +1,6 @@
 # verify callout with no transport
 exim -bhc V4NET.0.0.1
 # verify callout with no transport
 exim -bhc V4NET.0.0.1

+helo test

 Mail from: x@ten-1.test.ex
 rcpt to: x@y
 quit
 Mail from: x@ten-1.test.ex
 rcpt to: x@y
 quit

diff --git a/test/scripts/0000-Basic/0445 b/test/scripts/0000-Basic/0445
index fd38f85b53b8f127149063605f58db0fb57eca2f..54bfcc193322b2714e5e188e458ed21958b33c67 100644 (file)
--- a/test/scripts/0000-Basic/0445
+++ b/test/scripts/0000-Basic/0445
@@ -1,5 +1,6 @@
 # :fail: with looked up empty string
 exim -bh 1.2.3.4
 # :fail: with looked up empty string
 exim -bh 1.2.3.4

+helo test

 mail from:<lp1@x.y>
 rcpt to:<zz@x.y>
 rset
 mail from:<lp1@x.y>
 rcpt to:<zz@x.y>
 rset

diff --git a/test/scripts/0000-Basic/0446 b/test/scripts/0000-Basic/0446
index 00e7ec6b9f2cb8c813e354e1c2c73f0787742148..57451cf5860a53260350fb19d535c9a18eed92df 100644 (file)
--- a/test/scripts/0000-Basic/0446
+++ b/test/scripts/0000-Basic/0446
@@ -4,6 +4,7 @@ Received: the first received: line
 Received: the second received: line
 ****
 exim -odi -bs
 Received: the second received: line
 ****
 exim -odi -bs

+helo test

 mail from:<>
 rcpt to:userx@test.ex
 data
 mail from:<>
 rcpt to:userx@test.ex
 data

diff --git a/test/scripts/0000-Basic/0453 b/test/scripts/0000-Basic/0453
index b07a7125caf0cc37c3da0380b3ccb7f1dcd3a0ed..c5445b2453e2f6a42ed7f2408207eb8dfbe720b0 100644 (file)
--- a/test/scripts/0000-Basic/0453
+++ b/test/scripts/0000-Basic/0453
@@ -10,6 +10,7 @@ helo
 ****
 1
 exim -DERROR_DETAILS=smtp_max_synprot_errors=1 -bs
 ****
 1
 exim -DERROR_DETAILS=smtp_max_synprot_errors=1 -bs

+helo test

 mail from:<>
 mail from:<>
 mail from:<>
 mail from:<>
 mail from:<>
 mail from:<>

diff --git a/test/scripts/0000-Basic/0459 b/test/scripts/0000-Basic/0459
index 873c5d87f7f675e8e61eaaee7ef31b1a69f2a22f..feac5cfb4b03b37a775e77300c1a3b7806dbd6d2 100644 (file)
--- a/test/scripts/0000-Basic/0459
+++ b/test/scripts/0000-Basic/0459
@@ -1,5 +1,6 @@
 # unwanted search error messages in ACLs
 exim -bs
 # unwanted search error messages in ACLs
 exim -bs

+helo test

 mail from:<>
 rcpt to:outer@xx
 quit
 mail from:<>
 rcpt to:outer@xx
 quit

diff --git a/test/scripts/0000-Basic/0462 b/test/scripts/0000-Basic/0462
index da7b714bff52fefaad5b6a2c9cc8a513b22d1e4d..fa6f3867862a8e97688f87ae89920d2a7b334847 100644 (file)
--- a/test/scripts/0000-Basic/0462
+++ b/test/scripts/0000-Basic/0462
@@ -19,6 +19,7 @@ QUIT
 250 OK
 ****
 sudo exim -d-all+verify -v -bs -oMa V4NET.0.0.1
 250 OK
 ****
 sudo exim -d-all+verify -v -bs -oMa V4NET.0.0.1

+HELO test

 MAIL FROM:<Ok@localhost>
 RCPT TO:<checkpm@test.ex>
 RCPT TO:<nocheckpm@test.ex>
 MAIL FROM:<Ok@localhost>
 RCPT TO:<checkpm@test.ex>
 RCPT TO:<nocheckpm@test.ex>


@@ -37,6 +38,7 @@ QUIT
 250 OK
 ****
 sudo exim -d-all+verify -v -bs -oMa V4NET.0.0.2
 250 OK
 ****
 sudo exim -d-all+verify -v -bs -oMa V4NET.0.0.2

+HELO test

 MAIL FROM:<NOTok@elsewhere>
 RCPT TO:<nocheckpm@test.ex>
 QUIT
 MAIL FROM:<NOTok@elsewhere>
 RCPT TO:<nocheckpm@test.ex>
 QUIT


@@ -54,6 +56,7 @@ QUIT
 250 OK
 ****
 sudo exim -DSELECTOR=-sender_verify_fail -d-all+verify -v -bs -oMa V4NET.0.0.2
 250 OK
 ****
 sudo exim -DSELECTOR=-sender_verify_fail -d-all+verify -v -bs -oMa V4NET.0.0.2

+HELO test

 MAIL FROM:<NOTok2@elsewhere>
 RCPT TO:<nocheckpm@test.ex>
 QUIT
 MAIL FROM:<NOTok2@elsewhere>
 RCPT TO:<nocheckpm@test.ex>
 QUIT

diff --git a/test/scripts/0000-Basic/0464 b/test/scripts/0000-Basic/0464
index d2e231cac128dd4099f7218be3a5828452453e05..a81fcf94b4124eae0afb24b1cbaec6927f8199cd 100644 (file)
--- a/test/scripts/0000-Basic/0464
+++ b/test/scripts/0000-Basic/0464
@@ -2,6 +2,7 @@
 need_ipv4
 #
 exim -d -bs
 need_ipv4
 #
 exim -d -bs

+helo test

 mail from:<>
 rcpt to:<abc@domain1>
 quit
 mail from:<>
 rcpt to:<abc@domain1>
 quit

diff --git a/test/scripts/0000-Basic/0465 b/test/scripts/0000-Basic/0465
index de8b6cbdf0eae3ffcc447e2e2fda6324839f00cb..3b2e54c6b608508cc2af5522317005695e1bcd1f 100644 (file)
--- a/test/scripts/0000-Basic/0465
+++ b/test/scripts/0000-Basic/0465
@@ -1,5 +1,6 @@
 # strip_trailing_dot
 exim -d -bs
 # strip_trailing_dot
 exim -d -bs

+helo test

 mail from:<>
 rcpt to:<abc@domain.>
 quit
 mail from:<>
 rcpt to:<abc@domain.>
 quit


@@ -8,6 +9,7 @@ quit
 exim -f abc@somewhere. xxx
 ****
 exim -DOPT=strip_trailing_dot -d -bs
 exim -f abc@somewhere. xxx
 ****
 exim -DOPT=strip_trailing_dot -d -bs

+helo test

 mail from:<>
 rcpt to:<abc@domain.>
 data
 mail from:<>
 rcpt to:<abc@domain.>
 data


@@ -18,6 +20,7 @@ quit
 exim -DOPT=strip_trailing_dot -f abc@somewhere. xxx@yyy.
 ****
 exim -d -bs
 exim -DOPT=strip_trailing_dot -f abc@somewhere. xxx@yyy.
 ****
 exim -d -bs

+helo test

 mail from:<>
 rcpt to:<abc@xyz>
 data
 mail from:<>
 rcpt to:<abc@xyz>
 data

diff --git a/test/scripts/0000-Basic/0468 b/test/scripts/0000-Basic/0468
index 7c0790526ee18a33e58911b733937a7890a79ecf..c30503c1b3543eadf3ddb2c817dc2b4a854ee2c4 100644 (file)
--- a/test/scripts/0000-Basic/0468
+++ b/test/scripts/0000-Basic/0468
@@ -1,5 +1,6 @@
 # $message_body in multiple SMTP messages
 exim -bs
 # $message_body in multiple SMTP messages
 exim -bs

+helo test

 mail from:<>
 rcpt to:<x@y>
 data
 mail from:<>
 rcpt to:<x@y>
 data

diff --git a/test/scripts/0000-Basic/0475 b/test/scripts/0000-Basic/0475
index 1571f4e8986f932aa23ba6aca492557f014a2744..5008c8768b0017950451f022524d51c1aed50d0a 100644 (file)
--- a/test/scripts/0000-Basic/0475
+++ b/test/scripts/0000-Basic/0475
@@ -1,5 +1,6 @@
 # malformed item in host list
 exim -bh V4NET.0.0.0
 # malformed item in host list
 exim -bh V4NET.0.0.0

+helo test

 mail from:<>
 rcpt to:<a1@b>
 rcpt to:<a2@b>
 mail from:<>
 rcpt to:<a1@b>
 rcpt to:<a2@b>

diff --git a/test/scripts/0000-Basic/0483 b/test/scripts/0000-Basic/0483
index 14e42e3b942c079199ae3b038c0430de4ec88451..23a8a58d3540e2d05d44d7c0fb1aeee278dcf0b0 100644 (file)
--- a/test/scripts/0000-Basic/0483
+++ b/test/scripts/0000-Basic/0483
@@ -1,5 +1,6 @@
 # $sender_data and $recipient_data
 exim -bs -d-all+route
 # $sender_data and $recipient_data
 exim -bs -d-all+route

+helo test

 mail from:<sender@domain1>
 rcpt to:<recip@domain2>
 rcpt to:<other@domain2>
 mail from:<sender@domain1>
 rcpt to:<recip@domain2>
 rcpt to:<other@domain2>

diff --git a/test/scripts/0000-Basic/0488 b/test/scripts/0000-Basic/0488
index e4b96b70a37bbc775b0d1f66aad18d08a5411c62..7baa8840acaed0fc2c03c00fd25992d64f9c4896 100644 (file)
--- a/test/scripts/0000-Basic/0488
+++ b/test/scripts/0000-Basic/0488
@@ -1,5 +1,6 @@
 # Multiple headers in one warn message
 exim -odq -bs
 # Multiple headers in one warn message
 exim -odq -bs

+HELO test

 MAIL FROM:<>
 RCPT TO:<userx@test.ex>
 DATA
 MAIL FROM:<>
 RCPT TO:<userx@test.ex>
 DATA

diff --git a/test/scripts/0000-Basic/0490 b/test/scripts/0000-Basic/0490
index 060e270b4fb93b6db5c55ed2420a821653fe45c7..28c2de0e91470742938e9bb365aab127109278d5 100644 (file)
Binary files a/test/scripts/0000-Basic/0490 and b/test/scripts/0000-Basic/0490 differ

diff --git a/test/scripts/0000-Basic/0496 b/test/scripts/0000-Basic/0496
index ba96dc7dc4ea5e69c9d9cf9ed5bae76fa46fb2e7..7b38ba657c86cd8df46e78f508ac4a6ec7fbb1d3 100644 (file)
--- a/test/scripts/0000-Basic/0496
+++ b/test/scripts/0000-Basic/0496
@@ -1,5 +1,6 @@
 # acl adding positioned headers
 exim -odi -bs
 # acl adding positioned headers
 exim -odi -bs

+helo test

 Mail From:<some@ne>
 rcpt To: <someone@el.se>
 data
 Mail From:<some@ne>
 rcpt To: <someone@el.se>
 data

diff --git a/test/scripts/0000-Basic/0500 b/test/scripts/0000-Basic/0500
index 75bffe4250529d3c34b1843b94d84715e98e0e9b..688671625fde85a76143f5c48d01abd7dd023dfe 100644 (file)
--- a/test/scripts/0000-Basic/0500
+++ b/test/scripts/0000-Basic/0500
@@ -1,11 +1,13 @@
 # predata ACL
 exim -odi -bs
 # predata ACL
 exim -odi -bs

+helo test

 mail from:<x@y>
 rcpt to:<userx@y>
 data
 quit
 ****
 exim -odi -bs
 mail from:<x@y>
 rcpt to:<userx@y>
 data
 quit
 ****
 exim -odi -bs

+helo test

 mail from:<postmaster@y>
 rcpt to:<userx@y>
 data
 mail from:<postmaster@y>
 rcpt to:<userx@y>
 data

diff --git a/test/scripts/0000-Basic/0501 b/test/scripts/0000-Basic/0501
index c173255cb7f714cd917c8097769bb7d73d17da56..9f9fbdf94a5bfbcc6810f220abb9ba44d9ab5aec 100644 (file)
--- a/test/scripts/0000-Basic/0501
+++ b/test/scripts/0000-Basic/0501
@@ -1,5 +1,6 @@
 # control = case{ful,less}_local_part
 exim -odi -bs
 # control = case{ful,less}_local_part
 exim -odi -bs

+helo test

 mail from:<x@y>
 rcpt to:<Phil.Hazel@y>
 quit
 mail from:<x@y>
 rcpt to:<Phil.Hazel@y>
 quit

diff --git a/test/scripts/0000-Basic/0502 b/test/scripts/0000-Basic/0502
index c22205ca70d70f196c1f8a4e22a223a36b0449ed..1c0bc6afcb2a63c00856fe9b9c387d2457827927 100644 (file)
--- a/test/scripts/0000-Basic/0502
+++ b/test/scripts/0000-Basic/0502
@@ -1,5 +1,6 @@
 # ACL for QUIT
 exim -bs
 # ACL for QUIT
 exim -bs

+helo test

 mail from:<x@y>
 rcpt to:<a@y>
 rcpt to:<b@y>
 mail from:<x@y>
 rcpt to:<a@y>
 rcpt to:<b@y>


@@ -20,6 +21,7 @@ exim -bs -DLAST='deny message = Your message here'
 quit
 ****
 exim -bs -DLAST=''
 quit
 ****
 exim -bs -DLAST=''

+helo test

 mail from:<a@b>
 quit
 ****
 mail from:<a@b>
 quit
 ****

diff --git a/test/scripts/0000-Basic/0505 b/test/scripts/0000-Basic/0505
index 7059a93b56ee00713ac90b83d81d2cbf09ae74db..5b73ae4ee93a04911cb76e99bac183aeb52c5dc1 100644 (file)
--- a/test/scripts/0000-Basic/0505
+++ b/test/scripts/0000-Basic/0505
@@ -1,5 +1,6 @@
 # check illegally placed ACL control modifiers
 exim -DACL=smtp_data -DCONTROL=submission -bs
 # check illegally placed ACL control modifiers
 exim -DACL=smtp_data -DCONTROL=submission -bs

+helo test

 mail from:<>
 rcpt to:<userx@x.y>
 data
 mail from:<>
 rcpt to:<userx@x.y>
 data


@@ -8,6 +9,7 @@ Rhubarb
 quit
 ****
 exim -DACL=smtp_predata -DCONTROL=submission -bs
 quit
 ****
 exim -DACL=smtp_predata -DCONTROL=submission -bs

+helo test

 mail from:<>
 rcpt to:<userx@x.y>
 data
 mail from:<>
 rcpt to:<userx@x.y>
 data

diff --git a/test/scripts/0000-Basic/0507 b/test/scripts/0000-Basic/0507
index ce8d71e85e6bdbb01cd3cb81419bc9476910e62a..86f8a10c824cbaee4ae5db48e13ddf3531a29f43 100644 (file)
--- a/test/scripts/0000-Basic/0507
+++ b/test/scripts/0000-Basic/0507
@@ -1,5 +1,6 @@
 # verify = not_blind
 exim -odq -bs
 # verify = not_blind
 exim -odq -bs

+helo test

 mail from:<>
 rcpt to:<userx@dom.com>
 data
 mail from:<>
 rcpt to:<userx@dom.com>
 data


@@ -8,6 +9,7 @@ To: a@b.c, himself <userx@dom.com>
 quit
 ****
 exim -odq -bs
 quit
 ****
 exim -odq -bs

+helo test

 mail from:<>
 rcpt to:<userx@dom.com>
 data
 mail from:<>
 rcpt to:<userx@dom.com>
 data


@@ -16,6 +18,7 @@ To: a@b.c, himself <usery@dom.com>, HIMSELF <USERX@dom.com>
 quit
 ****
 exim -DERROR_DETAILS=smtp_return_error_details -odq -bs
 quit
 ****
 exim -DERROR_DETAILS=smtp_return_error_details -odq -bs

+helo test

 mail from:<>
 rcpt to:<userx@dom.com>
 data
 mail from:<>
 rcpt to:<userx@dom.com>
 data


@@ -24,6 +27,7 @@ To: a@b.c, himself <usery@dom.com>
 quit
 ****
 exim -odq -bs
 quit
 ****
 exim -odq -bs

+helo test

 mail from:<>
 rcpt to:<userx@dom.com>
 rcpt to:<usery@dom.com>
 mail from:<>
 rcpt to:<userx@dom.com>
 rcpt to:<usery@dom.com>


@@ -34,6 +38,7 @@ Cc: unqualified, userx@dom.com, x@y.z
 quit
 ****
 exim -odq -bs
 quit
 ****
 exim -odq -bs

+helo test

 mail from:<>
 rcpt to:<userx@dom.com>
 rcpt to:<usery@dom.com>
 mail from:<>
 rcpt to:<userx@dom.com>
 rcpt to:<usery@dom.com>


@@ -45,6 +50,7 @@ Cc: unqualified, userx@dom.com, x@y.z
 quit
 ****
 exim -odq -bs
 quit
 ****
 exim -odq -bs

+helo test

 mail from:<>
 rcpt to:<userx@dom.com>
 rcpt to:<usery@dom.com>
 mail from:<>
 rcpt to:<userx@dom.com>
 rcpt to:<usery@dom.com>

diff --git a/test/scripts/0000-Basic/0517 b/test/scripts/0000-Basic/0517
index 44e0c76331ceff99671d1ba57ba52efd96121da3..629d5efcf764bbfab28d189c74b293ac7d75d542 100644 (file)
--- a/test/scripts/0000-Basic/0517
+++ b/test/scripts/0000-Basic/0517
@@ -1,5 +1,6 @@
 # control = suppress_local_fixups
 exim -odi -bs
 # control = suppress_local_fixups
 exim -odi -bs

+helo test

 mail from:<>
 rcpt to:<userx@dom.com>
 data
 mail from:<>
 rcpt to:<userx@dom.com>
 data


@@ -7,6 +8,7 @@ data
 quit
 ****
 exim -odi -bs
 quit
 ****
 exim -odi -bs

+helo test

 mail from:<>
 rcpt to:<usery@dom.com>
 data
 mail from:<>
 rcpt to:<usery@dom.com>
 data

diff --git a/test/scripts/0000-Basic/0518 b/test/scripts/0000-Basic/0518
index 6b092173c80b6a50af14a04c1285d4d808ccf7ea..6ee234d85478012c70ddc4e222b6f543467deafb 100644 (file)
--- a/test/scripts/0000-Basic/0518
+++ b/test/scripts/0000-Basic/0518
@@ -83,6 +83,7 @@ QUIT
 250 OK
 ****
 exim -odq -bs
 250 OK
 ****
 exim -odq -bs

+helo test

 mail from:<>
 RCPT TO:<abc@include> 
 RCPT TO:<abc@exclude> 
 mail from:<>
 RCPT TO:<abc@include> 
 RCPT TO:<abc@exclude> 

diff --git a/test/scripts/0000-Basic/0525 b/test/scripts/0000-Basic/0525
index 3e5a9ac1c069612bc3c1a4716f3dcf104e8c61ba..ad9a358539d4dd608e93eb7ba219ef9327e5c841 100644 (file)
--- a/test/scripts/0000-Basic/0525
+++ b/test/scripts/0000-Basic/0525
@@ -14,6 +14,7 @@ DATA
 *sleep 3
 ****
 write test-data 200000x80
 *sleep 3
 ****
 write test-data 200000x80

+helo test

 mail from:<abc@xyz>
 RCPT TO:<def@pqr> 
 DATA
 mail from:<abc@xyz>
 RCPT TO:<def@pqr> 
 DATA

diff --git a/test/scripts/0000-Basic/0527 b/test/scripts/0000-Basic/0527
index 9c880d6445d4dc48de10dff342284ea5fbcf90f7..5c5cf6957e3255925b6b53a2f449300cd6cfef24 100644 (file)
--- a/test/scripts/0000-Basic/0527
+++ b/test/scripts/0000-Basic/0527
@@ -2,6 +2,7 @@
 need_ipv4
 #
 exim -bs
 need_ipv4
 #
 exim -bs

+helo test

 mail from:<unknown@x.x.x.x>
 rcpt to:<unknown@u.u.u.u>
 quit
 mail from:<unknown@x.x.x.x>
 rcpt to:<unknown@u.u.u.u>
 quit

diff --git a/test/scripts/0000-Basic/0530 b/test/scripts/0000-Basic/0530
index 6c57868ab1c3cae0d41146f5430282ea972bdebf..093d61efa003a735b94a941502436f0079619959 100644 (file)
--- a/test/scripts/0000-Basic/0530
+++ b/test/scripts/0000-Basic/0530
@@ -33,6 +33,7 @@ In-Reply-To: <i1@b>
 # an SMTP interface.
 #
 exim -odi -bs
 # an SMTP interface.
 #
 exim -odi -bs

+helo test

 mail from:<CALLER@test.ex>
 rcpt to:<userx@test.ex>
 data
 mail from:<CALLER@test.ex>
 rcpt to:<userx@test.ex>
 data


@@ -41,6 +42,7 @@ Subject: no Message-id, no References, no In-Reply-to
 quit
 ****
 exim -odi -bs
 quit
 ****
 exim -odi -bs

+helo test

 mail from:<CALLER@test.ex>
 rcpt to:<userx@test.ex>
 data
 mail from:<CALLER@test.ex>
 rcpt to:<userx@test.ex>
 data


@@ -50,6 +52,7 @@ In-Reply-To: <i1@b>
 quit
 ****
 exim -odi -bs
 quit
 ****
 exim -odi -bs

+helo test

 mail from:<CALLER@test.ex>
 rcpt to:<userx@test.ex>
 data
 mail from:<CALLER@test.ex>
 rcpt to:<userx@test.ex>
 data


@@ -60,6 +63,7 @@ In-Reply-To: <i1@b>
 quit
 ****
 exim -odi -bs
 quit
 ****
 exim -odi -bs

+helo test

 mail from:<CALLER@test.ex>
 rcpt to:<userx@test.ex>
 data
 mail from:<CALLER@test.ex>
 rcpt to:<userx@test.ex>
 data


@@ -69,6 +73,7 @@ References: <r1@b> <r2@b> <r3@b> <r4@b> <r5@b>
 quit
 ****
 exim -odi -bs
 quit
 ****
 exim -odi -bs

+helo test

 mail from:<CALLER@test.ex>
 rcpt to:<userx@test.ex>
 data
 mail from:<CALLER@test.ex>
 rcpt to:<userx@test.ex>
 data

diff --git a/test/scripts/0000-Basic/0532 b/test/scripts/0000-Basic/0532
index 80124cec17d65db8a50adbde9949eb2d12a72fae..23a60e2f6c0bdb43f1e2398b629f4b66680f6f6d 100644 (file)
--- a/test/scripts/0000-Basic/0532
+++ b/test/scripts/0000-Basic/0532
@@ -1,5 +1,6 @@
 # add_header modifier in ACLs
 exim -bs -odi
 # add_header modifier in ACLs
 exim -bs -odi

+helo test

 mail from:<mailok@test.ex>
 rcpt to:<rcptok@test.ex>
 rcpt to:<notok@test.ex>
 mail from:<mailok@test.ex>
 rcpt to:<rcptok@test.ex>
 rcpt to:<notok@test.ex>

diff --git a/test/scripts/0000-Basic/0538 b/test/scripts/0000-Basic/0538
index ccabcfbee686c9e76a6285402b8647e361e9dfa9..51daa9a26b3fa49dde07281f19e357fc387f9dce 100644 (file)
--- a/test/scripts/0000-Basic/0538
+++ b/test/scripts/0000-Basic/0538
@@ -12,6 +12,7 @@ QUIT
 221 Bye
 ****
 exim -bs
 221 Bye
 ****
 exim -bs

+helo test

 mail from:<userx@broken.example>
 quit
 ****
 mail from:<userx@broken.example>
 quit
 ****


@@ -28,12 +29,14 @@ QUIT
 221 Bye
 ****
 exim -bs
 221 Bye
 ****
 exim -bs

+helo test

 mail from:<userx@ok.example>
 rcpt to:<usery@broken.example>
 quit
 ****
 # A final check that the cache works for sender address
 exim -bs
 mail from:<userx@ok.example>
 rcpt to:<usery@broken.example>
 quit
 ****
 # A final check that the cache works for sender address
 exim -bs

+helo test

 mail from:<userx@broken.example>
 quit
 ****
 mail from:<userx@broken.example>
 quit
 ****

diff --git a/test/scripts/0000-Basic/0539 b/test/scripts/0000-Basic/0539
index 193047aa0a9099bcc9ddaa67097bb06799d6bc7e..559c633b5a1359b55443689d68f20eef7ee75f35 100644 (file)
--- a/test/scripts/0000-Basic/0539
+++ b/test/scripts/0000-Basic/0539
@@ -1,5 +1,6 @@
 # log_reject_target
 exim -bs
 # log_reject_target
 exim -bs

+helo test

 mail from:<main@test.ex>
 mail from:<reject@test.ex>
 mail from:<both@test.ex>
 mail from:<main@test.ex>
 mail from:<reject@test.ex>
 mail from:<both@test.ex>

diff --git a/test/scripts/0000-Basic/0540 b/test/scripts/0000-Basic/0540
index 0866eefb94cf34c60068c158d8fad90450b057d3..213797895dca95b38de242bced9cd892971a5f0f 100644 (file)
--- a/test/scripts/0000-Basic/0540
+++ b/test/scripts/0000-Basic/0540
@@ -43,6 +43,7 @@ QUIT
 250 OK
 ****
 exim -odq -bs
 250 OK
 ****
 exim -odq -bs

+helo test

 mail from:<>
 RCPT TO:<abc@yes1> 
 RCPT TO:<def@yes2> 
 mail from:<>
 RCPT TO:<abc@yes1> 
 RCPT TO:<def@yes2> 

diff --git a/test/scripts/0000-Basic/0542 b/test/scripts/0000-Basic/0542
index 1c8c03b5f3d96b3801620099bc4e902455bd2077..8d0384681fffcd7632fa365baab85fa82dfba3f4 100644 (file)
--- a/test/scripts/0000-Basic/0542
+++ b/test/scripts/0000-Basic/0542
@@ -18,6 +18,7 @@ TESTING_MACROS=$recipients
 (TESTING_MACROS)
 ****
 exim -bs
 (TESTING_MACROS)
 ****
 exim -bs

+helo test

 mail from:<userz@test.ex>
 rcpt to:<userx@test.x>
 rcpt to:<usery@test.ex>
 mail from:<userz@test.ex>
 rcpt to:<userx@test.x>
 rcpt to:<usery@test.ex>

diff --git a/test/scripts/0000-Basic/0555 b/test/scripts/0000-Basic/0555
index c35113603501b1562332094bf8b04157d77bd5f1..d5aa2e2681f4d1b6d5b7c5259bf43db4bd4dcae3 100644 (file)
--- a/test/scripts/0000-Basic/0555
+++ b/test/scripts/0000-Basic/0555
@@ -1,5 +1,6 @@
 # Long response lines for fakedefer/fakereject
 exim -bs
 # Long response lines for fakedefer/fakereject
 exim -bs

+helo test

 mail from:<>
 rcpt to:<userx@test.ex>
 data
 mail from:<>
 rcpt to:<userx@test.ex>
 data


@@ -10,6 +11,7 @@ quit
 exim -bs -DFAKE='fakedefer/This is a rather long customised message that \
                  should get automatically split up into more than one \
                  response line.' 
 exim -bs -DFAKE='fakedefer/This is a rather long customised message that \
                  should get automatically split up into more than one \
                  response line.' 

+helo test

 mail from:<>
 rcpt to:<userx@test.ex>
 data
 mail from:<>
 rcpt to:<userx@test.ex>
 data

diff --git a/test/scripts/0000-Basic/0561 b/test/scripts/0000-Basic/0561
index 1f55f8d4388d2da110337f1c19089c218af8984b..a7a6df5d282d191f14c6441ae2f0ad37e27fe3bc 100644 (file)
--- a/test/scripts/0000-Basic/0561
+++ b/test/scripts/0000-Basic/0561
@@ -2,6 +2,7 @@
 need_ipv4
 #
 exim -bs
 need_ipv4
 #
 exim -bs

+helo test

 mail from:<>
 rcpt to:<userx@test.ex>
 data
 mail from:<>
 rcpt to:<userx@test.ex>
 data


@@ -28,6 +29,7 @@ sleep 1
 killdaemon
 #
 exim -bs -DQOLL=false
 killdaemon
 #
 exim -bs -DQOLL=false

+helo test

 mail from:<>
 rcpt to:<userx@test.ex>
 data
 mail from:<>
 rcpt to:<userx@test.ex>
 data

diff --git a/test/scripts/0000-Basic/0565 b/test/scripts/0000-Basic/0565
index 8596233784aac97dcc2b88a1bee474436cac5e96..9c06c57b532f2161782f64c299ee3be91d800ba5 100644 (file)
--- a/test/scripts/0000-Basic/0565
+++ b/test/scripts/0000-Basic/0565
@@ -17,6 +17,7 @@ QUIT
 221 bye
 ****
 exim -odf -bs
 221 bye
 ****
 exim -odf -bs

+helo test

 mail from:<postmaster@y>
 rcpt to:<x@y>
 data
 mail from:<postmaster@y>
 rcpt to:<x@y>
 data


@@ -45,6 +46,7 @@ QUIT
 221 bye
 ****
 exim -odf -bs
 221 bye
 ****
 exim -odf -bs

+helo test

 mail from:<postmaster@y>
 rcpt to:<x@test.ex>
 data
 mail from:<postmaster@y>
 rcpt to:<x@test.ex>
 data

diff --git a/test/scripts/0000-Basic/0567 b/test/scripts/0000-Basic/0567
index 5abd06fd6012c9b847c8f1c9499cbbcfabb29ec1..a7a43489a6947c17fc0a218ed1d1b1b2e8772b68 100644 (file)
--- a/test/scripts/0000-Basic/0567
+++ b/test/scripts/0000-Basic/0567
@@ -1,5 +1,6 @@
 # remove_header modifier in ACLs
 exim -bs -odi
 # remove_header modifier in ACLs
 exim -bs -odi

+helo test

 mail from:<mailok@test.ex>
 rcpt to:<rcptok@test.ex>
 rcpt to:<notok@test.ex>
 mail from:<mailok@test.ex>
 rcpt to:<rcptok@test.ex>
 rcpt to:<notok@test.ex>

diff --git a/test/scripts/0000-Basic/0569 b/test/scripts/0000-Basic/0569
index 41cdb8731c5a8b6c114c8693645a9c4ddba8661e..a744590c25cde50bfa57036ba33c956ea18a99c7 100644 (file)
--- a/test/scripts/0000-Basic/0569
+++ b/test/scripts/0000-Basic/0569
@@ -1,6 +1,7 @@
 # verify = header_names_ascii
 # 1. Headers are good, make sure no misfires.
 exim -bh V4NET.10.10.10
 # verify = header_names_ascii
 # 1. Headers are good, make sure no misfires.
 exim -bh V4NET.10.10.10

+helo test

 mail from:<userx@exim.test.ex>
 rcpt to:<userx@test.ex>
 data
 mail from:<userx@exim.test.ex>
 rcpt to:<userx@test.ex>
 data


@@ -24,6 +25,7 @@ QUIT
 ****
 # 2. A non-ASCII in header name, uses default rejection message
 exim -bh V4NET.10.10.10
 ****
 # 2. A non-ASCII in header name, uses default rejection message
 exim -bh V4NET.10.10.10

+helo test

 mail from:<userx@exim.test.ex>
 rcpt to:<userx@test.ex>
 data
 mail from:<userx@exim.test.ex>
 rcpt to:<userx@test.ex>
 data


@@ -48,6 +50,7 @@ QUIT
 # 3. A non-ASCII character in header name, different from sets an acl variable
 #    causing custom log message
 exim -bh V4NET.10.10.10
 # 3. A non-ASCII character in header name, different from sets an acl variable
 #    causing custom log message
 exim -bh V4NET.10.10.10

+helo test

 mail from:<usery@exim.test.ex>
 rcpt to:<userx@test.ex>
 data
 mail from:<usery@exim.test.ex>
 rcpt to:<userx@test.ex>
 data


@@ -71,6 +74,7 @@ QUIT
 ****
 # 4. A non-ASCII character in header name, uses default rejection message
 exim -bh V4NET.10.10.10
 ****
 # 4. A non-ASCII character in header name, uses default rejection message
 exim -bh V4NET.10.10.10

+helo test

 mail from:<userx@exim.test.ex>
 rcpt to:<userx@test.ex>
 data
 mail from:<userx@exim.test.ex>
 rcpt to:<userx@test.ex>
 data


@@ -94,6 +98,7 @@ QUIT
 ****
 # 5. Headers are good, Unicode in message body, make sure no misfires.
 exim -bh V4NET.10.10.10
 ****
 # 5. Headers are good, Unicode in message body, make sure no misfires.
 exim -bh V4NET.10.10.10

+helo test

 mail from:<userx@exim.test.ex>
 rcpt to:<userx@test.ex>
 data
 mail from:<userx@exim.test.ex>
 rcpt to:<userx@test.ex>
 data


@@ -120,6 +125,7 @@ QUIT
 # 6. Headers are good, Unicode in a header content *and* message body,
 #    make sure no misfires.
 exim -bh V4NET.10.10.10
 # 6. Headers are good, Unicode in a header content *and* message body,
 #    make sure no misfires.
 exim -bh V4NET.10.10.10

+helo test

 mail from:<userx@exim.test.ex>
 rcpt to:<userx@test.ex>
 data
 mail from:<userx@exim.test.ex>
 rcpt to:<userx@test.ex>
 data

diff --git a/test/scripts/0000-Basic/0575 b/test/scripts/0000-Basic/0575
index 302b67f4fd690a9dd956c6a1949acef613c5a61c..9d1e3ed035602a9ac3f5445931b5bc571e35797b 100644 (file)
--- a/test/scripts/0000-Basic/0575
+++ b/test/scripts/0000-Basic/0575
@@ -1,6 +1,7 @@
 # -bh and msglog
 # no logfiles, says the docs
 exim -d -bh V4NET.0.0.0
 # -bh and msglog
 # no logfiles, says the docs
 exim -d -bh V4NET.0.0.0

+helo test

 mail from:<x@y>
 rcpt to:<x@y>
 data
 mail from:<x@y>
 rcpt to:<x@y>
 data

diff --git a/test/scripts/0000-Basic/0576 b/test/scripts/0000-Basic/0576
index 0f9a8c702c18e488063bd6da01def421147ed44f..5d6e8fc2187d1a25f5951f041225a30c3465968a 100644 (file)
--- a/test/scripts/0000-Basic/0576
+++ b/test/scripts/0000-Basic/0576
@@ -4,6 +4,7 @@
 no_msglog_check
 #
 exim -bs
 no_msglog_check
 #
 exim -bs

+HELO test

 MAIL FROM:<CALLER@myhost.test.ex>
 RCPT TO: <normal@test.ex>
 DATA
 MAIL FROM:<CALLER@myhost.test.ex>
 RCPT TO: <normal@test.ex>
 DATA


@@ -44,6 +45,7 @@ exim -DSERVER=server -qGlowpri/3s
 ****
 sleep 1
 exim -bs
 ****
 sleep 1
 exim -bs

+HELO test

 MAIL FROM:<CALLER@myhost.test.ex>
 RCPT TO: <lowpri@test.ex>
 DATA
 MAIL FROM:<CALLER@myhost.test.ex>
 RCPT TO: <lowpri@test.ex>
 DATA


@@ -58,6 +60,7 @@ killdaemon
 #
 # third-party queue transfer
 exim -bs
 #
 # third-party queue transfer
 exim -bs

+HELO test

 MAIL FROM:<CALLER@myhost.test.ex>
 RCPT TO: <alternate@test.ex>
 DATA
 MAIL FROM:<CALLER@myhost.test.ex>
 RCPT TO: <alternate@test.ex>
 DATA


@@ -76,6 +79,7 @@ exim -q
 # Native queue transfer
 ### load messages
 exim -bs
 # Native queue transfer
 ### load messages
 exim -bs

+HELO test

 MAIL FROM:<CALLER@myhost.test.ex>
 RCPT TO: <normal@test.ex>
 DATA
 MAIL FROM:<CALLER@myhost.test.ex>
 RCPT TO: <normal@test.ex>
 DATA

diff --git a/test/scripts/0000-Basic/0578 b/test/scripts/0000-Basic/0578
index 4267b0cea96a7f05a280d83cdd14127aa64baedd..5660a5349424ec4ca48089bbac55e7ad0f65bf69 100644 (file)
--- a/test/scripts/0000-Basic/0578
+++ b/test/scripts/0000-Basic/0578
@@ -16,11 +16,13 @@ QUIT
 250 OK
 ****
 sudo exim -d-all+verify -v -bs -oMa V4NET.0.0.1
 250 OK
 ****
 sudo exim -d-all+verify -v -bs -oMa V4NET.0.0.1

+HELO test

 MAIL FROM:<ok@localhost>
 RCPT TO:<z@test.ex>
 QUIT
 ****
 sudo exim -d-all+verify -v -bs -oMa V4NET.0.0.1
 MAIL FROM:<ok@localhost>
 RCPT TO:<z@test.ex>
 QUIT
 ****
 sudo exim -d-all+verify -v -bs -oMa V4NET.0.0.1

+HELO test

 MAIL FROM:<ok@localhost>
 RCPT TO:<z@test.ex>
 QUIT
 MAIL FROM:<ok@localhost>
 RCPT TO:<z@test.ex>
 QUIT


@@ -29,6 +31,7 @@ QUIT
 sleep 2
 # Should want to connect, but fail
 sudo exim -d-all+verify -v -bs -oMa V4NET.0.0.1
 sleep 2
 # Should want to connect, but fail
 sudo exim -d-all+verify -v -bs -oMa V4NET.0.0.1

+HELO test

 MAIL FROM:<ok@localhost>
 RCPT TO:<z@test.ex>
 QUIT
 MAIL FROM:<ok@localhost>
 RCPT TO:<z@test.ex>
 QUIT


@@ -48,11 +51,13 @@ QUIT
 250 OK
 ****
 sudo exim -d-all+verify -v -bs -oMa V4NET.0.0.1
 250 OK
 ****
 sudo exim -d-all+verify -v -bs -oMa V4NET.0.0.1

+HELO test

 MAIL FROM:<bad@localhost>
 RCPT TO:<z@test.ex>
 QUIT
 ****
 sudo exim -d-all+verify -v -bs -oMa V4NET.0.0.1
 MAIL FROM:<bad@localhost>
 RCPT TO:<z@test.ex>
 QUIT
 ****
 sudo exim -d-all+verify -v -bs -oMa V4NET.0.0.1

+HELO test

 MAIL FROM:<bad@localhost>
 RCPT TO:<z@test.ex>
 QUIT
 MAIL FROM:<bad@localhost>
 RCPT TO:<z@test.ex>
 QUIT


@@ -72,11 +77,13 @@ QUIT
 250 OK
 ****
 sudo exim -d-all+verify -v -bs -oMa V4NET.0.0.1
 250 OK
 ****
 sudo exim -d-all+verify -v -bs -oMa V4NET.0.0.1

+HELO test

 MAIL FROM:<ok@localhost>
 RCPT TO:<z@test.ex>
 QUIT
 ****
 sudo exim -d-all+verify -v -bs -oMa V4NET.0.0.1
 MAIL FROM:<ok@localhost>
 RCPT TO:<z@test.ex>
 QUIT
 ****
 sudo exim -d-all+verify -v -bs -oMa V4NET.0.0.1

+HELO test

 MAIL FROM:<ok@localhost>
 RCPT TO:<z@test.ex>
 QUIT
 MAIL FROM:<ok@localhost>
 RCPT TO:<z@test.ex>
 QUIT


@@ -102,11 +109,13 @@ QUIT
 250 OK
 ****
 sudo exim -d-all+verify -v -bs -oMa V4NET.0.0.2
 250 OK
 ****
 sudo exim -d-all+verify -v -bs -oMa V4NET.0.0.2

+HELO test

 MAIL FROM:<ok@otherhost>
 RCPT TO:<z@test.ex>
 QUIT
 ****
 sudo exim -d-all+verify -v -bs -oMa V4NET.0.0.2
 MAIL FROM:<ok@otherhost>
 RCPT TO:<z@test.ex>
 QUIT
 ****
 sudo exim -d-all+verify -v -bs -oMa V4NET.0.0.2

+HELO test

 MAIL FROM:<ok@otherhost>
 RCPT TO:<z@test.ex>
 QUIT
 MAIL FROM:<ok@otherhost>
 RCPT TO:<z@test.ex>
 QUIT


@@ -132,11 +141,13 @@ QUIT
 250 OK
 ****
 sudo exim -d-all+verify -v -bs -oMa V4NET.0.0.2
 250 OK
 ****
 sudo exim -d-all+verify -v -bs -oMa V4NET.0.0.2

+HELO test

 MAIL FROM:<ok@otherhost2>
 RCPT TO:<z@test.ex>
 QUIT
 ****
 sudo exim -d-all+verify -v -bs -oMa V4NET.0.0.2
 MAIL FROM:<ok@otherhost2>
 RCPT TO:<z@test.ex>
 QUIT
 ****
 sudo exim -d-all+verify -v -bs -oMa V4NET.0.0.2

+HELO test

 MAIL FROM:<ok@otherhost2>
 RCPT TO:<z@test.ex>
 QUIT
 MAIL FROM:<ok@otherhost2>
 RCPT TO:<z@test.ex>
 QUIT


@@ -156,11 +167,13 @@ QUIT
 250 OK
 ****
 sudo exim -d-all+verify -v -bs -oMa V4NET.0.0.3
 250 OK
 ****
 sudo exim -d-all+verify -v -bs -oMa V4NET.0.0.3

+HELO test

 MAIL FROM:<ok@otherhost3>
 RCPT TO:<z@test.ex>
 QUIT
 ****
 sudo exim -d-all+verify -v -bs -oMa V4NET.0.0.3
 MAIL FROM:<ok@otherhost3>
 RCPT TO:<z@test.ex>
 QUIT
 ****
 sudo exim -d-all+verify -v -bs -oMa V4NET.0.0.3

+HELO test

 MAIL FROM:<otherok@otherhost3>
 RCPT TO:<z@test.ex>
 QUIT
 MAIL FROM:<otherok@otherhost3>
 RCPT TO:<z@test.ex>
 QUIT


@@ -180,11 +193,13 @@ QUIT
 250 OK
 ****
 sudo exim -d-all+verify -v -bs -oMa V4NET.0.0.4
 250 OK
 ****
 sudo exim -d-all+verify -v -bs -oMa V4NET.0.0.4

+HELO test

 MAIL FROM:<ok@otherhost4>
 RCPT TO:<z@test.ex>
 QUIT
 ****
 sudo exim -d-all+verify -v -bs -oMa V4NET.0.0.4
 MAIL FROM:<ok@otherhost4>
 RCPT TO:<z@test.ex>
 QUIT
 ****
 sudo exim -d-all+verify -v -bs -oMa V4NET.0.0.4

+HELO test

 MAIL FROM:<ok@otherhost4>
 RCPT TO:<z@test.ex>
 QUIT
 MAIL FROM:<ok@otherhost4>
 RCPT TO:<z@test.ex>
 QUIT


@@ -216,11 +231,13 @@ QUIT
 250 OK
 ****
 sudo exim -d-all+verify -v -bs -oMa V4NET.0.0.4
 250 OK
 ****
 sudo exim -d-all+verify -v -bs -oMa V4NET.0.0.4

+HELO test

 MAIL FROM:<ok@otherhost41>
 RCPT TO:<z@test.ex>
 QUIT
 ****
 sudo exim -d-all+verify -v -bs -oMa V4NET.0.0.4
 MAIL FROM:<ok@otherhost41>
 RCPT TO:<z@test.ex>
 QUIT
 ****
 sudo exim -d-all+verify -v -bs -oMa V4NET.0.0.4

+HELO test

 MAIL FROM:<ok@otherhost41>
 RCPT TO:<z@test.ex>
 QUIT
 MAIL FROM:<ok@otherhost41>
 RCPT TO:<z@test.ex>
 QUIT


@@ -247,6 +264,7 @@ QUIT
 250 OK
 ****
 sudo exim -d-all+verify -v -bs -oMa V4NET.0.0.2
 250 OK
 ****
 sudo exim -d-all+verify -v -bs -oMa V4NET.0.0.2

+HELO test

 MAIL FROM:<ok@otherhost21>
 RCPT TO:<z@test.ex>
 QUIT
 MAIL FROM:<ok@otherhost21>
 RCPT TO:<z@test.ex>
 QUIT


@@ -265,6 +283,7 @@ QUIT
 250 OK
 ****
 sudo exim -d-all+verify -v -bs -oMa V4NET.0.0.2
 250 OK
 ****
 sudo exim -d-all+verify -v -bs -oMa V4NET.0.0.2

+HELO test

 MAIL FROM:<ok2@otherhost21>
 RCPT TO:<z@test.ex>
 QUIT
 MAIL FROM:<ok2@otherhost21>
 RCPT TO:<z@test.ex>
 QUIT


@@ -290,6 +309,7 @@ QUIT
 250 OK
 ****
 sudo exim -d-all+verify -v -bs -oMa V4NET.0.0.3
 250 OK
 ****
 sudo exim -d-all+verify -v -bs -oMa V4NET.0.0.3

+HELO test

 MAIL FROM:<ok@otherhost31>
 RCPT TO:<z@test.ex>
 QUIT
 MAIL FROM:<ok@otherhost31>
 RCPT TO:<z@test.ex>
 QUIT


@@ -308,6 +328,7 @@ QUIT
 250 OK
 ****
 sudo exim -d-all+verify -v -bs -oMa V4NET.0.0.3
 250 OK
 ****
 sudo exim -d-all+verify -v -bs -oMa V4NET.0.0.3

+HELO test

 MAIL FROM:<okok@otherhost31>
 RCPT TO:<z@test.ex>
 QUIT
 MAIL FROM:<okok@otherhost31>
 RCPT TO:<z@test.ex>
 QUIT


@@ -334,6 +355,7 @@ QUIT
 250 OK
 ****
 sudo exim -DPEX=1s -d-all+verify -v -bs -oMa V4NET.0.0.3
 250 OK
 ****
 sudo exim -DPEX=1s -d-all+verify -v -bs -oMa V4NET.0.0.3

+HELO test

 MAIL FROM:<okokok@otherhost31>
 RCPT TO:<z@test.ex>
 QUIT
 MAIL FROM:<okokok@otherhost31>
 RCPT TO:<z@test.ex>
 QUIT


@@ -351,6 +373,7 @@ RCPT TO
 *sleep 2
 ****
 sudo exim -d-all+verify -v -bs -oMa V4NET.0.0.5
 *sleep 2
 ****
 sudo exim -d-all+verify -v -bs -oMa V4NET.0.0.5

+HELO test

 MAIL FROM:<okok@otherhost51>
 RCPT TO:<z@test.ex>
 QUIT
 MAIL FROM:<okok@otherhost51>
 RCPT TO:<z@test.ex>
 QUIT


@@ -376,6 +399,7 @@ QUIT
 250 OK
 ****
 sudo exim -d-all+verify -v -bs -oMa V4NET.0.0.6
 250 OK
 ****
 sudo exim -d-all+verify -v -bs -oMa V4NET.0.0.6

+HELO test

 MAIL FROM:<okokok@otherhost52>
 RCPT TO:<z@test.ex>
 QUIT
 MAIL FROM:<okokok@otherhost52>
 RCPT TO:<z@test.ex>
 QUIT


@@ -395,6 +419,7 @@ QUIT
 250 OK
 ****
 sudo exim -d-all+verify -odq -v -bs -oMa V4NET.0.0.7
 250 OK
 ****
 sudo exim -d-all+verify -odq -v -bs -oMa V4NET.0.0.7

+HELO test

 MAIL FROM:<ok7@otherhost53>
 RCPT TO:<z@test.ex>
 DATA
 MAIL FROM:<ok7@otherhost53>
 RCPT TO:<z@test.ex>
 DATA


@@ -415,6 +440,7 @@ RCPT TO
 *sleep 2
 ****
 sudo exim -d-all+verify -odq -v -bs -oMa V4NET.0.0.8
 *sleep 2
 ****
 sudo exim -d-all+verify -odq -v -bs -oMa V4NET.0.0.8

+HELO test

 MAIL FROM:<ok7@otherhost53>
 RCPT TO:<z@test.ex>
 DATA
 MAIL FROM:<ok7@otherhost53>
 RCPT TO:<z@test.ex>
 DATA


@@ -445,6 +471,7 @@ QUIT
 250 OK
 ****
 sudo exim -d-all+verify -v -bs -oMa V4NET.0.0.9
 250 OK
 ****
 sudo exim -d-all+verify -v -bs -oMa V4NET.0.0.9

+HELO test

 MAIL FROM:<ok@otherhost9>
 RCPT TO:<z@test.ex>
 QUIT
 MAIL FROM:<ok@otherhost9>
 RCPT TO:<z@test.ex>
 QUIT


@@ -476,6 +503,7 @@ QUIT
 250 OK
 ****
 sudo exim -d-all+verify -v -bs -oMa V4NET.0.0.10
 250 OK
 ****
 sudo exim -d-all+verify -v -bs -oMa V4NET.0.0.10

+HELO test

 MAIL FROM:<ok@otherhost10>
 RCPT TO:<z@test.ex>
 QUIT
 MAIL FROM:<ok@otherhost10>
 RCPT TO:<z@test.ex>
 QUIT

diff --git a/test/scripts/0000-Basic/0580 b/test/scripts/0000-Basic/0580
index 5cce3e8585ce042c48857a51c3646d0514eb6127..4d216677af913079d1ed42eddc5bb1cbc7af16ff 100644 (file)
--- a/test/scripts/0000-Basic/0580
+++ b/test/scripts/0000-Basic/0580
@@ -20,6 +20,7 @@ QUIT
 ****
 #
 exim -bs -odi
 ****
 #
 exim -bs -odi

+helo test

 mail from:<userx@ok.example>
 rcpt to:<usery@test.ex>
 data
 mail from:<userx@ok.example>
 rcpt to:<usery@test.ex>
 data


@@ -62,6 +63,7 @@ QUIT
 ****
 #
 exim -bs -odi
 ****
 #
 exim -bs -odi

+helo test

 mail from:<userx@ok.example>
 rcpt to:<usery@test.ex>
 rcpt to:<usery2@test.ex>
 mail from:<userx@ok.example>
 rcpt to:<usery@test.ex>
 rcpt to:<usery2@test.ex>


@@ -104,6 +106,7 @@ QUIT
 ****
 #
 exim -bs -odi
 ****
 #
 exim -bs -odi

+helo test

 mail from:<userx@ok.example>
 rcpt to:<usery3@test.ex>
 rcpt to:<usery@test.ex>
 mail from:<userx@ok.example>
 rcpt to:<usery3@test.ex>
 rcpt to:<usery@test.ex>


@@ -136,6 +139,7 @@ QUIT
 ****
 #
 exim -bs -odi
 ****
 #
 exim -bs -odi

+helo test

 mail from:<userx@ok.example>
 rcpt to:<usery4@test.ex>
 rcpt to:<usery5@test.ex>
 mail from:<userx@ok.example>
 rcpt to:<usery4@test.ex>
 rcpt to:<usery5@test.ex>


@@ -164,6 +168,7 @@ QUIT
 221 bye
 ****
 exim -bs -odi
 221 bye
 ****
 exim -bs -odi

+helo test

 mail from:<useri@ok.example>
 rcpt to:<remote@test.ex>
 rcpt to:<local@test.ex>
 mail from:<useri@ok.example>
 rcpt to:<remote@test.ex>
 rcpt to:<local@test.ex>

diff --git a/test/scripts/0000-Basic/0582 b/test/scripts/0000-Basic/0582
index 6da20235ab037638b6831dfb0ce8b1a5d30470ca..da93d1a5ea248c04ebee63d652b1c4e765f1f6de 100644 (file)
--- a/test/scripts/0000-Basic/0582
+++ b/test/scripts/0000-Basic/0582
@@ -16,6 +16,7 @@ QUIT
 ****
 #
 exim -bs -odi
 ****
 #
 exim -bs -odi

+helo test

 mail from:<userg@ok.example>
 rcpt to:<userg@test.ex>
 quit
 mail from:<userg@ok.example>
 rcpt to:<userg@test.ex>
 quit


@@ -39,6 +40,7 @@ QUIT
 ****
 #
 exim -bs -odi
 ****
 #
 exim -bs -odi

+helo test

 mail from:<userh@ok.example>
 rcpt to:<userh@test.ex>
 data
 mail from:<userh@ok.example>
 rcpt to:<userh@test.ex>
 data

diff --git a/test/scripts/0000-Basic/0584 b/test/scripts/0000-Basic/0584
index c7f543d36cb0010f8ce18cc4d6ec7fdaecef5a22..8c629a1b54e9a9f6d32bed1fada94366f18072e3 100644 (file)
--- a/test/scripts/0000-Basic/0584
+++ b/test/scripts/0000-Basic/0584
@@ -2,6 +2,7 @@
 #
 # pass
 exim -DOPT=userx@test.ex -bh 127.0.0.1
 #
 # pass
 exim -DOPT=userx@test.ex -bh 127.0.0.1

+helo test

 mail from:<userx@test.ex>
 rcpt to:<userx@test.ex>
 data
 mail from:<userx@test.ex>
 rcpt to:<userx@test.ex>
 data


@@ -12,12 +13,14 @@ QUIT
 ****
 # fail
 exim -DOPT=fail@test.ex -bh 127.0.0.1
 ****
 # fail
 exim -DOPT=fail@test.ex -bh 127.0.0.1

+helo test

 mail from:<userx@test.ex>
 rcpt to:<userx@test.ex>
 QUIT
 ****
 # check can use tainted data
 exim -DOPT='$sender_address/defer_ok' -bh 127.0.0.1
 mail from:<userx@test.ex>
 rcpt to:<userx@test.ex>
 QUIT
 ****
 # check can use tainted data
 exim -DOPT='$sender_address/defer_ok' -bh 127.0.0.1

+helo test

 mail from:<userx@test.ex>
 rcpt to:<userx@test.ex>
 data
 mail from:<userx@test.ex>
 rcpt to:<userx@test.ex>
 data

diff --git a/test/scripts/0000-Basic/0585 b/test/scripts/0000-Basic/0585
index c4ae477c1b10253fa8540a8b8d03d5a880a3439f..b4d8258936f2c6f547ef2a852422db6ca3d2fb7f 100644 (file)
--- a/test/scripts/0000-Basic/0585
+++ b/test/scripts/0000-Basic/0585
@@ -2,6 +2,7 @@
 #
 # Accept: the env rcpt matches a header To:
 exim -odq -bs
 #
 # Accept: the env rcpt matches a header To:
 exim -odq -bs

+helo test

 mail from:<>
 rcpt to:<userx@dom.com>
 data
 mail from:<>
 rcpt to:<userx@dom.com>
 data


@@ -11,6 +12,7 @@ quit
 ****
 ### Reject: no match
 exim -odq -bs
 ****
 ### Reject: no match
 exim -odq -bs

+helo test

 mail from:<>
 rcpt to:<userx@dom.com>
 data
 mail from:<>
 rcpt to:<userx@dom.com>
 data


@@ -20,6 +22,7 @@ quit
 ****
 ### Reject, with specific SMTP message
 exim -DERROR_DETAILS=smtp_return_error_details -odq -bs
 ****
 ### Reject, with specific SMTP message
 exim -DERROR_DETAILS=smtp_return_error_details -odq -bs

+helo test

 mail from:<>
 rcpt to:<userx@dom.com>
 data
 mail from:<>
 rcpt to:<userx@dom.com>
 data


@@ -29,6 +32,7 @@ quit
 ****
 ### Accept, matches in header CC:
 exim -odq -bs
 ****
 ### Accept, matches in header CC:
 exim -odq -bs

+helo test

 mail from:<>
 rcpt to:<userx@dom.com>
 rcpt to:<usery@dom.com>
 mail from:<>
 rcpt to:<userx@dom.com>
 rcpt to:<usery@dom.com>


@@ -40,6 +44,7 @@ quit
 ****
 ### Reject: To: & CC: combo, an env rcpt missing
 exim -odq -bs
 ****
 ### Reject: To: & CC: combo, an env rcpt missing
 exim -odq -bs

+helo test

 mail from:<>
 rcpt to:<userx@dom.com>
 rcpt to:<usery@dom.com>
 mail from:<>
 rcpt to:<userx@dom.com>
 rcpt to:<usery@dom.com>


@@ -52,6 +57,7 @@ quit
 ****
 ### Accept: Resent-To: & Resent-CC: combo
 exim -odq -bs
 ****
 ### Accept: Resent-To: & Resent-CC: combo
 exim -odq -bs

+helo test

 mail from:<>
 rcpt to:<userx@dom.com>
 rcpt to:<usery@dom.com>
 mail from:<>
 rcpt to:<userx@dom.com>
 rcpt to:<usery@dom.com>

diff --git a/test/scripts/0000-Basic/0593 b/test/scripts/0000-Basic/0593
index 81a1b4c0351e041be2bef223cf7553953682dce3..00790ff1c206df0a371ed269f6c5b80baef975a6 100644 (file)
--- a/test/scripts/0000-Basic/0593
+++ b/test/scripts/0000-Basic/0593
@@ -2,6 +2,7 @@
 #
 # This should trap
 exim -bs -odi
 #
 # This should trap
 exim -bs -odi

+helo test

 mail from:someone@some.domain
 rcpt to:fred@HOSTNAME
 data
 mail from:someone@some.domain
 rcpt to:fred@HOSTNAME
 data


@@ -12,6 +13,7 @@ quit
 # taint trap defated by using create_file
 # goes on to fail on perms
 exim -bs -odi -DOPT=DIR/test-mail
 # taint trap defated by using create_file
 # goes on to fail on perms
 exim -bs -odi -DOPT=DIR/test-mail

+helo test

 mail from:someone@some.domain
 rcpt to:bill@HOSTNAME
 data
 mail from:someone@some.domain
 rcpt to:bill@HOSTNAME
 data

diff --git a/test/scripts/0000-Basic/0596 b/test/scripts/0000-Basic/0596
index 038254eaba1e9a4dc58d0d2824cee9a8b38bc7f7..72d2b1408076d701d8d35ee3c1dcbaf5013c5662 100644 (file)
--- a/test/scripts/0000-Basic/0596
+++ b/test/scripts/0000-Basic/0596
@@ -1,6 +1,7 @@
 # $local_part_data, multi-rcpt message
 #
 exim -bs -odi
 # $local_part_data, multi-rcpt message
 #
 exim -bs -odi

+helo test

 mail from:<someone@some.domain>
 rcpt to:<CALLER@HOSTNAME>
 rcpt to:<b@remote>
 mail from:<someone@some.domain>
 rcpt to:<CALLER@HOSTNAME>
 rcpt to:<b@remote>


@@ -9,6 +10,7 @@ data
 quit
 ****
 exim -bs -odi
 quit
 ****
 exim -bs -odi

+helo test

 mail from:<someone@some.domain>
 rcpt to:<a@remote>
 rcpt to:<CALLER@HOSTNAME>
 mail from:<someone@some.domain>
 rcpt to:<a@remote>
 rcpt to:<CALLER@HOSTNAME>

diff --git a/test/scripts/0000-Basic/0599 b/test/scripts/0000-Basic/0599
index 360d536c0df46fdd8c9020d3296b0e4e0d8e9497..b5aca88bf9ae44d4f943c6493be61b0f376968e0 100644 (file)
--- a/test/scripts/0000-Basic/0599
+++ b/test/scripts/0000-Basic/0599
@@ -6,6 +6,7 @@ perl aux-fixed/0601.udpserver
 ****
 #
 exim -bs -odi
 ****
 #
 exim -bs -odi

+helo test

 mail from:someone@some.domain
 rcpt to:CALLER@HOSTNAME
 data
 mail from:someone@some.domain
 rcpt to:CALLER@HOSTNAME
 data

diff --git a/test/scripts/0000-Basic/0600 b/test/scripts/0000-Basic/0600
index 43f7288225849a3c5f6585d522063fb630cd31d9..eadbcb7a7d1a5f5d22fa28ad467d0238009b38ae 100644 (file)
--- a/test/scripts/0000-Basic/0600
+++ b/test/scripts/0000-Basic/0600
@@ -2,6 +2,7 @@
 #
 # -bs to simple local delivery
 exim -bs -odi
 #
 # -bs to simple local delivery
 exim -bs -odi

+helo test

 mail from:CALLER@HOSTNAME
 rcpt to:CALLER@HOSTNAME
 data
 mail from:CALLER@HOSTNAME
 rcpt to:CALLER@HOSTNAME
 data


@@ -20,6 +21,7 @@ This is the last line.
 quit
 ****
 exim -bs -odi
 quit
 ****
 exim -bs -odi

+helo test

 mail from:CALLER@HOSTNAME
 rcpt to:CALLER@HOSTNAME
 data
 mail from:CALLER@HOSTNAME
 rcpt to:CALLER@HOSTNAME
 data

diff --git a/test/scripts/0000-Basic/0607 b/test/scripts/0000-Basic/0607
index 83c83b312fcc105f4506d9c5c063bc36d8ffc92a..42dc1ca5e4bed3beca1af42b9670e8a092225c92 100644 (file)
--- a/test/scripts/0000-Basic/0607
+++ b/test/scripts/0000-Basic/0607
@@ -7,6 +7,7 @@ exim -DSERVER=server -bd -oX PORT_D
 ****
 #
 exim -bs
 ****
 #
 exim -bs

+HELO test

 MAIL FROM:<CALLER@myhost.test.ex>
 RCPT TO: <testx@cname46.test.ex>
 DATA
 MAIL FROM:<CALLER@myhost.test.ex>
 RCPT TO: <testx@cname46.test.ex>
 DATA

diff --git a/test/scripts/0000-Basic/0609 b/test/scripts/0000-Basic/0609
index 86f75326ff84ef7f008334a7909c96579dfd07ce..79f214ba8e70c1315b6755c40e6ec5207658c05d 100644 (file)
--- a/test/scripts/0000-Basic/0609
+++ b/test/scripts/0000-Basic/0609
@@ -12,6 +12,8 @@ exim -d-all+acl -DSERVER=server -odq -bd -oX PORT_D
 # Server delays 4s before accepting RCPT
 client 127.0.0.1 PORT_D
 ??? 220
 # Server delays 4s before accepting RCPT
 client 127.0.0.1 PORT_D
 ??? 220

+helo test
+??? 250

 mail from:<x@y.test.ex>
 ??? 250
 rcpt to:<delay4_accept@y.test.ex>
 mail from:<x@y.test.ex>
 ??? 250
 rcpt to:<delay4_accept@y.test.ex>


@@ -24,6 +26,8 @@ quit
 # but client closes connection
 client 127.0.0.1 PORT_D
 ??? 220
 # but client closes connection
 client 127.0.0.1 PORT_D
 ??? 220

+helo test
+??? 250

 mail from:<x@y.test.ex>
 ??? 250
 rcpt to:<delay4_accept@y.test.ex>
 mail from:<x@y.test.ex>
 ??? 250
 rcpt to:<delay4_accept@y.test.ex>

diff --git a/test/scripts/0000-Basic/0610 b/test/scripts/0000-Basic/0610
index ff690f63f2d2dee3ce17c27ce09e0fa7a753e373..758e7fb432957685f7bb053ea6daf7c7f444982b 100644 (file)
--- a/test/scripts/0000-Basic/0610
+++ b/test/scripts/0000-Basic/0610
@@ -5,6 +5,7 @@ exim -DSERVER=server -bd -oX PORT_D
 ****
 #
 exim -bs
 ****
 #
 exim -bs

+HELO test

 MAIL FROM:<t1@dustyshoes.tld>
 RCPT TO:<fred@anotherone.tld>
 DATA
 MAIL FROM:<t1@dustyshoes.tld>
 RCPT TO:<fred@anotherone.tld>
 DATA

diff --git a/test/scripts/0000-Basic/0614 b/test/scripts/0000-Basic/0614
index 38e374a1f91104bd431b5622598251f043668867..0d23186d13640b950021a100ac33c07bcbfced6e 100644 (file)
--- a/test/scripts/0000-Basic/0614
+++ b/test/scripts/0000-Basic/0614
@@ -8,6 +8,7 @@ exim -DSERVER=server -bd -oX PORT_D
 ****
 #
 exim -bs
 ****
 #
 exim -bs

+helo test

 mail from:ralph@dustyshoes.tld
 rcpt to:bob@anotherone.tld
 data
 mail from:ralph@dustyshoes.tld
 rcpt to:bob@anotherone.tld
 data

diff --git a/test/scripts/0000-Basic/0615 b/test/scripts/0000-Basic/0615
index a24d194faaaeeba63c23c978d07cada2652ca6bb..1712c888f6cec7f49d41d9ee8861ecb2c1a3ec78 100644 (file)
--- a/test/scripts/0000-Basic/0615
+++ b/test/scripts/0000-Basic/0615
@@ -7,6 +7,7 @@ exim -DSERVER=server -bd -oX PORT_D
 ****
 #
 exim -bs
 ****
 #
 exim -bs

+helo test

 mail from:ralph@dustyshoes.tld
 rcpt to:bob@anotherone.tld
 data
 mail from:ralph@dustyshoes.tld
 rcpt to:bob@anotherone.tld
 data

diff --git a/test/scripts/0999-EXP-Queue-Ramp/0999 b/test/scripts/0999-EXP-Queue-Ramp/0999
index 529fa16a117faa38c9fb7a2d1d4d9340f8b276d6..3fb8df90db36a947d9fd7fca33b56af0361f6695 100644 (file)
--- a/test/scripts/0999-EXP-Queue-Ramp/0999
+++ b/test/scripts/0999-EXP-Queue-Ramp/0999
@@ -15,6 +15,7 @@ exim -DSERVER=server -bd -q30m -odd -oX PORT_D
 ****
 #
 exim -bs
 ****
 #
 exim -bs

+helo test

 mail from:ralph@dustyshoes.tld
 rcpt to:bob@anotherone.tld
 data
 mail from:ralph@dustyshoes.tld
 rcpt to:bob@anotherone.tld
 data

diff --git a/test/scripts/1000-Basic-ipv6/1002 b/test/scripts/1000-Basic-ipv6/1002
index c9a8b3f22a459032c0e530fa8250d971ecb139f9..f5f952304e51ea6faa02c780e05ecb89663f654a 100644 (file)
--- a/test/scripts/1000-Basic-ipv6/1002
+++ b/test/scripts/1000-Basic-ipv6/1002
@@ -1,5 +1,6 @@
 # @ items in domain lists and host lists
 exim -bh V4NET.1.1.1
 # @ items in domain lists and host lists
 exim -bh V4NET.1.1.1

+helo test

 mail from:<x@y>
 rcpt to:<1@[::1]>
 rcpt to:<6@mxt11a.test.ex>
 mail from:<x@y>
 rcpt to:<1@[::1]>
 rcpt to:<6@mxt11a.test.ex>

diff --git a/test/scripts/1100-Basic-TLS/1103 b/test/scripts/1100-Basic-TLS/1103
index d8441dc4055033f4637d0bf29a327fb9e4d1bdb8..734780f4d9ca9b9fbb93af092c774ef1d225b237 100644 (file)
--- a/test/scripts/1100-Basic-TLS/1103
+++ b/test/scripts/1100-Basic-TLS/1103
@@ -13,6 +13,12 @@ ehlo rhu.barb
 ??? 250
 starttls
 ??? 220
 ??? 250
 starttls
 ??? 220

+ehlo test
+??? 250-
+??? 250-
+??? 250-
+??? 250-
+??? 250

 mail from:<userx@test.ex>
 ??? 250
 rcpt to:<userx@test.ex>
 mail from:<userx@test.ex>
 ??? 250
 rcpt to:<userx@test.ex>

diff --git a/test/scripts/1100-Basic-TLS/1105 b/test/scripts/1100-Basic-TLS/1105
index fe06d2cabd8f6a6dbfdb5db5cff4a0f590cb7c33..01f911329d84b118d51c20be544d58f59dd69b1a 100644 (file)
--- a/test/scripts/1100-Basic-TLS/1105
+++ b/test/scripts/1100-Basic-TLS/1105
@@ -4,6 +4,8 @@ exim -DSERVER=server -bd -oX PORT_D
 ****
 client-anytls 127.0.0.1 PORT_D
 ??? 220
 ****
 client-anytls 127.0.0.1 PORT_D
 ??? 220

+helo test
+??? 250

 mail from:<userx@test.ex>
 ??? 250
 rcpt to:<userx@remote.test.ex>
 mail from:<userx@test.ex>
 ??? 250
 rcpt to:<userx@remote.test.ex>


@@ -17,6 +19,12 @@ ehlo rhu.barb
 ??? 250
 starttls
 ??? 220
 ??? 250
 starttls
 ??? 220

+ehlo rhu.barb
+??? 250-
+??? 250-
+??? 250-
+??? 250-
+??? 250

 mail from:<userx@test.ex>
 ??? 250
 rcpt to:<userx@remote.test.ex>
 mail from:<userx@test.ex>
 ??? 250
 rcpt to:<userx@remote.test.ex>

diff --git a/test/scripts/1100-Basic-TLS/1108 b/test/scripts/1100-Basic-TLS/1108
index 7da4f444bfa31f360a79e901cc142c932a1e21f2..4e85dc58650b5300ae90ccccc87f4db2ea8ef9a7 100644 (file)
--- a/test/scripts/1100-Basic-TLS/1108
+++ b/test/scripts/1100-Basic-TLS/1108
@@ -13,6 +13,12 @@ ehlo rhu.barb
 ??? 250
 starttls
 ??? 220
 ??? 250
 starttls
 ??? 220

+ehlo rhu.barb
+??? 250-
+??? 250-
+??? 250-
+??? 250-
+??? 250

 mail from:<userx@test.ex>
 ??? 250
 rcpt to:<userx@test.ex>
 mail from:<userx@test.ex>
 ??? 250
 rcpt to:<userx@test.ex>

diff --git a/test/scripts/1100-Basic-TLS/1110 b/test/scripts/1100-Basic-TLS/1110
index effc75006cfb2ca661f2ed5f43612e227fa39268..f81b7d8c74f89928a6477e57ddf2babd9716af0e 100644 (file)
--- a/test/scripts/1100-Basic-TLS/1110
+++ b/test/scripts/1100-Basic-TLS/1110
@@ -24,6 +24,8 @@ quit
 ****
 client-anytls -tls-on-connect HOSTIPV4 PORT_D aux-fixed/exim-ca/example.org/server2.example.org/server2.example.org.pem aux-fixed/exim-ca/example.org/server2.example.org/server2.example.org.unlocked.key
 ??? 220
 ****
 client-anytls -tls-on-connect HOSTIPV4 PORT_D aux-fixed/exim-ca/example.org/server2.example.org/server2.example.org.pem aux-fixed/exim-ca/example.org/server2.example.org/server2.example.org.unlocked.key
 ??? 220

+helo test
+??? 250

 mail from:<userx@test.ex>
 ??? 250
 rcpt to:<userx@test.ex>
 mail from:<userx@test.ex>
 ??? 250
 rcpt to:<userx@test.ex>

diff --git a/test/scripts/2000-GnuTLS/2002 b/test/scripts/2000-GnuTLS/2002
index c96ffa1b98a1625af583a867d1457cb2d48f87e9..2cf6b3329faddb7f7fe66bf7e74f2ff0fd17977b 100644 (file)
--- a/test/scripts/2000-GnuTLS/2002
+++ b/test/scripts/2000-GnuTLS/2002
@@ -24,6 +24,12 @@ ehlo rhu.barb
 ??? 250
 starttls
 ??? 220
 ??? 250
 starttls
 ??? 220

+ehlo rhu.barb
+??? 250-
+??? 250-
+??? 250-
+??? 250-
+??? 250

 mail from:<CALLER@test.ex>
 ??? 250
 rcpt to:<CALLER@test.ex>
 mail from:<CALLER@test.ex>
 ??? 250
 rcpt to:<CALLER@test.ex>


@@ -47,6 +53,8 @@ ehlo rhu.barb
 ??? 250
 starttls
 ??? 220
 ??? 250
 starttls
 ??? 220

+helo test
+??? 250

 mail from:<"name with spaces"@test.ex>
 ??? 250
 rcpt to:<CALLER@test.ex>
 mail from:<"name with spaces"@test.ex>
 ??? 250
 rcpt to:<CALLER@test.ex>


@@ -94,6 +102,8 @@ ehlo rhu.barb
 ??? 250
 starttls
 ??? 220
 ??? 250
 starttls
 ??? 220

+helo test
+??? 250

 mail from:<CALLER@test.ex>
 ??? 250
 rcpt to:<CALLER@test.ex>
 mail from:<CALLER@test.ex>
 ??? 250
 rcpt to:<CALLER@test.ex>


@@ -124,6 +134,8 @@ ehlo rhu.barb
 ??? 250
 starttls
 ??? 220
 ??? 250
 starttls
 ??? 220

+helo test
+??? 250

 mail from:<CALLER@test.ex>
 ??? 250
 rcpt to:<CALLER@test.ex>
 mail from:<CALLER@test.ex>
 ??? 250
 rcpt to:<CALLER@test.ex>


@@ -151,6 +163,8 @@ ehlo rhu.barb
 ??? 250
 starttls
 ??? 220
 ??? 250
 starttls
 ??? 220

+helo test
+??? 250

 mail from:<CALLER@test.ex>
 ??? 250
 rcpt to:<CALLER@test.ex>
 mail from:<CALLER@test.ex>
 ??? 250
 rcpt to:<CALLER@test.ex>

diff --git a/test/scripts/2000-GnuTLS/2014 b/test/scripts/2000-GnuTLS/2014
index 5bd5858db856c825941b9bd9f639d245ece9f35f..16bcbe4a98e5c05e1e965bda4b69a13e27dbdd3c 100644 (file)
--- a/test/scripts/2000-GnuTLS/2014
+++ b/test/scripts/2000-GnuTLS/2014
@@ -51,6 +51,8 @@ ehlo rhu3.barb
 ??? 250
 starttls
 ??? 220
 ??? 250
 starttls
 ??? 220

+helo test
+??? 250

 mail from:<userx@test.ex>
 ??? 250
 rcpt to:<userx@test.ex>
 mail from:<userx@test.ex>
 ??? 250
 rcpt to:<userx@test.ex>


@@ -70,6 +72,8 @@ ehlo rhu4.barb
 ??? 250
 starttls
 ??? 220
 ??? 250
 starttls
 ??? 220

+helo test
+??? 250

 mail from:<userx@test.ex>
 ??? 250
 rcpt to:<userx@test.ex>
 mail from:<userx@test.ex>
 ??? 250
 rcpt to:<userx@test.ex>


@@ -107,6 +111,8 @@ ehlo rhu6.barb
 ??? 250
 starttls
 ??? 220
 ??? 250
 starttls
 ??? 220

+helo test
+??? 250

 mail from:<userx@test.ex>
 ??? 250
 rcpt to:<userx@test.ex>
 mail from:<userx@test.ex>
 ??? 250
 rcpt to:<userx@test.ex>


@@ -134,7 +140,7 @@ ehlo rhu7.barb
 ??? 250
 starttls
 ??? 220
 ??? 250
 starttls
 ??? 220

-mail from:<userx@test.ex>
+helo test

 ??? 554
 ****
 ### Revoked certificate, certificate optional at TLS time, reject at ACL time
 ??? 554
 ****
 ### Revoked certificate, certificate optional at TLS time, reject at ACL time


@@ -149,6 +155,8 @@ ehlo rhu8.barb
 ??? 250
 starttls
 ??? 220
 ??? 250
 starttls
 ??? 220

+helo test
+??? 250

 mail from:<userx@test.ex>
 ??? 250
 rcpt to:<userx@test.ex>
 mail from:<userx@test.ex>
 ??? 250
 rcpt to:<userx@test.ex>


@@ -168,6 +176,8 @@ ehlo rhu9.barb
 ??? 250
 starttls
 ??? 220
 ??? 250
 starttls
 ??? 220

+helo test
+??? 250

 mail from:<userx@test.ex>
 ??? 250
 rcpt to:<userx@test.ex>
 mail from:<userx@test.ex>
 ??? 250
 rcpt to:<userx@test.ex>

diff --git a/test/scripts/2000-GnuTLS/2029 b/test/scripts/2000-GnuTLS/2029
index ab4f9491ea0f43f381881ee3c475c6c2cbd4310f..bc59e220dae5371e422751949e5f99f830a97e1b 100644 (file)
--- a/test/scripts/2000-GnuTLS/2029
+++ b/test/scripts/2000-GnuTLS/2029
@@ -17,6 +17,8 @@ ehlo abcd
 ??? 250
 starttls
 ??? 220
 ??? 250
 starttls
 ??? 220

+helo test
+??? 250

 mail from:<userx@test.ex>
 ??? 250
 rcpt to:<userx@test.ex>
 mail from:<userx@test.ex>
 ??? 250
 rcpt to:<userx@test.ex>

diff --git a/test/scripts/2000-GnuTLS/2035 b/test/scripts/2000-GnuTLS/2035
index 94923aa6013d0b2028cb2803e3ee10a0bf310d05..fd76f8c776b621c47f53ba57cb59f586352e108d 100644 (file)
--- a/test/scripts/2000-GnuTLS/2035
+++ b/test/scripts/2000-GnuTLS/2035
@@ -10,6 +10,7 @@ exim -bd -DSERVER=server -oX PORT_D
 # "proxied TLS", and the DATA smtp command only done by the transport process.
 # cmdline -bs send
 exim -d-all+transport -bs
 # "proxied TLS", and the DATA smtp command only done by the transport process.
 # cmdline -bs send
 exim -d-all+transport -bs

+helo test

 mail from:<usera@ok.example>
 rcpt to:<userb@test.ex>
 data
 mail from:<usera@ok.example>
 rcpt to:<userb@test.ex>
 data

diff --git a/test/scripts/2000-GnuTLS/2037 b/test/scripts/2000-GnuTLS/2037
index ad13a3f94dc0f6ef5979b1ab9c3135bec15ade5a..7060df0f53c17ffbd55e5fe5037fa7f6367039dc 100644 (file)
--- a/test/scripts/2000-GnuTLS/2037
+++ b/test/scripts/2000-GnuTLS/2037
@@ -6,6 +6,7 @@ exim -bd -DSERVER=server -oX PORT_D
 ****
 # cmdline -bs send, rcpt-time defer
 exim -bs
 ****
 # cmdline -bs send, rcpt-time defer
 exim -bs

+helo test

 mail from:<>
 rcpt to:<rcpt_defer@test.ex>
 quit
 mail from:<>
 rcpt to:<rcpt_defer@test.ex>
 quit


@@ -14,6 +15,7 @@ sleep 3
 #
 # cmdline -bs send, data-time defer
 exim -bs
 #
 # cmdline -bs send, data-time defer
 exim -bs

+helo test

 mail from:<>
 rcpt to:<data_defer@test.ex>
 data
 mail from:<>
 rcpt to:<data_defer@test.ex>
 data

diff --git a/test/scripts/2100-OpenSSL/2102 b/test/scripts/2100-OpenSSL/2102
index 9a9f4d7bd2d071211ebb7b09e14b9578c952e125..290db16f805000e3f379fd6ef0d0142c393fece3 100644 (file)
--- a/test/scripts/2100-OpenSSL/2102
+++ b/test/scripts/2100-OpenSSL/2102
@@ -22,6 +22,12 @@ ehlo rhu.barb
 ??? 250
 starttls
 ??? 220
 ??? 250
 starttls
 ??? 220

+ehlo rhu.barb
+??? 250-
+??? 250-
+??? 250-
+??? 250-
+??? 250

 mail from:<a@test.ex>
 ??? 250
 rcpt to:<CALLER@test.ex>
 mail from:<a@test.ex>
 ??? 250
 rcpt to:<CALLER@test.ex>


@@ -45,6 +51,12 @@ ehlo rhu.barb
 ??? 250
 starttls
 ??? 220
 ??? 250
 starttls
 ??? 220

+ehlo rhu.barb
+??? 250-
+??? 250-
+??? 250-
+??? 250-
+??? 250

 mail from:<"name with spaces"@test.ex>
 ??? 250
 rcpt to:<CALLER@test.ex>
 mail from:<"name with spaces"@test.ex>
 ??? 250
 rcpt to:<CALLER@test.ex>


@@ -84,6 +96,12 @@ ehlo rhu.barb
 ??? 250
 starttls
 ??? 220
 ??? 250
 starttls
 ??? 220

+ehlo rhu.barb
+??? 250-
+??? 250-
+??? 250-
+??? 250-
+??? 250

 mail from:<b@test.ex>
 ??? 250
 rcpt to:<CALLER@test.ex>
 mail from:<b@test.ex>
 ??? 250
 rcpt to:<CALLER@test.ex>


@@ -115,6 +133,12 @@ ehlo rhu.barb
 ??? 250
 starttls
 ??? 220
 ??? 250
 starttls
 ??? 220

+ehlo rhu.barb
+??? 250-
+??? 250-
+??? 250-
+??? 250-
+??? 250

 mail from:<c@test.ex>
 ??? 250
 rcpt to:<CALLER@test.ex>
 mail from:<c@test.ex>
 ??? 250
 rcpt to:<CALLER@test.ex>

diff --git a/test/scripts/2100-OpenSSL/2114 b/test/scripts/2100-OpenSSL/2114
index edf3b6c11af9eee5c7bacf82fc36407c111d7ea9..b5245fd37d453c60b760653502397979a1c46113 100644 (file)
--- a/test/scripts/2100-OpenSSL/2114
+++ b/test/scripts/2100-OpenSSL/2114
@@ -55,6 +55,8 @@ ehlo rhu.barb
 ??? 250
 starttls
 ??? 220
 ??? 250
 starttls
 ??? 220

+helo test
+??? 250

 mail from:<userx@test.ex>
 ??? 250
 rcpt to:<userx@test.ex>
 mail from:<userx@test.ex>
 ??? 250
 rcpt to:<userx@test.ex>


@@ -74,6 +76,8 @@ ehlo rhu.barb
 ??? 250
 starttls
 ??? 220
 ??? 250
 starttls
 ??? 220

+helo test
+??? 250

 mail from:<userx@test.ex>
 ??? 250
 rcpt to:<userx@test.ex>
 mail from:<userx@test.ex>
 ??? 250
 rcpt to:<userx@test.ex>


@@ -110,6 +114,8 @@ ehlo rhu.barb
 ??? 250
 starttls
 ??? 220
 ??? 250
 starttls
 ??? 220

+helo test
+??? 250

 mail from:<userx@test.ex>
 ??? 250
 rcpt to:<userx@test.ex>
 mail from:<userx@test.ex>
 ??? 250
 rcpt to:<userx@test.ex>


@@ -153,6 +159,8 @@ ehlo rhu.barb
 ??? 250
 starttls
 ??? 220
 ??? 250
 starttls
 ??? 220

+helo test
+??? 250

 mail from:<userx@test.ex>
 ??? 250
 rcpt to:<userx@test.ex>
 mail from:<userx@test.ex>
 ??? 250
 rcpt to:<userx@test.ex>


@@ -172,6 +180,8 @@ ehlo rhu.barb
 ??? 250
 starttls
 ??? 220
 ??? 250
 starttls
 ??? 220

+helo test
+??? 250

 mail from:<userx@test.ex>
 ??? 250
 rcpt to:<userx@test.ex>
 mail from:<userx@test.ex>
 ??? 250
 rcpt to:<userx@test.ex>

diff --git a/test/scripts/2100-OpenSSL/2132 b/test/scripts/2100-OpenSSL/2132
index cdf4ed2fd8721fdb7f71887f196c09349693338a..9aa4c1a8c0b56494648979b4eabc4354be494cda 100644 (file)
--- a/test/scripts/2100-OpenSSL/2132
+++ b/test/scripts/2100-OpenSSL/2132
@@ -14,6 +14,8 @@ ehlo rhu.barb
 ??? 250
 starttls
 ??? 220
 ??? 250
 starttls
 ??? 220

+helo test
+??? 250

 mail from:<CALLER@test.ex>
 ??? 250
 rcpt to:<CALLER@test.ex>
 mail from:<CALLER@test.ex>
 ??? 250
 rcpt to:<CALLER@test.ex>


@@ -38,6 +40,8 @@ ehlo rhu.barb
 ??? 250
 starttls
 ??? 220
 ??? 250
 starttls
 ??? 220

+helo test
+??? 250

 mail from:<"name with spaces"@test.ex>
 ??? 250
 rcpt to:<CALLER@test.ex>
 mail from:<"name with spaces"@test.ex>
 ??? 250
 rcpt to:<CALLER@test.ex>


@@ -79,6 +83,8 @@ ehlo rhu.barb
 ??? 250
 starttls
 ??? 220
 ??? 250
 starttls
 ??? 220

+helo test
+??? 250

 mail from:<CALLER@test.ex>
 ??? 250
 rcpt to:<CALLER@test.ex>
 mail from:<CALLER@test.ex>
 ??? 250
 rcpt to:<CALLER@test.ex>

diff --git a/test/scripts/2100-OpenSSL/2135 b/test/scripts/2100-OpenSSL/2135
index ff460c671e12bb64b02fe3a1ecfd87766c133fab..fe7447c0e65cbcb277f79e0252357e548d57c36a 100644 (file)
--- a/test/scripts/2100-OpenSSL/2135
+++ b/test/scripts/2100-OpenSSL/2135
@@ -9,6 +9,7 @@ exim -bd -DSERVER=server -oX PORT_D
 # "proxied TLS", and the DATA smtp command only done by the transport process.
 # cmdline -bs send
 exim -d-all+transport -bs
 # "proxied TLS", and the DATA smtp command only done by the transport process.
 # cmdline -bs send
 exim -d-all+transport -bs

+helo test

 mail from:<usera@ok.example>
 rcpt to:<userb@test.ex>
 data
 mail from:<usera@ok.example>
 rcpt to:<userb@test.ex>
 data

diff --git a/test/scripts/2100-OpenSSL/2137 b/test/scripts/2100-OpenSSL/2137
index 36c36fe11a78144144d3f19b7ea8a0bba1f7d394..1cce83d6618228c5434e279042edb3a8eaa6c189 100644 (file)
--- a/test/scripts/2100-OpenSSL/2137
+++ b/test/scripts/2100-OpenSSL/2137
@@ -5,6 +5,7 @@ exim -bd -DSERVER=server -oX PORT_D
 ****
 # cmdline -bs send, rcpt-time defer
 exim -bs
 ****
 # cmdline -bs send, rcpt-time defer
 exim -bs

+helo test

 mail from:<>
 rcpt to:<rcpt_defer@test.ex>
 quit
 mail from:<>
 rcpt to:<rcpt_defer@test.ex>
 quit


@@ -13,6 +14,7 @@ sleep 3
 #
 # cmdline -bs send, data-time defer
 exim -bs
 #
 # cmdline -bs send, data-time defer
 exim -bs

+helo test

 mail from:<>
 rcpt to:<data_defer@test.ex>
 data
 mail from:<>
 rcpt to:<data_defer@test.ex>
 data

diff --git a/test/scripts/2100-OpenSSL/2150 b/test/scripts/2100-OpenSSL/2150
index 9ee9eb13f4b76c1faf5148d9869b0bd48f8b3267..162436e29d41fb7dd447c3a41b17bb1b7c8e1c75 100644 (file)
--- a/test/scripts/2100-OpenSSL/2150
+++ b/test/scripts/2100-OpenSSL/2150
@@ -15,6 +15,8 @@ ehlo abcd
 ??? 250
 starttls
 ??? 220
 ??? 250
 starttls
 ??? 220

+helo test
+??? 250

 mail from:<userx@test.ex>
 ??? 250
 rcpt to:<userx@test.ex>
 mail from:<userx@test.ex>
 ??? 250
 rcpt to:<userx@test.ex>

diff --git a/test/scripts/2200-dnsdb/2202 b/test/scripts/2200-dnsdb/2202
index e55fbc38b0e9405744868697e7055fdc1543fe52..e87087b6bc277a1a8f7182bf8d693087de5f813f 100644 (file)
--- a/test/scripts/2200-dnsdb/2202
+++ b/test/scripts/2200-dnsdb/2202
@@ -1,6 +1,7 @@
 # dns_again_means_nonexist
 munge dnssec
 exim -d -bh HOSTIPV4
 # dns_again_means_nonexist
 munge dnssec
 exim -d -bh HOSTIPV4

+helo test

 mail from:<xx@cioce.test.again.dns>
 rcpt to:<a@b>
 quit
 mail from:<xx@cioce.test.again.dns>
 rcpt to:<a@b>
 quit

diff --git a/test/scripts/2600-SQLite/2600 b/test/scripts/2600-SQLite/2600
index a11d46ef173d78f17da86922d6fcefa346c3d301..27e4ab6051c38eff116654063727616752516b53 100644 (file)
--- a/test/scripts/2600-SQLite/2600
+++ b/test/scripts/2600-SQLite/2600
@@ -14,18 +14,21 @@ ${lookup sqlite,file=DIR/aux-fixed/sqlitedb{select * from them where id='its';}}
 ${lookup sqlite,file=DIR/aux-fixed/sqlitedb{select * from them where name='${quote_sqlite:it's}';}}
 ****
 exim -d -DOPT=y -bh 10.0.0.0
 ${lookup sqlite,file=DIR/aux-fixed/sqlitedb{select * from them where name='${quote_sqlite:it's}';}}
 ****
 exim -d -DOPT=y -bh 10.0.0.0

+helo test

 mail from:<a@b>
 rcpt to:<c@d>
 rcpt to:<c@d>
 quit
 ****
 exim -d -bh 10.0.0.0
 mail from:<a@b>
 rcpt to:<c@d>
 rcpt to:<c@d>
 quit
 ****
 exim -d -bh 10.0.0.0

+helo test

 mail from:<a@b>
 rcpt to:<c@d>
 rcpt to:<c@d>
 quit
 ****
 exim -d -bh 10.10.10.10
 mail from:<a@b>
 rcpt to:<c@d>
 rcpt to:<c@d>
 quit
 ****
 exim -d -bh 10.10.10.10

+helo test

 mail from:<a@b>
 rcpt to:<c@d>
 rcpt to:<c@d>
 mail from:<a@b>
 rcpt to:<c@d>
 rcpt to:<c@d>

diff --git a/test/scripts/2610-MySQL/2610 b/test/scripts/2610-MySQL/2610
index ec7b4548f5ccd41d7a8020839e97d3f28b8e1d5f..3065eac44b04f86dcb65c4cbfad68eb3994b7b86 100644 (file)
--- a/test/scripts/2610-MySQL/2610
+++ b/test/scripts/2610-MySQL/2610
@@ -82,6 +82,7 @@ ${lookup mysql {SELECT *    FROM them WHERE id IN ('ph10', 'aaaa');}}
 ${lookup mysql {delete from them where id='aaaa'}}
 ****
 exim -d -bh 10.0.0.0
 ${lookup mysql {delete from them where id='aaaa'}}
 ****
 exim -d -bh 10.0.0.0

+helo test

 mail from:<a@b>
 rcpt to:<c@d>
 quit
 mail from:<a@b>
 rcpt to:<c@d>
 quit

diff --git a/test/scripts/2620-Postgresql/2620 b/test/scripts/2620-Postgresql/2620
index a96b719308a1f5b67f4073788978d1bd6556d8b7..5d160774dcb544811711fbf207d26f6ee10c69c2 100644 (file)
--- a/test/scripts/2620-Postgresql/2620
+++ b/test/scripts/2620-Postgresql/2620
@@ -52,6 +52,7 @@ ${lookup pgsql {SELECT *    FROM them WHERE id IN ('ph10', 'aaaa');}}
 ${lookup pgsql {delete from them where id='aaaa'}}
 ****
 exim -d -bh 10.0.0.0
 ${lookup pgsql {delete from them where id='aaaa'}}
 ****
 exim -d -bh 10.0.0.0

+helo test

 mail from:<a@b>
 rcpt to:<c@d>
 rcpt to:<c@d>
 mail from:<a@b>
 rcpt to:<c@d>
 rcpt to:<c@d>

diff --git a/test/scripts/3200-testdb/3202 b/test/scripts/3200-testdb/3202
index 7b7206353bce6f73d5523ef465fb956efed297fb..2d971cf07b091fd9ab606fc79e2e22aabc828a17 100644 (file)
--- a/test/scripts/3200-testdb/3202
+++ b/test/scripts/3200-testdb/3202
@@ -1,15 +1,18 @@
 # ACL defer tests
 exim -bh 1.1.1.1
 # ACL defer tests
 exim -bh 1.1.1.1

+helo test

 mail from:<x@y>
 rcpt to:<x@y>
 quit
 ****
 exim -bh 1.1.2.1
 mail from:<x@y>
 rcpt to:<x@y>
 quit
 ****
 exim -bh 1.1.2.1

+helo test

 mail from:<x@y>
 rcpt to:<x@y>
 quit
 ****
 exim -bh 1.1.3.1
 mail from:<x@y>
 rcpt to:<x@y>
 quit
 ****
 exim -bh 1.1.3.1

+helo test

 mail from:<x@y>
 rcpt to:<x@y>
 quit
 mail from:<x@y>
 rcpt to:<x@y>
 quit

diff --git a/test/scripts/3200-testdb/3204 b/test/scripts/3200-testdb/3204
index d4a24fe1bc1b6adc6e8df4939e648b413bd49da9..652deb37789e8e66ab7cd8bcbfff48520a541cb9 100644 (file)
--- a/test/scripts/3200-testdb/3204
+++ b/test/scripts/3200-testdb/3204
@@ -1,5 +1,6 @@
 # Lookup defer (sender_reject)
 exim -bh 1.2.3.4
 # Lookup defer (sender_reject)
 exim -bh 1.2.3.4

+helo test

 mail from:<userx@somehost.example.com>
 rcpt to:<x@y>
 quit
 mail from:<userx@somehost.example.com>
 rcpt to:<x@y>
 quit

diff --git a/test/scripts/3200-testdb/3205 b/test/scripts/3200-testdb/3205
index adb8be65936951b419ba692897ca4f080a6cbf31..9b4ee524bd26fcda4b2813b287b8a3f319bd8458 100644 (file)
--- a/test/scripts/3200-testdb/3205
+++ b/test/scripts/3200-testdb/3205
@@ -1,10 +1,12 @@
 # lookup defer (senders and hosts conditions in ACL)
 exim -bh 1.2.3.4
 # lookup defer (senders and hosts conditions in ACL)
 exim -bh 1.2.3.4

+helo test

 mail from:<userx@external.test.ex>
 rcpt to:<userx@test.ex>
 quit
 ****
 exim -bh 4.3.2.1
 mail from:<userx@external.test.ex>
 rcpt to:<userx@test.ex>
 quit
 ****
 exim -bh 4.3.2.1

+helo test

 mail from:<userx@external.test.ex>
 rcpt to:<userx@test.ex>
 quit
 mail from:<userx@external.test.ex>
 rcpt to:<userx@test.ex>
 quit

diff --git a/test/scripts/3200-testdb/3211 b/test/scripts/3200-testdb/3211
index 44ab8723810763041b88294d4e10537940b44dd3..42da0ce1fda8fd18718cda268544f2f0a5c93fa8 100644 (file)
--- a/test/scripts/3200-testdb/3211
+++ b/test/scripts/3200-testdb/3211
@@ -1,15 +1,18 @@
 # reset search_error_message for next router
 exim -bs
 # reset search_error_message for next router
 exim -bs

+helo test

 mail from:<userx@test.ex>
 rcpt to:<userx@test.again.dns>
 quit
 ****
 exim -bh 1.2.3.4
 mail from:<userx@test.ex>
 rcpt to:<userx@test.again.dns>
 quit
 ****
 exim -bh 1.2.3.4

+helo test

 mail from:<userx@test.ex>
 rcpt to:<userx@test.again.dns>
 quit
 ****
 exim -bh 1.2.3.4
 mail from:<userx@test.ex>
 rcpt to:<userx@test.again.dns>
 quit
 ****
 exim -bh 1.2.3.4

+helo test

 mail from:<userx@test.ex>
 rcpt to:<r1-userx@test.again.dns>
 quit
 mail from:<userx@test.ex>
 rcpt to:<r1-userx@test.again.dns>
 quit

diff --git a/test/scripts/3400-plaintext/3400 b/test/scripts/3400-plaintext/3400
index 164ace593efcfc4d3246ec8749002d8cf8dbb53f..815dd392ffcd9f2d44d7d9856fc94dfd5711bd64 100644 (file)
--- a/test/scripts/3400-plaintext/3400
+++ b/test/scripts/3400-plaintext/3400
@@ -1,5 +1,6 @@
 # plaintext server tests
 exim -bh 10.0.0.2
 # plaintext server tests
 exim -bh 10.0.0.2

+helo test

 mail from:<junk@jink.jonk.test.ex>
 rset
 vrfy userx@test.ex
 mail from:<junk@jink.jonk.test.ex>
 rset
 vrfy userx@test.ex

diff --git a/test/scripts/3400-plaintext/3410 b/test/scripts/3400-plaintext/3410
index 20b5e067c535277f5c74841ab30ac00e649cec68..2a6df25554349f29d93847891d5dd5149573e357 100644 (file)
--- a/test/scripts/3400-plaintext/3410
+++ b/test/scripts/3400-plaintext/3410
@@ -1,5 +1,6 @@
 # ACL basic auth tests
 exim -bh 5.6.9.1
 # ACL basic auth tests
 exim -bh 5.6.9.1

+helo test

 mail from:<x@y>
 rcpt to:<x@y>
 rset
 mail from:<x@y>
 rcpt to:<x@y>
 rset


@@ -10,6 +11,7 @@ rcpt to:<x@y>
 quit
 ****
 exim -bh 5.6.10.1
 quit
 ****
 exim -bh 5.6.10.1

+helo test

 mail from:<x@y>
 rcpt to:<x@y>
 rset
 mail from:<x@y>
 rcpt to:<x@y>
 rset

diff --git a/test/scripts/5300-ipliteral/5300 b/test/scripts/5300-ipliteral/5300
index fba34c471ddc81dc9fc475b2a6b61d6d4b49d082..d7f156b28a45f30dfe1c01569158d148f3d94ea7 100644 (file)
--- a/test/scripts/5300-ipliteral/5300
+++ b/test/scripts/5300-ipliteral/5300
@@ -14,6 +14,7 @@ exim -bp
 ****
 0
 exim -odq -bs
 ****
 0
 exim -odq -bs

+HELO test

 MAIL FROM:<>
 RCPT TO:<x@[1.2.3.4]>
 RCPT TO:<x@[ipv4:1.2.3.4]>
 MAIL FROM:<>
 RCPT TO:<x@[1.2.3.4]>
 RCPT TO:<x@[ipv4:1.2.3.4]>

diff --git a/test/scripts/5300-ipliteral/5301 b/test/scripts/5300-ipliteral/5301
index 300b4f0d051770278b96091d0cc53abab9492f70..188e4feb0afb2f47118aadd8f50ad6efd44a2456 100644 (file)
--- a/test/scripts/5300-ipliteral/5301
+++ b/test/scripts/5300-ipliteral/5301
@@ -7,6 +7,7 @@ exim -DD6=disable_ipv6 -bt x@[abcd::dcba] x@[IPv6:cba::abc]
 ****
 0
 exim -odq -bs
 ****
 0
 exim -odq -bs

+HELO test

 MAIL FROM:<>
 RCPT TO:<x@[3ffe:ffff:836f:0a00:000a:0800:200a:c031]>
 RCPT TO:<x@[ipv6:3ffe:ffff:836f:0a00:000a:0800:200a:c031]>
 MAIL FROM:<>
 RCPT TO:<x@[3ffe:ffff:836f:0a00:000a:0800:200a:c031]>
 RCPT TO:<x@[ipv6:3ffe:ffff:836f:0a00:000a:0800:200a:c031]>

diff --git a/test/scripts/5600-OCSP-OpenSSL/5600 b/test/scripts/5600-OCSP-OpenSSL/5600
index 72fa478e32d0ed3e5cd14760f4a95c36d845b7dd..7dfaa604b5e0b345a3584e5e962fa149bcd57d78 100644 (file)
--- a/test/scripts/5600-OCSP-OpenSSL/5600
+++ b/test/scripts/5600-OCSP-OpenSSL/5600
@@ -20,6 +20,8 @@ ehlo rhu.barb
 ??? 250
 starttls
 ??? 220
 ??? 250
 starttls
 ??? 220

+helo test
+??? 250

 mail from:<userx@test.ex>
 ??? 250
 rcpt to:<userx@test.ex>
 mail from:<userx@test.ex>
 ??? 250
 rcpt to:<userx@test.ex>

diff --git a/test/scripts/5600-OCSP-OpenSSL/5610 b/test/scripts/5600-OCSP-OpenSSL/5610
index fccd94486e0447f6550f70b5ac9faf61088c3e81..cd135f5a7b5ca4a88e4c61ef00bf994ba0fd14f3 100644 (file)
--- a/test/scripts/5600-OCSP-OpenSSL/5610
+++ b/test/scripts/5600-OCSP-OpenSSL/5610
@@ -20,6 +20,8 @@ ehlo rhu.barb
 ??? 250
 starttls
 ??? 220
 ??? 250
 starttls
 ??? 220

+helo test
+??? 250

 mail from:<userx@test.ex>
 ??? 250
 rcpt to:<userx@test.ex>
 mail from:<userx@test.ex>
 ??? 250
 rcpt to:<userx@test.ex>

diff --git a/test/scripts/5650-OCSP-GnuTLS/5650 b/test/scripts/5650-OCSP-GnuTLS/5650
index bbea625b19168a74a1ccd70d18db49560fa22034..ee4b4f0282b6128c9f952c748fa9ae83c69557ef 100644 (file)
--- a/test/scripts/5650-OCSP-GnuTLS/5650
+++ b/test/scripts/5650-OCSP-GnuTLS/5650
@@ -21,6 +21,8 @@ ehlo rhu.barb
 ??? 250
 starttls
 ??? 220
 ??? 250
 starttls
 ??? 220

+helo test
+??? 250

 mail from:<userx@test.ex>
 ??? 250
 rcpt to:<userx@test.ex>
 mail from:<userx@test.ex>
 ??? 250
 rcpt to:<userx@test.ex>

diff --git a/test/scripts/5820-DANE-GnuTLS/5820 b/test/scripts/5820-DANE-GnuTLS/5820
index 0101a0c8d99d01e00ab5c3673a8e8cfd7a6cb3d6..f663e1aafb82ea5603920f9f346e03f162f4eea7 100644 (file)
--- a/test/scripts/5820-DANE-GnuTLS/5820
+++ b/test/scripts/5820-DANE-GnuTLS/5820
@@ -16,6 +16,7 @@ exim -qf
 #
 ### Recipient callout
 exim -DOPT=callout -bhc 127.0.0.1
 #
 ### Recipient callout
 exim -DOPT=callout -bhc 127.0.0.1

+HELO test

 MAIL FROM: <t3@myhost.test.ex>
 RCPT TO: <rcptuser@dane256ee.test.ex>
 ****
 MAIL FROM: <t3@myhost.test.ex>
 RCPT TO: <rcptuser@dane256ee.test.ex>
 ****

diff --git a/test/scripts/5840-DANE-OpenSSL/5840 b/test/scripts/5840-DANE-OpenSSL/5840
index 803865404c7a64e0ba0c72d2aaa7a8bb4ac64900..f968930df44e86063c9221ae2f19208b011d3307 100644 (file)
--- a/test/scripts/5840-DANE-OpenSSL/5840
+++ b/test/scripts/5840-DANE-OpenSSL/5840
@@ -16,6 +16,7 @@ exim -qf
 #
 ### Recipient callout
 exim -DOPT=callout -bhc 127.0.0.1
 #
 ### Recipient callout
 exim -DOPT=callout -bhc 127.0.0.1

+HELO test

 MAIL FROM: <t3@myhost.test.ex>
 RCPT TO: <rcptuser@dane256ee.test.ex>
 ****
 MAIL FROM: <t3@myhost.test.ex>
 RCPT TO: <rcptuser@dane256ee.test.ex>
 ****

diff --git a/test/stderr/0002 b/test/stderr/0002
index bd2d8067f0c6742cc4926df9b0b5956fd7dc063b..0c34e84c362b74e6e7a950bd502651b1dfc029f5 100644 (file)
--- a/test/stderr/0002
+++ b/test/stderr/0002
@@ -395,6 +395,7 @@ search_tidyup called
 >>> processing "accept" (TESTSUITE/test-config 42)
 >>> accept: condition test succeeded in ACL "connect0"
 >>> end of ACL "connect0": ACCEPT
 >>> processing "accept" (TESTSUITE/test-config 42)
 >>> accept: condition test succeeded in ACL "connect0"
 >>> end of ACL "connect0": ACCEPT

+>>> test in helo_lookup_domains? no (end of list)

 >>> processing "accept" (TESTSUITE/test-config 70)
 >>> accept: condition test succeeded in inline ACL
 >>> end of inline ACL: ACCEPT
 >>> processing "accept" (TESTSUITE/test-config 70)
 >>> accept: condition test succeeded in inline ACL
 >>> end of inline ACL: ACCEPT


@@ -408,7 +409,7 @@ LOG: 10HmaX-0005vi-00 Subject is: ""
 >>>   message: reply_address=<$reply_address>
 >>> deny: condition test succeeded in ACL "check_data"
 >>> end of ACL "check_data": DENY
 >>>   message: reply_address=<$reply_address>
 >>> deny: condition test succeeded in ACL "check_data"
 >>> end of ACL "check_data": DENY

-LOG: 10HmaX-0005vi-00 H=[V4NET.0.0.0] F=<> rejected after DATA: reply_address=<>
+LOG: 10HmaX-0005vi-00 H=(test) [V4NET.0.0.0] F=<> rejected after DATA: reply_address=<>

 >>> processing "accept" (TESTSUITE/test-config 70)
 >>> accept: condition test succeeded in inline ACL
 >>> end of inline ACL: ACCEPT
 >>> processing "accept" (TESTSUITE/test-config 70)
 >>> accept: condition test succeeded in inline ACL
 >>> end of inline ACL: ACCEPT


@@ -423,7 +424,7 @@ LOG: 10HmaY-0005vi-00 Subject is: ""
 >>>   message: reply_address=<$reply_address>
 >>> deny: condition test succeeded in ACL "check_data"
 >>> end of ACL "check_data": DENY
 >>>   message: reply_address=<$reply_address>
 >>> deny: condition test succeeded in ACL "check_data"
 >>> end of ACL "check_data": DENY

-LOG: 10HmaY-0005vi-00 H=[V4NET.0.0.0] F=<> rejected after DATA: reply_address=<a@b>
+LOG: 10HmaY-0005vi-00 H=(test) [V4NET.0.0.0] F=<> rejected after DATA: reply_address=<a@b>

 >>> processing "accept" (TESTSUITE/test-config 70)
 >>> accept: condition test succeeded in inline ACL
 >>> end of inline ACL: ACCEPT
 >>> processing "accept" (TESTSUITE/test-config 70)
 >>> accept: condition test succeeded in inline ACL
 >>> end of inline ACL: ACCEPT


@@ -438,7 +439,7 @@ LOG: 10HmaZ-0005vi-00 Subject is: ""
 >>>   message: reply_address=<$reply_address>
 >>> deny: condition test succeeded in ACL "check_data"
 >>> end of ACL "check_data": DENY
 >>>   message: reply_address=<$reply_address>
 >>> deny: condition test succeeded in ACL "check_data"
 >>> end of ACL "check_data": DENY

-LOG: 10HmaZ-0005vi-00 H=[V4NET.0.0.0] F=<> rejected after DATA: reply_address=<c@d>
+LOG: 10HmaZ-0005vi-00 H=(test) [V4NET.0.0.0] F=<> rejected after DATA: reply_address=<c@d>

 >>> processing "accept" (TESTSUITE/test-config 70)
 >>> accept: condition test succeeded in inline ACL
 >>> end of inline ACL: ACCEPT
 >>> processing "accept" (TESTSUITE/test-config 70)
 >>> accept: condition test succeeded in inline ACL
 >>> end of inline ACL: ACCEPT


@@ -453,7 +454,7 @@ LOG: 10HmbA-0005vi-00 Subject is: ""
 >>>   message: reply_address=<$reply_address>
 >>> deny: condition test succeeded in ACL "check_data"
 >>> end of ACL "check_data": DENY
 >>>   message: reply_address=<$reply_address>
 >>> deny: condition test succeeded in ACL "check_data"
 >>> end of ACL "check_data": DENY

-LOG: 10HmbA-0005vi-00 H=[V4NET.0.0.0] F=<> rejected after DATA: reply_address=<>
+LOG: 10HmbA-0005vi-00 H=(test) [V4NET.0.0.0] F=<> rejected after DATA: reply_address=<>

 >>> processing "accept" (TESTSUITE/test-config 70)
 >>> accept: condition test succeeded in inline ACL
 >>> end of inline ACL: ACCEPT
 >>> processing "accept" (TESTSUITE/test-config 70)
 >>> accept: condition test succeeded in inline ACL
 >>> end of inline ACL: ACCEPT


@@ -468,7 +469,7 @@ LOG: 10HmbB-0005vi-00 Subject is: ""
 >>>   message: reply_address=<$reply_address>
 >>> deny: condition test succeeded in ACL "check_data"
 >>> end of ACL "check_data": DENY
 >>>   message: reply_address=<$reply_address>
 >>> deny: condition test succeeded in ACL "check_data"
 >>> end of ACL "check_data": DENY

-LOG: 10HmbB-0005vi-00 H=[V4NET.0.0.0] F=<> rejected after DATA: reply_address=<x@y>
+LOG: 10HmbB-0005vi-00 H=(test) [V4NET.0.0.0] F=<> rejected after DATA: reply_address=<x@y>

 >>> host in hosts_connection_nolog? no (option unset)
 >>> host in host_lookup? no (option unset)
 >>> host in host_reject_connection? no (option unset)
 >>> host in hosts_connection_nolog? no (option unset)
 >>> host in host_lookup? no (option unset)
 >>> host in host_reject_connection? no (option unset)


@@ -481,6 +482,7 @@ LOG: 10HmbB-0005vi-00 H=[V4NET.0.0.0] F=<> rejected after DATA: reply_address=<x
 >>> processing "accept" (TESTSUITE/test-config 42)
 >>> accept: condition test succeeded in ACL "connect0"
 >>> end of ACL "connect0": ACCEPT
 >>> processing "accept" (TESTSUITE/test-config 42)
 >>> accept: condition test succeeded in ACL "connect0"
 >>> end of ACL "connect0": ACCEPT

+>>> test in helo_lookup_domains? no (end of list)

 >>> processing "accept" (TESTSUITE/test-config 70)
 >>> accept: condition test succeeded in inline ACL
 >>> end of inline ACL: ACCEPT
 >>> processing "accept" (TESTSUITE/test-config 70)
 >>> accept: condition test succeeded in inline ACL
 >>> end of inline ACL: ACCEPT


@@ -495,7 +497,7 @@ LOG: 10HmbC-0005vi-00 Subject is: "=?iso-8859-8?Q?_here_we_go=3A_a_string_that_i
 >>>   message: reply_address=<$reply_address>
 >>> deny: condition test succeeded in ACL "check_data"
 >>> end of ACL "check_data": DENY
 >>>   message: reply_address=<$reply_address>
 >>> deny: condition test succeeded in ACL "check_data"
 >>> end of ACL "check_data": DENY

-LOG: 10HmbC-0005vi-00 H=[V4NET.0.0.0] F=<> rejected after DATA: reply_address=<>
+LOG: 10HmbC-0005vi-00 H=(test) [V4NET.0.0.0] F=<> rejected after DATA: reply_address=<>

 >>> host in hosts_connection_nolog? no (option unset)
 >>> host in host_lookup? no (option unset)
 >>> host in host_reject_connection? no (option unset)
 >>> host in hosts_connection_nolog? no (option unset)
 >>> host in host_lookup? no (option unset)
 >>> host in host_reject_connection? no (option unset)


@@ -508,6 +510,7 @@ LOG: 10HmbC-0005vi-00 H=[V4NET.0.0.0] F=<> rejected after DATA: reply_address=<>
 >>> processing "accept" (TESTSUITE/test-config 42)
 >>> accept: condition test succeeded in ACL "connect0"
 >>> end of ACL "connect0": ACCEPT
 >>> processing "accept" (TESTSUITE/test-config 42)
 >>> accept: condition test succeeded in ACL "connect0"
 >>> end of ACL "connect0": ACCEPT

+>>> test in helo_lookup_domains? no (end of list)

 >>> processing "accept" (TESTSUITE/test-config 70)
 >>> accept: condition test succeeded in inline ACL
 >>> end of inline ACL: ACCEPT
 >>> processing "accept" (TESTSUITE/test-config 70)
 >>> accept: condition test succeeded in inline ACL
 >>> end of inline ACL: ACCEPT


@@ -522,7 +525,7 @@ LOG: 10HmbD-0005vi-00 Subject is: " here we go: a string that is going to be enc
 >>>   message: reply_address=<$reply_address>
 >>> deny: condition test succeeded in ACL "check_data"
 >>> end of ACL "check_data": DENY
 >>>   message: reply_address=<$reply_address>
 >>> deny: condition test succeeded in ACL "check_data"
 >>> end of ACL "check_data": DENY

-LOG: 10HmbD-0005vi-00 H=[V4NET.0.0.0] F=<> rejected after DATA: reply_address=<>
+LOG: 10HmbD-0005vi-00 H=(test) [V4NET.0.0.0] F=<> rejected after DATA: reply_address=<>

 Exim version x.yz ....
 changed uid/gid: -C, -D, -be or -bf forces real uid
   uid=CALLER_UID gid=CALLER_GID pid=pppp
 Exim version x.yz ....
 changed uid/gid: -C, -D, -be or -bf forces real uid
   uid=CALLER_UID gid=CALLER_GID pid=pppp

diff --git a/test/stderr/0003 b/test/stderr/0003
index 88fcb9827c427667b608af7aa50d0caa26e2381f..b94b975ff1c8d95b877427152f72a198b4f70650 100644 (file)
--- a/test/stderr/0003
+++ b/test/stderr/0003
@@ -6,6 +6,7 @@
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)

+>>> test in helo_lookup_domains? no (end of list)

 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 16)
 >>> check hosts = :
 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 16)
 >>> check hosts = :


@@ -17,7 +18,7 @@
 >>> a@b.c in "a@b.c : X@Y.Z : ^\Dx@e\.f : ^\DY@G\.H :lsearch*@;TESTSUITE/aux-fixed/0003.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0003.rej.bydomain"? yes (matched "a@b.c")
 >>> deny: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": DENY
 >>> a@b.c in "a@b.c : X@Y.Z : ^\Dx@e\.f : ^\DY@G\.H :lsearch*@;TESTSUITE/aux-fixed/0003.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0003.rej.bydomain"? yes (matched "a@b.c")
 >>> deny: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": DENY

-LOG: H=[1.1.1.1] F=<a@b.c> rejected RCPT <x@test.ex>
+LOG: H=(test) [1.1.1.1] F=<a@b.c> rejected RCPT <x@test.ex>

 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 16)
 >>> check hosts = :
 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 16)
 >>> check hosts = :


@@ -29,7 +30,7 @@ LOG: H=[1.1.1.1] F=<a@b.c> rejected RCPT <x@test.ex>
 >>> a@B.C in "a@b.c : X@Y.Z : ^\Dx@e\.f : ^\DY@G\.H :lsearch*@;TESTSUITE/aux-fixed/0003.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0003.rej.bydomain"? yes (matched "a@b.c")
 >>> deny: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": DENY
 >>> a@B.C in "a@b.c : X@Y.Z : ^\Dx@e\.f : ^\DY@G\.H :lsearch*@;TESTSUITE/aux-fixed/0003.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0003.rej.bydomain"? yes (matched "a@b.c")
 >>> deny: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": DENY

-LOG: H=[1.1.1.1] F=<a@B.C> rejected RCPT <x@test.ex>
+LOG: H=(test) [1.1.1.1] F=<a@B.C> rejected RCPT <x@test.ex>

 >>> host in smtp_accept_max_nonmail_hosts? yes (matched "*")
 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 16)
 >>> host in smtp_accept_max_nonmail_hosts? yes (matched "*")
 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 16)


@@ -42,7 +43,7 @@ LOG: H=[1.1.1.1] F=<a@B.C> rejected RCPT <x@test.ex>
 >>> A@b.c in "a@b.c : X@Y.Z : ^\Dx@e\.f : ^\DY@G\.H :lsearch*@;TESTSUITE/aux-fixed/0003.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0003.rej.bydomain"? yes (matched "a@b.c")
 >>> deny: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": DENY
 >>> A@b.c in "a@b.c : X@Y.Z : ^\Dx@e\.f : ^\DY@G\.H :lsearch*@;TESTSUITE/aux-fixed/0003.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0003.rej.bydomain"? yes (matched "a@b.c")
 >>> deny: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": DENY

-LOG: H=[1.1.1.1] F=<A@b.c> rejected RCPT <x@test.ex>
+LOG: H=(test) [1.1.1.1] F=<A@b.c> rejected RCPT <x@test.ex>

 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 16)
 >>> check hosts = :
 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 16)
 >>> check hosts = :


@@ -54,7 +55,7 @@ LOG: H=[1.1.1.1] F=<A@b.c> rejected RCPT <x@test.ex>
 >>> A@B.C in "a@b.c : X@Y.Z : ^\Dx@e\.f : ^\DY@G\.H :lsearch*@;TESTSUITE/aux-fixed/0003.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0003.rej.bydomain"? yes (matched "a@b.c")
 >>> deny: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": DENY
 >>> A@B.C in "a@b.c : X@Y.Z : ^\Dx@e\.f : ^\DY@G\.H :lsearch*@;TESTSUITE/aux-fixed/0003.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0003.rej.bydomain"? yes (matched "a@b.c")
 >>> deny: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": DENY

-LOG: H=[1.1.1.1] F=<A@B.C> rejected RCPT <x@test.ex>
+LOG: H=(test) [1.1.1.1] F=<A@B.C> rejected RCPT <x@test.ex>

 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 16)
 >>> check hosts = :
 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 16)
 >>> check hosts = :


@@ -66,7 +67,7 @@ LOG: H=[1.1.1.1] F=<A@B.C> rejected RCPT <x@test.ex>
 >>> x@y.z in "a@b.c : X@Y.Z : ^\Dx@e\.f : ^\DY@G\.H :lsearch*@;TESTSUITE/aux-fixed/0003.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0003.rej.bydomain"? yes (matched "X@Y.Z")
 >>> deny: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": DENY
 >>> x@y.z in "a@b.c : X@Y.Z : ^\Dx@e\.f : ^\DY@G\.H :lsearch*@;TESTSUITE/aux-fixed/0003.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0003.rej.bydomain"? yes (matched "X@Y.Z")
 >>> deny: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": DENY

-LOG: H=[1.1.1.1] F=<x@y.z> rejected RCPT <x@test.ex>
+LOG: H=(test) [1.1.1.1] F=<x@y.z> rejected RCPT <x@test.ex>

 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 16)
 >>> check hosts = :
 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 16)
 >>> check hosts = :


@@ -78,7 +79,7 @@ LOG: H=[1.1.1.1] F=<x@y.z> rejected RCPT <x@test.ex>
 >>> x@Y.Z in "a@b.c : X@Y.Z : ^\Dx@e\.f : ^\DY@G\.H :lsearch*@;TESTSUITE/aux-fixed/0003.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0003.rej.bydomain"? yes (matched "X@Y.Z")
 >>> deny: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": DENY
 >>> x@Y.Z in "a@b.c : X@Y.Z : ^\Dx@e\.f : ^\DY@G\.H :lsearch*@;TESTSUITE/aux-fixed/0003.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0003.rej.bydomain"? yes (matched "X@Y.Z")
 >>> deny: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": DENY

-LOG: H=[1.1.1.1] F=<x@Y.Z> rejected RCPT <x@test.ex>
+LOG: H=(test) [1.1.1.1] F=<x@Y.Z> rejected RCPT <x@test.ex>

 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 16)
 >>> check hosts = :
 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 16)
 >>> check hosts = :


@@ -90,7 +91,7 @@ LOG: H=[1.1.1.1] F=<x@Y.Z> rejected RCPT <x@test.ex>
 >>> X@y.z in "a@b.c : X@Y.Z : ^\Dx@e\.f : ^\DY@G\.H :lsearch*@;TESTSUITE/aux-fixed/0003.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0003.rej.bydomain"? yes (matched "X@Y.Z")
 >>> deny: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": DENY
 >>> X@y.z in "a@b.c : X@Y.Z : ^\Dx@e\.f : ^\DY@G\.H :lsearch*@;TESTSUITE/aux-fixed/0003.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0003.rej.bydomain"? yes (matched "X@Y.Z")
 >>> deny: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": DENY

-LOG: H=[1.1.1.1] F=<X@y.z> rejected RCPT <x@test.ex>
+LOG: H=(test) [1.1.1.1] F=<X@y.z> rejected RCPT <x@test.ex>

 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 16)
 >>> check hosts = :
 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 16)
 >>> check hosts = :


@@ -102,7 +103,7 @@ LOG: H=[1.1.1.1] F=<X@y.z> rejected RCPT <x@test.ex>
 >>> X@Y.Z in "a@b.c : X@Y.Z : ^\Dx@e\.f : ^\DY@G\.H :lsearch*@;TESTSUITE/aux-fixed/0003.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0003.rej.bydomain"? yes (matched "X@Y.Z")
 >>> deny: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": DENY
 >>> X@Y.Z in "a@b.c : X@Y.Z : ^\Dx@e\.f : ^\DY@G\.H :lsearch*@;TESTSUITE/aux-fixed/0003.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0003.rej.bydomain"? yes (matched "X@Y.Z")
 >>> deny: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": DENY

-LOG: H=[1.1.1.1] F=<X@Y.Z> rejected RCPT <x@test.ex>
+LOG: H=(test) [1.1.1.1] F=<X@Y.Z> rejected RCPT <x@test.ex>

 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 16)
 >>> check hosts = :
 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 16)
 >>> check hosts = :


@@ -113,7 +114,7 @@ LOG: H=[1.1.1.1] F=<X@Y.Z> rejected RCPT <x@test.ex>
 >>> ax@e.f in "a@b.c : X@Y.Z : ^\Dx@e\.f : ^\DY@G\.H :lsearch*@;TESTSUITE/aux-fixed/0003.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0003.rej.bydomain"? yes (matched "^\Dx@e\.f")
 >>> deny: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": DENY
 >>> ax@e.f in "a@b.c : X@Y.Z : ^\Dx@e\.f : ^\DY@G\.H :lsearch*@;TESTSUITE/aux-fixed/0003.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0003.rej.bydomain"? yes (matched "^\Dx@e\.f")
 >>> deny: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": DENY

-LOG: H=[1.1.1.1] F=<ax@e.f> rejected RCPT <x@test.ex>
+LOG: H=(test) [1.1.1.1] F=<ax@e.f> rejected RCPT <x@test.ex>

 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 16)
 >>> check hosts = :
 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 16)
 >>> check hosts = :


@@ -124,7 +125,7 @@ LOG: H=[1.1.1.1] F=<ax@e.f> rejected RCPT <x@test.ex>
 >>> ay@g.h in "a@b.c : X@Y.Z : ^\Dx@e\.f : ^\DY@G\.H :lsearch*@;TESTSUITE/aux-fixed/0003.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0003.rej.bydomain"? yes (matched "^\DY@G\.H")
 >>> deny: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": DENY
 >>> ay@g.h in "a@b.c : X@Y.Z : ^\Dx@e\.f : ^\DY@G\.H :lsearch*@;TESTSUITE/aux-fixed/0003.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0003.rej.bydomain"? yes (matched "^\DY@G\.H")
 >>> deny: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": DENY

-LOG: H=[1.1.1.1] F=<ay@g.h> rejected RCPT <x@test.ex>
+LOG: H=(test) [1.1.1.1] F=<ay@g.h> rejected RCPT <x@test.ex>

 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 16)
 >>> check hosts = :
 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 16)
 >>> check hosts = :


@@ -135,7 +136,7 @@ LOG: H=[1.1.1.1] F=<ay@g.h> rejected RCPT <x@test.ex>
 >>> bX@E.F in "a@b.c : X@Y.Z : ^\Dx@e\.f : ^\DY@G\.H :lsearch*@;TESTSUITE/aux-fixed/0003.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0003.rej.bydomain"? yes (matched "^\Dx@e\.f")
 >>> deny: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": DENY
 >>> bX@E.F in "a@b.c : X@Y.Z : ^\Dx@e\.f : ^\DY@G\.H :lsearch*@;TESTSUITE/aux-fixed/0003.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0003.rej.bydomain"? yes (matched "^\Dx@e\.f")
 >>> deny: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": DENY

-LOG: H=[1.1.1.1] F=<bX@E.F> rejected RCPT <x@test.ex>
+LOG: H=(test) [1.1.1.1] F=<bX@E.F> rejected RCPT <x@test.ex>

 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 16)
 >>> check hosts = :
 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 16)
 >>> check hosts = :


@@ -146,7 +147,7 @@ LOG: H=[1.1.1.1] F=<bX@E.F> rejected RCPT <x@test.ex>
 >>> bY@G.H in "a@b.c : X@Y.Z : ^\Dx@e\.f : ^\DY@G\.H :lsearch*@;TESTSUITE/aux-fixed/0003.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0003.rej.bydomain"? yes (matched "^\DY@G\.H")
 >>> deny: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": DENY
 >>> bY@G.H in "a@b.c : X@Y.Z : ^\Dx@e\.f : ^\DY@G\.H :lsearch*@;TESTSUITE/aux-fixed/0003.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0003.rej.bydomain"? yes (matched "^\DY@G\.H")
 >>> deny: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": DENY

-LOG: H=[1.1.1.1] F=<bY@G.H> rejected RCPT <x@test.ex>
+LOG: H=(test) [1.1.1.1] F=<bY@G.H> rejected RCPT <x@test.ex>

 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 16)
 >>> check hosts = :
 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 16)
 >>> check hosts = :


@@ -187,7 +188,7 @@ LOG: H=[1.1.1.1] F=<bY@G.H> rejected RCPT <x@test.ex>
 >>> q@aa.com in "a@b.c : X@Y.Z : ^\Dx@e\.f : ^\DY@G\.H :lsearch*@;TESTSUITE/aux-fixed/0003.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0003.rej.bydomain"? yes (matched "lsearch*@;TESTSUITE/aux-fixed/0003.rej.lsearch")
 >>> deny: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": DENY
 >>> q@aa.com in "a@b.c : X@Y.Z : ^\Dx@e\.f : ^\DY@G\.H :lsearch*@;TESTSUITE/aux-fixed/0003.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0003.rej.bydomain"? yes (matched "lsearch*@;TESTSUITE/aux-fixed/0003.rej.lsearch")
 >>> deny: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": DENY

-LOG: H=[1.1.1.1] F=<q@aa.com> rejected RCPT <x@test.ex>
+LOG: H=(test) [1.1.1.1] F=<q@aa.com> rejected RCPT <x@test.ex>

 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 16)
 >>> check hosts = :
 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 16)
 >>> check hosts = :


@@ -198,7 +199,7 @@ LOG: H=[1.1.1.1] F=<q@aa.com> rejected RCPT <x@test.ex>
 >>> q@AA.COM in "a@b.c : X@Y.Z : ^\Dx@e\.f : ^\DY@G\.H :lsearch*@;TESTSUITE/aux-fixed/0003.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0003.rej.bydomain"? yes (matched "lsearch*@;TESTSUITE/aux-fixed/0003.rej.lsearch")
 >>> deny: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": DENY
 >>> q@AA.COM in "a@b.c : X@Y.Z : ^\Dx@e\.f : ^\DY@G\.H :lsearch*@;TESTSUITE/aux-fixed/0003.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0003.rej.bydomain"? yes (matched "lsearch*@;TESTSUITE/aux-fixed/0003.rej.lsearch")
 >>> deny: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": DENY

-LOG: H=[1.1.1.1] F=<q@AA.COM> rejected RCPT <x@test.ex>
+LOG: H=(test) [1.1.1.1] F=<q@AA.COM> rejected RCPT <x@test.ex>

 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 16)
 >>> check hosts = :
 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 16)
 >>> check hosts = :


@@ -209,7 +210,7 @@ LOG: H=[1.1.1.1] F=<q@AA.COM> rejected RCPT <x@test.ex>
 >>> Q@bb.com in "a@b.c : X@Y.Z : ^\Dx@e\.f : ^\DY@G\.H :lsearch*@;TESTSUITE/aux-fixed/0003.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0003.rej.bydomain"? yes (matched "lsearch*@;TESTSUITE/aux-fixed/0003.rej.lsearch")
 >>> deny: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": DENY
 >>> Q@bb.com in "a@b.c : X@Y.Z : ^\Dx@e\.f : ^\DY@G\.H :lsearch*@;TESTSUITE/aux-fixed/0003.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0003.rej.bydomain"? yes (matched "lsearch*@;TESTSUITE/aux-fixed/0003.rej.lsearch")
 >>> deny: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": DENY

-LOG: H=[1.1.1.1] F=<Q@bb.com> rejected RCPT <x@test.ex>
+LOG: H=(test) [1.1.1.1] F=<Q@bb.com> rejected RCPT <x@test.ex>

 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 16)
 >>> check hosts = :
 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 16)
 >>> check hosts = :


@@ -220,7 +221,7 @@ LOG: H=[1.1.1.1] F=<Q@bb.com> rejected RCPT <x@test.ex>
 >>> Q@BB.Com in "a@b.c : X@Y.Z : ^\Dx@e\.f : ^\DY@G\.H :lsearch*@;TESTSUITE/aux-fixed/0003.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0003.rej.bydomain"? yes (matched "lsearch*@;TESTSUITE/aux-fixed/0003.rej.lsearch")
 >>> deny: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": DENY
 >>> Q@BB.Com in "a@b.c : X@Y.Z : ^\Dx@e\.f : ^\DY@G\.H :lsearch*@;TESTSUITE/aux-fixed/0003.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0003.rej.bydomain"? yes (matched "lsearch*@;TESTSUITE/aux-fixed/0003.rej.lsearch")
 >>> deny: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": DENY

-LOG: H=[1.1.1.1] F=<Q@BB.Com> rejected RCPT <x@test.ex>
+LOG: H=(test) [1.1.1.1] F=<Q@BB.Com> rejected RCPT <x@test.ex>

 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 16)
 >>> check hosts = :
 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 16)
 >>> check hosts = :


@@ -231,7 +232,7 @@ LOG: H=[1.1.1.1] F=<Q@BB.Com> rejected RCPT <x@test.ex>
 >>> cc@dd.com in "a@b.c : X@Y.Z : ^\Dx@e\.f : ^\DY@G\.H :lsearch*@;TESTSUITE/aux-fixed/0003.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0003.rej.bydomain"? yes (matched "lsearch*@;TESTSUITE/aux-fixed/0003.rej.lsearch")
 >>> deny: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": DENY
 >>> cc@dd.com in "a@b.c : X@Y.Z : ^\Dx@e\.f : ^\DY@G\.H :lsearch*@;TESTSUITE/aux-fixed/0003.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0003.rej.bydomain"? yes (matched "lsearch*@;TESTSUITE/aux-fixed/0003.rej.lsearch")
 >>> deny: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": DENY

-LOG: H=[1.1.1.1] F=<cc@dd.com> rejected RCPT <x@test.ex>
+LOG: H=(test) [1.1.1.1] F=<cc@dd.com> rejected RCPT <x@test.ex>

 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 16)
 >>> check hosts = :
 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 16)
 >>> check hosts = :


@@ -242,7 +243,7 @@ LOG: H=[1.1.1.1] F=<cc@dd.com> rejected RCPT <x@test.ex>
 >>> CC@DD.COM in "a@b.c : X@Y.Z : ^\Dx@e\.f : ^\DY@G\.H :lsearch*@;TESTSUITE/aux-fixed/0003.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0003.rej.bydomain"? yes (matched "lsearch*@;TESTSUITE/aux-fixed/0003.rej.lsearch")
 >>> deny: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": DENY
 >>> CC@DD.COM in "a@b.c : X@Y.Z : ^\Dx@e\.f : ^\DY@G\.H :lsearch*@;TESTSUITE/aux-fixed/0003.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0003.rej.bydomain"? yes (matched "lsearch*@;TESTSUITE/aux-fixed/0003.rej.lsearch")
 >>> deny: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": DENY

-LOG: H=[1.1.1.1] F=<CC@DD.COM> rejected RCPT <x@test.ex>
+LOG: H=(test) [1.1.1.1] F=<CC@DD.COM> rejected RCPT <x@test.ex>

 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 16)
 >>> check hosts = :
 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 16)
 >>> check hosts = :


@@ -268,7 +269,7 @@ LOG: H=[1.1.1.1] F=<CC@DD.COM> rejected RCPT <x@test.ex>
 >>> q@nn.com in "a@b.c : X@Y.Z : ^\Dx@e\.f : ^\DY@G\.H :lsearch*@;TESTSUITE/aux-fixed/0003.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0003.rej.bydomain"? yes (matched "lsearch*@;TESTSUITE/aux-fixed/0003.rej.lsearch")
 >>> deny: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": DENY
 >>> q@nn.com in "a@b.c : X@Y.Z : ^\Dx@e\.f : ^\DY@G\.H :lsearch*@;TESTSUITE/aux-fixed/0003.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0003.rej.bydomain"? yes (matched "lsearch*@;TESTSUITE/aux-fixed/0003.rej.lsearch")
 >>> deny: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": DENY

-LOG: H=[1.1.1.1] F=<q@nn.com> rejected RCPT <x@test.ex>
+LOG: H=(test) [1.1.1.1] F=<q@nn.com> rejected RCPT <x@test.ex>

 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 16)
 >>> check hosts = :
 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 16)
 >>> check hosts = :


@@ -279,7 +280,7 @@ LOG: H=[1.1.1.1] F=<q@nn.com> rejected RCPT <x@test.ex>
 >>> Q@NN.COM in "a@b.c : X@Y.Z : ^\Dx@e\.f : ^\DY@G\.H :lsearch*@;TESTSUITE/aux-fixed/0003.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0003.rej.bydomain"? yes (matched "lsearch*@;TESTSUITE/aux-fixed/0003.rej.lsearch")
 >>> deny: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": DENY
 >>> Q@NN.COM in "a@b.c : X@Y.Z : ^\Dx@e\.f : ^\DY@G\.H :lsearch*@;TESTSUITE/aux-fixed/0003.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0003.rej.bydomain"? yes (matched "lsearch*@;TESTSUITE/aux-fixed/0003.rej.lsearch")
 >>> deny: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": DENY

-LOG: H=[1.1.1.1] F=<Q@NN.COM> rejected RCPT <x@test.ex>
+LOG: H=(test) [1.1.1.1] F=<Q@NN.COM> rejected RCPT <x@test.ex>

 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 16)
 >>> check hosts = :
 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 16)
 >>> check hosts = :


@@ -290,7 +291,7 @@ LOG: H=[1.1.1.1] F=<Q@NN.COM> rejected RCPT <x@test.ex>
 >>> q@MM.com in "a@b.c : X@Y.Z : ^\Dx@e\.f : ^\DY@G\.H :lsearch*@;TESTSUITE/aux-fixed/0003.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0003.rej.bydomain"? yes (matched "lsearch*@;TESTSUITE/aux-fixed/0003.rej.lsearch")
 >>> deny: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": DENY
 >>> q@MM.com in "a@b.c : X@Y.Z : ^\Dx@e\.f : ^\DY@G\.H :lsearch*@;TESTSUITE/aux-fixed/0003.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0003.rej.bydomain"? yes (matched "lsearch*@;TESTSUITE/aux-fixed/0003.rej.lsearch")
 >>> deny: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": DENY

-LOG: H=[1.1.1.1] F=<q@MM.com> rejected RCPT <x@test.ex>
+LOG: H=(test) [1.1.1.1] F=<q@MM.com> rejected RCPT <x@test.ex>

 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 16)
 >>> check hosts = :
 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 16)
 >>> check hosts = :


@@ -301,7 +302,7 @@ LOG: H=[1.1.1.1] F=<q@MM.com> rejected RCPT <x@test.ex>
 >>> Pp@Qq.com in "a@b.c : X@Y.Z : ^\Dx@e\.f : ^\DY@G\.H :lsearch*@;TESTSUITE/aux-fixed/0003.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0003.rej.bydomain"? yes (matched "lsearch*@;TESTSUITE/aux-fixed/0003.rej.lsearch")
 >>> deny: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": DENY
 >>> Pp@Qq.com in "a@b.c : X@Y.Z : ^\Dx@e\.f : ^\DY@G\.H :lsearch*@;TESTSUITE/aux-fixed/0003.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0003.rej.bydomain"? yes (matched "lsearch*@;TESTSUITE/aux-fixed/0003.rej.lsearch")
 >>> deny: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": DENY

-LOG: H=[1.1.1.1] F=<Pp@Qq.com> rejected RCPT <x@test.ex>
+LOG: H=(test) [1.1.1.1] F=<Pp@Qq.com> rejected RCPT <x@test.ex>

 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 16)
 >>> check hosts = :
 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 16)
 >>> check hosts = :


@@ -312,7 +313,7 @@ LOG: H=[1.1.1.1] F=<Pp@Qq.com> rejected RCPT <x@test.ex>
 >>> abcd@aa.bb in "a@b.c : X@Y.Z : ^\Dx@e\.f : ^\DY@G\.H :lsearch*@;TESTSUITE/aux-fixed/0003.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0003.rej.bydomain"? yes (matched "@@lsearch*;TESTSUITE/aux-fixed/0003.rej.bydomain")
 >>> deny: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": DENY
 >>> abcd@aa.bb in "a@b.c : X@Y.Z : ^\Dx@e\.f : ^\DY@G\.H :lsearch*@;TESTSUITE/aux-fixed/0003.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0003.rej.bydomain"? yes (matched "@@lsearch*;TESTSUITE/aux-fixed/0003.rej.bydomain")
 >>> deny: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": DENY

-LOG: H=[1.1.1.1] F=<abcd@aa.bb> rejected RCPT <x@test.ex>
+LOG: H=(test) [1.1.1.1] F=<abcd@aa.bb> rejected RCPT <x@test.ex>

 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 16)
 >>> check hosts = :
 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 16)
 >>> check hosts = :


@@ -323,7 +324,7 @@ LOG: H=[1.1.1.1] F=<abcd@aa.bb> rejected RCPT <x@test.ex>
 >>> ABCD@aa.bb in "a@b.c : X@Y.Z : ^\Dx@e\.f : ^\DY@G\.H :lsearch*@;TESTSUITE/aux-fixed/0003.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0003.rej.bydomain"? yes (matched "@@lsearch*;TESTSUITE/aux-fixed/0003.rej.bydomain")
 >>> deny: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": DENY
 >>> ABCD@aa.bb in "a@b.c : X@Y.Z : ^\Dx@e\.f : ^\DY@G\.H :lsearch*@;TESTSUITE/aux-fixed/0003.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0003.rej.bydomain"? yes (matched "@@lsearch*;TESTSUITE/aux-fixed/0003.rej.bydomain")
 >>> deny: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": DENY

-LOG: H=[1.1.1.1] F=<ABCD@aa.bb> rejected RCPT <x@test.ex>
+LOG: H=(test) [1.1.1.1] F=<ABCD@aa.bb> rejected RCPT <x@test.ex>

 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 16)
 >>> check hosts = :
 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 16)
 >>> check hosts = :


@@ -334,7 +335,7 @@ LOG: H=[1.1.1.1] F=<ABCD@aa.bb> rejected RCPT <x@test.ex>
 >>> ax@aa.bb in "a@b.c : X@Y.Z : ^\Dx@e\.f : ^\DY@G\.H :lsearch*@;TESTSUITE/aux-fixed/0003.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0003.rej.bydomain"? yes (matched "@@lsearch*;TESTSUITE/aux-fixed/0003.rej.bydomain")
 >>> deny: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": DENY
 >>> ax@aa.bb in "a@b.c : X@Y.Z : ^\Dx@e\.f : ^\DY@G\.H :lsearch*@;TESTSUITE/aux-fixed/0003.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0003.rej.bydomain"? yes (matched "@@lsearch*;TESTSUITE/aux-fixed/0003.rej.bydomain")
 >>> deny: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": DENY

-LOG: H=[1.1.1.1] F=<ax@aa.bb> rejected RCPT <x@test.ex>
+LOG: H=(test) [1.1.1.1] F=<ax@aa.bb> rejected RCPT <x@test.ex>

 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 16)
 >>> check hosts = :
 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 16)
 >>> check hosts = :


@@ -345,7 +346,7 @@ LOG: H=[1.1.1.1] F=<ax@aa.bb> rejected RCPT <x@test.ex>
 >>> bX@aa.bb in "a@b.c : X@Y.Z : ^\Dx@e\.f : ^\DY@G\.H :lsearch*@;TESTSUITE/aux-fixed/0003.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0003.rej.bydomain"? yes (matched "@@lsearch*;TESTSUITE/aux-fixed/0003.rej.bydomain")
 >>> deny: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": DENY
 >>> bX@aa.bb in "a@b.c : X@Y.Z : ^\Dx@e\.f : ^\DY@G\.H :lsearch*@;TESTSUITE/aux-fixed/0003.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0003.rej.bydomain"? yes (matched "@@lsearch*;TESTSUITE/aux-fixed/0003.rej.bydomain")
 >>> deny: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": DENY

-LOG: H=[1.1.1.1] F=<bX@aa.bb> rejected RCPT <x@test.ex>
+LOG: H=(test) [1.1.1.1] F=<bX@aa.bb> rejected RCPT <x@test.ex>

 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 16)
 >>> check hosts = :
 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 16)
 >>> check hosts = :


@@ -356,7 +357,7 @@ LOG: H=[1.1.1.1] F=<bX@aa.bb> rejected RCPT <x@test.ex>
 >>> Ay@aa.bb in "a@b.c : X@Y.Z : ^\Dx@e\.f : ^\DY@G\.H :lsearch*@;TESTSUITE/aux-fixed/0003.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0003.rej.bydomain"? yes (matched "@@lsearch*;TESTSUITE/aux-fixed/0003.rej.bydomain")
 >>> deny: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": DENY
 >>> Ay@aa.bb in "a@b.c : X@Y.Z : ^\Dx@e\.f : ^\DY@G\.H :lsearch*@;TESTSUITE/aux-fixed/0003.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0003.rej.bydomain"? yes (matched "@@lsearch*;TESTSUITE/aux-fixed/0003.rej.bydomain")
 >>> deny: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": DENY

-LOG: H=[1.1.1.1] F=<Ay@aa.bb> rejected RCPT <x@test.ex>
+LOG: H=(test) [1.1.1.1] F=<Ay@aa.bb> rejected RCPT <x@test.ex>

 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 16)
 >>> check hosts = :
 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 16)
 >>> check hosts = :


@@ -367,7 +368,7 @@ LOG: H=[1.1.1.1] F=<Ay@aa.bb> rejected RCPT <x@test.ex>
 >>> BY@aa.bb in "a@b.c : X@Y.Z : ^\Dx@e\.f : ^\DY@G\.H :lsearch*@;TESTSUITE/aux-fixed/0003.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0003.rej.bydomain"? yes (matched "@@lsearch*;TESTSUITE/aux-fixed/0003.rej.bydomain")
 >>> deny: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": DENY
 >>> BY@aa.bb in "a@b.c : X@Y.Z : ^\Dx@e\.f : ^\DY@G\.H :lsearch*@;TESTSUITE/aux-fixed/0003.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0003.rej.bydomain"? yes (matched "@@lsearch*;TESTSUITE/aux-fixed/0003.rej.bydomain")
 >>> deny: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": DENY

-LOG: H=[1.1.1.1] F=<BY@aa.bb> rejected RCPT <x@test.ex>
+LOG: H=(test) [1.1.1.1] F=<BY@aa.bb> rejected RCPT <x@test.ex>

 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 16)
 >>> check hosts = :
 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 16)
 >>> check hosts = :


@@ -378,7 +379,7 @@ LOG: H=[1.1.1.1] F=<BY@aa.bb> rejected RCPT <x@test.ex>
 >>> blocked@xy.zz in "a@b.c : X@Y.Z : ^\Dx@e\.f : ^\DY@G\.H :lsearch*@;TESTSUITE/aux-fixed/0003.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0003.rej.bydomain"? yes (matched "@@lsearch*;TESTSUITE/aux-fixed/0003.rej.bydomain")
 >>> deny: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": DENY
 >>> blocked@xy.zz in "a@b.c : X@Y.Z : ^\Dx@e\.f : ^\DY@G\.H :lsearch*@;TESTSUITE/aux-fixed/0003.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0003.rej.bydomain"? yes (matched "@@lsearch*;TESTSUITE/aux-fixed/0003.rej.bydomain")
 >>> deny: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": DENY

-LOG: H=[1.1.1.1] F=<blocked@xy.zz> rejected RCPT <x@test.ex>
+LOG: H=(test) [1.1.1.1] F=<blocked@xy.zz> rejected RCPT <x@test.ex>

 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 16)
 >>> check hosts = :
 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 16)
 >>> check hosts = :


@@ -389,4 +390,4 @@ LOG: H=[1.1.1.1] F=<blocked@xy.zz> rejected RCPT <x@test.ex>
 >>> BLOCKED@zz.xy in "a@b.c : X@Y.Z : ^\Dx@e\.f : ^\DY@G\.H :lsearch*@;TESTSUITE/aux-fixed/0003.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0003.rej.bydomain"? yes (matched "@@lsearch*;TESTSUITE/aux-fixed/0003.rej.bydomain")
 >>> deny: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": DENY
 >>> BLOCKED@zz.xy in "a@b.c : X@Y.Z : ^\Dx@e\.f : ^\DY@G\.H :lsearch*@;TESTSUITE/aux-fixed/0003.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0003.rej.bydomain"? yes (matched "@@lsearch*;TESTSUITE/aux-fixed/0003.rej.bydomain")
 >>> deny: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": DENY

-LOG: H=[1.1.1.1] F=<BLOCKED@zz.xy> rejected RCPT <x@test.ex>
+LOG: H=(test) [1.1.1.1] F=<BLOCKED@zz.xy> rejected RCPT <x@test.ex>

diff --git a/test/stderr/0004 b/test/stderr/0004
index 6353e8e12779731b00c2fa7bf4d003cbb01c4070..6945d3190e3892bf3447d806571518216b3e1e49 100644 (file)
--- a/test/stderr/0004
+++ b/test/stderr/0004
@@ -6,6 +6,7 @@
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)

+>>> test in helo_lookup_domains? no (end of list)

 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 16)
 >>> check hosts = :
 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 16)
 >>> check hosts = :


@@ -17,7 +18,7 @@
 >>> a@b.c in "+caseful: a@b.c : X@Y.Z : ^\Dx@e\.f : ^\DY@G\.H :lsearch*@;TESTSUITE/aux-fixed/0003.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0003.rej.bydomain"? yes (matched "a@b.c")
 >>> deny: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": DENY
 >>> a@b.c in "+caseful: a@b.c : X@Y.Z : ^\Dx@e\.f : ^\DY@G\.H :lsearch*@;TESTSUITE/aux-fixed/0003.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0003.rej.bydomain"? yes (matched "a@b.c")
 >>> deny: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": DENY

-LOG: H=[1.1.1.1] F=<a@b.c> rejected RCPT <x@test.ex>
+LOG: H=(test) [1.1.1.1] F=<a@b.c> rejected RCPT <x@test.ex>

 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 16)
 >>> check hosts = :
 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 16)
 >>> check hosts = :


@@ -29,7 +30,7 @@ LOG: H=[1.1.1.1] F=<a@b.c> rejected RCPT <x@test.ex>
 >>> a@B.C in "+caseful: a@b.c : X@Y.Z : ^\Dx@e\.f : ^\DY@G\.H :lsearch*@;TESTSUITE/aux-fixed/0003.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0003.rej.bydomain"? yes (matched "a@b.c")
 >>> deny: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": DENY
 >>> a@B.C in "+caseful: a@b.c : X@Y.Z : ^\Dx@e\.f : ^\DY@G\.H :lsearch*@;TESTSUITE/aux-fixed/0003.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0003.rej.bydomain"? yes (matched "a@b.c")
 >>> deny: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": DENY

-LOG: H=[1.1.1.1] F=<a@B.C> rejected RCPT <x@test.ex>
+LOG: H=(test) [1.1.1.1] F=<a@B.C> rejected RCPT <x@test.ex>

 >>> host in smtp_accept_max_nonmail_hosts? yes (matched "*")
 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 16)
 >>> host in smtp_accept_max_nonmail_hosts? yes (matched "*")
 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 16)


@@ -133,7 +134,7 @@ LOG: H=[1.1.1.1] F=<a@B.C> rejected RCPT <x@test.ex>
 >>> ax@e.f in "+caseful: a@b.c : X@Y.Z : ^\Dx@e\.f : ^\DY@G\.H :lsearch*@;TESTSUITE/aux-fixed/0003.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0003.rej.bydomain"? yes (matched "^\Dx@e\.f")
 >>> deny: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": DENY
 >>> ax@e.f in "+caseful: a@b.c : X@Y.Z : ^\Dx@e\.f : ^\DY@G\.H :lsearch*@;TESTSUITE/aux-fixed/0003.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0003.rej.bydomain"? yes (matched "^\Dx@e\.f")
 >>> deny: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": DENY

-LOG: H=[1.1.1.1] F=<ax@e.f> rejected RCPT <x@test.ex>
+LOG: H=(test) [1.1.1.1] F=<ax@e.f> rejected RCPT <x@test.ex>

 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 16)
 >>> check hosts = :
 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 16)
 >>> check hosts = :


@@ -219,7 +220,7 @@ LOG: H=[1.1.1.1] F=<ax@e.f> rejected RCPT <x@test.ex>
 >>> q@aa.com in "+caseful: a@b.c : X@Y.Z : ^\Dx@e\.f : ^\DY@G\.H :lsearch*@;TESTSUITE/aux-fixed/0003.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0003.rej.bydomain"? yes (matched "lsearch*@;TESTSUITE/aux-fixed/0003.rej.lsearch")
 >>> deny: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": DENY
 >>> q@aa.com in "+caseful: a@b.c : X@Y.Z : ^\Dx@e\.f : ^\DY@G\.H :lsearch*@;TESTSUITE/aux-fixed/0003.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0003.rej.bydomain"? yes (matched "lsearch*@;TESTSUITE/aux-fixed/0003.rej.lsearch")
 >>> deny: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": DENY

-LOG: H=[1.1.1.1] F=<q@aa.com> rejected RCPT <x@test.ex>
+LOG: H=(test) [1.1.1.1] F=<q@aa.com> rejected RCPT <x@test.ex>

 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 16)
 >>> check hosts = :
 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 16)
 >>> check hosts = :


@@ -230,7 +231,7 @@ LOG: H=[1.1.1.1] F=<q@aa.com> rejected RCPT <x@test.ex>
 >>> q@AA.COM in "+caseful: a@b.c : X@Y.Z : ^\Dx@e\.f : ^\DY@G\.H :lsearch*@;TESTSUITE/aux-fixed/0003.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0003.rej.bydomain"? yes (matched "lsearch*@;TESTSUITE/aux-fixed/0003.rej.lsearch")
 >>> deny: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": DENY
 >>> q@AA.COM in "+caseful: a@b.c : X@Y.Z : ^\Dx@e\.f : ^\DY@G\.H :lsearch*@;TESTSUITE/aux-fixed/0003.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0003.rej.bydomain"? yes (matched "lsearch*@;TESTSUITE/aux-fixed/0003.rej.lsearch")
 >>> deny: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": DENY

-LOG: H=[1.1.1.1] F=<q@AA.COM> rejected RCPT <x@test.ex>
+LOG: H=(test) [1.1.1.1] F=<q@AA.COM> rejected RCPT <x@test.ex>

 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 16)
 >>> check hosts = :
 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 16)
 >>> check hosts = :


@@ -241,7 +242,7 @@ LOG: H=[1.1.1.1] F=<q@AA.COM> rejected RCPT <x@test.ex>
 >>> Q@bb.com in "+caseful: a@b.c : X@Y.Z : ^\Dx@e\.f : ^\DY@G\.H :lsearch*@;TESTSUITE/aux-fixed/0003.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0003.rej.bydomain"? yes (matched "lsearch*@;TESTSUITE/aux-fixed/0003.rej.lsearch")
 >>> deny: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": DENY
 >>> Q@bb.com in "+caseful: a@b.c : X@Y.Z : ^\Dx@e\.f : ^\DY@G\.H :lsearch*@;TESTSUITE/aux-fixed/0003.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0003.rej.bydomain"? yes (matched "lsearch*@;TESTSUITE/aux-fixed/0003.rej.lsearch")
 >>> deny: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": DENY

-LOG: H=[1.1.1.1] F=<Q@bb.com> rejected RCPT <x@test.ex>
+LOG: H=(test) [1.1.1.1] F=<Q@bb.com> rejected RCPT <x@test.ex>

 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 16)
 >>> check hosts = :
 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 16)
 >>> check hosts = :


@@ -252,7 +253,7 @@ LOG: H=[1.1.1.1] F=<Q@bb.com> rejected RCPT <x@test.ex>
 >>> Q@BB.Com in "+caseful: a@b.c : X@Y.Z : ^\Dx@e\.f : ^\DY@G\.H :lsearch*@;TESTSUITE/aux-fixed/0003.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0003.rej.bydomain"? yes (matched "lsearch*@;TESTSUITE/aux-fixed/0003.rej.lsearch")
 >>> deny: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": DENY
 >>> Q@BB.Com in "+caseful: a@b.c : X@Y.Z : ^\Dx@e\.f : ^\DY@G\.H :lsearch*@;TESTSUITE/aux-fixed/0003.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0003.rej.bydomain"? yes (matched "lsearch*@;TESTSUITE/aux-fixed/0003.rej.lsearch")
 >>> deny: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": DENY

-LOG: H=[1.1.1.1] F=<Q@BB.Com> rejected RCPT <x@test.ex>
+LOG: H=(test) [1.1.1.1] F=<Q@BB.Com> rejected RCPT <x@test.ex>

 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 16)
 >>> check hosts = :
 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 16)
 >>> check hosts = :


@@ -263,7 +264,7 @@ LOG: H=[1.1.1.1] F=<Q@BB.Com> rejected RCPT <x@test.ex>
 >>> cc@dd.com in "+caseful: a@b.c : X@Y.Z : ^\Dx@e\.f : ^\DY@G\.H :lsearch*@;TESTSUITE/aux-fixed/0003.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0003.rej.bydomain"? yes (matched "lsearch*@;TESTSUITE/aux-fixed/0003.rej.lsearch")
 >>> deny: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": DENY
 >>> cc@dd.com in "+caseful: a@b.c : X@Y.Z : ^\Dx@e\.f : ^\DY@G\.H :lsearch*@;TESTSUITE/aux-fixed/0003.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0003.rej.bydomain"? yes (matched "lsearch*@;TESTSUITE/aux-fixed/0003.rej.lsearch")
 >>> deny: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": DENY

-LOG: H=[1.1.1.1] F=<cc@dd.com> rejected RCPT <x@test.ex>
+LOG: H=(test) [1.1.1.1] F=<cc@dd.com> rejected RCPT <x@test.ex>

 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 16)
 >>> check hosts = :
 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 16)
 >>> check hosts = :


@@ -274,7 +275,7 @@ LOG: H=[1.1.1.1] F=<cc@dd.com> rejected RCPT <x@test.ex>
 >>> CC@DD.COM in "+caseful: a@b.c : X@Y.Z : ^\Dx@e\.f : ^\DY@G\.H :lsearch*@;TESTSUITE/aux-fixed/0003.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0003.rej.bydomain"? yes (matched "lsearch*@;TESTSUITE/aux-fixed/0003.rej.lsearch")
 >>> deny: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": DENY
 >>> CC@DD.COM in "+caseful: a@b.c : X@Y.Z : ^\Dx@e\.f : ^\DY@G\.H :lsearch*@;TESTSUITE/aux-fixed/0003.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0003.rej.bydomain"? yes (matched "lsearch*@;TESTSUITE/aux-fixed/0003.rej.lsearch")
 >>> deny: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": DENY

-LOG: H=[1.1.1.1] F=<CC@DD.COM> rejected RCPT <x@test.ex>
+LOG: H=(test) [1.1.1.1] F=<CC@DD.COM> rejected RCPT <x@test.ex>

 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 16)
 >>> check hosts = :
 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 16)
 >>> check hosts = :


@@ -300,7 +301,7 @@ LOG: H=[1.1.1.1] F=<CC@DD.COM> rejected RCPT <x@test.ex>
 >>> q@nn.com in "+caseful: a@b.c : X@Y.Z : ^\Dx@e\.f : ^\DY@G\.H :lsearch*@;TESTSUITE/aux-fixed/0003.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0003.rej.bydomain"? yes (matched "lsearch*@;TESTSUITE/aux-fixed/0003.rej.lsearch")
 >>> deny: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": DENY
 >>> q@nn.com in "+caseful: a@b.c : X@Y.Z : ^\Dx@e\.f : ^\DY@G\.H :lsearch*@;TESTSUITE/aux-fixed/0003.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0003.rej.bydomain"? yes (matched "lsearch*@;TESTSUITE/aux-fixed/0003.rej.lsearch")
 >>> deny: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": DENY

-LOG: H=[1.1.1.1] F=<q@nn.com> rejected RCPT <x@test.ex>
+LOG: H=(test) [1.1.1.1] F=<q@nn.com> rejected RCPT <x@test.ex>

 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 16)
 >>> check hosts = :
 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 16)
 >>> check hosts = :


@@ -311,7 +312,7 @@ LOG: H=[1.1.1.1] F=<q@nn.com> rejected RCPT <x@test.ex>
 >>> Q@NN.COM in "+caseful: a@b.c : X@Y.Z : ^\Dx@e\.f : ^\DY@G\.H :lsearch*@;TESTSUITE/aux-fixed/0003.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0003.rej.bydomain"? yes (matched "lsearch*@;TESTSUITE/aux-fixed/0003.rej.lsearch")
 >>> deny: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": DENY
 >>> Q@NN.COM in "+caseful: a@b.c : X@Y.Z : ^\Dx@e\.f : ^\DY@G\.H :lsearch*@;TESTSUITE/aux-fixed/0003.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0003.rej.bydomain"? yes (matched "lsearch*@;TESTSUITE/aux-fixed/0003.rej.lsearch")
 >>> deny: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": DENY

-LOG: H=[1.1.1.1] F=<Q@NN.COM> rejected RCPT <x@test.ex>
+LOG: H=(test) [1.1.1.1] F=<Q@NN.COM> rejected RCPT <x@test.ex>

 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 16)
 >>> check hosts = :
 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 16)
 >>> check hosts = :


@@ -322,7 +323,7 @@ LOG: H=[1.1.1.1] F=<Q@NN.COM> rejected RCPT <x@test.ex>
 >>> q@MM.com in "+caseful: a@b.c : X@Y.Z : ^\Dx@e\.f : ^\DY@G\.H :lsearch*@;TESTSUITE/aux-fixed/0003.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0003.rej.bydomain"? yes (matched "lsearch*@;TESTSUITE/aux-fixed/0003.rej.lsearch")
 >>> deny: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": DENY
 >>> q@MM.com in "+caseful: a@b.c : X@Y.Z : ^\Dx@e\.f : ^\DY@G\.H :lsearch*@;TESTSUITE/aux-fixed/0003.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0003.rej.bydomain"? yes (matched "lsearch*@;TESTSUITE/aux-fixed/0003.rej.lsearch")
 >>> deny: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": DENY

-LOG: H=[1.1.1.1] F=<q@MM.com> rejected RCPT <x@test.ex>
+LOG: H=(test) [1.1.1.1] F=<q@MM.com> rejected RCPT <x@test.ex>

 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 16)
 >>> check hosts = :
 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 16)
 >>> check hosts = :


@@ -333,7 +334,7 @@ LOG: H=[1.1.1.1] F=<q@MM.com> rejected RCPT <x@test.ex>
 >>> q@mm.com in "+caseful: a@b.c : X@Y.Z : ^\Dx@e\.f : ^\DY@G\.H :lsearch*@;TESTSUITE/aux-fixed/0003.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0003.rej.bydomain"? yes (matched "lsearch*@;TESTSUITE/aux-fixed/0003.rej.lsearch")
 >>> deny: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": DENY
 >>> q@mm.com in "+caseful: a@b.c : X@Y.Z : ^\Dx@e\.f : ^\DY@G\.H :lsearch*@;TESTSUITE/aux-fixed/0003.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0003.rej.bydomain"? yes (matched "lsearch*@;TESTSUITE/aux-fixed/0003.rej.lsearch")
 >>> deny: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": DENY

-LOG: H=[1.1.1.1] F=<q@mm.com> rejected RCPT <x@test.ex>
+LOG: H=(test) [1.1.1.1] F=<q@mm.com> rejected RCPT <x@test.ex>

 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 16)
 >>> check hosts = :
 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 16)
 >>> check hosts = :


@@ -344,7 +345,7 @@ LOG: H=[1.1.1.1] F=<q@mm.com> rejected RCPT <x@test.ex>
 >>> Pp@Qq.com in "+caseful: a@b.c : X@Y.Z : ^\Dx@e\.f : ^\DY@G\.H :lsearch*@;TESTSUITE/aux-fixed/0003.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0003.rej.bydomain"? yes (matched "lsearch*@;TESTSUITE/aux-fixed/0003.rej.lsearch")
 >>> deny: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": DENY
 >>> Pp@Qq.com in "+caseful: a@b.c : X@Y.Z : ^\Dx@e\.f : ^\DY@G\.H :lsearch*@;TESTSUITE/aux-fixed/0003.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0003.rej.bydomain"? yes (matched "lsearch*@;TESTSUITE/aux-fixed/0003.rej.lsearch")
 >>> deny: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": DENY

-LOG: H=[1.1.1.1] F=<Pp@Qq.com> rejected RCPT <x@test.ex>
+LOG: H=(test) [1.1.1.1] F=<Pp@Qq.com> rejected RCPT <x@test.ex>

 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 16)
 >>> check hosts = :
 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 16)
 >>> check hosts = :


@@ -385,7 +386,7 @@ LOG: H=[1.1.1.1] F=<Pp@Qq.com> rejected RCPT <x@test.ex>
 >>> AbCd@aa.bb in "+caseful: a@b.c : X@Y.Z : ^\Dx@e\.f : ^\DY@G\.H :lsearch*@;TESTSUITE/aux-fixed/0003.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0003.rej.bydomain"? yes (matched "@@lsearch*;TESTSUITE/aux-fixed/0003.rej.bydomain")
 >>> deny: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": DENY
 >>> AbCd@aa.bb in "+caseful: a@b.c : X@Y.Z : ^\Dx@e\.f : ^\DY@G\.H :lsearch*@;TESTSUITE/aux-fixed/0003.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0003.rej.bydomain"? yes (matched "@@lsearch*;TESTSUITE/aux-fixed/0003.rej.bydomain")
 >>> deny: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": DENY

-LOG: H=[1.1.1.1] F=<AbCd@aa.bb> rejected RCPT <x@test.ex>
+LOG: H=(test) [1.1.1.1] F=<AbCd@aa.bb> rejected RCPT <x@test.ex>

 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 16)
 >>> check hosts = :
 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 16)
 >>> check hosts = :


@@ -396,7 +397,7 @@ LOG: H=[1.1.1.1] F=<AbCd@aa.bb> rejected RCPT <x@test.ex>
 >>> ax@aa.bb in "+caseful: a@b.c : X@Y.Z : ^\Dx@e\.f : ^\DY@G\.H :lsearch*@;TESTSUITE/aux-fixed/0003.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0003.rej.bydomain"? yes (matched "@@lsearch*;TESTSUITE/aux-fixed/0003.rej.bydomain")
 >>> deny: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": DENY
 >>> ax@aa.bb in "+caseful: a@b.c : X@Y.Z : ^\Dx@e\.f : ^\DY@G\.H :lsearch*@;TESTSUITE/aux-fixed/0003.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0003.rej.bydomain"? yes (matched "@@lsearch*;TESTSUITE/aux-fixed/0003.rej.bydomain")
 >>> deny: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": DENY

-LOG: H=[1.1.1.1] F=<ax@aa.bb> rejected RCPT <x@test.ex>
+LOG: H=(test) [1.1.1.1] F=<ax@aa.bb> rejected RCPT <x@test.ex>

 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 16)
 >>> check hosts = :
 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 16)
 >>> check hosts = :


@@ -437,7 +438,7 @@ LOG: H=[1.1.1.1] F=<ax@aa.bb> rejected RCPT <x@test.ex>
 >>> BY@aa.bb in "+caseful: a@b.c : X@Y.Z : ^\Dx@e\.f : ^\DY@G\.H :lsearch*@;TESTSUITE/aux-fixed/0003.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0003.rej.bydomain"? yes (matched "@@lsearch*;TESTSUITE/aux-fixed/0003.rej.bydomain")
 >>> deny: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": DENY
 >>> BY@aa.bb in "+caseful: a@b.c : X@Y.Z : ^\Dx@e\.f : ^\DY@G\.H :lsearch*@;TESTSUITE/aux-fixed/0003.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0003.rej.bydomain"? yes (matched "@@lsearch*;TESTSUITE/aux-fixed/0003.rej.bydomain")
 >>> deny: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": DENY

-LOG: H=[1.1.1.1] F=<BY@aa.bb> rejected RCPT <x@test.ex>
+LOG: H=(test) [1.1.1.1] F=<BY@aa.bb> rejected RCPT <x@test.ex>

 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 16)
 >>> check hosts = :
 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 16)
 >>> check hosts = :


@@ -478,5 +479,5 @@ LOG: H=[1.1.1.1] F=<BY@aa.bb> rejected RCPT <x@test.ex>
 >>> BlOcKeD@zz.xy in "+caseful: a@b.c : X@Y.Z : ^\Dx@e\.f : ^\DY@G\.H :lsearch*@;TESTSUITE/aux-fixed/0003.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0003.rej.bydomain"? yes (matched "@@lsearch*;TESTSUITE/aux-fixed/0003.rej.bydomain")
 >>> deny: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": DENY
 >>> BlOcKeD@zz.xy in "+caseful: a@b.c : X@Y.Z : ^\Dx@e\.f : ^\DY@G\.H :lsearch*@;TESTSUITE/aux-fixed/0003.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0003.rej.bydomain"? yes (matched "@@lsearch*;TESTSUITE/aux-fixed/0003.rej.bydomain")
 >>> deny: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": DENY

-LOG: H=[1.1.1.1] F=<BlOcKeD@zz.xy> rejected RCPT <x@test.ex>
-LOG: unexpected disconnection while reading SMTP command from [1.1.1.1] D=qqs
+LOG: H=(test) [1.1.1.1] F=<BlOcKeD@zz.xy> rejected RCPT <x@test.ex>
+LOG: unexpected disconnection while reading SMTP command from (test) [1.1.1.1] D=qqs

diff --git a/test/stderr/0021 b/test/stderr/0021
index b9104e1c27e33feb747fd989323b3adb5db010e9..b476c0340cd662a79440c230770b1f4177b91acd 100644 (file)
--- a/test/stderr/0021
+++ b/test/stderr/0021
@@ -13,30 +13,31 @@ host in helo_verify_hosts? no (option unset)
 host in helo_try_verify_hosts? no (option unset)
 host in helo_accept_junk_hosts? no (option unset)
 using ACL "connect"
 host in helo_try_verify_hosts? no (option unset)
 host in helo_accept_junk_hosts? no (option unset)
 using ACL "connect"

-processing "deny" (TESTSUITE/test-config 50)
+processing "deny" (TESTSUITE/test-config 52)

 check hosts = : 10.9.8.7
 host in ": 10.9.8.7"? no (end of list)
 deny: condition test failed in ACL "connect"
 check hosts = : 10.9.8.7
 host in ": 10.9.8.7"? no (end of list)
 deny: condition test failed in ACL "connect"

-processing "drop" (TESTSUITE/test-config 51)
+processing "drop" (TESTSUITE/test-config 53)

 l_message: forcibly dropped
 check hosts = 10.9.8.9
 host in "10.9.8.9"? no (end of list)
 drop: condition test failed in ACL "connect"
 l_message: forcibly dropped
 check hosts = 10.9.8.9
 host in "10.9.8.9"? no (end of list)
 drop: condition test failed in ACL "connect"

-processing "accept" (TESTSUITE/test-config 53)
+processing "accept" (TESTSUITE/test-config 55)

 check logwrite = $sender_host_address accepted by connect ACL
                = 10.9.8.8 accepted by connect ACL
 LOG: MAIN
   10.9.8.8 accepted by connect ACL
 accept: condition test succeeded in ACL "connect"
 end of ACL "connect": ACCEPT
 check logwrite = $sender_host_address accepted by connect ACL
                = 10.9.8.8 accepted by connect ACL
 LOG: MAIN
   10.9.8.8 accepted by connect ACL
 accept: condition test succeeded in ACL "connect"
 end of ACL "connect": ACCEPT

+host in hosts_require_helo? no (end of list)

 using ACL "mail"
 using ACL "mail"

-processing "warn" (TESTSUITE/test-config 61)
+processing "warn" (TESTSUITE/test-config 63)

   message: added header line
 check senders = ok@test3
 address match test: subject=bad@test1 pattern=ok@test3
 bad@test1 in "ok@test3"? no (end of list)
 warn: condition test failed in ACL "mail"
   message: added header line
 check senders = ok@test3
 address match test: subject=bad@test1 pattern=ok@test3
 bad@test1 in "ok@test3"? no (end of list)
 warn: condition test failed in ACL "mail"

-processing "accept" (TESTSUITE/test-config 63)
+processing "accept" (TESTSUITE/test-config 65)

 check senders = ok@test1 : ok@test3
 address match test: subject=bad@test1 pattern=ok@test1
 address match test: subject=bad@test1 pattern=ok@test3
 check senders = ok@test1 : ok@test3
 address match test: subject=bad@test1 pattern=ok@test1
 address match test: subject=bad@test1 pattern=ok@test3


@@ -45,15 +46,16 @@ accept: condition test failed in ACL "mail"
 end of ACL "mail": implicit DENY
 LOG: MAIN REJECT
   H=[10.9.8.8] U=CALLER rejected MAIL <bad@test1>
 end of ACL "mail": implicit DENY
 LOG: MAIN REJECT
   H=[10.9.8.8] U=CALLER rejected MAIL <bad@test1>

+host in hosts_require_helo? no (end of list)

 using ACL "mail"
 using ACL "mail"

-processing "warn" (TESTSUITE/test-config 61)
+processing "warn" (TESTSUITE/test-config 63)

   message: added header line
 check senders = ok@test3
 address match test: subject=ok@test1 pattern=ok@test3
 test1 in "test3"? no (end of list)
 ok@test1 in "ok@test3"? no (end of list)
 warn: condition test failed in ACL "mail"
   message: added header line
 check senders = ok@test3
 address match test: subject=ok@test1 pattern=ok@test3
 test1 in "test3"? no (end of list)
 ok@test1 in "ok@test3"? no (end of list)
 warn: condition test failed in ACL "mail"

-processing "accept" (TESTSUITE/test-config 63)
+processing "accept" (TESTSUITE/test-config 65)

 check senders = ok@test1 : ok@test3
 address match test: subject=ok@test1 pattern=ok@test1
 test1 in "test1"? yes (matched "test1")
 check senders = ok@test1 : ok@test3
 address match test: subject=ok@test1 pattern=ok@test1
 test1 in "test1"? yes (matched "test1")


@@ -69,7 +71,7 @@ LOG: MAIN REJECT
 accept: condition test succeeded in ACL "mail"
 end of ACL "mail": ACCEPT
 using ACL "rcpt"
 accept: condition test succeeded in ACL "mail"
 end of ACL "mail": ACCEPT
 using ACL "rcpt"

-processing "accept" (TESTSUITE/test-config 68)
+processing "accept" (TESTSUITE/test-config 70)

 check senders = +ok_senders
 address match test: subject=ok@test1 pattern=ok@somewhere
 test1 in "somewhere"? no (end of list)
 check senders = +ok_senders
 address match test: subject=ok@test1 pattern=ok@somewhere
 test1 in "somewhere"? no (end of list)


@@ -88,7 +90,7 @@ LOG: PANIC
 accept: condition test succeeded in ACL "rcpt"
 end of ACL "rcpt": ACCEPT
 using ACL "rcpt"
 accept: condition test succeeded in ACL "rcpt"
 end of ACL "rcpt": ACCEPT
 using ACL "rcpt"

-processing "accept" (TESTSUITE/test-config 68)
+processing "accept" (TESTSUITE/test-config 70)

 check senders = +ok_senders
 cached yes match for +ok_senders
 cached lookup data = test1
 check senders = +ok_senders
 cached yes match for +ok_senders
 cached lookup data = test1


@@ -121,31 +123,32 @@ host in helo_verify_hosts? no (option unset)
 host in helo_try_verify_hosts? no (option unset)
 host in helo_accept_junk_hosts? no (option unset)
 using ACL "connect"
 host in helo_try_verify_hosts? no (option unset)
 host in helo_accept_junk_hosts? no (option unset)
 using ACL "connect"

-processing "deny" (TESTSUITE/test-config 50)
+processing "deny" (TESTSUITE/test-config 52)

 check hosts = : 10.9.8.7
 host in ": 10.9.8.7"? no (end of list)
 deny: condition test failed in ACL "connect"
 check hosts = : 10.9.8.7
 host in ": 10.9.8.7"? no (end of list)
 deny: condition test failed in ACL "connect"

-processing "drop" (TESTSUITE/test-config 51)
+processing "drop" (TESTSUITE/test-config 53)

 l_message: forcibly dropped
 check hosts = 10.9.8.9
 host in "10.9.8.9"? no (end of list)
 drop: condition test failed in ACL "connect"
 l_message: forcibly dropped
 check hosts = 10.9.8.9
 host in "10.9.8.9"? no (end of list)
 drop: condition test failed in ACL "connect"

-processing "accept" (TESTSUITE/test-config 53)
+processing "accept" (TESTSUITE/test-config 55)

 check logwrite = $sender_host_address accepted by connect ACL
                = 10.9.8.8 accepted by connect ACL
 LOG: MAIN
   10.9.8.8 accepted by connect ACL
 accept: condition test succeeded in ACL "connect"
 end of ACL "connect": ACCEPT
 check logwrite = $sender_host_address accepted by connect ACL
                = 10.9.8.8 accepted by connect ACL
 LOG: MAIN
   10.9.8.8 accepted by connect ACL
 accept: condition test succeeded in ACL "connect"
 end of ACL "connect": ACCEPT

+host in hosts_require_helo? no (end of list)

 using ACL "mail"
 using ACL "mail"

-processing "warn" (TESTSUITE/test-config 61)
+processing "warn" (TESTSUITE/test-config 63)

   message: added header line
 check senders = ok@test3
 address match test: subject=ok@test3 pattern=ok@test3
 test3 in "test3"? yes (matched "test3")
 ok@test3 in "ok@test3"? yes (matched "ok@test3")
 warn: condition test succeeded in ACL "mail"
   message: added header line
 check senders = ok@test3
 address match test: subject=ok@test3 pattern=ok@test3
 test3 in "test3"? yes (matched "test3")
 ok@test3 in "ok@test3"? yes (matched "ok@test3")
 warn: condition test succeeded in ACL "mail"

-processing "accept" (TESTSUITE/test-config 63)
+processing "accept" (TESTSUITE/test-config 65)

 check senders = ok@test1 : ok@test3
 address match test: subject=ok@test3 pattern=ok@test1
 test3 in "test1"? no (end of list)
 check senders = ok@test1 : ok@test3
 address match test: subject=ok@test3 pattern=ok@test1
 test3 in "test1"? no (end of list)


@@ -163,7 +166,7 @@ LOG: MAIN REJECT
 accept: condition test succeeded in ACL "mail"
 end of ACL "mail": ACCEPT
 using ACL "rcpt"
 accept: condition test succeeded in ACL "mail"
 end of ACL "mail": ACCEPT
 using ACL "rcpt"

-processing "accept" (TESTSUITE/test-config 68)
+processing "accept" (TESTSUITE/test-config 70)

 check senders = +ok_senders
 address match test: subject=ok@test3 pattern=ok@somewhere
 test3 in "somewhere"? no (end of list)
 check senders = +ok_senders
 address match test: subject=ok@test3 pattern=ok@somewhere
 test3 in "somewhere"? no (end of list)

diff --git a/test/stderr/0022 b/test/stderr/0022
index dc0e12575dbd5f071a794266d8bb892924484141..c647f7326489bd5e1b3d4d1df65fb957cc4ce7ae 100644 (file)
--- a/test/stderr/0022
+++ b/test/stderr/0022
@@ -24,6 +24,12 @@ host in helo_try_verify_hosts? no (option unset)
 host in helo_accept_junk_hosts? no (option unset)
 SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
 smtp_setup_msg entered
 host in helo_accept_junk_hosts? no (option unset)
 SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
 smtp_setup_msg entered

+SMTP<< helo test
+test in helo_lookup_domains? no (end of list)
+sender_fullhost = (test) [V4NET.9.8.7]
+sender_rcvhost = [V4NET.9.8.7] (helo=test)
+set_process_info: pppp handling incoming connection from (test) [V4NET.9.8.7]
+SMTP>> 250 myhost.test.ex Hello test [V4NET.9.8.7]

 SMTP<< mail from:<x@y>
 spool directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 msg_size = 0
 log directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100
 SMTP<< mail from:<x@y>
 spool directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 msg_size = 0
 log directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100


@@ -47,20 +53,20 @@ search_tidyup called
 Data file name: TESTSUITE/spool//input//10HmbF-0005vi-00-D
 Data file written for message 10HmbF-0005vi-00
 >>Generated Received: header line
 Data file name: TESTSUITE/spool//input//10HmbF-0005vi-00-D
 Data file written for message 10HmbF-0005vi-00
 >>Generated Received: header line

-P Received: from [V4NET.9.8.7]
+P Received: from [V4NET.9.8.7] (helo=test)

        by myhost.test.ex with smtp (Exim x.yz)
        (envelope-from <x@y>)
        id 10HmbF-0005vi-00
        for warn_empty@test.ex;
        Tue, 2 Mar 1999 09:44:33 +0000
 LOG: MAIN
        by myhost.test.ex with smtp (Exim x.yz)
        (envelope-from <x@y>)
        id 10HmbF-0005vi-00
        for warn_empty@test.ex;
        Tue, 2 Mar 1999 09:44:33 +0000
 LOG: MAIN

-  <= x@y H=[V4NET.9.8.7] P=smtp S=sss
+  <= x@y H=(test) [V4NET.9.8.7] P=smtp S=sss

 SMTP>> 250 OK id=10HmbF-0005vi-00
 smtp_setup_msg entered
 SMTP<< quit
 SMTP>> 221 myhost.test.ex closing connection
 LOG: smtp_connection MAIN
 SMTP>> 250 OK id=10HmbF-0005vi-00
 smtp_setup_msg entered
 SMTP<< quit
 SMTP>> 221 myhost.test.ex closing connection
 LOG: smtp_connection MAIN

-  SMTP connection from [V4NET.9.8.7] closed by QUIT
+  SMTP connection from (test) [V4NET.9.8.7] closed by QUIT

 search_tidyup called
 >>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
 Exim version x.yz ....
 search_tidyup called
 >>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
 Exim version x.yz ....


@@ -89,6 +95,12 @@ host in helo_try_verify_hosts? no (option unset)
 host in helo_accept_junk_hosts? no (option unset)
 SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
 smtp_setup_msg entered
 host in helo_accept_junk_hosts? no (option unset)
 SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
 smtp_setup_msg entered

+SMTP<< helo test
+test in helo_lookup_domains? no (end of list)
+sender_fullhost = (test) [V4NET.9.8.7]
+sender_rcvhost = [V4NET.9.8.7] (helo=test)
+set_process_info: pppp handling incoming connection from (test) [V4NET.9.8.7]
+SMTP>> 250 myhost.test.ex Hello test [V4NET.9.8.7]

 SMTP<< mail from:<x@y>
 spool directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 msg_size = 0
 log directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100
 SMTP<< mail from:<x@y>
 spool directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 msg_size = 0
 log directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100


@@ -99,7 +111,7 @@ processing "warn" (TESTSUITE/test-config 33)
 l_message: warn log message
 warn: condition test succeeded in ACL "warn_log"
 LOG: MAIN
 l_message: warn log message
 warn: condition test succeeded in ACL "warn_log"
 LOG: MAIN

-  H=[V4NET.9.8.7] Warning: warn log message
+  H=(test) [V4NET.9.8.7] Warning: warn log message

 processing "accept" (TESTSUITE/test-config 34)
 accept: condition test succeeded in ACL "warn_log"
 end of ACL "warn_log": ACCEPT
 processing "accept" (TESTSUITE/test-config 34)
 accept: condition test succeeded in ACL "warn_log"
 end of ACL "warn_log": ACCEPT


@@ -115,20 +127,20 @@ search_tidyup called
 Data file name: TESTSUITE/spool//input//10HmbG-0005vi-00-D
 Data file written for message 10HmbG-0005vi-00
 >>Generated Received: header line
 Data file name: TESTSUITE/spool//input//10HmbG-0005vi-00-D
 Data file written for message 10HmbG-0005vi-00
 >>Generated Received: header line

-P Received: from [V4NET.9.8.7]
+P Received: from [V4NET.9.8.7] (helo=test)

        by myhost.test.ex with smtp (Exim x.yz)
        (envelope-from <x@y>)
        id 10HmbG-0005vi-00
        for warn_log@test.ex;
        Tue, 2 Mar 1999 09:44:33 +0000
 LOG: MAIN
        by myhost.test.ex with smtp (Exim x.yz)
        (envelope-from <x@y>)
        id 10HmbG-0005vi-00
        for warn_log@test.ex;
        Tue, 2 Mar 1999 09:44:33 +0000
 LOG: MAIN

-  <= x@y H=[V4NET.9.8.7] P=smtp S=sss
+  <= x@y H=(test) [V4NET.9.8.7] P=smtp S=sss

 SMTP>> 250 OK id=10HmbG-0005vi-00
 smtp_setup_msg entered
 SMTP<< quit
 SMTP>> 221 myhost.test.ex closing connection
 LOG: smtp_connection MAIN
 SMTP>> 250 OK id=10HmbG-0005vi-00
 smtp_setup_msg entered
 SMTP<< quit
 SMTP>> 221 myhost.test.ex closing connection
 LOG: smtp_connection MAIN

-  SMTP connection from [V4NET.9.8.7] closed by QUIT
+  SMTP connection from (test) [V4NET.9.8.7] closed by QUIT

 search_tidyup called
 >>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
 Exim version x.yz ....
 search_tidyup called
 >>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
 Exim version x.yz ....


@@ -157,6 +169,12 @@ host in helo_try_verify_hosts? no (option unset)
 host in helo_accept_junk_hosts? no (option unset)
 SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
 smtp_setup_msg entered
 host in helo_accept_junk_hosts? no (option unset)
 SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
 smtp_setup_msg entered

+SMTP<< helo test
+test in helo_lookup_domains? no (end of list)
+sender_fullhost = (test) [V4NET.9.8.7]
+sender_rcvhost = [V4NET.9.8.7] (helo=test)
+set_process_info: pppp handling incoming connection from (test) [V4NET.9.8.7]
+SMTP>> 250 myhost.test.ex Hello test [V4NET.9.8.7]

 SMTP<< mail from:<x@y>
 spool directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 msg_size = 0
 log directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100
 SMTP<< mail from:<x@y>
 spool directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 msg_size = 0
 log directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100


@@ -181,7 +199,7 @@ search_tidyup called
 Data file name: TESTSUITE/spool//input//10HmbH-0005vi-00-D
 Data file written for message 10HmbH-0005vi-00
 >>Generated Received: header line
 Data file name: TESTSUITE/spool//input//10HmbH-0005vi-00-D
 Data file written for message 10HmbH-0005vi-00
 >>Generated Received: header line

-P Received: from [V4NET.9.8.7]
+P Received: from [V4NET.9.8.7] (helo=test)

        by myhost.test.ex with smtp (Exim x.yz)
        (envelope-from <x@y>)
        id 10HmbH-0005vi-00
        by myhost.test.ex with smtp (Exim x.yz)
        (envelope-from <x@y>)
        id 10HmbH-0005vi-00


@@ -191,13 +209,13 @@ P Received: from [V4NET.9.8.7]
   X-ACL-Warn: warn user message
 >>
 LOG: MAIN
   X-ACL-Warn: warn user message
 >>
 LOG: MAIN

-  <= x@y H=[V4NET.9.8.7] P=smtp S=sss
+  <= x@y H=(test) [V4NET.9.8.7] P=smtp S=sss

 SMTP>> 250 OK id=10HmbH-0005vi-00
 smtp_setup_msg entered
 SMTP<< quit
 SMTP>> 221 myhost.test.ex closing connection
 LOG: smtp_connection MAIN
 SMTP>> 250 OK id=10HmbH-0005vi-00
 smtp_setup_msg entered
 SMTP<< quit
 SMTP>> 221 myhost.test.ex closing connection
 LOG: smtp_connection MAIN

-  SMTP connection from [V4NET.9.8.7] closed by QUIT
+  SMTP connection from (test) [V4NET.9.8.7] closed by QUIT

 search_tidyup called
 >>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
 >>> host in hosts_connection_nolog? no (end of list)
 search_tidyup called
 >>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
 >>> host in hosts_connection_nolog? no (end of list)


@@ -209,12 +227,13 @@ LOG: SMTP connection from [V4NET.9.8.7]
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)

+>>> test in helo_lookup_domains? no (end of list)

 >>> using ACL "defer"
 >>> processing "defer" (TESTSUITE/test-config 51)
 >>>   message: forcibly deferred
 >>> defer: condition test succeeded in ACL "defer"
 >>> end of ACL "defer": DEFER
 >>> using ACL "defer"
 >>> processing "defer" (TESTSUITE/test-config 51)
 >>>   message: forcibly deferred
 >>> defer: condition test succeeded in ACL "defer"
 >>> end of ACL "defer": DEFER

-LOG: H=[V4NET.9.8.7] F=<x@y> temporarily rejected RCPT <defer@y>: forcibly deferred
+LOG: H=(test) [V4NET.9.8.7] F=<x@y> temporarily rejected RCPT <defer@y>: forcibly deferred

 >>> using ACL "accept"
 >>> processing "accept" (TESTSUITE/test-config 24)
 >>> accept: condition test succeeded in ACL "accept"
 >>> using ACL "accept"
 >>> processing "accept" (TESTSUITE/test-config 24)
 >>> accept: condition test succeeded in ACL "accept"


@@ -224,8 +243,8 @@ LOG: H=[V4NET.9.8.7] F=<x@y> temporarily rejected RCPT <defer@y>: forcibly defer
 >>>   message: forcibly dropped
 >>> drop: condition test succeeded in ACL "drop"
 >>> end of ACL "drop": DROP
 >>>   message: forcibly dropped
 >>> drop: condition test succeeded in ACL "drop"
 >>> end of ACL "drop": DROP

-LOG: H=[V4NET.9.8.7] F=<x@y> rejected RCPT <drop@y>: forcibly dropped
-LOG: SMTP connection from [V4NET.9.8.7] closed by DROP in ACL
+LOG: H=(test) [V4NET.9.8.7] F=<x@y> rejected RCPT <drop@y>: forcibly dropped
+LOG: SMTP connection from (test) [V4NET.9.8.7] closed by DROP in ACL

 >>> host in hosts_connection_nolog? no (end of list)
 LOG: SMTP connection from [V4NET.9.8.7]
 >>> host in host_lookup? no (option unset)
 >>> host in hosts_connection_nolog? no (end of list)
 LOG: SMTP connection from [V4NET.9.8.7]
 >>> host in host_lookup? no (option unset)


@@ -235,14 +254,15 @@ LOG: SMTP connection from [V4NET.9.8.7]
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)

+>>> test in helo_lookup_domains? no (end of list)

 >>> using ACL "defer_senders"
 >>> processing "defer" (TESTSUITE/test-config 54)
 >>> check senders = :
 >>>  in ":"? yes (matched "")
 >>> defer: condition test succeeded in ACL "defer_senders"
 >>> end of ACL "defer_senders": DEFER
 >>> using ACL "defer_senders"
 >>> processing "defer" (TESTSUITE/test-config 54)
 >>> check senders = :
 >>>  in ":"? yes (matched "")
 >>> defer: condition test succeeded in ACL "defer_senders"
 >>> end of ACL "defer_senders": DEFER

-LOG: H=[V4NET.9.8.7] F=<> temporarily rejected RCPT <defer_senders@y>
-LOG: SMTP connection from [V4NET.9.8.7] closed by QUIT
+LOG: H=(test) [V4NET.9.8.7] F=<> temporarily rejected RCPT <defer_senders@y>
+LOG: SMTP connection from (test) [V4NET.9.8.7] closed by QUIT

 >>> host in hosts_connection_nolog? no (end of list)
 LOG: SMTP connection from [V4NET.9.8.7]
 >>> host in host_lookup? no (option unset)
 >>> host in hosts_connection_nolog? no (end of list)
 LOG: SMTP connection from [V4NET.9.8.7]
 >>> host in host_lookup? no (option unset)


@@ -252,6 +272,7 @@ LOG: SMTP connection from [V4NET.9.8.7]
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)

+>>> test in helo_lookup_domains? no (end of list)

 >>> using ACL "delay_accept"
 >>> processing "accept" (TESTSUITE/test-config 57)
 >>> check delay = 1s
 >>> using ACL "delay_accept"
 >>> processing "accept" (TESTSUITE/test-config 57)
 >>> check delay = 1s


@@ -268,7 +289,7 @@ LOG: SMTP connection from [V4NET.9.8.7]
 >>> processing "accept" (TESTSUITE/test-config 61)
 >>> accept: condition test succeeded in ACL "delay_warn"
 >>> end of ACL "delay_warn": ACCEPT
 >>> processing "accept" (TESTSUITE/test-config 61)
 >>> accept: condition test succeeded in ACL "delay_warn"
 >>> end of ACL "delay_warn": ACCEPT

-LOG: SMTP connection from [V4NET.9.8.7] closed by QUIT
+LOG: SMTP connection from (test) [V4NET.9.8.7] closed by QUIT

 >>> host in hosts_connection_nolog? no (end of list)
 LOG: SMTP connection from [V4NET.9.8.7]
 >>> host in host_lookup? no (option unset)
 >>> host in hosts_connection_nolog? no (end of list)
 LOG: SMTP connection from [V4NET.9.8.7]
 >>> host in host_lookup? no (option unset)


@@ -278,6 +299,7 @@ LOG: SMTP connection from [V4NET.9.8.7]
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)

+>>> test in helo_lookup_domains? no (end of list)

 >>> using ACL "host_check"
 >>> processing "deny" (TESTSUITE/test-config 71)
 >>> check hosts = net-lsearch;TESTSUITE/aux-var/0022.hosts
 >>> using ACL "host_check"
 >>> processing "deny" (TESTSUITE/test-config 71)
 >>> check hosts = net-lsearch;TESTSUITE/aux-var/0022.hosts


@@ -285,7 +307,7 @@ LOG: SMTP connection from [V4NET.9.8.7]
 >>>   message: host data >$host_data<
 >>> deny: condition test succeeded in ACL "host_check"
 >>> end of ACL "host_check": DENY
 >>>   message: host data >$host_data<
 >>> deny: condition test succeeded in ACL "host_check"
 >>> end of ACL "host_check": DENY

-LOG: H=[V4NET.9.8.7] F=<x@y> rejected RCPT <host_check@y>: host data >A host-specific message<
+LOG: H=(test) [V4NET.9.8.7] F=<x@y> rejected RCPT <host_check@y>: host data >A host-specific message<

 >>> using ACL "host_check"
 >>> processing "deny" (TESTSUITE/test-config 71)
 >>> check hosts = net-lsearch;TESTSUITE/aux-var/0022.hosts
 >>> using ACL "host_check"
 >>> processing "deny" (TESTSUITE/test-config 71)
 >>> check hosts = net-lsearch;TESTSUITE/aux-var/0022.hosts


@@ -293,7 +315,7 @@ LOG: H=[V4NET.9.8.7] F=<x@y> rejected RCPT <host_check@y>: host data >A host-spe
 >>>   message: host data >$host_data<
 >>> deny: condition test succeeded in ACL "host_check"
 >>> end of ACL "host_check": DENY
 >>>   message: host data >$host_data<
 >>> deny: condition test succeeded in ACL "host_check"
 >>> end of ACL "host_check": DENY

-LOG: H=[V4NET.9.8.7] F=<x@y> rejected RCPT <host_check@y>: host data >A host-specific message<
+LOG: H=(test) [V4NET.9.8.7] F=<x@y> rejected RCPT <host_check@y>: host data >A host-specific message<

 >>> using ACL "host_check2"
 >>> processing "deny" (TESTSUITE/test-config 75)
 >>>   message: host data >$host_data<
 >>> using ACL "host_check2"
 >>> processing "deny" (TESTSUITE/test-config 75)
 >>>   message: host data >$host_data<


@@ -302,7 +324,7 @@ LOG: H=[V4NET.9.8.7] F=<x@y> rejected RCPT <host_check@y>: host data >A host-spe
 >>> host in "+some_hosts"? yes (matched "+some_hosts")
 >>> deny: condition test succeeded in ACL "host_check2"
 >>> end of ACL "host_check2": DENY
 >>> host in "+some_hosts"? yes (matched "+some_hosts")
 >>> deny: condition test succeeded in ACL "host_check2"
 >>> end of ACL "host_check2": DENY

-LOG: H=[V4NET.9.8.7] F=<x@y> rejected RCPT <host_check2@y>: host data >A host-specific message<
+LOG: H=(test) [V4NET.9.8.7] F=<x@y> rejected RCPT <host_check2@y>: host data >A host-specific message<

 >>> using ACL "host_check2"
 >>> processing "deny" (TESTSUITE/test-config 75)
 >>>   message: host data >$host_data<
 >>> using ACL "host_check2"
 >>> processing "deny" (TESTSUITE/test-config 75)
 >>>   message: host data >$host_data<


@@ -310,8 +332,8 @@ LOG: H=[V4NET.9.8.7] F=<x@y> rejected RCPT <host_check2@y>: host data >A host-sp
 >>> host in "+some_hosts"? yes (matched "+some_hosts" - cached)
 >>> deny: condition test succeeded in ACL "host_check2"
 >>> end of ACL "host_check2": DENY
 >>> host in "+some_hosts"? yes (matched "+some_hosts" - cached)
 >>> deny: condition test succeeded in ACL "host_check2"
 >>> end of ACL "host_check2": DENY

-LOG: H=[V4NET.9.8.7] F=<x@y> rejected RCPT <host_check2@y>: host data >A host-specific message<
-LOG: SMTP connection from [V4NET.9.8.7] closed by QUIT
+LOG: H=(test) [V4NET.9.8.7] F=<x@y> rejected RCPT <host_check2@y>: host data >A host-specific message<
+LOG: SMTP connection from (test) [V4NET.9.8.7] closed by QUIT

 LOG: smtp_connection MAIN
   SMTP connection from CALLER
 LOG: MAIN
 LOG: smtp_connection MAIN
   SMTP connection from CALLER
 LOG: MAIN


@@ -349,6 +371,7 @@ LOG: SMTP connection from [V4NET.9.8.7]
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)

+>>> test in helo_lookup_domains? no (end of list)

 >>> using ACL "nested_drop"
 >>> processing "accept" (TESTSUITE/test-config 44)
 >>> check acl = drop
 >>> using ACL "nested_drop"
 >>> processing "accept" (TESTSUITE/test-config 44)
 >>> check acl = drop


@@ -359,8 +382,8 @@ LOG: SMTP connection from [V4NET.9.8.7]
 >>>  end of ACL "drop": DROP
 >>> accept: condition test yielded "drop" in ACL "nested_drop"
 >>> accept: endpass encountered - denying access
 >>>  end of ACL "drop": DROP
 >>> accept: condition test yielded "drop" in ACL "nested_drop"
 >>> accept: endpass encountered - denying access

-LOG: H=[V4NET.9.8.7] F=<x@y> rejected RCPT <nested_drop@y>: forcibly dropped
-LOG: SMTP connection from [V4NET.9.8.7] closed by DROP in ACL
+LOG: H=(test) [V4NET.9.8.7] F=<x@y> rejected RCPT <nested_drop@y>: forcibly dropped
+LOG: SMTP connection from (test) [V4NET.9.8.7] closed by DROP in ACL

 >>> host in hosts_connection_nolog? no (end of list)
 LOG: SMTP connection from [V4NET.9.8.7]
 >>> host in host_lookup? no (option unset)
 >>> host in hosts_connection_nolog? no (end of list)
 LOG: SMTP connection from [V4NET.9.8.7]
 >>> host in host_lookup? no (option unset)


@@ -370,6 +393,7 @@ LOG: SMTP connection from [V4NET.9.8.7]
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)

+>>> test in helo_lookup_domains? no (end of list)

 >>> using ACL "nested_drop_require"
 >>> processing "require" (TESTSUITE/test-config 48)
 >>> check acl = drop
 >>> using ACL "nested_drop_require"
 >>> processing "require" (TESTSUITE/test-config 48)
 >>> check acl = drop


@@ -380,7 +404,7 @@ LOG: SMTP connection from [V4NET.9.8.7]
 >>>  end of ACL "drop": DROP
 >>> require: condition test yielded "drop" in ACL "nested_drop_require"
 >>> end of ACL "nested_drop_require": not OK
 >>>  end of ACL "drop": DROP
 >>> require: condition test yielded "drop" in ACL "nested_drop_require"
 >>> end of ACL "nested_drop_require": not OK

-LOG: H=[V4NET.9.8.7] F=<x@y> rejected RCPT <nested_drop_require@y>: forcibly dropped
-LOG: SMTP connection from [V4NET.9.8.7] closed by DROP in ACL
+LOG: H=(test) [V4NET.9.8.7] F=<x@y> rejected RCPT <nested_drop_require@y>: forcibly dropped
+LOG: SMTP connection from (test) [V4NET.9.8.7] closed by DROP in ACL

 
 ******** SERVER ********
 
 ******** SERVER ********

diff --git a/test/stderr/0023 b/test/stderr/0023
index 441422371b99b9708f71d1b5f9fa91058eb15c35..07d8126f86840837b5933a292e9f17c6973f965e 100644 (file)
--- a/test/stderr/0023
+++ b/test/stderr/0023
@@ -6,6 +6,7 @@
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)

+>>> test in helo_lookup_domains? no (end of list)

 >>> using ACL "acl_1_2_3"
 >>> processing "require" (TESTSUITE/test-config 44)
 >>> check domains = !nopass
 >>> using ACL "acl_1_2_3"
 >>> processing "require" (TESTSUITE/test-config 44)
 >>> check domains = !nopass


@@ -64,7 +65,7 @@
 >>> z in "+relay_domains"? no (end of list)
 >>> accept: condition test failed in ACL "acl_1_2_3"
 >>> end of ACL "acl_1_2_3": implicit DENY
 >>> z in "+relay_domains"? no (end of list)
 >>> accept: condition test failed in ACL "acl_1_2_3"
 >>> end of ACL "acl_1_2_3": implicit DENY

-LOG: H=[1.2.3.4] F=<x@y> rejected RCPT <z@z>
+LOG: H=(test) [1.2.3.4] F=<x@y> rejected RCPT <z@z>

 >>> using ACL "acl_1_2_3"
 >>> processing "require" (TESTSUITE/test-config 44)
 >>> check domains = !nopass
 >>> using ACL "acl_1_2_3"
 >>> processing "require" (TESTSUITE/test-config 44)
 >>> check domains = !nopass


@@ -161,7 +162,7 @@ LOG: H=[1.2.3.4] F=<x@y> rejected RCPT <z@z>
 >>> deny.test.ex in "deny.test.ex"? yes (matched "deny.test.ex")
 >>> deny: condition test succeeded in ACL "acl_1_2_3"
 >>> end of ACL "acl_1_2_3": DENY
 >>> deny.test.ex in "deny.test.ex"? yes (matched "deny.test.ex")
 >>> deny: condition test succeeded in ACL "acl_1_2_3"
 >>> end of ACL "acl_1_2_3": DENY

-LOG: H=[1.2.3.4] F=<x@y> rejected RCPT <x@deny.test.ex>: DOMAIN EXPLICITLY DENIED
+LOG: H=(test) [1.2.3.4] F=<x@y> rejected RCPT <x@deny.test.ex>: DOMAIN EXPLICITLY DENIED

 >>> using ACL "acl_1_2_3"
 >>> processing "require" (TESTSUITE/test-config 44)
 >>> check domains = !nopass
 >>> using ACL "acl_1_2_3"
 >>> processing "require" (TESTSUITE/test-config 44)
 >>> check domains = !nopass


@@ -188,14 +189,14 @@ LOG: H=[1.2.3.4] F=<x@y> rejected RCPT <x@deny.test.ex>: DOMAIN EXPLICITLY DENIE
 >>> refuse.test.ex in "!refuse.test.ex"? no (matched "!refuse.test.ex")
 >>> accept: condition test failed in ACL "acl_1_2_3"
 >>> accept: endpass encountered - denying access
 >>> refuse.test.ex in "!refuse.test.ex"? no (matched "!refuse.test.ex")
 >>> accept: condition test failed in ACL "acl_1_2_3"
 >>> accept: endpass encountered - denying access

-LOG: H=[1.2.3.4] F=<x@y> rejected RCPT <x@refuse.test.ex>: refuse.test.ex gets refused
+LOG: H=(test) [1.2.3.4] F=<x@y> rejected RCPT <x@refuse.test.ex>: refuse.test.ex gets refused

 >>> using ACL "acl_1_2_3"
 >>> processing "require" (TESTSUITE/test-config 44)
 >>> check domains = !nopass
 >>> nopass in "!nopass"? no (matched "!nopass")
 >>> require: condition test failed in ACL "acl_1_2_3"
 >>> end of ACL "acl_1_2_3": not OK
 >>> using ACL "acl_1_2_3"
 >>> processing "require" (TESTSUITE/test-config 44)
 >>> check domains = !nopass
 >>> nopass in "!nopass"? no (matched "!nopass")
 >>> require: condition test failed in ACL "acl_1_2_3"
 >>> end of ACL "acl_1_2_3": not OK

-LOG: H=[1.2.3.4] F=<x@y> rejected RCPT <x@nopass>
+LOG: H=(test) [1.2.3.4] F=<x@y> rejected RCPT <x@nopass>

 >>> using ACL "acl_1_2_3"
 >>> processing "require" (TESTSUITE/test-config 44)
 >>> check domains = !nopass
 >>> using ACL "acl_1_2_3"
 >>> processing "require" (TESTSUITE/test-config 44)
 >>> check domains = !nopass


@@ -207,7 +208,7 @@ LOG: H=[1.2.3.4] F=<x@y> rejected RCPT <x@nopass>
 >>> wontpass in "!wontpass"? no (matched "!wontpass")
 >>> require: condition test failed in ACL "acl_1_2_3"
 >>> end of ACL "acl_1_2_3": not OK
 >>> wontpass in "!wontpass"? no (matched "!wontpass")
 >>> require: condition test failed in ACL "acl_1_2_3"
 >>> end of ACL "acl_1_2_3": not OK

-LOG: H=[1.2.3.4] F=<x@y> rejected RCPT <x@wontpass>: x@wontpass shall not pass
+LOG: H=(test) [1.2.3.4] F=<x@y> rejected RCPT <x@wontpass>: x@wontpass shall not pass

 >>> host in hosts_connection_nolog? no (option unset)
 >>> host in host_lookup? no (option unset)
 >>> host in host_reject_connection? no (option unset)
 >>> host in hosts_connection_nolog? no (option unset)
 >>> host in host_lookup? no (option unset)
 >>> host in host_reject_connection? no (option unset)


@@ -216,13 +217,14 @@ LOG: H=[1.2.3.4] F=<x@y> rejected RCPT <x@wontpass>: x@wontpass shall not pass
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)

+>>> test in helo_lookup_domains? no (end of list)

 >>> using ACL "acl_5_6_7"
 >>> processing "accept" (TESTSUITE/test-config 64)
 >>> check domains = lsearch;TESTSUITE/aux-fixed/0023.doms
 >>> y in "lsearch;TESTSUITE/aux-fixed/0023.doms"? no (end of list)
 >>> accept: condition test failed in ACL "acl_5_6_7"
 >>> end of ACL "acl_5_6_7": implicit DENY
 >>> using ACL "acl_5_6_7"
 >>> processing "accept" (TESTSUITE/test-config 64)
 >>> check domains = lsearch;TESTSUITE/aux-fixed/0023.doms
 >>> y in "lsearch;TESTSUITE/aux-fixed/0023.doms"? no (end of list)
 >>> accept: condition test failed in ACL "acl_5_6_7"
 >>> end of ACL "acl_5_6_7": implicit DENY

-LOG: H=[5.6.7.8] F=<x@y> rejected RCPT <x@y>
+LOG: H=(test) [5.6.7.8] F=<x@y> rejected RCPT <x@y>

 >>> using ACL "acl_5_6_7"
 >>> processing "accept" (TESTSUITE/test-config 64)
 >>> check domains = lsearch;TESTSUITE/aux-fixed/0023.doms
 >>> using ACL "acl_5_6_7"
 >>> processing "accept" (TESTSUITE/test-config 64)
 >>> check domains = lsearch;TESTSUITE/aux-fixed/0023.doms


@@ -231,7 +233,7 @@ LOG: H=[5.6.7.8] F=<x@y> rejected RCPT <x@y>
 >>> x in "userx : spqr"? no (end of list)
 >>> accept: condition test failed in ACL "acl_5_6_7"
 >>> end of ACL "acl_5_6_7": implicit DENY
 >>> x in "userx : spqr"? no (end of list)
 >>> accept: condition test failed in ACL "acl_5_6_7"
 >>> end of ACL "acl_5_6_7": implicit DENY

-LOG: H=[5.6.7.8] F=<x@y> rejected RCPT <x@test.ex>
+LOG: H=(test) [5.6.7.8] F=<x@y> rejected RCPT <x@test.ex>

 >>> using ACL "acl_5_6_7"
 >>> processing "accept" (TESTSUITE/test-config 64)
 >>> check domains = lsearch;TESTSUITE/aux-fixed/0023.doms
 >>> using ACL "acl_5_6_7"
 >>> processing "accept" (TESTSUITE/test-config 64)
 >>> check domains = lsearch;TESTSUITE/aux-fixed/0023.doms


@@ -256,6 +258,7 @@ LOG: H=[5.6.7.8] F=<x@y> rejected RCPT <x@test.ex>
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)

+>>> test in helo_lookup_domains? no (end of list)

 >>> using ACL "acl_9_9_9"
 >>> processing "accept" (TESTSUITE/test-config 91)
 >>> check hosts = +ok9_hosts
 >>> using ACL "acl_9_9_9"
 >>> processing "accept" (TESTSUITE/test-config 91)
 >>> check hosts = +ok9_hosts


@@ -277,6 +280,7 @@ LOG: H=[5.6.7.8] F=<x@y> rejected RCPT <x@test.ex>
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)

+>>> test in helo_lookup_domains? no (end of list)

 >>> using ACL "acl_9_9_9"
 >>> processing "accept" (TESTSUITE/test-config 91)
 >>> check hosts = +ok9_hosts
 >>> using ACL "acl_9_9_9"
 >>> processing "accept" (TESTSUITE/test-config 91)
 >>> check hosts = +ok9_hosts


@@ -289,7 +293,7 @@ LOG: H=[5.6.7.8] F=<x@y> rejected RCPT <x@test.ex>
 >>> host in "9.9.9.0/26"? yes (matched "9.9.9.0/26")
 >>> deny: condition test succeeded in ACL "acl_9_9_9"
 >>> end of ACL "acl_9_9_9": DENY
 >>> host in "9.9.9.0/26"? yes (matched "9.9.9.0/26")
 >>> deny: condition test succeeded in ACL "acl_9_9_9"
 >>> end of ACL "acl_9_9_9": DENY

-LOG: H=[9.9.9.8] F=<x@y> rejected RCPT <x@y>: don't like this host
+LOG: H=(test) [9.9.9.8] F=<x@y> rejected RCPT <x@y>: don't like this host

 >>> using ACL "acl_9_9_9"
 >>> processing "accept" (TESTSUITE/test-config 91)
 >>> check hosts = +ok9_hosts
 >>> using ACL "acl_9_9_9"
 >>> processing "accept" (TESTSUITE/test-config 91)
 >>> check hosts = +ok9_hosts


@@ -301,7 +305,7 @@ LOG: H=[9.9.9.8] F=<x@y> rejected RCPT <x@y>: don't like this host
 >>> host in "9.9.9.0/26"? yes (matched "9.9.9.0/26")
 >>> deny: condition test succeeded in ACL "acl_9_9_9"
 >>> end of ACL "acl_9_9_9": DENY
 >>> host in "9.9.9.0/26"? yes (matched "9.9.9.0/26")
 >>> deny: condition test succeeded in ACL "acl_9_9_9"
 >>> end of ACL "acl_9_9_9": DENY

-LOG: H=[9.9.9.8] F=<x@y> rejected RCPT <a@b>: don't like this host
+LOG: H=(test) [9.9.9.8] F=<x@y> rejected RCPT <a@b>: don't like this host

 >>> host in hosts_connection_nolog? no (option unset)
 >>> host in host_lookup? no (option unset)
 >>> host in host_reject_connection? no (option unset)
 >>> host in hosts_connection_nolog? no (option unset)
 >>> host in host_lookup? no (option unset)
 >>> host in host_reject_connection? no (option unset)


@@ -310,6 +314,7 @@ LOG: H=[9.9.9.8] F=<x@y> rejected RCPT <a@b>: don't like this host
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)

+>>> test in helo_lookup_domains? no (end of list)

 >>> using ACL "acl_9_9_9"
 >>> processing "accept" (TESTSUITE/test-config 91)
 >>> check hosts = +ok9_hosts
 >>> using ACL "acl_9_9_9"
 >>> processing "accept" (TESTSUITE/test-config 91)
 >>> check hosts = +ok9_hosts


@@ -349,6 +354,7 @@ LOG: H=[9.9.9.8] F=<x@y> rejected RCPT <a@b>: don't like this host
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)

+>>> test in helo_lookup_domains? no (end of list)

 >>> using ACL "acl_5_6_8"
 >>> processing "accept" (TESTSUITE/test-config 68)
 >>> check senders = user1@domain1 : domain2 : +ok_senders
 >>> using ACL "acl_5_6_8"
 >>> processing "accept" (TESTSUITE/test-config 68)
 >>> check senders = user1@domain1 : domain2 : +ok_senders


@@ -357,7 +363,7 @@ LOG: H=[9.9.9.8] F=<x@y> rejected RCPT <a@b>: don't like this host
 >>> x@y in "user1@domain1 : domain2 : +ok_senders"? no (end of list)
 >>> accept: condition test failed in ACL "acl_5_6_8"
 >>> end of ACL "acl_5_6_8": implicit DENY
 >>> x@y in "user1@domain1 : domain2 : +ok_senders"? no (end of list)
 >>> accept: condition test failed in ACL "acl_5_6_8"
 >>> end of ACL "acl_5_6_8": implicit DENY

-LOG: H=[5.6.8.1] F=<x@y> rejected RCPT <x@y>
+LOG: H=(test) [5.6.8.1] F=<x@y> rejected RCPT <x@y>

 >>> using ACL "acl_5_6_8"
 >>> processing "accept" (TESTSUITE/test-config 68)
 >>> check senders = user1@domain1 : domain2 : +ok_senders
 >>> using ACL "acl_5_6_8"
 >>> processing "accept" (TESTSUITE/test-config 68)
 >>> check senders = user1@domain1 : domain2 : +ok_senders


@@ -365,7 +371,7 @@ LOG: H=[5.6.8.1] F=<x@y> rejected RCPT <x@y>
 >>> x@y in "user1@domain1 : domain2 : +ok_senders"? no (end of list)
 >>> accept: condition test failed in ACL "acl_5_6_8"
 >>> end of ACL "acl_5_6_8": implicit DENY
 >>> x@y in "user1@domain1 : domain2 : +ok_senders"? no (end of list)
 >>> accept: condition test failed in ACL "acl_5_6_8"
 >>> end of ACL "acl_5_6_8": implicit DENY

-LOG: H=[5.6.8.1] F=<x@y> rejected RCPT <y@x>
+LOG: H=(test) [5.6.8.1] F=<x@y> rejected RCPT <y@x>

 >>> using ACL "acl_5_6_8"
 >>> processing "accept" (TESTSUITE/test-config 68)
 >>> check senders = user1@domain1 : domain2 : +ok_senders
 >>> using ACL "acl_5_6_8"
 >>> processing "accept" (TESTSUITE/test-config 68)
 >>> check senders = user1@domain1 : domain2 : +ok_senders


@@ -382,7 +388,7 @@ LOG: H=[5.6.8.1] F=<x@y> rejected RCPT <y@x>
 >>> user2@domain1 in "user1@domain1 : domain2 : +ok_senders"? no (end of list)
 >>> accept: condition test failed in ACL "acl_5_6_8"
 >>> end of ACL "acl_5_6_8": implicit DENY
 >>> user2@domain1 in "user1@domain1 : domain2 : +ok_senders"? no (end of list)
 >>> accept: condition test failed in ACL "acl_5_6_8"
 >>> end of ACL "acl_5_6_8": implicit DENY

-LOG: H=[5.6.8.1] F=<user2@domain1> rejected RCPT <x@y>
+LOG: H=(test) [5.6.8.1] F=<user2@domain1> rejected RCPT <x@y>

 >>> using ACL "acl_5_6_8"
 >>> processing "accept" (TESTSUITE/test-config 68)
 >>> check senders = user1@domain1 : domain2 : +ok_senders
 >>> using ACL "acl_5_6_8"
 >>> processing "accept" (TESTSUITE/test-config 68)
 >>> check senders = user1@domain1 : domain2 : +ok_senders


@@ -415,6 +421,7 @@ LOG: H=[5.6.8.1] F=<user2@domain1> rejected RCPT <x@y>
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)

+>>> test in helo_lookup_domains? no (end of list)

 >>> using ACL "acl_5_6_11"
 >>> processing "accept" (TESTSUITE/test-config 71)
 >>> check condition = ${if match{$local_part}{^x}{yes}{no}}
 >>> using ACL "acl_5_6_11"
 >>> processing "accept" (TESTSUITE/test-config 71)
 >>> check condition = ${if match{$local_part}{^x}{yes}{no}}


@@ -436,7 +443,7 @@ LOG: H=[5.6.8.1] F=<user2@domain1> rejected RCPT <x@y>
 >>>   message: "local part of wrong type\n(quotes are literal)
 >>> deny: condition test succeeded in ACL "acl_5_6_11"
 >>> end of ACL "acl_5_6_11": DENY
 >>>   message: "local part of wrong type\n(quotes are literal)
 >>> deny: condition test succeeded in ACL "acl_5_6_11"
 >>> end of ACL "acl_5_6_11": DENY

-LOG: H=[5.6.11.1] F=<x@y> rejected RCPT <y2@y>: "local part of wrong type
+LOG: H=(test) [5.6.11.1] F=<x@y> rejected RCPT <y2@y>: "local part of wrong type

 >>> host in hosts_connection_nolog? no (option unset)
 >>> host in host_lookup? no (option unset)
 >>> host in host_reject_connection? no (option unset)
 >>> host in hosts_connection_nolog? no (option unset)
 >>> host in host_lookup? no (option unset)
 >>> host in host_reject_connection? no (option unset)


@@ -445,6 +452,7 @@ LOG: H=[5.6.11.1] F=<x@y> rejected RCPT <y2@y>: "local part of wrong type
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)

+>>> test in helo_lookup_domains? no (end of list)

 >>> using ACL "acl_5_6_12"
 >>> processing "accept" (TESTSUITE/test-config 75)
 >>> check hosts = 5.6.12.1
 >>> using ACL "acl_5_6_12"
 >>> processing "accept" (TESTSUITE/test-config 75)
 >>> check hosts = 5.6.12.1


@@ -473,7 +481,7 @@ LOG: H=[5.6.11.1] F=<x@y> rejected RCPT <y2@y>: "local part of wrong type
 >>>  end of ACL "acl_5_6_12A": implicit DENY
 >>> accept: condition test failed in ACL "acl_5_6_12"
 >>> accept: endpass encountered - denying access
 >>>  end of ACL "acl_5_6_12A": implicit DENY
 >>> accept: condition test failed in ACL "acl_5_6_12"
 >>> accept: endpass encountered - denying access

-LOG: H=[5.6.12.1] F=<x@y> rejected RCPT <x@y>: failed nested acl
+LOG: H=(test) [5.6.12.1] F=<x@y> rejected RCPT <x@y>: failed nested acl

 >>> host in hosts_connection_nolog? no (option unset)
 >>> host in host_lookup? no (option unset)
 >>> host in host_reject_connection? no (option unset)
 >>> host in hosts_connection_nolog? no (option unset)
 >>> host in host_lookup? no (option unset)
 >>> host in host_reject_connection? no (option unset)


@@ -482,6 +490,7 @@ LOG: H=[5.6.12.1] F=<x@y> rejected RCPT <x@y>: failed nested acl
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)

+>>> test in helo_lookup_domains? no (end of list)

 >>> using ACL "acl_5_6_12"
 >>> processing "accept" (TESTSUITE/test-config 75)
 >>> check hosts = 5.6.12.1
 >>> using ACL "acl_5_6_12"
 >>> processing "accept" (TESTSUITE/test-config 75)
 >>> check hosts = 5.6.12.1


@@ -506,6 +515,7 @@ LOG: H=[5.6.12.1] F=<x@y> rejected RCPT <x@y>: failed nested acl
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)

+>>> test in helo_lookup_domains? no (end of list)

 >>> using ACL "acl_8_8_8"
 >>> processing "accept" (TESTSUITE/test-config 88)
 >>> check acl = acl_8_8_8
 >>> using ACL "acl_8_8_8"
 >>> processing "accept" (TESTSUITE/test-config 88)
 >>> check acl = acl_8_8_8


@@ -590,7 +600,7 @@ LOG: H=[5.6.12.1] F=<x@y> rejected RCPT <x@y>: failed nested acl
 >>>   accept: condition test error in ACL "acl_8_8_8"
 >>>  accept: condition test error in ACL "acl_8_8_8"
 >>> accept: condition test error in ACL "acl_8_8_8"
 >>>   accept: condition test error in ACL "acl_8_8_8"
 >>>  accept: condition test error in ACL "acl_8_8_8"
 >>> accept: condition test error in ACL "acl_8_8_8"

-LOG: H=[8.8.8.8] F=<x@y> temporarily rejected RCPT <x@y>: ACL nested too deep: possible loop
+LOG: H=(test) [8.8.8.8] F=<x@y> temporarily rejected RCPT <x@y>: ACL nested too deep: possible loop

 >>> host in hosts_connection_nolog? no (option unset)
 >>> host in host_lookup? no (option unset)
 >>> host in host_reject_connection? no (option unset)
 >>> host in hosts_connection_nolog? no (option unset)
 >>> host in host_lookup? no (option unset)
 >>> host in host_reject_connection? no (option unset)


@@ -599,6 +609,7 @@ LOG: H=[8.8.8.8] F=<x@y> temporarily rejected RCPT <x@y>: ACL nested too deep: p
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)

+>>> test in helo_lookup_domains? no (end of list)

 >>> using ACL "acl_5_6_13"
 >>> processing "accept" (TESTSUITE/test-config 85)
 >>> check acl = TESTSUITE/aux-fixed/0023.acl1
 >>> using ACL "acl_5_6_13"
 >>> processing "accept" (TESTSUITE/test-config 85)
 >>> check acl = TESTSUITE/aux-fixed/0023.acl1


@@ -625,7 +636,7 @@ LOG: H=[8.8.8.8] F=<x@y> temporarily rejected RCPT <x@y>: ACL nested too deep: p
 >>>  end of ACL "TESTSUITE/aux-fixed/0023.acl1": implicit DENY
 >>> accept: condition test failed in ACL "acl_5_6_13"
 >>> end of ACL "acl_5_6_13": implicit DENY
 >>>  end of ACL "TESTSUITE/aux-fixed/0023.acl1": implicit DENY
 >>> accept: condition test failed in ACL "acl_5_6_13"
 >>> end of ACL "acl_5_6_13": implicit DENY

-LOG: H=[5.6.13.1] F=<x@y> rejected RCPT <x1@y>
+LOG: H=(test) [5.6.13.1] F=<x@y> rejected RCPT <x1@y>

 >>> using ACL "acl_5_6_13"
 >>> processing "accept" (TESTSUITE/test-config 85)
 >>> check acl = TESTSUITE/aux-fixed/0023.acl1
 >>> using ACL "acl_5_6_13"
 >>> processing "accept" (TESTSUITE/test-config 85)
 >>> check acl = TESTSUITE/aux-fixed/0023.acl1


@@ -639,7 +650,7 @@ LOG: H=[5.6.13.1] F=<x@y> rejected RCPT <x1@y>
 >>>  end of ACL "TESTSUITE/aux-fixed/0023.acl1": implicit DENY
 >>> accept: condition test failed in ACL "acl_5_6_13"
 >>> end of ACL "acl_5_6_13": implicit DENY
 >>>  end of ACL "TESTSUITE/aux-fixed/0023.acl1": implicit DENY
 >>> accept: condition test failed in ACL "acl_5_6_13"
 >>> end of ACL "acl_5_6_13": implicit DENY

-LOG: H=[5.6.13.1] F=<x@y> rejected RCPT <x2@y>
+LOG: H=(test) [5.6.13.1] F=<x@y> rejected RCPT <x2@y>

 >>> host in hosts_connection_nolog? no (option unset)
 >>> host in host_lookup? no (option unset)
 >>> host in host_reject_connection? no (option unset)
 >>> host in hosts_connection_nolog? no (option unset)
 >>> host in host_lookup? no (option unset)
 >>> host in host_reject_connection? no (option unset)


@@ -648,6 +659,7 @@ LOG: H=[5.6.13.1] F=<x@y> rejected RCPT <x2@y>
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)

+>>> test in helo_lookup_domains? no (end of list)

 >>> using ACL "acl_V4NET_11_12"
 >>> processing "deny" (TESTSUITE/test-config 105)
 >>>   message: host in DNS list $dnslist_domain: $dnslist_text
 >>> using ACL "acl_V4NET_11_12"
 >>> processing "deny" (TESTSUITE/test-config 105)
 >>>   message: host in DNS list $dnslist_domain: $dnslist_text


@@ -660,7 +672,7 @@ LOG: H=[5.6.13.1] F=<x@y> rejected RCPT <x2@y>
 >>> => that means V4NET.11.12.13 is listed at rbl.test.ex
 >>> deny: condition test succeeded in ACL "acl_V4NET_11_12"
 >>> end of ACL "acl_V4NET_11_12": DENY
 >>> => that means V4NET.11.12.13 is listed at rbl.test.ex
 >>> deny: condition test succeeded in ACL "acl_V4NET_11_12"
 >>> end of ACL "acl_V4NET_11_12": DENY

-LOG: H=[V4NET.11.12.13] F=<x@y> rejected RCPT <x@y>: DNSLIST (rbl.test.ex: This is a test blacklisting message)
+LOG: H=(test) [V4NET.11.12.13] F=<x@y> rejected RCPT <x@y>: DNSLIST (rbl.test.ex: This is a test blacklisting message)

 >>> using ACL "acl_V4NET_11_12"
 >>> processing "deny" (TESTSUITE/test-config 105)
 >>>   message: host in DNS list $dnslist_domain: $dnslist_text
 >>> using ACL "acl_V4NET_11_12"
 >>> processing "deny" (TESTSUITE/test-config 105)
 >>>   message: host in DNS list $dnslist_domain: $dnslist_text


@@ -672,7 +684,7 @@ LOG: H=[V4NET.11.12.13] F=<x@y> rejected RCPT <x@y>: DNSLIST (rbl.test.ex: This
 >>> => that means V4NET.11.12.13 is listed at rbl.test.ex
 >>> deny: condition test succeeded in ACL "acl_V4NET_11_12"
 >>> end of ACL "acl_V4NET_11_12": DENY
 >>> => that means V4NET.11.12.13 is listed at rbl.test.ex
 >>> deny: condition test succeeded in ACL "acl_V4NET_11_12"
 >>> end of ACL "acl_V4NET_11_12": DENY

-LOG: H=[V4NET.11.12.13] F=<x@y> rejected RCPT <x1@y>: DNSLIST (rbl.test.ex: This is a test blacklisting message)
+LOG: H=(test) [V4NET.11.12.13] F=<x@y> rejected RCPT <x1@y>: DNSLIST (rbl.test.ex: This is a test blacklisting message)

 >>> host in hosts_connection_nolog? no (option unset)
 >>> host in host_lookup? no (option unset)
 >>> host in host_reject_connection? no (option unset)
 >>> host in hosts_connection_nolog? no (option unset)
 >>> host in host_lookup? no (option unset)
 >>> host in host_reject_connection? no (option unset)


@@ -681,6 +693,7 @@ LOG: H=[V4NET.11.12.13] F=<x@y> rejected RCPT <x1@y>: DNSLIST (rbl.test.ex: This
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)

+>>> test in helo_lookup_domains? no (end of list)

 >>> using ACL "acl_V4NET_11_12"
 >>> processing "deny" (TESTSUITE/test-config 105)
 >>>   message: host in DNS list $dnslist_domain: $dnslist_text
 >>> using ACL "acl_V4NET_11_12"
 >>> processing "deny" (TESTSUITE/test-config 105)
 >>>   message: host in DNS list $dnslist_domain: $dnslist_text


@@ -716,6 +729,7 @@ LOG: H=[V4NET.11.12.13] F=<x@y> rejected RCPT <x1@y>: DNSLIST (rbl.test.ex: This
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)

+>>> test in helo_lookup_domains? no (end of list)

 >>> using ACL "acl_20_20_20"
 >>> processing "accept" (TESTSUITE/test-config 111)
 >>>   message: sender verify failure
 >>> using ACL "acl_20_20_20"
 >>> processing "accept" (TESTSUITE/test-config 111)
 >>>   message: sender verify failure


@@ -729,8 +743,8 @@ LOG: H=[V4NET.11.12.13] F=<x@y> rejected RCPT <x1@y>: DNSLIST (rbl.test.ex: This
 >>> ----------- end verify ------------
 >>> accept: condition test failed in ACL "acl_20_20_20"
 >>> accept: endpass encountered - denying access
 >>> ----------- end verify ------------
 >>> accept: condition test failed in ACL "acl_20_20_20"
 >>> accept: endpass encountered - denying access

-LOG: H=[20.20.20.20] sender verify fail for <x@y>: Unrouteable address
-LOG: H=[20.20.20.20] F=<x@y> rejected RCPT <x1@y>: Sender verify failed
+LOG: H=(test) [20.20.20.20] sender verify fail for <x@y>: Unrouteable address
+LOG: H=(test) [20.20.20.20] F=<x@y> rejected RCPT <x1@y>: Sender verify failed

 >>> using ACL "acl_20_20_20"
 >>> processing "accept" (TESTSUITE/test-config 111)
 >>>   message: sender verify failure
 >>> using ACL "acl_20_20_20"
 >>> processing "accept" (TESTSUITE/test-config 111)
 >>>   message: sender verify failure


@@ -738,7 +752,7 @@ LOG: H=[20.20.20.20] F=<x@y> rejected RCPT <x1@y>: Sender verify failed
 >>> using cached sender verify result
 >>> accept: condition test failed in ACL "acl_20_20_20"
 >>> accept: endpass encountered - denying access
 >>> using cached sender verify result
 >>> accept: condition test failed in ACL "acl_20_20_20"
 >>> accept: endpass encountered - denying access

-LOG: H=[20.20.20.20] F=<x@y> rejected RCPT <x2@y>: Sender verify failed
+LOG: H=(test) [20.20.20.20] F=<x@y> rejected RCPT <x2@y>: Sender verify failed

 >>> host in hosts_connection_nolog? no (option unset)
 >>> host in host_lookup? no (option unset)
 >>> host in host_reject_connection? no (option unset)
 >>> host in hosts_connection_nolog? no (option unset)
 >>> host in host_lookup? no (option unset)
 >>> host in host_reject_connection? no (option unset)


@@ -747,6 +761,7 @@ LOG: H=[20.20.20.20] F=<x@y> rejected RCPT <x2@y>: Sender verify failed
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)

+>>> test in helo_lookup_domains? no (end of list)

 >>> using ACL "acl_20_20_20"
 >>> processing "accept" (TESTSUITE/test-config 111)
 >>>   message: sender verify failure
 >>> using ACL "acl_20_20_20"
 >>> processing "accept" (TESTSUITE/test-config 111)
 >>>   message: sender verify failure


@@ -769,7 +784,7 @@ LOG: H=[20.20.20.20] F=<x@y> rejected RCPT <x2@y>: Sender verify failed
 >>> ----------- end verify ------------
 >>> accept: condition test failed in ACL "acl_20_20_20"
 >>> accept: endpass encountered - denying access
 >>> ----------- end verify ------------
 >>> accept: condition test failed in ACL "acl_20_20_20"
 >>> accept: endpass encountered - denying access

-LOG: H=[20.20.20.20] F=<userx@y> rejected RCPT <x1@y>: Unrouteable address
+LOG: H=(test) [20.20.20.20] F=<userx@y> rejected RCPT <x1@y>: Unrouteable address

 >>> using ACL "acl_20_20_20"
 >>> processing "accept" (TESTSUITE/test-config 111)
 >>>   message: sender verify failure
 >>> using ACL "acl_20_20_20"
 >>> processing "accept" (TESTSUITE/test-config 111)
 >>>   message: sender verify failure


@@ -794,6 +809,7 @@ LOG: H=[20.20.20.20] F=<userx@y> rejected RCPT <x1@y>: Unrouteable address
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)

+>>> test in helo_lookup_domains? no (end of list)

 >>> using ACL "acl_21_21_21"
 >>> processing "accept" (TESTSUITE/test-config 118)
 >>> check verify = sender
 >>> using ACL "acl_21_21_21"
 >>> processing "accept" (TESTSUITE/test-config 118)
 >>> check verify = sender


@@ -814,7 +830,7 @@ LOG: H=[20.20.20.20] F=<userx@y> rejected RCPT <x1@y>: Unrouteable address
 >>> ----------- end verify ------------
 >>> accept: condition test failed in ACL "acl_21_21_21"
 >>> end of ACL "acl_21_21_21": implicit DENY
 >>> ----------- end verify ------------
 >>> accept: condition test failed in ACL "acl_21_21_21"
 >>> end of ACL "acl_21_21_21": implicit DENY

-LOG: H=[21.21.21.21] F=<userx@y> rejected RCPT <x1@y>: Unrouteable address
+LOG: H=(test) [21.21.21.21] F=<userx@y> rejected RCPT <x1@y>: Unrouteable address

 >>> using ACL "acl_21_21_21"
 >>> processing "accept" (TESTSUITE/test-config 118)
 >>> check verify = sender
 >>> using ACL "acl_21_21_21"
 >>> processing "accept" (TESTSUITE/test-config 118)
 >>> check verify = sender


@@ -844,7 +860,7 @@ LOG: H=[21.21.21.21] F=<userx@y> rejected RCPT <x1@y>: Unrouteable address
 >>> ----------- end verify ------------
 >>> accept: condition test failed in ACL "acl_21_21_21"
 >>> end of ACL "acl_21_21_21": implicit DENY
 >>> ----------- end verify ------------
 >>> accept: condition test failed in ACL "acl_21_21_21"
 >>> end of ACL "acl_21_21_21": implicit DENY

-LOG: H=[21.21.21.21] F=<userx@y> rejected RCPT <fail@y>: here is a fail message
+LOG: H=(test) [21.21.21.21] F=<userx@y> rejected RCPT <fail@y>: here is a fail message

 >>> using ACL "acl_21_21_21"
 >>> processing "accept" (TESTSUITE/test-config 118)
 >>> check verify = sender
 >>> using ACL "acl_21_21_21"
 >>> processing "accept" (TESTSUITE/test-config 118)
 >>> check verify = sender


@@ -857,15 +873,15 @@ LOG: H=[21.21.21.21] F=<userx@y> rejected RCPT <fail@y>: here is a fail message
 >>> ----------- end verify ------------
 >>> accept: condition test failed in ACL "acl_21_21_21"
 >>> end of ACL "acl_21_21_21": implicit DENY
 >>> ----------- end verify ------------
 >>> accept: condition test failed in ACL "acl_21_21_21"
 >>> end of ACL "acl_21_21_21": implicit DENY

-LOG: H=[21.21.21.21] sender verify fail for <x@y>: Unrouteable address
-LOG: H=[21.21.21.21] F=<x@y> rejected RCPT <x1@y>: Sender verify failed
+LOG: H=(test) [21.21.21.21] sender verify fail for <x@y>: Unrouteable address
+LOG: H=(test) [21.21.21.21] F=<x@y> rejected RCPT <x1@y>: Sender verify failed

 >>> using ACL "acl_21_21_21"
 >>> processing "accept" (TESTSUITE/test-config 118)
 >>> check verify = sender
 >>> using cached sender verify result
 >>> accept: condition test failed in ACL "acl_21_21_21"
 >>> end of ACL "acl_21_21_21": implicit DENY
 >>> using ACL "acl_21_21_21"
 >>> processing "accept" (TESTSUITE/test-config 118)
 >>> check verify = sender
 >>> using cached sender verify result
 >>> accept: condition test failed in ACL "acl_21_21_21"
 >>> end of ACL "acl_21_21_21": implicit DENY

-LOG: H=[21.21.21.21] F=<x@y> rejected RCPT <x2@y>: Sender verify failed
+LOG: H=(test) [21.21.21.21] F=<x@y> rejected RCPT <x2@y>: Sender verify failed

 >>> host in smtp_accept_max_nonmail_hosts? yes (matched "*")
 >>> using ACL "acl_21_21_21"
 >>> processing "accept" (TESTSUITE/test-config 118)
 >>> host in smtp_accept_max_nonmail_hosts? yes (matched "*")
 >>> using ACL "acl_21_21_21"
 >>> processing "accept" (TESTSUITE/test-config 118)


@@ -880,8 +896,8 @@ LOG: H=[21.21.21.21] F=<x@y> rejected RCPT <x2@y>: Sender verify failed
 >>> ----------- end verify ------------
 >>> accept: condition test failed in ACL "acl_21_21_21"
 >>> end of ACL "acl_21_21_21": implicit DENY
 >>> ----------- end verify ------------
 >>> accept: condition test failed in ACL "acl_21_21_21"
 >>> end of ACL "acl_21_21_21": implicit DENY

-LOG: H=[21.21.21.21] sender verify fail for <fail@y>: here is a fail message
-LOG: H=[21.21.21.21] F=<fail@y> rejected RCPT <x@y>: Sender verify failed
+LOG: H=(test) [21.21.21.21] sender verify fail for <fail@y>: here is a fail message
+LOG: H=(test) [21.21.21.21] F=<fail@y> rejected RCPT <x@y>: Sender verify failed

 >>> host in hosts_connection_nolog? no (option unset)
 >>> host in host_lookup? no (option unset)
 >>> host in host_reject_connection? no (option unset)
 >>> host in hosts_connection_nolog? no (option unset)
 >>> host in host_lookup? no (option unset)
 >>> host in host_reject_connection? no (option unset)


@@ -890,13 +906,14 @@ LOG: H=[21.21.21.21] F=<fail@y> rejected RCPT <x@y>: Sender verify failed
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)

+>>> test in helo_lookup_domains? no (end of list)

 >>> using ACL "acl_22_22_22"
 >>> processing "accept" (TESTSUITE/test-config 123)
 >>> check recipients = x@y
 >>> userx@y in "x@y"? no (end of list)
 >>> accept: condition test failed in ACL "acl_22_22_22"
 >>> end of ACL "acl_22_22_22": implicit DENY
 >>> using ACL "acl_22_22_22"
 >>> processing "accept" (TESTSUITE/test-config 123)
 >>> check recipients = x@y
 >>> userx@y in "x@y"? no (end of list)
 >>> accept: condition test failed in ACL "acl_22_22_22"
 >>> end of ACL "acl_22_22_22": implicit DENY

-LOG: H=[22.22.22.22] F=<userx@y> rejected RCPT <userx@y>
+LOG: H=(test) [22.22.22.22] F=<userx@y> rejected RCPT <userx@y>

 >>> using ACL "acl_22_22_22"
 >>> processing "accept" (TESTSUITE/test-config 123)
 >>> check recipients = x@y
 >>> using ACL "acl_22_22_22"
 >>> processing "accept" (TESTSUITE/test-config 123)
 >>> check recipients = x@y


@@ -912,6 +929,7 @@ LOG: H=[22.22.22.22] F=<userx@y> rejected RCPT <userx@y>
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)

+>>> test in helo_lookup_domains? no (end of list)

 >>> using ACL "acl_23_23_23"
 >>> processing "deny" (TESTSUITE/test-config 126)
 >>> check hosts = 23.23.23.0
 >>> using ACL "acl_23_23_23"
 >>> processing "deny" (TESTSUITE/test-config 126)
 >>> check hosts = 23.23.23.0


@@ -927,8 +945,8 @@ LOG: H=[22.22.22.22] F=<userx@y> rejected RCPT <userx@y>
 >>> ----------- end verify ------------
 >>> deny: condition test succeeded in ACL "acl_23_23_23"
 >>> end of ACL "acl_23_23_23": DENY
 >>> ----------- end verify ------------
 >>> deny: condition test succeeded in ACL "acl_23_23_23"
 >>> end of ACL "acl_23_23_23": DENY

-LOG: H=[23.23.23.0] sender verify fail for <x@y>: Unrouteable address
-LOG: H=[23.23.23.0] F=<x@y> rejected RCPT <userx@y>: Sender verify failed
+LOG: H=(test) [23.23.23.0] sender verify fail for <x@y>: Unrouteable address
+LOG: H=(test) [23.23.23.0] F=<x@y> rejected RCPT <userx@y>: Sender verify failed

 >>> using ACL "acl_23_23_23"
 >>> processing "deny" (TESTSUITE/test-config 126)
 >>> check hosts = 23.23.23.0
 >>> using ACL "acl_23_23_23"
 >>> processing "deny" (TESTSUITE/test-config 126)
 >>> check hosts = 23.23.23.0


@@ -954,6 +972,7 @@ LOG: H=[23.23.23.0] F=<x@y> rejected RCPT <userx@y>: Sender verify failed
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)

+>>> test in helo_lookup_domains? no (end of list)

 >>> using ACL "acl_23_23_23"
 >>> processing "deny" (TESTSUITE/test-config 126)
 >>> check hosts = 23.23.23.0
 >>> using ACL "acl_23_23_23"
 >>> processing "deny" (TESTSUITE/test-config 126)
 >>> check hosts = 23.23.23.0


@@ -970,13 +989,14 @@ LOG: H=[23.23.23.0] F=<x@y> rejected RCPT <userx@y>: Sender verify failed
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)

+>>> test in helo_lookup_domains? no (end of list)

 >>> using ACL "acl_24_24_24"
 >>> processing "warn" (TESTSUITE/test-config 132)
 >>>   message: X-Warn: sender didn't verify
 >>> check condition = yes
 >>> warn: condition test succeeded in ACL "acl_24_24_24"
 >>> end of ACL "acl_24_24_24": implicit DENY
 >>> using ACL "acl_24_24_24"
 >>> processing "warn" (TESTSUITE/test-config 132)
 >>>   message: X-Warn: sender didn't verify
 >>> check condition = yes
 >>> warn: condition test succeeded in ACL "acl_24_24_24"
 >>> end of ACL "acl_24_24_24": implicit DENY

-LOG: H=[24.24.24.24] F=<x@y> rejected RCPT <userx@y>
+LOG: H=(test) [24.24.24.24] F=<x@y> rejected RCPT <userx@y>

 >>> host in hosts_connection_nolog? no (option unset)
 >>> host in host_lookup? no (option unset)
 >>> host in host_reject_connection? no (option unset)
 >>> host in hosts_connection_nolog? no (option unset)
 >>> host in host_lookup? no (option unset)
 >>> host in host_reject_connection? no (option unset)


@@ -985,6 +1005,7 @@ LOG: H=[24.24.24.24] F=<x@y> rejected RCPT <userx@y>
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)

+>>> test in helo_lookup_domains? no (end of list)

 >>> using ACL "acl_25_25_25"
 >>> processing "deny" (TESTSUITE/test-config 136)
 >>>   message: denying domains=x
 >>> using ACL "acl_25_25_25"
 >>> processing "deny" (TESTSUITE/test-config 136)
 >>>   message: denying domains=x


@@ -992,7 +1013,7 @@ LOG: H=[24.24.24.24] F=<x@y> rejected RCPT <userx@y>
 >>> y in "x"? no (end of list)
 >>> deny: condition test failed in ACL "acl_25_25_25"
 >>> end of ACL "acl_25_25_25": implicit DENY
 >>> y in "x"? no (end of list)
 >>> deny: condition test failed in ACL "acl_25_25_25"
 >>> end of ACL "acl_25_25_25": implicit DENY

-LOG: H=[25.25.25.25] F=<x@y> rejected RCPT <x@y>
+LOG: H=(test) [25.25.25.25] F=<x@y> rejected RCPT <x@y>

 >>> host in hosts_connection_nolog? no (option unset)
 >>> host in host_lookup? no (option unset)
 >>> host in host_reject_connection? no (option unset)
 >>> host in hosts_connection_nolog? no (option unset)
 >>> host in host_lookup? no (option unset)
 >>> host in host_reject_connection? no (option unset)


@@ -1001,6 +1022,7 @@ LOG: H=[25.25.25.25] F=<x@y> rejected RCPT <x@y>
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)

+>>> test in helo_lookup_domains? no (end of list)

 >>> using ACL "acl_26_26_26"
 >>> processing "deny" (TESTSUITE/test-config 140)
 >>> check senders = :
 >>> using ACL "acl_26_26_26"
 >>> processing "deny" (TESTSUITE/test-config 140)
 >>> check senders = :


@@ -1021,7 +1043,7 @@ LOG: H=[25.25.25.25] F=<x@y> rejected RCPT <x@y>
 >>>                 = yes
 >>> deny: condition test succeeded in ACL "acl_26_26_26"
 >>> end of ACL "acl_26_26_26": DENY
 >>>                 = yes
 >>> deny: condition test succeeded in ACL "acl_26_26_26"
 >>> end of ACL "acl_26_26_26": DENY

-LOG: H=[26.26.26.26] F=<> rejected RCPT <y@y>: bounce messages can have only one recipient
+LOG: H=(test) [26.26.26.26] F=<> rejected RCPT <y@y>: bounce messages can have only one recipient

 >>> using ACL "acl_26_26_26"
 >>> processing "deny" (TESTSUITE/test-config 140)
 >>> check senders = :
 >>> using ACL "acl_26_26_26"
 >>> processing "deny" (TESTSUITE/test-config 140)
 >>> check senders = :


@@ -1031,7 +1053,7 @@ LOG: H=[26.26.26.26] F=<> rejected RCPT <y@y>: bounce messages can have only one
 >>>                 = yes
 >>> deny: condition test succeeded in ACL "acl_26_26_26"
 >>> end of ACL "acl_26_26_26": DENY
 >>>                 = yes
 >>> deny: condition test succeeded in ACL "acl_26_26_26"
 >>> end of ACL "acl_26_26_26": DENY

-LOG: H=[26.26.26.26] F=<> rejected RCPT <z@y>: bounce messages can have only one recipient
+LOG: H=(test) [26.26.26.26] F=<> rejected RCPT <z@y>: bounce messages can have only one recipient

 >>> host in hosts_connection_nolog? no (option unset)
 >>> host in host_lookup? no (option unset)
 >>> host in host_reject_connection? no (option unset)
 >>> host in hosts_connection_nolog? no (option unset)
 >>> host in host_lookup? no (option unset)
 >>> host in host_reject_connection? no (option unset)


@@ -1040,6 +1062,7 @@ LOG: H=[26.26.26.26] F=<> rejected RCPT <z@y>: bounce messages can have only one
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)

+>>> test in helo_lookup_domains? no (end of list)

 >>> using ACL "acl_27_27_27"
 >>> processing "deny" (TESTSUITE/test-config 147)
 >>> check hosts = ${if eq {1}{0}{}fail}
 >>> using ACL "acl_27_27_27"
 >>> processing "deny" (TESTSUITE/test-config 147)
 >>> check hosts = ${if eq {1}{0}{}fail}


@@ -1056,6 +1079,7 @@ LOG: H=[26.26.26.26] F=<> rejected RCPT <z@y>: bounce messages can have only one
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)

+>>> test in helo_lookup_domains? no (end of list)

 >>> using ACL "acl_28_28_28"
 >>> processing "accept" (TESTSUITE/test-config 151)
 >>> check sender_domains = : okdomain
 >>> using ACL "acl_28_28_28"
 >>> processing "accept" (TESTSUITE/test-config 151)
 >>> check sender_domains = : okdomain


@@ -1075,7 +1099,7 @@ LOG: H=[26.26.26.26] F=<> rejected RCPT <z@y>: bounce messages can have only one
 >>> baddomain in ": okdomain"? no (end of list)
 >>> accept: condition test failed in ACL "acl_28_28_28"
 >>> end of ACL "acl_28_28_28": implicit DENY
 >>> baddomain in ": okdomain"? no (end of list)
 >>> accept: condition test failed in ACL "acl_28_28_28"
 >>> end of ACL "acl_28_28_28": implicit DENY

-LOG: H=[28.28.28.28] F=<a@baddomain> rejected RCPT <x@y>
+LOG: H=(test) [28.28.28.28] F=<a@baddomain> rejected RCPT <x@y>

 >>> host in hosts_connection_nolog? no (option unset)
 >>> host in host_lookup? no (option unset)
 >>> host in host_reject_connection? no (option unset)
 >>> host in hosts_connection_nolog? no (option unset)
 >>> host in host_lookup? no (option unset)
 >>> host in host_reject_connection? no (option unset)


@@ -1084,6 +1108,7 @@ LOG: H=[28.28.28.28] F=<a@baddomain> rejected RCPT <x@y>
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)

+>>> test in helo_lookup_domains? no (end of list)

 >>> using ACL "acl_V4NET_0_0"
 >>> processing "require" (TESTSUITE/test-config 97)
 >>> check verify = reverse_host_lookup
 >>> using ACL "acl_V4NET_0_0"
 >>> processing "require" (TESTSUITE/test-config 97)
 >>> check verify = reverse_host_lookup


@@ -1107,6 +1132,7 @@ LOG: H=[28.28.28.28] F=<a@baddomain> rejected RCPT <x@y>
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)

+>>> test in helo_lookup_domains? no (end of list)

 >>> using ACL "acl_V4NET_0_0"
 >>> processing "require" (TESTSUITE/test-config 97)
 >>> check verify = reverse_host_lookup
 >>> using ACL "acl_V4NET_0_0"
 >>> processing "require" (TESTSUITE/test-config 97)
 >>> check verify = reverse_host_lookup


@@ -1115,7 +1141,7 @@ LOG: H=[28.28.28.28] F=<a@baddomain> rejected RCPT <x@y>
 LOG: no host name found for IP address V4NET.0.0.97
 >>> require: condition test failed in ACL "acl_V4NET_0_0"
 >>> end of ACL "acl_V4NET_0_0": not OK
 LOG: no host name found for IP address V4NET.0.0.97
 >>> require: condition test failed in ACL "acl_V4NET_0_0"
 >>> end of ACL "acl_V4NET_0_0": not OK

-LOG: H=[V4NET.0.0.97] F=<> rejected RCPT <x@y>: host lookup failed for reverse lookup check (failed to find host name from IP address)
+LOG: H=(test) [V4NET.0.0.97] F=<> rejected RCPT <x@y>: host lookup failed for reverse lookup check (failed to find host name from IP address)

 >>> host in hosts_connection_nolog? no (option unset)
 >>> host in host_lookup? no (option unset)
 >>> host in host_reject_connection? no (option unset)
 >>> host in hosts_connection_nolog? no (option unset)
 >>> host in host_lookup? no (option unset)
 >>> host in host_reject_connection? no (option unset)


@@ -1124,6 +1150,7 @@ LOG: H=[V4NET.0.0.97] F=<> rejected RCPT <x@y>: host lookup failed for reverse l
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)

+>>> test in helo_lookup_domains? no (end of list)

 >>> using ACL "acl_V4NET_99_99"
 >>> processing "accept" (TESTSUITE/test-config 100)
 >>> check local_parts = defer_ok
 >>> using ACL "acl_V4NET_99_99"
 >>> processing "accept" (TESTSUITE/test-config 100)
 >>> check local_parts = defer_ok


@@ -1137,7 +1164,7 @@ LOG: H=[V4NET.0.0.97] F=<> rejected RCPT <x@y>: host lookup failed for reverse l
 >>> x.test.again.dns in dns_again_means_nonexist? no (option unset)
 >>> temporary error for host name lookup
 >>> accept: condition test deferred in ACL "acl_V4NET_99_99"
 >>> x.test.again.dns in dns_again_means_nonexist? no (option unset)
 >>> temporary error for host name lookup
 >>> accept: condition test deferred in ACL "acl_V4NET_99_99"

-LOG: H=[V4NET.99.99.96] F=<> temporarily rejected RCPT <x@y>: host lookup deferred for reverse lookup check
+LOG: H=(test) [V4NET.99.99.96] F=<> temporarily rejected RCPT <x@y>: host lookup deferred for reverse lookup check

 >>> host in hosts_connection_nolog? no (option unset)
 >>> host in host_lookup? no (option unset)
 >>> host in host_reject_connection? no (option unset)
 >>> host in hosts_connection_nolog? no (option unset)
 >>> host in host_lookup? no (option unset)
 >>> host in host_reject_connection? no (option unset)


@@ -1146,6 +1173,7 @@ LOG: H=[V4NET.99.99.96] F=<> temporarily rejected RCPT <x@y>: host lookup deferr
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)

+>>> test in helo_lookup_domains? no (end of list)

 >>> using ACL "acl_V4NET_99_99"
 >>> processing "accept" (TESTSUITE/test-config 100)
 >>> check local_parts = defer_ok
 >>> using ACL "acl_V4NET_99_99"
 >>> processing "accept" (TESTSUITE/test-config 100)
 >>> check local_parts = defer_ok


@@ -1166,6 +1194,7 @@ LOG: H=[V4NET.99.99.96] F=<> temporarily rejected RCPT <x@y>: host lookup deferr
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)

+>>> test in helo_lookup_domains? no (end of list)

 >>> using ACL "acl_29_29_29"
 >>> processing "deny" (TESTSUITE/test-config 154)
 >>> check dnslists = test.ex/$sender_address_domain
 >>> using ACL "acl_29_29_29"
 >>> processing "deny" (TESTSUITE/test-config 154)
 >>> check dnslists = test.ex/$sender_address_domain


@@ -1177,7 +1206,7 @@ LOG: H=[V4NET.99.99.96] F=<> temporarily rejected RCPT <x@y>: host lookup deferr
 >>> => that means localhost is listed at test.ex
 >>> deny: condition test succeeded in ACL "acl_29_29_29"
 >>> end of ACL "acl_29_29_29": DENY
 >>> => that means localhost is listed at test.ex
 >>> deny: condition test succeeded in ACL "acl_29_29_29"
 >>> end of ACL "acl_29_29_29": DENY

-LOG: H=[29.29.29.29] F=<a@localhost> rejected RCPT <x@y>
+LOG: H=(test) [29.29.29.29] F=<a@localhost> rejected RCPT <x@y>

 >>> using ACL "acl_29_29_29"
 >>> processing "deny" (TESTSUITE/test-config 154)
 >>> check dnslists = test.ex/$sender_address_domain
 >>> using ACL "acl_29_29_29"
 >>> processing "deny" (TESTSUITE/test-config 154)
 >>> check dnslists = test.ex/$sender_address_domain


@@ -1199,6 +1228,7 @@ LOG: H=[29.29.29.29] F=<a@localhost> rejected RCPT <x@y>
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)

+>>> test in helo_lookup_domains? no (end of list)

 >>> using ACL "acl_30_30_30"
 >>> processing "deny" (TESTSUITE/test-config 161)
 >>>   message: domain=$dnslist_domain\nvalue=$dnslist_value\nmatched=$dnslist_matched\ntext="$dnslist_text"
 >>> using ACL "acl_30_30_30"
 >>> processing "deny" (TESTSUITE/test-config 161)
 >>>   message: domain=$dnslist_domain\nvalue=$dnslist_value\nmatched=$dnslist_matched\ntext="$dnslist_text"


@@ -1211,7 +1241,7 @@ LOG: H=[29.29.29.29] F=<a@localhost> rejected RCPT <x@y>
 >>> => that means ten-1 is listed at test.ex
 >>> deny: condition test succeeded in ACL "acl_30_30_30"
 >>> end of ACL "acl_30_30_30": DENY
 >>> => that means ten-1 is listed at test.ex
 >>> deny: condition test succeeded in ACL "acl_30_30_30"
 >>> end of ACL "acl_30_30_30": DENY

-LOG: H=[30.30.30.30] F=<a@ten-1> rejected RCPT <x@y>: domain=test.ex
+LOG: H=(test) [30.30.30.30] F=<a@ten-1> rejected RCPT <x@y>: domain=test.ex

 >>> using ACL "acl_30_30_30"
 >>> processing "deny" (TESTSUITE/test-config 161)
 >>>   message: domain=$dnslist_domain\nvalue=$dnslist_value\nmatched=$dnslist_matched\ntext="$dnslist_text"
 >>> using ACL "acl_30_30_30"
 >>> processing "deny" (TESTSUITE/test-config 161)
 >>>   message: domain=$dnslist_domain\nvalue=$dnslist_value\nmatched=$dnslist_matched\ntext="$dnslist_text"


@@ -1240,7 +1270,7 @@ LOG: H=[30.30.30.30] F=<a@ten-1> rejected RCPT <x@y>: domain=test.ex
 >>> => that means 13.12.11.V4NET.rbl is listed at test.ex
 >>> deny: condition test succeeded in ACL "acl_30_30_30"
 >>> end of ACL "acl_30_30_30": DENY
 >>> => that means 13.12.11.V4NET.rbl is listed at test.ex
 >>> deny: condition test succeeded in ACL "acl_30_30_30"
 >>> end of ACL "acl_30_30_30": DENY

-LOG: H=[30.30.30.30] F=<a@13.12.11.V4NET.rbl> rejected RCPT <x@y>: domain=test.ex
+LOG: H=(test) [30.30.30.30] F=<a@13.12.11.V4NET.rbl> rejected RCPT <x@y>: domain=test.ex

 >>> host in hosts_connection_nolog? no (option unset)
 >>> host in host_lookup? no (option unset)
 >>> host in host_reject_connection? no (option unset)
 >>> host in hosts_connection_nolog? no (option unset)
 >>> host in host_lookup? no (option unset)
 >>> host in host_reject_connection? no (option unset)


@@ -1249,6 +1279,7 @@ LOG: H=[30.30.30.30] F=<a@13.12.11.V4NET.rbl> rejected RCPT <x@y>: domain=test.e
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)

+>>> test in helo_lookup_domains? no (end of list)

 >>> using ACL "acl_31_31_31"
 >>> processing "deny" (TESTSUITE/test-config 167)
 >>> check dnslists = test.ex/$sender_address_domain+extra+extra+extra+extra+extra+extra+extra+extra+extra+extra+extra+extra+extra+extra+extra+extra+extra+extra+extra+extra+extra+extra+extra+extra+extra+extra+extra+extra+extra+extra+extra+extra+extra+extra+extra+extra+extra+extra+extra+extra+extra+extra+extra+extra+extra+extra+extra+extra+extra+extra+extra+extra+extra+extra+extra+END
 >>> using ACL "acl_31_31_31"
 >>> processing "deny" (TESTSUITE/test-config 167)
 >>> check dnslists = test.ex/$sender_address_domain+extra+extra+extra+extra+extra+extra+extra+extra+extra+extra+extra+extra+extra+extra+extra+extra+extra+extra+extra+extra+extra+extra+extra+extra+extra+extra+extra+extra+extra+extra+extra+extra+extra+extra+extra+extra+extra+extra+extra+extra+extra+extra+extra+extra+extra+extra+extra+extra+extra+extra+extra+extra+extra+extra+extra+END


@@ -1267,6 +1298,7 @@ LOG: dnslist query is too long (ignored): y+extra+extra+extra+extra+extra+extra+
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)

+>>> test in helo_lookup_domains? no (end of list)

 >>> using ACL "acl_33_33_33"
 >>> processing "accept" (TESTSUITE/test-config 184)
 >>>   message: sender verify failure
 >>> using ACL "acl_33_33_33"
 >>> processing "accept" (TESTSUITE/test-config 184)
 >>>   message: sender verify failure


@@ -1280,7 +1312,7 @@ LOG: dnslist query is too long (ignored): y+extra+extra+extra+extra+extra+extra+
 >>> ----------- end verify ------------
 >>> accept: condition test failed in ACL "acl_33_33_33"
 >>> accept: endpass encountered - denying access
 >>> ----------- end verify ------------
 >>> accept: condition test failed in ACL "acl_33_33_33"
 >>> accept: endpass encountered - denying access

-LOG: H=[33.33.33.33] F=<x@y> rejected RCPT <x1@y>: Sender verify failed
+LOG: H=(test) [33.33.33.33] F=<x@y> rejected RCPT <x1@y>: Sender verify failed

 >>> using ACL "acl_33_33_33"
 >>> processing "accept" (TESTSUITE/test-config 184)
 >>>   message: sender verify failure
 >>> using ACL "acl_33_33_33"
 >>> processing "accept" (TESTSUITE/test-config 184)
 >>>   message: sender verify failure


@@ -1288,7 +1320,7 @@ LOG: H=[33.33.33.33] F=<x@y> rejected RCPT <x1@y>: Sender verify failed
 >>> using cached sender verify result
 >>> accept: condition test failed in ACL "acl_33_33_33"
 >>> accept: endpass encountered - denying access
 >>> using cached sender verify result
 >>> accept: condition test failed in ACL "acl_33_33_33"
 >>> accept: endpass encountered - denying access

-LOG: H=[33.33.33.33] F=<x@y> rejected RCPT <x2@y>: Sender verify failed
+LOG: H=(test) [33.33.33.33] F=<x@y> rejected RCPT <x2@y>: Sender verify failed

 >>> host in hosts_connection_nolog? no (option unset)
 >>> host in host_lookup? no (option unset)
 >>> host in host_reject_connection? no (option unset)
 >>> host in hosts_connection_nolog? no (option unset)
 >>> host in host_lookup? no (option unset)
 >>> host in host_reject_connection? no (option unset)


@@ -1297,6 +1329,7 @@ LOG: H=[33.33.33.33] F=<x@y> rejected RCPT <x2@y>: Sender verify failed
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)

+>>> test in helo_lookup_domains? no (end of list)

 >>> using ACL "acl_44_44_44"
 >>> processing "warn" (TESTSUITE/test-config 192)
 >>> check dnslists = test.again.dns
 >>> using ACL "acl_44_44_44"
 >>> processing "warn" (TESTSUITE/test-config 192)
 >>> check dnslists = test.again.dns


@@ -1328,7 +1361,7 @@ LOG: DNS list lookup defer (probably timeout) for 1.44.44.44.test.again.dns: ass
 >>> dnslists: using result of previous lookup
 LOG: DNS list lookup defer (probably timeout) for 1.44.44.44.test.again.dns: returned DEFER
 >>> warn: condition test deferred in ACL "acl_44_44_44"
 >>> dnslists: using result of previous lookup
 LOG: DNS list lookup defer (probably timeout) for 1.44.44.44.test.again.dns: returned DEFER
 >>> warn: condition test deferred in ACL "acl_44_44_44"

-LOG: H=[44.44.44.1] Warning: ACL "warn" statement skipped: condition test deferred
+LOG: H=(test) [44.44.44.1] Warning: ACL "warn" statement skipped: condition test deferred

 >>> processing "accept" (TESTSUITE/test-config 196)
 >>> accept: condition test succeeded in ACL "acl_44_44_44"
 >>> end of ACL "acl_44_44_44": ACCEPT
 >>> processing "accept" (TESTSUITE/test-config 196)
 >>> accept: condition test succeeded in ACL "acl_44_44_44"
 >>> end of ACL "acl_44_44_44": ACCEPT


@@ -1340,6 +1373,7 @@ LOG: H=[44.44.44.1] Warning: ACL "warn" statement skipped: condition test deferr
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)

+>>> test in helo_lookup_domains? no (end of list)

 >>> using ACL "acl_60_60_60"
 >>> processing "accept" (TESTSUITE/test-config 226)
 >>> check !acl = TESTSUITE/aux-fixed/0023.acl2
 >>> using ACL "acl_60_60_60"
 >>> processing "accept" (TESTSUITE/test-config 226)
 >>> check !acl = TESTSUITE/aux-fixed/0023.acl2


@@ -1364,4 +1398,4 @@ LOG: H=[44.44.44.1] Warning: ACL "warn" statement skipped: condition test deferr
 >>>  end of ACL "TESTSUITE/aux-fixed/0023.acl2": ACCEPT
 >>> accept: condition test failed in ACL "acl_60_60_60"
 >>> end of ACL "acl_60_60_60": implicit DENY
 >>>  end of ACL "TESTSUITE/aux-fixed/0023.acl2": ACCEPT
 >>> accept: condition test failed in ACL "acl_60_60_60"
 >>> end of ACL "acl_60_60_60": implicit DENY

-LOG: H=[60.60.60.60] F=<x@y> rejected RCPT <a@b>
+LOG: H=(test) [60.60.60.60] F=<x@y> rejected RCPT <a@b>

diff --git a/test/stderr/0026 b/test/stderr/0026
index e1dfdf664264f346fe0cbdd87cc9e86966d58894..5bd6f0115f8b46c81ce5502b96196103edf68cfe 100644 (file)
--- a/test/stderr/0026
+++ b/test/stderr/0026
@@ -6,6 +6,7 @@
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)

+>>> test in helo_lookup_domains? no (end of list)

 >>> processing "accept" (TESTSUITE/test-config 61)
 >>> accept: condition test succeeded in inline ACL
 >>> end of inline ACL: ACCEPT
 >>> processing "accept" (TESTSUITE/test-config 61)
 >>> accept: condition test succeeded in inline ACL
 >>> end of inline ACL: ACCEPT


@@ -25,7 +26,7 @@ LOG: 10HmbI-0005vi-00 $h_from: '@'
 >>> check verify = header_syntax
 >>> require: condition test failed in ACL "acl_data"
 >>> end of ACL "acl_data": not OK
 >>> check verify = header_syntax
 >>> require: condition test failed in ACL "acl_data"
 >>> end of ACL "acl_data": not OK

-LOG: 10HmbI-0005vi-00 H=[10.0.0.0] F=<x@y> rejected after DATA: domain missing or malformed: failing address in "From:" header is: @
+LOG: 10HmbI-0005vi-00 H=(test) [10.0.0.0] F=<x@y> rejected after DATA: domain missing or malformed: failing address in "From:" header is: @

 >>> host in hosts_connection_nolog? no (option unset)
 >>> host in host_lookup? no (option unset)
 >>> host in host_reject_connection? no (option unset)
 >>> host in hosts_connection_nolog? no (option unset)
 >>> host in host_lookup? no (option unset)
 >>> host in host_reject_connection? no (option unset)


@@ -34,6 +35,7 @@ LOG: 10HmbI-0005vi-00 H=[10.0.0.0] F=<x@y> rejected after DATA: domain missing o
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)

+>>> test in helo_lookup_domains? no (end of list)

 >>> processing "accept" (TESTSUITE/test-config 61)
 >>> accept: condition test succeeded in inline ACL
 >>> end of inline ACL: ACCEPT
 >>> processing "accept" (TESTSUITE/test-config 61)
 >>> accept: condition test succeeded in inline ACL
 >>> end of inline ACL: ACCEPT


@@ -45,4 +47,4 @@ LOG: 10HmbI-0005vi-00 H=[10.0.0.0] F=<x@y> rejected after DATA: domain missing o
 >>>                 = yes
 >>> deny: condition test succeeded in ACL "acl_data"
 >>> end of ACL "acl_data": DENY
 >>>                 = yes
 >>> deny: condition test succeeded in ACL "acl_data"
 >>> end of ACL "acl_data": DENY

-LOG: 10HmbJ-0005vi-00 H=[10.0.0.0] F=<x@y> rejected after DATA: body contains trigger
+LOG: 10HmbJ-0005vi-00 H=(test) [10.0.0.0] F=<x@y> rejected after DATA: body contains trigger

diff --git a/test/stderr/0056 b/test/stderr/0056
index f23ed97efd5f61fffca920a2643c2fb36aec3d15..8cb1215cb5b2ae9979229c123e10a495a2aba191 100644 (file)
--- a/test/stderr/0056
+++ b/test/stderr/0056
@@ -6,6 +6,7 @@
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)

+>>> test in helo_lookup_domains? no (end of list)

 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 20)
 >>> check domains = +local_domains
 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 20)
 >>> check domains = +local_domains


@@ -37,4 +38,4 @@
 >>> 3rdhost.example.com in "+relay_domains"? yes (matched "+relay_domains")
 >>> accept: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": ACCEPT
 >>> 3rdhost.example.com in "+relay_domains"? yes (matched "+relay_domains")
 >>> accept: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": ACCEPT

-LOG: 10HmaX-0005vi-00 <= userx@somehost.example.com H=[V4NET.0.0.1] P=smtp S=sss
+LOG: 10HmaX-0005vi-00 <= userx@somehost.example.com H=(test) [V4NET.0.0.1] P=smtp S=sss

diff --git a/test/stderr/0057 b/test/stderr/0057
index 2f087d7c1b4affa15533a5fdbaed7377fcafbc94..1ad8703411ce24bd483d7a91ad23b2468c91068b 100644 (file)
--- a/test/stderr/0057
+++ b/test/stderr/0057
@@ -6,6 +6,7 @@
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)

+>>> test in helo_lookup_domains? no (end of list)

 >>> test.ex in percent_hack_domains? no (end of list)
 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 23)
 >>> test.ex in percent_hack_domains? no (end of list)
 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 23)


@@ -30,7 +31,7 @@
 >>>   message: relay not permitted
 >>> deny: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": DENY
 >>>   message: relay not permitted
 >>> deny: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": DENY

-LOG: H=[V4NET.0.0.1] F=<userx@somehost.example.com> rejected RCPT <userx@anotherhost.example.com>: relay not permitted
+LOG: H=(test) [V4NET.0.0.1] F=<userx@somehost.example.com> rejected RCPT <userx@anotherhost.example.com>: relay not permitted

 >>> 3rdhost.example.com in percent_hack_domains? no (end of list)
 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 23)
 >>> 3rdhost.example.com in percent_hack_domains? no (end of list)
 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 23)


@@ -47,5 +48,5 @@ LOG: H=[V4NET.0.0.1] F=<userx@somehost.example.com> rejected RCPT <userx@another
 >>>   message: relay not permitted
 >>> deny: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": DENY
 >>>   message: relay not permitted
 >>> deny: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": DENY

-LOG: H=[V4NET.0.0.1] F=<userx@somehost.example.com> rejected RCPT <userx@3rdhost.example.com>: relay not permitted
-LOG: 10HmaX-0005vi-00 <= userx@somehost.example.com H=[V4NET.0.0.1] P=smtp S=sss
+LOG: H=(test) [V4NET.0.0.1] F=<userx@somehost.example.com> rejected RCPT <userx@3rdhost.example.com>: relay not permitted
+LOG: 10HmaX-0005vi-00 <= userx@somehost.example.com H=(test) [V4NET.0.0.1] P=smtp S=sss

diff --git a/test/stderr/0058 b/test/stderr/0058
index 326127baca1c02542ac2c9e24fafdad34ee03994..82879698286509ca6f623565cfa5e3ff69f1eb16 100644 (file)
--- a/test/stderr/0058
+++ b/test/stderr/0058
@@ -6,6 +6,7 @@
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)

+>>> test in helo_lookup_domains? no (end of list)

 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 19)
 >>> check domains = +local_domains
 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 19)
 >>> check domains = +local_domains


@@ -18,7 +19,7 @@
 >>> host in "+relay_hosts"? yes (matched "+relay_hosts")
 >>> accept: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": ACCEPT
 >>> host in "+relay_hosts"? yes (matched "+relay_hosts")
 >>> accept: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": ACCEPT

-LOG: 10HmaX-0005vi-00 <= userx@somehost.example.com H=[V4NET.0.0.1] P=smtp S=sss
+LOG: 10HmaX-0005vi-00 <= userx@somehost.example.com H=(test) [V4NET.0.0.1] P=smtp S=sss

 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 19)
 >>> check domains = +local_domains
 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 19)
 >>> check domains = +local_domains


@@ -30,4 +31,4 @@ LOG: 10HmaX-0005vi-00 <= userx@somehost.example.com H=[V4NET.0.0.1] P=smtp S=sss
 >>> host in "+relay_hosts"? yes (matched "+relay_hosts" - cached)
 >>> accept: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": ACCEPT
 >>> host in "+relay_hosts"? yes (matched "+relay_hosts" - cached)
 >>> accept: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": ACCEPT

-LOG: 10HmaY-0005vi-00 <= userx@somehost.example.com H=[V4NET.0.0.1] P=smtp S=sss
+LOG: 10HmaY-0005vi-00 <= userx@somehost.example.com H=(test) [V4NET.0.0.1] P=smtp S=sss

diff --git a/test/stderr/0059 b/test/stderr/0059
index b9c3bd9db5fa11def227349a4ec22b5dfd38f7d5..835a64e9eab443c844e353c47e6aea7b63058018 100644 (file)
--- a/test/stderr/0059
+++ b/test/stderr/0059
@@ -6,6 +6,7 @@
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)

+>>> test in helo_lookup_domains? no (end of list)

 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 20)
 >>> check domains = +local_domains
 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 20)
 >>> check domains = +local_domains


@@ -33,5 +34,5 @@
 >>>   message: relay not permitted
 >>> deny: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": DENY
 >>>   message: relay not permitted
 >>> deny: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": DENY

-LOG: H=[V4NET.0.0.1] F=<userx@somehost.example.com> rejected RCPT <userx@anotherhost.example.com>: relay not permitted
-LOG: 10HmaX-0005vi-00 <= userx@somehost.example.com H=[V4NET.0.0.1] P=smtp S=sss
+LOG: H=(test) [V4NET.0.0.1] F=<userx@somehost.example.com> rejected RCPT <userx@anotherhost.example.com>: relay not permitted
+LOG: 10HmaX-0005vi-00 <= userx@somehost.example.com H=(test) [V4NET.0.0.1] P=smtp S=sss

diff --git a/test/stderr/0060 b/test/stderr/0060
index df969e4b2621f95018ab6d3cfab5c44ac319d3f9..7060ca8fe3e9cc05c1e84d8625254a4bd020b9da 100644 (file)
--- a/test/stderr/0060
+++ b/test/stderr/0060
@@ -6,6 +6,7 @@
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)

+>>> test in helo_lookup_domains? no (end of list)

 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 22)
 >>> check domains = +local_domains
 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 22)
 >>> check domains = +local_domains


@@ -33,7 +34,7 @@ MUNGED: ::1 will be omitted in what follows
 >>> host in "+relay_hosts"? yes (matched "+relay_hosts")
 >>> accept: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": ACCEPT
 >>> host in "+relay_hosts"? yes (matched "+relay_hosts")
 >>> accept: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": ACCEPT

-LOG: 10HmaX-0005vi-00 <= userx@somehost.example.com H=[V4NET.0.0.1] P=smtp S=sss
+LOG: 10HmaX-0005vi-00 <= userx@somehost.example.com H=(test) [V4NET.0.0.1] P=smtp S=sss

 >>> host in hosts_connection_nolog? no (option unset)
 >>> host in host_lookup? no (option unset)
 >>> host in host_reject_connection? no (option unset)
 >>> host in hosts_connection_nolog? no (option unset)
 >>> host in host_lookup? no (option unset)
 >>> host in host_reject_connection? no (option unset)


@@ -42,6 +43,7 @@ LOG: 10HmaX-0005vi-00 <= userx@somehost.example.com H=[V4NET.0.0.1] P=smtp S=sss
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)

+>>> test in helo_lookup_domains? no (end of list)

 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 22)
 >>> check domains = +local_domains
 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 22)
 >>> check domains = +local_domains


@@ -76,8 +78,8 @@ MUNGED: ::1 will be omitted in what follows
 >>>   message: relay not permitted
 >>> deny: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": DENY
 >>>   message: relay not permitted
 >>> deny: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": DENY

-LOG: H=[V4NET.0.0.2] F=<userx@somehost.example.com> rejected RCPT <userx@anotherhost.example.com>: relay not permitted
-LOG: 10HmaY-0005vi-00 <= userx@somehost.example.com H=[V4NET.0.0.2] P=smtp S=sss
+LOG: H=(test) [V4NET.0.0.2] F=<userx@somehost.example.com> rejected RCPT <userx@anotherhost.example.com>: relay not permitted
+LOG: 10HmaY-0005vi-00 <= userx@somehost.example.com H=(test) [V4NET.0.0.2] P=smtp S=sss

 >>> host in hosts_connection_nolog? no (option unset)
 >>> host in host_lookup? no (option unset)
 >>> host in host_reject_connection? no (option unset)
 >>> host in hosts_connection_nolog? no (option unset)
 >>> host in host_lookup? no (option unset)
 >>> host in host_reject_connection? no (option unset)


@@ -86,6 +88,7 @@ LOG: 10HmaY-0005vi-00 <= userx@somehost.example.com H=[V4NET.0.0.2] P=smtp S=sss
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)

+>>> test in helo_lookup_domains? no (end of list)

 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 22)
 >>> check domains = +local_domains
 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 22)
 >>> check domains = +local_domains


@@ -117,7 +120,7 @@ MUNGED: ::1 will be omitted in what follows
 >>> host in "+relay_hosts"? yes (matched "+relay_hosts")
 >>> accept: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": ACCEPT
 >>> host in "+relay_hosts"? yes (matched "+relay_hosts")
 >>> accept: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": ACCEPT

-LOG: 10HmaZ-0005vi-00 <= userx@somehost.example.com H=[V4NET.0.0.5] P=smtp S=sss
+LOG: 10HmaZ-0005vi-00 <= userx@somehost.example.com H=(test) [V4NET.0.0.5] P=smtp S=sss

 >>> host in hosts_connection_nolog? no (option unset)
 >>> host in host_lookup? no (option unset)
 >>> host in host_reject_connection? no (option unset)
 >>> host in hosts_connection_nolog? no (option unset)
 >>> host in host_lookup? no (option unset)
 >>> host in host_reject_connection? no (option unset)


@@ -126,6 +129,7 @@ LOG: 10HmaZ-0005vi-00 <= userx@somehost.example.com H=[V4NET.0.0.5] P=smtp S=sss
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)

+>>> test in helo_lookup_domains? no (end of list)

 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 22)
 >>> check domains = +local_domains
 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 22)
 >>> check domains = +local_domains


@@ -157,7 +161,7 @@ MUNGED: ::1 will be omitted in what follows
 >>> host in "+relay_hosts"? yes (matched "+relay_hosts")
 >>> accept: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": ACCEPT
 >>> host in "+relay_hosts"? yes (matched "+relay_hosts")
 >>> accept: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": ACCEPT

-LOG: 10HmbA-0005vi-00 <= userx@somehost.example.com H=[V4NET.0.0.6] P=smtp S=sss
+LOG: 10HmbA-0005vi-00 <= userx@somehost.example.com H=(test) [V4NET.0.0.6] P=smtp S=sss

 >>> host in hosts_connection_nolog? no (option unset)
 >>> host in host_lookup? no (option unset)
 >>> host in host_reject_connection? no (option unset)
 >>> host in hosts_connection_nolog? no (option unset)
 >>> host in host_lookup? no (option unset)
 >>> host in host_reject_connection? no (option unset)


@@ -166,6 +170,7 @@ LOG: 10HmbA-0005vi-00 <= userx@somehost.example.com H=[V4NET.0.0.6] P=smtp S=sss
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)

+>>> test in helo_lookup_domains? no (end of list)

 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 22)
 >>> check domains = +local_domains
 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 22)
 >>> check domains = +local_domains


@@ -193,8 +198,8 @@ LOG: 10HmbA-0005vi-00 <= userx@somehost.example.com H=[V4NET.0.0.6] P=smtp S=sss
 >>>   message: relay not permitted
 >>> deny: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": DENY
 >>>   message: relay not permitted
 >>> deny: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": DENY

-LOG: H=[V4NET.255.0.1] F=<userx@somehost.example.com> rejected RCPT <userx@anotherhost.example.com>: relay not permitted
-LOG: 10HmbB-0005vi-00 <= userx@somehost.example.com H=[V4NET.255.0.1] P=smtp S=sss
+LOG: H=(test) [V4NET.255.0.1] F=<userx@somehost.example.com> rejected RCPT <userx@anotherhost.example.com>: relay not permitted
+LOG: 10HmbB-0005vi-00 <= userx@somehost.example.com H=(test) [V4NET.255.0.1] P=smtp S=sss

 >>> host in hosts_connection_nolog? no (option unset)
 >>> host in host_lookup? no (option unset)
 >>> host in host_reject_connection? no (option unset)
 >>> host in hosts_connection_nolog? no (option unset)
 >>> host in host_lookup? no (option unset)
 >>> host in host_reject_connection? no (option unset)


@@ -203,6 +208,7 @@ LOG: 10HmbB-0005vi-00 <= userx@somehost.example.com H=[V4NET.255.0.1] P=smtp S=s
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)

+>>> test in helo_lookup_domains? no (end of list)

 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 22)
 >>> check domains = +local_domains
 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 22)
 >>> check domains = +local_domains


@@ -230,8 +236,8 @@ LOG: 10HmbB-0005vi-00 <= userx@somehost.example.com H=[V4NET.255.0.1] P=smtp S=s
 >>>   message: relay not permitted
 >>> deny: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": DENY
 >>>   message: relay not permitted
 >>> deny: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": DENY

-LOG: H=[V4NET.255.0.2] F=<userx@somehost.example.com> rejected RCPT <userx@anotherhost.example.com>: relay not permitted
-LOG: 10HmbC-0005vi-00 <= userx@somehost.example.com H=[V4NET.255.0.2] P=smtp S=sss
+LOG: H=(test) [V4NET.255.0.2] F=<userx@somehost.example.com> rejected RCPT <userx@anotherhost.example.com>: relay not permitted
+LOG: 10HmbC-0005vi-00 <= userx@somehost.example.com H=(test) [V4NET.255.0.2] P=smtp S=sss

 >>> host in hosts_connection_nolog? no (option unset)
 >>> host in host_lookup? no (option unset)
 >>> host in host_reject_connection? no (option unset)
 >>> host in hosts_connection_nolog? no (option unset)
 >>> host in host_lookup? no (option unset)
 >>> host in host_reject_connection? no (option unset)


@@ -240,6 +246,7 @@ LOG: 10HmbC-0005vi-00 <= userx@somehost.example.com H=[V4NET.255.0.2] P=smtp S=s
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)

+>>> test in helo_lookup_domains? no (end of list)

 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 22)
 >>> check domains = +local_domains
 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 22)
 >>> check domains = +local_domains


@@ -267,8 +274,8 @@ LOG: 10HmbC-0005vi-00 <= userx@somehost.example.com H=[V4NET.255.0.2] P=smtp S=s
 >>>   message: relay not permitted
 >>> deny: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": DENY
 >>>   message: relay not permitted
 >>> deny: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": DENY

-LOG: H=[V4NET.255.0.3] F=<userx@somehost.example.com> rejected RCPT <userx@anotherhost.example.com>: relay not permitted
-LOG: 10HmbD-0005vi-00 <= userx@somehost.example.com H=[V4NET.255.0.3] P=smtp S=sss
+LOG: H=(test) [V4NET.255.0.3] F=<userx@somehost.example.com> rejected RCPT <userx@anotherhost.example.com>: relay not permitted
+LOG: 10HmbD-0005vi-00 <= userx@somehost.example.com H=(test) [V4NET.255.0.3] P=smtp S=sss

 >>> host in hosts_connection_nolog? no (option unset)
 >>> host in host_lookup? no (option unset)
 >>> host in host_reject_connection? no (option unset)
 >>> host in hosts_connection_nolog? no (option unset)
 >>> host in host_lookup? no (option unset)
 >>> host in host_reject_connection? no (option unset)


@@ -277,6 +284,7 @@ LOG: 10HmbD-0005vi-00 <= userx@somehost.example.com H=[V4NET.255.0.3] P=smtp S=s
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)

+>>> test in helo_lookup_domains? no (end of list)

 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 22)
 >>> check domains = +local_domains
 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 22)
 >>> check domains = +local_domains


@@ -304,5 +312,5 @@ LOG: 10HmbD-0005vi-00 <= userx@somehost.example.com H=[V4NET.255.0.3] P=smtp S=s
 >>>   message: relay not permitted
 >>> deny: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": DENY
 >>>   message: relay not permitted
 >>> deny: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": DENY

-LOG: H=[V4NET.255.0.4] F=<userx@somehost.example.com> rejected RCPT <userx@anotherhost.example.com>: relay not permitted
-LOG: 10HmbE-0005vi-00 <= userx@somehost.example.com H=[V4NET.255.0.4] P=smtp S=sss
+LOG: H=(test) [V4NET.255.0.4] F=<userx@somehost.example.com> rejected RCPT <userx@anotherhost.example.com>: relay not permitted
+LOG: 10HmbE-0005vi-00 <= userx@somehost.example.com H=(test) [V4NET.255.0.4] P=smtp S=sss

diff --git a/test/stderr/0061 b/test/stderr/0061
index 7026031baee71f1ea1d9caa3b8b9d3dbf1b176b9..a4ce8be2d08c33ea0278335b798510a7ce0f52d7 100644 (file)
--- a/test/stderr/0061
+++ b/test/stderr/0061
@@ -6,6 +6,7 @@
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)

+>>> test in helo_lookup_domains? no (end of list)

 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 20)
 >>> check domains = +local_domains
 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 20)
 >>> check domains = +local_domains


@@ -33,7 +34,7 @@ MUNGED: ::1 will be omitted in what follows
 >>> host in "+relay_hosts"? yes (matched "+relay_hosts")
 >>> accept: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": ACCEPT
 >>> host in "+relay_hosts"? yes (matched "+relay_hosts")
 >>> accept: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": ACCEPT

-LOG: 10HmaX-0005vi-00 <= userx@somehost.example.com H=[V4NET.0.0.1] P=smtp S=sss
+LOG: 10HmaX-0005vi-00 <= userx@somehost.example.com H=(test) [V4NET.0.0.1] P=smtp S=sss

 >>> host in hosts_connection_nolog? no (option unset)
 >>> host in host_lookup? no (option unset)
 >>> host in host_reject_connection? no (option unset)
 >>> host in hosts_connection_nolog? no (option unset)
 >>> host in host_lookup? no (option unset)
 >>> host in host_reject_connection? no (option unset)


@@ -42,6 +43,7 @@ LOG: 10HmaX-0005vi-00 <= userx@somehost.example.com H=[V4NET.0.0.1] P=smtp S=sss
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)

+>>> test in helo_lookup_domains? no (end of list)

 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 20)
 >>> check domains = +local_domains
 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 20)
 >>> check domains = +local_domains


@@ -72,5 +74,5 @@ MUNGED: ::1 will be omitted in what follows
 >>>   message: relay not permitted
 >>> deny: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": DENY
 >>>   message: relay not permitted
 >>> deny: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": DENY

-LOG: H=[V4NET.0.0.2] F=<userx@somehost.example.com> rejected RCPT <userx@anotherhost.example.com>: relay not permitted
-LOG: 10HmaY-0005vi-00 <= userx@somehost.example.com H=[V4NET.0.0.2] P=smtp S=sss
+LOG: H=(test) [V4NET.0.0.2] F=<userx@somehost.example.com> rejected RCPT <userx@anotherhost.example.com>: relay not permitted
+LOG: 10HmaY-0005vi-00 <= userx@somehost.example.com H=(test) [V4NET.0.0.2] P=smtp S=sss

diff --git a/test/stderr/0062 b/test/stderr/0062
index 0658dc83349e2468d5c82d87aaecbe09a8a3bfd5..95a1ecfd2accc893aa92c94cec3feb2e84158b0a 100644 (file)
--- a/test/stderr/0062
+++ b/test/stderr/0062
@@ -6,6 +6,7 @@
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)

+>>> test in helo_lookup_domains? no (end of list)

 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 23)
 >>> check domains = +local_domains
 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 23)
 >>> check domains = +local_domains


@@ -38,12 +39,12 @@
 >>>   message: relay not permitted
 >>> deny: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": DENY
 >>>   message: relay not permitted
 >>> deny: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": DENY

-LOG: H=ten-1.test.ex [V4NET.0.0.1] F=<userx@somehost.example.com> rejected RCPT <userx@anotherhost.example.com>: relay not permitted
+LOG: H=ten-1.test.ex (test) [V4NET.0.0.1] F=<userx@somehost.example.com> rejected RCPT <userx@anotherhost.example.com>: relay not permitted

 >>> using ACL "check_message"
 >>> processing "accept" (TESTSUITE/test-config 29)
 >>> accept: condition test succeeded in ACL "check_message"
 >>> end of ACL "check_message": ACCEPT
 >>> using ACL "check_message"
 >>> processing "accept" (TESTSUITE/test-config 29)
 >>> accept: condition test succeeded in ACL "check_message"
 >>> end of ACL "check_message": ACCEPT

-LOG: 10HmaX-0005vi-00 <= userx@somehost.example.com H=ten-1.test.ex [V4NET.0.0.1] P=smtp S=sss
+LOG: 10HmaX-0005vi-00 <= userx@somehost.example.com H=ten-1.test.ex (test) [V4NET.0.0.1] P=smtp S=sss

 >>> host in hosts_connection_nolog? no (option unset)
 >>> host in host_lookup? no (option unset)
 >>> host in host_reject_connection? no (option unset)
 >>> host in hosts_connection_nolog? no (option unset)
 >>> host in host_lookup? no (option unset)
 >>> host in host_reject_connection? no (option unset)


@@ -52,6 +53,7 @@ LOG: 10HmaX-0005vi-00 <= userx@somehost.example.com H=ten-1.test.ex [V4NET.0.0.1
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)

+>>> test in helo_lookup_domains? no (end of list)

 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 23)
 >>> check domains = +local_domains
 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 23)
 >>> check domains = +local_domains


@@ -85,7 +87,7 @@ LOG: 10HmaX-0005vi-00 <= userx@somehost.example.com H=ten-1.test.ex [V4NET.0.0.1
 >>> processing "accept" (TESTSUITE/test-config 29)
 >>> accept: condition test succeeded in ACL "check_message"
 >>> end of ACL "check_message": ACCEPT
 >>> processing "accept" (TESTSUITE/test-config 29)
 >>> accept: condition test succeeded in ACL "check_message"
 >>> end of ACL "check_message": ACCEPT

-LOG: 10HmaY-0005vi-00 <= userx@somehost.example.com H=ten-2.test.ex [V4NET.0.0.2] P=smtp S=sss
+LOG: 10HmaY-0005vi-00 <= userx@somehost.example.com H=ten-2.test.ex (test) [V4NET.0.0.2] P=smtp S=sss

 >>> host in hosts_connection_nolog? no (option unset)
 >>> host in host_lookup? no (option unset)
 >>> host in host_reject_connection? no (option unset)
 >>> host in hosts_connection_nolog? no (option unset)
 >>> host in host_lookup? no (option unset)
 >>> host in host_reject_connection? no (option unset)


@@ -94,6 +96,7 @@ LOG: 10HmaY-0005vi-00 <= userx@somehost.example.com H=ten-2.test.ex [V4NET.0.0.2
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)

+>>> test in helo_lookup_domains? no (end of list)

 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 23)
 >>> check domains = +local_domains
 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 23)
 >>> check domains = +local_domains


@@ -130,4 +133,4 @@ LOG: 10HmaY-0005vi-00 <= userx@somehost.example.com H=ten-2.test.ex [V4NET.0.0.2
 >>> processing "accept" (TESTSUITE/test-config 29)
 >>> accept: condition test succeeded in ACL "check_message"
 >>> end of ACL "check_message": ACCEPT
 >>> processing "accept" (TESTSUITE/test-config 29)
 >>> accept: condition test succeeded in ACL "check_message"
 >>> end of ACL "check_message": ACCEPT

-LOG: 10HmaZ-0005vi-00 <= userx@somehost.example.com H=ten-3.test.ex [V4NET.0.0.3] P=smtp S=sss
+LOG: 10HmaZ-0005vi-00 <= userx@somehost.example.com H=ten-3.test.ex (test) [V4NET.0.0.3] P=smtp S=sss

diff --git a/test/stderr/0063 b/test/stderr/0063
index 56929ff234c642266ab1dd4718f27fc13db6402b..3a3410725c51cb9561c6c2bbac89c0f913092722 100644 (file)
--- a/test/stderr/0063
+++ b/test/stderr/0063
@@ -6,6 +6,7 @@
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)

+>>> test in helo_lookup_domains? no (end of list)

 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 22)
 >>> check domains = +local_domains
 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 22)
 >>> check domains = +local_domains


@@ -38,8 +39,8 @@
 >>>   message: relay not permitted
 >>> deny: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": DENY
 >>>   message: relay not permitted
 >>> deny: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": DENY

-LOG: H=ten-1.test.ex [V4NET.0.0.1] F=<userx@somehost.example.com> rejected RCPT <userx@anotherhost.example.com>: relay not permitted
-LOG: 10HmaX-0005vi-00 <= userx@somehost.example.com H=ten-1.test.ex [V4NET.0.0.1] P=smtp S=sss
+LOG: H=ten-1.test.ex (test) [V4NET.0.0.1] F=<userx@somehost.example.com> rejected RCPT <userx@anotherhost.example.com>: relay not permitted
+LOG: 10HmaX-0005vi-00 <= userx@somehost.example.com H=ten-1.test.ex (test) [V4NET.0.0.1] P=smtp S=sss

 >>> host in hosts_connection_nolog? no (option unset)
 >>> host in host_lookup? no (option unset)
 >>> host in host_reject_connection? no (option unset)
 >>> host in hosts_connection_nolog? no (option unset)
 >>> host in host_lookup? no (option unset)
 >>> host in host_reject_connection? no (option unset)


@@ -48,6 +49,7 @@ LOG: 10HmaX-0005vi-00 <= userx@somehost.example.com H=ten-1.test.ex [V4NET.0.0.1
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)

+>>> test in helo_lookup_domains? no (end of list)

 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 22)
 >>> check domains = +local_domains
 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 22)
 >>> check domains = +local_domains


@@ -77,4 +79,4 @@ LOG: 10HmaX-0005vi-00 <= userx@somehost.example.com H=ten-1.test.ex [V4NET.0.0.1
 >>> host in "+relay_hosts"? yes (matched "+relay_hosts")
 >>> accept: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": ACCEPT
 >>> host in "+relay_hosts"? yes (matched "+relay_hosts")
 >>> accept: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": ACCEPT

-LOG: 10HmaY-0005vi-00 <= userx@somehost.example.com H=ten-2.test.ex [V4NET.0.0.2] P=smtp S=sss
+LOG: 10HmaY-0005vi-00 <= userx@somehost.example.com H=ten-2.test.ex (test) [V4NET.0.0.2] P=smtp S=sss

diff --git a/test/stderr/0064 b/test/stderr/0064
index b197227393e7531c3eb1d83bfb22dc9163bc7387..4365563cbd131cad0f6f091a1e816270ab531703 100644 (file)
--- a/test/stderr/0064
+++ b/test/stderr/0064
@@ -6,6 +6,7 @@
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)

+>>> test in helo_lookup_domains? no (end of list)

 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 19)
 >>> check domains = +local_domains
 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 19)
 >>> check domains = +local_domains


@@ -38,8 +39,8 @@
 >>>   message: relay not permitted
 >>> deny: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": DENY
 >>>   message: relay not permitted
 >>> deny: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": DENY

-LOG: H=ten-1.test.ex [V4NET.0.0.1] F=<userx@somehost.example.com> rejected RCPT <userx@anotherhost.example.com>: relay not permitted
-LOG: 10HmaX-0005vi-00 <= userx@somehost.example.com H=ten-1.test.ex [V4NET.0.0.1] P=smtp S=sss
+LOG: H=ten-1.test.ex (test) [V4NET.0.0.1] F=<userx@somehost.example.com> rejected RCPT <userx@anotherhost.example.com>: relay not permitted
+LOG: 10HmaX-0005vi-00 <= userx@somehost.example.com H=ten-1.test.ex (test) [V4NET.0.0.1] P=smtp S=sss

 >>> host in hosts_connection_nolog? no (option unset)
 >>> host in host_lookup? no (option unset)
 >>> host in host_reject_connection? no (option unset)
 >>> host in hosts_connection_nolog? no (option unset)
 >>> host in host_lookup? no (option unset)
 >>> host in host_reject_connection? no (option unset)


@@ -48,6 +49,7 @@ LOG: 10HmaX-0005vi-00 <= userx@somehost.example.com H=ten-1.test.ex [V4NET.0.0.1
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)

+>>> test in helo_lookup_domains? no (end of list)

 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 19)
 >>> check domains = +local_domains
 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 19)
 >>> check domains = +local_domains


@@ -77,4 +79,4 @@ LOG: 10HmaX-0005vi-00 <= userx@somehost.example.com H=ten-1.test.ex [V4NET.0.0.1
 >>> host in "+relay_hosts"? yes (matched "+relay_hosts")
 >>> accept: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": ACCEPT
 >>> host in "+relay_hosts"? yes (matched "+relay_hosts")
 >>> accept: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": ACCEPT

-LOG: 10HmaY-0005vi-00 <= userx@somehost.example.com H=ten-2.test.ex [V4NET.0.0.2] P=smtp S=sss
+LOG: 10HmaY-0005vi-00 <= userx@somehost.example.com H=ten-2.test.ex (test) [V4NET.0.0.2] P=smtp S=sss

diff --git a/test/stderr/0065 b/test/stderr/0065
index e12581d58dc417a88c5a5c53399467987ac781c1..50276148f1e6900b681b8440182cce52ad3779fc 100644 (file)
--- a/test/stderr/0065
+++ b/test/stderr/0065
@@ -6,6 +6,7 @@
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)

+>>> test in helo_lookup_domains? no (end of list)

 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 23)
 >>> check domains = +local_domains
 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 23)
 >>> check domains = +local_domains


@@ -30,7 +31,7 @@
 >>> host in "+relay_hosts"? yes (matched "+relay_hosts")
 >>> accept: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": ACCEPT
 >>> host in "+relay_hosts"? yes (matched "+relay_hosts")
 >>> accept: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": ACCEPT

-LOG: 10HmaX-0005vi-00 <= userx@somehost.example.com H=[1.2.3.4] P=smtp S=sss
+LOG: 10HmaX-0005vi-00 <= userx@somehost.example.com H=(test) [1.2.3.4] P=smtp S=sss

 >>> host in hosts_connection_nolog? no (option unset)
 >>> host in host_lookup? no (option unset)
 >>> host in host_reject_connection? no (option unset)
 >>> host in hosts_connection_nolog? no (option unset)
 >>> host in host_lookup? no (option unset)
 >>> host in host_reject_connection? no (option unset)


@@ -39,6 +40,7 @@ LOG: 10HmaX-0005vi-00 <= userx@somehost.example.com H=[1.2.3.4] P=smtp S=sss
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)

+>>> test in helo_lookup_domains? no (end of list)

 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 23)
 >>> check domains = +local_domains
 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 23)
 >>> check domains = +local_domains


@@ -66,8 +68,8 @@ LOG: 10HmaX-0005vi-00 <= userx@somehost.example.com H=[1.2.3.4] P=smtp S=sss
 >>>   message: relay not permitted
 >>> deny: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": DENY
 >>>   message: relay not permitted
 >>> deny: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": DENY

-LOG: H=[1.2.3.5] F=<userx@somehost.example.com> rejected RCPT <userx@anotherhost.example.com>: relay not permitted
-LOG: 10HmaY-0005vi-00 <= userx@somehost.example.com H=[1.2.3.5] P=smtp S=sss
+LOG: H=(test) [1.2.3.5] F=<userx@somehost.example.com> rejected RCPT <userx@anotherhost.example.com>: relay not permitted
+LOG: 10HmaY-0005vi-00 <= userx@somehost.example.com H=(test) [1.2.3.5] P=smtp S=sss

 >>> host in hosts_connection_nolog? no (option unset)
 >>> host in host_lookup? no (option unset)
 >>> host in host_reject_connection? no (option unset)
 >>> host in hosts_connection_nolog? no (option unset)
 >>> host in host_lookup? no (option unset)
 >>> host in host_reject_connection? no (option unset)


@@ -76,6 +78,7 @@ LOG: 10HmaY-0005vi-00 <= userx@somehost.example.com H=[1.2.3.5] P=smtp S=sss
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)

+>>> test in helo_lookup_domains? no (end of list)

 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 23)
 >>> check domains = +local_domains
 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 23)
 >>> check domains = +local_domains


@@ -100,7 +103,7 @@ LOG: 10HmaY-0005vi-00 <= userx@somehost.example.com H=[1.2.3.5] P=smtp S=sss
 >>> host in "+relay_hosts"? yes (matched "+relay_hosts")
 >>> accept: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": ACCEPT
 >>> host in "+relay_hosts"? yes (matched "+relay_hosts")
 >>> accept: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": ACCEPT

-LOG: 10HmaZ-0005vi-00 <= userx@somehost.example.com H=[1.2.4.5] P=smtp S=sss
+LOG: 10HmaZ-0005vi-00 <= userx@somehost.example.com H=(test) [1.2.4.5] P=smtp S=sss

 >>> host in hosts_connection_nolog? no (option unset)
 >>> host in host_lookup? no (option unset)
 >>> host in host_reject_connection? no (option unset)
 >>> host in hosts_connection_nolog? no (option unset)
 >>> host in host_lookup? no (option unset)
 >>> host in host_reject_connection? no (option unset)


@@ -109,6 +112,7 @@ LOG: 10HmaZ-0005vi-00 <= userx@somehost.example.com H=[1.2.4.5] P=smtp S=sss
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)

+>>> test in helo_lookup_domains? no (end of list)

 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 23)
 >>> check domains = +local_domains
 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 23)
 >>> check domains = +local_domains


@@ -136,8 +140,8 @@ LOG: 10HmaZ-0005vi-00 <= userx@somehost.example.com H=[1.2.4.5] P=smtp S=sss
 >>>   message: relay not permitted
 >>> deny: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": DENY
 >>>   message: relay not permitted
 >>> deny: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": DENY

-LOG: H=[1.3.2.4] F=<userx@somehost.example.com> rejected RCPT <userx@anotherhost.example.com>: relay not permitted
-LOG: 10HmbA-0005vi-00 <= userx@somehost.example.com H=[1.3.2.4] P=smtp S=sss
+LOG: H=(test) [1.3.2.4] F=<userx@somehost.example.com> rejected RCPT <userx@anotherhost.example.com>: relay not permitted
+LOG: 10HmbA-0005vi-00 <= userx@somehost.example.com H=(test) [1.3.2.4] P=smtp S=sss

 >>> host in hosts_connection_nolog? no (option unset)
 >>> host in host_lookup? no (option unset)
 >>> host in host_reject_connection? no (option unset)
 >>> host in hosts_connection_nolog? no (option unset)
 >>> host in host_lookup? no (option unset)
 >>> host in host_reject_connection? no (option unset)


@@ -146,6 +150,7 @@ LOG: 10HmbA-0005vi-00 <= userx@somehost.example.com H=[1.3.2.4] P=smtp S=sss
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)

+>>> test in helo_lookup_domains? no (end of list)

 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 23)
 >>> check domains = +local_domains
 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 23)
 >>> check domains = +local_domains


@@ -170,7 +175,7 @@ LOG: 10HmbA-0005vi-00 <= userx@somehost.example.com H=[1.3.2.4] P=smtp S=sss
 >>> host in "+relay_hosts"? yes (matched "+relay_hosts")
 >>> accept: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": ACCEPT
 >>> host in "+relay_hosts"? yes (matched "+relay_hosts")
 >>> accept: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": ACCEPT

-LOG: 10HmbB-0005vi-00 <= userx@somehost.example.com H=[131.111.8.2] P=smtp S=sss
+LOG: 10HmbB-0005vi-00 <= userx@somehost.example.com H=(test) [131.111.8.2] P=smtp S=sss

 >>> host in hosts_connection_nolog? no (option unset)
 >>> host in host_lookup? no (option unset)
 >>> host in host_reject_connection? no (option unset)
 >>> host in hosts_connection_nolog? no (option unset)
 >>> host in host_lookup? no (option unset)
 >>> host in host_reject_connection? no (option unset)


@@ -179,6 +184,7 @@ LOG: 10HmbB-0005vi-00 <= userx@somehost.example.com H=[131.111.8.2] P=smtp S=sss
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)

+>>> test in helo_lookup_domains? no (end of list)

 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 23)
 >>> check domains = +local_domains
 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 23)
 >>> check domains = +local_domains


@@ -203,7 +209,7 @@ LOG: 10HmbB-0005vi-00 <= userx@somehost.example.com H=[131.111.8.2] P=smtp S=sss
 >>> host in "+relay_hosts"? yes (matched "+relay_hosts")
 >>> accept: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": ACCEPT
 >>> host in "+relay_hosts"? yes (matched "+relay_hosts")
 >>> accept: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": ACCEPT

-LOG: 10HmbC-0005vi-00 <= userx@somehost.example.com H=[192.152.98.3] P=smtp S=sss
+LOG: 10HmbC-0005vi-00 <= userx@somehost.example.com H=(test) [192.152.98.3] P=smtp S=sss

 >>> host in hosts_connection_nolog? no (option unset)
 >>> host in host_lookup? no (option unset)
 >>> host in host_reject_connection? no (option unset)
 >>> host in hosts_connection_nolog? no (option unset)
 >>> host in host_lookup? no (option unset)
 >>> host in host_reject_connection? no (option unset)


@@ -212,6 +218,7 @@ LOG: 10HmbC-0005vi-00 <= userx@somehost.example.com H=[192.152.98.3] P=smtp S=ss
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)

+>>> test in helo_lookup_domains? no (end of list)

 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 23)
 >>> check domains = +local_domains
 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 23)
 >>> check domains = +local_domains


@@ -236,4 +243,4 @@ LOG: 10HmbC-0005vi-00 <= userx@somehost.example.com H=[192.152.98.3] P=smtp S=ss
 >>> host in "+relay_hosts"? yes (matched "+relay_hosts")
 >>> accept: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": ACCEPT
 >>> host in "+relay_hosts"? yes (matched "+relay_hosts")
 >>> accept: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": ACCEPT

-LOG: 10HmbD-0005vi-00 <= userx@somehost.example.com H=[192.153.98.4] P=smtp S=sss
+LOG: 10HmbD-0005vi-00 <= userx@somehost.example.com H=(test) [192.153.98.4] P=smtp S=sss

diff --git a/test/stderr/0066 b/test/stderr/0066
index 096bd8a48fe17ca45982b576b1ecec3a95c712bf..9769c7126fc875880ae7452fae63d968f9b89e90 100644 (file)
--- a/test/stderr/0066
+++ b/test/stderr/0066
@@ -6,6 +6,7 @@
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)

+>>> test in helo_lookup_domains? no (end of list)

 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 20)
 >>> check domains = +local_domains
 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 20)
 >>> check domains = +local_domains


@@ -36,7 +37,7 @@ MUNGED: ::1 will be omitted in what follows
 >>> host in "+relay_hosts"? yes (matched "+relay_hosts")
 >>> accept: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": ACCEPT
 >>> host in "+relay_hosts"? yes (matched "+relay_hosts")
 >>> accept: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": ACCEPT

-LOG: 10HmaX-0005vi-00 <= userx@somehost.example.com H=[1.2.3.4] P=smtp S=sss
+LOG: 10HmaX-0005vi-00 <= userx@somehost.example.com H=(test) [1.2.3.4] P=smtp S=sss

 >>> host in hosts_connection_nolog? no (option unset)
 >>> host in host_lookup? no (option unset)
 >>> host in host_reject_connection? no (option unset)
 >>> host in hosts_connection_nolog? no (option unset)
 >>> host in host_lookup? no (option unset)
 >>> host in host_reject_connection? no (option unset)


@@ -45,6 +46,7 @@ LOG: 10HmaX-0005vi-00 <= userx@somehost.example.com H=[1.2.3.4] P=smtp S=sss
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)

+>>> test in helo_lookup_domains? no (end of list)

 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 20)
 >>> check domains = +local_domains
 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 20)
 >>> check domains = +local_domains


@@ -78,8 +80,8 @@ MUNGED: ::1 will be omitted in what follows
 >>>   message: relay not permitted
 >>> deny: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": DENY
 >>>   message: relay not permitted
 >>> deny: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": DENY

-LOG: H=[1.2.3.5] F=<userx@somehost.example.com> rejected RCPT <userx@anotherhost.example.com>: relay not permitted
-LOG: 10HmaY-0005vi-00 <= userx@somehost.example.com H=[1.2.3.5] P=smtp S=sss
+LOG: H=(test) [1.2.3.5] F=<userx@somehost.example.com> rejected RCPT <userx@anotherhost.example.com>: relay not permitted
+LOG: 10HmaY-0005vi-00 <= userx@somehost.example.com H=(test) [1.2.3.5] P=smtp S=sss

 >>> host in hosts_connection_nolog? no (option unset)
 >>> host in host_lookup? no (option unset)
 >>> host in host_reject_connection? no (option unset)
 >>> host in hosts_connection_nolog? no (option unset)
 >>> host in host_lookup? no (option unset)
 >>> host in host_reject_connection? no (option unset)


@@ -88,6 +90,7 @@ LOG: 10HmaY-0005vi-00 <= userx@somehost.example.com H=[1.2.3.5] P=smtp S=sss
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)

+>>> test in helo_lookup_domains? no (end of list)

 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 20)
 >>> check domains = +local_domains
 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 20)
 >>> check domains = +local_domains


@@ -118,7 +121,7 @@ MUNGED: ::1 will be omitted in what follows
 >>> host in "+relay_hosts"? yes (matched "+relay_hosts")
 >>> accept: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": ACCEPT
 >>> host in "+relay_hosts"? yes (matched "+relay_hosts")
 >>> accept: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": ACCEPT

-LOG: 10HmaZ-0005vi-00 <= userx@somehost.example.com H=[1.2.4.5] P=smtp S=sss
+LOG: 10HmaZ-0005vi-00 <= userx@somehost.example.com H=(test) [1.2.4.5] P=smtp S=sss

 >>> host in hosts_connection_nolog? no (option unset)
 >>> host in host_lookup? no (option unset)
 >>> host in host_reject_connection? no (option unset)
 >>> host in hosts_connection_nolog? no (option unset)
 >>> host in host_lookup? no (option unset)
 >>> host in host_reject_connection? no (option unset)


@@ -127,6 +130,7 @@ LOG: 10HmaZ-0005vi-00 <= userx@somehost.example.com H=[1.2.4.5] P=smtp S=sss
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)

+>>> test in helo_lookup_domains? no (end of list)

 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 20)
 >>> check domains = +local_domains
 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 20)
 >>> check domains = +local_domains


@@ -163,8 +167,8 @@ LOG: no host name found for IP address 1.3.2.4
 >>>   message: relay not permitted
 >>> deny: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": DENY
 >>>   message: relay not permitted
 >>> deny: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": DENY

-LOG: H=[1.3.2.4] F=<userx@somehost.example.com> rejected RCPT <userx@anotherhost.example.com>: relay not permitted
-LOG: 10HmbA-0005vi-00 <= userx@somehost.example.com H=[1.3.2.4] P=smtp S=sss
+LOG: H=(test) [1.3.2.4] F=<userx@somehost.example.com> rejected RCPT <userx@anotherhost.example.com>: relay not permitted
+LOG: 10HmbA-0005vi-00 <= userx@somehost.example.com H=(test) [1.3.2.4] P=smtp S=sss

 >>> host in hosts_connection_nolog? no (option unset)
 >>> host in host_lookup? no (option unset)
 >>> host in host_reject_connection? no (option unset)
 >>> host in hosts_connection_nolog? no (option unset)
 >>> host in host_lookup? no (option unset)
 >>> host in host_reject_connection? no (option unset)


@@ -173,6 +177,7 @@ LOG: 10HmbA-0005vi-00 <= userx@somehost.example.com H=[1.3.2.4] P=smtp S=sss
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)

+>>> test in helo_lookup_domains? no (end of list)

 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 20)
 >>> check domains = +local_domains
 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 20)
 >>> check domains = +local_domains


@@ -203,7 +208,7 @@ MUNGED: ::1 will be omitted in what follows
 >>> host in "+relay_hosts"? yes (matched "+relay_hosts")
 >>> accept: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": ACCEPT
 >>> host in "+relay_hosts"? yes (matched "+relay_hosts")
 >>> accept: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": ACCEPT

-LOG: 10HmbB-0005vi-00 <= userx@somehost.example.com H=[131.111.8.2] P=smtp S=sss
+LOG: 10HmbB-0005vi-00 <= userx@somehost.example.com H=(test) [131.111.8.2] P=smtp S=sss

 >>> host in hosts_connection_nolog? no (option unset)
 >>> host in host_lookup? no (option unset)
 >>> host in host_reject_connection? no (option unset)
 >>> host in hosts_connection_nolog? no (option unset)
 >>> host in host_lookup? no (option unset)
 >>> host in host_reject_connection? no (option unset)


@@ -212,6 +217,7 @@ LOG: 10HmbB-0005vi-00 <= userx@somehost.example.com H=[131.111.8.2] P=smtp S=sss
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)

+>>> test in helo_lookup_domains? no (end of list)

 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 20)
 >>> check domains = +local_domains
 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 20)
 >>> check domains = +local_domains


@@ -242,7 +248,7 @@ MUNGED: ::1 will be omitted in what follows
 >>> host in "+relay_hosts"? yes (matched "+relay_hosts")
 >>> accept: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": ACCEPT
 >>> host in "+relay_hosts"? yes (matched "+relay_hosts")
 >>> accept: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": ACCEPT

-LOG: 10HmbC-0005vi-00 <= userx@somehost.example.com H=[192.152.98.3] P=smtp S=sss
+LOG: 10HmbC-0005vi-00 <= userx@somehost.example.com H=(test) [192.152.98.3] P=smtp S=sss

 >>> host in hosts_connection_nolog? no (option unset)
 >>> host in host_lookup? no (option unset)
 >>> host in host_reject_connection? no (option unset)
 >>> host in hosts_connection_nolog? no (option unset)
 >>> host in host_lookup? no (option unset)
 >>> host in host_reject_connection? no (option unset)


@@ -251,6 +257,7 @@ LOG: 10HmbC-0005vi-00 <= userx@somehost.example.com H=[192.152.98.3] P=smtp S=ss
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)

+>>> test in helo_lookup_domains? no (end of list)

 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 20)
 >>> check domains = +local_domains
 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 20)
 >>> check domains = +local_domains


@@ -286,7 +293,7 @@ MUNGED: ::1 will be omitted in what follows
 >>> host in "+relay_hosts"? yes (matched "+relay_hosts")
 >>> accept: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": ACCEPT
 >>> host in "+relay_hosts"? yes (matched "+relay_hosts")
 >>> accept: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": ACCEPT

-LOG: 10HmbD-0005vi-00 <= userx@somehost.example.com H=ten-1.test.ex [V4NET.0.0.1] P=smtp S=sss
+LOG: 10HmbD-0005vi-00 <= userx@somehost.example.com H=ten-1.test.ex (test) [V4NET.0.0.1] P=smtp S=sss

 >>> host in hosts_connection_nolog? no (option unset)
 >>> host in host_lookup? no (option unset)
 >>> host in host_reject_connection? no (option unset)
 >>> host in hosts_connection_nolog? no (option unset)
 >>> host in host_lookup? no (option unset)
 >>> host in host_reject_connection? no (option unset)


@@ -295,6 +302,7 @@ LOG: 10HmbD-0005vi-00 <= userx@somehost.example.com H=ten-1.test.ex [V4NET.0.0.1
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)

+>>> test in helo_lookup_domains? no (end of list)

 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 20)
 >>> check domains = +local_domains
 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 20)
 >>> check domains = +local_domains


@@ -325,8 +333,8 @@ MUNGED: ::1 will be omitted in what follows
 >>>   message: relay not permitted
 >>> deny: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": DENY
 >>>   message: relay not permitted
 >>> deny: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": DENY

-LOG: H=[V4NET.11.12.13] F=<userx@somehost.example.com> rejected RCPT <userx@anotherhost.example.com>: relay not permitted
-LOG: 10HmbE-0005vi-00 <= userx@somehost.example.com H=[V4NET.11.12.13] P=smtp S=sss
+LOG: H=(test) [V4NET.11.12.13] F=<userx@somehost.example.com> rejected RCPT <userx@anotherhost.example.com>: relay not permitted
+LOG: 10HmbE-0005vi-00 <= userx@somehost.example.com H=(test) [V4NET.11.12.13] P=smtp S=sss

 >>> host in hosts_connection_nolog? no (option unset)
 >>> host in host_lookup? no (option unset)
 >>> host in host_reject_connection? no (option unset)
 >>> host in hosts_connection_nolog? no (option unset)
 >>> host in host_lookup? no (option unset)
 >>> host in host_reject_connection? no (option unset)


@@ -335,6 +343,7 @@ LOG: 10HmbE-0005vi-00 <= userx@somehost.example.com H=[V4NET.11.12.13] P=smtp S=
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)

+>>> test in helo_lookup_domains? no (end of list)

 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 20)
 >>> check domains = +local_domains
 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 20)
 >>> check domains = +local_domains


@@ -365,4 +374,4 @@ MUNGED: ::1 will be omitted in what follows
 >>> host in "+relay_hosts"? yes (matched "+relay_hosts")
 >>> accept: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": ACCEPT
 >>> host in "+relay_hosts"? yes (matched "+relay_hosts")
 >>> accept: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": ACCEPT

-LOG: 10HmbF-0005vi-00 <= userx@somehost.example.com H=[V4NET.0.0.3] P=smtp S=sss
+LOG: 10HmbF-0005vi-00 <= userx@somehost.example.com H=(test) [V4NET.0.0.3] P=smtp S=sss

diff --git a/test/stderr/0067 b/test/stderr/0067
index 95106a806dc26b62dade181dc089ed787096d911..69d05946de8960ad1f0520951a2245f6f0174906 100644 (file)
--- a/test/stderr/0067
+++ b/test/stderr/0067
@@ -6,6 +6,7 @@
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)

+>>> test in helo_lookup_domains? no (end of list)

 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 20)
 >>> check hosts = :
 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 20)
 >>> check hosts = :


@@ -72,7 +73,7 @@
 >>> y@b.c in "!x@b.c : *@b.c :!^philip@a.b.c : ^(phil|quil)[^@]*@ :!yy@lsearch;TESTSUITE/aux-fixed/0067.rej.lsearch :lsearch*@;TESTSUITE/aux-fixed/0067.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0067.rej.bydomain : ! x@bb.cc : *@bb.cc :! TESTSUITE/aux-fixed/0067.not1 : !TESTSUITE/aux-fixed/0067.not2 : bbb.ccc"? yes (matched "*@b.c")
 >>> deny: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": DENY
 >>> y@b.c in "!x@b.c : *@b.c :!^philip@a.b.c : ^(phil|quil)[^@]*@ :!yy@lsearch;TESTSUITE/aux-fixed/0067.rej.lsearch :lsearch*@;TESTSUITE/aux-fixed/0067.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0067.rej.bydomain : ! x@bb.cc : *@bb.cc :! TESTSUITE/aux-fixed/0067.not1 : !TESTSUITE/aux-fixed/0067.not2 : bbb.ccc"? yes (matched "*@b.c")
 >>> deny: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": DENY

-LOG: H=[1.2.3.4] F=<y@b.c> rejected RCPT <x@test.ex>
+LOG: H=(test) [1.2.3.4] F=<y@b.c> rejected RCPT <x@test.ex>

 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 20)
 >>> check hosts = :
 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 20)
 >>> check hosts = :


@@ -88,7 +89,7 @@ LOG: H=[1.2.3.4] F=<y@b.c> rejected RCPT <x@test.ex>
 >>> philip@xy.z in "!x@b.c : *@b.c :!^philip@a.b.c : ^(phil|quil)[^@]*@ :!yy@lsearch;TESTSUITE/aux-fixed/0067.rej.lsearch :lsearch*@;TESTSUITE/aux-fixed/0067.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0067.rej.bydomain : ! x@bb.cc : *@bb.cc :! TESTSUITE/aux-fixed/0067.not1 : !TESTSUITE/aux-fixed/0067.not2 : bbb.ccc"? yes (matched "^(phil|quil)[^@]*@")
 >>> deny: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": DENY
 >>> philip@xy.z in "!x@b.c : *@b.c :!^philip@a.b.c : ^(phil|quil)[^@]*@ :!yy@lsearch;TESTSUITE/aux-fixed/0067.rej.lsearch :lsearch*@;TESTSUITE/aux-fixed/0067.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0067.rej.bydomain : ! x@bb.cc : *@bb.cc :! TESTSUITE/aux-fixed/0067.not1 : !TESTSUITE/aux-fixed/0067.not2 : bbb.ccc"? yes (matched "^(phil|quil)[^@]*@")
 >>> deny: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": DENY

-LOG: H=[1.2.3.4] F=<philip@xy.z> rejected RCPT <x@test.ex>
+LOG: H=(test) [1.2.3.4] F=<philip@xy.z> rejected RCPT <x@test.ex>

 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 20)
 >>> check hosts = :
 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 20)
 >>> check hosts = :


@@ -104,7 +105,7 @@ LOG: H=[1.2.3.4] F=<philip@xy.z> rejected RCPT <x@test.ex>
 >>> quilt@patch.work in "!x@b.c : *@b.c :!^philip@a.b.c : ^(phil|quil)[^@]*@ :!yy@lsearch;TESTSUITE/aux-fixed/0067.rej.lsearch :lsearch*@;TESTSUITE/aux-fixed/0067.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0067.rej.bydomain : ! x@bb.cc : *@bb.cc :! TESTSUITE/aux-fixed/0067.not1 : !TESTSUITE/aux-fixed/0067.not2 : bbb.ccc"? yes (matched "^(phil|quil)[^@]*@")
 >>> deny: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": DENY
 >>> quilt@patch.work in "!x@b.c : *@b.c :!^philip@a.b.c : ^(phil|quil)[^@]*@ :!yy@lsearch;TESTSUITE/aux-fixed/0067.rej.lsearch :lsearch*@;TESTSUITE/aux-fixed/0067.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0067.rej.bydomain : ! x@bb.cc : *@bb.cc :! TESTSUITE/aux-fixed/0067.not1 : !TESTSUITE/aux-fixed/0067.not2 : bbb.ccc"? yes (matched "^(phil|quil)[^@]*@")
 >>> deny: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": DENY

-LOG: H=[1.2.3.4] F=<quilt@patch.work> rejected RCPT <x@test.ex>
+LOG: H=(test) [1.2.3.4] F=<quilt@patch.work> rejected RCPT <x@test.ex>

 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 20)
 >>> check hosts = :
 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 20)
 >>> check hosts = :


@@ -144,7 +145,7 @@ LOG: H=[1.2.3.4] F=<quilt@patch.work> rejected RCPT <x@test.ex>
 >>> xx@abc.def in "!x@b.c : *@b.c :!^philip@a.b.c : ^(phil|quil)[^@]*@ :!yy@lsearch;TESTSUITE/aux-fixed/0067.rej.lsearch :lsearch*@;TESTSUITE/aux-fixed/0067.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0067.rej.bydomain : ! x@bb.cc : *@bb.cc :! TESTSUITE/aux-fixed/0067.not1 : !TESTSUITE/aux-fixed/0067.not2 : bbb.ccc"? yes (matched "lsearch*@;TESTSUITE/aux-fixed/0067.rej.lsearch")
 >>> deny: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": DENY
 >>> xx@abc.def in "!x@b.c : *@b.c :!^philip@a.b.c : ^(phil|quil)[^@]*@ :!yy@lsearch;TESTSUITE/aux-fixed/0067.rej.lsearch :lsearch*@;TESTSUITE/aux-fixed/0067.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0067.rej.bydomain : ! x@bb.cc : *@bb.cc :! TESTSUITE/aux-fixed/0067.not1 : !TESTSUITE/aux-fixed/0067.not2 : bbb.ccc"? yes (matched "lsearch*@;TESTSUITE/aux-fixed/0067.rej.lsearch")
 >>> deny: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": DENY

-LOG: H=[1.2.3.4] F=<xx@abc.def> rejected RCPT <x@test.ex>
+LOG: H=(test) [1.2.3.4] F=<xx@abc.def> rejected RCPT <x@test.ex>

 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 20)
 >>> check hosts = :
 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 20)
 >>> check hosts = :


@@ -160,7 +161,7 @@ LOG: H=[1.2.3.4] F=<xx@abc.def> rejected RCPT <x@test.ex>
 >>> abc@d.e.f in "!x@b.c : *@b.c :!^philip@a.b.c : ^(phil|quil)[^@]*@ :!yy@lsearch;TESTSUITE/aux-fixed/0067.rej.lsearch :lsearch*@;TESTSUITE/aux-fixed/0067.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0067.rej.bydomain : ! x@bb.cc : *@bb.cc :! TESTSUITE/aux-fixed/0067.not1 : !TESTSUITE/aux-fixed/0067.not2 : bbb.ccc"? yes (matched "lsearch*@;TESTSUITE/aux-fixed/0067.rej.lsearch")
 >>> deny: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": DENY
 >>> abc@d.e.f in "!x@b.c : *@b.c :!^philip@a.b.c : ^(phil|quil)[^@]*@ :!yy@lsearch;TESTSUITE/aux-fixed/0067.rej.lsearch :lsearch*@;TESTSUITE/aux-fixed/0067.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0067.rej.bydomain : ! x@bb.cc : *@bb.cc :! TESTSUITE/aux-fixed/0067.not1 : !TESTSUITE/aux-fixed/0067.not2 : bbb.ccc"? yes (matched "lsearch*@;TESTSUITE/aux-fixed/0067.rej.lsearch")
 >>> deny: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": DENY

-LOG: H=[1.2.3.4] F=<abc@d.e.f> rejected RCPT <x@test.ex>
+LOG: H=(test) [1.2.3.4] F=<abc@d.e.f> rejected RCPT <x@test.ex>

 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 20)
 >>> check hosts = :
 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 20)
 >>> check hosts = :


@@ -227,7 +228,7 @@ LOG: H=[1.2.3.4] F=<abc@d.e.f> rejected RCPT <x@test.ex>
 >>> abc@z.z in "!x@b.c : *@b.c :!^philip@a.b.c : ^(phil|quil)[^@]*@ :!yy@lsearch;TESTSUITE/aux-fixed/0067.rej.lsearch :lsearch*@;TESTSUITE/aux-fixed/0067.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0067.rej.bydomain : ! x@bb.cc : *@bb.cc :! TESTSUITE/aux-fixed/0067.not1 : !TESTSUITE/aux-fixed/0067.not2 : bbb.ccc"? yes (matched "@@lsearch*;TESTSUITE/aux-fixed/0067.rej.bydomain")
 >>> deny: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": DENY
 >>> abc@z.z in "!x@b.c : *@b.c :!^philip@a.b.c : ^(phil|quil)[^@]*@ :!yy@lsearch;TESTSUITE/aux-fixed/0067.rej.lsearch :lsearch*@;TESTSUITE/aux-fixed/0067.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0067.rej.bydomain : ! x@bb.cc : *@bb.cc :! TESTSUITE/aux-fixed/0067.not1 : !TESTSUITE/aux-fixed/0067.not2 : bbb.ccc"? yes (matched "@@lsearch*;TESTSUITE/aux-fixed/0067.rej.bydomain")
 >>> deny: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": DENY

-LOG: H=[1.2.3.4] F=<abc@z.z> rejected RCPT <x@test.ex>
+LOG: H=(test) [1.2.3.4] F=<abc@z.z> rejected RCPT <x@test.ex>

 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 20)
 >>> check hosts = :
 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 20)
 >>> check hosts = :


@@ -269,7 +270,7 @@ LOG: H=[1.2.3.4] F=<abc@z.z> rejected RCPT <x@test.ex>
 >>> xyz@z.z in "!x@b.c : *@b.c :!^philip@a.b.c : ^(phil|quil)[^@]*@ :!yy@lsearch;TESTSUITE/aux-fixed/0067.rej.lsearch :lsearch*@;TESTSUITE/aux-fixed/0067.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0067.rej.bydomain : ! x@bb.cc : *@bb.cc :! TESTSUITE/aux-fixed/0067.not1 : !TESTSUITE/aux-fixed/0067.not2 : bbb.ccc"? yes (matched "@@lsearch*;TESTSUITE/aux-fixed/0067.rej.bydomain")
 >>> deny: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": DENY
 >>> xyz@z.z in "!x@b.c : *@b.c :!^philip@a.b.c : ^(phil|quil)[^@]*@ :!yy@lsearch;TESTSUITE/aux-fixed/0067.rej.lsearch :lsearch*@;TESTSUITE/aux-fixed/0067.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0067.rej.bydomain : ! x@bb.cc : *@bb.cc :! TESTSUITE/aux-fixed/0067.not1 : !TESTSUITE/aux-fixed/0067.not2 : bbb.ccc"? yes (matched "@@lsearch*;TESTSUITE/aux-fixed/0067.rej.bydomain")
 >>> deny: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": DENY

-LOG: H=[1.2.3.4] F=<xyz@z.z> rejected RCPT <x@test.ex>
+LOG: H=(test) [1.2.3.4] F=<xyz@z.z> rejected RCPT <x@test.ex>

 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 20)
 >>> check hosts = :
 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 20)
 >>> check hosts = :


@@ -285,7 +286,7 @@ LOG: H=[1.2.3.4] F=<xyz@z.z> rejected RCPT <x@test.ex>
 >>> 12345678@p.q.r in "!x@b.c : *@b.c :!^philip@a.b.c : ^(phil|quil)[^@]*@ :!yy@lsearch;TESTSUITE/aux-fixed/0067.rej.lsearch :lsearch*@;TESTSUITE/aux-fixed/0067.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0067.rej.bydomain : ! x@bb.cc : *@bb.cc :! TESTSUITE/aux-fixed/0067.not1 : !TESTSUITE/aux-fixed/0067.not2 : bbb.ccc"? yes (matched "@@lsearch*;TESTSUITE/aux-fixed/0067.rej.bydomain")
 >>> deny: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": DENY
 >>> 12345678@p.q.r in "!x@b.c : *@b.c :!^philip@a.b.c : ^(phil|quil)[^@]*@ :!yy@lsearch;TESTSUITE/aux-fixed/0067.rej.lsearch :lsearch*@;TESTSUITE/aux-fixed/0067.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0067.rej.bydomain : ! x@bb.cc : *@bb.cc :! TESTSUITE/aux-fixed/0067.not1 : !TESTSUITE/aux-fixed/0067.not2 : bbb.ccc"? yes (matched "@@lsearch*;TESTSUITE/aux-fixed/0067.rej.bydomain")
 >>> deny: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": DENY

-LOG: H=[1.2.3.4] F=<12345678@p.q.r> rejected RCPT <x@test.ex>
+LOG: H=(test) [1.2.3.4] F=<12345678@p.q.r> rejected RCPT <x@test.ex>

 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 20)
 >>> check hosts = :
 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 20)
 >>> check hosts = :


@@ -301,7 +302,7 @@ LOG: H=[1.2.3.4] F=<12345678@p.q.r> rejected RCPT <x@test.ex>
 >>> 12345678@z.z in "!x@b.c : *@b.c :!^philip@a.b.c : ^(phil|quil)[^@]*@ :!yy@lsearch;TESTSUITE/aux-fixed/0067.rej.lsearch :lsearch*@;TESTSUITE/aux-fixed/0067.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0067.rej.bydomain : ! x@bb.cc : *@bb.cc :! TESTSUITE/aux-fixed/0067.not1 : !TESTSUITE/aux-fixed/0067.not2 : bbb.ccc"? yes (matched "@@lsearch*;TESTSUITE/aux-fixed/0067.rej.bydomain")
 >>> deny: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": DENY
 >>> 12345678@z.z in "!x@b.c : *@b.c :!^philip@a.b.c : ^(phil|quil)[^@]*@ :!yy@lsearch;TESTSUITE/aux-fixed/0067.rej.lsearch :lsearch*@;TESTSUITE/aux-fixed/0067.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0067.rej.bydomain : ! x@bb.cc : *@bb.cc :! TESTSUITE/aux-fixed/0067.not1 : !TESTSUITE/aux-fixed/0067.not2 : bbb.ccc"? yes (matched "@@lsearch*;TESTSUITE/aux-fixed/0067.rej.bydomain")
 >>> deny: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": DENY

-LOG: H=[1.2.3.4] F=<12345678@z.z> rejected RCPT <x@test.ex>
+LOG: H=(test) [1.2.3.4] F=<12345678@z.z> rejected RCPT <x@test.ex>

 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 20)
 >>> check hosts = :
 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 20)
 >>> check hosts = :


@@ -351,7 +352,7 @@ LOG: H=[1.2.3.4] F=<12345678@z.z> rejected RCPT <x@test.ex>
 >>> 1234@m.n.o in "1234@m.n.o : TESTSUITE/aux-fixed/0067.rejrec"? yes (matched "1234@m.n.o")
 >>> deny: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": DENY
 >>> 1234@m.n.o in "1234@m.n.o : TESTSUITE/aux-fixed/0067.rejrec"? yes (matched "1234@m.n.o")
 >>> deny: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": DENY

-LOG: H=[1.2.3.4] F=<1234@m.n.o> rejected RCPT <userx@test.ex>
+LOG: H=(test) [1.2.3.4] F=<1234@m.n.o> rejected RCPT <userx@test.ex>

 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 20)
 >>> check hosts = :
 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 20)
 >>> check hosts = :


@@ -396,7 +397,7 @@ LOG: H=[1.2.3.4] F=<1234@m.n.o> rejected RCPT <userx@test.ex>
 >>> rr01@a.b.c in "1234@m.n.o : TESTSUITE/aux-fixed/0067.rejrec"? yes (matched "rr01@a.b.c" in TESTSUITE/aux-fixed/0067.rejrec)
 >>> deny: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": DENY
 >>> rr01@a.b.c in "1234@m.n.o : TESTSUITE/aux-fixed/0067.rejrec"? yes (matched "rr01@a.b.c" in TESTSUITE/aux-fixed/0067.rejrec)
 >>> deny: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": DENY

-LOG: H=[1.2.3.4] F=<rr01@a.b.c> rejected RCPT <userx@test.ex>
+LOG: H=(test) [1.2.3.4] F=<rr01@a.b.c> rejected RCPT <userx@test.ex>

 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 20)
 >>> check hosts = :
 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 20)
 >>> check hosts = :


@@ -444,7 +445,7 @@ LOG: H=[1.2.3.4] F=<rr01@a.b.c> rejected RCPT <userx@test.ex>
 >>> qq@a.b.c in "1234@m.n.o : TESTSUITE/aux-fixed/0067.rejrec"? yes (matched "^qq" in TESTSUITE/aux-fixed/0067.rejrec)
 >>> deny: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": DENY
 >>> qq@a.b.c in "1234@m.n.o : TESTSUITE/aux-fixed/0067.rejrec"? yes (matched "^qq" in TESTSUITE/aux-fixed/0067.rejrec)
 >>> deny: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": DENY

-LOG: H=[1.2.3.4] F=<qq@a.b.c> rejected RCPT <userx@test.ex>
+LOG: H=(test) [1.2.3.4] F=<qq@a.b.c> rejected RCPT <userx@test.ex>

 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 20)
 >>> check hosts = :
 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 20)
 >>> check hosts = :


@@ -466,7 +467,7 @@ LOG: H=[1.2.3.4] F=<qq@a.b.c> rejected RCPT <userx@test.ex>
 >>> !excl@z.z in "1234@m.n.o : TESTSUITE/aux-fixed/0067.rejrec"? yes (matched "^!excl" in TESTSUITE/aux-fixed/0067.rejrec)
 >>> deny: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": DENY
 >>> !excl@z.z in "1234@m.n.o : TESTSUITE/aux-fixed/0067.rejrec"? yes (matched "^!excl" in TESTSUITE/aux-fixed/0067.rejrec)
 >>> deny: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": DENY

-LOG: H=[1.2.3.4] F=<!excl@z.z> rejected RCPT <userx@test.ex>
+LOG: H=(test) [1.2.3.4] F=<!excl@z.z> rejected RCPT <userx@test.ex>

 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 20)
 >>> check hosts = :
 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 20)
 >>> check hosts = :


@@ -489,7 +490,7 @@ LOG: H=[1.2.3.4] F=<!excl@z.z> rejected RCPT <userx@test.ex>
 >>> sh#rp@y.p.s in "1234@m.n.o : TESTSUITE/aux-fixed/0067.rejrec"? yes (matched "sh#rp@y.p.s" in TESTSUITE/aux-fixed/0067.rejrec)
 >>> deny: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": DENY
 >>> sh#rp@y.p.s in "1234@m.n.o : TESTSUITE/aux-fixed/0067.rejrec"? yes (matched "sh#rp@y.p.s" in TESTSUITE/aux-fixed/0067.rejrec)
 >>> deny: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": DENY

-LOG: H=[1.2.3.4] F=<sh#rp@y.p.s> rejected RCPT <userx@test.ex>
+LOG: H=(test) [1.2.3.4] F=<sh#rp@y.p.s> rejected RCPT <userx@test.ex>

 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 20)
 >>> check hosts = :
 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 20)
 >>> check hosts = :


@@ -531,7 +532,7 @@ LOG: H=[1.2.3.4] F=<sh#rp@y.p.s> rejected RCPT <userx@test.ex>
 >>> xyzbc@xx.yy in "!x@b.c : *@b.c :!^philip@a.b.c : ^(phil|quil)[^@]*@ :!yy@lsearch;TESTSUITE/aux-fixed/0067.rej.lsearch :lsearch*@;TESTSUITE/aux-fixed/0067.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0067.rej.bydomain : ! x@bb.cc : *@bb.cc :! TESTSUITE/aux-fixed/0067.not1 : !TESTSUITE/aux-fixed/0067.not2 : bbb.ccc"? yes (matched "@@lsearch*;TESTSUITE/aux-fixed/0067.rej.bydomain")
 >>> deny: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": DENY
 >>> xyzbc@xx.yy in "!x@b.c : *@b.c :!^philip@a.b.c : ^(phil|quil)[^@]*@ :!yy@lsearch;TESTSUITE/aux-fixed/0067.rej.lsearch :lsearch*@;TESTSUITE/aux-fixed/0067.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0067.rej.bydomain : ! x@bb.cc : *@bb.cc :! TESTSUITE/aux-fixed/0067.not1 : !TESTSUITE/aux-fixed/0067.not2 : bbb.ccc"? yes (matched "@@lsearch*;TESTSUITE/aux-fixed/0067.rej.bydomain")
 >>> deny: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": DENY

-LOG: H=[1.2.3.4] F=<xyzbc@xx.yy> rejected RCPT <x@test.ex>
+LOG: H=(test) [1.2.3.4] F=<xyzbc@xx.yy> rejected RCPT <x@test.ex>

 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 20)
 >>> check hosts = :
 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 20)
 >>> check hosts = :


@@ -547,7 +548,7 @@ LOG: H=[1.2.3.4] F=<xyzbc@xx.yy> rejected RCPT <x@test.ex>
 >>> aabc@xx.yy in "!x@b.c : *@b.c :!^philip@a.b.c : ^(phil|quil)[^@]*@ :!yy@lsearch;TESTSUITE/aux-fixed/0067.rej.lsearch :lsearch*@;TESTSUITE/aux-fixed/0067.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0067.rej.bydomain : ! x@bb.cc : *@bb.cc :! TESTSUITE/aux-fixed/0067.not1 : !TESTSUITE/aux-fixed/0067.not2 : bbb.ccc"? yes (matched "@@lsearch*;TESTSUITE/aux-fixed/0067.rej.bydomain")
 >>> deny: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": DENY
 >>> aabc@xx.yy in "!x@b.c : *@b.c :!^philip@a.b.c : ^(phil|quil)[^@]*@ :!yy@lsearch;TESTSUITE/aux-fixed/0067.rej.lsearch :lsearch*@;TESTSUITE/aux-fixed/0067.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0067.rej.bydomain : ! x@bb.cc : *@bb.cc :! TESTSUITE/aux-fixed/0067.not1 : !TESTSUITE/aux-fixed/0067.not2 : bbb.ccc"? yes (matched "@@lsearch*;TESTSUITE/aux-fixed/0067.rej.bydomain")
 >>> deny: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": DENY

-LOG: H=[1.2.3.4] F=<aabc@xx.yy> rejected RCPT <x@test.ex>
+LOG: H=(test) [1.2.3.4] F=<aabc@xx.yy> rejected RCPT <x@test.ex>

 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 20)
 >>> check hosts = :
 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 20)
 >>> check hosts = :


@@ -590,7 +591,7 @@ LOG: H=[1.2.3.4] F=<aabc@xx.yy> rejected RCPT <x@test.ex>
 >>> y@bb.cc in "!x@b.c : *@b.c :!^philip@a.b.c : ^(phil|quil)[^@]*@ :!yy@lsearch;TESTSUITE/aux-fixed/0067.rej.lsearch :lsearch*@;TESTSUITE/aux-fixed/0067.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0067.rej.bydomain : ! x@bb.cc : *@bb.cc :! TESTSUITE/aux-fixed/0067.not1 : !TESTSUITE/aux-fixed/0067.not2 : bbb.ccc"? yes (matched "*@bb.cc")
 >>> deny: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": DENY
 >>> y@bb.cc in "!x@b.c : *@b.c :!^philip@a.b.c : ^(phil|quil)[^@]*@ :!yy@lsearch;TESTSUITE/aux-fixed/0067.rej.lsearch :lsearch*@;TESTSUITE/aux-fixed/0067.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0067.rej.bydomain : ! x@bb.cc : *@bb.cc :! TESTSUITE/aux-fixed/0067.not1 : !TESTSUITE/aux-fixed/0067.not2 : bbb.ccc"? yes (matched "*@bb.cc")
 >>> deny: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": DENY

-LOG: H=[1.2.3.4] F=<y@bb.cc> rejected RCPT <x@test.ex>
+LOG: H=(test) [1.2.3.4] F=<y@bb.cc> rejected RCPT <x@test.ex>

 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 20)
 >>> check hosts = :
 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 20)
 >>> check hosts = :


@@ -662,4 +663,4 @@ LOG: H=[1.2.3.4] F=<y@bb.cc> rejected RCPT <x@test.ex>
 >>> z@bbb.ccc in "!x@b.c : *@b.c :!^philip@a.b.c : ^(phil|quil)[^@]*@ :!yy@lsearch;TESTSUITE/aux-fixed/0067.rej.lsearch :lsearch*@;TESTSUITE/aux-fixed/0067.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0067.rej.bydomain : ! x@bb.cc : *@bb.cc :! TESTSUITE/aux-fixed/0067.not1 : !TESTSUITE/aux-fixed/0067.not2 : bbb.ccc"? yes (matched "bbb.ccc")
 >>> deny: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": DENY
 >>> z@bbb.ccc in "!x@b.c : *@b.c :!^philip@a.b.c : ^(phil|quil)[^@]*@ :!yy@lsearch;TESTSUITE/aux-fixed/0067.rej.lsearch :lsearch*@;TESTSUITE/aux-fixed/0067.rej.lsearch :@@lsearch*;TESTSUITE/aux-fixed/0067.rej.bydomain : ! x@bb.cc : *@bb.cc :! TESTSUITE/aux-fixed/0067.not1 : !TESTSUITE/aux-fixed/0067.not2 : bbb.ccc"? yes (matched "bbb.ccc")
 >>> deny: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": DENY

-LOG: H=[1.2.3.4] F=<z@bbb.ccc> rejected RCPT <x@test.ex>
+LOG: H=(test) [1.2.3.4] F=<z@bbb.ccc> rejected RCPT <x@test.ex>

diff --git a/test/stderr/0068 b/test/stderr/0068
index c65432f3f864a5290f9708a3899f04005a8b019b..d649cda552f86612698e4695a27ca9338cb5c1cd 100644 (file)
--- a/test/stderr/0068
+++ b/test/stderr/0068
@@ -6,6 +6,7 @@
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)

+>>> test in helo_lookup_domains? no (end of list)

 >>> processing "accept" (TESTSUITE/test-config 12)
 >>> accept: condition test succeeded in inline ACL
 >>> end of inline ACL: ACCEPT
 >>> processing "accept" (TESTSUITE/test-config 12)
 >>> accept: condition test succeeded in inline ACL
 >>> end of inline ACL: ACCEPT


@@ -21,4 +22,4 @@
 >>> processing "accept" (TESTSUITE/test-config 12)
 >>> accept: condition test succeeded in inline ACL
 >>> end of inline ACL: ACCEPT
 >>> processing "accept" (TESTSUITE/test-config 12)
 >>> accept: condition test succeeded in inline ACL
 >>> end of inline ACL: ACCEPT

-LOG: too many recipients: message rejected: sender=<x@y> H=[V4NET.10.10.10]
+LOG: too many recipients: message rejected: sender=<x@y> H=(test) [V4NET.10.10.10]

diff --git a/test/stderr/0069 b/test/stderr/0069
index 619c7f17122400806d274cef69ceeae698994529..f8b08119387754418adb45636b0c801e14f8cb7e 100644 (file)
--- a/test/stderr/0069
+++ b/test/stderr/0069
@@ -21,7 +21,7 @@
 >>> host in "+include_unknown : ^ten-1\.test\.ex"? yes (matched "^ten-1\.test\.ex")
 >>> deny: condition test succeeded in ACL "check_recipientx"
 >>> end of ACL "check_recipientx": DENY
 >>> host in "+include_unknown : ^ten-1\.test\.ex"? yes (matched "^ten-1\.test\.ex")
 >>> deny: condition test succeeded in ACL "check_recipientx"
 >>> end of ACL "check_recipientx": DENY

-LOG: H=ten-1.test.ex [V4NET.0.0.1] F=<x@y> rejected RCPT <x@test.ex>
+LOG: H=ten-1.test.ex (test) [V4NET.0.0.1] F=<x@y> rejected RCPT <x@test.ex>

 >>> host in hosts_connection_nolog? no (option unset)
 >>> host in host_lookup? no (option unset)
 >>> host in host_reject_connection? no (option unset)
 >>> host in hosts_connection_nolog? no (option unset)
 >>> host in host_lookup? no (option unset)
 >>> host in host_reject_connection? no (option unset)


@@ -34,6 +34,7 @@ LOG: failed to find host name for V4NET.0.0.13: accepted by +include_unknown
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)

+>>> test in helo_lookup_domains? no (end of list)

 >>> using ACL "check_recipientx"
 >>> processing "accept" (TESTSUITE/test-config 24)
 >>> check hosts = :
 >>> using ACL "check_recipientx"
 >>> processing "accept" (TESTSUITE/test-config 24)
 >>> check hosts = :


@@ -46,7 +47,7 @@ LOG: failed to find host name for V4NET.0.0.13: accepted by +include_unknown
 LOG: failed to find host name for V4NET.0.0.13: accepted by +include_unknown
 >>> deny: condition test succeeded in ACL "check_recipientx"
 >>> end of ACL "check_recipientx": DENY
 LOG: failed to find host name for V4NET.0.0.13: accepted by +include_unknown
 >>> deny: condition test succeeded in ACL "check_recipientx"
 >>> end of ACL "check_recipientx": DENY

-LOG: H=[V4NET.0.0.13] F=<userx@myhost.test.ex> rejected RCPT <x@test.ex>
+LOG: H=(test) [V4NET.0.0.13] F=<userx@myhost.test.ex> rejected RCPT <x@test.ex>

 >>> host in hosts_connection_nolog? no (option unset)
 >>> host in host_lookup? no (option unset)
 >>> host in host_reject_connection? no (option unset)
 >>> host in hosts_connection_nolog? no (option unset)
 >>> host in host_lookup? no (option unset)
 >>> host in host_reject_connection? no (option unset)


@@ -59,18 +60,19 @@ LOG: failed to find host name for V4NET.0.0.13: accepted by +include_unknown
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)

+>>> test in helo_lookup_domains? no (end of list)

 >>> using ACL "check_recipienty"
 >>> processing "accept" (TESTSUITE/test-config 30)
 >>> check hosts = not-exist.test.ex : V4NET.0.0.13
 >>> using ACL "check_recipienty"
 >>> processing "accept" (TESTSUITE/test-config 30)
 >>> check hosts = not-exist.test.ex : V4NET.0.0.13

->>> no IP address found for host not-exist.test.ex (during SMTP connection from [V4NET.0.0.13])
-LOG: no IP address found for host not-exist.test.ex (during SMTP connection from [V4NET.0.0.13])
+>>> no IP address found for host not-exist.test.ex (during SMTP connection from (test) [V4NET.0.0.13])
+LOG: no IP address found for host not-exist.test.ex (during SMTP connection from (test) [V4NET.0.0.13])

 >>> host in "not-exist.test.ex : V4NET.0.0.13"? no (failed to find IP address for not-exist.test.ex)
 >>> accept: condition test failed in ACL "check_recipienty"
 >>> processing "deny" (TESTSUITE/test-config 31)
 >>>   message: "Denied"
 >>> deny: condition test succeeded in ACL "check_recipienty"
 >>> end of ACL "check_recipienty": DENY
 >>> host in "not-exist.test.ex : V4NET.0.0.13"? no (failed to find IP address for not-exist.test.ex)
 >>> accept: condition test failed in ACL "check_recipienty"
 >>> processing "deny" (TESTSUITE/test-config 31)
 >>>   message: "Denied"
 >>> deny: condition test succeeded in ACL "check_recipienty"
 >>> end of ACL "check_recipienty": DENY

-LOG: H=[V4NET.0.0.13] F=<userx@test.ex> rejected RCPT <y@test.ex>: "Denied"
+LOG: H=(test) [V4NET.0.0.13] F=<userx@test.ex> rejected RCPT <y@test.ex>: "Denied"

 >>> host in hosts_connection_nolog? no (option unset)
 >>> host in host_lookup? no (option unset)
 >>> host in host_reject_connection? no (option unset)
 >>> host in hosts_connection_nolog? no (option unset)
 >>> host in host_lookup? no (option unset)
 >>> host in host_reject_connection? no (option unset)


@@ -83,11 +85,12 @@ LOG: failed to find host name for V4NET.0.0.13: accepted by +include_unknown
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)

+>>> test in helo_lookup_domains? no (end of list)

 >>> using ACL "check_recipientz"
 >>> processing "accept" (TESTSUITE/test-config 34)
 >>> check hosts = +ignore_unknown : not-exist.test.ex : V4NET.0.0.13
 >>> using ACL "check_recipientz"
 >>> processing "accept" (TESTSUITE/test-config 34)
 >>> check hosts = +ignore_unknown : not-exist.test.ex : V4NET.0.0.13

->>> no IP address found for host not-exist.test.ex (during SMTP connection from [V4NET.0.0.13])
-LOG: no IP address found for host not-exist.test.ex (during SMTP connection from [V4NET.0.0.13])
+>>> no IP address found for host not-exist.test.ex (during SMTP connection from (test) [V4NET.0.0.13])
+LOG: no IP address found for host not-exist.test.ex (during SMTP connection from (test) [V4NET.0.0.13])

 >>> failed to find IP address for not-exist.test.ex: item ignored by +ignore_unknown
 >>> host in "+ignore_unknown : not-exist.test.ex : V4NET.0.0.13"? yes (matched "V4NET.0.0.13")
 >>> accept: condition test succeeded in ACL "check_recipientz"
 >>> failed to find IP address for not-exist.test.ex: item ignored by +ignore_unknown
 >>> host in "+ignore_unknown : not-exist.test.ex : V4NET.0.0.13"? yes (matched "V4NET.0.0.13")
 >>> accept: condition test succeeded in ACL "check_recipientz"


@@ -104,11 +107,12 @@ LOG: failed to find host name for V4NET.0.0.13: accepted by +include_unknown
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)

+>>> test in helo_lookup_domains? no (end of list)

 >>> using ACL "check_recipienty"
 >>> processing "accept" (TESTSUITE/test-config 30)
 >>> check hosts = not-exist.test.ex : V4NET.0.0.13
 >>> using ACL "check_recipienty"
 >>> processing "accept" (TESTSUITE/test-config 30)
 >>> check hosts = not-exist.test.ex : V4NET.0.0.13

->>> no IP address found for host not-exist.test.ex (during SMTP connection from [V4NET.0.0.13])
-LOG: no IP address found for host not-exist.test.ex (during SMTP connection from [V4NET.0.0.13])
+>>> no IP address found for host not-exist.test.ex (during SMTP connection from (test) [V4NET.0.0.13])
+LOG: no IP address found for host not-exist.test.ex (during SMTP connection from (test) [V4NET.0.0.13])

 >>> host in "not-exist.test.ex : V4NET.0.0.13"? no (failed to find IP address for not-exist.test.ex)
 LOG: list matching forced to fail: failed to find IP address for not-exist.test.ex
 >>> accept: condition test failed in ACL "check_recipienty"
 >>> host in "not-exist.test.ex : V4NET.0.0.13"? no (failed to find IP address for not-exist.test.ex)
 LOG: list matching forced to fail: failed to find IP address for not-exist.test.ex
 >>> accept: condition test failed in ACL "check_recipienty"


@@ -116,7 +120,7 @@ LOG: list matching forced to fail: failed to find IP address for not-exist.test.
 >>>   message: "Denied"
 >>> deny: condition test succeeded in ACL "check_recipienty"
 >>> end of ACL "check_recipienty": DENY
 >>>   message: "Denied"
 >>> deny: condition test succeeded in ACL "check_recipienty"
 >>> end of ACL "check_recipienty": DENY

-LOG: H=[V4NET.0.0.13] F=<userx@test.ex> rejected RCPT <y@test.ex>: "Denied"
+LOG: H=(test) [V4NET.0.0.13] F=<userx@test.ex> rejected RCPT <y@test.ex>: "Denied"

 >>> host in hosts_connection_nolog? no (option unset)
 >>> host in host_lookup? no (option unset)
 >>> host in host_reject_connection? no (option unset)
 >>> host in hosts_connection_nolog? no (option unset)
 >>> host in host_lookup? no (option unset)
 >>> host in host_reject_connection? no (option unset)


@@ -129,6 +133,7 @@ LOG: failed to find host name for V4NET.0.0.13: accepted by +include_unknown
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)

+>>> test in helo_lookup_domains? no (end of list)

 >>> using ACL "check_recipienta"
 >>> processing "accept" (TESTSUITE/test-config 38)
 >>> check hosts = :
 >>> using ACL "check_recipienta"
 >>> processing "accept" (TESTSUITE/test-config 38)
 >>> check hosts = :


@@ -137,12 +142,12 @@ LOG: failed to find host name for V4NET.0.0.13: accepted by +include_unknown
 >>> processing "deny" (TESTSUITE/test-config 39)
 >>> check hosts = +include_defer : test.again.dns
 >>> test.again.dns in dns_again_means_nonexist? no (option unset)
 >>> processing "deny" (TESTSUITE/test-config 39)
 >>> check hosts = +include_defer : test.again.dns
 >>> test.again.dns in dns_again_means_nonexist? no (option unset)

->>> no IP address found for host test.again.dns (during SMTP connection from [V4NET.0.0.13])
+>>> no IP address found for host test.again.dns (during SMTP connection from (test) [V4NET.0.0.13])

 >>> test.again.dns in dns_again_means_nonexist? no (option unset)
 LOG: DNS lookup of "test.again.dns" deferred: accepted by +include_defer
 >>> deny: condition test succeeded in ACL "check_recipienta"
 >>> end of ACL "check_recipienta": DENY
 >>> test.again.dns in dns_again_means_nonexist? no (option unset)
 LOG: DNS lookup of "test.again.dns" deferred: accepted by +include_defer
 >>> deny: condition test succeeded in ACL "check_recipienta"
 >>> end of ACL "check_recipienta": DENY

-LOG: H=[V4NET.0.0.13] F=<userx@myhost.test.ex> rejected RCPT <a@test.ex>
+LOG: H=(test) [V4NET.0.0.13] F=<userx@myhost.test.ex> rejected RCPT <a@test.ex>

 >>> host in hosts_connection_nolog? no (option unset)
 >>> host in host_lookup? no (option unset)
 >>> host in host_reject_connection? no (option unset)
 >>> host in hosts_connection_nolog? no (option unset)
 >>> host in host_lookup? no (option unset)
 >>> host in host_reject_connection? no (option unset)


@@ -155,15 +160,16 @@ LOG: failed to find host name for V4NET.0.0.13: accepted by +include_unknown
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)

+>>> test in helo_lookup_domains? no (end of list)

 >>> using ACL "check_recipientb"
 >>> processing "accept" (TESTSUITE/test-config 44)
 >>> check hosts = test.again.dns : V4NET.0.0.13
 >>> test.again.dns in dns_again_means_nonexist? no (option unset)
 >>> using ACL "check_recipientb"
 >>> processing "accept" (TESTSUITE/test-config 44)
 >>> check hosts = test.again.dns : V4NET.0.0.13
 >>> test.again.dns in dns_again_means_nonexist? no (option unset)

->>> no IP address found for host test.again.dns (during SMTP connection from [V4NET.0.0.13])
+>>> no IP address found for host test.again.dns (during SMTP connection from (test) [V4NET.0.0.13])

 >>> test.again.dns in dns_again_means_nonexist? no (option unset)
 >>> host in "test.again.dns : V4NET.0.0.13"? list match deferred for test.again.dns
 >>> accept: condition test deferred in ACL "check_recipientb"
 >>> test.again.dns in dns_again_means_nonexist? no (option unset)
 >>> host in "test.again.dns : V4NET.0.0.13"? list match deferred for test.again.dns
 >>> accept: condition test deferred in ACL "check_recipientb"

-LOG: H=[V4NET.0.0.13] F=<userx@test.ex> temporarily rejected RCPT <b@test.ex>: DNS lookup of "test.again.dns" deferred
+LOG: H=(test) [V4NET.0.0.13] F=<userx@test.ex> temporarily rejected RCPT <b@test.ex>: DNS lookup of "test.again.dns" deferred

 >>> host in hosts_connection_nolog? no (option unset)
 >>> host in host_lookup? no (option unset)
 >>> host in host_reject_connection? no (option unset)
 >>> host in hosts_connection_nolog? no (option unset)
 >>> host in host_lookup? no (option unset)
 >>> host in host_reject_connection? no (option unset)


@@ -176,11 +182,12 @@ LOG: failed to find host name for V4NET.0.0.13: accepted by +include_unknown
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)

+>>> test in helo_lookup_domains? no (end of list)

 >>> using ACL "check_recipientc"
 >>> processing "accept" (TESTSUITE/test-config 48)
 >>> check hosts = +ignore_defer : test.again.dns : V4NET.0.0.13
 >>> test.again.dns in dns_again_means_nonexist? no (option unset)
 >>> using ACL "check_recipientc"
 >>> processing "accept" (TESTSUITE/test-config 48)
 >>> check hosts = +ignore_defer : test.again.dns : V4NET.0.0.13
 >>> test.again.dns in dns_again_means_nonexist? no (option unset)

->>> no IP address found for host test.again.dns (during SMTP connection from [V4NET.0.0.13])
+>>> no IP address found for host test.again.dns (during SMTP connection from (test) [V4NET.0.0.13])

 >>> test.again.dns in dns_again_means_nonexist? no (option unset)
 >>> DNS lookup of "test.again.dns" deferred: item ignored by +ignore_defer
 >>> host in "+ignore_defer : test.again.dns : V4NET.0.0.13"? yes (matched "V4NET.0.0.13")
 >>> test.again.dns in dns_again_means_nonexist? no (option unset)
 >>> DNS lookup of "test.again.dns" deferred: item ignored by +ignore_defer
 >>> host in "+ignore_defer : test.again.dns : V4NET.0.0.13"? yes (matched "V4NET.0.0.13")

diff --git a/test/stderr/0070 b/test/stderr/0070
index b4e00211768b34866205c9e910dfd0b1b511a32a..8e6d9e56129145737437ce761da452e2c173ee57 100644 (file)
--- a/test/stderr/0070
+++ b/test/stderr/0070
@@ -26,8 +26,9 @@ MUNGED: ::1 will be omitted in what follows
 >>>   name=ten-2.test.ex address=V4NET.0.0.2
 >>> host in helo_try_verify_hosts? no (end of list)
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>>   name=ten-2.test.ex address=V4NET.0.0.2
 >>> host in helo_try_verify_hosts? no (end of list)
 >>> host in helo_accept_junk_hosts? no (option unset)

+>>> host in hosts_require_helo? no (end of list)

 >>> using ACL "rcpt"
 >>> using ACL "rcpt"

->>> processing "require" (TESTSUITE/test-config 22)
+>>> processing "require" (TESTSUITE/test-config 23)

 >>>   message: helo not verified
 >>> check verify = helo
 >>> verifying EHLO/HELO argument "NULL"
 >>>   message: helo not verified
 >>> check verify = helo
 >>> verifying EHLO/HELO argument "NULL"


@@ -56,7 +57,7 @@ MUNGED: ::1 will be omitted in what follows
 >>> verifying EHLO/HELO argument "[V4NET.0.0.1]"
 >>> HELO verification failed but host is in helo_try_verify_hosts
 >>> using ACL "rcpt"
 >>> verifying EHLO/HELO argument "[V4NET.0.0.1]"
 >>> HELO verification failed but host is in helo_try_verify_hosts
 >>> using ACL "rcpt"

->>> processing "require" (TESTSUITE/test-config 22)
+>>> processing "require" (TESTSUITE/test-config 23)

 >>>   message: helo not verified
 >>> check verify = helo
 >>> require: condition test failed in ACL "rcpt"
 >>>   message: helo not verified
 >>> check verify = helo
 >>> require: condition test failed in ACL "rcpt"


@@ -83,11 +84,11 @@ MUNGED: ::1 will be omitted in what follows
 >>> verifying EHLO/HELO argument "[V4NET.0.0.2]"
 >>> matched host address
 >>> using ACL "rcpt"
 >>> verifying EHLO/HELO argument "[V4NET.0.0.2]"
 >>> matched host address
 >>> using ACL "rcpt"

->>> processing "require" (TESTSUITE/test-config 22)
+>>> processing "require" (TESTSUITE/test-config 23)

 >>>   message: helo not verified
 >>> check verify = helo
 >>> require: condition test succeeded in ACL "rcpt"
 >>>   message: helo not verified
 >>> check verify = helo
 >>> require: condition test succeeded in ACL "rcpt"

->>> processing "deny" (TESTSUITE/test-config 25)
+>>> processing "deny" (TESTSUITE/test-config 26)

 >>>   message: helo did verify
 >>> deny: condition test succeeded in ACL "rcpt"
 >>> end of ACL "rcpt": DENY
 >>>   message: helo did verify
 >>> deny: condition test succeeded in ACL "rcpt"
 >>> end of ACL "rcpt": DENY


@@ -201,7 +202,7 @@ MUNGED: ::1 will be omitted in what follows
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> [V4NET.0.0.99] in helo_lookup_domains? no (end of list)
 >>> using ACL "rcpt"
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> [V4NET.0.0.99] in helo_lookup_domains? no (end of list)
 >>> using ACL "rcpt"

->>> processing "require" (TESTSUITE/test-config 22)
+>>> processing "require" (TESTSUITE/test-config 23)

 >>>   message: helo not verified
 >>> check verify = helo
 >>> verifying EHLO/HELO argument "[V4NET.0.0.99]"
 >>>   message: helo not verified
 >>> check verify = helo
 >>> verifying EHLO/HELO argument "[V4NET.0.0.99]"


@@ -227,13 +228,13 @@ MUNGED: ::1 will be omitted in what follows
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> [V4NET.0.0.13] in helo_lookup_domains? no (end of list)
 >>> using ACL "rcpt"
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> [V4NET.0.0.13] in helo_lookup_domains? no (end of list)
 >>> using ACL "rcpt"

->>> processing "require" (TESTSUITE/test-config 22)
+>>> processing "require" (TESTSUITE/test-config 23)

 >>>   message: helo not verified
 >>> check verify = helo
 >>> verifying EHLO/HELO argument "[V4NET.0.0.13]"
 >>> matched host address
 >>> require: condition test succeeded in ACL "rcpt"
 >>>   message: helo not verified
 >>> check verify = helo
 >>> verifying EHLO/HELO argument "[V4NET.0.0.13]"
 >>> matched host address
 >>> require: condition test succeeded in ACL "rcpt"

->>> processing "deny" (TESTSUITE/test-config 25)
+>>> processing "deny" (TESTSUITE/test-config 26)

 >>>   message: helo did verify
 >>> deny: condition test succeeded in ACL "rcpt"
 >>> end of ACL "rcpt": DENY
 >>>   message: helo did verify
 >>> deny: condition test succeeded in ACL "rcpt"
 >>> end of ACL "rcpt": DENY


@@ -260,7 +261,7 @@ MUNGED: ::1 will be omitted in what follows
 >>> host in pipelining_advertise_hosts? yes (matched "*")
 >>> host in chunking_advertise_hosts? no (end of list)
 >>> using ACL "rcpt"
 >>> host in pipelining_advertise_hosts? yes (matched "*")
 >>> host in chunking_advertise_hosts? no (end of list)
 >>> using ACL "rcpt"

->>> processing "require" (TESTSUITE/test-config 22)
+>>> processing "require" (TESTSUITE/test-config 23)

 >>>   message: helo not verified
 >>> check verify = helo
 >>> verifying EHLO/HELO argument "rhubarb"
 >>>   message: helo not verified
 >>> check verify = helo
 >>> verifying EHLO/HELO argument "rhubarb"

diff --git a/test/stderr/0077 b/test/stderr/0077
index c6362a8bdb2f2be4b848ff1b685650227f59d33c..a0128bd9f443d09857be567e29fdfe63d83a40c6 100644 (file)
--- a/test/stderr/0077
+++ b/test/stderr/0077
@@ -6,6 +6,7 @@
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)

+>>> test in helo_lookup_domains? no (end of list)

 >>> using ACL "check_recipient"
 >>> processing "deny" (TESTSUITE/test-config 18)
 >>> check hosts = ! @ : ! localhost
 >>> using ACL "check_recipient"
 >>> processing "deny" (TESTSUITE/test-config 18)
 >>> check hosts = ! @ : ! localhost


@@ -31,6 +32,7 @@ MUNGED: ::1 will be omitted in what follows
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)

+>>> test in helo_lookup_domains? no (end of list)

 >>> using ACL "check_recipient"
 >>> processing "deny" (TESTSUITE/test-config 18)
 >>> check hosts = ! @ : ! localhost
 >>> using ACL "check_recipient"
 >>> processing "deny" (TESTSUITE/test-config 18)
 >>> check hosts = ! @ : ! localhost


@@ -53,6 +55,7 @@ MUNGED: ::1 will be omitted in what follows
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)

+>>> test in helo_lookup_domains? no (end of list)

 >>> using ACL "check_recipient"
 >>> processing "deny" (TESTSUITE/test-config 18)
 >>> check hosts = ! @ : ! localhost
 >>> using ACL "check_recipient"
 >>> processing "deny" (TESTSUITE/test-config 18)
 >>> check hosts = ! @ : ! localhost


@@ -65,4 +68,4 @@ MUNGED: ::1 will be omitted in what follows
 >>> host in "! @ : ! localhost"? yes (end of list)
 >>> deny: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": DENY
 >>> host in "! @ : ! localhost"? yes (end of list)
 >>> deny: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": DENY

-LOG: H=[V4NET.0.0.1] F=<x@test.ex> rejected RCPT <x@test.ex>
+LOG: H=(test) [V4NET.0.0.1] F=<x@test.ex> rejected RCPT <x@test.ex>

diff --git a/test/stderr/0086 b/test/stderr/0086
index 577c2b9eda6ee1be29fc0885b46ad2f5cede36cd..77846d8b4b80feeb5b60fe565179cef86069dcf4 100644 (file)
--- a/test/stderr/0086
+++ b/test/stderr/0086
@@ -6,6 +6,7 @@
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)

+>>> test in helo_lookup_domains? no (end of list)

 >>> processing "accept" (TESTSUITE/test-config 23)
 >>> accept: condition test succeeded in inline ACL
 >>> end of inline ACL: ACCEPT
 >>> processing "accept" (TESTSUITE/test-config 23)
 >>> accept: condition test succeeded in inline ACL
 >>> end of inline ACL: ACCEPT


@@ -18,7 +19,7 @@
 LOG: 10HmaY-0005vi-00 acl_verify_message: ''>' missing at end of address: failing address in "Cc:" header is: <abcd@x.y.z'
 >>> deny: condition test succeeded in ACL "check_message"
 >>> end of ACL "check_message": DENY
 LOG: 10HmaY-0005vi-00 acl_verify_message: ''>' missing at end of address: failing address in "Cc:" header is: <abcd@x.y.z'
 >>> deny: condition test succeeded in ACL "check_message"
 >>> end of ACL "check_message": DENY

-LOG: 10HmaY-0005vi-00 H=[V4NET.10.10.10] F=<userx@exim.test.ex> rejected after DATA: '>' missing at end of address: failing address in "Cc:" header is: <abcd@x.y.z
+LOG: 10HmaY-0005vi-00 H=(test) [V4NET.10.10.10] F=<userx@exim.test.ex> rejected after DATA: '>' missing at end of address: failing address in "Cc:" header is: <abcd@x.y.z

 >>> host in hosts_connection_nolog? no (option unset)
 >>> host in host_lookup? no (option unset)
 >>> host in host_reject_connection? no (option unset)
 >>> host in hosts_connection_nolog? no (option unset)
 >>> host in host_lookup? no (option unset)
 >>> host in host_reject_connection? no (option unset)


@@ -27,6 +28,7 @@ LOG: 10HmaY-0005vi-00 H=[V4NET.10.10.10] F=<userx@exim.test.ex> rejected after D
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)

+>>> test in helo_lookup_domains? no (end of list)

 >>> processing "accept" (TESTSUITE/test-config 23)
 >>> accept: condition test succeeded in inline ACL
 >>> end of inline ACL: ACCEPT
 >>> processing "accept" (TESTSUITE/test-config 23)
 >>> accept: condition test succeeded in inline ACL
 >>> end of inline ACL: ACCEPT


@@ -39,7 +41,7 @@ LOG: 10HmaY-0005vi-00 H=[V4NET.10.10.10] F=<userx@exim.test.ex> rejected after D
 LOG: 10HmaZ-0005vi-00 acl_verify_message: ''>' missing at end of address: failing address in "Cc:" header is: <abcd@x.y.z'
 >>> deny: condition test succeeded in ACL "check_message"
 >>> end of ACL "check_message": DENY
 LOG: 10HmaZ-0005vi-00 acl_verify_message: ''>' missing at end of address: failing address in "Cc:" header is: <abcd@x.y.z'
 >>> deny: condition test succeeded in ACL "check_message"
 >>> end of ACL "check_message": DENY

-LOG: 10HmaZ-0005vi-00 H=[V4NET.10.10.10] F=<userx@exim.test.ex> rejected after DATA: '>' missing at end of address: failing address in "Cc:" header is: <abcd@x.y.z
+LOG: 10HmaZ-0005vi-00 H=(test) [V4NET.10.10.10] F=<userx@exim.test.ex> rejected after DATA: '>' missing at end of address: failing address in "Cc:" header is: <abcd@x.y.z

 >>> host in hosts_connection_nolog? no (option unset)
 >>> host in host_lookup? no (option unset)
 >>> host in host_reject_connection? no (option unset)
 >>> host in hosts_connection_nolog? no (option unset)
 >>> host in host_lookup? no (option unset)
 >>> host in host_reject_connection? no (option unset)


@@ -48,6 +50,7 @@ LOG: 10HmaZ-0005vi-00 H=[V4NET.10.10.10] F=<userx@exim.test.ex> rejected after D
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)

+>>> test in helo_lookup_domains? no (end of list)

 >>> processing "accept" (TESTSUITE/test-config 23)
 >>> accept: condition test succeeded in inline ACL
 >>> end of inline ACL: ACCEPT
 >>> processing "accept" (TESTSUITE/test-config 23)
 >>> accept: condition test succeeded in inline ACL
 >>> end of inline ACL: ACCEPT


@@ -60,7 +63,7 @@ LOG: 10HmaZ-0005vi-00 H=[V4NET.10.10.10] F=<userx@exim.test.ex> rejected after D
 LOG: 10HmbA-0005vi-00 acl_verify_message: ''>' missing at end of address: failing address in "Resent-To:" header is: <xyz@a.b.c.d'
 >>> deny: condition test succeeded in ACL "check_message"
 >>> end of ACL "check_message": DENY
 LOG: 10HmbA-0005vi-00 acl_verify_message: ''>' missing at end of address: failing address in "Resent-To:" header is: <xyz@a.b.c.d'
 >>> deny: condition test succeeded in ACL "check_message"
 >>> end of ACL "check_message": DENY

-LOG: 10HmbA-0005vi-00 H=[V4NET.10.10.10] F=<userx@exim.test.ex> rejected after DATA: '>' missing at end of address: failing address in "Resent-To:" header is: <xyz@a.b.c.d
+LOG: 10HmbA-0005vi-00 H=(test) [V4NET.10.10.10] F=<userx@exim.test.ex> rejected after DATA: '>' missing at end of address: failing address in "Resent-To:" header is: <xyz@a.b.c.d

 >>> host in hosts_connection_nolog? no (option unset)
 >>> host in host_lookup? no (option unset)
 >>> host in host_reject_connection? no (option unset)
 >>> host in hosts_connection_nolog? no (option unset)
 >>> host in host_lookup? no (option unset)
 >>> host in host_reject_connection? no (option unset)


@@ -69,6 +72,7 @@ LOG: 10HmbA-0005vi-00 H=[V4NET.10.10.10] F=<userx@exim.test.ex> rejected after D
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)

+>>> test in helo_lookup_domains? no (end of list)

 >>> processing "accept" (TESTSUITE/test-config 23)
 >>> accept: condition test succeeded in inline ACL
 >>> end of inline ACL: ACCEPT
 >>> processing "accept" (TESTSUITE/test-config 23)
 >>> accept: condition test succeeded in inline ACL
 >>> end of inline ACL: ACCEPT


@@ -81,7 +85,7 @@ LOG: 10HmbA-0005vi-00 H=[V4NET.10.10.10] F=<userx@exim.test.ex> rejected after D
 LOG: 10HmbB-0005vi-00 acl_verify_message: 'unmatched doublequote in local part: failing address in "Cc:" header begins: "abcd@x.y.z (missing quote),\n  longlonglonglonglong@long.long.long.long.long.long.long.long,\n  listlistlistlistlist@list.list.list.list.list.list.list.list,\n  ofofofofofofofofofof@of.of.of.of.of.of.of.of.of.of.of.of.of,\n  addressesaddresses@addresses.addresses.addresses.addresses,   \n  longlonglonglonglong@long.long.long.long.long.long.long.long,\n  listlistlistlistlist@list.list.list.list.list.list.list.list,\n  ofofofofofofofofofof@of.of.of.of.of.of.of.of.of.of.of.of.of,\n  addressesaddresses@addresses.addresses.addresses.addresses,   \n  longlonglonglonglong@long.long.long.long.long.long.long.long,\n  listlistlistlistlist@list.list.list.list.list.list.list.list,\n  ofofofofofofofofofof@of.of.of.of.of.of.of.of.of.of.of.of.of,\n  addressesaddresses@addresses.addresses.addresses.addresses,   \n  longlonglonglonglong@long.long.long.long.long.long.long.long,\n  listlistlistlistlist@list.list.list.list.list.list.list.list,\n  ofofofofofofofofofof@of.of.of.of.of.of.of.of.of.of.of.of.of,\n  addressesaddresses@addresses.addre'
 >>> deny: condition test succeeded in ACL "check_message"
 >>> end of ACL "check_message": DENY
 LOG: 10HmbB-0005vi-00 acl_verify_message: 'unmatched doublequote in local part: failing address in "Cc:" header begins: "abcd@x.y.z (missing quote),\n  longlonglonglonglong@long.long.long.long.long.long.long.long,\n  listlistlistlistlist@list.list.list.list.list.list.list.list,\n  ofofofofofofofofofof@of.of.of.of.of.of.of.of.of.of.of.of.of,\n  addressesaddresses@addresses.addresses.addresses.addresses,   \n  longlonglonglonglong@long.long.long.long.long.long.long.long,\n  listlistlistlistlist@list.list.list.list.list.list.list.list,\n  ofofofofofofofofofof@of.of.of.of.of.of.of.of.of.of.of.of.of,\n  addressesaddresses@addresses.addresses.addresses.addresses,   \n  longlonglonglonglong@long.long.long.long.long.long.long.long,\n  listlistlistlistlist@list.list.list.list.list.list.list.list,\n  ofofofofofofofofofof@of.of.of.of.of.of.of.of.of.of.of.of.of,\n  addressesaddresses@addresses.addresses.addresses.addresses,   \n  longlonglonglonglong@long.long.long.long.long.long.long.long,\n  listlistlistlistlist@list.list.list.list.list.list.list.list,\n  ofofofofofofofofofof@of.of.of.of.of.of.of.of.of.of.of.of.of,\n  addressesaddresses@addresses.addre'
 >>> deny: condition test succeeded in ACL "check_message"
 >>> end of ACL "check_message": DENY

-LOG: 10HmbB-0005vi-00 H=[V4NET.10.10.10] F=<userx@exim.test.ex> rejected after DATA: unmatched doublequote in local part: failing address in "Cc:" header begins: "abcd@x.y.z (missing quote),\n  longlonglonglonglong@long.long.long.long.long.long.long.long,\n  listlistlistlistlist@list.list.list.list.list.list.list.list,\n  ofofofofofofofofofof@of.of.of.of.of.of.of.of.of.of.of.of.of,\n  addressesaddresses@addresses.addresses.addresses.addresses,   \n  longlonglonglonglong@long.long.long.long.long.long.long.long,\n  listlistlistlistlist@list.list.list.list.list.list.list.list,\n  ofofofofofofofofofof@of.of.of.of.of.of.of.of.of.of.of.of.of,\n  addressesaddresses@addresses.addresses.addresses.addresses,   \n  longlonglonglonglong@long.long.long.long.long.long.long.long,\n  listlistlistlistlist@list.list.list.list.list.list.list.list,\n  ofofofofofofofofofof@of.of.of.of.of.of.of.of.of.of.of.of.of,\n  addressesaddresses@addresses.addresses.addresses.addresses,   \n  longlonglonglonglong@long.long.long.long.long.long.long.long,\n  listlistlistlistlist@list.list.list.list.list.list.list.list,\n  ofofofofofofofofofof@of.of.of.of.of.of.of.of.of.of.of.of.of,\n  addressesaddresses@addresses.addre
+LOG: 10HmbB-0005vi-00 H=(test) [V4NET.10.10.10] F=<userx@exim.test.ex> rejected after DATA: unmatched doublequote in local part: failing address in "Cc:" header begins: "abcd@x.y.z (missing quote),\n  longlonglonglonglong@long.long.long.long.long.long.long.long,\n  listlistlistlistlist@list.list.list.list.list.list.list.list,\n  ofofofofofofofofofof@of.of.of.of.of.of.of.of.of.of.of.of.of,\n  addressesaddresses@addresses.addresses.addresses.addresses,   \n  longlonglonglonglong@long.long.long.long.long.long.long.long,\n  listlistlistlistlist@list.list.list.list.list.list.list.list,\n  ofofofofofofofofofof@of.of.of.of.of.of.of.of.of.of.of.of.of,\n  addressesaddresses@addresses.addresses.addresses.addresses,   \n  longlonglonglonglong@long.long.long.long.long.long.long.long,\n  listlistlistlistlist@list.list.list.list.list.list.list.list,\n  ofofofofofofofofofof@of.of.of.of.of.of.of.of.of.of.of.of.of,\n  addressesaddresses@addresses.addresses.addresses.addresses,   \n  longlonglonglonglong@long.long.long.long.long.long.long.long,\n  listlistlistlistlist@list.list.list.list.list.list.list.list,\n  ofofofofofofofofofof@of.of.of.of.of.of.of.of.of.of.of.of.of,\n  addressesaddresses@addresses.addre

 >>> host in hosts_connection_nolog? no (option unset)
 >>> host in host_lookup? no (option unset)
 >>> host in host_reject_connection? no (option unset)
 >>> host in hosts_connection_nolog? no (option unset)
 >>> host in host_lookup? no (option unset)
 >>> host in host_reject_connection? no (option unset)


@@ -90,6 +94,7 @@ LOG: 10HmbB-0005vi-00 H=[V4NET.10.10.10] F=<userx@exim.test.ex> rejected after D
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)

+>>> test in helo_lookup_domains? no (end of list)

 >>> processing "accept" (TESTSUITE/test-config 23)
 >>> accept: condition test succeeded in inline ACL
 >>> end of inline ACL: ACCEPT
 >>> processing "accept" (TESTSUITE/test-config 23)
 >>> accept: condition test succeeded in inline ACL
 >>> end of inline ACL: ACCEPT


@@ -102,7 +107,7 @@ LOG: 10HmbB-0005vi-00 H=[V4NET.10.10.10] F=<userx@exim.test.ex> rejected after D
 LOG: 10HmbC-0005vi-00 acl_verify_message: 'unqualified address not permitted: failing address in "Cc:" header is: <abcd>'
 >>> deny: condition test succeeded in ACL "check_message"
 >>> end of ACL "check_message": DENY
 LOG: 10HmbC-0005vi-00 acl_verify_message: 'unqualified address not permitted: failing address in "Cc:" header is: <abcd>'
 >>> deny: condition test succeeded in ACL "check_message"
 >>> end of ACL "check_message": DENY

-LOG: 10HmbC-0005vi-00 H=[V4NET.10.10.10] F=<userx@exim.test.ex> rejected after DATA: unqualified address not permitted: failing address in "Cc:" header is: <abcd>
+LOG: 10HmbC-0005vi-00 H=(test) [V4NET.10.10.10] F=<userx@exim.test.ex> rejected after DATA: unqualified address not permitted: failing address in "Cc:" header is: <abcd>

 >>> host in hosts_connection_nolog? no (option unset)
 >>> host in host_lookup? no (option unset)
 >>> host in host_reject_connection? no (option unset)
 >>> host in hosts_connection_nolog? no (option unset)
 >>> host in host_lookup? no (option unset)
 >>> host in host_reject_connection? no (option unset)


@@ -111,6 +116,7 @@ LOG: 10HmbC-0005vi-00 H=[V4NET.10.10.10] F=<userx@exim.test.ex> rejected after D
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)

+>>> test in helo_lookup_domains? no (end of list)

 >>> processing "accept" (TESTSUITE/test-config 23)
 >>> accept: condition test succeeded in inline ACL
 >>> end of inline ACL: ACCEPT
 >>> processing "accept" (TESTSUITE/test-config 23)
 >>> accept: condition test succeeded in inline ACL
 >>> end of inline ACL: ACCEPT


@@ -122,4 +128,4 @@ LOG: 10HmbC-0005vi-00 H=[V4NET.10.10.10] F=<userx@exim.test.ex> rejected after D
 >>> processing "accept" (TESTSUITE/test-config 21)
 >>> accept: condition test succeeded in ACL "check_message"
 >>> end of ACL "check_message": ACCEPT
 >>> processing "accept" (TESTSUITE/test-config 21)
 >>> accept: condition test succeeded in ACL "check_message"
 >>> end of ACL "check_message": ACCEPT

-LOG: 10HmaX-0005vi-00 <= userx@exim.test.ex H=[V4NET.10.10.9] P=smtp S=sss
+LOG: 10HmaX-0005vi-00 <= userx@exim.test.ex H=(test) [V4NET.10.10.9] P=smtp S=sss

diff --git a/test/stderr/0087 b/test/stderr/0087
index ec9eeb4e7d857dcc9ef9ca4ec67b457449f39efa..18eaf64c0c4618ad43cecc4ecb36a1ccc1a843a7 100644 (file)
--- a/test/stderr/0087
+++ b/test/stderr/0087
@@ -6,6 +6,7 @@
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)

+>>> test in helo_lookup_domains? no (end of list)

 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 20)
 >>> check hosts = :
 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 20)
 >>> check hosts = :


@@ -37,7 +38,7 @@
 >>> processing "accept" (TESTSUITE/test-config 27)
 >>> accept: condition test succeeded in ACL "check_message"
 >>> end of ACL "check_message": ACCEPT
 >>> processing "accept" (TESTSUITE/test-config 27)
 >>> accept: condition test succeeded in ACL "check_message"
 >>> end of ACL "check_message": ACCEPT

-LOG: 10HmaX-0005vi-00 <= userx@test.ex H=[V4NET.10.10.10] P=smtp S=sss
+LOG: 10HmaX-0005vi-00 <= userx@test.ex H=(test) [V4NET.10.10.10] P=smtp S=sss

 >>> host in hosts_connection_nolog? no (option unset)
 >>> host in host_lookup? no (option unset)
 >>> host in host_reject_connection? no (option unset)
 >>> host in hosts_connection_nolog? no (option unset)
 >>> host in host_lookup? no (option unset)
 >>> host in host_reject_connection? no (option unset)


@@ -46,6 +47,7 @@ LOG: 10HmaX-0005vi-00 <= userx@test.ex H=[V4NET.10.10.10] P=smtp S=sss
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)

+>>> test in helo_lookup_domains? no (end of list)

 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 20)
 >>> check hosts = :
 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 20)
 >>> check hosts = :


@@ -77,7 +79,7 @@ LOG: 10HmaX-0005vi-00 <= userx@test.ex H=[V4NET.10.10.10] P=smtp S=sss
 >>> processing "accept" (TESTSUITE/test-config 27)
 >>> accept: condition test succeeded in ACL "check_message"
 >>> end of ACL "check_message": ACCEPT
 >>> processing "accept" (TESTSUITE/test-config 27)
 >>> accept: condition test succeeded in ACL "check_message"
 >>> end of ACL "check_message": ACCEPT

-LOG: 10HmaY-0005vi-00 <= userx@test.ex H=[V4NET.10.10.10] P=smtp S=sss
+LOG: 10HmaY-0005vi-00 <= userx@test.ex H=(test) [V4NET.10.10.10] P=smtp S=sss

 >>> host in hosts_connection_nolog? no (option unset)
 >>> host in host_lookup? no (option unset)
 >>> host in host_reject_connection? no (option unset)
 >>> host in hosts_connection_nolog? no (option unset)
 >>> host in host_lookup? no (option unset)
 >>> host in host_reject_connection? no (option unset)


@@ -86,6 +88,7 @@ LOG: 10HmaY-0005vi-00 <= userx@test.ex H=[V4NET.10.10.10] P=smtp S=sss
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)

+>>> test in helo_lookup_domains? no (end of list)

 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 20)
 >>> check hosts = :
 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 20)
 >>> check hosts = :


@@ -119,7 +122,7 @@ LOG: 10HmaY-0005vi-00 <= userx@test.ex H=[V4NET.10.10.10] P=smtp S=sss
 >>> no more routers
 >>> require: condition test failed in ACL "check_message"
 >>> end of ACL "check_message": not OK
 >>> no more routers
 >>> require: condition test failed in ACL "check_message"
 >>> end of ACL "check_message": not OK

-LOG: 10HmbA-0005vi-00 H=[V4NET.10.10.10] F=<userx@test.ex> rejected after DATA: there is no valid sender in any header line
+LOG: 10HmbA-0005vi-00 H=(test) [V4NET.10.10.10] F=<userx@test.ex> rejected after DATA: there is no valid sender in any header line

 >>> host in hosts_connection_nolog? no (option unset)
 >>> host in host_lookup? no (option unset)
 >>> host in host_reject_connection? no (option unset)
 >>> host in hosts_connection_nolog? no (option unset)
 >>> host in host_lookup? no (option unset)
 >>> host in host_reject_connection? no (option unset)


@@ -128,6 +131,7 @@ LOG: 10HmbA-0005vi-00 H=[V4NET.10.10.10] F=<userx@test.ex> rejected after DATA:
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)

+>>> test in helo_lookup_domains? no (end of list)

 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 20)
 >>> check hosts = :
 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 20)
 >>> check hosts = :


@@ -165,7 +169,7 @@ LOG: 10HmbA-0005vi-00 H=[V4NET.10.10.10] F=<userx@test.ex> rejected after DATA:
 >>> processing "accept" (TESTSUITE/test-config 27)
 >>> accept: condition test succeeded in ACL "check_message"
 >>> end of ACL "check_message": ACCEPT
 >>> processing "accept" (TESTSUITE/test-config 27)
 >>> accept: condition test succeeded in ACL "check_message"
 >>> end of ACL "check_message": ACCEPT

-LOG: 10HmaZ-0005vi-00 <= userx@test.ex H=[V4NET.10.10.10] P=smtp S=sss
+LOG: 10HmaZ-0005vi-00 <= userx@test.ex H=(test) [V4NET.10.10.10] P=smtp S=sss

 >>> host in hosts_connection_nolog? no (option unset)
 >>> host in host_lookup? no (option unset)
 >>> host in host_reject_connection? no (option unset)
 >>> host in hosts_connection_nolog? no (option unset)
 >>> host in host_lookup? no (option unset)
 >>> host in host_reject_connection? no (option unset)


@@ -174,6 +178,7 @@ LOG: 10HmaZ-0005vi-00 <= userx@test.ex H=[V4NET.10.10.10] P=smtp S=sss
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)

+>>> test in helo_lookup_domains? no (end of list)

 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 20)
 >>> check hosts = :
 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 20)
 >>> check hosts = :


@@ -207,4 +212,4 @@ LOG: 10HmaZ-0005vi-00 <= userx@test.ex H=[V4NET.10.10.10] P=smtp S=sss
 >>> defer router: defer for defer@test.ex
 >>>   message: this is a forced defer
 >>> require: condition test deferred in ACL "check_message"
 >>> defer router: defer for defer@test.ex
 >>>   message: this is a forced defer
 >>> require: condition test deferred in ACL "check_message"

-LOG: 10HmbB-0005vi-00 H=[V4NET.10.10.10] F=<userx@test.ex> temporarily rejected after DATA: all attempts to verify a sender in a header line deferred
+LOG: 10HmbB-0005vi-00 H=(test) [V4NET.10.10.10] F=<userx@test.ex> temporarily rejected after DATA: all attempts to verify a sender in a header line deferred

diff --git a/test/stderr/0091 b/test/stderr/0091
index 660477a5964dcf60caad57b8bbf118d4a5b7fd41..f105543c15f0a8259064aa2a52d0d96081bdce16 100644 (file)
--- a/test/stderr/0091
+++ b/test/stderr/0091
@@ -6,6 +6,7 @@
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)

+>>> test in helo_lookup_domains? no (end of list)

 >>> using ACL "check_recipient"
 >>> processing "deny" (TESTSUITE/test-config 18)
 >>> check hosts = ! V4NET.0.0.1
 >>> using ACL "check_recipient"
 >>> processing "deny" (TESTSUITE/test-config 18)
 >>> check hosts = ! V4NET.0.0.1


@@ -28,7 +29,7 @@
 >>> no more routers
 >>> require: condition test failed in ACL "check_message"
 >>> end of ACL "check_message": not OK
 >>> no more routers
 >>> require: condition test failed in ACL "check_message"
 >>> end of ACL "check_message": not OK

-LOG: 10HmaY-0005vi-00 H=[V4NET.0.0.1] F=<junk@jink.jonk.test.ex> rejected after DATA: there is no valid sender in any header line
+LOG: 10HmaY-0005vi-00 H=(test) [V4NET.0.0.1] F=<junk@jink.jonk.test.ex> rejected after DATA: there is no valid sender in any header line

 >>> host in hosts_connection_nolog? no (option unset)
 >>> host in host_lookup? no (option unset)
 >>> host in host_reject_connection? no (option unset)
 >>> host in hosts_connection_nolog? no (option unset)
 >>> host in host_lookup? no (option unset)
 >>> host in host_reject_connection? no (option unset)


@@ -37,6 +38,7 @@ LOG: 10HmaY-0005vi-00 H=[V4NET.0.0.1] F=<junk@jink.jonk.test.ex> rejected after
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)

+>>> test in helo_lookup_domains? no (end of list)

 >>> using ACL "check_recipient"
 >>> processing "deny" (TESTSUITE/test-config 18)
 >>> check hosts = ! V4NET.0.0.1
 >>> using ACL "check_recipient"
 >>> processing "deny" (TESTSUITE/test-config 18)
 >>> check hosts = ! V4NET.0.0.1


@@ -49,8 +51,8 @@ LOG: 10HmaY-0005vi-00 H=[V4NET.0.0.1] F=<junk@jink.jonk.test.ex> rejected after
 >>> ----------- end verify ------------
 >>> deny: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": DENY
 >>> ----------- end verify ------------
 >>> deny: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": DENY

-LOG: H=[V4NET.0.0.2] sender verify fail for <junk@jink.jonk.test.ex>: Unrouteable address
-LOG: H=[V4NET.0.0.2] F=<junk@jink.jonk.test.ex> rejected RCPT <root@test.ex>: Sender verify failed
+LOG: H=(test) [V4NET.0.0.2] sender verify fail for <junk@jink.jonk.test.ex>: Unrouteable address
+LOG: H=(test) [V4NET.0.0.2] F=<junk@jink.jonk.test.ex> rejected RCPT <root@test.ex>: Sender verify failed

 >>> host in hosts_connection_nolog? no (option unset)
 >>> host in host_lookup? no (option unset)
 >>> host in host_reject_connection? no (option unset)
 >>> host in hosts_connection_nolog? no (option unset)
 >>> host in host_lookup? no (option unset)
 >>> host in host_reject_connection? no (option unset)


@@ -59,6 +61,7 @@ LOG: H=[V4NET.0.0.2] F=<junk@jink.jonk.test.ex> rejected RCPT <root@test.ex>: Se
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)

+>>> test in helo_lookup_domains? no (end of list)

 >>> using ACL "check_recipient"
 >>> processing "deny" (TESTSUITE/test-config 18)
 >>> check hosts = ! V4NET.0.0.1
 >>> using ACL "check_recipient"
 >>> processing "deny" (TESTSUITE/test-config 18)
 >>> check hosts = ! V4NET.0.0.1


@@ -88,7 +91,7 @@ LOG: H=[V4NET.0.0.2] F=<junk@jink.jonk.test.ex> rejected RCPT <root@test.ex>: Se
 >>> no more routers
 >>> require: condition test failed in ACL "check_message"
 >>> end of ACL "check_message": not OK
 >>> no more routers
 >>> require: condition test failed in ACL "check_message"
 >>> end of ACL "check_message": not OK

-LOG: 10HmaZ-0005vi-00 H=[V4NET.0.0.2] F=<userx@test.ex> rejected after DATA: there is no valid sender in any header line
+LOG: 10HmaZ-0005vi-00 H=(test) [V4NET.0.0.2] F=<userx@test.ex> rejected after DATA: there is no valid sender in any header line

 >>> host in hosts_connection_nolog? no (option unset)
 >>> host in host_lookup? no (option unset)
 >>> host in host_reject_connection? no (option unset)
 >>> host in hosts_connection_nolog? no (option unset)
 >>> host in host_lookup? no (option unset)
 >>> host in host_reject_connection? no (option unset)


@@ -97,6 +100,7 @@ LOG: 10HmaZ-0005vi-00 H=[V4NET.0.0.2] F=<userx@test.ex> rejected after DATA: the
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)

+>>> test in helo_lookup_domains? no (end of list)

 >>> using ACL "check_recipient"
 >>> processing "deny" (TESTSUITE/test-config 18)
 >>> check hosts = ! V4NET.0.0.1
 >>> using ACL "check_recipient"
 >>> processing "deny" (TESTSUITE/test-config 18)
 >>> check hosts = ! V4NET.0.0.1


@@ -129,4 +133,4 @@ LOG: 10HmaZ-0005vi-00 H=[V4NET.0.0.2] F=<userx@test.ex> rejected after DATA: the
 >>> processing "accept" (TESTSUITE/test-config 25)
 >>> accept: condition test succeeded in ACL "check_message"
 >>> end of ACL "check_message": ACCEPT
 >>> processing "accept" (TESTSUITE/test-config 25)
 >>> accept: condition test succeeded in ACL "check_message"
 >>> end of ACL "check_message": ACCEPT

-LOG: 10HmaX-0005vi-00 <= userx@test.ex H=[V4NET.0.0.2] P=smtp S=sss
+LOG: 10HmaX-0005vi-00 <= userx@test.ex H=(test) [V4NET.0.0.2] P=smtp S=sss

diff --git a/test/stderr/0092 b/test/stderr/0092
index b97eed8fd072a62ca68dfbc1908405e8a152cf29..2d6b02a9b4e088d6cb840c374be334fb00e1d5d3 100644 (file)
--- a/test/stderr/0092
+++ b/test/stderr/0092
@@ -15,6 +15,7 @@ LOG: SMTP command timeout on connection from [V4NET.0.0.1]
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)

+>>> test in helo_lookup_domains? no (end of list)

 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 27)
 >>> check hosts = :
 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 27)
 >>> check hosts = :


@@ -31,7 +32,7 @@ LOG: SMTP command timeout on connection from [V4NET.0.0.1]
 >>> test.ex in "+local_domains"? yes (matched "+local_domains")
 >>> accept: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": ACCEPT
 >>> test.ex in "+local_domains"? yes (matched "+local_domains")
 >>> accept: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": ACCEPT

-LOG: SMTP data timeout (message abandoned) on connection from [V4NET.0.0.1] F=<userx@test.ex>
+LOG: SMTP data timeout (message abandoned) on connection from (test) [V4NET.0.0.1] F=<userx@test.ex>

 Exim version x.yz ....
 changed uid/gid: forcing real = effective
   uid=uuuu gid=CALLER_GID pid=pppp
 Exim version x.yz ....
 changed uid/gid: forcing real = effective
   uid=uuuu gid=CALLER_GID pid=pppp


@@ -78,6 +79,12 @@ host in helo_accept_junk_hosts? no (option unset)
  ╰─────result: myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
 SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
 smtp_setup_msg entered
  ╰─────result: myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
 SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
 smtp_setup_msg entered

+SMTP<< helo test
+test in helo_lookup_domains? no (end of list)
+sender_fullhost = (test) [V4NET.0.0.1]
+sender_rcvhost = [V4NET.0.0.1] (helo=test)
+set_process_info: pppp handling incoming connection from (test) [V4NET.0.0.1]
+SMTP>> 250 myhost.test.ex Hello test [V4NET.0.0.1]

 SMTP<< mail from:userx@test.ex
 spool directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 msg_size = 0
 log directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100
 SMTP<< mail from:userx@test.ex
 spool directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 msg_size = 0
 log directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100


@@ -106,7 +113,7 @@ SMTP<< data
 SMTP>> 354 Enter message, ending with "." on a line by itself
 search_tidyup called
 LOG: lost_incoming_connection MAIN
 SMTP>> 354 Enter message, ending with "." on a line by itself
 search_tidyup called
 LOG: lost_incoming_connection MAIN

-  SMTP data timeout (message abandoned) on connection from [V4NET.0.0.1] F=<userx@test.ex>
+  SMTP data timeout (message abandoned) on connection from (test) [V4NET.0.0.1] F=<userx@test.ex>

 SMTP>> 421 myhost.test.ex SMTP incoming data timeout - closing connection.
 search_tidyup called
 >>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=1 >>>>>>>>>>>>>>>>
 SMTP>> 421 myhost.test.ex SMTP incoming data timeout - closing connection.
 search_tidyup called
 >>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=1 >>>>>>>>>>>>>>>>


@@ -120,6 +127,7 @@ exim: timed out while reading - message abandoned
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)

+>>> test in helo_lookup_domains? no (end of list)

 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 27)
 >>> check hosts = :
 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 27)
 >>> check hosts = :


@@ -141,8 +149,8 @@ exim: timed out while reading - message abandoned
 >>> ----------- end verify ------------
 >>> deny: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": DENY
 >>> ----------- end verify ------------
 >>> deny: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": DENY

-LOG: H=[V4NET.0.0.1] F=<userx@test.ex> rejected RCPT verify@test.ex: Unrouteable address
-LOG: SMTP command timeout on connection from [V4NET.0.0.1]
+LOG: H=(test) [V4NET.0.0.1] F=<userx@test.ex> rejected RCPT verify@test.ex: Unrouteable address
+LOG: SMTP command timeout on connection from (test) [V4NET.0.0.1]

 An error was detected while processing a file of BSMTP input.
 The error message was:
 
 An error was detected while processing a file of BSMTP input.
 The error message was:
 

diff --git a/test/stderr/0094 b/test/stderr/0094
index d2b8cc4bc72bf30cf0fa45f3a783e47e15acc800..86569ec9410863fedff3f715a886a9a03fc63785 100644 (file)
--- a/test/stderr/0094
+++ b/test/stderr/0094
@@ -8,6 +8,7 @@ LOG: no host name found for IP address V4NET.11.12.13
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)

+>>> test in helo_lookup_domains? no (end of list)

 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 23)
 >>> check hosts = :
 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 23)
 >>> check hosts = :


@@ -28,7 +29,7 @@ LOG: no host name found for IP address V4NET.11.12.13
 >>>   message: relay not permitted
 >>> deny: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": DENY
 >>>   message: relay not permitted
 >>> deny: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": DENY

-LOG: H=[V4NET.11.12.13] F=<userx@cam.ac.uk> rejected RCPT <userx@cam.ac.uk>: relay not permitted
+LOG: H=(test) [V4NET.11.12.13] F=<userx@cam.ac.uk> rejected RCPT <userx@cam.ac.uk>: relay not permitted

 >>> host in hosts_connection_nolog? no (option unset)
 >>> host in host_lookup? yes (matched "0.0.0.0/0")
 >>> looking up host name for V4NET.0.0.1
 >>> host in hosts_connection_nolog? no (option unset)
 >>> host in host_lookup? yes (matched "0.0.0.0/0")
 >>> looking up host name for V4NET.0.0.1


@@ -60,7 +61,7 @@ LOG: H=[V4NET.11.12.13] F=<userx@cam.ac.uk> rejected RCPT <userx@cam.ac.uk>: rel
 >>>   message: relay not permitted
 >>> deny: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": DENY
 >>>   message: relay not permitted
 >>> deny: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": DENY

-LOG: H=ten-1.test.ex [V4NET.0.0.1] F=<userx@cam.ac.uk> rejected RCPT <userx@cam.ac.uk>: relay not permitted
+LOG: H=ten-1.test.ex (test) [V4NET.0.0.1] F=<userx@cam.ac.uk> rejected RCPT <userx@cam.ac.uk>: relay not permitted

 Exim version x.yz ....
 changed uid/gid: forcing real = effective
   uid=uuuu gid=CALLER_GID pid=pppp
 Exim version x.yz ....
 changed uid/gid: forcing real = effective
   uid=uuuu gid=CALLER_GID pid=pppp


@@ -107,6 +108,11 @@ host in helo_try_verify_hosts? no (option unset)
 host in helo_accept_junk_hosts? no (option unset)
 SMTP>> 220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
 smtp_setup_msg entered
 host in helo_accept_junk_hosts? no (option unset)
 SMTP>> 220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
 smtp_setup_msg entered

+SMTP<< helo test
+sender_fullhost = oneback.test.ex (test) [V4NET.99.99.90]
+sender_rcvhost = oneback.test.ex ([V4NET.99.99.90] helo=test)
+set_process_info: pppp handling incoming connection from oneback.test.ex (test) [V4NET.99.99.90]
+SMTP>> 250 the.local.host.name Hello oneback.test.ex [V4NET.99.99.90]

 SMTP<< mail from:<userx@test.ex>
 spool directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 msg_size = 0
 log directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100
 SMTP<< mail from:<userx@test.ex>
 spool directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 msg_size = 0
 log directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100


@@ -147,10 +153,10 @@ deny: condition test succeeded in ACL "check_recipient"
 end of ACL "check_recipient": DENY
 SMTP>> 550 relay not permitted
 LOG: MAIN REJECT
 end of ACL "check_recipient": DENY
 SMTP>> 550 relay not permitted
 LOG: MAIN REJECT

-  H=oneback.test.ex [V4NET.99.99.90] F=<userx@test.ex> rejected RCPT <userx@cam.ac.uk>: relay not permitted
+  H=oneback.test.ex (test) [V4NET.99.99.90] F=<userx@test.ex> rejected RCPT <userx@cam.ac.uk>: relay not permitted

 SMTP<< quit
 SMTP>> 221 the.local.host.name closing connection
 LOG: smtp_connection MAIN
 SMTP<< quit
 SMTP>> 221 the.local.host.name closing connection
 LOG: smtp_connection MAIN

-  SMTP connection from oneback.test.ex [V4NET.99.99.90] closed by QUIT
+  SMTP connection from oneback.test.ex (test) [V4NET.99.99.90] closed by QUIT

 search_tidyup called
 >>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
 search_tidyup called
 >>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>

diff --git a/test/stderr/0121 b/test/stderr/0121
index f874949df97b08e5a6f3df9507c6e935ef9bcf57..d9673286943640866d95a27b2d8f14c3a8a66258 100644 (file)
--- a/test/stderr/0121
+++ b/test/stderr/0121
@@ -6,6 +6,7 @@
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)

+>>> test in helo_lookup_domains? no (end of list)

 >>> using ACL "check_recipient"
 >>> processing "require" (TESTSUITE/test-config 21)
 >>> check verify = sender
 >>> using ACL "check_recipient"
 >>> processing "require" (TESTSUITE/test-config 21)
 >>> check verify = sender


@@ -19,8 +20,8 @@
 >>> ----------- end verify ------------
 >>> require: condition test failed in ACL "check_recipient"
 >>> end of ACL "check_recipient": not OK
 >>> ----------- end verify ------------
 >>> require: condition test failed in ACL "check_recipient"
 >>> end of ACL "check_recipient": not OK

-LOG: H=[127.0.0.1] sender verify fail for <unknown@test.ex>: Unrouteable address
-LOG: H=[127.0.0.1] F=<unknown@test.ex> rejected RCPT <userx@test.ex>: Sender verify failed
+LOG: H=(test) [127.0.0.1] sender verify fail for <unknown@test.ex>: Unrouteable address
+LOG: H=(test) [127.0.0.1] F=<unknown@test.ex> rejected RCPT <userx@test.ex>: Sender verify failed

 >>> using ACL "check_recipient"
 >>> processing "require" (TESTSUITE/test-config 21)
 >>> check verify = sender
 >>> using ACL "check_recipient"
 >>> processing "require" (TESTSUITE/test-config 21)
 >>> check verify = sender


@@ -33,8 +34,8 @@ LOG: H=[127.0.0.1] F=<unknown@test.ex> rejected RCPT <userx@test.ex>: Sender ver
 >>> ----------- end verify ------------
 >>> require: condition test failed in ACL "check_recipient"
 >>> end of ACL "check_recipient": not OK
 >>> ----------- end verify ------------
 >>> require: condition test failed in ACL "check_recipient"
 >>> end of ACL "check_recipient": not OK

-LOG: H=[127.0.0.1] sender verify fail for <userx@unknown.dom.ain>: unrouteable mail domain "unknown.dom.ain"
-LOG: H=[127.0.0.1] F=<userx@unknown.dom.ain> rejected RCPT <userx@test.ex>: Sender verify failed
+LOG: H=(test) [127.0.0.1] sender verify fail for <userx@unknown.dom.ain>: unrouteable mail domain "unknown.dom.ain"
+LOG: H=(test) [127.0.0.1] F=<userx@unknown.dom.ain> rejected RCPT <userx@test.ex>: Sender verify failed

 >>> host in smtp_accept_max_nonmail_hosts? yes (matched "*")
 >>> using ACL "check_recipient"
 >>> processing "require" (TESTSUITE/test-config 21)
 >>> host in smtp_accept_max_nonmail_hosts? yes (matched "*")
 >>> using ACL "check_recipient"
 >>> processing "require" (TESTSUITE/test-config 21)


@@ -49,8 +50,8 @@ LOG: H=[127.0.0.1] F=<userx@unknown.dom.ain> rejected RCPT <userx@test.ex>: Send
 >>> ----------- end verify ------------
 >>> require: condition test failed in ACL "check_recipient"
 >>> end of ACL "check_recipient": not OK
 >>> ----------- end verify ------------
 >>> require: condition test failed in ACL "check_recipient"
 >>> end of ACL "check_recipient": not OK

-LOG: H=[127.0.0.1] sender verify fail for <"unknown with spaces"@test.ex>: Unrouteable address
-LOG: H=[127.0.0.1] F=<"unknown with spaces"@test.ex> rejected RCPT <userx@test.ex>: Sender verify failed
+LOG: H=(test) [127.0.0.1] sender verify fail for <"unknown with spaces"@test.ex>: Unrouteable address
+LOG: H=(test) [127.0.0.1] F=<"unknown with spaces"@test.ex> rejected RCPT <userx@test.ex>: Sender verify failed

 >>> using ACL "check_recipient"
 >>> processing "require" (TESTSUITE/test-config 21)
 >>> check verify = sender
 >>> using ACL "check_recipient"
 >>> processing "require" (TESTSUITE/test-config 21)
 >>> check verify = sender


@@ -84,7 +85,7 @@ LOG: H=[127.0.0.1] F=<"unknown with spaces"@test.ex> rejected RCPT <userx@test.e
 >>> no more routers
 >>> require: condition test failed in ACL "check_message"
 >>> end of ACL "check_message": not OK
 >>> no more routers
 >>> require: condition test failed in ACL "check_message"
 >>> end of ACL "check_message": not OK

-LOG: 10HmaX-0005vi-00 H=[127.0.0.1] F=<userx@test.ex> rejected after DATA: there is no valid sender in any header line
+LOG: 10HmaX-0005vi-00 H=(test) [127.0.0.1] F=<userx@test.ex> rejected after DATA: there is no valid sender in any header line

 >>> using ACL "check_recipient"
 >>> processing "require" (TESTSUITE/test-config 21)
 >>> check verify = sender
 >>> using ACL "check_recipient"
 >>> processing "require" (TESTSUITE/test-config 21)
 >>> check verify = sender


@@ -111,7 +112,7 @@ LOG: 10HmaX-0005vi-00 H=[127.0.0.1] F=<userx@test.ex> rejected after DATA: there
 >>> verifying From: header address <>
 >>> require: condition test failed in ACL "check_message"
 >>> end of ACL "check_message": not OK
 >>> verifying From: header address <>
 >>> require: condition test failed in ACL "check_message"
 >>> end of ACL "check_message": not OK

-LOG: 10HmaY-0005vi-00 H=[127.0.0.1] F=<userx@test.ex> rejected after DATA: syntax error in 'From:' header when scanning for sender: missing or malformed local part in "<>"
+LOG: 10HmaY-0005vi-00 H=(test) [127.0.0.1] F=<userx@test.ex> rejected after DATA: syntax error in 'From:' header when scanning for sender: missing or malformed local part in "<>"

 >>> using ACL "check_recipient"
 >>> processing "require" (TESTSUITE/test-config 21)
 >>> check verify = sender
 >>> using ACL "check_recipient"
 >>> processing "require" (TESTSUITE/test-config 21)
 >>> check verify = sender


@@ -125,8 +126,8 @@ LOG: 10HmaY-0005vi-00 H=[127.0.0.1] F=<userx@test.ex> rejected after DATA: synta
 >>>   message: forced defer
 >>> ----------- end verify ------------
 >>> require: condition test deferred in ACL "check_recipient"
 >>>   message: forced defer
 >>> ----------- end verify ------------
 >>> require: condition test deferred in ACL "check_recipient"

-LOG: H=[127.0.0.1] sender verify defer for <defer@test.ex>: forced defer
-LOG: H=[127.0.0.1] F=<defer@test.ex> temporarily rejected RCPT <userx@test.ex>: Could not complete sender verify
+LOG: H=(test) [127.0.0.1] sender verify defer for <defer@test.ex>: forced defer
+LOG: H=(test) [127.0.0.1] F=<defer@test.ex> temporarily rejected RCPT <userx@test.ex>: Could not complete sender verify

 >>> using ACL "check_recipient"
 >>> processing "require" (TESTSUITE/test-config 21)
 >>> check verify = sender
 >>> using ACL "check_recipient"
 >>> processing "require" (TESTSUITE/test-config 21)
 >>> check verify = sender


@@ -160,7 +161,7 @@ LOG: H=[127.0.0.1] F=<defer@test.ex> temporarily rejected RCPT <userx@test.ex>:
 >>> defer router: defer for defer@test.ex
 >>>   message: forced defer
 >>> require: condition test deferred in ACL "check_message"
 >>> defer router: defer for defer@test.ex
 >>>   message: forced defer
 >>> require: condition test deferred in ACL "check_message"

-LOG: 10HmaZ-0005vi-00 H=[127.0.0.1] F=<userx@test.ex> temporarily rejected after DATA: all attempts to verify a sender in a header line deferred
+LOG: 10HmaZ-0005vi-00 H=(test) [127.0.0.1] F=<userx@test.ex> temporarily rejected after DATA: all attempts to verify a sender in a header line deferred

 >>> host in hosts_connection_nolog? no (option unset)
 >>> host in host_lookup? no (option unset)
 >>> host in host_reject_connection? no (option unset)
 >>> host in hosts_connection_nolog? no (option unset)
 >>> host in host_lookup? no (option unset)
 >>> host in host_reject_connection? no (option unset)

diff --git a/test/stderr/0124 b/test/stderr/0124
index 82c1e47ddb0f1d3316a6054dbf76a93e93ac0cf6..a1d3cdb6ef10f2d04cac38e4031e4454dba19b2f 100644 (file)
--- a/test/stderr/0124
+++ b/test/stderr/0124
@@ -6,6 +6,7 @@
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)

+>>> test in helo_lookup_domains? no (end of list)

 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 20)
 >>> check hosts = :
 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 20)
 >>> check hosts = :


@@ -28,7 +29,7 @@ LOG: no host name found for IP address V4NET.0.0.97
 >>>   message: relay not permitted
 >>> deny: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": DENY
 >>>   message: relay not permitted
 >>> deny: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": DENY

-LOG: H=[V4NET.0.0.97] F=<userx@test.ex> rejected RCPT <userx@external.test.ex>: relay not permitted
+LOG: H=(test) [V4NET.0.0.97] F=<userx@test.ex> rejected RCPT <userx@external.test.ex>: relay not permitted

 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 20)
 >>> check hosts = :
 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 20)
 >>> check hosts = :


@@ -47,4 +48,4 @@ LOG: H=[V4NET.0.0.97] F=<userx@test.ex> rejected RCPT <userx@external.test.ex>:
 >>>   message: relay not permitted
 >>> deny: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": DENY
 >>>   message: relay not permitted
 >>> deny: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": DENY

-LOG: H=[V4NET.0.0.97] F=<userx@test.ex> rejected RCPT <userx@external.test.ex>: relay not permitted
+LOG: H=(test) [V4NET.0.0.97] F=<userx@test.ex> rejected RCPT <userx@external.test.ex>: relay not permitted

diff --git a/test/stderr/0130 b/test/stderr/0130
index c07f850abb2cca1406a29c8ad22feb698084f5fc..8ddb23e11fad54e5414b5aec058b5982bc318eaa 100644 (file)
--- a/test/stderr/0130
+++ b/test/stderr/0130
@@ -6,6 +6,7 @@
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)

+>>> test in helo_lookup_domains? no (end of list)

 >>> using ACL "check_recipient"
 >>> processing "deny" (TESTSUITE/test-config 21)
 >>>   message: unrouteable address
 >>> using ACL "check_recipient"
 >>> processing "deny" (TESTSUITE/test-config 21)
 >>>   message: unrouteable address


@@ -21,11 +22,11 @@
 MUNGED: ::1 will be omitted in what follows
 >>> get[host|ipnode]byname[2] looked up these IP addresses:
 >>>   name=localhost address=127.0.0.1
 MUNGED: ::1 will be omitted in what follows
 >>> get[host|ipnode]byname[2] looked up these IP addresses:
 >>>   name=localhost address=127.0.0.1

-LOG: remote host address is the local host: not.test.ex (while verifying <userx@not.test.ex> from host [V4NET.0.0.0])
+LOG: remote host address is the local host: not.test.ex (while verifying <userx@not.test.ex> from host (test) [V4NET.0.0.0])

 >>> islocal router: defer for userx@not.test.ex
 >>>   message: remote host address is the local host
 >>> ----------- end verify ------------
 >>> deny: condition test deferred in ACL "check_recipient"
 >>> islocal router: defer for userx@not.test.ex
 >>>   message: remote host address is the local host
 >>> ----------- end verify ------------
 >>> deny: condition test deferred in ACL "check_recipient"

-LOG: H=[V4NET.0.0.0] F=<userx@test.ex> temporarily rejected RCPT <userx@not.test.ex>: remote host address is the local host
+LOG: H=(test) [V4NET.0.0.0] F=<userx@test.ex> temporarily rejected RCPT <userx@not.test.ex>: remote host address is the local host

 LOG: MAIN
   remote host address is the local host: not.test.ex (while routing <userx@not.test.ex>)
 LOG: MAIN
   remote host address is the local host: not.test.ex (while routing <userx@not.test.ex>)

diff --git a/test/stderr/0139 b/test/stderr/0139
index eb73157706ea0588e6602605792539bb5753d27a..66331324656e640ae4ebe60ccb3d8f2ca3f937ed 100644 (file)
--- a/test/stderr/0139
+++ b/test/stderr/0139
@@ -6,8 +6,9 @@
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)

+>>> host in hosts_require_helo? no (end of list)

 >>> using ACL "check_mail"
 >>> using ACL "check_mail"

->>> processing "warn" (TESTSUITE/test-config 37)
+>>> processing "warn" (TESTSUITE/test-config 38)

 >>> check dnslists = rbl4.test.ex&0.0.0.6
 >>> dnslists check: rbl4.test.ex&0.0.0.6
 >>> new DNS lookup for 14.12.11.V4NET.rbl4.test.ex
 >>> check dnslists = rbl4.test.ex&0.0.0.6
 >>> dnslists check: rbl4.test.ex&0.0.0.6
 >>> new DNS lookup for 14.12.11.V4NET.rbl4.test.ex


@@ -15,32 +16,32 @@
 >>> DNS lookup for 14.12.11.V4NET.rbl4.test.ex failed
 >>> => that means V4NET.11.12.14 is not listed at rbl4.test.ex
 >>> warn: condition test failed in ACL "check_mail"
 >>> DNS lookup for 14.12.11.V4NET.rbl4.test.ex failed
 >>> => that means V4NET.11.12.14 is not listed at rbl4.test.ex
 >>> warn: condition test failed in ACL "check_mail"

->>> processing "warn" (TESTSUITE/test-config 38)
+>>> processing "warn" (TESTSUITE/test-config 39)

 >>> check dnslists = rbl4.test.ex&127.0.0.3
 >>> dnslists check: rbl4.test.ex&127.0.0.3
 >>> dnslists: using result of previous lookup
 >>> DNS lookup for 14.12.11.V4NET.rbl4.test.ex failed
 >>> => that means V4NET.11.12.14 is not listed at rbl4.test.ex
 >>> warn: condition test failed in ACL "check_mail"
 >>> check dnslists = rbl4.test.ex&127.0.0.3
 >>> dnslists check: rbl4.test.ex&127.0.0.3
 >>> dnslists: using result of previous lookup
 >>> DNS lookup for 14.12.11.V4NET.rbl4.test.ex failed
 >>> => that means V4NET.11.12.14 is not listed at rbl4.test.ex
 >>> warn: condition test failed in ACL "check_mail"

->>> processing "warn" (TESTSUITE/test-config 39)
+>>> processing "warn" (TESTSUITE/test-config 40)

 >>> check dnslists = rbl4.test.ex!&0.0.0.7
 >>> dnslists check: rbl4.test.ex!&0.0.0.7
 >>> dnslists: using result of previous lookup
 >>> DNS lookup for 14.12.11.V4NET.rbl4.test.ex failed
 >>> => that means V4NET.11.12.14 is not listed at rbl4.test.ex
 >>> warn: condition test failed in ACL "check_mail"
 >>> check dnslists = rbl4.test.ex!&0.0.0.7
 >>> dnslists check: rbl4.test.ex!&0.0.0.7
 >>> dnslists: using result of previous lookup
 >>> DNS lookup for 14.12.11.V4NET.rbl4.test.ex failed
 >>> => that means V4NET.11.12.14 is not listed at rbl4.test.ex
 >>> warn: condition test failed in ACL "check_mail"

->>> processing "warn" (TESTSUITE/test-config 41)
+>>> processing "warn" (TESTSUITE/test-config 42)

 >>> check dnslists = rbl5.test.ex,rbl4.test.ex=127.0.0.128
 >>> dnslists check: rbl5.test.ex,rbl4.test.ex=127.0.0.128
 >>> dnslists: using result of previous lookup
 >>> DNS lookup for 14.12.11.V4NET.rbl4.test.ex failed
 >>> => that means V4NET.11.12.14 is not listed at rbl4.test.ex
 >>> warn: condition test failed in ACL "check_mail"
 >>> check dnslists = rbl5.test.ex,rbl4.test.ex=127.0.0.128
 >>> dnslists check: rbl5.test.ex,rbl4.test.ex=127.0.0.128
 >>> dnslists: using result of previous lookup
 >>> DNS lookup for 14.12.11.V4NET.rbl4.test.ex failed
 >>> => that means V4NET.11.12.14 is not listed at rbl4.test.ex
 >>> warn: condition test failed in ACL "check_mail"

->>> processing "accept" (TESTSUITE/test-config 43)
+>>> processing "accept" (TESTSUITE/test-config 44)

 >>> accept: condition test succeeded in ACL "check_mail"
 >>> end of ACL "check_mail": ACCEPT
 >>> using ACL "check_recipient"
 >>> accept: condition test succeeded in ACL "check_mail"
 >>> end of ACL "check_mail": ACCEPT
 >>> using ACL "check_recipient"

->>> processing "warn" (TESTSUITE/test-config 47)
+>>> processing "warn" (TESTSUITE/test-config 48)

 >>>   message: X-Warn: host is listed in $dnslist_domain but not =127.0.0.3${if def:dnslist_text{\n  $dnslist_text}}
 >>> check dnslists = rbl3.test.ex!=127.0.0.3
 >>> dnslists check: rbl3.test.ex!=127.0.0.3
 >>>   message: X-Warn: host is listed in $dnslist_domain but not =127.0.0.3${if def:dnslist_text{\n  $dnslist_text}}
 >>> check dnslists = rbl3.test.ex!=127.0.0.3
 >>> dnslists check: rbl3.test.ex!=127.0.0.3


@@ -49,7 +50,7 @@
 >>> DNS lookup for 14.12.11.V4NET.rbl3.test.ex succeeded (yielding 127.0.0.2)
 >>> => that means V4NET.11.12.14 is listed at rbl3.test.ex
 >>> warn: condition test succeeded in ACL "check_recipient"
 >>> DNS lookup for 14.12.11.V4NET.rbl3.test.ex succeeded (yielding 127.0.0.2)
 >>> => that means V4NET.11.12.14 is listed at rbl3.test.ex
 >>> warn: condition test succeeded in ACL "check_recipient"

->>> processing "deny" (TESTSUITE/test-config 50)
+>>> processing "deny" (TESTSUITE/test-config 51)

 >>>   message: host is listed in $dnslist_domain with value 127.0.0.3${if def:dnslist_text{\n$dnslist_text}}
 >>> check dnslists = rbl3.test.ex=127.0.0.3
 >>> dnslists check: rbl3.test.ex=127.0.0.3
 >>>   message: host is listed in $dnslist_domain with value 127.0.0.3${if def:dnslist_text{\n$dnslist_text}}
 >>> check dnslists = rbl3.test.ex=127.0.0.3
 >>> dnslists check: rbl3.test.ex=127.0.0.3


@@ -58,7 +59,7 @@
 >>> => but we are not accepting this block class because
 >>> => there was no match for =127.0.0.3
 >>> deny: condition test failed in ACL "check_recipient"
 >>> => but we are not accepting this block class because
 >>> => there was no match for =127.0.0.3
 >>> deny: condition test failed in ACL "check_recipient"

->>> processing "require" (TESTSUITE/test-config 52)
+>>> processing "require" (TESTSUITE/test-config 53)

 >>> check verify = sender
 >>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 >>> routing postmaster@exim.test.ex
 >>> check verify = sender
 >>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 >>> routing postmaster@exim.test.ex


@@ -73,7 +74,7 @@
 >>> routed by localuser router
 >>> ----------- end verify ------------
 >>> require: condition test succeeded in ACL "check_recipient"
 >>> routed by localuser router
 >>> ----------- end verify ------------
 >>> require: condition test succeeded in ACL "check_recipient"

->>> processing "deny" (TESTSUITE/test-config 53)
+>>> processing "deny" (TESTSUITE/test-config 54)

 >>>   message: unrouteable address
 >>> check !verify = recipient
 >>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 >>>   message: unrouteable address
 >>> check !verify = recipient
 >>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>


@@ -85,14 +86,14 @@
 >>> routed by localuser router
 >>> ----------- end verify ------------
 >>> deny: condition test failed in ACL "check_recipient"
 >>> routed by localuser router
 >>> ----------- end verify ------------
 >>> deny: condition test failed in ACL "check_recipient"

->>> processing "accept" (TESTSUITE/test-config 55)
+>>> processing "accept" (TESTSUITE/test-config 56)

 >>> check domains = +local_domains
 >>> exim.test.ex in "exim.test.ex"? yes (matched "exim.test.ex")
 >>> exim.test.ex in "+local_domains"? yes (matched "+local_domains")
 >>> accept: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": ACCEPT
 >>> using ACL "check_recipient"
 >>> check domains = +local_domains
 >>> exim.test.ex in "exim.test.ex"? yes (matched "exim.test.ex")
 >>> exim.test.ex in "+local_domains"? yes (matched "+local_domains")
 >>> accept: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": ACCEPT
 >>> using ACL "check_recipient"

->>> processing "warn" (TESTSUITE/test-config 47)
+>>> processing "warn" (TESTSUITE/test-config 48)

 >>>   message: X-Warn: host is listed in $dnslist_domain but not =127.0.0.3${if def:dnslist_text{\n  $dnslist_text}}
 >>> check dnslists = rbl3.test.ex!=127.0.0.3
 >>> dnslists check: rbl3.test.ex!=127.0.0.3
 >>>   message: X-Warn: host is listed in $dnslist_domain but not =127.0.0.3${if def:dnslist_text{\n  $dnslist_text}}
 >>> check dnslists = rbl3.test.ex!=127.0.0.3
 >>> dnslists check: rbl3.test.ex!=127.0.0.3


@@ -100,7 +101,7 @@
 >>> DNS lookup for 14.12.11.V4NET.rbl3.test.ex succeeded (yielding 127.0.0.2)
 >>> => that means V4NET.11.12.14 is listed at rbl3.test.ex
 >>> warn: condition test succeeded in ACL "check_recipient"
 >>> DNS lookup for 14.12.11.V4NET.rbl3.test.ex succeeded (yielding 127.0.0.2)
 >>> => that means V4NET.11.12.14 is listed at rbl3.test.ex
 >>> warn: condition test succeeded in ACL "check_recipient"

->>> processing "deny" (TESTSUITE/test-config 50)
+>>> processing "deny" (TESTSUITE/test-config 51)

 >>>   message: host is listed in $dnslist_domain with value 127.0.0.3${if def:dnslist_text{\n$dnslist_text}}
 >>> check dnslists = rbl3.test.ex=127.0.0.3
 >>> dnslists check: rbl3.test.ex=127.0.0.3
 >>>   message: host is listed in $dnslist_domain with value 127.0.0.3${if def:dnslist_text{\n$dnslist_text}}
 >>> check dnslists = rbl3.test.ex=127.0.0.3
 >>> dnslists check: rbl3.test.ex=127.0.0.3


@@ -109,11 +110,11 @@
 >>> => but we are not accepting this block class because
 >>> => there was no match for =127.0.0.3
 >>> deny: condition test failed in ACL "check_recipient"
 >>> => but we are not accepting this block class because
 >>> => there was no match for =127.0.0.3
 >>> deny: condition test failed in ACL "check_recipient"

->>> processing "require" (TESTSUITE/test-config 52)
+>>> processing "require" (TESTSUITE/test-config 53)

 >>> check verify = sender
 >>> using cached sender verify result
 >>> require: condition test succeeded in ACL "check_recipient"
 >>> check verify = sender
 >>> using cached sender verify result
 >>> require: condition test succeeded in ACL "check_recipient"

->>> processing "deny" (TESTSUITE/test-config 53)
+>>> processing "deny" (TESTSUITE/test-config 54)

 >>>   message: unrouteable address
 >>> check !verify = recipient
 >>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 >>>   message: unrouteable address
 >>> check !verify = recipient
 >>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>


@@ -122,7 +123,7 @@
 >>> routed by system_aliases router
 >>> ----------- end verify ------------
 >>> deny: condition test failed in ACL "check_recipient"
 >>> routed by system_aliases router
 >>> ----------- end verify ------------
 >>> deny: condition test failed in ACL "check_recipient"

->>> processing "accept" (TESTSUITE/test-config 55)
+>>> processing "accept" (TESTSUITE/test-config 56)

 >>> check domains = +local_domains
 >>> exim.test.ex in "exim.test.ex"? yes (matched "exim.test.ex")
 >>> exim.test.ex in "+local_domains"? yes (matched "+local_domains")
 >>> check domains = +local_domains
 >>> exim.test.ex in "exim.test.ex"? yes (matched "exim.test.ex")
 >>> exim.test.ex in "+local_domains"? yes (matched "+local_domains")


@@ -138,8 +139,9 @@ LOG: 10HmaY-0005vi-00 <= postmaster@exim.test.ex H=[V4NET.11.12.14] P=smtp S=sss
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)

+>>> host in hosts_require_helo? no (end of list)

 >>> using ACL "check_mail"
 >>> using ACL "check_mail"

->>> processing "warn" (TESTSUITE/test-config 37)
+>>> processing "warn" (TESTSUITE/test-config 38)

 >>> check dnslists = rbl4.test.ex&0.0.0.6
 >>> dnslists check: rbl4.test.ex&0.0.0.6
 >>> new DNS lookup for 15.12.11.V4NET.rbl4.test.ex
 >>> check dnslists = rbl4.test.ex&0.0.0.6
 >>> dnslists check: rbl4.test.ex&0.0.0.6
 >>> new DNS lookup for 15.12.11.V4NET.rbl4.test.ex


@@ -147,32 +149,32 @@ LOG: 10HmaY-0005vi-00 <= postmaster@exim.test.ex H=[V4NET.11.12.14] P=smtp S=sss
 >>> DNS lookup for 15.12.11.V4NET.rbl4.test.ex failed
 >>> => that means V4NET.11.12.15 is not listed at rbl4.test.ex
 >>> warn: condition test failed in ACL "check_mail"
 >>> DNS lookup for 15.12.11.V4NET.rbl4.test.ex failed
 >>> => that means V4NET.11.12.15 is not listed at rbl4.test.ex
 >>> warn: condition test failed in ACL "check_mail"

->>> processing "warn" (TESTSUITE/test-config 38)
+>>> processing "warn" (TESTSUITE/test-config 39)

 >>> check dnslists = rbl4.test.ex&127.0.0.3
 >>> dnslists check: rbl4.test.ex&127.0.0.3
 >>> dnslists: using result of previous lookup
 >>> DNS lookup for 15.12.11.V4NET.rbl4.test.ex failed
 >>> => that means V4NET.11.12.15 is not listed at rbl4.test.ex
 >>> warn: condition test failed in ACL "check_mail"
 >>> check dnslists = rbl4.test.ex&127.0.0.3
 >>> dnslists check: rbl4.test.ex&127.0.0.3
 >>> dnslists: using result of previous lookup
 >>> DNS lookup for 15.12.11.V4NET.rbl4.test.ex failed
 >>> => that means V4NET.11.12.15 is not listed at rbl4.test.ex
 >>> warn: condition test failed in ACL "check_mail"

->>> processing "warn" (TESTSUITE/test-config 39)
+>>> processing "warn" (TESTSUITE/test-config 40)

 >>> check dnslists = rbl4.test.ex!&0.0.0.7
 >>> dnslists check: rbl4.test.ex!&0.0.0.7
 >>> dnslists: using result of previous lookup
 >>> DNS lookup for 15.12.11.V4NET.rbl4.test.ex failed
 >>> => that means V4NET.11.12.15 is not listed at rbl4.test.ex
 >>> warn: condition test failed in ACL "check_mail"
 >>> check dnslists = rbl4.test.ex!&0.0.0.7
 >>> dnslists check: rbl4.test.ex!&0.0.0.7
 >>> dnslists: using result of previous lookup
 >>> DNS lookup for 15.12.11.V4NET.rbl4.test.ex failed
 >>> => that means V4NET.11.12.15 is not listed at rbl4.test.ex
 >>> warn: condition test failed in ACL "check_mail"

->>> processing "warn" (TESTSUITE/test-config 41)
+>>> processing "warn" (TESTSUITE/test-config 42)

 >>> check dnslists = rbl5.test.ex,rbl4.test.ex=127.0.0.128
 >>> dnslists check: rbl5.test.ex,rbl4.test.ex=127.0.0.128
 >>> dnslists: using result of previous lookup
 >>> DNS lookup for 15.12.11.V4NET.rbl4.test.ex failed
 >>> => that means V4NET.11.12.15 is not listed at rbl4.test.ex
 >>> warn: condition test failed in ACL "check_mail"
 >>> check dnslists = rbl5.test.ex,rbl4.test.ex=127.0.0.128
 >>> dnslists check: rbl5.test.ex,rbl4.test.ex=127.0.0.128
 >>> dnslists: using result of previous lookup
 >>> DNS lookup for 15.12.11.V4NET.rbl4.test.ex failed
 >>> => that means V4NET.11.12.15 is not listed at rbl4.test.ex
 >>> warn: condition test failed in ACL "check_mail"

->>> processing "accept" (TESTSUITE/test-config 43)
+>>> processing "accept" (TESTSUITE/test-config 44)

 >>> accept: condition test succeeded in ACL "check_mail"
 >>> end of ACL "check_mail": ACCEPT
 >>> using ACL "check_recipient"
 >>> accept: condition test succeeded in ACL "check_mail"
 >>> end of ACL "check_mail": ACCEPT
 >>> using ACL "check_recipient"

->>> processing "warn" (TESTSUITE/test-config 47)
+>>> processing "warn" (TESTSUITE/test-config 48)

 >>>   message: X-Warn: host is listed in $dnslist_domain but not =127.0.0.3${if def:dnslist_text{\n  $dnslist_text}}
 >>> check dnslists = rbl3.test.ex!=127.0.0.3
 >>> dnslists check: rbl3.test.ex!=127.0.0.3
 >>>   message: X-Warn: host is listed in $dnslist_domain but not =127.0.0.3${if def:dnslist_text{\n  $dnslist_text}}
 >>> check dnslists = rbl3.test.ex!=127.0.0.3
 >>> dnslists check: rbl3.test.ex!=127.0.0.3


@@ -182,7 +184,7 @@ LOG: 10HmaY-0005vi-00 <= postmaster@exim.test.ex H=[V4NET.11.12.14] P=smtp S=sss
 >>> => but we are not accepting this block class because
 >>> => there was an exclude match for =127.0.0.3
 >>> warn: condition test failed in ACL "check_recipient"
 >>> => but we are not accepting this block class because
 >>> => there was an exclude match for =127.0.0.3
 >>> warn: condition test failed in ACL "check_recipient"

->>> processing "deny" (TESTSUITE/test-config 50)
+>>> processing "deny" (TESTSUITE/test-config 51)

 >>>   message: host is listed in $dnslist_domain with value 127.0.0.3${if def:dnslist_text{\n$dnslist_text}}
 >>> check dnslists = rbl3.test.ex=127.0.0.3
 >>> dnslists check: rbl3.test.ex=127.0.0.3
 >>>   message: host is listed in $dnslist_domain with value 127.0.0.3${if def:dnslist_text{\n$dnslist_text}}
 >>> check dnslists = rbl3.test.ex=127.0.0.3
 >>> dnslists check: rbl3.test.ex=127.0.0.3


@@ -200,8 +202,9 @@ LOG: H=[V4NET.11.12.15] F=<postmaster@exim.test.ex> rejected RCPT <userx@exim.te
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)

+>>> host in hosts_require_helo? no (end of list)

 >>> using ACL "check_mail"
 >>> using ACL "check_mail"

->>> processing "warn" (TESTSUITE/test-config 37)
+>>> processing "warn" (TESTSUITE/test-config 38)

 >>> check dnslists = rbl4.test.ex&0.0.0.6
 >>> dnslists check: rbl4.test.ex&0.0.0.6
 >>> new DNS lookup for 20.12.11.V4NET.rbl4.test.ex
 >>> check dnslists = rbl4.test.ex&0.0.0.6
 >>> dnslists check: rbl4.test.ex&0.0.0.6
 >>> new DNS lookup for 20.12.11.V4NET.rbl4.test.ex


@@ -209,7 +212,7 @@ LOG: H=[V4NET.11.12.15] F=<postmaster@exim.test.ex> rejected RCPT <userx@exim.te
 >>> DNS lookup for 20.12.11.V4NET.rbl4.test.ex succeeded (yielding 127.0.0.6)
 >>> => that means V4NET.11.12.20 is listed at rbl4.test.ex
 >>> warn: condition test succeeded in ACL "check_mail"
 >>> DNS lookup for 20.12.11.V4NET.rbl4.test.ex succeeded (yielding 127.0.0.6)
 >>> => that means V4NET.11.12.20 is listed at rbl4.test.ex
 >>> warn: condition test succeeded in ACL "check_mail"

->>> processing "warn" (TESTSUITE/test-config 38)
+>>> processing "warn" (TESTSUITE/test-config 39)

 >>> check dnslists = rbl4.test.ex&127.0.0.3
 >>> dnslists check: rbl4.test.ex&127.0.0.3
 >>> dnslists: using result of previous lookup
 >>> check dnslists = rbl4.test.ex&127.0.0.3
 >>> dnslists check: rbl4.test.ex&127.0.0.3
 >>> dnslists: using result of previous lookup


@@ -217,7 +220,7 @@ LOG: H=[V4NET.11.12.15] F=<postmaster@exim.test.ex> rejected RCPT <userx@exim.te
 >>> => but we are not accepting this block class because
 >>> => there was no match for &127.0.0.3
 >>> warn: condition test failed in ACL "check_mail"
 >>> => but we are not accepting this block class because
 >>> => there was no match for &127.0.0.3
 >>> warn: condition test failed in ACL "check_mail"

->>> processing "warn" (TESTSUITE/test-config 39)
+>>> processing "warn" (TESTSUITE/test-config 40)

 >>> check dnslists = rbl4.test.ex!&0.0.0.7
 >>> dnslists check: rbl4.test.ex!&0.0.0.7
 >>> dnslists: using result of previous lookup
 >>> check dnslists = rbl4.test.ex!&0.0.0.7
 >>> dnslists check: rbl4.test.ex!&0.0.0.7
 >>> dnslists: using result of previous lookup


@@ -226,7 +229,7 @@ LOG: H=[V4NET.11.12.15] F=<postmaster@exim.test.ex> rejected RCPT <userx@exim.te
 >>> check add_header = DNSlist: $dnslist_domain $dnslist_text $dnslist_matched
 >>>                  = DNSlist: rbl4.test.ex  V4NET.11.12.20
 >>> warn: condition test succeeded in ACL "check_mail"
 >>> check add_header = DNSlist: $dnslist_domain $dnslist_text $dnslist_matched
 >>>                  = DNSlist: rbl4.test.ex  V4NET.11.12.20
 >>> warn: condition test succeeded in ACL "check_mail"

->>> processing "warn" (TESTSUITE/test-config 41)
+>>> processing "warn" (TESTSUITE/test-config 42)

 >>> check dnslists = rbl5.test.ex,rbl4.test.ex=127.0.0.128
 >>> dnslists check: rbl5.test.ex,rbl4.test.ex=127.0.0.128
 >>> dnslists: using result of previous lookup
 >>> check dnslists = rbl5.test.ex,rbl4.test.ex=127.0.0.128
 >>> dnslists check: rbl5.test.ex,rbl4.test.ex=127.0.0.128
 >>> dnslists: using result of previous lookup


@@ -234,7 +237,7 @@ LOG: H=[V4NET.11.12.15] F=<postmaster@exim.test.ex> rejected RCPT <userx@exim.te
 >>> => but we are not accepting this block class because
 >>> => there was no match for =127.0.0.128
 >>> warn: condition test failed in ACL "check_mail"
 >>> => but we are not accepting this block class because
 >>> => there was no match for =127.0.0.128
 >>> warn: condition test failed in ACL "check_mail"

->>> processing "accept" (TESTSUITE/test-config 43)
+>>> processing "accept" (TESTSUITE/test-config 44)

 >>> accept: condition test succeeded in ACL "check_mail"
 >>> end of ACL "check_mail": ACCEPT
 >>> host in hosts_connection_nolog? no (option unset)
 >>> accept: condition test succeeded in ACL "check_mail"
 >>> end of ACL "check_mail": ACCEPT
 >>> host in hosts_connection_nolog? no (option unset)


@@ -245,8 +248,9 @@ LOG: H=[V4NET.11.12.15] F=<postmaster@exim.test.ex> rejected RCPT <userx@exim.te
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)

+>>> host in hosts_require_helo? no (end of list)

 >>> using ACL "check_mail"
 >>> using ACL "check_mail"

->>> processing "warn" (TESTSUITE/test-config 37)
+>>> processing "warn" (TESTSUITE/test-config 38)

 >>> check dnslists = rbl4.test.ex&0.0.0.6
 >>> dnslists check: rbl4.test.ex&0.0.0.6
 >>> new DNS lookup for 21.12.11.V4NET.rbl4.test.ex
 >>> check dnslists = rbl4.test.ex&0.0.0.6
 >>> dnslists check: rbl4.test.ex&0.0.0.6
 >>> new DNS lookup for 21.12.11.V4NET.rbl4.test.ex


@@ -254,14 +258,14 @@ LOG: H=[V4NET.11.12.15] F=<postmaster@exim.test.ex> rejected RCPT <userx@exim.te
 >>> DNS lookup for 21.12.11.V4NET.rbl4.test.ex succeeded (yielding 127.0.0.7)
 >>> => that means V4NET.11.12.21 is listed at rbl4.test.ex
 >>> warn: condition test succeeded in ACL "check_mail"
 >>> DNS lookup for 21.12.11.V4NET.rbl4.test.ex succeeded (yielding 127.0.0.7)
 >>> => that means V4NET.11.12.21 is listed at rbl4.test.ex
 >>> warn: condition test succeeded in ACL "check_mail"

->>> processing "warn" (TESTSUITE/test-config 38)
+>>> processing "warn" (TESTSUITE/test-config 39)

 >>> check dnslists = rbl4.test.ex&127.0.0.3
 >>> dnslists check: rbl4.test.ex&127.0.0.3
 >>> dnslists: using result of previous lookup
 >>> DNS lookup for 21.12.11.V4NET.rbl4.test.ex succeeded (yielding 127.0.0.7)
 >>> => that means V4NET.11.12.21 is listed at rbl4.test.ex
 >>> warn: condition test succeeded in ACL "check_mail"
 >>> check dnslists = rbl4.test.ex&127.0.0.3
 >>> dnslists check: rbl4.test.ex&127.0.0.3
 >>> dnslists: using result of previous lookup
 >>> DNS lookup for 21.12.11.V4NET.rbl4.test.ex succeeded (yielding 127.0.0.7)
 >>> => that means V4NET.11.12.21 is listed at rbl4.test.ex
 >>> warn: condition test succeeded in ACL "check_mail"

->>> processing "warn" (TESTSUITE/test-config 39)
+>>> processing "warn" (TESTSUITE/test-config 40)

 >>> check dnslists = rbl4.test.ex!&0.0.0.7
 >>> dnslists check: rbl4.test.ex!&0.0.0.7
 >>> dnslists: using result of previous lookup
 >>> check dnslists = rbl4.test.ex!&0.0.0.7
 >>> dnslists check: rbl4.test.ex!&0.0.0.7
 >>> dnslists: using result of previous lookup


@@ -269,7 +273,7 @@ LOG: H=[V4NET.11.12.15] F=<postmaster@exim.test.ex> rejected RCPT <userx@exim.te
 >>> => but we are not accepting this block class because
 >>> => there was an exclude match for &0.0.0.7
 >>> warn: condition test failed in ACL "check_mail"
 >>> => but we are not accepting this block class because
 >>> => there was an exclude match for &0.0.0.7
 >>> warn: condition test failed in ACL "check_mail"

->>> processing "warn" (TESTSUITE/test-config 41)
+>>> processing "warn" (TESTSUITE/test-config 42)

 >>> check dnslists = rbl5.test.ex,rbl4.test.ex=127.0.0.128
 >>> dnslists check: rbl5.test.ex,rbl4.test.ex=127.0.0.128
 >>> dnslists: using result of previous lookup
 >>> check dnslists = rbl5.test.ex,rbl4.test.ex=127.0.0.128
 >>> dnslists check: rbl5.test.ex,rbl4.test.ex=127.0.0.128
 >>> dnslists: using result of previous lookup


@@ -277,7 +281,7 @@ LOG: H=[V4NET.11.12.15] F=<postmaster@exim.test.ex> rejected RCPT <userx@exim.te
 >>> => but we are not accepting this block class because
 >>> => there was no match for =127.0.0.128
 >>> warn: condition test failed in ACL "check_mail"
 >>> => but we are not accepting this block class because
 >>> => there was no match for =127.0.0.128
 >>> warn: condition test failed in ACL "check_mail"

->>> processing "accept" (TESTSUITE/test-config 43)
+>>> processing "accept" (TESTSUITE/test-config 44)

 >>> accept: condition test succeeded in ACL "check_mail"
 >>> end of ACL "check_mail": ACCEPT
 >>> host in hosts_connection_nolog? no (option unset)
 >>> accept: condition test succeeded in ACL "check_mail"
 >>> end of ACL "check_mail": ACCEPT
 >>> host in hosts_connection_nolog? no (option unset)


@@ -290,7 +294,7 @@ LOG: H=[V4NET.11.12.15] F=<postmaster@exim.test.ex> rejected RCPT <userx@exim.te
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> a.b in helo_lookup_domains? no (end of list)
 >>> using ACL "check_helo"
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> a.b in helo_lookup_domains? no (end of list)
 >>> using ACL "check_helo"

->>> processing "warn" (TESTSUITE/test-config 21)
+>>> processing "warn" (TESTSUITE/test-config 22)

 >>> check dnslists = rbl2.test.ex!=127.0.0.3 : rbl3.test.ex=127.0.0.3
 >>> dnslists check: rbl2.test.ex!=127.0.0.3
 >>> new DNS lookup for 15.12.11.V4NET.rbl2.test.ex
 >>> check dnslists = rbl2.test.ex!=127.0.0.3 : rbl3.test.ex=127.0.0.3
 >>> dnslists check: rbl2.test.ex!=127.0.0.3
 >>> new DNS lookup for 15.12.11.V4NET.rbl2.test.ex


@@ -303,7 +307,7 @@ LOG: H=[V4NET.11.12.15] F=<postmaster@exim.test.ex> rejected RCPT <userx@exim.te
 >>> DNS lookup for 15.12.11.V4NET.rbl3.test.ex succeeded (yielding 127.0.0.3)
 >>> => that means V4NET.11.12.15 is listed at rbl3.test.ex
 >>> warn: condition test succeeded in ACL "check_helo"
 >>> DNS lookup for 15.12.11.V4NET.rbl3.test.ex succeeded (yielding 127.0.0.3)
 >>> => that means V4NET.11.12.15 is listed at rbl3.test.ex
 >>> warn: condition test succeeded in ACL "check_helo"

->>> processing "accept" (TESTSUITE/test-config 22)
+>>> processing "accept" (TESTSUITE/test-config 23)

 >>> accept: condition test succeeded in ACL "check_helo"
 >>> end of ACL "check_helo": ACCEPT
 >>> host in hosts_connection_nolog? no (option unset)
 >>> accept: condition test succeeded in ACL "check_helo"
 >>> end of ACL "check_helo": ACCEPT
 >>> host in hosts_connection_nolog? no (option unset)


@@ -316,7 +320,7 @@ LOG: H=[V4NET.11.12.15] F=<postmaster@exim.test.ex> rejected RCPT <userx@exim.te
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> host in smtp_accept_max_nonmail_hosts? yes (matched "*")
 >>> using ACL "check_vrfy"
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> host in smtp_accept_max_nonmail_hosts? yes (matched "*")
 >>> using ACL "check_vrfy"

->>> processing "warn" (TESTSUITE/test-config 25)
+>>> processing "warn" (TESTSUITE/test-config 26)

 >>> check dnslists = rbl.test.ex=127.0.0.1
 >>> dnslists check: rbl.test.ex=127.0.0.1
 >>> new DNS lookup for 2.13.13.V4NET.rbl.test.ex
 >>> check dnslists = rbl.test.ex=127.0.0.1
 >>> dnslists check: rbl.test.ex=127.0.0.1
 >>> new DNS lookup for 2.13.13.V4NET.rbl.test.ex


@@ -324,7 +328,7 @@ LOG: H=[V4NET.11.12.15] F=<postmaster@exim.test.ex> rejected RCPT <userx@exim.te
 >>> DNS lookup for 2.13.13.V4NET.rbl.test.ex succeeded (yielding 127.0.0.1, 127.0.0.2)
 >>> => that means V4NET.13.13.2 is listed at rbl.test.ex
 >>> warn: condition test succeeded in ACL "check_vrfy"
 >>> DNS lookup for 2.13.13.V4NET.rbl.test.ex succeeded (yielding 127.0.0.1, 127.0.0.2)
 >>> => that means V4NET.13.13.2 is listed at rbl.test.ex
 >>> warn: condition test succeeded in ACL "check_vrfy"

->>> processing "warn" (TESTSUITE/test-config 26)
+>>> processing "warn" (TESTSUITE/test-config 27)

 >>> check dnslists = rbl.test.ex!=127.0.0.1
 >>> dnslists check: rbl.test.ex!=127.0.0.1
 >>> dnslists: using result of previous lookup
 >>> check dnslists = rbl.test.ex!=127.0.0.1
 >>> dnslists check: rbl.test.ex!=127.0.0.1
 >>> dnslists: using result of previous lookup


@@ -332,14 +336,14 @@ LOG: H=[V4NET.11.12.15] F=<postmaster@exim.test.ex> rejected RCPT <userx@exim.te
 >>> => but we are not accepting this block class because
 >>> => there was an exclude match for =127.0.0.1
 >>> warn: condition test failed in ACL "check_vrfy"
 >>> => but we are not accepting this block class because
 >>> => there was an exclude match for =127.0.0.1
 >>> warn: condition test failed in ACL "check_vrfy"

->>> processing "warn" (TESTSUITE/test-config 27)
+>>> processing "warn" (TESTSUITE/test-config 28)

 >>> check dnslists = rbl.test.ex!=127.0.0.3
 >>> dnslists check: rbl.test.ex!=127.0.0.3
 >>> dnslists: using result of previous lookup
 >>> DNS lookup for 2.13.13.V4NET.rbl.test.ex succeeded (yielding 127.0.0.1, 127.0.0.2)
 >>> => that means V4NET.13.13.2 is listed at rbl.test.ex
 >>> warn: condition test succeeded in ACL "check_vrfy"
 >>> check dnslists = rbl.test.ex!=127.0.0.3
 >>> dnslists check: rbl.test.ex!=127.0.0.3
 >>> dnslists: using result of previous lookup
 >>> DNS lookup for 2.13.13.V4NET.rbl.test.ex succeeded (yielding 127.0.0.1, 127.0.0.2)
 >>> => that means V4NET.13.13.2 is listed at rbl.test.ex
 >>> warn: condition test succeeded in ACL "check_vrfy"

->>> processing "warn" (TESTSUITE/test-config 28)
+>>> processing "warn" (TESTSUITE/test-config 29)

 >>> check dnslists = rbl.test.ex==127.0.0.1
 >>> dnslists check: rbl.test.ex==127.0.0.1
 >>> dnslists: using result of previous lookup
 >>> check dnslists = rbl.test.ex==127.0.0.1
 >>> dnslists check: rbl.test.ex==127.0.0.1
 >>> dnslists: using result of previous lookup


@@ -347,28 +351,28 @@ LOG: H=[V4NET.11.12.15] F=<postmaster@exim.test.ex> rejected RCPT <userx@exim.te
 >>> => but we are not accepting this block class because
 >>> => there was an IP address that did not match for ==127.0.0.1
 >>> warn: condition test failed in ACL "check_vrfy"
 >>> => but we are not accepting this block class because
 >>> => there was an IP address that did not match for ==127.0.0.1
 >>> warn: condition test failed in ACL "check_vrfy"

->>> processing "warn" (TESTSUITE/test-config 29)
+>>> processing "warn" (TESTSUITE/test-config 30)

 >>> check dnslists = rbl.test.ex==127.0.0.1,127.0.0.2
 >>> dnslists check: rbl.test.ex==127.0.0.1,127.0.0.2
 >>> dnslists: using result of previous lookup
 >>> DNS lookup for 2.13.13.V4NET.rbl.test.ex succeeded (yielding 127.0.0.1, 127.0.0.2)
 >>> => that means V4NET.13.13.2 is listed at rbl.test.ex
 >>> warn: condition test succeeded in ACL "check_vrfy"
 >>> check dnslists = rbl.test.ex==127.0.0.1,127.0.0.2
 >>> dnslists check: rbl.test.ex==127.0.0.1,127.0.0.2
 >>> dnslists: using result of previous lookup
 >>> DNS lookup for 2.13.13.V4NET.rbl.test.ex succeeded (yielding 127.0.0.1, 127.0.0.2)
 >>> => that means V4NET.13.13.2 is listed at rbl.test.ex
 >>> warn: condition test succeeded in ACL "check_vrfy"

->>> processing "warn" (TESTSUITE/test-config 30)
+>>> processing "warn" (TESTSUITE/test-config 31)

 >>> check dnslists = rbl.test.ex!==127.0.0.1
 >>> dnslists check: rbl.test.ex!==127.0.0.1
 >>> dnslists: using result of previous lookup
 >>> DNS lookup for 2.13.13.V4NET.rbl.test.ex succeeded (yielding 127.0.0.1, 127.0.0.2)
 >>> => that means V4NET.13.13.2 is listed at rbl.test.ex
 >>> warn: condition test succeeded in ACL "check_vrfy"
 >>> check dnslists = rbl.test.ex!==127.0.0.1
 >>> dnslists check: rbl.test.ex!==127.0.0.1
 >>> dnslists: using result of previous lookup
 >>> DNS lookup for 2.13.13.V4NET.rbl.test.ex succeeded (yielding 127.0.0.1, 127.0.0.2)
 >>> => that means V4NET.13.13.2 is listed at rbl.test.ex
 >>> warn: condition test succeeded in ACL "check_vrfy"

->>> processing "warn" (TESTSUITE/test-config 31)
+>>> processing "warn" (TESTSUITE/test-config 32)

 >>> check dnslists = rbl.test.ex!==127.0.0.3
 >>> dnslists check: rbl.test.ex!==127.0.0.3
 >>> dnslists: using result of previous lookup
 >>> DNS lookup for 2.13.13.V4NET.rbl.test.ex succeeded (yielding 127.0.0.1, 127.0.0.2)
 >>> => that means V4NET.13.13.2 is listed at rbl.test.ex
 >>> warn: condition test succeeded in ACL "check_vrfy"
 >>> check dnslists = rbl.test.ex!==127.0.0.3
 >>> dnslists check: rbl.test.ex!==127.0.0.3
 >>> dnslists: using result of previous lookup
 >>> DNS lookup for 2.13.13.V4NET.rbl.test.ex succeeded (yielding 127.0.0.1, 127.0.0.2)
 >>> => that means V4NET.13.13.2 is listed at rbl.test.ex
 >>> warn: condition test succeeded in ACL "check_vrfy"

->>> processing "warn" (TESTSUITE/test-config 32)
+>>> processing "warn" (TESTSUITE/test-config 33)

 >>> check dnslists = rbl.test.ex!==127.0.0.1,127.0.0.2
 >>> dnslists check: rbl.test.ex!==127.0.0.1,127.0.0.2
 >>> dnslists: using result of previous lookup
 >>> check dnslists = rbl.test.ex!==127.0.0.1,127.0.0.2
 >>> dnslists check: rbl.test.ex!==127.0.0.1,127.0.0.2
 >>> dnslists: using result of previous lookup


@@ -376,14 +380,14 @@ LOG: H=[V4NET.11.12.15] F=<postmaster@exim.test.ex> rejected RCPT <userx@exim.te
 >>> => but we are not accepting this block class because
 >>> => there were no IP addresses that did not match for ==127.0.0.1,127.0.0.2
 >>> warn: condition test failed in ACL "check_vrfy"
 >>> => but we are not accepting this block class because
 >>> => there were no IP addresses that did not match for ==127.0.0.1,127.0.0.2
 >>> warn: condition test failed in ACL "check_vrfy"

->>> processing "warn" (TESTSUITE/test-config 33)
+>>> processing "warn" (TESTSUITE/test-config 34)

 >>> check dnslists = rbl.test.ex
 >>> dnslists check: rbl.test.ex
 >>> dnslists: using result of previous lookup
 >>> DNS lookup for 2.13.13.V4NET.rbl.test.ex succeeded (yielding 127.0.0.1, 127.0.0.2)
 >>> => that means V4NET.13.13.2 is listed at rbl.test.ex
 >>> warn: condition test succeeded in ACL "check_vrfy"
 >>> check dnslists = rbl.test.ex
 >>> dnslists check: rbl.test.ex
 >>> dnslists: using result of previous lookup
 >>> DNS lookup for 2.13.13.V4NET.rbl.test.ex succeeded (yielding 127.0.0.1, 127.0.0.2)
 >>> => that means V4NET.13.13.2 is listed at rbl.test.ex
 >>> warn: condition test succeeded in ACL "check_vrfy"

->>> processing "accept" (TESTSUITE/test-config 34)
+>>> processing "accept" (TESTSUITE/test-config 35)

 >>> accept: condition test succeeded in ACL "check_vrfy"
 >>> end of ACL "check_vrfy": ACCEPT
 >>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 >>> accept: condition test succeeded in ACL "check_vrfy"
 >>> end of ACL "check_vrfy": ACCEPT
 >>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>


@@ -403,7 +407,7 @@ LOG: VRFY failed for a@b H=[V4NET.13.13.2]
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> host in smtp_accept_max_nonmail_hosts? yes (matched "*")
 >>> using ACL "check_vrfy"
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> host in smtp_accept_max_nonmail_hosts? yes (matched "*")
 >>> using ACL "check_vrfy"

->>> processing "warn" (TESTSUITE/test-config 25)
+>>> processing "warn" (TESTSUITE/test-config 26)

 >>> check dnslists = rbl.test.ex=127.0.0.1
 >>> dnslists check: rbl.test.ex=127.0.0.1
 >>> new DNS lookup for 100.13.13.V4NET.rbl.test.ex
 >>> check dnslists = rbl.test.ex=127.0.0.1
 >>> dnslists check: rbl.test.ex=127.0.0.1
 >>> new DNS lookup for 100.13.13.V4NET.rbl.test.ex


@@ -412,21 +416,21 @@ LOG: VRFY failed for a@b H=[V4NET.13.13.2]
 >>> => but we are not accepting this block class because
 >>> => there was no match for =127.0.0.1
 >>> warn: condition test failed in ACL "check_vrfy"
 >>> => but we are not accepting this block class because
 >>> => there was no match for =127.0.0.1
 >>> warn: condition test failed in ACL "check_vrfy"

->>> processing "warn" (TESTSUITE/test-config 26)
+>>> processing "warn" (TESTSUITE/test-config 27)

 >>> check dnslists = rbl.test.ex!=127.0.0.1
 >>> dnslists check: rbl.test.ex!=127.0.0.1
 >>> dnslists: using result of previous lookup
 >>> DNS lookup for 100.13.13.V4NET.rbl.test.ex succeeded (yielding 0.0.0.0)
 >>> => that means V4NET.13.13.100 is listed at rbl.test.ex
 >>> warn: condition test succeeded in ACL "check_vrfy"
 >>> check dnslists = rbl.test.ex!=127.0.0.1
 >>> dnslists check: rbl.test.ex!=127.0.0.1
 >>> dnslists: using result of previous lookup
 >>> DNS lookup for 100.13.13.V4NET.rbl.test.ex succeeded (yielding 0.0.0.0)
 >>> => that means V4NET.13.13.100 is listed at rbl.test.ex
 >>> warn: condition test succeeded in ACL "check_vrfy"

->>> processing "warn" (TESTSUITE/test-config 27)
+>>> processing "warn" (TESTSUITE/test-config 28)

 >>> check dnslists = rbl.test.ex!=127.0.0.3
 >>> dnslists check: rbl.test.ex!=127.0.0.3
 >>> dnslists: using result of previous lookup
 >>> DNS lookup for 100.13.13.V4NET.rbl.test.ex succeeded (yielding 0.0.0.0)
 >>> => that means V4NET.13.13.100 is listed at rbl.test.ex
 >>> warn: condition test succeeded in ACL "check_vrfy"
 >>> check dnslists = rbl.test.ex!=127.0.0.3
 >>> dnslists check: rbl.test.ex!=127.0.0.3
 >>> dnslists: using result of previous lookup
 >>> DNS lookup for 100.13.13.V4NET.rbl.test.ex succeeded (yielding 0.0.0.0)
 >>> => that means V4NET.13.13.100 is listed at rbl.test.ex
 >>> warn: condition test succeeded in ACL "check_vrfy"

->>> processing "warn" (TESTSUITE/test-config 28)
+>>> processing "warn" (TESTSUITE/test-config 29)

 >>> check dnslists = rbl.test.ex==127.0.0.1
 >>> dnslists check: rbl.test.ex==127.0.0.1
 >>> dnslists: using result of previous lookup
 >>> check dnslists = rbl.test.ex==127.0.0.1
 >>> dnslists check: rbl.test.ex==127.0.0.1
 >>> dnslists: using result of previous lookup


@@ -434,7 +438,7 @@ LOG: VRFY failed for a@b H=[V4NET.13.13.2]
 >>> => but we are not accepting this block class because
 >>> => there was an IP address that did not match for ==127.0.0.1
 >>> warn: condition test failed in ACL "check_vrfy"
 >>> => but we are not accepting this block class because
 >>> => there was an IP address that did not match for ==127.0.0.1
 >>> warn: condition test failed in ACL "check_vrfy"

->>> processing "warn" (TESTSUITE/test-config 29)
+>>> processing "warn" (TESTSUITE/test-config 30)

 >>> check dnslists = rbl.test.ex==127.0.0.1,127.0.0.2
 >>> dnslists check: rbl.test.ex==127.0.0.1,127.0.0.2
 >>> dnslists: using result of previous lookup
 >>> check dnslists = rbl.test.ex==127.0.0.1,127.0.0.2
 >>> dnslists check: rbl.test.ex==127.0.0.1,127.0.0.2
 >>> dnslists: using result of previous lookup


@@ -442,35 +446,35 @@ LOG: VRFY failed for a@b H=[V4NET.13.13.2]
 >>> => but we are not accepting this block class because
 >>> => there was an IP address that did not match for ==127.0.0.1,127.0.0.2
 >>> warn: condition test failed in ACL "check_vrfy"
 >>> => but we are not accepting this block class because
 >>> => there was an IP address that did not match for ==127.0.0.1,127.0.0.2
 >>> warn: condition test failed in ACL "check_vrfy"

->>> processing "warn" (TESTSUITE/test-config 30)
+>>> processing "warn" (TESTSUITE/test-config 31)

 >>> check dnslists = rbl.test.ex!==127.0.0.1
 >>> dnslists check: rbl.test.ex!==127.0.0.1
 >>> dnslists: using result of previous lookup
 >>> DNS lookup for 100.13.13.V4NET.rbl.test.ex succeeded (yielding 0.0.0.0)
 >>> => that means V4NET.13.13.100 is listed at rbl.test.ex
 >>> warn: condition test succeeded in ACL "check_vrfy"
 >>> check dnslists = rbl.test.ex!==127.0.0.1
 >>> dnslists check: rbl.test.ex!==127.0.0.1
 >>> dnslists: using result of previous lookup
 >>> DNS lookup for 100.13.13.V4NET.rbl.test.ex succeeded (yielding 0.0.0.0)
 >>> => that means V4NET.13.13.100 is listed at rbl.test.ex
 >>> warn: condition test succeeded in ACL "check_vrfy"

->>> processing "warn" (TESTSUITE/test-config 31)
+>>> processing "warn" (TESTSUITE/test-config 32)

 >>> check dnslists = rbl.test.ex!==127.0.0.3
 >>> dnslists check: rbl.test.ex!==127.0.0.3
 >>> dnslists: using result of previous lookup
 >>> DNS lookup for 100.13.13.V4NET.rbl.test.ex succeeded (yielding 0.0.0.0)
 >>> => that means V4NET.13.13.100 is listed at rbl.test.ex
 >>> warn: condition test succeeded in ACL "check_vrfy"
 >>> check dnslists = rbl.test.ex!==127.0.0.3
 >>> dnslists check: rbl.test.ex!==127.0.0.3
 >>> dnslists: using result of previous lookup
 >>> DNS lookup for 100.13.13.V4NET.rbl.test.ex succeeded (yielding 0.0.0.0)
 >>> => that means V4NET.13.13.100 is listed at rbl.test.ex
 >>> warn: condition test succeeded in ACL "check_vrfy"

->>> processing "warn" (TESTSUITE/test-config 32)
+>>> processing "warn" (TESTSUITE/test-config 33)

 >>> check dnslists = rbl.test.ex!==127.0.0.1,127.0.0.2
 >>> dnslists check: rbl.test.ex!==127.0.0.1,127.0.0.2
 >>> dnslists: using result of previous lookup
 >>> DNS lookup for 100.13.13.V4NET.rbl.test.ex succeeded (yielding 0.0.0.0)
 >>> => that means V4NET.13.13.100 is listed at rbl.test.ex
 >>> warn: condition test succeeded in ACL "check_vrfy"
 >>> check dnslists = rbl.test.ex!==127.0.0.1,127.0.0.2
 >>> dnslists check: rbl.test.ex!==127.0.0.1,127.0.0.2
 >>> dnslists: using result of previous lookup
 >>> DNS lookup for 100.13.13.V4NET.rbl.test.ex succeeded (yielding 0.0.0.0)
 >>> => that means V4NET.13.13.100 is listed at rbl.test.ex
 >>> warn: condition test succeeded in ACL "check_vrfy"

->>> processing "warn" (TESTSUITE/test-config 33)
+>>> processing "warn" (TESTSUITE/test-config 34)

 >>> check dnslists = rbl.test.ex
 >>> dnslists check: rbl.test.ex
 >>> dnslists: using result of previous lookup
 >>> DNS lookup for 100.13.13.V4NET.rbl.test.ex succeeded (yielding 0.0.0.0)
 LOG: DNS list lookup for V4NET.13.13.100 at rbl.test.ex returned 0.0.0.0; not in 127.0/8 and discarded
 >>> warn: condition test failed in ACL "check_vrfy"
 >>> check dnslists = rbl.test.ex
 >>> dnslists check: rbl.test.ex
 >>> dnslists: using result of previous lookup
 >>> DNS lookup for 100.13.13.V4NET.rbl.test.ex succeeded (yielding 0.0.0.0)
 LOG: DNS list lookup for V4NET.13.13.100 at rbl.test.ex returned 0.0.0.0; not in 127.0/8 and discarded
 >>> warn: condition test failed in ACL "check_vrfy"

->>> processing "accept" (TESTSUITE/test-config 34)
+>>> processing "accept" (TESTSUITE/test-config 35)

 >>> accept: condition test succeeded in ACL "check_vrfy"
 >>> end of ACL "check_vrfy": ACCEPT
 >>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 >>> accept: condition test succeeded in ACL "check_vrfy"
 >>> end of ACL "check_vrfy": ACCEPT
 >>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>


@@ -490,7 +494,7 @@ LOG: VRFY failed for a@b H=[V4NET.13.13.100]
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> host in smtp_accept_max_nonmail_hosts? yes (matched "*")
 >>> using ACL "check_vrfy"
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> host in smtp_accept_max_nonmail_hosts? yes (matched "*")
 >>> using ACL "check_vrfy"

->>> processing "warn" (TESTSUITE/test-config 25)
+>>> processing "warn" (TESTSUITE/test-config 26)

 >>> check dnslists = rbl.test.ex=127.0.0.1
 >>> dnslists check: rbl.test.ex=127.0.0.1
 >>> new DNS lookup for 101.13.13.V4NET.rbl.test.ex
 >>> check dnslists = rbl.test.ex=127.0.0.1
 >>> dnslists check: rbl.test.ex=127.0.0.1
 >>> new DNS lookup for 101.13.13.V4NET.rbl.test.ex


@@ -499,21 +503,21 @@ LOG: VRFY failed for a@b H=[V4NET.13.13.100]
 >>> => but we are not accepting this block class because
 >>> => there was no match for =127.0.0.1
 >>> warn: condition test failed in ACL "check_vrfy"
 >>> => but we are not accepting this block class because
 >>> => there was no match for =127.0.0.1
 >>> warn: condition test failed in ACL "check_vrfy"

->>> processing "warn" (TESTSUITE/test-config 26)
+>>> processing "warn" (TESTSUITE/test-config 27)

 >>> check dnslists = rbl.test.ex!=127.0.0.1
 >>> dnslists check: rbl.test.ex!=127.0.0.1
 >>> dnslists: using result of previous lookup
 >>> DNS lookup for 101.13.13.V4NET.rbl.test.ex succeeded (yielding 126.255.255.255)
 >>> => that means V4NET.13.13.101 is listed at rbl.test.ex
 >>> warn: condition test succeeded in ACL "check_vrfy"
 >>> check dnslists = rbl.test.ex!=127.0.0.1
 >>> dnslists check: rbl.test.ex!=127.0.0.1
 >>> dnslists: using result of previous lookup
 >>> DNS lookup for 101.13.13.V4NET.rbl.test.ex succeeded (yielding 126.255.255.255)
 >>> => that means V4NET.13.13.101 is listed at rbl.test.ex
 >>> warn: condition test succeeded in ACL "check_vrfy"

->>> processing "warn" (TESTSUITE/test-config 27)
+>>> processing "warn" (TESTSUITE/test-config 28)

 >>> check dnslists = rbl.test.ex!=127.0.0.3
 >>> dnslists check: rbl.test.ex!=127.0.0.3
 >>> dnslists: using result of previous lookup
 >>> DNS lookup for 101.13.13.V4NET.rbl.test.ex succeeded (yielding 126.255.255.255)
 >>> => that means V4NET.13.13.101 is listed at rbl.test.ex
 >>> warn: condition test succeeded in ACL "check_vrfy"
 >>> check dnslists = rbl.test.ex!=127.0.0.3
 >>> dnslists check: rbl.test.ex!=127.0.0.3
 >>> dnslists: using result of previous lookup
 >>> DNS lookup for 101.13.13.V4NET.rbl.test.ex succeeded (yielding 126.255.255.255)
 >>> => that means V4NET.13.13.101 is listed at rbl.test.ex
 >>> warn: condition test succeeded in ACL "check_vrfy"

->>> processing "warn" (TESTSUITE/test-config 28)
+>>> processing "warn" (TESTSUITE/test-config 29)

 >>> check dnslists = rbl.test.ex==127.0.0.1
 >>> dnslists check: rbl.test.ex==127.0.0.1
 >>> dnslists: using result of previous lookup
 >>> check dnslists = rbl.test.ex==127.0.0.1
 >>> dnslists check: rbl.test.ex==127.0.0.1
 >>> dnslists: using result of previous lookup


@@ -521,7 +525,7 @@ LOG: VRFY failed for a@b H=[V4NET.13.13.100]
 >>> => but we are not accepting this block class because
 >>> => there was an IP address that did not match for ==127.0.0.1
 >>> warn: condition test failed in ACL "check_vrfy"
 >>> => but we are not accepting this block class because
 >>> => there was an IP address that did not match for ==127.0.0.1
 >>> warn: condition test failed in ACL "check_vrfy"

->>> processing "warn" (TESTSUITE/test-config 29)
+>>> processing "warn" (TESTSUITE/test-config 30)

 >>> check dnslists = rbl.test.ex==127.0.0.1,127.0.0.2
 >>> dnslists check: rbl.test.ex==127.0.0.1,127.0.0.2
 >>> dnslists: using result of previous lookup
 >>> check dnslists = rbl.test.ex==127.0.0.1,127.0.0.2
 >>> dnslists check: rbl.test.ex==127.0.0.1,127.0.0.2
 >>> dnslists: using result of previous lookup


@@ -529,35 +533,35 @@ LOG: VRFY failed for a@b H=[V4NET.13.13.100]
 >>> => but we are not accepting this block class because
 >>> => there was an IP address that did not match for ==127.0.0.1,127.0.0.2
 >>> warn: condition test failed in ACL "check_vrfy"
 >>> => but we are not accepting this block class because
 >>> => there was an IP address that did not match for ==127.0.0.1,127.0.0.2
 >>> warn: condition test failed in ACL "check_vrfy"

->>> processing "warn" (TESTSUITE/test-config 30)
+>>> processing "warn" (TESTSUITE/test-config 31)

 >>> check dnslists = rbl.test.ex!==127.0.0.1
 >>> dnslists check: rbl.test.ex!==127.0.0.1
 >>> dnslists: using result of previous lookup
 >>> DNS lookup for 101.13.13.V4NET.rbl.test.ex succeeded (yielding 126.255.255.255)
 >>> => that means V4NET.13.13.101 is listed at rbl.test.ex
 >>> warn: condition test succeeded in ACL "check_vrfy"
 >>> check dnslists = rbl.test.ex!==127.0.0.1
 >>> dnslists check: rbl.test.ex!==127.0.0.1
 >>> dnslists: using result of previous lookup
 >>> DNS lookup for 101.13.13.V4NET.rbl.test.ex succeeded (yielding 126.255.255.255)
 >>> => that means V4NET.13.13.101 is listed at rbl.test.ex
 >>> warn: condition test succeeded in ACL "check_vrfy"

->>> processing "warn" (TESTSUITE/test-config 31)
+>>> processing "warn" (TESTSUITE/test-config 32)

 >>> check dnslists = rbl.test.ex!==127.0.0.3
 >>> dnslists check: rbl.test.ex!==127.0.0.3
 >>> dnslists: using result of previous lookup
 >>> DNS lookup for 101.13.13.V4NET.rbl.test.ex succeeded (yielding 126.255.255.255)
 >>> => that means V4NET.13.13.101 is listed at rbl.test.ex
 >>> warn: condition test succeeded in ACL "check_vrfy"
 >>> check dnslists = rbl.test.ex!==127.0.0.3
 >>> dnslists check: rbl.test.ex!==127.0.0.3
 >>> dnslists: using result of previous lookup
 >>> DNS lookup for 101.13.13.V4NET.rbl.test.ex succeeded (yielding 126.255.255.255)
 >>> => that means V4NET.13.13.101 is listed at rbl.test.ex
 >>> warn: condition test succeeded in ACL "check_vrfy"

->>> processing "warn" (TESTSUITE/test-config 32)
+>>> processing "warn" (TESTSUITE/test-config 33)

 >>> check dnslists = rbl.test.ex!==127.0.0.1,127.0.0.2
 >>> dnslists check: rbl.test.ex!==127.0.0.1,127.0.0.2
 >>> dnslists: using result of previous lookup
 >>> DNS lookup for 101.13.13.V4NET.rbl.test.ex succeeded (yielding 126.255.255.255)
 >>> => that means V4NET.13.13.101 is listed at rbl.test.ex
 >>> warn: condition test succeeded in ACL "check_vrfy"
 >>> check dnslists = rbl.test.ex!==127.0.0.1,127.0.0.2
 >>> dnslists check: rbl.test.ex!==127.0.0.1,127.0.0.2
 >>> dnslists: using result of previous lookup
 >>> DNS lookup for 101.13.13.V4NET.rbl.test.ex succeeded (yielding 126.255.255.255)
 >>> => that means V4NET.13.13.101 is listed at rbl.test.ex
 >>> warn: condition test succeeded in ACL "check_vrfy"

->>> processing "warn" (TESTSUITE/test-config 33)
+>>> processing "warn" (TESTSUITE/test-config 34)

 >>> check dnslists = rbl.test.ex
 >>> dnslists check: rbl.test.ex
 >>> dnslists: using result of previous lookup
 >>> DNS lookup for 101.13.13.V4NET.rbl.test.ex succeeded (yielding 126.255.255.255)
 LOG: DNS list lookup for V4NET.13.13.101 at rbl.test.ex returned 126.255.255.255; not in 127.0/8 and discarded
 >>> warn: condition test failed in ACL "check_vrfy"
 >>> check dnslists = rbl.test.ex
 >>> dnslists check: rbl.test.ex
 >>> dnslists: using result of previous lookup
 >>> DNS lookup for 101.13.13.V4NET.rbl.test.ex succeeded (yielding 126.255.255.255)
 LOG: DNS list lookup for V4NET.13.13.101 at rbl.test.ex returned 126.255.255.255; not in 127.0/8 and discarded
 >>> warn: condition test failed in ACL "check_vrfy"

->>> processing "accept" (TESTSUITE/test-config 34)
+>>> processing "accept" (TESTSUITE/test-config 35)

 >>> accept: condition test succeeded in ACL "check_vrfy"
 >>> end of ACL "check_vrfy": ACCEPT
 >>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 >>> accept: condition test succeeded in ACL "check_vrfy"
 >>> end of ACL "check_vrfy": ACCEPT
 >>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>


@@ -577,7 +581,7 @@ LOG: VRFY failed for a@b H=[V4NET.13.13.101]
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> host in smtp_accept_max_nonmail_hosts? yes (matched "*")
 >>> using ACL "check_vrfy"
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> host in smtp_accept_max_nonmail_hosts? yes (matched "*")
 >>> using ACL "check_vrfy"

->>> processing "warn" (TESTSUITE/test-config 25)
+>>> processing "warn" (TESTSUITE/test-config 26)

 >>> check dnslists = rbl.test.ex=127.0.0.1
 >>> dnslists check: rbl.test.ex=127.0.0.1
 >>> new DNS lookup for 102.13.13.V4NET.rbl.test.ex
 >>> check dnslists = rbl.test.ex=127.0.0.1
 >>> dnslists check: rbl.test.ex=127.0.0.1
 >>> new DNS lookup for 102.13.13.V4NET.rbl.test.ex


@@ -586,21 +590,21 @@ LOG: VRFY failed for a@b H=[V4NET.13.13.101]
 >>> => but we are not accepting this block class because
 >>> => there was no match for =127.0.0.1
 >>> warn: condition test failed in ACL "check_vrfy"
 >>> => but we are not accepting this block class because
 >>> => there was no match for =127.0.0.1
 >>> warn: condition test failed in ACL "check_vrfy"

->>> processing "warn" (TESTSUITE/test-config 26)
+>>> processing "warn" (TESTSUITE/test-config 27)

 >>> check dnslists = rbl.test.ex!=127.0.0.1
 >>> dnslists check: rbl.test.ex!=127.0.0.1
 >>> dnslists: using result of previous lookup
 >>> DNS lookup for 102.13.13.V4NET.rbl.test.ex succeeded (yielding 128.0.0.0)
 >>> => that means V4NET.13.13.102 is listed at rbl.test.ex
 >>> warn: condition test succeeded in ACL "check_vrfy"
 >>> check dnslists = rbl.test.ex!=127.0.0.1
 >>> dnslists check: rbl.test.ex!=127.0.0.1
 >>> dnslists: using result of previous lookup
 >>> DNS lookup for 102.13.13.V4NET.rbl.test.ex succeeded (yielding 128.0.0.0)
 >>> => that means V4NET.13.13.102 is listed at rbl.test.ex
 >>> warn: condition test succeeded in ACL "check_vrfy"

->>> processing "warn" (TESTSUITE/test-config 27)
+>>> processing "warn" (TESTSUITE/test-config 28)

 >>> check dnslists = rbl.test.ex!=127.0.0.3
 >>> dnslists check: rbl.test.ex!=127.0.0.3
 >>> dnslists: using result of previous lookup
 >>> DNS lookup for 102.13.13.V4NET.rbl.test.ex succeeded (yielding 128.0.0.0)
 >>> => that means V4NET.13.13.102 is listed at rbl.test.ex
 >>> warn: condition test succeeded in ACL "check_vrfy"
 >>> check dnslists = rbl.test.ex!=127.0.0.3
 >>> dnslists check: rbl.test.ex!=127.0.0.3
 >>> dnslists: using result of previous lookup
 >>> DNS lookup for 102.13.13.V4NET.rbl.test.ex succeeded (yielding 128.0.0.0)
 >>> => that means V4NET.13.13.102 is listed at rbl.test.ex
 >>> warn: condition test succeeded in ACL "check_vrfy"

->>> processing "warn" (TESTSUITE/test-config 28)
+>>> processing "warn" (TESTSUITE/test-config 29)

 >>> check dnslists = rbl.test.ex==127.0.0.1
 >>> dnslists check: rbl.test.ex==127.0.0.1
 >>> dnslists: using result of previous lookup
 >>> check dnslists = rbl.test.ex==127.0.0.1
 >>> dnslists check: rbl.test.ex==127.0.0.1
 >>> dnslists: using result of previous lookup


@@ -608,7 +612,7 @@ LOG: VRFY failed for a@b H=[V4NET.13.13.101]
 >>> => but we are not accepting this block class because
 >>> => there was an IP address that did not match for ==127.0.0.1
 >>> warn: condition test failed in ACL "check_vrfy"
 >>> => but we are not accepting this block class because
 >>> => there was an IP address that did not match for ==127.0.0.1
 >>> warn: condition test failed in ACL "check_vrfy"

->>> processing "warn" (TESTSUITE/test-config 29)
+>>> processing "warn" (TESTSUITE/test-config 30)

 >>> check dnslists = rbl.test.ex==127.0.0.1,127.0.0.2
 >>> dnslists check: rbl.test.ex==127.0.0.1,127.0.0.2
 >>> dnslists: using result of previous lookup
 >>> check dnslists = rbl.test.ex==127.0.0.1,127.0.0.2
 >>> dnslists check: rbl.test.ex==127.0.0.1,127.0.0.2
 >>> dnslists: using result of previous lookup


@@ -616,35 +620,35 @@ LOG: VRFY failed for a@b H=[V4NET.13.13.101]
 >>> => but we are not accepting this block class because
 >>> => there was an IP address that did not match for ==127.0.0.1,127.0.0.2
 >>> warn: condition test failed in ACL "check_vrfy"
 >>> => but we are not accepting this block class because
 >>> => there was an IP address that did not match for ==127.0.0.1,127.0.0.2
 >>> warn: condition test failed in ACL "check_vrfy"

->>> processing "warn" (TESTSUITE/test-config 30)
+>>> processing "warn" (TESTSUITE/test-config 31)

 >>> check dnslists = rbl.test.ex!==127.0.0.1
 >>> dnslists check: rbl.test.ex!==127.0.0.1
 >>> dnslists: using result of previous lookup
 >>> DNS lookup for 102.13.13.V4NET.rbl.test.ex succeeded (yielding 128.0.0.0)
 >>> => that means V4NET.13.13.102 is listed at rbl.test.ex
 >>> warn: condition test succeeded in ACL "check_vrfy"
 >>> check dnslists = rbl.test.ex!==127.0.0.1
 >>> dnslists check: rbl.test.ex!==127.0.0.1
 >>> dnslists: using result of previous lookup
 >>> DNS lookup for 102.13.13.V4NET.rbl.test.ex succeeded (yielding 128.0.0.0)
 >>> => that means V4NET.13.13.102 is listed at rbl.test.ex
 >>> warn: condition test succeeded in ACL "check_vrfy"

->>> processing "warn" (TESTSUITE/test-config 31)
+>>> processing "warn" (TESTSUITE/test-config 32)

 >>> check dnslists = rbl.test.ex!==127.0.0.3
 >>> dnslists check: rbl.test.ex!==127.0.0.3
 >>> dnslists: using result of previous lookup
 >>> DNS lookup for 102.13.13.V4NET.rbl.test.ex succeeded (yielding 128.0.0.0)
 >>> => that means V4NET.13.13.102 is listed at rbl.test.ex
 >>> warn: condition test succeeded in ACL "check_vrfy"
 >>> check dnslists = rbl.test.ex!==127.0.0.3
 >>> dnslists check: rbl.test.ex!==127.0.0.3
 >>> dnslists: using result of previous lookup
 >>> DNS lookup for 102.13.13.V4NET.rbl.test.ex succeeded (yielding 128.0.0.0)
 >>> => that means V4NET.13.13.102 is listed at rbl.test.ex
 >>> warn: condition test succeeded in ACL "check_vrfy"

->>> processing "warn" (TESTSUITE/test-config 32)
+>>> processing "warn" (TESTSUITE/test-config 33)

 >>> check dnslists = rbl.test.ex!==127.0.0.1,127.0.0.2
 >>> dnslists check: rbl.test.ex!==127.0.0.1,127.0.0.2
 >>> dnslists: using result of previous lookup
 >>> DNS lookup for 102.13.13.V4NET.rbl.test.ex succeeded (yielding 128.0.0.0)
 >>> => that means V4NET.13.13.102 is listed at rbl.test.ex
 >>> warn: condition test succeeded in ACL "check_vrfy"
 >>> check dnslists = rbl.test.ex!==127.0.0.1,127.0.0.2
 >>> dnslists check: rbl.test.ex!==127.0.0.1,127.0.0.2
 >>> dnslists: using result of previous lookup
 >>> DNS lookup for 102.13.13.V4NET.rbl.test.ex succeeded (yielding 128.0.0.0)
 >>> => that means V4NET.13.13.102 is listed at rbl.test.ex
 >>> warn: condition test succeeded in ACL "check_vrfy"

->>> processing "warn" (TESTSUITE/test-config 33)
+>>> processing "warn" (TESTSUITE/test-config 34)

 >>> check dnslists = rbl.test.ex
 >>> dnslists check: rbl.test.ex
 >>> dnslists: using result of previous lookup
 >>> DNS lookup for 102.13.13.V4NET.rbl.test.ex succeeded (yielding 128.0.0.0)
 LOG: DNS list lookup for V4NET.13.13.102 at rbl.test.ex returned 128.0.0.0; not in 127.0/8 and discarded
 >>> warn: condition test failed in ACL "check_vrfy"
 >>> check dnslists = rbl.test.ex
 >>> dnslists check: rbl.test.ex
 >>> dnslists: using result of previous lookup
 >>> DNS lookup for 102.13.13.V4NET.rbl.test.ex succeeded (yielding 128.0.0.0)
 LOG: DNS list lookup for V4NET.13.13.102 at rbl.test.ex returned 128.0.0.0; not in 127.0/8 and discarded
 >>> warn: condition test failed in ACL "check_vrfy"

->>> processing "accept" (TESTSUITE/test-config 34)
+>>> processing "accept" (TESTSUITE/test-config 35)

 >>> accept: condition test succeeded in ACL "check_vrfy"
 >>> end of ACL "check_vrfy": ACCEPT
 >>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 >>> accept: condition test succeeded in ACL "check_vrfy"
 >>> end of ACL "check_vrfy": ACCEPT
 >>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>


@@ -664,7 +668,7 @@ LOG: VRFY failed for a@b H=[V4NET.13.13.102]
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> host in smtp_accept_max_nonmail_hosts? yes (matched "*")
 >>> using ACL "check_vrfy"
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> host in smtp_accept_max_nonmail_hosts? yes (matched "*")
 >>> using ACL "check_vrfy"

->>> processing "warn" (TESTSUITE/test-config 25)
+>>> processing "warn" (TESTSUITE/test-config 26)

 >>> check dnslists = rbl.test.ex=127.0.0.1
 >>> dnslists check: rbl.test.ex=127.0.0.1
 >>> new DNS lookup for 103.13.13.V4NET.rbl.test.ex
 >>> check dnslists = rbl.test.ex=127.0.0.1
 >>> dnslists check: rbl.test.ex=127.0.0.1
 >>> new DNS lookup for 103.13.13.V4NET.rbl.test.ex


@@ -673,21 +677,21 @@ LOG: VRFY failed for a@b H=[V4NET.13.13.102]
 >>> => but we are not accepting this block class because
 >>> => there was no match for =127.0.0.1
 >>> warn: condition test failed in ACL "check_vrfy"
 >>> => but we are not accepting this block class because
 >>> => there was no match for =127.0.0.1
 >>> warn: condition test failed in ACL "check_vrfy"

->>> processing "warn" (TESTSUITE/test-config 26)
+>>> processing "warn" (TESTSUITE/test-config 27)

 >>> check dnslists = rbl.test.ex!=127.0.0.1
 >>> dnslists check: rbl.test.ex!=127.0.0.1
 >>> dnslists: using result of previous lookup
 >>> DNS lookup for 103.13.13.V4NET.rbl.test.ex succeeded (yielding 255.255.255.255)
 >>> => that means V4NET.13.13.103 is listed at rbl.test.ex
 >>> warn: condition test succeeded in ACL "check_vrfy"
 >>> check dnslists = rbl.test.ex!=127.0.0.1
 >>> dnslists check: rbl.test.ex!=127.0.0.1
 >>> dnslists: using result of previous lookup
 >>> DNS lookup for 103.13.13.V4NET.rbl.test.ex succeeded (yielding 255.255.255.255)
 >>> => that means V4NET.13.13.103 is listed at rbl.test.ex
 >>> warn: condition test succeeded in ACL "check_vrfy"

->>> processing "warn" (TESTSUITE/test-config 27)
+>>> processing "warn" (TESTSUITE/test-config 28)

 >>> check dnslists = rbl.test.ex!=127.0.0.3
 >>> dnslists check: rbl.test.ex!=127.0.0.3
 >>> dnslists: using result of previous lookup
 >>> DNS lookup for 103.13.13.V4NET.rbl.test.ex succeeded (yielding 255.255.255.255)
 >>> => that means V4NET.13.13.103 is listed at rbl.test.ex
 >>> warn: condition test succeeded in ACL "check_vrfy"
 >>> check dnslists = rbl.test.ex!=127.0.0.3
 >>> dnslists check: rbl.test.ex!=127.0.0.3
 >>> dnslists: using result of previous lookup
 >>> DNS lookup for 103.13.13.V4NET.rbl.test.ex succeeded (yielding 255.255.255.255)
 >>> => that means V4NET.13.13.103 is listed at rbl.test.ex
 >>> warn: condition test succeeded in ACL "check_vrfy"

->>> processing "warn" (TESTSUITE/test-config 28)
+>>> processing "warn" (TESTSUITE/test-config 29)

 >>> check dnslists = rbl.test.ex==127.0.0.1
 >>> dnslists check: rbl.test.ex==127.0.0.1
 >>> dnslists: using result of previous lookup
 >>> check dnslists = rbl.test.ex==127.0.0.1
 >>> dnslists check: rbl.test.ex==127.0.0.1
 >>> dnslists: using result of previous lookup


@@ -695,7 +699,7 @@ LOG: VRFY failed for a@b H=[V4NET.13.13.102]
 >>> => but we are not accepting this block class because
 >>> => there was an IP address that did not match for ==127.0.0.1
 >>> warn: condition test failed in ACL "check_vrfy"
 >>> => but we are not accepting this block class because
 >>> => there was an IP address that did not match for ==127.0.0.1
 >>> warn: condition test failed in ACL "check_vrfy"

->>> processing "warn" (TESTSUITE/test-config 29)
+>>> processing "warn" (TESTSUITE/test-config 30)

 >>> check dnslists = rbl.test.ex==127.0.0.1,127.0.0.2
 >>> dnslists check: rbl.test.ex==127.0.0.1,127.0.0.2
 >>> dnslists: using result of previous lookup
 >>> check dnslists = rbl.test.ex==127.0.0.1,127.0.0.2
 >>> dnslists check: rbl.test.ex==127.0.0.1,127.0.0.2
 >>> dnslists: using result of previous lookup


@@ -703,35 +707,35 @@ LOG: VRFY failed for a@b H=[V4NET.13.13.102]
 >>> => but we are not accepting this block class because
 >>> => there was an IP address that did not match for ==127.0.0.1,127.0.0.2
 >>> warn: condition test failed in ACL "check_vrfy"
 >>> => but we are not accepting this block class because
 >>> => there was an IP address that did not match for ==127.0.0.1,127.0.0.2
 >>> warn: condition test failed in ACL "check_vrfy"

->>> processing "warn" (TESTSUITE/test-config 30)
+>>> processing "warn" (TESTSUITE/test-config 31)

 >>> check dnslists = rbl.test.ex!==127.0.0.1
 >>> dnslists check: rbl.test.ex!==127.0.0.1
 >>> dnslists: using result of previous lookup
 >>> DNS lookup for 103.13.13.V4NET.rbl.test.ex succeeded (yielding 255.255.255.255)
 >>> => that means V4NET.13.13.103 is listed at rbl.test.ex
 >>> warn: condition test succeeded in ACL "check_vrfy"
 >>> check dnslists = rbl.test.ex!==127.0.0.1
 >>> dnslists check: rbl.test.ex!==127.0.0.1
 >>> dnslists: using result of previous lookup
 >>> DNS lookup for 103.13.13.V4NET.rbl.test.ex succeeded (yielding 255.255.255.255)
 >>> => that means V4NET.13.13.103 is listed at rbl.test.ex
 >>> warn: condition test succeeded in ACL "check_vrfy"

->>> processing "warn" (TESTSUITE/test-config 31)
+>>> processing "warn" (TESTSUITE/test-config 32)

 >>> check dnslists = rbl.test.ex!==127.0.0.3
 >>> dnslists check: rbl.test.ex!==127.0.0.3
 >>> dnslists: using result of previous lookup
 >>> DNS lookup for 103.13.13.V4NET.rbl.test.ex succeeded (yielding 255.255.255.255)
 >>> => that means V4NET.13.13.103 is listed at rbl.test.ex
 >>> warn: condition test succeeded in ACL "check_vrfy"
 >>> check dnslists = rbl.test.ex!==127.0.0.3
 >>> dnslists check: rbl.test.ex!==127.0.0.3
 >>> dnslists: using result of previous lookup
 >>> DNS lookup for 103.13.13.V4NET.rbl.test.ex succeeded (yielding 255.255.255.255)
 >>> => that means V4NET.13.13.103 is listed at rbl.test.ex
 >>> warn: condition test succeeded in ACL "check_vrfy"

->>> processing "warn" (TESTSUITE/test-config 32)
+>>> processing "warn" (TESTSUITE/test-config 33)

 >>> check dnslists = rbl.test.ex!==127.0.0.1,127.0.0.2
 >>> dnslists check: rbl.test.ex!==127.0.0.1,127.0.0.2
 >>> dnslists: using result of previous lookup
 >>> DNS lookup for 103.13.13.V4NET.rbl.test.ex succeeded (yielding 255.255.255.255)
 >>> => that means V4NET.13.13.103 is listed at rbl.test.ex
 >>> warn: condition test succeeded in ACL "check_vrfy"
 >>> check dnslists = rbl.test.ex!==127.0.0.1,127.0.0.2
 >>> dnslists check: rbl.test.ex!==127.0.0.1,127.0.0.2
 >>> dnslists: using result of previous lookup
 >>> DNS lookup for 103.13.13.V4NET.rbl.test.ex succeeded (yielding 255.255.255.255)
 >>> => that means V4NET.13.13.103 is listed at rbl.test.ex
 >>> warn: condition test succeeded in ACL "check_vrfy"

->>> processing "warn" (TESTSUITE/test-config 33)
+>>> processing "warn" (TESTSUITE/test-config 34)

 >>> check dnslists = rbl.test.ex
 >>> dnslists check: rbl.test.ex
 >>> dnslists: using result of previous lookup
 >>> DNS lookup for 103.13.13.V4NET.rbl.test.ex succeeded (yielding 255.255.255.255)
 LOG: DNS list lookup for V4NET.13.13.103 at rbl.test.ex returned 255.255.255.255; not in 127.0/8 and discarded
 >>> warn: condition test failed in ACL "check_vrfy"
 >>> check dnslists = rbl.test.ex
 >>> dnslists check: rbl.test.ex
 >>> dnslists: using result of previous lookup
 >>> DNS lookup for 103.13.13.V4NET.rbl.test.ex succeeded (yielding 255.255.255.255)
 LOG: DNS list lookup for V4NET.13.13.103 at rbl.test.ex returned 255.255.255.255; not in 127.0/8 and discarded
 >>> warn: condition test failed in ACL "check_vrfy"

->>> processing "accept" (TESTSUITE/test-config 34)
+>>> processing "accept" (TESTSUITE/test-config 35)

 >>> accept: condition test succeeded in ACL "check_vrfy"
 >>> end of ACL "check_vrfy": ACCEPT
 >>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 >>> accept: condition test succeeded in ACL "check_vrfy"
 >>> end of ACL "check_vrfy": ACCEPT
 >>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>


@@ -751,7 +755,7 @@ LOG: VRFY failed for a@b H=[V4NET.13.13.103]
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> host in smtp_accept_max_nonmail_hosts? yes (matched "*")
 >>> using ACL "check_vrfy"
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> host in smtp_accept_max_nonmail_hosts? yes (matched "*")
 >>> using ACL "check_vrfy"

->>> processing "warn" (TESTSUITE/test-config 25)
+>>> processing "warn" (TESTSUITE/test-config 26)

 >>> check dnslists = rbl.test.ex=127.0.0.1
 >>> dnslists check: rbl.test.ex=127.0.0.1
 >>> new DNS lookup for 104.13.13.V4NET.rbl.test.ex
 >>> check dnslists = rbl.test.ex=127.0.0.1
 >>> dnslists check: rbl.test.ex=127.0.0.1
 >>> new DNS lookup for 104.13.13.V4NET.rbl.test.ex


@@ -760,21 +764,21 @@ LOG: VRFY failed for a@b H=[V4NET.13.13.103]
 >>> => but we are not accepting this block class because
 >>> => there was no match for =127.0.0.1
 >>> warn: condition test failed in ACL "check_vrfy"
 >>> => but we are not accepting this block class because
 >>> => there was no match for =127.0.0.1
 >>> warn: condition test failed in ACL "check_vrfy"

->>> processing "warn" (TESTSUITE/test-config 26)
+>>> processing "warn" (TESTSUITE/test-config 27)

 >>> check dnslists = rbl.test.ex!=127.0.0.1
 >>> dnslists check: rbl.test.ex!=127.0.0.1
 >>> dnslists: using result of previous lookup
 >>> DNS lookup for 104.13.13.V4NET.rbl.test.ex succeeded (yielding 255.255.255.255, 127.0.0.0)
 >>> => that means V4NET.13.13.104 is listed at rbl.test.ex
 >>> warn: condition test succeeded in ACL "check_vrfy"
 >>> check dnslists = rbl.test.ex!=127.0.0.1
 >>> dnslists check: rbl.test.ex!=127.0.0.1
 >>> dnslists: using result of previous lookup
 >>> DNS lookup for 104.13.13.V4NET.rbl.test.ex succeeded (yielding 255.255.255.255, 127.0.0.0)
 >>> => that means V4NET.13.13.104 is listed at rbl.test.ex
 >>> warn: condition test succeeded in ACL "check_vrfy"

->>> processing "warn" (TESTSUITE/test-config 27)
+>>> processing "warn" (TESTSUITE/test-config 28)

 >>> check dnslists = rbl.test.ex!=127.0.0.3
 >>> dnslists check: rbl.test.ex!=127.0.0.3
 >>> dnslists: using result of previous lookup
 >>> DNS lookup for 104.13.13.V4NET.rbl.test.ex succeeded (yielding 255.255.255.255, 127.0.0.0)
 >>> => that means V4NET.13.13.104 is listed at rbl.test.ex
 >>> warn: condition test succeeded in ACL "check_vrfy"
 >>> check dnslists = rbl.test.ex!=127.0.0.3
 >>> dnslists check: rbl.test.ex!=127.0.0.3
 >>> dnslists: using result of previous lookup
 >>> DNS lookup for 104.13.13.V4NET.rbl.test.ex succeeded (yielding 255.255.255.255, 127.0.0.0)
 >>> => that means V4NET.13.13.104 is listed at rbl.test.ex
 >>> warn: condition test succeeded in ACL "check_vrfy"

->>> processing "warn" (TESTSUITE/test-config 28)
+>>> processing "warn" (TESTSUITE/test-config 29)

 >>> check dnslists = rbl.test.ex==127.0.0.1
 >>> dnslists check: rbl.test.ex==127.0.0.1
 >>> dnslists: using result of previous lookup
 >>> check dnslists = rbl.test.ex==127.0.0.1
 >>> dnslists check: rbl.test.ex==127.0.0.1
 >>> dnslists: using result of previous lookup


@@ -782,7 +786,7 @@ LOG: VRFY failed for a@b H=[V4NET.13.13.103]
 >>> => but we are not accepting this block class because
 >>> => there was an IP address that did not match for ==127.0.0.1
 >>> warn: condition test failed in ACL "check_vrfy"
 >>> => but we are not accepting this block class because
 >>> => there was an IP address that did not match for ==127.0.0.1
 >>> warn: condition test failed in ACL "check_vrfy"

->>> processing "warn" (TESTSUITE/test-config 29)
+>>> processing "warn" (TESTSUITE/test-config 30)

 >>> check dnslists = rbl.test.ex==127.0.0.1,127.0.0.2
 >>> dnslists check: rbl.test.ex==127.0.0.1,127.0.0.2
 >>> dnslists: using result of previous lookup
 >>> check dnslists = rbl.test.ex==127.0.0.1,127.0.0.2
 >>> dnslists check: rbl.test.ex==127.0.0.1,127.0.0.2
 >>> dnslists: using result of previous lookup


@@ -790,28 +794,28 @@ LOG: VRFY failed for a@b H=[V4NET.13.13.103]
 >>> => but we are not accepting this block class because
 >>> => there was an IP address that did not match for ==127.0.0.1,127.0.0.2
 >>> warn: condition test failed in ACL "check_vrfy"
 >>> => but we are not accepting this block class because
 >>> => there was an IP address that did not match for ==127.0.0.1,127.0.0.2
 >>> warn: condition test failed in ACL "check_vrfy"

->>> processing "warn" (TESTSUITE/test-config 30)
+>>> processing "warn" (TESTSUITE/test-config 31)

 >>> check dnslists = rbl.test.ex!==127.0.0.1
 >>> dnslists check: rbl.test.ex!==127.0.0.1
 >>> dnslists: using result of previous lookup
 >>> DNS lookup for 104.13.13.V4NET.rbl.test.ex succeeded (yielding 255.255.255.255, 127.0.0.0)
 >>> => that means V4NET.13.13.104 is listed at rbl.test.ex
 >>> warn: condition test succeeded in ACL "check_vrfy"
 >>> check dnslists = rbl.test.ex!==127.0.0.1
 >>> dnslists check: rbl.test.ex!==127.0.0.1
 >>> dnslists: using result of previous lookup
 >>> DNS lookup for 104.13.13.V4NET.rbl.test.ex succeeded (yielding 255.255.255.255, 127.0.0.0)
 >>> => that means V4NET.13.13.104 is listed at rbl.test.ex
 >>> warn: condition test succeeded in ACL "check_vrfy"

->>> processing "warn" (TESTSUITE/test-config 31)
+>>> processing "warn" (TESTSUITE/test-config 32)

 >>> check dnslists = rbl.test.ex!==127.0.0.3
 >>> dnslists check: rbl.test.ex!==127.0.0.3
 >>> dnslists: using result of previous lookup
 >>> DNS lookup for 104.13.13.V4NET.rbl.test.ex succeeded (yielding 255.255.255.255, 127.0.0.0)
 >>> => that means V4NET.13.13.104 is listed at rbl.test.ex
 >>> warn: condition test succeeded in ACL "check_vrfy"
 >>> check dnslists = rbl.test.ex!==127.0.0.3
 >>> dnslists check: rbl.test.ex!==127.0.0.3
 >>> dnslists: using result of previous lookup
 >>> DNS lookup for 104.13.13.V4NET.rbl.test.ex succeeded (yielding 255.255.255.255, 127.0.0.0)
 >>> => that means V4NET.13.13.104 is listed at rbl.test.ex
 >>> warn: condition test succeeded in ACL "check_vrfy"

->>> processing "warn" (TESTSUITE/test-config 32)
+>>> processing "warn" (TESTSUITE/test-config 33)

 >>> check dnslists = rbl.test.ex!==127.0.0.1,127.0.0.2
 >>> dnslists check: rbl.test.ex!==127.0.0.1,127.0.0.2
 >>> dnslists: using result of previous lookup
 >>> DNS lookup for 104.13.13.V4NET.rbl.test.ex succeeded (yielding 255.255.255.255, 127.0.0.0)
 >>> => that means V4NET.13.13.104 is listed at rbl.test.ex
 >>> warn: condition test succeeded in ACL "check_vrfy"
 >>> check dnslists = rbl.test.ex!==127.0.0.1,127.0.0.2
 >>> dnslists check: rbl.test.ex!==127.0.0.1,127.0.0.2
 >>> dnslists: using result of previous lookup
 >>> DNS lookup for 104.13.13.V4NET.rbl.test.ex succeeded (yielding 255.255.255.255, 127.0.0.0)
 >>> => that means V4NET.13.13.104 is listed at rbl.test.ex
 >>> warn: condition test succeeded in ACL "check_vrfy"

->>> processing "warn" (TESTSUITE/test-config 33)
+>>> processing "warn" (TESTSUITE/test-config 34)

 >>> check dnslists = rbl.test.ex
 >>> dnslists check: rbl.test.ex
 >>> dnslists: using result of previous lookup
 >>> check dnslists = rbl.test.ex
 >>> dnslists check: rbl.test.ex
 >>> dnslists: using result of previous lookup


@@ -819,7 +823,7 @@ LOG: VRFY failed for a@b H=[V4NET.13.13.103]
 LOG: DNS list lookup for V4NET.13.13.104 at rbl.test.ex returned 255.255.255.255; not in 127.0/8 and discarded
 >>> => that means V4NET.13.13.104 is listed at rbl.test.ex
 >>> warn: condition test succeeded in ACL "check_vrfy"
 LOG: DNS list lookup for V4NET.13.13.104 at rbl.test.ex returned 255.255.255.255; not in 127.0/8 and discarded
 >>> => that means V4NET.13.13.104 is listed at rbl.test.ex
 >>> warn: condition test succeeded in ACL "check_vrfy"

->>> processing "accept" (TESTSUITE/test-config 34)
+>>> processing "accept" (TESTSUITE/test-config 35)

 >>> accept: condition test succeeded in ACL "check_vrfy"
 >>> end of ACL "check_vrfy": ACCEPT
 >>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 >>> accept: condition test succeeded in ACL "check_vrfy"
 >>> end of ACL "check_vrfy": ACCEPT
 >>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>


@@ -839,7 +843,7 @@ LOG: VRFY failed for a@b H=[V4NET.13.13.104]
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> host in smtp_accept_max_nonmail_hosts? yes (matched "*")
 >>> using ACL "check_vrfy"
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> host in smtp_accept_max_nonmail_hosts? yes (matched "*")
 >>> using ACL "check_vrfy"

->>> processing "warn" (TESTSUITE/test-config 25)
+>>> processing "warn" (TESTSUITE/test-config 26)

 >>> check dnslists = rbl.test.ex=127.0.0.1
 >>> dnslists check: rbl.test.ex=127.0.0.1
 >>> new DNS lookup for 105.13.13.V4NET.rbl.test.ex
 >>> check dnslists = rbl.test.ex=127.0.0.1
 >>> dnslists check: rbl.test.ex=127.0.0.1
 >>> new DNS lookup for 105.13.13.V4NET.rbl.test.ex


@@ -848,21 +852,21 @@ LOG: VRFY failed for a@b H=[V4NET.13.13.104]
 >>> => but we are not accepting this block class because
 >>> => there was no match for =127.0.0.1
 >>> warn: condition test failed in ACL "check_vrfy"
 >>> => but we are not accepting this block class because
 >>> => there was no match for =127.0.0.1
 >>> warn: condition test failed in ACL "check_vrfy"

->>> processing "warn" (TESTSUITE/test-config 26)
+>>> processing "warn" (TESTSUITE/test-config 27)

 >>> check dnslists = rbl.test.ex!=127.0.0.1
 >>> dnslists check: rbl.test.ex!=127.0.0.1
 >>> dnslists: using result of previous lookup
 >>> DNS lookup for 105.13.13.V4NET.rbl.test.ex succeeded (yielding 255.255.255.255, 255.255.255.254)
 >>> => that means V4NET.13.13.105 is listed at rbl.test.ex
 >>> warn: condition test succeeded in ACL "check_vrfy"
 >>> check dnslists = rbl.test.ex!=127.0.0.1
 >>> dnslists check: rbl.test.ex!=127.0.0.1
 >>> dnslists: using result of previous lookup
 >>> DNS lookup for 105.13.13.V4NET.rbl.test.ex succeeded (yielding 255.255.255.255, 255.255.255.254)
 >>> => that means V4NET.13.13.105 is listed at rbl.test.ex
 >>> warn: condition test succeeded in ACL "check_vrfy"

->>> processing "warn" (TESTSUITE/test-config 27)
+>>> processing "warn" (TESTSUITE/test-config 28)

 >>> check dnslists = rbl.test.ex!=127.0.0.3
 >>> dnslists check: rbl.test.ex!=127.0.0.3
 >>> dnslists: using result of previous lookup
 >>> DNS lookup for 105.13.13.V4NET.rbl.test.ex succeeded (yielding 255.255.255.255, 255.255.255.254)
 >>> => that means V4NET.13.13.105 is listed at rbl.test.ex
 >>> warn: condition test succeeded in ACL "check_vrfy"
 >>> check dnslists = rbl.test.ex!=127.0.0.3
 >>> dnslists check: rbl.test.ex!=127.0.0.3
 >>> dnslists: using result of previous lookup
 >>> DNS lookup for 105.13.13.V4NET.rbl.test.ex succeeded (yielding 255.255.255.255, 255.255.255.254)
 >>> => that means V4NET.13.13.105 is listed at rbl.test.ex
 >>> warn: condition test succeeded in ACL "check_vrfy"

->>> processing "warn" (TESTSUITE/test-config 28)
+>>> processing "warn" (TESTSUITE/test-config 29)

 >>> check dnslists = rbl.test.ex==127.0.0.1
 >>> dnslists check: rbl.test.ex==127.0.0.1
 >>> dnslists: using result of previous lookup
 >>> check dnslists = rbl.test.ex==127.0.0.1
 >>> dnslists check: rbl.test.ex==127.0.0.1
 >>> dnslists: using result of previous lookup


@@ -870,7 +874,7 @@ LOG: VRFY failed for a@b H=[V4NET.13.13.104]
 >>> => but we are not accepting this block class because
 >>> => there was an IP address that did not match for ==127.0.0.1
 >>> warn: condition test failed in ACL "check_vrfy"
 >>> => but we are not accepting this block class because
 >>> => there was an IP address that did not match for ==127.0.0.1
 >>> warn: condition test failed in ACL "check_vrfy"

->>> processing "warn" (TESTSUITE/test-config 29)
+>>> processing "warn" (TESTSUITE/test-config 30)

 >>> check dnslists = rbl.test.ex==127.0.0.1,127.0.0.2
 >>> dnslists check: rbl.test.ex==127.0.0.1,127.0.0.2
 >>> dnslists: using result of previous lookup
 >>> check dnslists = rbl.test.ex==127.0.0.1,127.0.0.2
 >>> dnslists check: rbl.test.ex==127.0.0.1,127.0.0.2
 >>> dnslists: using result of previous lookup


@@ -878,28 +882,28 @@ LOG: VRFY failed for a@b H=[V4NET.13.13.104]
 >>> => but we are not accepting this block class because
 >>> => there was an IP address that did not match for ==127.0.0.1,127.0.0.2
 >>> warn: condition test failed in ACL "check_vrfy"
 >>> => but we are not accepting this block class because
 >>> => there was an IP address that did not match for ==127.0.0.1,127.0.0.2
 >>> warn: condition test failed in ACL "check_vrfy"

->>> processing "warn" (TESTSUITE/test-config 30)
+>>> processing "warn" (TESTSUITE/test-config 31)

 >>> check dnslists = rbl.test.ex!==127.0.0.1
 >>> dnslists check: rbl.test.ex!==127.0.0.1
 >>> dnslists: using result of previous lookup
 >>> DNS lookup for 105.13.13.V4NET.rbl.test.ex succeeded (yielding 255.255.255.255, 255.255.255.254)
 >>> => that means V4NET.13.13.105 is listed at rbl.test.ex
 >>> warn: condition test succeeded in ACL "check_vrfy"
 >>> check dnslists = rbl.test.ex!==127.0.0.1
 >>> dnslists check: rbl.test.ex!==127.0.0.1
 >>> dnslists: using result of previous lookup
 >>> DNS lookup for 105.13.13.V4NET.rbl.test.ex succeeded (yielding 255.255.255.255, 255.255.255.254)
 >>> => that means V4NET.13.13.105 is listed at rbl.test.ex
 >>> warn: condition test succeeded in ACL "check_vrfy"

->>> processing "warn" (TESTSUITE/test-config 31)
+>>> processing "warn" (TESTSUITE/test-config 32)

 >>> check dnslists = rbl.test.ex!==127.0.0.3
 >>> dnslists check: rbl.test.ex!==127.0.0.3
 >>> dnslists: using result of previous lookup
 >>> DNS lookup for 105.13.13.V4NET.rbl.test.ex succeeded (yielding 255.255.255.255, 255.255.255.254)
 >>> => that means V4NET.13.13.105 is listed at rbl.test.ex
 >>> warn: condition test succeeded in ACL "check_vrfy"
 >>> check dnslists = rbl.test.ex!==127.0.0.3
 >>> dnslists check: rbl.test.ex!==127.0.0.3
 >>> dnslists: using result of previous lookup
 >>> DNS lookup for 105.13.13.V4NET.rbl.test.ex succeeded (yielding 255.255.255.255, 255.255.255.254)
 >>> => that means V4NET.13.13.105 is listed at rbl.test.ex
 >>> warn: condition test succeeded in ACL "check_vrfy"

->>> processing "warn" (TESTSUITE/test-config 32)
+>>> processing "warn" (TESTSUITE/test-config 33)

 >>> check dnslists = rbl.test.ex!==127.0.0.1,127.0.0.2
 >>> dnslists check: rbl.test.ex!==127.0.0.1,127.0.0.2
 >>> dnslists: using result of previous lookup
 >>> DNS lookup for 105.13.13.V4NET.rbl.test.ex succeeded (yielding 255.255.255.255, 255.255.255.254)
 >>> => that means V4NET.13.13.105 is listed at rbl.test.ex
 >>> warn: condition test succeeded in ACL "check_vrfy"
 >>> check dnslists = rbl.test.ex!==127.0.0.1,127.0.0.2
 >>> dnslists check: rbl.test.ex!==127.0.0.1,127.0.0.2
 >>> dnslists: using result of previous lookup
 >>> DNS lookup for 105.13.13.V4NET.rbl.test.ex succeeded (yielding 255.255.255.255, 255.255.255.254)
 >>> => that means V4NET.13.13.105 is listed at rbl.test.ex
 >>> warn: condition test succeeded in ACL "check_vrfy"

->>> processing "warn" (TESTSUITE/test-config 33)
+>>> processing "warn" (TESTSUITE/test-config 34)

 >>> check dnslists = rbl.test.ex
 >>> dnslists check: rbl.test.ex
 >>> dnslists: using result of previous lookup
 >>> check dnslists = rbl.test.ex
 >>> dnslists check: rbl.test.ex
 >>> dnslists: using result of previous lookup


@@ -907,7 +911,7 @@ LOG: VRFY failed for a@b H=[V4NET.13.13.104]
 LOG: DNS list lookup for V4NET.13.13.105 at rbl.test.ex returned 255.255.255.255; not in 127.0/8 and discarded
 LOG: DNS list lookup for V4NET.13.13.105 at rbl.test.ex returned 255.255.255.254; not in 127.0/8 and discarded
 >>> warn: condition test failed in ACL "check_vrfy"
 LOG: DNS list lookup for V4NET.13.13.105 at rbl.test.ex returned 255.255.255.255; not in 127.0/8 and discarded
 LOG: DNS list lookup for V4NET.13.13.105 at rbl.test.ex returned 255.255.255.254; not in 127.0/8 and discarded
 >>> warn: condition test failed in ACL "check_vrfy"

->>> processing "accept" (TESTSUITE/test-config 34)
+>>> processing "accept" (TESTSUITE/test-config 35)

 >>> accept: condition test succeeded in ACL "check_vrfy"
 >>> end of ACL "check_vrfy": ACCEPT
 >>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 >>> accept: condition test succeeded in ACL "check_vrfy"
 >>> end of ACL "check_vrfy": ACCEPT
 >>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>

diff --git a/test/stderr/0145 b/test/stderr/0145
index 79a6f4ab1bda3483bfc01c6a7114eb9248432bc1..a117057308cbcfbb5283f55eacc24b0ba1e24655 100644 (file)
--- a/test/stderr/0145
+++ b/test/stderr/0145
@@ -6,6 +6,7 @@
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)

+>>> test in helo_lookup_domains? no (end of list)

 >>> using ACL "check_recipient"
 >>> processing "require" (TESTSUITE/test-config 18)
 >>> check verify = sender
 >>> using ACL "check_recipient"
 >>> processing "require" (TESTSUITE/test-config 18)
 >>> check verify = sender


@@ -19,8 +20,8 @@
 >>> ----------- end verify ------------
 >>> require: condition test failed in ACL "check_recipient"
 >>> end of ACL "check_recipient": not OK
 >>> ----------- end verify ------------
 >>> require: condition test failed in ACL "check_recipient"
 >>> end of ACL "check_recipient": not OK

-LOG: H=[V4NET.9.8.7] sender verify fail for <x@mxt10.test.ex>: all relevant MX records point to non-existent hosts or (invalidly) to IP addresses
-LOG: H=[V4NET.9.8.7] F=<x@mxt10.test.ex> rejected RCPT <x@y>: Sender verify failed
+LOG: H=(test) [V4NET.9.8.7] sender verify fail for <x@mxt10.test.ex>: all relevant MX records point to non-existent hosts or (invalidly) to IP addresses
+LOG: H=(test) [V4NET.9.8.7] F=<x@mxt10.test.ex> rejected RCPT <x@y>: Sender verify failed

 >>> host in hosts_connection_nolog? no (option unset)
 >>> host in host_lookup? no (option unset)
 >>> host in host_reject_connection? no (option unset)
 >>> host in hosts_connection_nolog? no (option unset)
 >>> host in host_lookup? no (option unset)
 >>> host in host_reject_connection? no (option unset)


@@ -29,6 +30,7 @@ LOG: H=[V4NET.9.8.7] F=<x@mxt10.test.ex> rejected RCPT <x@y>: Sender verify fail
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)

+>>> test in helo_lookup_domains? no (end of list)

 >>> using ACL "check_recipient"
 >>> processing "require" (TESTSUITE/test-config 18)
 >>> check verify = sender
 >>> using ACL "check_recipient"
 >>> processing "require" (TESTSUITE/test-config 18)
 >>> check verify = sender


@@ -51,4 +53,4 @@ LOG: H=[V4NET.9.8.7] F=<x@mxt10.test.ex> rejected RCPT <x@y>: Sender verify fail
 >>> ----------- end verify ------------
 >>> require: condition test failed in ACL "check_recipient"
 >>> end of ACL "check_recipient": not OK
 >>> ----------- end verify ------------
 >>> require: condition test failed in ACL "check_recipient"
 >>> end of ACL "check_recipient": not OK

-LOG: H=[V4NET.9.8.7] F=<x@ten-1.test.ex> rejected RCPT <x@mxt10.test.ex>: all relevant MX records point to non-existent hosts or (invalidly) to IP addresses
+LOG: H=(test) [V4NET.9.8.7] F=<x@ten-1.test.ex> rejected RCPT <x@mxt10.test.ex>: all relevant MX records point to non-existent hosts or (invalidly) to IP addresses

diff --git a/test/stderr/0157 b/test/stderr/0157
index df37cedcfa0235bd6921a5365eaa1ee0d9b49bad..f4565c76c52006f4405138358d969f927e1d0161 100644 (file)
--- a/test/stderr/0157
+++ b/test/stderr/0157
@@ -6,6 +6,7 @@
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)

+>>> test in helo_lookup_domains? no (end of list)

 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 19)
 >>> check hosts = :
 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 19)
 >>> check hosts = :


@@ -24,7 +25,7 @@
 >>> x@y.z in "userx@test.ex"? no (end of list)
 >>> accept: condition test failed in ACL "check_recipient"
 >>> accept: endpass encountered - denying access
 >>> x@y.z in "userx@test.ex"? no (end of list)
 >>> accept: condition test failed in ACL "check_recipient"
 >>> accept: endpass encountered - denying access

-LOG: H=[V4NET.0.0.1] F=<x@y.z> rejected RCPT <a@b.c>: invalid sender
+LOG: H=(test) [V4NET.0.0.1] F=<x@y.z> rejected RCPT <a@b.c>: invalid sender

 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 19)
 >>> check hosts = :
 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 19)
 >>> check hosts = :


@@ -52,6 +53,7 @@ LOG: H=[V4NET.0.0.1] F=<x@y.z> rejected RCPT <a@b.c>: invalid sender
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)

+>>> test in helo_lookup_domains? no (end of list)

 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 19)
 >>> check hosts = :
 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 19)
 >>> check hosts = :


@@ -99,6 +101,7 @@ LOG: H=[V4NET.0.0.1] F=<x@y.z> rejected RCPT <a@b.c>: invalid sender
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)

+>>> test in helo_lookup_domains? no (end of list)

 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 19)
 >>> check hosts = :
 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 19)
 >>> check hosts = :


@@ -122,7 +125,7 @@ LOG: H=[V4NET.0.0.1] F=<x@y.z> rejected RCPT <a@b.c>: invalid sender
 >>>   message: relay not permitted
 >>> deny: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": DENY
 >>>   message: relay not permitted
 >>> deny: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": DENY

-LOG: H=[V4NET.0.0.3] F=<x@y.z> rejected RCPT <a@b.c>: relay not permitted
+LOG: H=(test) [V4NET.0.0.3] F=<x@y.z> rejected RCPT <a@b.c>: relay not permitted

 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 19)
 >>> check hosts = :
 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 19)
 >>> check hosts = :


@@ -145,4 +148,4 @@ LOG: H=[V4NET.0.0.3] F=<x@y.z> rejected RCPT <a@b.c>: relay not permitted
 >>>   message: relay not permitted
 >>> deny: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": DENY
 >>>   message: relay not permitted
 >>> deny: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": DENY

-LOG: H=[V4NET.0.0.3] F=<userx@test.ex> rejected RCPT <a@b.c>: relay not permitted
+LOG: H=(test) [V4NET.0.0.3] F=<userx@test.ex> rejected RCPT <a@b.c>: relay not permitted

diff --git a/test/stderr/0175 b/test/stderr/0175
index 684b2b428c522c8aec104fbd1fea70d6b27bde96..014979ad5a7ced8c24904e9c19bce6ec948af765 100644 (file)
--- a/test/stderr/0175
+++ b/test/stderr/0175
@@ -6,6 +6,7 @@
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)

+>>> test in helo_lookup_domains? no (end of list)

 >>> using ACL "check_recipient"
 >>> processing "require" (TESTSUITE/test-config 18)
 >>> check verify = sender
 >>> using ACL "check_recipient"
 >>> processing "require" (TESTSUITE/test-config 18)
 >>> check verify = sender


@@ -24,8 +25,8 @@ MUNGED: ::1 will be omitted in what follows
 >>> ----------- end verify ------------
 >>> require: condition test failed in ACL "check_recipient"
 >>> end of ACL "check_recipient": not OK
 >>> ----------- end verify ------------
 >>> require: condition test failed in ACL "check_recipient"
 >>> end of ACL "check_recipient": not OK

-LOG: H=[V4NET.0.0.0] sender verify fail for <user@bad.domain>: remote host address is the local host
-LOG: H=[V4NET.0.0.0] F=<user@bad.domain> rejected RCPT <userx@test.ex>: Sender verify failed
+LOG: H=(test) [V4NET.0.0.0] sender verify fail for <user@bad.domain>: remote host address is the local host
+LOG: H=(test) [V4NET.0.0.0] F=<user@bad.domain> rejected RCPT <userx@test.ex>: Sender verify failed

 >>> host in hosts_connection_nolog? no (option unset)
 >>> host in host_lookup? no (option unset)
 >>> host in host_reject_connection? no (option unset)
 >>> host in hosts_connection_nolog? no (option unset)
 >>> host in host_lookup? no (option unset)
 >>> host in host_reject_connection? no (option unset)


@@ -34,6 +35,7 @@ LOG: H=[V4NET.0.0.0] F=<user@bad.domain> rejected RCPT <userx@test.ex>: Sender v
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)

+>>> test in helo_lookup_domains? no (end of list)

 >>> using ACL "check_recipient"
 >>> processing "require" (TESTSUITE/test-config 18)
 >>> check verify = sender
 >>> using ACL "check_recipient"
 >>> processing "require" (TESTSUITE/test-config 18)
 >>> check verify = sender


@@ -55,8 +57,8 @@ MUNGED: ::1 will be omitted in what follows
 >>> ----------- end verify ------------
 >>> require: condition test failed in ACL "check_recipient"
 >>> end of ACL "check_recipient": not OK
 >>> ----------- end verify ------------
 >>> require: condition test failed in ACL "check_recipient"
 >>> end of ACL "check_recipient": not OK

-LOG: H=[V4NET.0.0.0] sender verify fail for <user@bad.domain2>: fail_sender2 router forced verify failure
-LOG: H=[V4NET.0.0.0] F=<user@bad.domain2> rejected RCPT <userx@test.ex>: Sender verify failed
+LOG: H=(test) [V4NET.0.0.0] sender verify fail for <user@bad.domain2>: fail_sender2 router forced verify failure
+LOG: H=(test) [V4NET.0.0.0] F=<user@bad.domain2> rejected RCPT <userx@test.ex>: Sender verify failed

 >>> host in hosts_connection_nolog? no (option unset)
 >>> host in host_lookup? no (option unset)
 >>> host in host_reject_connection? no (option unset)
 >>> host in hosts_connection_nolog? no (option unset)
 >>> host in host_lookup? no (option unset)
 >>> host in host_reject_connection? no (option unset)


@@ -65,6 +67,7 @@ LOG: H=[V4NET.0.0.0] F=<user@bad.domain2> rejected RCPT <userx@test.ex>: Sender
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)

+>>> test in helo_lookup_domains? no (end of list)

 >>> using ACL "check_recipient"
 >>> processing "require" (TESTSUITE/test-config 18)
 >>> check verify = sender
 >>> using ACL "check_recipient"
 >>> processing "require" (TESTSUITE/test-config 18)
 >>> check verify = sender


@@ -91,4 +94,4 @@ LOG: H=[V4NET.0.0.0] F=<user@bad.domain2> rejected RCPT <userx@test.ex>: Sender
 >>> test.ex in "+local_domains"? yes (matched "+local_domains")
 >>> accept: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": ACCEPT
 >>> test.ex in "+local_domains"? yes (matched "+local_domains")
 >>> accept: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": ACCEPT

-LOG: 10HmaX-0005vi-00 <= user@ten-1.test.ex H=[V4NET.0.0.0] P=smtp S=sss
+LOG: 10HmaX-0005vi-00 <= user@ten-1.test.ex H=(test) [V4NET.0.0.0] P=smtp S=sss

diff --git a/test/stderr/0227 b/test/stderr/0227
index 36e6ee75d04c915ce0340fe607ceda9b31ed009f..71b9637ff7031e2aceed0ea917784388d54a3145 100644 (file)
--- a/test/stderr/0227
+++ b/test/stderr/0227
@@ -31,9 +31,9 @@ Connecting to 127.0.0.1 [127.0.0.1]:1224 ...  connected
   SMTP<< 250 OK
   SMTP(close)>>
 LOG: MAIN REJECT
   SMTP<< 250 OK
   SMTP(close)>>
 LOG: MAIN REJECT

-  H=[V4NET.0.0.1] U=root sender verify fail for <bad@localhost>: 127.0.0.1 [127.0.0.1] : SMTP error from remote mail server after RCPT TO:<bad@localhost>: 550 Unknown user
+  H=(test) [V4NET.0.0.1] U=root sender verify fail for <bad@localhost>: 127.0.0.1 [127.0.0.1] : SMTP error from remote mail server after RCPT TO:<bad@localhost>: 550 Unknown user

 LOG: MAIN REJECT
 LOG: MAIN REJECT

-  H=[V4NET.0.0.1] U=root F=<bad@localhost> rejected RCPT <z@test.ex>: Sender verify failed
+  H=(test) [V4NET.0.0.1] U=root F=<bad@localhost> rejected RCPT <z@test.ex>: Sender verify failed

 LOG: smtp_connection MAIN
   SMTP connection from root closed by QUIT
 LOG: smtp_connection MAIN
 LOG: smtp_connection MAIN
   SMTP connection from root closed by QUIT
 LOG: smtp_connection MAIN


@@ -50,9 +50,9 @@ Connecting to 127.0.0.1 [127.0.0.1]:1224 ...  connected
   SMTP<< 250 OK
   SMTP(close)>>
 LOG: MAIN REJECT
   SMTP<< 250 OK
   SMTP(close)>>
 LOG: MAIN REJECT

-  H=[V4NET.0.0.1] U=root sender verify defer for <uncheckable@localhost1>: Could not complete sender verify callout: 127.0.0.1 [127.0.0.1] : SMTP error from remote mail server after RCPT TO:<uncheckable@localhost1>: 450 Temporary error
+  H=(test) [V4NET.0.0.1] U=root sender verify defer for <uncheckable@localhost1>: Could not complete sender verify callout: 127.0.0.1 [127.0.0.1] : SMTP error from remote mail server after RCPT TO:<uncheckable@localhost1>: 450 Temporary error

 LOG: MAIN REJECT
 LOG: MAIN REJECT

-  H=[V4NET.0.0.1] U=root F=<uncheckable@localhost1> temporarily rejected RCPT <z@test.ex>: Could not complete sender verify callout
+  H=(test) [V4NET.0.0.1] U=root F=<uncheckable@localhost1> temporarily rejected RCPT <z@test.ex>: Could not complete sender verify callout

 LOG: smtp_connection MAIN
   SMTP connection from root closed by QUIT
 LOG: smtp_connection MAIN
 LOG: smtp_connection MAIN
   SMTP connection from root closed by QUIT
 LOG: smtp_connection MAIN


@@ -67,9 +67,9 @@ Connecting to 127.0.0.1 [127.0.0.1]:1224 ...  connected
   SMTP<< 250 OK
   SMTP(close)>>
 LOG: MAIN REJECT
   SMTP<< 250 OK
   SMTP(close)>>
 LOG: MAIN REJECT

-  H=[V4NET.0.0.1] U=root sender verify fail for <uncheckable2@localhost1>: 127.0.0.1 [127.0.0.1] : response to "MAIL FROM:<>" was: 550 Error for <>
+  H=(test) [V4NET.0.0.1] U=root sender verify fail for <uncheckable2@localhost1>: 127.0.0.1 [127.0.0.1] : response to "MAIL FROM:<>" was: 550 Error for <>

 LOG: MAIN REJECT
 LOG: MAIN REJECT

-  H=[V4NET.0.0.1] U=root F=<uncheckable2@localhost1> rejected RCPT <z@test.ex>: Sender verify failed
+  H=(test) [V4NET.0.0.1] U=root F=<uncheckable2@localhost1> rejected RCPT <z@test.ex>: Sender verify failed

 LOG: smtp_connection MAIN
   SMTP connection from root closed by QUIT
 LOG: smtp_connection MAIN
 LOG: smtp_connection MAIN
   SMTP connection from root closed by QUIT
 LOG: smtp_connection MAIN


@@ -85,9 +85,9 @@ Connecting to 127.0.0.1 [127.0.0.1]:1224 ...  connected
   SMTP<< 250 OK
   SMTP(close)>>
 LOG: MAIN REJECT
   SMTP<< 250 OK
   SMTP(close)>>
 LOG: MAIN REJECT

-  H=[V4NET.0.0.1] U=root sender verify fail for <uncheckable@localhost1>: 127.0.0.1 [127.0.0.1] : response to "MAIL FROM:<>" was: 550-Multiline error for <>\n550 Here's the second line
+  H=(test) [V4NET.0.0.1] U=root sender verify fail for <uncheckable@localhost1>: 127.0.0.1 [127.0.0.1] : response to "MAIL FROM:<>" was: 550-Multiline error for <>\n550 Here's the second line

 LOG: MAIN REJECT
 LOG: MAIN REJECT

-  H=[V4NET.0.0.1] U=root F=<uncheckable@localhost1> rejected RCPT <z@test.ex>: Sender verify failed
+  H=(test) [V4NET.0.0.1] U=root F=<uncheckable@localhost1> rejected RCPT <z@test.ex>: Sender verify failed

 LOG: smtp_connection MAIN
   SMTP connection from root closed by QUIT
 LOG: smtp_connection MAIN
 LOG: smtp_connection MAIN
   SMTP connection from root closed by QUIT
 LOG: smtp_connection MAIN


@@ -102,9 +102,9 @@ Connecting to 127.0.0.1 [127.0.0.1]:1224 ...  connected
   SMTP<< 250 OK
   SMTP(close)>>
 LOG: MAIN REJECT
   SMTP<< 250 OK
   SMTP(close)>>
 LOG: MAIN REJECT

-  H=[V4NET.0.0.1] U=root sender verify fail for <uncheckable2@localhost1>: 127.0.0.1 [127.0.0.1] : response to "MAIL FROM:<>" was: 550 Bad-char error for <> topbitchar:\200\377\377
+  H=(test) [V4NET.0.0.1] U=root sender verify fail for <uncheckable2@localhost1>: 127.0.0.1 [127.0.0.1] : response to "MAIL FROM:<>" was: 550 Bad-char error for <> topbitchar:\200\377\377

 LOG: MAIN REJECT
 LOG: MAIN REJECT

-  H=[V4NET.0.0.1] U=root F=<uncheckable2@localhost1> rejected RCPT <z@test.ex>: Sender verify failed
+  H=(test) [V4NET.0.0.1] U=root F=<uncheckable2@localhost1> rejected RCPT <z@test.ex>: Sender verify failed

 LOG: smtp_connection MAIN
   SMTP connection from root closed by QUIT
 LOG: smtp_connection MAIN
 LOG: smtp_connection MAIN
   SMTP connection from root closed by QUIT
 LOG: smtp_connection MAIN


@@ -121,7 +121,7 @@ Connecting to 127.0.0.1 [127.0.0.1]:1224 ...  connected
   SMTP<< 250 OK
   SMTP(close)>>
 LOG: MAIN REJECT
   SMTP<< 250 OK
   SMTP(close)>>
 LOG: MAIN REJECT

-  H=[V4NET.0.0.3] U=root F=<uncheckable@localhost1> rejected RCPT <z@remote.domain>: 127.0.0.1 [127.0.0.1] : SMTP error from remote mail server after RCPT TO:<z@remote.domain>: 550 Recipient not liked
+  H=(test) [V4NET.0.0.3] U=root F=<uncheckable@localhost1> rejected RCPT <z@remote.domain>: 127.0.0.1 [127.0.0.1] : SMTP error from remote mail server after RCPT TO:<z@remote.domain>: 550 Recipient not liked

 LOG: smtp_connection MAIN
   SMTP connection from root closed by QUIT
 LOG: smtp_connection MAIN
 LOG: smtp_connection MAIN
   SMTP connection from root closed by QUIT
 LOG: smtp_connection MAIN


@@ -139,7 +139,7 @@ Connecting to 127.0.0.1 [127.0.0.1]:1224 ...  connected
   SMTP<< 250 OK
   SMTP(close)>>
 LOG: MAIN REJECT
   SMTP<< 250 OK
   SMTP(close)>>
 LOG: MAIN REJECT

-  H=[V4NET.0.0.3] U=root F=<uncheckable@localhost1> rejected RCPT <z@remote.domain>: 127.0.0.1 [127.0.0.1] : SMTP error from remote mail server after RCPT TO:<z@remote.domain>: 550-Recipient not liked on two lines\n550 Here's the second
+  H=(test) [V4NET.0.0.3] U=root F=<uncheckable@localhost1> rejected RCPT <z@remote.domain>: 127.0.0.1 [127.0.0.1] : SMTP error from remote mail server after RCPT TO:<z@remote.domain>: 550-Recipient not liked on two lines\n550 Here's the second

 LOG: smtp_connection MAIN
   SMTP connection from root closed by QUIT
 LOG: smtp_connection MAIN
 LOG: smtp_connection MAIN
   SMTP connection from root closed by QUIT
 LOG: smtp_connection MAIN


@@ -156,7 +156,7 @@ Connecting to 127.0.0.1 [127.0.0.1]:1224 ...  connected
   SMTP<< 250 OK
   SMTP(close)>>
 LOG: MAIN REJECT
   SMTP<< 250 OK
   SMTP(close)>>
 LOG: MAIN REJECT

-  H=[V4NET.0.0.3] U=root F=<uncheckable@localhost1> rejected RCPT <z@remote.domain>: 127.0.0.1 [127.0.0.1] : SMTP error from remote mail server after RCPT TO:<z@remote.domain>: 550 Recipient not liked, with bad char:\200\377\377
+  H=(test) [V4NET.0.0.3] U=root F=<uncheckable@localhost1> rejected RCPT <z@remote.domain>: 127.0.0.1 [127.0.0.1] : SMTP error from remote mail server after RCPT TO:<z@remote.domain>: 550 Recipient not liked, with bad char:\200\377\377

 LOG: smtp_connection MAIN
   SMTP connection from root closed by QUIT
 LOG: smtp_connection MAIN
 LOG: smtp_connection MAIN
   SMTP connection from root closed by QUIT
 LOG: smtp_connection MAIN


@@ -164,7 +164,7 @@ LOG: smtp_connection MAIN
 Connecting to 127.0.0.1 [127.0.0.1]:1224 ...  failed: Connection refused
 Connecting to ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4]:1224 ...  failed: Connection refused
 LOG: MAIN REJECT
 Connecting to 127.0.0.1 [127.0.0.1]:1224 ...  failed: Connection refused
 Connecting to ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4]:1224 ...  failed: Connection refused
 LOG: MAIN REJECT

-  H=[V4NET.0.0.3] U=root F=<uncheckable@localhost1> temporarily rejected RCPT <z@remote.domain>: Could not complete recipient verify callout
+  H=(test) [V4NET.0.0.3] U=root F=<uncheckable@localhost1> temporarily rejected RCPT <z@remote.domain>: Could not complete recipient verify callout

 LOG: smtp_connection MAIN
   SMTP connection from root closed by QUIT
 LOG: smtp_connection MAIN
 LOG: smtp_connection MAIN
   SMTP connection from root closed by QUIT
 LOG: smtp_connection MAIN


@@ -181,7 +181,7 @@ Connecting to 127.0.0.1 [127.0.0.1]:1224 ...  connected
   SMTP<< 250 OK
   SMTP(close)>>
 LOG: MAIN REJECT
   SMTP<< 250 OK
   SMTP(close)>>
 LOG: MAIN REJECT

-  H=[V4NET.0.0.4] U=root F=<uncheckable@localhost1> rejected after DATA: there is no valid sender in any header line
+  H=(test) [V4NET.0.0.4] U=root F=<uncheckable@localhost1> rejected after DATA: there is no valid sender in any header line

 LOG: smtp_connection MAIN
   SMTP connection from root closed by QUIT
 LOG: smtp_connection MAIN
 LOG: smtp_connection MAIN
   SMTP connection from root closed by QUIT
 LOG: smtp_connection MAIN


@@ -198,7 +198,7 @@ Connecting to 127.0.0.1 [127.0.0.1]:1224 ...  connected
   SMTP<< 250 OK
   SMTP(close)>>
 LOG: MAIN REJECT
   SMTP<< 250 OK
   SMTP(close)>>
 LOG: MAIN REJECT

-  H=[V4NET.0.0.4] U=root F=<uncheckable@localhost1> rejected after DATA: there is no valid sender in any header line
+  H=(test) [V4NET.0.0.4] U=root F=<uncheckable@localhost1> rejected after DATA: there is no valid sender in any header line

 LOG: smtp_connection MAIN
   SMTP connection from root closed by QUIT
 LOG: smtp_connection MAIN
 LOG: smtp_connection MAIN
   SMTP connection from root closed by QUIT
 LOG: smtp_connection MAIN


@@ -222,7 +222,7 @@ Cutthrough cancelled by presence of postmaster verify
   SMTP<< 250 OK
   SMTP(close)>>
 LOG: MAIN REJECT
   SMTP<< 250 OK
   SMTP(close)>>
 LOG: MAIN REJECT

-  H=[V4NET.0.0.5] U=root F=<ok@localhost1> rejected RCPT <z@remote.domain>: relay not permitted
+  H=(test) [V4NET.0.0.5] U=root F=<ok@localhost1> rejected RCPT <z@remote.domain>: relay not permitted

 LOG: smtp_connection MAIN
   SMTP connection from root closed by QUIT
 LOG: smtp_connection MAIN
 LOG: smtp_connection MAIN
   SMTP connection from root closed by QUIT
 LOG: smtp_connection MAIN


@@ -246,9 +246,9 @@ Cutthrough cancelled by presence of postmaster verify
   SMTP<< 250 OK
   SMTP(close)>>
 LOG: MAIN REJECT
   SMTP<< 250 OK
   SMTP(close)>>
 LOG: MAIN REJECT

-  H=[V4NET.0.0.5] U=root sender verify fail for <ok@localhost1>: 127.0.0.1 [127.0.0.1] : SMTP error from remote mail server after RCPT TO:<postmaster@localhost1>: 550 Don't like postmaster
+  H=(test) [V4NET.0.0.5] U=root sender verify fail for <ok@localhost1>: 127.0.0.1 [127.0.0.1] : SMTP error from remote mail server after RCPT TO:<postmaster@localhost1>: 550 Don't like postmaster

 LOG: MAIN REJECT
 LOG: MAIN REJECT

-  H=[V4NET.0.0.5] U=root F=<ok@localhost1> rejected RCPT <z@remote.domain>: Sender verify failed
+  H=(test) [V4NET.0.0.5] U=root F=<ok@localhost1> rejected RCPT <z@remote.domain>: Sender verify failed

 LOG: smtp_connection MAIN
   SMTP connection from root closed by QUIT
 LOG: smtp_connection MAIN
 LOG: smtp_connection MAIN
   SMTP connection from root closed by QUIT
 LOG: smtp_connection MAIN


@@ -345,7 +345,7 @@ Connecting to 127.0.0.1 [127.0.0.1]:1224 ...  connected
   SMTP<< 250 OK
   SMTP(close)>>
 LOG: MAIN REJECT
   SMTP<< 250 OK
   SMTP(close)>>
 LOG: MAIN REJECT

-  H=[V4NET.0.0.3] U=root F=<uncheckable@localhost1> rejected RCPT <z@remote.lmtp>: 127.0.0.1 [127.0.0.1] : SMTP error from remote mail server after RCPT TO:<z@remote.lmtp>: 550 Recipient not liked
+  H=(test) [V4NET.0.0.3] U=root F=<uncheckable@localhost1> rejected RCPT <z@remote.lmtp>: 127.0.0.1 [127.0.0.1] : SMTP error from remote mail server after RCPT TO:<z@remote.lmtp>: 550 Recipient not liked

 LOG: smtp_connection MAIN
   SMTP connection from root closed by QUIT
 LOG: smtp_connection MAIN
 LOG: smtp_connection MAIN
   SMTP connection from root closed by QUIT
 LOG: smtp_connection MAIN


@@ -354,17 +354,17 @@ Connecting to 127.0.0.1 [127.0.0.1]:1224 ...  connected
   SMTP(closed)<<
   SMTP(close)>>
 LOG: MAIN REJECT
   SMTP(closed)<<
   SMTP(close)>>
 LOG: MAIN REJECT

-  H=[V4NET.0.0.1] U=root sender verify defer for <bad@localhost1>: Could not complete sender verify callout: 127.0.0.1 [127.0.0.1] : Remote host closed connection in response to initial connection
+  H=(test) [V4NET.0.0.1] U=root sender verify defer for <bad@localhost1>: Could not complete sender verify callout: 127.0.0.1 [127.0.0.1] : Remote host closed connection in response to initial connection

 LOG: MAIN REJECT
 LOG: MAIN REJECT

-  H=[V4NET.0.0.1] U=root F=<bad@localhost1> temporarily rejected RCPT <z@test.ex>: Could not complete sender verify callout
+  H=(test) [V4NET.0.0.1] U=root F=<bad@localhost1> temporarily rejected RCPT <z@test.ex>: Could not complete sender verify callout

 LOG: smtp_connection MAIN
   SMTP connection from root closed by QUIT
 LOG: smtp_connection MAIN
   SMTP connection from root
 Connecting to 127.0.0.1 [127.0.0.1]:1224 ...  failed: Connection refused
 LOG: MAIN REJECT
 LOG: smtp_connection MAIN
   SMTP connection from root closed by QUIT
 LOG: smtp_connection MAIN
   SMTP connection from root
 Connecting to 127.0.0.1 [127.0.0.1]:1224 ...  failed: Connection refused
 LOG: MAIN REJECT

-  H=[V4NET.0.0.1] U=root sender verify defer for <bad@localhost1>: Could not complete sender verify callout: 127.0.0.1 [127.0.0.1] : Connection refused
+  H=(test) [V4NET.0.0.1] U=root sender verify defer for <bad@localhost1>: Could not complete sender verify callout: 127.0.0.1 [127.0.0.1] : Connection refused

 LOG: MAIN REJECT
 LOG: MAIN REJECT

-  H=[V4NET.0.0.1] U=root F=<bad@localhost1> temporarily rejected RCPT <z@test.ex>: Could not complete sender verify callout
+  H=(test) [V4NET.0.0.1] U=root F=<bad@localhost1> temporarily rejected RCPT <z@test.ex>: Could not complete sender verify callout

 LOG: smtp_connection MAIN
   SMTP connection from root closed by QUIT
 LOG: smtp_connection MAIN
   SMTP connection from root closed by QUIT

diff --git a/test/stderr/0234 b/test/stderr/0234
index ffc440678b2cc2ffefb6e0252eb573cd52d3b265..5455bb854014fe9cd9e228f66b60029b9195e3fa 100644 (file)
--- a/test/stderr/0234
+++ b/test/stderr/0234
@@ -6,6 +6,7 @@
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)

+>>> test in helo_lookup_domains? no (end of list)

 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 19)
 >>> check domains = +relay_domains
 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 19)
 >>> check domains = +relay_domains


@@ -16,7 +17,7 @@
 >>>   message: relay not permitted
 >>> deny: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": DENY
 >>>   message: relay not permitted
 >>> deny: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": DENY

-LOG: H=[V4NET.0.0.0] F=<a@b> rejected RCPT <c@d>: relay not permitted
+LOG: H=(test) [V4NET.0.0.0] F=<a@b> rejected RCPT <c@d>: relay not permitted

 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 19)
 >>> check domains = +relay_domains
 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 19)
 >>> check domains = +relay_domains

diff --git a/test/stderr/0251 b/test/stderr/0251
index a118e5cb3fcea4c7cc4ffa42c4b7d4a2fd0fa5ed..87595bc909850ec1ca480361f7c5fa08c1acb2cd 100644 (file)
--- a/test/stderr/0251
+++ b/test/stderr/0251
@@ -6,6 +6,7 @@
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)

+>>> test in helo_lookup_domains? no (end of list)

 >>> using ACL "check_recipient"
 >>> processing "deny" (TESTSUITE/test-config 20)
 >>>   message: unrouteable address
 >>> using ACL "check_recipient"
 >>> processing "deny" (TESTSUITE/test-config 20)
 >>>   message: unrouteable address

diff --git a/test/stderr/0281 b/test/stderr/0281
index 5c58bd3afbb1a5ecb7d061d3bda68b28dc415140..ccdf4f3d6a00664ae3fd19ccdbbd273f1db3cb30 100644 (file)
--- a/test/stderr/0281
+++ b/test/stderr/0281
@@ -6,6 +6,7 @@
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)

+>>> test in helo_lookup_domains? no (end of list)

 >>> using ACL "acl_rcpt_1"
 >>> processing "require" (TESTSUITE/test-config 19)
 >>>   message: domain doesn't match @ or @[]
 >>> using ACL "acl_rcpt_1"
 >>> processing "require" (TESTSUITE/test-config 19)
 >>>   message: domain doesn't match @ or @[]


@@ -31,7 +32,7 @@
 >>> else.where in "@ : @[]"? no (end of list)
 >>> require: condition test failed in ACL "acl_rcpt_1"
 >>> end of ACL "acl_rcpt_1": not OK
 >>> else.where in "@ : @[]"? no (end of list)
 >>> require: condition test failed in ACL "acl_rcpt_1"
 >>> end of ACL "acl_rcpt_1": not OK

-LOG: H=[V4NET.1.1.1] F=<x@y> rejected RCPT <1@else.where>: domain doesn't match @ or @[]
+LOG: H=(test) [V4NET.1.1.1] F=<x@y> rejected RCPT <1@else.where>: domain doesn't match @ or @[]

 >>> using ACL "acl_rcpt_2"
 >>> processing "require" (TESTSUITE/test-config 24)
 >>>   message: domain doesn't match @mx_any
 >>> using ACL "acl_rcpt_2"
 >>> processing "require" (TESTSUITE/test-config 24)
 >>>   message: domain doesn't match @mx_any


@@ -78,7 +79,7 @@ LOG: H=[V4NET.1.1.1] F=<x@y> rejected RCPT <1@else.where>: domain doesn't match
 >>> mxt9.test.ex in "@mx_any"? no (end of list)
 >>> require: condition test failed in ACL "acl_rcpt_2"
 >>> end of ACL "acl_rcpt_2": not OK
 >>> mxt9.test.ex in "@mx_any"? no (end of list)
 >>> require: condition test failed in ACL "acl_rcpt_2"
 >>> end of ACL "acl_rcpt_2": not OK

-LOG: H=[V4NET.1.1.1] F=<x@y> rejected RCPT <2@mxt9.test.ex>: domain doesn't match @mx_any
+LOG: H=(test) [V4NET.1.1.1] F=<x@y> rejected RCPT <2@mxt9.test.ex>: domain doesn't match @mx_any

 >>> using ACL "acl_rcpt_2"
 >>> processing "require" (TESTSUITE/test-config 24)
 >>>   message: domain doesn't match @mx_any
 >>> using ACL "acl_rcpt_2"
 >>> processing "require" (TESTSUITE/test-config 24)
 >>>   message: domain doesn't match @mx_any


@@ -86,7 +87,7 @@ LOG: H=[V4NET.1.1.1] F=<x@y> rejected RCPT <2@mxt9.test.ex>: domain doesn't matc
 >>> mxnone.test.ex in "@mx_any"? no (end of list)
 >>> require: condition test failed in ACL "acl_rcpt_2"
 >>> end of ACL "acl_rcpt_2": not OK
 >>> mxnone.test.ex in "@mx_any"? no (end of list)
 >>> require: condition test failed in ACL "acl_rcpt_2"
 >>> end of ACL "acl_rcpt_2": not OK

-LOG: H=[V4NET.1.1.1] F=<x@y> rejected RCPT <2@mxnone.test.ex>: domain doesn't match @mx_any
+LOG: H=(test) [V4NET.1.1.1] F=<x@y> rejected RCPT <2@mxnone.test.ex>: domain doesn't match @mx_any

 >>> using ACL "acl_rcpt_3"
 >>> processing "require" (TESTSUITE/test-config 29)
 >>>   message: domain doesn't match @mx_primary
 >>> using ACL "acl_rcpt_3"
 >>> processing "require" (TESTSUITE/test-config 29)
 >>>   message: domain doesn't match @mx_primary


@@ -112,7 +113,7 @@ LOG: H=[V4NET.1.1.1] F=<x@y> rejected RCPT <2@mxnone.test.ex>: domain doesn't ma
 >>> mxt6.test.ex in "@mx_primary"? no (end of list)
 >>> require: condition test failed in ACL "acl_rcpt_3"
 >>> end of ACL "acl_rcpt_3": not OK
 >>> mxt6.test.ex in "@mx_primary"? no (end of list)
 >>> require: condition test failed in ACL "acl_rcpt_3"
 >>> end of ACL "acl_rcpt_3": not OK

-LOG: H=[V4NET.1.1.1] F=<x@y> rejected RCPT <3@mxt6.test.ex>: domain doesn't match @mx_primary
+LOG: H=(test) [V4NET.1.1.1] F=<x@y> rejected RCPT <3@mxt6.test.ex>: domain doesn't match @mx_primary

 >>> using ACL "acl_rcpt_3"
 >>> processing "require" (TESTSUITE/test-config 29)
 >>>   message: domain doesn't match @mx_primary
 >>> using ACL "acl_rcpt_3"
 >>> processing "require" (TESTSUITE/test-config 29)
 >>>   message: domain doesn't match @mx_primary


@@ -123,7 +124,7 @@ LOG: H=[V4NET.1.1.1] F=<x@y> rejected RCPT <3@mxt6.test.ex>: domain doesn't matc
 >>> mxt9.test.ex in "@mx_primary"? no (end of list)
 >>> require: condition test failed in ACL "acl_rcpt_3"
 >>> end of ACL "acl_rcpt_3": not OK
 >>> mxt9.test.ex in "@mx_primary"? no (end of list)
 >>> require: condition test failed in ACL "acl_rcpt_3"
 >>> end of ACL "acl_rcpt_3": not OK

-LOG: H=[V4NET.1.1.1] F=<x@y> rejected RCPT <3@mxt9.test.ex>: domain doesn't match @mx_primary
+LOG: H=(test) [V4NET.1.1.1] F=<x@y> rejected RCPT <3@mxt9.test.ex>: domain doesn't match @mx_primary

 >>> using ACL "acl_rcpt_3"
 >>> processing "require" (TESTSUITE/test-config 29)
 >>>   message: domain doesn't match @mx_primary
 >>> using ACL "acl_rcpt_3"
 >>> processing "require" (TESTSUITE/test-config 29)
 >>>   message: domain doesn't match @mx_primary


@@ -131,7 +132,7 @@ LOG: H=[V4NET.1.1.1] F=<x@y> rejected RCPT <3@mxt9.test.ex>: domain doesn't matc
 >>> mxnone.test.ex in "@mx_primary"? no (end of list)
 >>> require: condition test failed in ACL "acl_rcpt_3"
 >>> end of ACL "acl_rcpt_3": not OK
 >>> mxnone.test.ex in "@mx_primary"? no (end of list)
 >>> require: condition test failed in ACL "acl_rcpt_3"
 >>> end of ACL "acl_rcpt_3": not OK

-LOG: H=[V4NET.1.1.1] F=<x@y> rejected RCPT <3@mxnone.test.ex>: domain doesn't match @mx_primary
+LOG: H=(test) [V4NET.1.1.1] F=<x@y> rejected RCPT <3@mxnone.test.ex>: domain doesn't match @mx_primary

 >>> using ACL "acl_rcpt_4"
 >>> processing "require" (TESTSUITE/test-config 34)
 >>>   message: domain doesn't match @mx_secondary
 >>> using ACL "acl_rcpt_4"
 >>> processing "require" (TESTSUITE/test-config 34)
 >>>   message: domain doesn't match @mx_secondary


@@ -141,7 +142,7 @@ LOG: H=[V4NET.1.1.1] F=<x@y> rejected RCPT <3@mxnone.test.ex>: domain doesn't ma
 >>> mxt5.test.ex in "@mx_secondary"? no (end of list)
 >>> require: condition test failed in ACL "acl_rcpt_4"
 >>> end of ACL "acl_rcpt_4": not OK
 >>> mxt5.test.ex in "@mx_secondary"? no (end of list)
 >>> require: condition test failed in ACL "acl_rcpt_4"
 >>> end of ACL "acl_rcpt_4": not OK

-LOG: H=[V4NET.1.1.1] F=<x@y> rejected RCPT <4@mxt5.test.ex>: domain doesn't match @mx_secondary
+LOG: H=(test) [V4NET.1.1.1] F=<x@y> rejected RCPT <4@mxt5.test.ex>: domain doesn't match @mx_secondary

 >>> using ACL "acl_rcpt_4"
 >>> processing "require" (TESTSUITE/test-config 34)
 >>>   message: domain doesn't match @mx_secondary
 >>> using ACL "acl_rcpt_4"
 >>> processing "require" (TESTSUITE/test-config 34)
 >>>   message: domain doesn't match @mx_secondary


@@ -167,7 +168,7 @@ LOG: H=[V4NET.1.1.1] F=<x@y> rejected RCPT <4@mxt5.test.ex>: domain doesn't matc
 >>> mxt9.test.ex in "@mx_secondary"? no (end of list)
 >>> require: condition test failed in ACL "acl_rcpt_4"
 >>> end of ACL "acl_rcpt_4": not OK
 >>> mxt9.test.ex in "@mx_secondary"? no (end of list)
 >>> require: condition test failed in ACL "acl_rcpt_4"
 >>> end of ACL "acl_rcpt_4": not OK

-LOG: H=[V4NET.1.1.1] F=<x@y> rejected RCPT <4@mxt9.test.ex>: domain doesn't match @mx_secondary
+LOG: H=(test) [V4NET.1.1.1] F=<x@y> rejected RCPT <4@mxt9.test.ex>: domain doesn't match @mx_secondary

 >>> using ACL "acl_rcpt_4"
 >>> processing "require" (TESTSUITE/test-config 34)
 >>>   message: domain doesn't match @mx_secondary
 >>> using ACL "acl_rcpt_4"
 >>> processing "require" (TESTSUITE/test-config 34)
 >>>   message: domain doesn't match @mx_secondary


@@ -175,7 +176,7 @@ LOG: H=[V4NET.1.1.1] F=<x@y> rejected RCPT <4@mxt9.test.ex>: domain doesn't matc
 >>> mxnone.test.ex in "@mx_secondary"? no (end of list)
 >>> require: condition test failed in ACL "acl_rcpt_4"
 >>> end of ACL "acl_rcpt_4": not OK
 >>> mxnone.test.ex in "@mx_secondary"? no (end of list)
 >>> require: condition test failed in ACL "acl_rcpt_4"
 >>> end of ACL "acl_rcpt_4": not OK

-LOG: H=[V4NET.1.1.1] F=<x@y> rejected RCPT <4@mxnone.test.ex>: domain doesn't match @mx_secondary
+LOG: H=(test) [V4NET.1.1.1] F=<x@y> rejected RCPT <4@mxnone.test.ex>: domain doesn't match @mx_secondary

 >>> using ACL "acl_rcpt_5"
 >>> processing "require" (TESTSUITE/test-config 39)
 >>>   message: host doesn't match @ or @[]
 >>> using ACL "acl_rcpt_5"
 >>> processing "require" (TESTSUITE/test-config 39)
 >>>   message: host doesn't match @ or @[]


@@ -186,7 +187,7 @@ MUNGED: ::1 will be omitted in what follows
 >>> host in "@ : @[]"? no (end of list)
 >>> require: condition test failed in ACL "acl_rcpt_5"
 >>> end of ACL "acl_rcpt_5": not OK
 >>> host in "@ : @[]"? no (end of list)
 >>> require: condition test failed in ACL "acl_rcpt_5"
 >>> end of ACL "acl_rcpt_5": not OK

-LOG: H=[V4NET.1.1.1] F=<x@y> rejected RCPT <5@myhost.test.ex>: host doesn't match @ or @[]
+LOG: H=(test) [V4NET.1.1.1] F=<x@y> rejected RCPT <5@myhost.test.ex>: host doesn't match @ or @[]

 >>> host in hosts_connection_nolog? no (option unset)
 >>> host in host_lookup? no (option unset)
 >>> host in host_reject_connection? no (option unset)
 >>> host in hosts_connection_nolog? no (option unset)
 >>> host in host_lookup? no (option unset)
 >>> host in host_reject_connection? no (option unset)


@@ -195,6 +196,7 @@ LOG: H=[V4NET.1.1.1] F=<x@y> rejected RCPT <5@myhost.test.ex>: host doesn't matc
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)

+>>> test in helo_lookup_domains? no (end of list)

 >>> using ACL "acl_rcpt_5"
 >>> processing "require" (TESTSUITE/test-config 39)
 >>>   message: host doesn't match @ or @[]
 >>> using ACL "acl_rcpt_5"
 >>> processing "require" (TESTSUITE/test-config 39)
 >>>   message: host doesn't match @ or @[]


@@ -215,6 +217,7 @@ MUNGED: ::1 will be omitted in what follows
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)

+>>> test in helo_lookup_domains? no (end of list)

 >>> using ACL "acl_rcpt_5"
 >>> processing "require" (TESTSUITE/test-config 39)
 >>>   message: host doesn't match @ or @[]
 >>> using ACL "acl_rcpt_5"
 >>> processing "require" (TESTSUITE/test-config 39)
 >>>   message: host doesn't match @ or @[]


@@ -235,6 +238,7 @@ MUNGED: ::1 will be omitted in what follows
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)

+>>> test in helo_lookup_domains? no (end of list)

 >>> using ACL "acl_rcpt_2"
 >>> processing "require" (TESTSUITE/test-config 24)
 >>>   message: domain doesn't match @mx_any
 >>> using ACL "acl_rcpt_2"
 >>> processing "require" (TESTSUITE/test-config 24)
 >>>   message: domain doesn't match @mx_any


@@ -259,7 +263,7 @@ MUNGED: ::1 will be omitted in what follows
 >>> mxt3.test.ex in "@mx_primary"? no (end of list)
 >>> require: condition test failed in ACL "acl_rcpt_3"
 >>> end of ACL "acl_rcpt_3": not OK
 >>> mxt3.test.ex in "@mx_primary"? no (end of list)
 >>> require: condition test failed in ACL "acl_rcpt_3"
 >>> end of ACL "acl_rcpt_3": not OK

-LOG: H=[V4NET.1.1.1] F=<x@y> rejected RCPT <3@mxt3.test.ex>: domain doesn't match @mx_primary
+LOG: H=(test) [V4NET.1.1.1] F=<x@y> rejected RCPT <3@mxt3.test.ex>: domain doesn't match @mx_primary

 >>> using ACL "acl_rcpt_4"
 >>> processing "require" (TESTSUITE/test-config 34)
 >>>   message: domain doesn't match @mx_secondary
 >>> using ACL "acl_rcpt_4"
 >>> processing "require" (TESTSUITE/test-config 34)
 >>>   message: domain doesn't match @mx_secondary

diff --git a/test/stderr/0293 b/test/stderr/0293
index a89c4b86a5e2ececcf21ed1511fa9421dabce10f..f12b83795c8ecf62950abf81d510b1dafb4ddb1a 100644 (file)
--- a/test/stderr/0293
+++ b/test/stderr/0293
@@ -1,14 +1,14 @@
 LOG: smtp_connection MAIN
   SMTP connection from CALLER
 LOG: MAIN
 LOG: smtp_connection MAIN
   SMTP connection from CALLER
 LOG: MAIN

-  <= x@y U=CALLER P=local-smtp S=sss
+  <= x1@y U=CALLER P=local-smtp S=sss

 delivering 10HmaX-0005vi-00
 LOG: MAIN
   => one <one@z> R=r1 T=t1
 LOG: MAIN
   Completed
 LOG: MAIN
 delivering 10HmaX-0005vi-00
 LOG: MAIN
   => one <one@z> R=r1 T=t1
 LOG: MAIN
   Completed
 LOG: MAIN

-  <= x@y U=CALLER P=local-smtp S=sss
+  <= x2@y U=CALLER P=local-smtp S=sss

 LOG: delay_delivery MAIN
   no immediate delivery: more than 1 messages received in one connection
 LOG: MAIN REJECT
 LOG: delay_delivery MAIN
   no immediate delivery: more than 1 messages received in one connection
 LOG: MAIN REJECT

diff --git a/test/stderr/0294 b/test/stderr/0294
index c2ffd2d965c37a4c4870b4a28ff1f2a88b3e24f2..8bd1e8c9e2a6cade928aa3e5349a51d299234645 100644 (file)
--- a/test/stderr/0294
+++ b/test/stderr/0294
@@ -8,6 +8,8 @@ LOG: smtp_connection MAIN
   SMTP connection from CALLER
 SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
 smtp_setup_msg entered
   SMTP connection from CALLER
 SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
 smtp_setup_msg entered

+SMTP<< helo test
+SMTP>> 250 myhost.test.ex Hello CALLER at test

 SMTP<< mail from:<x@y>
 spool directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 msg_size = 0
 log directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100
 SMTP<< mail from:<x@y>
 spool directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 msg_size = 0
 log directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100


@@ -38,7 +40,8 @@ F From: x@y
 Data file name: TESTSUITE/spool//input//10HmaX-0005vi-00-D
 Data file written for message 10HmaX-0005vi-00
 >>Generated Received: header line
 Data file name: TESTSUITE/spool//input//10HmaX-0005vi-00-D
 Data file written for message 10HmaX-0005vi-00
 >>Generated Received: header line

-P Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
+P Received: from CALLER (helo=test)
+       by myhost.test.ex with local-smtp (Exim x.yz)

        (envelope-from <x@y>)
        id 10HmaX-0005vi-00;
        Tue, 2 Mar 1999 09:44:33 +0000
        (envelope-from <x@y>)
        id 10HmaX-0005vi-00;
        Tue, 2 Mar 1999 09:44:33 +0000


@@ -69,7 +72,8 @@ F From: x@y
 Data file name: TESTSUITE/spool//input//10HmaY-0005vi-00-D
 Data file written for message 10HmaY-0005vi-00
 >>Generated Received: header line
 Data file name: TESTSUITE/spool//input//10HmaY-0005vi-00-D
 Data file written for message 10HmaY-0005vi-00
 >>Generated Received: header line

-P Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
+P Received: from CALLER (helo=test)
+       by myhost.test.ex with local-smtp (Exim x.yz)

        (envelope-from <x@y>)
        id 10HmaY-0005vi-00
        for two@z;
        (envelope-from <x@y>)
        id 10HmaY-0005vi-00
        for two@z;


@@ -109,6 +113,9 @@ host in helo_try_verify_hosts? no (option unset)
 host in helo_accept_junk_hosts? no (option unset)
 SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
 smtp_setup_msg entered
 host in helo_accept_junk_hosts? no (option unset)
 SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
 smtp_setup_msg entered

+SMTP<< helo test
+test in helo_lookup_domains? no (end of list)
+SMTP>> 250 myhost.test.ex Hello test [1.2.3.4]

 SMTP<< mail from:<x@y>
 spool directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 msg_size = 0
 log directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100
 SMTP<< mail from:<x@y>
 spool directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 msg_size = 0
 log directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100


@@ -135,7 +142,7 @@ SMTP>> 250 Accepted
 SMTP<< quit
 SMTP>> 221 myhost.test.ex closing connection
 LOG: smtp_connection MAIN
 SMTP<< quit
 SMTP>> 221 myhost.test.ex closing connection
 LOG: smtp_connection MAIN

-  SMTP connection from [1.2.3.4] closed by QUIT
+  SMTP connection from (test) [1.2.3.4] closed by QUIT

 >>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 >>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config


@@ -155,6 +162,9 @@ host in helo_try_verify_hosts? no (option unset)
 host in helo_accept_junk_hosts? no (option unset)
 SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
 smtp_setup_msg entered
 host in helo_accept_junk_hosts? no (option unset)
 SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
 smtp_setup_msg entered

+SMTP<< helo test
+test in helo_lookup_domains? no (end of list)
+SMTP>> 250 myhost.test.ex Hello test [V4NET.9.8.7]

 SMTP<< mail from:<x@y>
 spool directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 msg_size = 0
 log directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100
 SMTP<< mail from:<x@y>
 spool directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 msg_size = 0
 log directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100


@@ -182,7 +192,7 @@ SMTP>> 250 Accepted
 SMTP<< quit
 SMTP>> 221 myhost.test.ex closing connection
 LOG: smtp_connection MAIN
 SMTP<< quit
 SMTP>> 221 myhost.test.ex closing connection
 LOG: smtp_connection MAIN

-  SMTP connection from [V4NET.9.8.7] closed by QUIT
+  SMTP connection from (test) [V4NET.9.8.7] closed by QUIT

 >>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 >>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config


@@ -194,6 +204,8 @@ LOG: smtp_connection MAIN
   SMTP connection from CALLER
 SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
 smtp_setup_msg entered
   SMTP connection from CALLER
 SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
 smtp_setup_msg entered

+SMTP<< helo test
+SMTP>> 250 myhost.test.ex Hello CALLER at test

 SMTP<< mail from:<x@y>
 spool directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 msg_size = 0
 log directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100
 SMTP<< mail from:<x@y>
 spool directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 msg_size = 0
 log directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100

diff --git a/test/stderr/0304 b/test/stderr/0304
index bd33dd7462f05e403ccc2660ef406e76e19c30ea..3760ef7f4b33769adf7880b9e9b4f3347258f6af 100644 (file)
--- a/test/stderr/0304
+++ b/test/stderr/0304
@@ -6,6 +6,7 @@
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)

+>>> test in helo_lookup_domains? no (end of list)

 >>> using ACL "acl1"
 >>> processing "deny" (TESTSUITE/test-config 16)
 >>>   message: failed 1
 >>> using ACL "acl1"
 >>> processing "deny" (TESTSUITE/test-config 16)
 >>>   message: failed 1


@@ -48,7 +49,7 @@
 >>> b1@x in "b1@x"? yes (matched "b1@x")
 >>> deny: condition test succeeded in ACL "acl1"
 >>> end of ACL "acl1": DENY
 >>> b1@x in "b1@x"? yes (matched "b1@x")
 >>> deny: condition test succeeded in ACL "acl1"
 >>> end of ACL "acl1": DENY

-LOG: H=[1.2.3.4] F=<> rejected RCPT <b1@x>: failed 7
+LOG: H=(test) [1.2.3.4] F=<> rejected RCPT <b1@x>: failed 7

 >>> using ACL "acl1"
 >>> processing "deny" (TESTSUITE/test-config 16)
 >>>   message: failed 1
 >>> using ACL "acl1"
 >>> processing "deny" (TESTSUITE/test-config 16)
 >>>   message: failed 1


@@ -98,7 +99,7 @@ LOG: H=[1.2.3.4] F=<> rejected RCPT <b1@x>: failed 7
 >>> b2@x in "b2@x"? yes (matched "b2@x")
 >>> deny: condition test succeeded in ACL "acl1"
 >>> end of ACL "acl1": DENY
 >>> b2@x in "b2@x"? yes (matched "b2@x")
 >>> deny: condition test succeeded in ACL "acl1"
 >>> end of ACL "acl1": DENY

-LOG: H=[1.2.3.4] F=<> rejected RCPT <b2@x>: failed 8
+LOG: H=(test) [1.2.3.4] F=<> rejected RCPT <b2@x>: failed 8

 >>> using ACL "acl1"
 >>> processing "deny" (TESTSUITE/test-config 16)
 >>>   message: failed 1
 >>> using ACL "acl1"
 >>> processing "deny" (TESTSUITE/test-config 16)
 >>>   message: failed 1


@@ -172,7 +173,7 @@ LOG: H=[1.2.3.4] F=<> rejected RCPT <b2@x>: failed 8
 >>> abc@w.x.y.z in "^abc.*@.*\.x\.y\.z : a@b"? yes (matched "^abc.*@.*\.x\.y\.z")
 >>> deny: condition test succeeded in ACL "acl1"
 >>> end of ACL "acl1": DENY
 >>> abc@w.x.y.z in "^abc.*@.*\.x\.y\.z : a@b"? yes (matched "^abc.*@.*\.x\.y\.z")
 >>> deny: condition test succeeded in ACL "acl1"
 >>> end of ACL "acl1": DENY

-LOG: H=[1.2.3.4] F=<x@y> rejected RCPT <abc@w.x.y.z>: failed 1
+LOG: H=(test) [1.2.3.4] F=<x@y> rejected RCPT <abc@w.x.y.z>: failed 1

 >>> using ACL "acl1"
 >>> processing "deny" (TESTSUITE/test-config 16)
 >>>   message: failed 1
 >>> using ACL "acl1"
 >>> processing "deny" (TESTSUITE/test-config 16)
 >>>   message: failed 1


@@ -180,7 +181,7 @@ LOG: H=[1.2.3.4] F=<x@y> rejected RCPT <abc@w.x.y.z>: failed 1
 >>> abcdef@q.x.y.z in "^abc.*@.*\.x\.y\.z : a@b"? yes (matched "^abc.*@.*\.x\.y\.z")
 >>> deny: condition test succeeded in ACL "acl1"
 >>> end of ACL "acl1": DENY
 >>> abcdef@q.x.y.z in "^abc.*@.*\.x\.y\.z : a@b"? yes (matched "^abc.*@.*\.x\.y\.z")
 >>> deny: condition test succeeded in ACL "acl1"
 >>> end of ACL "acl1": DENY

-LOG: H=[1.2.3.4] F=<x@y> rejected RCPT <abcdef@q.x.y.z>: failed 1
+LOG: H=(test) [1.2.3.4] F=<x@y> rejected RCPT <abcdef@q.x.y.z>: failed 1

 >>> using ACL "acl1"
 >>> processing "deny" (TESTSUITE/test-config 16)
 >>>   message: failed 1
 >>> using ACL "acl1"
 >>> processing "deny" (TESTSUITE/test-config 16)
 >>>   message: failed 1


@@ -189,7 +190,7 @@ LOG: H=[1.2.3.4] F=<x@y> rejected RCPT <abcdef@q.x.y.z>: failed 1
 >>> a@b in "^abc.*@.*\.x\.y\.z : a@b"? yes (matched "a@b")
 >>> deny: condition test succeeded in ACL "acl1"
 >>> end of ACL "acl1": DENY
 >>> a@b in "^abc.*@.*\.x\.y\.z : a@b"? yes (matched "a@b")
 >>> deny: condition test succeeded in ACL "acl1"
 >>> end of ACL "acl1": DENY

-LOG: H=[1.2.3.4] F=<x@y> rejected RCPT <a@b>: failed 1
+LOG: H=(test) [1.2.3.4] F=<x@y> rejected RCPT <a@b>: failed 1

 >>> using ACL "acl1"
 >>> processing "deny" (TESTSUITE/test-config 16)
 >>>   message: failed 1
 >>> using ACL "acl1"
 >>> processing "deny" (TESTSUITE/test-config 16)
 >>>   message: failed 1


@@ -265,7 +266,7 @@ LOG: H=[1.2.3.4] F=<x@y> rejected RCPT <a@b>: failed 1
 >>> x@a.b.c in "lsearch*@;TESTSUITE/aux-fixed/0304.d1"? yes (matched "lsearch*@;TESTSUITE/aux-fixed/0304.d1")
 >>> deny: condition test succeeded in ACL "acl1"
 >>> end of ACL "acl1": DENY
 >>> x@a.b.c in "lsearch*@;TESTSUITE/aux-fixed/0304.d1"? yes (matched "lsearch*@;TESTSUITE/aux-fixed/0304.d1")
 >>> deny: condition test succeeded in ACL "acl1"
 >>> end of ACL "acl1": DENY

-LOG: H=[1.2.3.4] F=<x@y> rejected RCPT <x@a.b.c>: failed 2
+LOG: H=(test) [1.2.3.4] F=<x@y> rejected RCPT <x@a.b.c>: failed 2

 >>> using ACL "acl1"
 >>> processing "deny" (TESTSUITE/test-config 16)
 >>>   message: failed 1
 >>> using ACL "acl1"
 >>> processing "deny" (TESTSUITE/test-config 16)
 >>>   message: failed 1


@@ -278,7 +279,7 @@ LOG: H=[1.2.3.4] F=<x@y> rejected RCPT <x@a.b.c>: failed 2
 >>> abc@d.e.f in "lsearch*@;TESTSUITE/aux-fixed/0304.d1"? yes (matched "lsearch*@;TESTSUITE/aux-fixed/0304.d1")
 >>> deny: condition test succeeded in ACL "acl1"
 >>> end of ACL "acl1": DENY
 >>> abc@d.e.f in "lsearch*@;TESTSUITE/aux-fixed/0304.d1"? yes (matched "lsearch*@;TESTSUITE/aux-fixed/0304.d1")
 >>> deny: condition test succeeded in ACL "acl1"
 >>> end of ACL "acl1": DENY

-LOG: H=[1.2.3.4] F=<x@y> rejected RCPT <abc@d.e.f>: failed 2
+LOG: H=(test) [1.2.3.4] F=<x@y> rejected RCPT <abc@d.e.f>: failed 2

 >>> using ACL "acl1"
 >>> processing "deny" (TESTSUITE/test-config 16)
 >>>   message: failed 1
 >>> using ACL "acl1"
 >>> processing "deny" (TESTSUITE/test-config 16)
 >>>   message: failed 1


@@ -359,7 +360,7 @@ LOG: H=[1.2.3.4] F=<x@y> rejected RCPT <abc@d.e.f>: failed 2
 >>> abc@at.1 in "@@lsearch;TESTSUITE/aux-fixed/0304.d2"? yes (matched "@@lsearch;TESTSUITE/aux-fixed/0304.d2")
 >>> deny: condition test succeeded in ACL "acl1"
 >>> end of ACL "acl1": DENY
 >>> abc@at.1 in "@@lsearch;TESTSUITE/aux-fixed/0304.d2"? yes (matched "@@lsearch;TESTSUITE/aux-fixed/0304.d2")
 >>> deny: condition test succeeded in ACL "acl1"
 >>> end of ACL "acl1": DENY

-LOG: H=[1.2.3.4] F=<x@y> rejected RCPT <abc@at.1>: failed 3
+LOG: H=(test) [1.2.3.4] F=<x@y> rejected RCPT <abc@at.1>: failed 3

 >>> using ACL "acl1"
 >>> processing "deny" (TESTSUITE/test-config 16)
 >>>   message: failed 1
 >>> using ACL "acl1"
 >>> processing "deny" (TESTSUITE/test-config 16)
 >>>   message: failed 1


@@ -377,7 +378,7 @@ LOG: H=[1.2.3.4] F=<x@y> rejected RCPT <abc@at.1>: failed 3
 >>> xyz@at.1 in "@@lsearch;TESTSUITE/aux-fixed/0304.d2"? yes (matched "@@lsearch;TESTSUITE/aux-fixed/0304.d2")
 >>> deny: condition test succeeded in ACL "acl1"
 >>> end of ACL "acl1": DENY
 >>> xyz@at.1 in "@@lsearch;TESTSUITE/aux-fixed/0304.d2"? yes (matched "@@lsearch;TESTSUITE/aux-fixed/0304.d2")
 >>> deny: condition test succeeded in ACL "acl1"
 >>> end of ACL "acl1": DENY

-LOG: H=[1.2.3.4] F=<x@y> rejected RCPT <xyz@at.1>: failed 3
+LOG: H=(test) [1.2.3.4] F=<x@y> rejected RCPT <xyz@at.1>: failed 3

 >>> using ACL "acl1"
 >>> processing "deny" (TESTSUITE/test-config 16)
 >>>   message: failed 1
 >>> using ACL "acl1"
 >>> processing "deny" (TESTSUITE/test-config 16)
 >>>   message: failed 1


@@ -395,7 +396,7 @@ LOG: H=[1.2.3.4] F=<x@y> rejected RCPT <xyz@at.1>: failed 3
 >>> abcxyz@at.1 in "@@lsearch;TESTSUITE/aux-fixed/0304.d2"? yes (matched "@@lsearch;TESTSUITE/aux-fixed/0304.d2")
 >>> deny: condition test succeeded in ACL "acl1"
 >>> end of ACL "acl1": DENY
 >>> abcxyz@at.1 in "@@lsearch;TESTSUITE/aux-fixed/0304.d2"? yes (matched "@@lsearch;TESTSUITE/aux-fixed/0304.d2")
 >>> deny: condition test succeeded in ACL "acl1"
 >>> end of ACL "acl1": DENY

-LOG: H=[1.2.3.4] F=<x@y> rejected RCPT <abcxyz@at.1>: failed 3
+LOG: H=(test) [1.2.3.4] F=<x@y> rejected RCPT <abcxyz@at.1>: failed 3

 >>> using ACL "acl1"
 >>> processing "deny" (TESTSUITE/test-config 16)
 >>>   message: failed 1
 >>> using ACL "acl1"
 >>> processing "deny" (TESTSUITE/test-config 16)
 >>>   message: failed 1


@@ -482,7 +483,7 @@ LOG: H=[1.2.3.4] F=<x@y> rejected RCPT <abcxyz@at.1>: failed 3
 >>> x@domain.only in "domain.only : *.domain2.only"? yes (matched "domain.only")
 >>> deny: condition test succeeded in ACL "acl1"
 >>> end of ACL "acl1": DENY
 >>> x@domain.only in "domain.only : *.domain2.only"? yes (matched "domain.only")
 >>> deny: condition test succeeded in ACL "acl1"
 >>> end of ACL "acl1": DENY

-LOG: H=[1.2.3.4] F=<x@y> rejected RCPT <x@domain.only>: failed 4
+LOG: H=(test) [1.2.3.4] F=<x@y> rejected RCPT <x@domain.only>: failed 4

 >>> using ACL "acl1"
 >>> processing "deny" (TESTSUITE/test-config 16)
 >>>   message: failed 1
 >>> using ACL "acl1"
 >>> processing "deny" (TESTSUITE/test-config 16)
 >>>   message: failed 1


@@ -507,7 +508,7 @@ LOG: H=[1.2.3.4] F=<x@y> rejected RCPT <x@domain.only>: failed 4
 >>> x@abc.domain2.only in "domain.only : *.domain2.only"? yes (matched "*.domain2.only")
 >>> deny: condition test succeeded in ACL "acl1"
 >>> end of ACL "acl1": DENY
 >>> x@abc.domain2.only in "domain.only : *.domain2.only"? yes (matched "*.domain2.only")
 >>> deny: condition test succeeded in ACL "acl1"
 >>> end of ACL "acl1": DENY

-LOG: H=[1.2.3.4] F=<x@y> rejected RCPT <x@abc.domain2.only>: failed 4
+LOG: H=(test) [1.2.3.4] F=<x@y> rejected RCPT <x@abc.domain2.only>: failed 4

 >>> using ACL "acl1"
 >>> processing "deny" (TESTSUITE/test-config 16)
 >>>   message: failed 1
 >>> using ACL "acl1"
 >>> processing "deny" (TESTSUITE/test-config 16)
 >>>   message: failed 1


@@ -601,7 +602,7 @@ LOG: H=[1.2.3.4] F=<x@y> rejected RCPT <x@abc.domain2.only>: failed 4
 >>> abc@domain3 in "abc@domain3 : xyz@*.domain4"? yes (matched "abc@domain3")
 >>> deny: condition test succeeded in ACL "acl1"
 >>> end of ACL "acl1": DENY
 >>> abc@domain3 in "abc@domain3 : xyz@*.domain4"? yes (matched "abc@domain3")
 >>> deny: condition test succeeded in ACL "acl1"
 >>> end of ACL "acl1": DENY

-LOG: H=[1.2.3.4] F=<x@y> rejected RCPT <abc@domain3>: failed 5
+LOG: H=(test) [1.2.3.4] F=<x@y> rejected RCPT <abc@domain3>: failed 5

 >>> using ACL "acl1"
 >>> processing "deny" (TESTSUITE/test-config 16)
 >>>   message: failed 1
 >>> using ACL "acl1"
 >>> processing "deny" (TESTSUITE/test-config 16)
 >>>   message: failed 1


@@ -632,7 +633,7 @@ LOG: H=[1.2.3.4] F=<x@y> rejected RCPT <abc@domain3>: failed 5
 >>> xyz@x.domain4 in "abc@domain3 : xyz@*.domain4"? yes (matched "xyz@*.domain4")
 >>> deny: condition test succeeded in ACL "acl1"
 >>> end of ACL "acl1": DENY
 >>> xyz@x.domain4 in "abc@domain3 : xyz@*.domain4"? yes (matched "xyz@*.domain4")
 >>> deny: condition test succeeded in ACL "acl1"
 >>> end of ACL "acl1": DENY

-LOG: H=[1.2.3.4] F=<x@y> rejected RCPT <xyz@x.domain4>: failed 5
+LOG: H=(test) [1.2.3.4] F=<x@y> rejected RCPT <xyz@x.domain4>: failed 5

 >>> using ACL "acl1"
 >>> processing "deny" (TESTSUITE/test-config 16)
 >>>   message: failed 1
 >>> using ACL "acl1"
 >>> processing "deny" (TESTSUITE/test-config 16)
 >>>   message: failed 1


@@ -797,7 +798,7 @@ LOG: H=[1.2.3.4] F=<x@y> rejected RCPT <xyz@x.domain4>: failed 5
 >>> pqr@myhost.test.ex in "pqr@@"? yes (matched "pqr@@")
 >>> deny: condition test succeeded in ACL "acl1"
 >>> end of ACL "acl1": DENY
 >>> pqr@myhost.test.ex in "pqr@@"? yes (matched "pqr@@")
 >>> deny: condition test succeeded in ACL "acl1"
 >>> end of ACL "acl1": DENY

-LOG: H=[1.2.3.4] F=<x@y> rejected RCPT <pqr@myhost.test.ex>: failed 6
+LOG: H=(test) [1.2.3.4] F=<x@y> rejected RCPT <pqr@myhost.test.ex>: failed 6

 >>> using ACL "acl1"
 >>> processing "deny" (TESTSUITE/test-config 16)
 >>>   message: failed 1
 >>> using ACL "acl1"
 >>> processing "deny" (TESTSUITE/test-config 16)
 >>>   message: failed 1


@@ -913,7 +914,7 @@ LOG: H=[1.2.3.4] F=<x@y> rejected RCPT <pqr@myhost.test.ex>: failed 6
 >>> a@domain5 in "*@lsearch;TESTSUITE/aux-fixed/0304.d3"? yes (matched "*@lsearch;TESTSUITE/aux-fixed/0304.d3")
 >>> deny: condition test succeeded in ACL "acl1"
 >>> end of ACL "acl1": DENY
 >>> a@domain5 in "*@lsearch;TESTSUITE/aux-fixed/0304.d3"? yes (matched "*@lsearch;TESTSUITE/aux-fixed/0304.d3")
 >>> deny: condition test succeeded in ACL "acl1"
 >>> end of ACL "acl1": DENY

-LOG: H=[1.2.3.4] F=<x@y> rejected RCPT <a@domain5>: failed 9
+LOG: H=(test) [1.2.3.4] F=<x@y> rejected RCPT <a@domain5>: failed 9

 >>> using ACL "acl1"
 >>> processing "deny" (TESTSUITE/test-config 16)
 >>>   message: failed 1
 >>> using ACL "acl1"
 >>> processing "deny" (TESTSUITE/test-config 16)
 >>>   message: failed 1


@@ -972,7 +973,7 @@ LOG: H=[1.2.3.4] F=<x@y> rejected RCPT <a@domain5>: failed 9
 >>> xyz@domain6 in "xyz@lsearch;TESTSUITE/aux-fixed/0304.d4"? yes (matched "xyz@lsearch;TESTSUITE/aux-fixed/0304.d4")
 >>> deny: condition test succeeded in ACL "acl1"
 >>> end of ACL "acl1": DENY
 >>> xyz@domain6 in "xyz@lsearch;TESTSUITE/aux-fixed/0304.d4"? yes (matched "xyz@lsearch;TESTSUITE/aux-fixed/0304.d4")
 >>> deny: condition test succeeded in ACL "acl1"
 >>> end of ACL "acl1": DENY

-LOG: H=[1.2.3.4] F=<x@y> rejected RCPT <xyz@domain6>: failed 10
+LOG: H=(test) [1.2.3.4] F=<x@y> rejected RCPT <xyz@domain6>: failed 10

 >>> using ACL "acl1"
 >>> processing "deny" (TESTSUITE/test-config 16)
 >>>   message: failed 1
 >>> using ACL "acl1"
 >>> processing "deny" (TESTSUITE/test-config 16)
 >>>   message: failed 1


@@ -1098,4 +1099,4 @@ LOG: H=[1.2.3.4] F=<x@y> rejected RCPT <xyz@domain6>: failed 10
 >>> x@domain7 in "lsearch*@;TESTSUITE/aux-fixed/0304.d5"? yes (matched "lsearch*@;TESTSUITE/aux-fixed/0304.d5")
 >>> deny: condition test succeeded in ACL "acl1"
 >>> end of ACL "acl1": DENY
 >>> x@domain7 in "lsearch*@;TESTSUITE/aux-fixed/0304.d5"? yes (matched "lsearch*@;TESTSUITE/aux-fixed/0304.d5")
 >>> deny: condition test succeeded in ACL "acl1"
 >>> end of ACL "acl1": DENY

-LOG: H=[1.2.3.4] F=<x@y> rejected RCPT <x@domain7>: failed 11
+LOG: H=(test) [1.2.3.4] F=<x@y> rejected RCPT <x@domain7>: failed 11

diff --git a/test/stderr/0305 b/test/stderr/0305
index 4576166b1b45c1bf862b297f560c2ae77ae40c10..9eaa813580870aae78c369ecf856f0bcd675b5f2 100644 (file)
--- a/test/stderr/0305
+++ b/test/stderr/0305
@@ -6,6 +6,7 @@
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)

+>>> test in helo_lookup_domains? no (end of list)

 >>> using ACL "acl1"
 >>> processing "accept" (TESTSUITE/test-config 18)
 >>> check domains = +ok_domains
 >>> using ACL "acl1"
 >>> processing "accept" (TESTSUITE/test-config 18)
 >>> check domains = +ok_domains


@@ -20,4 +21,4 @@
 >>> junk.junk in "+ok_domains"? no (end of list)
 >>> accept: condition test failed in ACL "acl1"
 >>> end of ACL "acl1": implicit DENY
 >>> junk.junk in "+ok_domains"? no (end of list)
 >>> accept: condition test failed in ACL "acl1"
 >>> end of ACL "acl1": implicit DENY

-LOG: H=[V4NET.2.3.4] F=<x@y> rejected RCPT <x@junk.junk>
+LOG: H=(test) [V4NET.2.3.4] F=<x@y> rejected RCPT <x@junk.junk>

diff --git a/test/stderr/0306 b/test/stderr/0306
index e8e7d4667f06ec785ebd01eabfed50277eb1a62d..ff95f973865f528ae81eda2d6c078d8997de8013 100644 (file)
--- a/test/stderr/0306
+++ b/test/stderr/0306
@@ -6,6 +6,7 @@
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)

+>>> test in helo_lookup_domains? no (end of list)

 >>> using ACL "rcpt"
 >>> processing "accept" (TESTSUITE/test-config 18)
 >>> check verify = recipient
 >>> using ACL "rcpt"
 >>> processing "accept" (TESTSUITE/test-config 18)
 >>> check verify = recipient


@@ -51,7 +52,7 @@
 >>> ----------- end verify ------------
 >>> accept: condition test failed in ACL "rcpt"
 >>> accept: endpass encountered - denying access
 >>> ----------- end verify ------------
 >>> accept: condition test failed in ACL "rcpt"
 >>> accept: endpass encountered - denying access

-LOG: H=[1.2.3.4] F=<anyone@anywhere> rejected RCPT <list1@lists.test.ex>: list1@lists.test.ex is a closed mailing list
+LOG: H=(test) [1.2.3.4] F=<anyone@anywhere> rejected RCPT <list1@lists.test.ex>: list1@lists.test.ex is a closed mailing list

 >>> using ACL "rcpt"
 >>> processing "accept" (TESTSUITE/test-config 18)
 >>> check verify = recipient
 >>> using ACL "rcpt"
 >>> processing "accept" (TESTSUITE/test-config 18)
 >>> check verify = recipient


@@ -68,4 +69,4 @@ LOG: H=[1.2.3.4] F=<anyone@anywhere> rejected RCPT <list1@lists.test.ex>: list1@
 >>> ----------- end verify ------------
 >>> accept: condition test failed in ACL "rcpt"
 >>> accept: endpass encountered - denying access
 >>> ----------- end verify ------------
 >>> accept: condition test failed in ACL "rcpt"
 >>> accept: endpass encountered - denying access

-LOG: H=[1.2.3.4] F=<anyone@anywhere> rejected RCPT <nonlist@lists.test.ex>: nonlist@lists.test.ex is a closed mailing list
+LOG: H=(test) [1.2.3.4] F=<anyone@anywhere> rejected RCPT <nonlist@lists.test.ex>: nonlist@lists.test.ex is a closed mailing list

diff --git a/test/stderr/0308 b/test/stderr/0308
index 091b39590fb0352af25fa09dceb9764a6faba9d2..130c02831283d35d697027b189c136dec7dd6dd2 100644 (file)
--- a/test/stderr/0308
+++ b/test/stderr/0308
@@ -6,6 +6,7 @@
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)

+>>> test in helo_lookup_domains? no (end of list)

 >>> using ACL "acl_V4NET_0_0"
 >>> processing "accept" (TESTSUITE/test-config 17)
 >>> check hosts = *.test.ex
 >>> using ACL "acl_V4NET_0_0"
 >>> processing "accept" (TESTSUITE/test-config 17)
 >>> check hosts = *.test.ex


@@ -27,6 +28,7 @@ LOG: no host name found for IP address V4NET.0.0.97
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)

+>>> test in helo_lookup_domains? no (end of list)

 >>> using ACL "acl_V4NET_0_0"
 >>> processing "accept" (TESTSUITE/test-config 17)
 >>> check hosts = *.test.ex
 >>> using ACL "acl_V4NET_0_0"
 >>> processing "accept" (TESTSUITE/test-config 17)
 >>> check hosts = *.test.ex

diff --git a/test/stderr/0312 b/test/stderr/0312
index 9b147156e9585b6653f2a9d8fa2ed1ce742b4895..22055ad9adeaf1931247d45e8fed04dabd575712 100644 (file)
--- a/test/stderr/0312
+++ b/test/stderr/0312
@@ -6,6 +6,7 @@
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)

+>>> test in helo_lookup_domains? no (end of list)

 >>> using ACL "check_rcpt"
 >>> processing "deny" (TESTSUITE/test-config 16)
 >>> check dnslists = +defer_unknown : test.again.dns
 >>> using ACL "check_rcpt"
 >>> processing "deny" (TESTSUITE/test-config 16)
 >>> check dnslists = +defer_unknown : test.again.dns


@@ -16,4 +17,4 @@
 >>> dnslists: wrote cache entry, ttl=3600
 LOG: DNS list lookup defer (probably timeout) for 1.0.0.V4NET.test.again.dns: returned DEFER
 >>> deny: condition test deferred in ACL "check_rcpt"
 >>> dnslists: wrote cache entry, ttl=3600
 LOG: DNS list lookup defer (probably timeout) for 1.0.0.V4NET.test.again.dns: returned DEFER
 >>> deny: condition test deferred in ACL "check_rcpt"

-LOG: H=[V4NET.0.0.1] F=<userx@x> temporarily rejected RCPT <userx@y>
+LOG: H=(test) [V4NET.0.0.1] F=<userx@x> temporarily rejected RCPT <userx@y>

diff --git a/test/stderr/0325 b/test/stderr/0325
index a9d8eb1bc08899415c340e5d89a4e45cce580245..8ebefffcfb8d1990634b76930ddd7048949c355f 100644 (file)
--- a/test/stderr/0325
+++ b/test/stderr/0325
@@ -14,6 +14,7 @@ r4: $local_part_data = LOCAL PART DATA
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)

+>>> test in helo_lookup_domains? no (end of list)

 >>> using ACL "a1"
 >>> processing "accept" (TESTSUITE/test-config 19)
 >>> check domains = +test_domains
 >>> using ACL "a1"
 >>> processing "accept" (TESTSUITE/test-config 19)
 >>> check domains = +test_domains


@@ -33,4 +34,4 @@ r4: $local_part_data = LOCAL PART DATA
 >>>   message: \$domain_data=$domain_data \$local_part_data=$local_part_data
 >>> deny: condition test succeeded in ACL "a1"
 >>> end of ACL "a1": DENY
 >>>   message: \$domain_data=$domain_data \$local_part_data=$local_part_data
 >>> deny: condition test succeeded in ACL "a1"
 >>> end of ACL "a1": DENY

-LOG: H=[V4NET.0.0.0] F=<a@b.c> rejected RCPT xxx@a.b.c: $domain_data=DOMAIN DATA $local_part_data=LOCAL PART DATA
+LOG: H=(test) [V4NET.0.0.0] F=<a@b.c> rejected RCPT xxx@a.b.c: $domain_data=DOMAIN DATA $local_part_data=LOCAL PART DATA

diff --git a/test/stderr/0342 b/test/stderr/0342
index 3f9891c570c38b7b650f8968b9ccf240fd241280..3739f797ea177a59f1442f7e4bdb856f433aff4a 100644 (file)
--- a/test/stderr/0342
+++ b/test/stderr/0342
@@ -6,6 +6,7 @@
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)

+>>> test in helo_lookup_domains? no (end of list)

 >>> using ACL "check_rcpt"
 >>> processing "deny" (TESTSUITE/test-config 17)
 >>>   message: unverifiable
 >>> using ACL "check_rcpt"
 >>> processing "deny" (TESTSUITE/test-config 17)
 >>>   message: unverifiable

diff --git a/test/stderr/0362 b/test/stderr/0362
index 3c6259bea429a3bdf4d6a839f8ade44a62c10757..39fe096283c3193cda5e5abb7e4dfb1b62bfd963 100644 (file)
--- a/test/stderr/0362
+++ b/test/stderr/0362
@@ -24,6 +24,12 @@ host in helo_try_verify_hosts? no (option unset)
 host in helo_accept_junk_hosts? no (option unset)
 SMTP>> 220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
 smtp_setup_msg entered
 host in helo_accept_junk_hosts? no (option unset)
 SMTP>> 220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
 smtp_setup_msg entered

+SMTP<< helo test
+test in helo_lookup_domains? no (end of list)
+sender_fullhost = (test) [V4NET.0.0.0]
+sender_rcvhost = [V4NET.0.0.0] (helo=test)
+set_process_info: pppp handling incoming connection from (test) [V4NET.0.0.0]
+SMTP>> 250 the.local.host.name Hello test [V4NET.0.0.0]

 SMTP<< mail from:<x@y>
 spool directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 msg_size = 0
 log directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100
 SMTP<< mail from:<x@y>
 spool directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 msg_size = 0
 log directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100


@@ -82,6 +88,6 @@ SMTP>> 250 Accepted
 SMTP<< quit
 SMTP>> 221 the.local.host.name closing connection
 LOG: smtp_connection MAIN
 SMTP<< quit
 SMTP>> 221 the.local.host.name closing connection
 LOG: smtp_connection MAIN

-  SMTP connection from [V4NET.0.0.0] closed by QUIT
+  SMTP connection from (test) [V4NET.0.0.0] closed by QUIT

 search_tidyup called
 >>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
 search_tidyup called
 >>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>

diff --git a/test/stderr/0372 b/test/stderr/0372
index 096049ec80fe4c4fbf774eaa8b10274af242adcb..abec969e9be5887d9e6ead949bdf3b4bc327a75d 100644 (file)
--- a/test/stderr/0372
+++ b/test/stderr/0372
@@ -1,7 +1,7 @@
 LOG: smtp_connection MAIN
   SMTP connection from CALLER
 LOG: MAIN
 LOG: smtp_connection MAIN
   SMTP connection from CALLER
 LOG: MAIN

-  <= <> H=host.name [1.2.3.4] U=CALLER P=smtp S=sss
+  <= <> H=host.name (test) [1.2.3.4] U=CALLER P=smtp S=sss

 delivering 10HmaY-0005vi-00
 ----- System filter -----
   acl_c0="value for c0 is ip: 1.2.3.4"
 delivering 10HmaY-0005vi-00
 ----- System filter -----
   acl_c0="value for c0 is ip: 1.2.3.4"


@@ -62,7 +62,7 @@ LOG: MAIN
 LOG: MAIN
   Completed
 LOG: MAIN
 LOG: MAIN
   Completed
 LOG: MAIN

-  <= <> H=host.name [1.2.3.4] U=CALLER P=smtp S=sss
+  <= <> H=host.name (test) [1.2.3.4] U=CALLER P=smtp S=sss

 delivering 10HmaZ-0005vi-00
 ----- System filter -----
   acl_c0="value for c0 is ip: 1.2.3.4"
 delivering 10HmaZ-0005vi-00
 ----- System filter -----
   acl_c0="value for c0 is ip: 1.2.3.4"

diff --git a/test/stderr/0376 b/test/stderr/0376
index 7315bec96251bef66748c9dd735b9208cddb965a..96c8347815f66a8b9a1464bd771ca29e888395eb 100644 (file)
--- a/test/stderr/0376
+++ b/test/stderr/0376
@@ -62,10 +62,10 @@ callout cache: address record expired for ok@localhost
 interface=NULL port=1224
 Connecting to 127.0.0.1 [127.0.0.1]:1224 ...  failed: Connection refused
 LOG: MAIN REJECT
 interface=NULL port=1224
 Connecting to 127.0.0.1 [127.0.0.1]:1224 ...  failed: Connection refused
 LOG: MAIN REJECT

-  H=[V4NET.0.0.1] U=root sender verify defer for <ok@localhost>: Could not complete sender verify callout: 127.0.0.1 [127.0.0.1] : Connection refused
+  H=(test) [V4NET.0.0.1] U=root sender verify defer for <ok@localhost>: Could not complete sender verify callout: 127.0.0.1 [127.0.0.1] : Connection refused

 created log directory TESTSUITE/spool/log
 LOG: MAIN REJECT
 created log directory TESTSUITE/spool/log
 LOG: MAIN REJECT

-  H=[V4NET.0.0.1] U=root F=<ok@localhost> temporarily rejected RCPT <z@test.ex>: Could not complete sender verify callout
+  H=(test) [V4NET.0.0.1] U=root F=<ok@localhost> temporarily rejected RCPT <z@test.ex>: Could not complete sender verify callout

 LOG: smtp_connection MAIN
   SMTP connection from root closed by QUIT
 >>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
 LOG: smtp_connection MAIN
   SMTP connection from root closed by QUIT
 >>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>


@@ -98,9 +98,9 @@ wrote callout cache domain record for localhost:
   result=1 postmaster=0 random=0
 wrote negative callout cache address record for bad@localhost
 LOG: MAIN REJECT
   result=1 postmaster=0 random=0
 wrote negative callout cache address record for bad@localhost
 LOG: MAIN REJECT

-  H=[V4NET.0.0.1] U=root sender verify fail for <bad@localhost>: 127.0.0.1 [127.0.0.1] : SMTP error from remote mail server after RCPT TO:<bad@localhost>: 550 REJECTED
+  H=(test) [V4NET.0.0.1] U=root sender verify fail for <bad@localhost>: 127.0.0.1 [127.0.0.1] : SMTP error from remote mail server after RCPT TO:<bad@localhost>: 550 REJECTED

 LOG: MAIN REJECT
 LOG: MAIN REJECT

-  H=[V4NET.0.0.1] U=root F=<bad@localhost> rejected RCPT <z@test.ex>: (recipient): Sender verify failed
+  H=(test) [V4NET.0.0.1] U=root F=<bad@localhost> rejected RCPT <z@test.ex>: (recipient): Sender verify failed

 LOG: smtp_connection MAIN
   SMTP connection from root closed by QUIT
 >>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
 LOG: smtp_connection MAIN
   SMTP connection from root closed by QUIT
 >>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>


@@ -119,9 +119,9 @@ callout cache: found domain record for localhost
 callout cache: found address record for bad@localhost
 callout cache: address record is negative
 LOG: MAIN REJECT
 callout cache: found address record for bad@localhost
 callout cache: address record is negative
 LOG: MAIN REJECT

-  H=[V4NET.0.0.1] U=root sender verify fail for <bad@localhost>
+  H=(test) [V4NET.0.0.1] U=root sender verify fail for <bad@localhost>

 LOG: MAIN REJECT
 LOG: MAIN REJECT

-  H=[V4NET.0.0.1] U=root F=<bad@localhost> rejected RCPT <z@test.ex>: (recipient): Sender verify failed
+  H=(test) [V4NET.0.0.1] U=root F=<bad@localhost> rejected RCPT <z@test.ex>: (recipient): Sender verify failed

 LOG: smtp_connection MAIN
   SMTP connection from root closed by QUIT
 >>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
 LOG: smtp_connection MAIN
   SMTP connection from root closed by QUIT
 >>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>


@@ -151,9 +151,9 @@ Connecting to 127.0.0.1 [127.0.0.1]:1224 ...  connected
 wrote callout cache domain record for localhost:
   result=3 postmaster=0 random=0
 LOG: MAIN REJECT
 wrote callout cache domain record for localhost:
   result=3 postmaster=0 random=0
 LOG: MAIN REJECT

-  H=[V4NET.0.0.1] U=root sender verify fail for <ok@localhost>: 127.0.0.1 [127.0.0.1] : response to "MAIL FROM:<>" was: 550 REJECT MAIL FROM
+  H=(test) [V4NET.0.0.1] U=root sender verify fail for <ok@localhost>: 127.0.0.1 [127.0.0.1] : response to "MAIL FROM:<>" was: 550 REJECT MAIL FROM

 LOG: MAIN REJECT
 LOG: MAIN REJECT

-  H=[V4NET.0.0.1] U=root F=<ok@localhost> rejected RCPT <z@test.ex>: (mail): Sender verify failed
+  H=(test) [V4NET.0.0.1] U=root F=<ok@localhost> rejected RCPT <z@test.ex>: (mail): Sender verify failed

 LOG: smtp_connection MAIN
   SMTP connection from root closed by QUIT
 >>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
 LOG: smtp_connection MAIN
   SMTP connection from root closed by QUIT
 >>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>


@@ -171,9 +171,9 @@ Attempting full verification using callout
 callout cache: found domain record for localhost
 callout cache: domain gave initial rejection, or does not accept HELO or MAIL FROM:<>
 LOG: MAIN REJECT
 callout cache: found domain record for localhost
 callout cache: domain gave initial rejection, or does not accept HELO or MAIL FROM:<>
 LOG: MAIN REJECT

-  H=[V4NET.0.0.1] U=root sender verify fail for <ok@localhost>
+  H=(test) [V4NET.0.0.1] U=root sender verify fail for <ok@localhost>

 LOG: MAIN REJECT
 LOG: MAIN REJECT

-  H=[V4NET.0.0.1] U=root F=<ok@localhost> rejected RCPT <z@test.ex>: (mail): Sender verify failed
+  H=(test) [V4NET.0.0.1] U=root F=<ok@localhost> rejected RCPT <z@test.ex>: (mail): Sender verify failed

 LOG: smtp_connection MAIN
   SMTP connection from root closed by QUIT
 >>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
 LOG: smtp_connection MAIN
   SMTP connection from root closed by QUIT
 >>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>


@@ -213,9 +213,9 @@ wrote callout cache domain record for otherhost:
   result=1 postmaster=2 random=0
 wrote positive callout cache address record for ok@otherhost
 LOG: MAIN REJECT
   result=1 postmaster=2 random=0
 wrote positive callout cache address record for ok@otherhost
 LOG: MAIN REJECT

-  H=[V4NET.0.0.2] U=root sender verify fail for <ok@otherhost>: 127.0.0.1 [127.0.0.1] : SMTP error from remote mail server after RCPT TO:<postmaster@otherhost>: 550 NOT OK
+  H=(test) [V4NET.0.0.2] U=root sender verify fail for <ok@otherhost>: 127.0.0.1 [127.0.0.1] : SMTP error from remote mail server after RCPT TO:<postmaster@otherhost>: 550 NOT OK

 LOG: MAIN REJECT
 LOG: MAIN REJECT

-  H=[V4NET.0.0.2] U=root F=<ok@otherhost> rejected RCPT <z@test.ex>: Sender verify failed
+  H=(test) [V4NET.0.0.2] U=root F=<ok@otherhost> rejected RCPT <z@test.ex>: Sender verify failed

 LOG: smtp_connection MAIN
   SMTP connection from root closed by QUIT
 >>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
 LOG: smtp_connection MAIN
   SMTP connection from root closed by QUIT
 >>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>


@@ -233,9 +233,9 @@ Attempting full verification using callout
 callout cache: found domain record for otherhost
 callout cache: domain does not accept RCPT TO:<postmaster@domain>
 LOG: MAIN REJECT
 callout cache: found domain record for otherhost
 callout cache: domain does not accept RCPT TO:<postmaster@domain>
 LOG: MAIN REJECT

-  H=[V4NET.0.0.2] U=root sender verify fail for <ok@otherhost>
+  H=(test) [V4NET.0.0.2] U=root sender verify fail for <ok@otherhost>

 LOG: MAIN REJECT
 LOG: MAIN REJECT

-  H=[V4NET.0.0.2] U=root F=<ok@otherhost> rejected RCPT <z@test.ex>: Sender verify failed
+  H=(test) [V4NET.0.0.2] U=root F=<ok@otherhost> rejected RCPT <z@test.ex>: Sender verify failed

 LOG: smtp_connection MAIN
   SMTP connection from root closed by QUIT
 >>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
 LOG: smtp_connection MAIN
   SMTP connection from root closed by QUIT
 >>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>


@@ -661,9 +661,9 @@ SMTP timeout
 wrote callout cache domain record for otherhost51:
   result=1 postmaster=0 random=0
 LOG: MAIN REJECT
 wrote callout cache domain record for otherhost51:
   result=1 postmaster=0 random=0
 LOG: MAIN REJECT

-  H=[V4NET.0.0.5] U=root sender verify defer for <okok@otherhost51>: Could not complete sender verify callout: 127.0.0.1 [127.0.0.1] : SMTP timeout after RCPT TO:<myhost.test.ex-dddddddd-testing@otherhost51>
+  H=(test) [V4NET.0.0.5] U=root sender verify defer for <okok@otherhost51>: Could not complete sender verify callout: 127.0.0.1 [127.0.0.1] : SMTP timeout after RCPT TO:<myhost.test.ex-dddddddd-testing@otherhost51>

 LOG: MAIN REJECT
 LOG: MAIN REJECT

-  H=[V4NET.0.0.5] U=root F=<okok@otherhost51> temporarily rejected RCPT <z@test.ex>: Could not complete sender verify callout
+  H=(test) [V4NET.0.0.5] U=root F=<okok@otherhost51> temporarily rejected RCPT <z@test.ex>: Could not complete sender verify callout

 LOG: smtp_connection MAIN
   SMTP connection from root closed by QUIT
 >>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
 LOG: smtp_connection MAIN
   SMTP connection from root closed by QUIT
 >>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>


@@ -735,7 +735,7 @@ wrote callout cache domain record for x.y.z:
   result=1 postmaster=0 random=0
 wrote positive callout cache address record for abcd@x.y.z/<somesender@a.domain>
 LOG: MAIN
   result=1 postmaster=0 random=0
 wrote positive callout cache address record for abcd@x.y.z/<somesender@a.domain>
 LOG: MAIN

-  <= ok7@otherhost53 H=[V4NET.0.0.7] U=root P=smtp S=sss
+  <= ok7@otherhost53 H=(test) [V4NET.0.0.7] U=root P=smtp S=sss

 LOG: smtp_connection MAIN
   SMTP connection from root closed by QUIT
 >>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
 LOG: smtp_connection MAIN
   SMTP connection from root closed by QUIT
 >>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>


@@ -767,7 +767,7 @@ SMTP timeout
 wrote callout cache domain record for x.y.z:
   result=1 postmaster=0 random=0
 LOG: MAIN
 wrote callout cache domain record for x.y.z:
   result=1 postmaster=0 random=0
 LOG: MAIN

-  <= ok7@otherhost53 H=[V4NET.0.0.8] U=root P=smtp S=sss
+  <= ok7@otherhost53 H=(test) [V4NET.0.0.8] U=root P=smtp S=sss

 LOG: smtp_connection MAIN
   SMTP connection from root closed by QUIT
 >>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
 LOG: smtp_connection MAIN
   SMTP connection from root closed by QUIT
 >>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>

diff --git a/test/stderr/0381 b/test/stderr/0381
index 0edf18cf5ea62a0a735f4259879f1efa1c9d8fcc..19c4e8a3a08386335a390c2da9e2987b16f83526 100644 (file)
--- a/test/stderr/0381
+++ b/test/stderr/0381
@@ -27,6 +27,12 @@ host in helo_try_verify_hosts? no (option unset)
 host in helo_accept_junk_hosts? no (option unset)
 SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
 smtp_setup_msg entered
 host in helo_accept_junk_hosts? no (option unset)
 SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
 smtp_setup_msg entered

+SMTP<< helo test
+test in helo_lookup_domains? no (end of list)
+sender_fullhost = (test) [V4NET.99.99.97]
+sender_rcvhost = [V4NET.99.99.97] (helo=test ident=CALLER)
+set_process_info: pppp handling incoming connection from (test) [V4NET.99.99.97] U=CALLER
+SMTP>> 250 myhost.test.ex Hello CALLER at test [V4NET.99.99.97]

 SMTP<< mail from:<notgov@test.ex>
 spool directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 msg_size = 0
 log directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100
 SMTP<< mail from:<notgov@test.ex>
 spool directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 msg_size = 0
 log directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100


@@ -53,8 +59,9 @@ x.co.uk.test.ex V4NET.99.99.97 mx=-1 sort=xx
 checking addresses for x.co.uk.test.ex
 Forward DNS security status: unverified
   V4NET.99.99.97 OK
 checking addresses for x.co.uk.test.ex
 Forward DNS security status: unverified
   V4NET.99.99.97 OK

-sender_fullhost = x.gov.uk.test.ex [V4NET.99.99.97]
-sender_rcvhost = x.gov.uk.test.ex ([V4NET.99.99.97] ident=CALLER)
+sender_fullhost = x.gov.uk.test.ex (test) [V4NET.99.99.97]
+sender_rcvhost = x.gov.uk.test.ex
+       ([V4NET.99.99.97] helo=test ident=CALLER)

 host in "*.gov.uk.test.ex"? yes (matched "*.gov.uk.test.ex")
 warn: condition test succeeded in ACL "check_rcpt"
 processing "warn" (TESTSUITE/test-config 18)
 host in "*.gov.uk.test.ex"? yes (matched "*.gov.uk.test.ex")
 warn: condition test succeeded in ACL "check_rcpt"
 processing "warn" (TESTSUITE/test-config 18)

diff --git a/test/stderr/0386 b/test/stderr/0386
index 8b0ca464803c125ea830c845e11996f10e730626..a94214bbc59675c7263477b9f6a91773592cd1c3 100644 (file)
--- a/test/stderr/0386
+++ b/test/stderr/0386
@@ -27,6 +27,12 @@ host in helo_try_verify_hosts? no (option unset)
 host in helo_accept_junk_hosts? no (option unset)
 SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
 smtp_setup_msg entered
 host in helo_accept_junk_hosts? no (option unset)
 SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
 smtp_setup_msg entered

+SMTP<< helo test
+test in helo_lookup_domains? no (end of list)
+sender_fullhost = (test) [V4NET.9.8.7]
+sender_rcvhost = [V4NET.9.8.7] (helo=test)
+set_process_info: pppp handling incoming connection from (test) [V4NET.9.8.7]
+SMTP>> 250 myhost.test.ex Hello test [V4NET.9.8.7]

 SMTP<< mail from:<x@y>
 spool directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 msg_size = 0
 log directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100
 SMTP<< mail from:<x@y>
 spool directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 msg_size = 0
 log directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100


@@ -80,7 +86,7 @@ accept: condition test failed in ACL "chk_rcpt"
 accept: endpass encountered - denying access
 SMTP>> 550 No such user here
 LOG: MAIN REJECT
 accept: endpass encountered - denying access
 SMTP>> 550 No such user here
 LOG: MAIN REJECT

-  H=[V4NET.9.8.7] F=<x@y> rejected RCPT <1@b>: No such user here
+  H=(test) [V4NET.9.8.7] F=<x@y> rejected RCPT <1@b>: No such user here

 SMTP<< rset
 SMTP>> 250 Reset OK
 SMTP<< mail from:<x@y>
 SMTP<< rset
 SMTP>> 250 Reset OK
 SMTP<< mail from:<x@y>


@@ -135,11 +141,11 @@ accept: condition test failed in ACL "chk_rcpt"
 accept: endpass encountered - denying access
 SMTP>> 550 No such user here
 LOG: MAIN REJECT
 accept: endpass encountered - denying access
 SMTP>> 550 No such user here
 LOG: MAIN REJECT

-  H=[V4NET.9.8.7] F=<x@y> rejected RCPT <1@b>: No such user here
+  H=(test) [V4NET.9.8.7] F=<x@y> rejected RCPT <1@b>: No such user here

 SMTP<< quit
 SMTP>> 221 myhost.test.ex closing connection
 LOG: smtp_connection MAIN
 SMTP<< quit
 SMTP>> 221 myhost.test.ex closing connection
 LOG: smtp_connection MAIN

-  SMTP connection from [V4NET.9.8.7] closed by QUIT
+  SMTP connection from (test) [V4NET.9.8.7] closed by QUIT

 search_tidyup called
 >>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
 Exim version x.yz ....
 search_tidyup called
 >>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
 Exim version x.yz ....


@@ -173,6 +179,12 @@ host in helo_try_verify_hosts? no (option unset)
 host in helo_accept_junk_hosts? no (option unset)
 SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
 smtp_setup_msg entered
 host in helo_accept_junk_hosts? no (option unset)
 SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
 smtp_setup_msg entered

+SMTP<< helo test
+test in helo_lookup_domains? no (end of list)
+sender_fullhost = (test) [V4NET.11.12.13]
+sender_rcvhost = [V4NET.11.12.13] (helo=test ident=CALLER)
+set_process_info: pppp handling incoming connection from (test) [V4NET.11.12.13] U=CALLER
+SMTP>> 250 myhost.test.ex Hello CALLER at test [V4NET.11.12.13]

 SMTP<< mail from:<x@y>
 spool directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 msg_size = 0
 log directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100
 SMTP<< mail from:<x@y>
 spool directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 msg_size = 0
 log directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100


@@ -203,7 +215,7 @@ DNS lookup of 13.12.11.V4NET.rbl.test.ex (TXT) succeeded
 => that means V4NET.11.12.13 is listed at rbl.test.ex
  warn: condition test succeeded in ACL "TESTSUITE/aux-fixed/0386.acl2"
 LOG: MAIN
 => that means V4NET.11.12.13 is listed at rbl.test.ex
  warn: condition test succeeded in ACL "TESTSUITE/aux-fixed/0386.acl2"
 LOG: MAIN

-  H=[V4NET.11.12.13] U=CALLER Warning: found in rbl.test.ex: This is a test blacklisting message
+  H=(test) [V4NET.11.12.13] U=CALLER Warning: found in rbl.test.ex: This is a test blacklisting message

 created log directory TESTSUITE/spool/log
  processing "accept" (TESTSUITE/test-config 44)
  accept: condition test succeeded in ACL "TESTSUITE/aux-fixed/0386.acl2"
 created log directory TESTSUITE/spool/log
  processing "accept" (TESTSUITE/test-config 44)
  accept: condition test succeeded in ACL "TESTSUITE/aux-fixed/0386.acl2"


@@ -222,7 +234,7 @@ search_tidyup called
 Data file name: TESTSUITE/spool//input//10HmaX-0005vi-00-D
 Data file written for message 10HmaX-0005vi-00
 >>Generated Received: header line
 Data file name: TESTSUITE/spool//input//10HmaX-0005vi-00-D
 Data file written for message 10HmaX-0005vi-00
 >>Generated Received: header line

-P Received: from [V4NET.11.12.13] (ident=CALLER)
+P Received: from [V4NET.11.12.13] (helo=test ident=CALLER)

        by myhost.test.ex with smtp (Exim x.yz)
        (envelope-from <x@y>)
        id 10HmaX-0005vi-00
        by myhost.test.ex with smtp (Exim x.yz)
        (envelope-from <x@y>)
        id 10HmaX-0005vi-00


@@ -237,7 +249,7 @@ DSN: **** SPOOL_OUT - address: <2@b> errorsto: <NULL> orcpt: <NULL> dsn_flags: 0
 Renaming spool header file: TESTSUITE/spool//input//10HmaX-0005vi-00-H
 Size of headers = sss
 LOG: MAIN
 Renaming spool header file: TESTSUITE/spool//input//10HmaX-0005vi-00-H
 Size of headers = sss
 LOG: MAIN

-  <= x@y H=[V4NET.11.12.13] U=CALLER P=smtp S=sss
+  <= x@y H=(test) [V4NET.11.12.13] U=CALLER P=smtp S=sss

 SMTP>> 250 OK id=10HmaX-0005vi-00
 search_tidyup called
 exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -C TESTSUITE/test-config -d=0xf7715cfd -MCd local-accept-delivery -odi -Mc 10HmaX-0005vi-00
 SMTP>> 250 OK id=10HmaX-0005vi-00
 search_tidyup called
 exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -C TESTSUITE/test-config -d=0xf7715cfd -MCd local-accept-delivery -odi -Mc 10HmaX-0005vi-00


@@ -257,8 +269,8 @@ set_process_info: pppp delivering 10HmaX-0005vi-00
 Trying spool file TESTSUITE/spool//input//10HmaX-0005vi-00-D
 reading spool file 10HmaX-0005vi-00-H
 user=CALLER uid=CALLER_UID gid=CALLER_GID sender=x@y
 Trying spool file TESTSUITE/spool//input//10HmaX-0005vi-00-D
 reading spool file 10HmaX-0005vi-00-H
 user=CALLER uid=CALLER_UID gid=CALLER_GID sender=x@y

-sender_fullhost = [V4NET.11.12.13]
-sender_rcvhost = [V4NET.11.12.13] (ident=CALLER)
+sender_fullhost = (test) [V4NET.11.12.13]
+sender_rcvhost = [V4NET.11.12.13] (helo=test ident=CALLER)

 sender_local=0 ident=CALLER
 Non-recipients:
  Empty Tree
 sender_local=0 ident=CALLER
 Non-recipients:
  Empty Tree


@@ -394,7 +406,7 @@ DNS lookup for 13.12.11.V4NET.rbl.test.ex succeeded (yielding 127.0.0.2)
 => that means V4NET.11.12.13 is listed at rbl.test.ex
  warn: condition test succeeded in ACL "TESTSUITE/aux-fixed/0386.acl2"
 LOG: MAIN
 => that means V4NET.11.12.13 is listed at rbl.test.ex
  warn: condition test succeeded in ACL "TESTSUITE/aux-fixed/0386.acl2"
 LOG: MAIN

-  H=[V4NET.11.12.13] U=CALLER Warning: found in rbl.test.ex: This is a test blacklisting message
+  H=(test) [V4NET.11.12.13] U=CALLER Warning: found in rbl.test.ex: This is a test blacklisting message

  processing "accept" (TESTSUITE/test-config 44)
  accept: condition test succeeded in ACL "TESTSUITE/aux-fixed/0386.acl2"
  end of ACL "TESTSUITE/aux-fixed/0386.acl2": ACCEPT
  processing "accept" (TESTSUITE/test-config 44)
  accept: condition test succeeded in ACL "TESTSUITE/aux-fixed/0386.acl2"
  end of ACL "TESTSUITE/aux-fixed/0386.acl2": ACCEPT


@@ -412,7 +424,7 @@ search_tidyup called
 Data file name: TESTSUITE/spool//input//10HmaY-0005vi-00-D
 Data file written for message 10HmaY-0005vi-00
 >>Generated Received: header line
 Data file name: TESTSUITE/spool//input//10HmaY-0005vi-00-D
 Data file written for message 10HmaY-0005vi-00
 >>Generated Received: header line

-P Received: from [V4NET.11.12.13] (ident=CALLER)
+P Received: from [V4NET.11.12.13] (helo=test ident=CALLER)

        by myhost.test.ex with smtp (Exim x.yz)
        (envelope-from <x@y>)
        id 10HmaY-0005vi-00
        by myhost.test.ex with smtp (Exim x.yz)
        (envelope-from <x@y>)
        id 10HmaY-0005vi-00


@@ -427,7 +439,7 @@ DSN: **** SPOOL_OUT - address: <2@b> errorsto: <NULL> orcpt: <NULL> dsn_flags: 0
 Renaming spool header file: TESTSUITE/spool//input//10HmaY-0005vi-00-H
 Size of headers = sss
 LOG: MAIN
 Renaming spool header file: TESTSUITE/spool//input//10HmaY-0005vi-00-H
 Size of headers = sss
 LOG: MAIN

-  <= x@y H=[V4NET.11.12.13] U=CALLER P=smtp S=sss
+  <= x@y H=(test) [V4NET.11.12.13] U=CALLER P=smtp S=sss

 SMTP>> 250 OK id=10HmaY-0005vi-00
 search_tidyup called
 exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -C TESTSUITE/test-config -d=0xf7715cfd -MCd local-accept-delivery -odi -Mc 10HmaY-0005vi-00
 SMTP>> 250 OK id=10HmaY-0005vi-00
 search_tidyup called
 exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -C TESTSUITE/test-config -d=0xf7715cfd -MCd local-accept-delivery -odi -Mc 10HmaY-0005vi-00


@@ -447,8 +459,8 @@ set_process_info: pppp delivering 10HmaY-0005vi-00
 Trying spool file TESTSUITE/spool//input//10HmaY-0005vi-00-D
 reading spool file 10HmaY-0005vi-00-H
 user=CALLER uid=CALLER_UID gid=CALLER_GID sender=x@y
 Trying spool file TESTSUITE/spool//input//10HmaY-0005vi-00-D
 reading spool file 10HmaY-0005vi-00-H
 user=CALLER uid=CALLER_UID gid=CALLER_GID sender=x@y

-sender_fullhost = [V4NET.11.12.13]
-sender_rcvhost = [V4NET.11.12.13] (ident=CALLER)
+sender_fullhost = (test) [V4NET.11.12.13]
+sender_rcvhost = [V4NET.11.12.13] (helo=test ident=CALLER)

 sender_local=0 ident=CALLER
 Non-recipients:
  Empty Tree
 sender_local=0 ident=CALLER
 Non-recipients:
  Empty Tree

diff --git a/test/stderr/0391 b/test/stderr/0391
index 8bfb22897b9989554f2b8c448ab5b9c6f2c77f8a..8c76173e3ae4d3696c312289b9fe2257a30be2c1 100644 (file)
--- a/test/stderr/0391
+++ b/test/stderr/0391
@@ -22,6 +22,12 @@ host in helo_try_verify_hosts? no (option unset)
 host in helo_accept_junk_hosts? no (option unset)
 SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
 smtp_setup_msg entered
 host in helo_accept_junk_hosts? no (option unset)
 SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
 smtp_setup_msg entered

+SMTP<< helo test
+test in helo_lookup_domains? no (end of list)
+sender_fullhost = (test) [1.2.3.4]
+sender_rcvhost = [1.2.3.4] (helo=test)
+set_process_info: pppp handling incoming connection from (test) [1.2.3.4]
+SMTP>> 250 myhost.test.ex Hello test [1.2.3.4]

 SMTP<< mail from:<U@W.x.y>
 spool directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 msg_size = 0
 log directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100
 SMTP<< mail from:<U@W.x.y>
 spool directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 msg_size = 0
 log directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100


@@ -62,6 +68,6 @@ SMTP>> 250 Accepted
 SMTP<< quit
 SMTP>> 221 myhost.test.ex closing connection
 LOG: smtp_connection MAIN
 SMTP<< quit
 SMTP>> 221 myhost.test.ex closing connection
 LOG: smtp_connection MAIN

-  SMTP connection from [1.2.3.4] closed by QUIT
+  SMTP connection from (test) [1.2.3.4] closed by QUIT

 search_tidyup called
 >>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
 search_tidyup called
 >>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>

diff --git a/test/stderr/0395 b/test/stderr/0395
index 503b9636079d05f231547d727dd28f6610e85dc1..964ce9243f740c2a794c0836bb36dbe70dfb1dbb 100644 (file)
--- a/test/stderr/0395
+++ b/test/stderr/0395
@@ -3,8 +3,8 @@ The error message was:
 
   501 sender address must contain a domain
 
 
   501 sender address must contain a domain
 

-The SMTP transaction started in line 0.
-The error was detected in line 1.
+The SMTP transaction started in line 1.
+The error was detected in line 2.

 The SMTP command at fault was:
 
    mail from: userx
 The SMTP command at fault was:
 
    mail from: userx


@@ -16,8 +16,8 @@ The error message was:
 
   501 recipient address must contain a domain
 
 
   501 recipient address must contain a domain
 

-The SMTP transaction started in line 0.
-The error was detected in line 2.
+The SMTP transaction started in line 1.
+The error was detected in line 3.

 The SMTP command at fault was:
 
    rcpt to: userx
 The SMTP command at fault was:
 
    rcpt to: userx

diff --git a/test/stderr/0396 b/test/stderr/0396
index 6afac4c6cac916b74c2996098c9708e39cba47ed..60661f82f07ed05aa77c3e98fede35189633aecd 100644 (file)
--- a/test/stderr/0396
+++ b/test/stderr/0396
@@ -13,6 +13,8 @@ LOG: smtp_connection MAIN
   SMTP connection from CALLER
 SMTP>> 220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
 smtp_setup_msg entered
   SMTP connection from CALLER
 SMTP>> 220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
 smtp_setup_msg entered

+SMTP<< helo test
+SMTP>> 250 the.local.host.name Hello CALLER at test

 SMTP<< mail from:<x@y>
 spool directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 msg_size = 0
 log directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100
 SMTP<< mail from:<x@y>
 spool directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 msg_size = 0
 log directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100

diff --git a/test/stderr/0398 b/test/stderr/0398
index d4f6a1c5480167c7750eb6a07ea566fb31633f29..d14f1056a812a84f698ae5cc66a0ae58eec4c29d 100644 (file)
--- a/test/stderr/0398
+++ b/test/stderr/0398
@@ -15,6 +15,8 @@ LOG: smtp_connection MAIN
   SMTP connection from CALLER
 SMTP>> 220 mail.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
 smtp_setup_msg entered
   SMTP connection from CALLER
 SMTP>> 220 mail.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
 smtp_setup_msg entered

+SMTP<< helo test
+SMTP>> 250 mail.test.ex Hello CALLER at test

 SMTP<< mail from:<qq@remote>
 spool directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 msg_size = 0
 log directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100
 SMTP<< mail from:<qq@remote>
 spool directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 msg_size = 0
 log directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100

diff --git a/test/stderr/0432 b/test/stderr/0432
index da8c0b57c5b3794aacd379841126da370990c33d..2f55fa252d0dead8950e3987dce7cd59b9e91f24 100644 (file)
--- a/test/stderr/0432
+++ b/test/stderr/0432
@@ -6,6 +6,7 @@
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)

+>>> test in helo_lookup_domains? no (end of list)

 >>> using ACL "mail"
 >>> processing "accept" (TESTSUITE/test-config 20)
 >>> check verify = sender/callout=1s,maxwait=1s
 >>> using ACL "mail"
 >>> processing "accept" (TESTSUITE/test-config 20)
 >>> check verify = sender/callout=1s,maxwait=1s


@@ -47,6 +48,12 @@ host in helo_try_verify_hosts? no (option unset)
 host in helo_accept_junk_hosts? no (option unset)
 SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
 smtp_setup_msg entered
 host in helo_accept_junk_hosts? no (option unset)
 SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
 smtp_setup_msg entered

+SMTP<< helo test
+test in helo_lookup_domains? no (end of list)
+sender_fullhost = (test) [1.2.3.4]
+sender_rcvhost = [1.2.3.4] (helo=test)
+set_process_info: pppp handling incoming connection from (test) [1.2.3.4]
+SMTP>> 250 myhost.test.ex Hello test [1.2.3.4]

 SMTP<< mail from:<x@y>
 spool directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 msg_size = 0
 log directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100
 SMTP<< mail from:<x@y>
 spool directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 msg_size = 0
 log directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100


@@ -130,7 +137,7 @@ SMTP>> 250 OK
 SMTP<< quit
 SMTP>> 221 myhost.test.ex closing connection
 LOG: smtp_connection MAIN
 SMTP<< quit
 SMTP>> 221 myhost.test.ex closing connection
 LOG: smtp_connection MAIN

-  SMTP connection from [1.2.3.4] closed by QUIT
+  SMTP connection from (test) [1.2.3.4] closed by QUIT

 search_tidyup called
 >>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
 Exim version x.yz ....
 search_tidyup called
 >>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
 Exim version x.yz ....


@@ -157,6 +164,12 @@ host in helo_try_verify_hosts? no (option unset)
 host in helo_accept_junk_hosts? no (option unset)
 SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
 smtp_setup_msg entered
 host in helo_accept_junk_hosts? no (option unset)
 SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
 smtp_setup_msg entered

+SMTP<< helo test
+test in helo_lookup_domains? no (end of list)
+sender_fullhost = (test) [1.2.3.4]
+sender_rcvhost = [1.2.3.4] (helo=test)
+set_process_info: pppp handling incoming connection from (test) [1.2.3.4]
+SMTP>> 250 myhost.test.ex Hello test [1.2.3.4]

 SMTP<< mail from:<x@y>
 spool directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 msg_size = 0
 log directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100
 SMTP<< mail from:<x@y>
 spool directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 msg_size = 0
 log directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100


@@ -208,7 +221,7 @@ SMTP>> 250 OK
 SMTP<< quit
 SMTP>> 221 myhost.test.ex closing connection
 LOG: smtp_connection MAIN
 SMTP<< quit
 SMTP>> 221 myhost.test.ex closing connection
 LOG: smtp_connection MAIN

-  SMTP connection from [1.2.3.4] closed by QUIT
+  SMTP connection from (test) [1.2.3.4] closed by QUIT

 search_tidyup called
 >>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
 >>> host in hosts_connection_nolog? no (option unset)
 search_tidyup called
 >>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
 >>> host in hosts_connection_nolog? no (option unset)


@@ -219,6 +232,7 @@ search_tidyup called
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)

+>>> test in helo_lookup_domains? no (end of list)

 >>> using ACL "mail"
 >>> processing "accept" (TESTSUITE/test-config 20)
 >>> check verify = sender/callout=1s,maxwait=1s
 >>> using ACL "mail"
 >>> processing "accept" (TESTSUITE/test-config 20)
 >>> check verify = sender/callout=1s,maxwait=1s


@@ -245,6 +259,7 @@ MUNGED: ::1 will be omitted in what follows
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)

+>>> test in helo_lookup_domains? no (end of list)

 >>> using ACL "mail"
 >>> processing "accept" (TESTSUITE/test-config 20)
 >>> check verify = sender/callout=1s,maxwait=1s
 >>> using ACL "mail"
 >>> processing "accept" (TESTSUITE/test-config 20)
 >>> check verify = sender/callout=1s,maxwait=1s


@@ -291,6 +306,7 @@ MUNGED: ::1 will be omitted in what follows
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)

+>>> test in helo_lookup_domains? no (end of list)

 >>> using ACL "mail"
 >>> processing "accept" (TESTSUITE/test-config 20)
 >>> check verify = sender/callout=1s,maxwait=1s
 >>> using ACL "mail"
 >>> processing "accept" (TESTSUITE/test-config 20)
 >>> check verify = sender/callout=1s,maxwait=1s


@@ -315,5 +331,5 @@ MUNGED: ::1 will be omitted in what follows
 >>> SMTP timeout
 >>> ----------- end verify ------------
 >>> accept: condition test deferred in ACL "mail"
 >>> SMTP timeout
 >>> ----------- end verify ------------
 >>> accept: condition test deferred in ACL "mail"

-LOG: H=[1.2.3.4] sender verify defer for <p1@q>: Could not complete sender verify callout: 127.0.0.1 [127.0.0.1] : SMTP timeout after EHLO myhost.test.ex
-LOG: H=[1.2.3.4] temporarily rejected MAIL <p1@q>: Could not complete sender verify callout
+LOG: H=(test) [1.2.3.4] sender verify defer for <p1@q>: Could not complete sender verify callout: 127.0.0.1 [127.0.0.1] : SMTP timeout after EHLO myhost.test.ex
+LOG: H=(test) [1.2.3.4] temporarily rejected MAIL <p1@q>: Could not complete sender verify callout

diff --git a/test/stderr/0443 b/test/stderr/0443
index 2911efa80df804cd89910b0791c83ed31a6a5098..974eb9a7ef2b95a2045a3d8a3d1408d23b1071cf 100644 (file)
--- a/test/stderr/0443
+++ b/test/stderr/0443
@@ -6,6 +6,7 @@
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)

+>>> test in helo_lookup_domains? no (end of list)

 >>> using ACL "rcpt"
 >>> processing "accept" (TESTSUITE/test-config 20)
 >>> check verify = sender/callout=1s
 >>> using ACL "rcpt"
 >>> processing "accept" (TESTSUITE/test-config 20)
 >>> check verify = sender/callout=1s


@@ -20,5 +21,5 @@
 >>> cannot callout via null transport
 >>> ----------- end verify ------------
 >>> accept: condition test deferred in ACL "rcpt"
 >>> cannot callout via null transport
 >>> ----------- end verify ------------
 >>> accept: condition test deferred in ACL "rcpt"

-LOG: H=[V4NET.0.0.1] sender verify defer for <x@ten-1.test.ex>: Could not complete sender verify callout
-LOG: H=[V4NET.0.0.1] F=<x@ten-1.test.ex> temporarily rejected RCPT x@y: Could not complete sender verify callout
+LOG: H=(test) [V4NET.0.0.1] sender verify defer for <x@ten-1.test.ex>: Could not complete sender verify callout
+LOG: H=(test) [V4NET.0.0.1] F=<x@ten-1.test.ex> temporarily rejected RCPT x@y: Could not complete sender verify callout

diff --git a/test/stderr/0445 b/test/stderr/0445
index f493eda3367d607310252994d9bea508a960fd30..38410b78e54d223dd78285f5876fa9e228d990f4 100644 (file)
--- a/test/stderr/0445
+++ b/test/stderr/0445
@@ -6,6 +6,7 @@
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)

+>>> test in helo_lookup_domains? no (end of list)

 >>> using ACL "rcpt"
 >>> processing "deny" (TESTSUITE/test-config 20)
 >>> check !verify = sender
 >>> using ACL "rcpt"
 >>> processing "deny" (TESTSUITE/test-config 20)
 >>> check !verify = sender


@@ -17,8 +18,8 @@
 >>> ----------- end verify ------------
 >>> deny: condition test succeeded in ACL "rcpt"
 >>> end of ACL "rcpt": DENY
 >>> ----------- end verify ------------
 >>> deny: condition test succeeded in ACL "rcpt"
 >>> end of ACL "rcpt": DENY

-LOG: H=[1.2.3.4] sender verify fail for <lp1@x.y>: 
-LOG: H=[1.2.3.4] F=<lp1@x.y> rejected RCPT <zz@x.y>: Sender verify failed
+LOG: H=(test) [1.2.3.4] sender verify fail for <lp1@x.y>: 
+LOG: H=(test) [1.2.3.4] F=<lp1@x.y> rejected RCPT <zz@x.y>: Sender verify failed

 >>> using ACL "rcpt"
 >>> processing "deny" (TESTSUITE/test-config 20)
 >>> check !verify = sender
 >>> using ACL "rcpt"
 >>> processing "deny" (TESTSUITE/test-config 20)
 >>> check !verify = sender


@@ -30,5 +31,5 @@ LOG: H=[1.2.3.4] F=<lp1@x.y> rejected RCPT <zz@x.y>: Sender verify failed
 >>> ----------- end verify ------------
 >>> deny: condition test succeeded in ACL "rcpt"
 >>> end of ACL "rcpt": DENY
 >>> ----------- end verify ------------
 >>> deny: condition test succeeded in ACL "rcpt"
 >>> end of ACL "rcpt": DENY

-LOG: H=[1.2.3.4] sender verify fail for <lp2@x.y>: This is a message
-LOG: H=[1.2.3.4] F=<lp2@x.y> rejected RCPT <zz@x.y>: Sender verify failed
+LOG: H=(test) [1.2.3.4] sender verify fail for <lp2@x.y>: This is a message
+LOG: H=(test) [1.2.3.4] F=<lp2@x.y> rejected RCPT <zz@x.y>: Sender verify failed

diff --git a/test/stderr/0462 b/test/stderr/0462
index 7ec8deda843275a67483bc0df9a2edf2b1070d59..0cf9bd41224da0a89fc6c8cde602af7b47ff5622 100644 (file)
--- a/test/stderr/0462
+++ b/test/stderr/0462
@@ -34,10 +34,10 @@ wrote callout cache domain record for localhost:
   result=1 postmaster=2 random=0
 wrote positive callout cache address record for Ok@localhost
 LOG: MAIN REJECT
   result=1 postmaster=2 random=0
 wrote positive callout cache address record for Ok@localhost
 LOG: MAIN REJECT

-  H=[V4NET.0.0.1] U=root sender verify fail for <Ok@localhost>: 127.0.0.1 [127.0.0.1] : SMTP error from remote mail server after RCPT TO:<postmaster@localhost>: 550 NO
+  H=(test) [V4NET.0.0.1] U=root sender verify fail for <Ok@localhost>: 127.0.0.1 [127.0.0.1] : SMTP error from remote mail server after RCPT TO:<postmaster@localhost>: 550 NO

 created log directory TESTSUITE/spool/log
 LOG: MAIN REJECT
 created log directory TESTSUITE/spool/log
 LOG: MAIN REJECT

-  H=[V4NET.0.0.1] U=root F=<Ok@localhost> rejected RCPT <checkpm@test.ex>: Sender verify failed
+  H=(test) [V4NET.0.0.1] U=root F=<Ok@localhost> rejected RCPT <checkpm@test.ex>: Sender verify failed

 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 Verifying Ok@localhost
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 Verifying Ok@localhost
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>


@@ -78,9 +78,9 @@ wrote callout cache domain record for elsewhere:
   result=1 postmaster=0 random=0
 wrote negative callout cache address record for NOTok@elsewhere
 LOG: MAIN REJECT
   result=1 postmaster=0 random=0
 wrote negative callout cache address record for NOTok@elsewhere
 LOG: MAIN REJECT

-  H=[V4NET.0.0.2] U=root sender verify fail for <NOTok@elsewhere>: 127.0.0.1 [127.0.0.1] : SMTP error from remote mail server after RCPT TO:<NOTok@elsewhere>: 550 NO
+  H=(test) [V4NET.0.0.2] U=root sender verify fail for <NOTok@elsewhere>: 127.0.0.1 [127.0.0.1] : SMTP error from remote mail server after RCPT TO:<NOTok@elsewhere>: 550 NO

 LOG: MAIN REJECT
 LOG: MAIN REJECT

-  H=[V4NET.0.0.2] U=root F=<NOTok@elsewhere> rejected RCPT <nocheckpm@test.ex>: Sender verify failed
+  H=(test) [V4NET.0.0.2] U=root F=<NOTok@elsewhere> rejected RCPT <nocheckpm@test.ex>: Sender verify failed

 LOG: smtp_connection MAIN
   SMTP connection from root closed by QUIT
 >>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
 LOG: smtp_connection MAIN
   SMTP connection from root closed by QUIT
 >>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>


@@ -113,7 +113,7 @@ wrote callout cache domain record for elsewhere:
   result=1 postmaster=0 random=0
 wrote negative callout cache address record for NOTok2@elsewhere
 LOG: MAIN REJECT
   result=1 postmaster=0 random=0
 wrote negative callout cache address record for NOTok2@elsewhere
 LOG: MAIN REJECT

-  H=[V4NET.0.0.2] U=root F=<NOTok2@elsewhere> rejected RCPT <nocheckpm@test.ex>: Sender verify failed
+  H=(test) [V4NET.0.0.2] U=root F=<NOTok2@elsewhere> rejected RCPT <nocheckpm@test.ex>: Sender verify failed

 LOG: smtp_connection MAIN
   SMTP connection from root closed by QUIT
 >>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
 LOG: smtp_connection MAIN
   SMTP connection from root closed by QUIT
 >>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>

diff --git a/test/stderr/0464 b/test/stderr/0464
index c156e873628fb45c71c18d6459704530575af9f3..c77aa978f78552c57fe1904e9e8bdfbb1992cadb 100644 (file)
--- a/test/stderr/0464
+++ b/test/stderr/0464
@@ -13,6 +13,8 @@ LOG: smtp_connection MAIN
   SMTP connection from CALLER
 SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
 smtp_setup_msg entered
   SMTP connection from CALLER
 SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
 smtp_setup_msg entered

+SMTP<< helo test
+SMTP>> 250 myhost.test.ex Hello CALLER at test

 SMTP<< mail from:<>
 spool directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 msg_size = 0
 log directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100
 SMTP<< mail from:<>
 spool directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 msg_size = 0
 log directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100

diff --git a/test/stderr/0465 b/test/stderr/0465
index bef0e0290fca283a338871f28533fdd62825fda3..c1dc8233e2abb39c19ed14bd5f06a8533783dc99 100644 (file)
--- a/test/stderr/0465
+++ b/test/stderr/0465
@@ -16,6 +16,8 @@ LOG: smtp_connection MAIN
   SMTP connection from CALLER
 SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
 smtp_setup_msg entered
   SMTP connection from CALLER
 SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
 smtp_setup_msg entered

+SMTP<< helo test
+SMTP>> 250 myhost.test.ex Hello CALLER at test

 SMTP<< mail from:<>
 spool directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 msg_size = 0
 log directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100
 SMTP<< mail from:<>
 spool directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 msg_size = 0
 log directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100


@@ -49,6 +51,8 @@ LOG: smtp_connection MAIN
   SMTP connection from CALLER
 SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
 smtp_setup_msg entered
   SMTP connection from CALLER
 SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
 smtp_setup_msg entered

+SMTP<< helo test
+SMTP>> 250 myhost.test.ex Hello CALLER at test

 SMTP<< mail from:<>
 spool directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 msg_size = 0
 log directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100
 SMTP<< mail from:<>
 spool directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 msg_size = 0
 log directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100


@@ -75,7 +79,8 @@ I Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
 Data file name: TESTSUITE/spool//input//10HmaY-0005vi-00-D
 Data file written for message 10HmaY-0005vi-00
 >>Generated Received: header line
 Data file name: TESTSUITE/spool//input//10HmaY-0005vi-00-D
 Data file written for message 10HmaY-0005vi-00
 >>Generated Received: header line

-P Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
+P Received: from CALLER (helo=test)
+       by myhost.test.ex with local-smtp (Exim x.yz)

        id 10HmaY-0005vi-00
        for abc@domain;
        Tue, 2 Mar 1999 09:44:33 +0000
        id 10HmaY-0005vi-00
        for abc@domain;
        Tue, 2 Mar 1999 09:44:33 +0000


@@ -117,6 +122,8 @@ LOG: smtp_connection MAIN
   SMTP connection from CALLER
 SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
 smtp_setup_msg entered
   SMTP connection from CALLER
 SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
 smtp_setup_msg entered

+SMTP<< helo test
+SMTP>> 250 myhost.test.ex Hello CALLER at test

 SMTP<< mail from:<>
 spool directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 msg_size = 0
 log directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100
 SMTP<< mail from:<>
 spool directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 msg_size = 0
 log directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100


@@ -143,7 +150,8 @@ I Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 Data file name: TESTSUITE/spool//input//10HmaX-0005vi-00-D
 Data file written for message 10HmaX-0005vi-00
 >>Generated Received: header line
 Data file name: TESTSUITE/spool//input//10HmaX-0005vi-00-D
 Data file written for message 10HmaX-0005vi-00
 >>Generated Received: header line

-P Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
+P Received: from CALLER (helo=test)
+       by myhost.test.ex with local-smtp (Exim x.yz)

        id 10HmaX-0005vi-00
        for abc@xyz;
        Tue, 2 Mar 1999 09:44:33 +0000
        id 10HmaX-0005vi-00
        for abc@xyz;
        Tue, 2 Mar 1999 09:44:33 +0000

diff --git a/test/stderr/0475 b/test/stderr/0475
index 6225b4dd0eb501478c7a0a871483d83d0fbfae73..c4df1ad5d896e97e7e4771d0051cedcb7f5d5393 100644 (file)
--- a/test/stderr/0475
+++ b/test/stderr/0475
@@ -6,17 +6,18 @@
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)

+>>> test in helo_lookup_domains? no (end of list)

 >>> using ACL "a1"
 >>> processing "deny" (TESTSUITE/test-config 16)
 >>> check hosts = 1.2.3.4 : <; 1.2.3.4::5.6.7.8
 LOG: unknown lookup type "<" in host list item "<; 1.2.3.4:5.6.7.8"
 >>> host in "1.2.3.4 : <; 1.2.3.4::5.6.7.8"? list match deferred for <; 1.2.3.4:5.6.7.8
 >>> deny: condition test deferred in ACL "a1"
 >>> using ACL "a1"
 >>> processing "deny" (TESTSUITE/test-config 16)
 >>> check hosts = 1.2.3.4 : <; 1.2.3.4::5.6.7.8
 LOG: unknown lookup type "<" in host list item "<; 1.2.3.4:5.6.7.8"
 >>> host in "1.2.3.4 : <; 1.2.3.4::5.6.7.8"? list match deferred for <; 1.2.3.4:5.6.7.8
 >>> deny: condition test deferred in ACL "a1"

-LOG: H=[V4NET.0.0.0] F=<> temporarily rejected RCPT <a1@b>: unknown lookup type "<"
+LOG: H=(test) [V4NET.0.0.0] F=<> temporarily rejected RCPT <a1@b>: unknown lookup type "<"

 >>> using ACL "a2"
 >>> processing "deny" (TESTSUITE/test-config 19)
 >>> check hosts = 1.2.3/24
 >>> host in "1.2.3/24"? no (malformed IPv4 address or address mask)
 >>> deny: condition test failed in ACL "a2"
 >>> end of ACL "a2": implicit DENY
 >>> using ACL "a2"
 >>> processing "deny" (TESTSUITE/test-config 19)
 >>> check hosts = 1.2.3/24
 >>> host in "1.2.3/24"? no (malformed IPv4 address or address mask)
 >>> deny: condition test failed in ACL "a2"
 >>> end of ACL "a2": implicit DENY

-LOG: H=[V4NET.0.0.0] F=<> rejected RCPT <a2@b>
+LOG: H=(test) [V4NET.0.0.0] F=<> rejected RCPT <a2@b>

diff --git a/test/stderr/0569 b/test/stderr/0569
index 78ef6d30ff23597ce44d3706a69ff71f047fd086..4799df036554ad5e8037660cc9640ba48769d02d 100644 (file)
--- a/test/stderr/0569
+++ b/test/stderr/0569
@@ -6,6 +6,7 @@
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)

+>>> test in helo_lookup_domains? no (end of list)

 >>> using ACL "check_from"
 >>> processing "accept" (TESTSUITE/test-config 20)
 >>> check senders = usery@exim.test.ex
 >>> using ACL "check_from"
 >>> processing "accept" (TESTSUITE/test-config 20)
 >>> check senders = usery@exim.test.ex


@@ -26,7 +27,7 @@
 >>> processing "accept" (TESTSUITE/test-config 27)
 >>> accept: condition test succeeded in ACL "check_message"
 >>> end of ACL "check_message": ACCEPT
 >>> processing "accept" (TESTSUITE/test-config 27)
 >>> accept: condition test succeeded in ACL "check_message"
 >>> end of ACL "check_message": ACCEPT

-LOG: 10HmaX-0005vi-00 <= userx@exim.test.ex H=[V4NET.10.10.10] P=smtp S=sss
+LOG: 10HmaX-0005vi-00 <= userx@exim.test.ex H=(test) [V4NET.10.10.10] P=smtp S=sss

 >>> host in hosts_connection_nolog? no (option unset)
 >>> host in host_lookup? no (option unset)
 >>> host in host_reject_connection? no (option unset)
 >>> host in hosts_connection_nolog? no (option unset)
 >>> host in host_lookup? no (option unset)
 >>> host in host_reject_connection? no (option unset)


@@ -35,6 +36,7 @@ LOG: 10HmaX-0005vi-00 <= userx@exim.test.ex H=[V4NET.10.10.10] P=smtp S=sss
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)

+>>> test in helo_lookup_domains? no (end of list)

 >>> using ACL "check_from"
 >>> processing "accept" (TESTSUITE/test-config 20)
 >>> check senders = usery@exim.test.ex
 >>> using ACL "check_from"
 >>> processing "accept" (TESTSUITE/test-config 20)
 >>> check senders = usery@exim.test.ex


@@ -53,7 +55,7 @@ LOG: 10HmaX-0005vi-00 <= userx@exim.test.ex H=[V4NET.10.10.10] P=smtp S=sss
 >>> check verify = header_names_ascii
 >>> require: condition test failed in ACL "check_message"
 >>> end of ACL "check_message": not OK
 >>> check verify = header_names_ascii
 >>> require: condition test failed in ACL "check_message"
 >>> end of ACL "check_message": not OK

-LOG: 10HmbA-0005vi-00 H=[V4NET.10.10.10] F=<userx@exim.test.ex> rejected after DATA: Invalid character in header "Received" found
+LOG: 10HmbA-0005vi-00 H=(test) [V4NET.10.10.10] F=<userx@exim.test.ex> rejected after DATA: Invalid character in header "Received" found

 >>> host in hosts_connection_nolog? no (option unset)
 >>> host in host_lookup? no (option unset)
 >>> host in host_reject_connection? no (option unset)
 >>> host in hosts_connection_nolog? no (option unset)
 >>> host in host_lookup? no (option unset)
 >>> host in host_reject_connection? no (option unset)


@@ -62,6 +64,7 @@ LOG: 10HmbA-0005vi-00 H=[V4NET.10.10.10] F=<userx@exim.test.ex> rejected after D
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)

+>>> test in helo_lookup_domains? no (end of list)

 >>> using ACL "check_from"
 >>> processing "accept" (TESTSUITE/test-config 20)
 >>> check senders = usery@exim.test.ex
 >>> using ACL "check_from"
 >>> processing "accept" (TESTSUITE/test-config 20)
 >>> check senders = usery@exim.test.ex


@@ -80,7 +83,7 @@ LOG: 10HmbA-0005vi-00 H=[V4NET.10.10.10] F=<userx@exim.test.ex> rejected after D
 >>> check verify = header_names_ascii
 >>> require: condition test failed in ACL "check_message"
 >>> end of ACL "check_message": not OK
 >>> check verify = header_names_ascii
 >>> require: condition test failed in ACL "check_message"
 >>> end of ACL "check_message": not OK

-LOG: 10HmbB-0005vi-00 H=[V4NET.10.10.10] F=<usery@exim.test.ex> rejected after DATA: Invalid character in header "Subjec⍅" found
+LOG: 10HmbB-0005vi-00 H=(test) [V4NET.10.10.10] F=<usery@exim.test.ex> rejected after DATA: Invalid character in header "Subjec⍅" found

 >>> host in hosts_connection_nolog? no (option unset)
 >>> host in host_lookup? no (option unset)
 >>> host in host_reject_connection? no (option unset)
 >>> host in hosts_connection_nolog? no (option unset)
 >>> host in host_lookup? no (option unset)
 >>> host in host_reject_connection? no (option unset)


@@ -89,6 +92,7 @@ LOG: 10HmbB-0005vi-00 H=[V4NET.10.10.10] F=<usery@exim.test.ex> rejected after D
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)

+>>> test in helo_lookup_domains? no (end of list)

 >>> using ACL "check_from"
 >>> processing "accept" (TESTSUITE/test-config 20)
 >>> check senders = usery@exim.test.ex
 >>> using ACL "check_from"
 >>> processing "accept" (TESTSUITE/test-config 20)
 >>> check senders = usery@exim.test.ex


@@ -107,7 +111,7 @@ LOG: 10HmbB-0005vi-00 H=[V4NET.10.10.10] F=<usery@exim.test.ex> rejected after D
 >>> check verify = header_names_ascii
 >>> require: condition test failed in ACL "check_message"
 >>> end of ACL "check_message": not OK
 >>> check verify = header_names_ascii
 >>> require: condition test failed in ACL "check_message"
 >>> end of ACL "check_message": not OK

-LOG: 10HmbC-0005vi-00 H=[V4NET.10.10.10] F=<userx@exim.test.ex> rejected after DATA: Invalid character in header "Subjec⍅" found
+LOG: 10HmbC-0005vi-00 H=(test) [V4NET.10.10.10] F=<userx@exim.test.ex> rejected after DATA: Invalid character in header "Subjec⍅" found

 >>> host in hosts_connection_nolog? no (option unset)
 >>> host in host_lookup? no (option unset)
 >>> host in host_reject_connection? no (option unset)
 >>> host in hosts_connection_nolog? no (option unset)
 >>> host in host_lookup? no (option unset)
 >>> host in host_reject_connection? no (option unset)


@@ -116,6 +120,7 @@ LOG: 10HmbC-0005vi-00 H=[V4NET.10.10.10] F=<userx@exim.test.ex> rejected after D
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)

+>>> test in helo_lookup_domains? no (end of list)

 >>> using ACL "check_from"
 >>> processing "accept" (TESTSUITE/test-config 20)
 >>> check senders = usery@exim.test.ex
 >>> using ACL "check_from"
 >>> processing "accept" (TESTSUITE/test-config 20)
 >>> check senders = usery@exim.test.ex


@@ -136,7 +141,7 @@ LOG: 10HmbC-0005vi-00 H=[V4NET.10.10.10] F=<userx@exim.test.ex> rejected after D
 >>> processing "accept" (TESTSUITE/test-config 27)
 >>> accept: condition test succeeded in ACL "check_message"
 >>> end of ACL "check_message": ACCEPT
 >>> processing "accept" (TESTSUITE/test-config 27)
 >>> accept: condition test succeeded in ACL "check_message"
 >>> end of ACL "check_message": ACCEPT

-LOG: 10HmaY-0005vi-00 <= userx@exim.test.ex H=[V4NET.10.10.10] P=smtp S=sss
+LOG: 10HmaY-0005vi-00 <= userx@exim.test.ex H=(test) [V4NET.10.10.10] P=smtp S=sss

 >>> host in hosts_connection_nolog? no (option unset)
 >>> host in host_lookup? no (option unset)
 >>> host in host_reject_connection? no (option unset)
 >>> host in hosts_connection_nolog? no (option unset)
 >>> host in host_lookup? no (option unset)
 >>> host in host_reject_connection? no (option unset)


@@ -145,6 +150,7 @@ LOG: 10HmaY-0005vi-00 <= userx@exim.test.ex H=[V4NET.10.10.10] P=smtp S=sss
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)

+>>> test in helo_lookup_domains? no (end of list)

 >>> using ACL "check_from"
 >>> processing "accept" (TESTSUITE/test-config 20)
 >>> check senders = usery@exim.test.ex
 >>> using ACL "check_from"
 >>> processing "accept" (TESTSUITE/test-config 20)
 >>> check senders = usery@exim.test.ex


@@ -165,4 +171,4 @@ LOG: 10HmaY-0005vi-00 <= userx@exim.test.ex H=[V4NET.10.10.10] P=smtp S=sss
 >>> processing "accept" (TESTSUITE/test-config 27)
 >>> accept: condition test succeeded in ACL "check_message"
 >>> end of ACL "check_message": ACCEPT
 >>> processing "accept" (TESTSUITE/test-config 27)
 >>> accept: condition test succeeded in ACL "check_message"
 >>> end of ACL "check_message": ACCEPT

-LOG: 10HmaZ-0005vi-00 <= userx@exim.test.ex H=[V4NET.10.10.10] P=smtp S=sss
+LOG: 10HmaZ-0005vi-00 <= userx@exim.test.ex H=(test) [V4NET.10.10.10] P=smtp S=sss

diff --git a/test/stderr/0575 b/test/stderr/0575
index 845b2c3626917d8dca611c11392c069448f975b7..17f50041f682a23e9ec18963dc72bc96c617ec81 100644 (file)
--- a/test/stderr/0575
+++ b/test/stderr/0575
@@ -22,6 +22,12 @@ host in helo_try_verify_hosts? no (option unset)
 host in helo_accept_junk_hosts? no (option unset)
 SMTP>> 220 mail.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
 smtp_setup_msg entered
 host in helo_accept_junk_hosts? no (option unset)
 SMTP>> 220 mail.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
 smtp_setup_msg entered

+SMTP<< helo test
+test in helo_lookup_domains? no (end of list)
+sender_fullhost = (test) [V4NET.0.0.0]
+sender_rcvhost = [V4NET.0.0.0] (helo=test)
+set_process_info: pppp handling incoming connection from (test) [V4NET.0.0.0]
+SMTP>> 250 mail.test.ex Hello test [V4NET.0.0.0]

 SMTP<< mail from:<x@y>
 spool directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 msg_size = 0
 log directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100
 SMTP<< mail from:<x@y>
 spool directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 msg_size = 0
 log directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100


@@ -42,19 +48,19 @@ search_tidyup called
 Data file name: TESTSUITE/spool//input//10HmaX-0005vi-00-D
 Data file written for message 10HmaX-0005vi-00
 >>Generated Received: header line
 Data file name: TESTSUITE/spool//input//10HmaX-0005vi-00-D
 Data file written for message 10HmaX-0005vi-00
 >>Generated Received: header line

-P Received: from [V4NET.0.0.0]
+P Received: from [V4NET.0.0.0] (helo=test)

        by mail.test.ex with smtp (Exim x.yz)
        (envelope-from <x@y>)
        id 10HmaX-0005vi-00
        for x@y;
        Tue, 2 Mar 1999 09:44:33 +0000
 LOG: MAIN
        by mail.test.ex with smtp (Exim x.yz)
        (envelope-from <x@y>)
        id 10HmaX-0005vi-00
        for x@y;
        Tue, 2 Mar 1999 09:44:33 +0000
 LOG: MAIN

-  <= x@y H=[V4NET.0.0.0] P=smtp S=sss
+  <= x@y H=(test) [V4NET.0.0.0] P=smtp S=sss

 SMTP>> 250 OK id=10HmaX-0005vi-00
 smtp_setup_msg entered
 SMTP<< quit
 SMTP>> 221 mail.test.ex closing connection
 LOG: smtp_connection MAIN
 SMTP>> 250 OK id=10HmaX-0005vi-00
 smtp_setup_msg entered
 SMTP<< quit
 SMTP>> 221 mail.test.ex closing connection
 LOG: smtp_connection MAIN

-  SMTP connection from [V4NET.0.0.0] closed by QUIT
+  SMTP connection from (test) [V4NET.0.0.0] closed by QUIT

 search_tidyup called
 >>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
 search_tidyup called
 >>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>

diff --git a/test/stderr/0578 b/test/stderr/0578
index 8a342346b2f936b70a7c418856b67d95c7659c94..3be9e2a1c6512f3376fc3b9653280ce5d6a7be03 100644 (file)
--- a/test/stderr/0578
+++ b/test/stderr/0578
@@ -64,10 +64,10 @@ callout cache: address record expired for ok@localhost
 interface=NULL port=1224
 Connecting to 127.0.0.1 [127.0.0.1]:1224 ...  failed: Connection refused
 LOG: MAIN REJECT
 interface=NULL port=1224
 Connecting to 127.0.0.1 [127.0.0.1]:1224 ...  failed: Connection refused
 LOG: MAIN REJECT

-  H=[V4NET.0.0.1] U=root sender verify defer for <ok@localhost>: Could not complete sender verify callout: 127.0.0.1 [127.0.0.1] : Connection refused
+  H=(test) [V4NET.0.0.1] U=root sender verify defer for <ok@localhost>: Could not complete sender verify callout: 127.0.0.1 [127.0.0.1] : Connection refused

 created log directory TESTSUITE/spool/log
 LOG: MAIN REJECT
 created log directory TESTSUITE/spool/log
 LOG: MAIN REJECT

-  H=[V4NET.0.0.1] U=root F=<ok@localhost> temporarily rejected RCPT <z@test.ex>: Could not complete sender verify callout
+  H=(test) [V4NET.0.0.1] U=root F=<ok@localhost> temporarily rejected RCPT <z@test.ex>: Could not complete sender verify callout

 LOG: smtp_connection MAIN
   SMTP connection from root closed by QUIT
 >>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
 LOG: smtp_connection MAIN
   SMTP connection from root closed by QUIT
 >>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>


@@ -102,9 +102,9 @@ wrote callout cache domain record for localhost:
   result=1 postmaster=0 random=0
 wrote negative callout cache address record for bad@localhost
 LOG: MAIN REJECT
   result=1 postmaster=0 random=0
 wrote negative callout cache address record for bad@localhost
 LOG: MAIN REJECT

-  H=[V4NET.0.0.1] U=root sender verify fail for <bad@localhost>: 127.0.0.1 [127.0.0.1] : SMTP error from remote mail server after RCPT TO:<bad@localhost>: 550 REJECTED rcpt
+  H=(test) [V4NET.0.0.1] U=root sender verify fail for <bad@localhost>: 127.0.0.1 [127.0.0.1] : SMTP error from remote mail server after RCPT TO:<bad@localhost>: 550 REJECTED rcpt

 LOG: MAIN REJECT
 LOG: MAIN REJECT

-  H=[V4NET.0.0.1] U=root F=<bad@localhost> rejected RCPT <z@test.ex>: (recipient): Sender verify failed
+  H=(test) [V4NET.0.0.1] U=root F=<bad@localhost> rejected RCPT <z@test.ex>: (recipient): Sender verify failed

 LOG: smtp_connection MAIN
   SMTP connection from root closed by QUIT
 >>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
 LOG: smtp_connection MAIN
   SMTP connection from root closed by QUIT
 >>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>


@@ -123,9 +123,9 @@ callout cache: found domain record for localhost
 callout cache: found address record for bad@localhost
 callout cache: address record is negative
 LOG: MAIN REJECT
 callout cache: found address record for bad@localhost
 callout cache: address record is negative
 LOG: MAIN REJECT

-  H=[V4NET.0.0.1] U=root sender verify fail for <bad@localhost>
+  H=(test) [V4NET.0.0.1] U=root sender verify fail for <bad@localhost>

 LOG: MAIN REJECT
 LOG: MAIN REJECT

-  H=[V4NET.0.0.1] U=root F=<bad@localhost> rejected RCPT <z@test.ex>: (recipient): Sender verify failed
+  H=(test) [V4NET.0.0.1] U=root F=<bad@localhost> rejected RCPT <z@test.ex>: (recipient): Sender verify failed

 LOG: smtp_connection MAIN
   SMTP connection from root closed by QUIT
 >>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
 LOG: smtp_connection MAIN
   SMTP connection from root closed by QUIT
 >>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>


@@ -159,9 +159,9 @@ Connecting to 127.0.0.1 [127.0.0.1]:1224 ...  connected
 wrote callout cache domain record for localhost:
   result=3 postmaster=0 random=0
 LOG: MAIN REJECT
 wrote callout cache domain record for localhost:
   result=3 postmaster=0 random=0
 LOG: MAIN REJECT

-  H=[V4NET.0.0.1] U=root sender verify fail for <ok@localhost>: 127.0.0.1 [127.0.0.1] : response to "MAIL FROM:<>" was: 550 REJECT mail from
+  H=(test) [V4NET.0.0.1] U=root sender verify fail for <ok@localhost>: 127.0.0.1 [127.0.0.1] : response to "MAIL FROM:<>" was: 550 REJECT mail from

 LOG: MAIN REJECT
 LOG: MAIN REJECT

-  H=[V4NET.0.0.1] U=root F=<ok@localhost> rejected RCPT <z@test.ex>: (mail): Sender verify failed
+  H=(test) [V4NET.0.0.1] U=root F=<ok@localhost> rejected RCPT <z@test.ex>: (mail): Sender verify failed

 LOG: smtp_connection MAIN
   SMTP connection from root closed by QUIT
 >>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
 LOG: smtp_connection MAIN
   SMTP connection from root closed by QUIT
 >>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>


@@ -179,9 +179,9 @@ Attempting full verification using callout
 callout cache: found domain record for localhost
 callout cache: domain gave initial rejection, or does not accept HELO or MAIL FROM:<>
 LOG: MAIN REJECT
 callout cache: found domain record for localhost
 callout cache: domain gave initial rejection, or does not accept HELO or MAIL FROM:<>
 LOG: MAIN REJECT

-  H=[V4NET.0.0.1] U=root sender verify fail for <ok@localhost>
+  H=(test) [V4NET.0.0.1] U=root sender verify fail for <ok@localhost>

 LOG: MAIN REJECT
 LOG: MAIN REJECT

-  H=[V4NET.0.0.1] U=root F=<ok@localhost> rejected RCPT <z@test.ex>: (mail): Sender verify failed
+  H=(test) [V4NET.0.0.1] U=root F=<ok@localhost> rejected RCPT <z@test.ex>: (mail): Sender verify failed

 LOG: smtp_connection MAIN
   SMTP connection from root closed by QUIT
 >>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
 LOG: smtp_connection MAIN
   SMTP connection from root closed by QUIT
 >>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>


@@ -223,9 +223,9 @@ wrote callout cache domain record for otherhost:
   result=1 postmaster=2 random=0
 wrote positive callout cache address record for ok@otherhost
 LOG: MAIN REJECT
   result=1 postmaster=2 random=0
 wrote positive callout cache address record for ok@otherhost
 LOG: MAIN REJECT

-  H=[V4NET.0.0.2] U=root sender verify fail for <ok@otherhost>: 127.0.0.1 [127.0.0.1] : SMTP error from remote mail server after RCPT TO:<postmaster@otherhost>: 550 NOT OK rcpt postmaster
+  H=(test) [V4NET.0.0.2] U=root sender verify fail for <ok@otherhost>: 127.0.0.1 [127.0.0.1] : SMTP error from remote mail server after RCPT TO:<postmaster@otherhost>: 550 NOT OK rcpt postmaster

 LOG: MAIN REJECT
 LOG: MAIN REJECT

-  H=[V4NET.0.0.2] U=root F=<ok@otherhost> rejected RCPT <z@test.ex>: Sender verify failed
+  H=(test) [V4NET.0.0.2] U=root F=<ok@otherhost> rejected RCPT <z@test.ex>: Sender verify failed

 LOG: smtp_connection MAIN
   SMTP connection from root closed by QUIT
 >>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
 LOG: smtp_connection MAIN
   SMTP connection from root closed by QUIT
 >>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>


@@ -243,9 +243,9 @@ Attempting full verification using callout
 callout cache: found domain record for otherhost
 callout cache: domain does not accept RCPT TO:<postmaster@domain>
 LOG: MAIN REJECT
 callout cache: found domain record for otherhost
 callout cache: domain does not accept RCPT TO:<postmaster@domain>
 LOG: MAIN REJECT

-  H=[V4NET.0.0.2] U=root sender verify fail for <ok@otherhost>
+  H=(test) [V4NET.0.0.2] U=root sender verify fail for <ok@otherhost>

 LOG: MAIN REJECT
 LOG: MAIN REJECT

-  H=[V4NET.0.0.2] U=root F=<ok@otherhost> rejected RCPT <z@test.ex>: Sender verify failed
+  H=(test) [V4NET.0.0.2] U=root F=<ok@otherhost> rejected RCPT <z@test.ex>: Sender verify failed

 LOG: smtp_connection MAIN
   SMTP connection from root closed by QUIT
 >>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
 LOG: smtp_connection MAIN
   SMTP connection from root closed by QUIT
 >>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>


@@ -691,9 +691,9 @@ SMTP timeout
 wrote callout cache domain record for otherhost51:
   result=1 postmaster=0 random=0
 LOG: MAIN REJECT
 wrote callout cache domain record for otherhost51:
   result=1 postmaster=0 random=0
 LOG: MAIN REJECT

-  H=[V4NET.0.0.5] U=root sender verify defer for <okok@otherhost51>: Could not complete sender verify callout: 127.0.0.1 [127.0.0.1] : SMTP timeout after RCPT TO:<myhost.test.ex-dddddddd-testing@otherhost51>
+  H=(test) [V4NET.0.0.5] U=root sender verify defer for <okok@otherhost51>: Could not complete sender verify callout: 127.0.0.1 [127.0.0.1] : SMTP timeout after RCPT TO:<myhost.test.ex-dddddddd-testing@otherhost51>

 LOG: MAIN REJECT
 LOG: MAIN REJECT

-  H=[V4NET.0.0.5] U=root F=<okok@otherhost51> temporarily rejected RCPT <z@test.ex>: Could not complete sender verify callout
+  H=(test) [V4NET.0.0.5] U=root F=<okok@otherhost51> temporarily rejected RCPT <z@test.ex>: Could not complete sender verify callout

 LOG: smtp_connection MAIN
   SMTP connection from root closed by QUIT
 >>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
 LOG: smtp_connection MAIN
   SMTP connection from root closed by QUIT
 >>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>


@@ -769,7 +769,7 @@ wrote callout cache domain record for x.y.z:
   result=1 postmaster=0 random=0
 wrote positive callout cache address record for abcd@x.y.z/<somesender@a.domain>
 LOG: MAIN
   result=1 postmaster=0 random=0
 wrote positive callout cache address record for abcd@x.y.z/<somesender@a.domain>
 LOG: MAIN

-  <= ok7@otherhost53 H=[V4NET.0.0.7] U=root P=smtp S=sss
+  <= ok7@otherhost53 H=(test) [V4NET.0.0.7] U=root P=smtp S=sss

 LOG: smtp_connection MAIN
   SMTP connection from root closed by QUIT
 >>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
 LOG: smtp_connection MAIN
   SMTP connection from root closed by QUIT
 >>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>


@@ -803,7 +803,7 @@ SMTP timeout
 wrote callout cache domain record for x.y.z:
   result=1 postmaster=0 random=0
 LOG: MAIN
 wrote callout cache domain record for x.y.z:
   result=1 postmaster=0 random=0
 LOG: MAIN

-  <= ok7@otherhost53 H=[V4NET.0.0.8] U=root P=smtp S=sss
+  <= ok7@otherhost53 H=(test) [V4NET.0.0.8] U=root P=smtp S=sss

 LOG: smtp_connection MAIN
   SMTP connection from root closed by QUIT
 >>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
 LOG: smtp_connection MAIN
   SMTP connection from root closed by QUIT
 >>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>

diff --git a/test/stderr/0584 b/test/stderr/0584
index d3e854e680331b47aac0de95f4be1d2b4815862b..73a584a4f973f6894d7fc80649f80e5df6d5d7de 100644 (file)
--- a/test/stderr/0584
+++ b/test/stderr/0584
@@ -6,6 +6,7 @@
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)

+>>> test in helo_lookup_domains? no (end of list)

 >>> using ACL "check_recipient"
 >>> processing "require" (TESTSUITE/test-config 20)
 >>> check verify = sender=userx@test.ex
 >>> using ACL "check_recipient"
 >>> processing "require" (TESTSUITE/test-config 20)
 >>> check verify = sender=userx@test.ex


@@ -20,7 +21,7 @@
 >>> accept: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": ACCEPT
 >>> host in ignore_fromline_hosts? no (option unset)
 >>> accept: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": ACCEPT
 >>> host in ignore_fromline_hosts? no (option unset)

-LOG: 10HmaX-0005vi-00 <= userx@test.ex H=[127.0.0.1] P=smtp S=sss
+LOG: 10HmaX-0005vi-00 <= userx@test.ex H=(test) [127.0.0.1] P=smtp S=sss

 >>> host in hosts_connection_nolog? no (option unset)
 >>> host in host_lookup? no (option unset)
 >>> host in host_reject_connection? no (option unset)
 >>> host in hosts_connection_nolog? no (option unset)
 >>> host in host_lookup? no (option unset)
 >>> host in host_reject_connection? no (option unset)


@@ -29,6 +30,7 @@ LOG: 10HmaX-0005vi-00 <= userx@test.ex H=[127.0.0.1] P=smtp S=sss
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)

+>>> test in helo_lookup_domains? no (end of list)

 >>> using ACL "check_recipient"
 >>> processing "require" (TESTSUITE/test-config 20)
 >>> check verify = sender=fail@test.ex
 >>> using ACL "check_recipient"
 >>> processing "require" (TESTSUITE/test-config 20)
 >>> check verify = sender=fail@test.ex


@@ -39,8 +41,8 @@ LOG: 10HmaX-0005vi-00 <= userx@test.ex H=[127.0.0.1] P=smtp S=sss
 >>> ----------- end verify ------------
 >>> require: condition test failed in ACL "check_recipient"
 >>> end of ACL "check_recipient": not OK
 >>> ----------- end verify ------------
 >>> require: condition test failed in ACL "check_recipient"
 >>> end of ACL "check_recipient": not OK

-LOG: H=[127.0.0.1] sender verify fail for <fail@test.ex>: Unrouteable address
-LOG: H=[127.0.0.1] F=<userx@test.ex> rejected RCPT <userx@test.ex>: Sender verify failed
+LOG: H=(test) [127.0.0.1] sender verify fail for <fail@test.ex>: Unrouteable address
+LOG: H=(test) [127.0.0.1] F=<userx@test.ex> rejected RCPT <userx@test.ex>: Sender verify failed

 >>> host in hosts_connection_nolog? no (option unset)
 >>> host in host_lookup? no (option unset)
 >>> host in host_reject_connection? no (option unset)
 >>> host in hosts_connection_nolog? no (option unset)
 >>> host in host_lookup? no (option unset)
 >>> host in host_reject_connection? no (option unset)


@@ -49,6 +51,7 @@ LOG: H=[127.0.0.1] F=<userx@test.ex> rejected RCPT <userx@test.ex>: Sender verif
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)

+>>> test in helo_lookup_domains? no (end of list)

 >>> using ACL "check_recipient"
 >>> processing "require" (TESTSUITE/test-config 20)
 >>> check verify = sender=$sender_address/defer_ok
 >>> using ACL "check_recipient"
 >>> processing "require" (TESTSUITE/test-config 20)
 >>> check verify = sender=$sender_address/defer_ok


@@ -64,4 +67,4 @@ LOG: H=[127.0.0.1] F=<userx@test.ex> rejected RCPT <userx@test.ex>: Sender verif
 >>> accept: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": ACCEPT
 >>> host in ignore_fromline_hosts? no (option unset)
 >>> accept: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": ACCEPT
 >>> host in ignore_fromline_hosts? no (option unset)

-LOG: 10HmaY-0005vi-00 <= userx@test.ex H=[127.0.0.1] P=smtp S=sss
+LOG: 10HmaY-0005vi-00 <= userx@test.ex H=(test) [127.0.0.1] P=smtp S=sss

diff --git a/test/stderr/0609 b/test/stderr/0609
index 5d6f97fd8ce1a5ef5c63870df45f1bfd40e9bfac..f8b8aee0b5dc58c39b5b607003b8596199203a35 100644 (file)
--- a/test/stderr/0609
+++ b/test/stderr/0609
@@ -28,7 +28,7 @@ ppppp Listening...
 ppppp accept: condition test succeeded in ACL "delay4_accept"
 ppppp end of ACL "delay4_accept": ACCEPT
 ppppp LOG: smtp_connection MAIN
 ppppp accept: condition test succeeded in ACL "delay4_accept"
 ppppp end of ACL "delay4_accept": ACCEPT
 ppppp LOG: smtp_connection MAIN

-ppppp   SMTP connection from [127.0.0.1] closed by QUIT
+ppppp   SMTP connection from (test) [127.0.0.1] closed by QUIT

 ppppp >>>>>>>>>>>>>>>> Exim pid=pppp (daemon-accept) terminating with rc=0 >>>>>>>>>>>>>>>>
 ppppp child ppppp ended: status=0x0
 ppppp   normal exit, 0
 ppppp >>>>>>>>>>>>>>>> Exim pid=pppp (daemon-accept) terminating with rc=0 >>>>>>>>>>>>>>>>
 ppppp child ppppp ended: status=0x0
 ppppp   normal exit, 0


@@ -47,7 +47,7 @@ ppppp delay cancelled by peer close
 ppppp accept: condition test succeeded in ACL "delay4_accept"
 ppppp end of ACL "delay4_accept": ACCEPT
 ppppp LOG: lost_incoming_connection MAIN
 ppppp accept: condition test succeeded in ACL "delay4_accept"
 ppppp end of ACL "delay4_accept": ACCEPT
 ppppp LOG: lost_incoming_connection MAIN

-ppppp   unexpected disconnection while reading SMTP command from [127.0.0.1] D=qqs
+ppppp   unexpected disconnection while reading SMTP command from (test) [127.0.0.1] D=qqs

 ppppp >>>>>>>>>>>>>>>> Exim pid=pppp (daemon-accept) terminating with rc=1 >>>>>>>>>>>>>>>>
 ppppp 1 SMTP accept process running
 ppppp SIGTERM/SIGINT seen
 ppppp >>>>>>>>>>>>>>>> Exim pid=pppp (daemon-accept) terminating with rc=1 >>>>>>>>>>>>>>>>
 ppppp 1 SMTP accept process running
 ppppp SIGTERM/SIGINT seen

diff --git a/test/stderr/1002 b/test/stderr/1002
index d01a05d7b3dea3927a8ab8c04e4b85ad62a5907d..7e23fe7e72319af63d294ddf76eccc6dffd02bf5 100644 (file)
--- a/test/stderr/1002
+++ b/test/stderr/1002
@@ -6,6 +6,7 @@
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)

+>>> test in helo_lookup_domains? no (end of list)

 >>> using ACL "acl_rcpt_1"
 >>> processing "require" (TESTSUITE/test-config 19)
 >>>   message: domain doesn't match @ or @[]
 >>> using ACL "acl_rcpt_1"
 >>> processing "require" (TESTSUITE/test-config 19)
 >>>   message: domain doesn't match @ or @[]


@@ -26,4 +27,4 @@
 >>> mxt11a.test.ex in "<+ @mx_any/ignore=<;127.0.0.1;::1"? no (end of list)
 >>> require: condition test failed in ACL "acl_rcpt_6"
 >>> end of ACL "acl_rcpt_6": not OK
 >>> mxt11a.test.ex in "<+ @mx_any/ignore=<;127.0.0.1;::1"? no (end of list)
 >>> require: condition test failed in ACL "acl_rcpt_6"
 >>> end of ACL "acl_rcpt_6": not OK

-LOG: H=[V4NET.1.1.1] F=<x@y> rejected RCPT <6@mxt11a.test.ex>: domain doesn't match @mx_any/ignore=<;127.0.0.1;::1
+LOG: H=(test) [V4NET.1.1.1] F=<x@y> rejected RCPT <6@mxt11a.test.ex>: domain doesn't match @mx_any/ignore=<;127.0.0.1;::1

diff --git a/test/stderr/2202 b/test/stderr/2202
index 3ce137682477fa6a764c0476f1fa26102545c3e6..9770c04823d16c4e29e1dd6884b172670e58b872 100644 (file)
--- a/test/stderr/2202
+++ b/test/stderr/2202
@@ -22,6 +22,12 @@ host in helo_try_verify_hosts? no (option unset)
 host in helo_accept_junk_hosts? no (option unset)
 SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
 smtp_setup_msg entered
 host in helo_accept_junk_hosts? no (option unset)
 SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
 smtp_setup_msg entered

+SMTP<< helo test
+test in helo_lookup_domains? no (end of list)
+sender_fullhost = (test) [ip4.ip4.ip4.ip4]
+sender_rcvhost = [ip4.ip4.ip4.ip4] (helo=test)
+set_process_info: pppp handling incoming connection from (test) [ip4.ip4.ip4.ip4]
+SMTP>> 250 myhost.test.ex Hello test [ip4.ip4.ip4.ip4]

 SMTP<< mail from:<xx@cioce.test.again.dns>
 spool directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 msg_size = 0
 log directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100
 SMTP<< mail from:<xx@cioce.test.again.dns>
 spool directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 msg_size = 0
 log directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100


@@ -59,8 +65,8 @@ the.local.host.name ip4.ip4.ip4.ip4 mx=-1 sort=xx
 checking addresses for the.local.host.name
 Forward DNS security status: unverified
   ip4.ip4.ip4.ip4 OK
 checking addresses for the.local.host.name
 Forward DNS security status: unverified
   ip4.ip4.ip4.ip4 OK

-sender_fullhost = the.local.host.name [ip4.ip4.ip4.ip4]
-sender_rcvhost = the.local.host.name ([ip4.ip4.ip4.ip4])
+sender_fullhost = the.local.host.name (test) [ip4.ip4.ip4.ip4]
+sender_rcvhost = the.local.host.name ([ip4.ip4.ip4.ip4] helo=test)

 using host_fake_gethostbyname for cioce.test.again.dns (IPv4)
 DNS lookup of cioce.test.again.dns (A) using fakens
 DNS lookup of cioce.test.again.dns (A) gave TRY_AGAIN
 using host_fake_gethostbyname for cioce.test.again.dns (IPv4)
 DNS lookup of cioce.test.again.dns (A) using fakens
 DNS lookup of cioce.test.again.dns (A) gave TRY_AGAIN


@@ -70,19 +76,19 @@ DNS: couldn't fake dnsa len
 DNS: no SOA record found for neg-TTL
  writing neg-cache entry for cioce.test.again.dns-A-xxxx, ttl -1
 host_fake_gethostbyname(af=inet) returned 1 (HOST_NOT_FOUND)
 DNS: no SOA record found for neg-TTL
  writing neg-cache entry for cioce.test.again.dns-A-xxxx, ttl -1
 host_fake_gethostbyname(af=inet) returned 1 (HOST_NOT_FOUND)

-no IP address found for host cioce.test.again.dns (during SMTP connection from the.local.host.name [ip4.ip4.ip4.ip4])
+no IP address found for host cioce.test.again.dns (during SMTP connection from the.local.host.name (test) [ip4.ip4.ip4.ip4])

 LOG: host_lookup_failed MAIN
 LOG: host_lookup_failed MAIN

-  no IP address found for host cioce.test.again.dns (during SMTP connection from the.local.host.name [ip4.ip4.ip4.ip4])
+  no IP address found for host cioce.test.again.dns (during SMTP connection from the.local.host.name (test) [ip4.ip4.ip4.ip4])

 failed to find IP address for cioce.test.again.dns: item ignored by +ignore_unknown
 host in "+ignore_unknown : *.cioce.test.again.dns : cioce.test.again.dns : "? no (end of list)
 accept: condition test failed in ACL "rcpt"
 end of ACL "rcpt": implicit DENY
 SMTP>> 550 Administrative prohibition
 LOG: MAIN REJECT
 failed to find IP address for cioce.test.again.dns: item ignored by +ignore_unknown
 host in "+ignore_unknown : *.cioce.test.again.dns : cioce.test.again.dns : "? no (end of list)
 accept: condition test failed in ACL "rcpt"
 end of ACL "rcpt": implicit DENY
 SMTP>> 550 Administrative prohibition
 LOG: MAIN REJECT

-  H=the.local.host.name [ip4.ip4.ip4.ip4] F=<xx@cioce.test.again.dns> rejected RCPT <a@b>
+  H=the.local.host.name (test) [ip4.ip4.ip4.ip4] F=<xx@cioce.test.again.dns> rejected RCPT <a@b>

 SMTP<< quit
 SMTP>> 221 myhost.test.ex closing connection
 LOG: smtp_connection MAIN
 SMTP<< quit
 SMTP>> 221 myhost.test.ex closing connection
 LOG: smtp_connection MAIN

-  SMTP connection from the.local.host.name [ip4.ip4.ip4.ip4] closed by QUIT
+  SMTP connection from the.local.host.name (test) [ip4.ip4.ip4.ip4] closed by QUIT

 search_tidyup called
 >>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
 search_tidyup called
 >>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>

diff --git a/test/stderr/2600 b/test/stderr/2600
index 74dab0a1da6b4fed7ca6219a05473516e748062b..c53a5ef8a60b89086f6f597184bbc2e9985efc70 100644 (file)
--- a/test/stderr/2600
+++ b/test/stderr/2600
@@ -161,6 +161,12 @@ host in helo_try_verify_hosts? no (option unset)
 host in helo_accept_junk_hosts? no (option unset)
 SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
 smtp_setup_msg entered
 host in helo_accept_junk_hosts? no (option unset)
 SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
 smtp_setup_msg entered

+SMTP<< helo test
+test in helo_lookup_domains? no (end of list)
+sender_fullhost = (test) [10.0.0.0]
+sender_rcvhost = [10.0.0.0] (helo=test)
+set_process_info: pppp handling incoming connection from (test) [10.0.0.0]
+SMTP>> 250 myhost.test.ex Hello test [10.0.0.0]

 SMTP<< mail from:<a@b>
 spool directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 msg_size = 0
 log directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100
 SMTP<< mail from:<a@b>
 spool directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 msg_size = 0
 log directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100


@@ -193,7 +199,7 @@ deny: condition test succeeded in ACL "check_recipient"
 end of ACL "check_recipient": DENY
 SMTP>> 550 relay not permitted
 LOG: MAIN REJECT
 end of ACL "check_recipient": DENY
 SMTP>> 550 relay not permitted
 LOG: MAIN REJECT

-  H=[10.0.0.0] F=<a@b> rejected RCPT <c@d>: relay not permitted
+  H=(test) [10.0.0.0] F=<a@b> rejected RCPT <c@d>: relay not permitted

 SMTP<< rcpt to:<c@d>
 using ACL "check_recipient"
 processing "accept" (TESTSUITE/test-config 32)
 SMTP<< rcpt to:<c@d>
 using ACL "check_recipient"
 processing "accept" (TESTSUITE/test-config 32)


@@ -223,11 +229,11 @@ deny: condition test succeeded in ACL "check_recipient"
 end of ACL "check_recipient": DENY
 SMTP>> 550 relay not permitted
 LOG: MAIN REJECT
 end of ACL "check_recipient": DENY
 SMTP>> 550 relay not permitted
 LOG: MAIN REJECT

-  H=[10.0.0.0] F=<a@b> rejected RCPT <c@d>: relay not permitted
+  H=(test) [10.0.0.0] F=<a@b> rejected RCPT <c@d>: relay not permitted

 SMTP<< quit
 SMTP>> 221 myhost.test.ex closing connection
 LOG: smtp_connection MAIN
 SMTP<< quit
 SMTP>> 221 myhost.test.ex closing connection
 LOG: smtp_connection MAIN

-  SMTP connection from [10.0.0.0] closed by QUIT
+  SMTP connection from (test) [10.0.0.0] closed by QUIT

 search_tidyup called
 >>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
 Exim version x.yz ....
 search_tidyup called
 >>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
 Exim version x.yz ....


@@ -256,6 +262,12 @@ host in helo_try_verify_hosts? no (option unset)
 host in helo_accept_junk_hosts? no (option unset)
 SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
 smtp_setup_msg entered
 host in helo_accept_junk_hosts? no (option unset)
 SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
 smtp_setup_msg entered

+SMTP<< helo test
+test in helo_lookup_domains? no (end of list)
+sender_fullhost = (test) [10.0.0.0]
+sender_rcvhost = [10.0.0.0] (helo=test)
+set_process_info: pppp handling incoming connection from (test) [10.0.0.0]
+SMTP>> 250 myhost.test.ex Hello test [10.0.0.0]

 SMTP<< mail from:<a@b>
 spool directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 msg_size = 0
 log directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100
 SMTP<< mail from:<a@b>
 spool directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 msg_size = 0
 log directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100


@@ -288,7 +300,7 @@ deny: condition test succeeded in ACL "check_recipient"
 end of ACL "check_recipient": DENY
 SMTP>> 550 relay not permitted
 LOG: MAIN REJECT
 end of ACL "check_recipient": DENY
 SMTP>> 550 relay not permitted
 LOG: MAIN REJECT

-  H=[10.0.0.0] F=<a@b> rejected RCPT <c@d>: relay not permitted
+  H=(test) [10.0.0.0] F=<a@b> rejected RCPT <c@d>: relay not permitted

 SMTP<< rcpt to:<c@d>
 using ACL "check_recipient"
 processing "accept" (TESTSUITE/test-config 32)
 SMTP<< rcpt to:<c@d>
 using ACL "check_recipient"
 processing "accept" (TESTSUITE/test-config 32)


@@ -318,11 +330,11 @@ deny: condition test succeeded in ACL "check_recipient"
 end of ACL "check_recipient": DENY
 SMTP>> 550 relay not permitted
 LOG: MAIN REJECT
 end of ACL "check_recipient": DENY
 SMTP>> 550 relay not permitted
 LOG: MAIN REJECT

-  H=[10.0.0.0] F=<a@b> rejected RCPT <c@d>: relay not permitted
+  H=(test) [10.0.0.0] F=<a@b> rejected RCPT <c@d>: relay not permitted

 SMTP<< quit
 SMTP>> 221 myhost.test.ex closing connection
 LOG: smtp_connection MAIN
 SMTP<< quit
 SMTP>> 221 myhost.test.ex closing connection
 LOG: smtp_connection MAIN

-  SMTP connection from [10.0.0.0] closed by QUIT
+  SMTP connection from (test) [10.0.0.0] closed by QUIT

 search_tidyup called
 >>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
 Exim version x.yz ....
 search_tidyup called
 >>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
 Exim version x.yz ....


@@ -351,6 +363,12 @@ host in helo_try_verify_hosts? no (option unset)
 host in helo_accept_junk_hosts? no (option unset)
 SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
 smtp_setup_msg entered
 host in helo_accept_junk_hosts? no (option unset)
 SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
 smtp_setup_msg entered

+SMTP<< helo test
+test in helo_lookup_domains? no (end of list)
+sender_fullhost = (test) [10.10.10.10]
+sender_rcvhost = [10.10.10.10] (helo=test)
+set_process_info: pppp handling incoming connection from (test) [10.10.10.10]
+SMTP>> 250 myhost.test.ex Hello test [10.10.10.10]

 SMTP<< mail from:<a@b>
 spool directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 msg_size = 0
 log directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100
 SMTP<< mail from:<a@b>
 spool directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 msg_size = 0
 log directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100


@@ -406,7 +424,7 @@ SMTP>> 250 Accepted
 SMTP<< quit
 SMTP>> 221 myhost.test.ex closing connection
 LOG: smtp_connection MAIN
 SMTP<< quit
 SMTP>> 221 myhost.test.ex closing connection
 LOG: smtp_connection MAIN

-  SMTP connection from [10.10.10.10] closed by QUIT
+  SMTP connection from (test) [10.10.10.10] closed by QUIT

 search_tidyup called
 >>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
 Exim version x.yz ....
 search_tidyup called
 >>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
 Exim version x.yz ....

diff --git a/test/stderr/2610 b/test/stderr/2610
index c768cb32161a82bb43becdcae344428a79dd4b47..fdda3b293ad5780a6ce672b4b9eb026b7872d9be 100644 (file)
--- a/test/stderr/2610
+++ b/test/stderr/2610
@@ -254,6 +254,12 @@ host in helo_try_verify_hosts? no (option unset)
 host in helo_accept_junk_hosts? no (option unset)
 SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
 smtp_setup_msg entered
 host in helo_accept_junk_hosts? no (option unset)
 SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
 smtp_setup_msg entered

+SMTP<< helo test
+test in helo_lookup_domains? no (end of list)
+sender_fullhost = (test) [10.0.0.0]
+sender_rcvhost = [10.0.0.0] (helo=test)
+set_process_info: pppp handling incoming connection from (test) [10.0.0.0]
+SMTP>> 250 myhost.test.ex Hello test [10.0.0.0]

 SMTP<< mail from:<a@b>
 spool directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 msg_size = 0
 log directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100
 SMTP<< mail from:<a@b>
 spool directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 msg_size = 0
 log directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100


@@ -317,7 +323,7 @@ check set acl_m0 = ok:   ${lookup mysql,servers=127.0.0.1::1223    {select name
  lookup deferred: MySQL server "127.0.0.1:1223/test/root/pass" is tainted
 warn: condition test deferred in ACL "check_recipient"
 LOG: MAIN
  lookup deferred: MySQL server "127.0.0.1:1223/test/root/pass" is tainted
 warn: condition test deferred in ACL "check_recipient"
 LOG: MAIN

-  H=[10.0.0.0] Warning: ACL "warn" statement skipped: condition test deferred: MySQL server "127.0.0.1:1223/test/root/pass" is tainted
+  H=(test) [10.0.0.0] Warning: ACL "warn" statement skipped: condition test deferred: MySQL server "127.0.0.1:1223/test/root/pass" is tainted

 processing "warn" (TESTSUITE/test-config 36)
 check set acl_m0 = ok:   hostlist
 check hosts = net-mysql;select * from them where id='$local_part'
 processing "warn" (TESTSUITE/test-config 36)
 check set acl_m0 = ok:   hostlist
 check hosts = net-mysql;select * from them where id='$local_part'


@@ -352,7 +358,7 @@ lookup deferred: MySQL server "127.0.0.1:1223/test/root/pass" is tainted
 host in "<& net-mysql;servers=127.0.0.1::1223/test/root/pass; select * from them where id='c'"? list match deferred for net-mysql;servers=127.0.0.1::1223/test/root/pass; select * from them where id='c'
 warn: condition test deferred in ACL "check_recipient"
 LOG: MAIN
 host in "<& net-mysql;servers=127.0.0.1::1223/test/root/pass; select * from them where id='c'"? list match deferred for net-mysql;servers=127.0.0.1::1223/test/root/pass; select * from them where id='c'
 warn: condition test deferred in ACL "check_recipient"
 LOG: MAIN

-  H=[10.0.0.0] Warning: ACL "warn" statement skipped: condition test deferred: MySQL server "127.0.0.1:1223/test/root/pass" is tainted
+  H=(test) [10.0.0.0] Warning: ACL "warn" statement skipped: condition test deferred: MySQL server "127.0.0.1:1223/test/root/pass" is tainted

 processing "warn" (TESTSUITE/test-config 44)
 check set acl_m0 = FAIL: hostlist
 check hosts = <& net-mysql,servers=127.0.0.1::1223/test/root/pass; select * from them where id='$local_part'
 processing "warn" (TESTSUITE/test-config 44)
 check set acl_m0 = FAIL: hostlist
 check hosts = <& net-mysql,servers=127.0.0.1::1223/test/root/pass; select * from them where id='$local_part'


@@ -369,7 +375,7 @@ lookup deferred: MySQL server "127.0.0.1:1223/test/root/pass" is tainted
 host in "<& net-mysql,servers=127.0.0.1::1223/test/root/pass; select * from them where id='c'"? list match deferred for net-mysql,servers=127.0.0.1::1223/test/root/pass; select * from them where id='c'
 warn: condition test deferred in ACL "check_recipient"
 LOG: MAIN
 host in "<& net-mysql,servers=127.0.0.1::1223/test/root/pass; select * from them where id='c'"? list match deferred for net-mysql,servers=127.0.0.1::1223/test/root/pass; select * from them where id='c'
 warn: condition test deferred in ACL "check_recipient"
 LOG: MAIN

-  H=[10.0.0.0] Warning: ACL "warn" statement skipped: condition test deferred: MySQL server "127.0.0.1:1223/test/root/pass" is tainted
+  H=(test) [10.0.0.0] Warning: ACL "warn" statement skipped: condition test deferred: MySQL server "127.0.0.1:1223/test/root/pass" is tainted

 processing "accept" (TESTSUITE/test-config 47)
 check domains = +local_domains
 d in "@"? no (end of list)
 processing "accept" (TESTSUITE/test-config 47)
 check domains = +local_domains
 d in "@"? no (end of list)


@@ -399,11 +405,11 @@ deny: condition test succeeded in ACL "check_recipient"
 end of ACL "check_recipient": DENY
 SMTP>> 550 relay not permitted
 LOG: MAIN REJECT
 end of ACL "check_recipient": DENY
 SMTP>> 550 relay not permitted
 LOG: MAIN REJECT

-  H=[10.0.0.0] F=<a@b> rejected RCPT <c@d>: relay not permitted
+  H=(test) [10.0.0.0] F=<a@b> rejected RCPT <c@d>: relay not permitted

 SMTP<< quit
 SMTP>> 221 myhost.test.ex closing connection
 LOG: smtp_connection MAIN
 SMTP<< quit
 SMTP>> 221 myhost.test.ex closing connection
 LOG: smtp_connection MAIN

-  SMTP connection from [10.0.0.0] closed by QUIT
+  SMTP connection from (test) [10.0.0.0] closed by QUIT

 search_tidyup called
 close MYSQL connection: 127.0.0.1:1223/test/root
 >>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
 search_tidyup called
 close MYSQL connection: 127.0.0.1:1223/test/root
 >>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>

diff --git a/test/stderr/2620 b/test/stderr/2620
index a1327115693ab9835f87760dde9a8559f08fdb7c..620aa86b1d42f44ee994cd527ec9c20ac5e7c5bd 100644 (file)
--- a/test/stderr/2620
+++ b/test/stderr/2620
@@ -240,6 +240,12 @@ host in helo_try_verify_hosts? no (option unset)
 host in helo_accept_junk_hosts? no (option unset)
 SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
 smtp_setup_msg entered
 host in helo_accept_junk_hosts? no (option unset)
 SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
 smtp_setup_msg entered

+SMTP<< helo test
+test in helo_lookup_domains? no (end of list)
+sender_fullhost = (test) [10.0.0.0]
+sender_rcvhost = [10.0.0.0] (helo=test)
+set_process_info: pppp handling incoming connection from (test) [10.0.0.0]
+SMTP>> 250 myhost.test.ex Hello test [10.0.0.0]

 SMTP<< mail from:<a@b>
 spool directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 msg_size = 0
 log directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100
 SMTP<< mail from:<a@b>
 spool directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 msg_size = 0
 log directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100


@@ -273,7 +279,7 @@ check set acl_m0 = ok:   ${lookup pgsql                    {select name from the
  lookup deferred: PostgreSQL server "SSPEC" not found in pgsql_servers
 warn: condition test deferred in ACL "check_recipient"
 LOG: MAIN
  lookup deferred: PostgreSQL server "SSPEC" not found in pgsql_servers
 warn: condition test deferred in ACL "check_recipient"
 LOG: MAIN

-  H=[10.0.0.0] Warning: ACL "warn" statement skipped: condition test deferred: PostgreSQL server "SSPEC" not found in pgsql_servers
+  H=(test) [10.0.0.0] Warning: ACL "warn" statement skipped: condition test deferred: PostgreSQL server "SSPEC" not found in pgsql_servers

 processing "warn" (TESTSUITE/test-config 38)
 check set acl_m0 = ok:   hostlist
 check hosts = net-pgsql;select * from them where id='$local_part'
 processing "warn" (TESTSUITE/test-config 38)
 check set acl_m0 = ok:   hostlist
 check hosts = net-pgsql;select * from them where id='$local_part'


@@ -308,7 +314,7 @@ lookup deferred: PostgreSQL server "SSPEC" not found in pgsql_servers
 host in "<& net-pgsql;servers=SSPEC; select * from them where id='c'"? list match deferred for net-pgsql;servers=SSPEC; select * from them where id='c'
 warn: condition test deferred in ACL "check_recipient"
 LOG: MAIN
 host in "<& net-pgsql;servers=SSPEC; select * from them where id='c'"? list match deferred for net-pgsql;servers=SSPEC; select * from them where id='c'
 warn: condition test deferred in ACL "check_recipient"
 LOG: MAIN

-  H=[10.0.0.0] Warning: ACL "warn" statement skipped: condition test deferred: PostgreSQL server "SSPEC" not found in pgsql_servers
+  H=(test) [10.0.0.0] Warning: ACL "warn" statement skipped: condition test deferred: PostgreSQL server "SSPEC" not found in pgsql_servers

 processing "warn" (TESTSUITE/test-config 46)
 check set acl_m0 = FAIL: hostlist
 check hosts = <& net-pgsql,servers=SSPEC; select * from them where id='$local_part'
 processing "warn" (TESTSUITE/test-config 46)
 check set acl_m0 = FAIL: hostlist
 check hosts = <& net-pgsql,servers=SSPEC; select * from them where id='$local_part'


@@ -325,7 +331,7 @@ lookup deferred: PostgreSQL server "SSPEC" not found in pgsql_servers
 host in "<& net-pgsql,servers=SSPEC; select * from them where id='c'"? list match deferred for net-pgsql,servers=SSPEC; select * from them where id='c'
 warn: condition test deferred in ACL "check_recipient"
 LOG: MAIN
 host in "<& net-pgsql,servers=SSPEC; select * from them where id='c'"? list match deferred for net-pgsql,servers=SSPEC; select * from them where id='c'
 warn: condition test deferred in ACL "check_recipient"
 LOG: MAIN

-  H=[10.0.0.0] Warning: ACL "warn" statement skipped: condition test deferred: PostgreSQL server "SSPEC" not found in pgsql_servers
+  H=(test) [10.0.0.0] Warning: ACL "warn" statement skipped: condition test deferred: PostgreSQL server "SSPEC" not found in pgsql_servers

 processing "accept" (TESTSUITE/test-config 49)
 check domains = +local_domains
 d in "@"? no (end of list)
 processing "accept" (TESTSUITE/test-config 49)
 check domains = +local_domains
 d in "@"? no (end of list)


@@ -355,7 +361,7 @@ deny: condition test succeeded in ACL "check_recipient"
 end of ACL "check_recipient": DENY
 SMTP>> 550 relay not permitted
 LOG: MAIN REJECT
 end of ACL "check_recipient": DENY
 SMTP>> 550 relay not permitted
 LOG: MAIN REJECT

-  H=[10.0.0.0] F=<a@b> rejected RCPT <c@d>: relay not permitted
+  H=(test) [10.0.0.0] F=<a@b> rejected RCPT <c@d>: relay not permitted

 SMTP<< rcpt to:<c@d>
 using ACL "check_recipient"
 processing "warn" (TESTSUITE/test-config 27)
 SMTP<< rcpt to:<c@d>
 using ACL "check_recipient"
 processing "warn" (TESTSUITE/test-config 27)


@@ -382,7 +388,7 @@ check set acl_m0 = ok:   ${lookup pgsql                    {select name from the
  lookup deferred: PostgreSQL server "SSPEC" not found in pgsql_servers
 warn: condition test deferred in ACL "check_recipient"
 LOG: MAIN
  lookup deferred: PostgreSQL server "SSPEC" not found in pgsql_servers
 warn: condition test deferred in ACL "check_recipient"
 LOG: MAIN

-  H=[10.0.0.0] Warning: ACL "warn" statement skipped: condition test deferred: PostgreSQL server "SSPEC" not found in pgsql_servers
+  H=(test) [10.0.0.0] Warning: ACL "warn" statement skipped: condition test deferred: PostgreSQL server "SSPEC" not found in pgsql_servers

 processing "warn" (TESTSUITE/test-config 38)
 check set acl_m0 = ok:   hostlist
 check hosts = net-pgsql;select * from them where id='$local_part'
 processing "warn" (TESTSUITE/test-config 38)
 check set acl_m0 = ok:   hostlist
 check hosts = net-pgsql;select * from them where id='$local_part'


@@ -413,7 +419,7 @@ lookup deferred: PostgreSQL server "SSPEC" not found in pgsql_servers
 host in "<& net-pgsql;servers=SSPEC; select * from them where id='c'"? list match deferred for net-pgsql;servers=SSPEC; select * from them where id='c'
 warn: condition test deferred in ACL "check_recipient"
 LOG: MAIN
 host in "<& net-pgsql;servers=SSPEC; select * from them where id='c'"? list match deferred for net-pgsql;servers=SSPEC; select * from them where id='c'
 warn: condition test deferred in ACL "check_recipient"
 LOG: MAIN

-  H=[10.0.0.0] Warning: ACL "warn" statement skipped: condition test deferred: PostgreSQL server "SSPEC" not found in pgsql_servers
+  H=(test) [10.0.0.0] Warning: ACL "warn" statement skipped: condition test deferred: PostgreSQL server "SSPEC" not found in pgsql_servers

 processing "warn" (TESTSUITE/test-config 46)
 check set acl_m0 = FAIL: hostlist
 check hosts = <& net-pgsql,servers=SSPEC; select * from them where id='$local_part'
 processing "warn" (TESTSUITE/test-config 46)
 check set acl_m0 = FAIL: hostlist
 check hosts = <& net-pgsql,servers=SSPEC; select * from them where id='$local_part'


@@ -430,7 +436,7 @@ lookup deferred: PostgreSQL server "SSPEC" not found in pgsql_servers
 host in "<& net-pgsql,servers=SSPEC; select * from them where id='c'"? list match deferred for net-pgsql,servers=SSPEC; select * from them where id='c'
 warn: condition test deferred in ACL "check_recipient"
 LOG: MAIN
 host in "<& net-pgsql,servers=SSPEC; select * from them where id='c'"? list match deferred for net-pgsql,servers=SSPEC; select * from them where id='c'
 warn: condition test deferred in ACL "check_recipient"
 LOG: MAIN

-  H=[10.0.0.0] Warning: ACL "warn" statement skipped: condition test deferred: PostgreSQL server "SSPEC" not found in pgsql_servers
+  H=(test) [10.0.0.0] Warning: ACL "warn" statement skipped: condition test deferred: PostgreSQL server "SSPEC" not found in pgsql_servers

 processing "accept" (TESTSUITE/test-config 49)
 check domains = +local_domains
 d in "@"? no (end of list)
 processing "accept" (TESTSUITE/test-config 49)
 check domains = +local_domains
 d in "@"? no (end of list)


@@ -456,11 +462,11 @@ deny: condition test succeeded in ACL "check_recipient"
 end of ACL "check_recipient": DENY
 SMTP>> 550 relay not permitted
 LOG: MAIN REJECT
 end of ACL "check_recipient": DENY
 SMTP>> 550 relay not permitted
 LOG: MAIN REJECT

-  H=[10.0.0.0] F=<a@b> rejected RCPT <c@d>: relay not permitted
+  H=(test) [10.0.0.0] F=<a@b> rejected RCPT <c@d>: relay not permitted

 SMTP<< quit
 SMTP>> 221 myhost.test.ex closing connection
 LOG: smtp_connection MAIN
 SMTP<< quit
 SMTP>> 221 myhost.test.ex closing connection
 LOG: smtp_connection MAIN

-  SMTP connection from [10.0.0.0] closed by QUIT
+  SMTP connection from (test) [10.0.0.0] closed by QUIT

 search_tidyup called
 close PGSQL connection: localhost:1223/test/CALLER
 >>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
 search_tidyup called
 close PGSQL connection: localhost:1223/test/CALLER
 >>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>

diff --git a/test/stderr/3202 b/test/stderr/3202
index 557a0da043df2c62700bb34de714387adc03175a..96d8d5fb71389198dca52662150b91bdc9950669 100644 (file)
--- a/test/stderr/3202
+++ b/test/stderr/3202
@@ -6,12 +6,13 @@
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)

+>>> test in helo_lookup_domains? no (end of list)

 >>> using ACL "acl_1_1_1"
 >>> processing "accept" (TESTSUITE/test-config 17)
 >>> check hosts = net-testdb;defer
 >>> host in "net-testdb;defer"? list match deferred for net-testdb;defer
 >>> accept: condition test deferred in ACL "acl_1_1_1"
 >>> using ACL "acl_1_1_1"
 >>> processing "accept" (TESTSUITE/test-config 17)
 >>> check hosts = net-testdb;defer
 >>> host in "net-testdb;defer"? list match deferred for net-testdb;defer
 >>> accept: condition test deferred in ACL "acl_1_1_1"

-LOG: H=[1.1.1.1] F=<x@y> temporarily rejected RCPT <x@y>: testdb lookup forced DEFER
+LOG: H=(test) [1.1.1.1] F=<x@y> temporarily rejected RCPT <x@y>: testdb lookup forced DEFER

 >>> host in hosts_connection_nolog? no (option unset)
 >>> host in host_lookup? no (option unset)
 >>> host in host_reject_connection? no (option unset)
 >>> host in hosts_connection_nolog? no (option unset)
 >>> host in host_lookup? no (option unset)
 >>> host in host_reject_connection? no (option unset)


@@ -20,12 +21,13 @@ LOG: H=[1.1.1.1] F=<x@y> temporarily rejected RCPT <x@y>: testdb lookup forced D
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)

+>>> test in helo_lookup_domains? no (end of list)

 >>> using ACL "acl_1_1_2"
 >>> processing "deny" (TESTSUITE/test-config 20)
 >>> check domains = testdb;defer
 >>> y in "testdb;defer"? list match deferred for testdb;defer
 >>> deny: condition test deferred in ACL "acl_1_1_2"
 >>> using ACL "acl_1_1_2"
 >>> processing "deny" (TESTSUITE/test-config 20)
 >>> check domains = testdb;defer
 >>> y in "testdb;defer"? list match deferred for testdb;defer
 >>> deny: condition test deferred in ACL "acl_1_1_2"

-LOG: H=[1.1.2.1] F=<x@y> temporarily rejected RCPT <x@y>: testdb lookup forced DEFER
+LOG: H=(test) [1.1.2.1] F=<x@y> temporarily rejected RCPT <x@y>: testdb lookup forced DEFER

 >>> host in hosts_connection_nolog? no (option unset)
 >>> host in host_lookup? no (option unset)
 >>> host in host_reject_connection? no (option unset)
 >>> host in hosts_connection_nolog? no (option unset)
 >>> host in host_lookup? no (option unset)
 >>> host in host_reject_connection? no (option unset)


@@ -34,9 +36,10 @@ LOG: H=[1.1.2.1] F=<x@y> temporarily rejected RCPT <x@y>: testdb lookup forced D
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)

+>>> test in helo_lookup_domains? no (end of list)

 >>> using ACL "acl_1_1_3"
 >>> processing "require" (TESTSUITE/test-config 23)
 >>> check local_parts = testdb;defer
 >>> x in "testdb;defer"? list match deferred for testdb;defer
 >>> require: condition test deferred in ACL "acl_1_1_3"
 >>> using ACL "acl_1_1_3"
 >>> processing "require" (TESTSUITE/test-config 23)
 >>> check local_parts = testdb;defer
 >>> x in "testdb;defer"? list match deferred for testdb;defer
 >>> require: condition test deferred in ACL "acl_1_1_3"

-LOG: H=[1.1.3.1] F=<x@y> temporarily rejected RCPT <x@y>: testdb lookup forced DEFER
+LOG: H=(test) [1.1.3.1] F=<x@y> temporarily rejected RCPT <x@y>: testdb lookup forced DEFER

diff --git a/test/stderr/3204 b/test/stderr/3204
index e285f3d17d31e19864746de1a128ba88314e769c..cd7db8f87b06f56b7854fd97d78f596d47d3a7b9 100644 (file)
--- a/test/stderr/3204
+++ b/test/stderr/3204
@@ -6,9 +6,10 @@
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)

+>>> test in helo_lookup_domains? no (end of list)

 >>> using ACL "check_recipient"
 >>> processing "deny" (TESTSUITE/test-config 17)
 >>> check senders = testdb;defer
 >>> userx@somehost.example.com in "testdb;defer"? list match deferred for testdb;defer
 >>> deny: condition test deferred in ACL "check_recipient"
 >>> using ACL "check_recipient"
 >>> processing "deny" (TESTSUITE/test-config 17)
 >>> check senders = testdb;defer
 >>> userx@somehost.example.com in "testdb;defer"? list match deferred for testdb;defer
 >>> deny: condition test deferred in ACL "check_recipient"

-LOG: H=[1.2.3.4] F=<userx@somehost.example.com> temporarily rejected RCPT <x@y>: testdb lookup forced DEFER
+LOG: H=(test) [1.2.3.4] F=<userx@somehost.example.com> temporarily rejected RCPT <x@y>: testdb lookup forced DEFER

diff --git a/test/stderr/3205 b/test/stderr/3205
index 012f5aed404fd8977ee35d6581e97799e966290f..6cc2e9c196dfeaef89fda48bf9c6f4fa2ffab9f4 100644 (file)
--- a/test/stderr/3205
+++ b/test/stderr/3205
@@ -6,12 +6,13 @@
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)

+>>> test in helo_lookup_domains? no (end of list)

 >>> using ACL "acl_1_2_3_4"
 >>> processing "deny" (TESTSUITE/test-config 17)
 >>> check senders = testdb;defer
 >>> userx@external.test.ex in "testdb;defer"? list match deferred for testdb;defer
 >>> deny: condition test deferred in ACL "acl_1_2_3_4"
 >>> using ACL "acl_1_2_3_4"
 >>> processing "deny" (TESTSUITE/test-config 17)
 >>> check senders = testdb;defer
 >>> userx@external.test.ex in "testdb;defer"? list match deferred for testdb;defer
 >>> deny: condition test deferred in ACL "acl_1_2_3_4"

-LOG: H=[1.2.3.4] F=<userx@external.test.ex> temporarily rejected RCPT <userx@test.ex>: testdb lookup forced DEFER
+LOG: H=(test) [1.2.3.4] F=<userx@external.test.ex> temporarily rejected RCPT <userx@test.ex>: testdb lookup forced DEFER

 >>> host in hosts_connection_nolog? no (option unset)
 >>> host in host_lookup? no (option unset)
 >>> host in host_reject_connection? no (option unset)
 >>> host in hosts_connection_nolog? no (option unset)
 >>> host in host_lookup? no (option unset)
 >>> host in host_reject_connection? no (option unset)


@@ -20,6 +21,7 @@ LOG: H=[1.2.3.4] F=<userx@external.test.ex> temporarily rejected RCPT <userx@tes
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)

+>>> test in helo_lookup_domains? no (end of list)

 >>> using ACL "acl_4_3_2_1"
 >>> processing "accept" (TESTSUITE/test-config 23)
 >>> check hosts = :
 >>> using ACL "acl_4_3_2_1"
 >>> processing "accept" (TESTSUITE/test-config 23)
 >>> check hosts = :


@@ -29,4 +31,4 @@ LOG: H=[1.2.3.4] F=<userx@external.test.ex> temporarily rejected RCPT <userx@tes
 >>> check hosts = testdb;defer
 >>> host in "testdb;defer"? list match deferred for testdb;defer
 >>> deny: condition test deferred in ACL "acl_4_3_2_1"
 >>> check hosts = testdb;defer
 >>> host in "testdb;defer"? list match deferred for testdb;defer
 >>> deny: condition test deferred in ACL "acl_4_3_2_1"

-LOG: H=[4.3.2.1] F=<userx@external.test.ex> temporarily rejected RCPT <userx@test.ex>: testdb lookup forced DEFER
+LOG: H=(test) [4.3.2.1] F=<userx@external.test.ex> temporarily rejected RCPT <userx@test.ex>: testdb lookup forced DEFER

diff --git a/test/stderr/3211 b/test/stderr/3211
index 2ae0bde590e9343e3b15eb3acf378636d9da8933..37566d36a581c9b54af1e7c7ef636fa25b98c51b 100644 (file)
--- a/test/stderr/3211
+++ b/test/stderr/3211
@@ -6,6 +6,7 @@
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)

+>>> test in helo_lookup_domains? no (end of list)

 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 17)
 >>> check verify = recipient
 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 17)
 >>> check verify = recipient


@@ -21,7 +22,7 @@
 >>>   message: host lookup did not complete
 >>> ----------- end verify ------------
 >>> accept: condition test deferred in ACL "check_recipient"
 >>>   message: host lookup did not complete
 >>> ----------- end verify ------------
 >>> accept: condition test deferred in ACL "check_recipient"

-LOG: H=[1.2.3.4] F=<userx@test.ex> temporarily rejected RCPT <userx@test.again.dns>: host lookup did not complete
+LOG: H=(test) [1.2.3.4] F=<userx@test.ex> temporarily rejected RCPT <userx@test.again.dns>: host lookup did not complete

 >>> host in hosts_connection_nolog? no (option unset)
 >>> host in host_lookup? no (option unset)
 >>> host in host_reject_connection? no (option unset)
 >>> host in hosts_connection_nolog? no (option unset)
 >>> host in host_lookup? no (option unset)
 >>> host in host_reject_connection? no (option unset)


@@ -30,6 +31,7 @@ LOG: H=[1.2.3.4] F=<userx@test.ex> temporarily rejected RCPT <userx@test.again.d
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)

+>>> test in helo_lookup_domains? no (end of list)

 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 17)
 >>> check verify = recipient
 >>> using ACL "check_recipient"
 >>> processing "accept" (TESTSUITE/test-config 17)
 >>> check verify = recipient


@@ -43,4 +45,4 @@ LOG: H=[1.2.3.4] F=<userx@test.ex> temporarily rejected RCPT <userx@test.again.d
 >>>   message: host lookup did not complete
 >>> ----------- end verify ------------
 >>> accept: condition test deferred in ACL "check_recipient"
 >>>   message: host lookup did not complete
 >>> ----------- end verify ------------
 >>> accept: condition test deferred in ACL "check_recipient"

-LOG: H=[1.2.3.4] F=<userx@test.ex> temporarily rejected RCPT <r1-userx@test.again.dns>: host lookup did not complete
+LOG: H=(test) [1.2.3.4] F=<userx@test.ex> temporarily rejected RCPT <r1-userx@test.again.dns>: host lookup did not complete

diff --git a/test/stderr/3400 b/test/stderr/3400
index e5ab777f1ad5b57b1eec7546a5861e46b67cffef..bd048d486ca3c4bb4351dfa83c35b87e3871770d 100644 (file)
--- a/test/stderr/3400
+++ b/test/stderr/3400
@@ -14,6 +14,7 @@
 >>> processing "accept" (TESTSUITE/test-config 34)
 >>> accept: condition test succeeded in ACL "check_connect"
 >>> end of ACL "check_connect": ACCEPT
 >>> processing "accept" (TESTSUITE/test-config 34)
 >>> accept: condition test succeeded in ACL "check_connect"
 >>> end of ACL "check_connect": ACCEPT

+>>> test in helo_lookup_domains? no (end of list)

 >>> host in smtp_accept_max_nonmail_hosts? yes (matched "*")
 >>> using ACL "check_vrfy"
 >>> processing "deny" (TESTSUITE/test-config 67)
 >>> host in smtp_accept_max_nonmail_hosts? yes (matched "*")
 >>> using ACL "check_vrfy"
 >>> processing "deny" (TESTSUITE/test-config 67)


@@ -47,7 +48,7 @@
 >>> test.ex in "! +local_domains"? no (matched "! +local_domains")
 >>> list in "userx"? no (end of list)
 >>> no more routers
 >>> test.ex in "! +local_domains"? no (matched "! +local_domains")
 >>> list in "userx"? no (end of list)
 >>> no more routers

-LOG: ETRN #abcd received from [10.0.0.2]
+LOG: ETRN #abcd received from (test) [10.0.0.2]

 >>> using ACL "check_etrn"
 >>> processing "deny" (TESTSUITE/test-config 53)
 >>> check hosts = +auth_hosts
 >>> using ACL "check_etrn"
 >>> processing "deny" (TESTSUITE/test-config 53)
 >>> check hosts = +auth_hosts


@@ -60,7 +61,7 @@ LOG: ETRN #abcd received from [10.0.0.2]
 >>> processing "warn" (TESTSUITE/test-config 57)
 >>> l_message: accepted ETRN $smtp_command_argument
 >>> warn: condition test succeeded in ACL "check_etrn"
 >>> processing "warn" (TESTSUITE/test-config 57)
 >>> l_message: accepted ETRN $smtp_command_argument
 >>> warn: condition test succeeded in ACL "check_etrn"

-LOG: H=[10.0.0.2] Warning: accepted ETRN #abcd
+LOG: H=(test) [10.0.0.2] Warning: accepted ETRN #abcd

 >>> processing "accept" (TESTSUITE/test-config 58)
 >>> accept: condition test succeeded in ACL "check_etrn"
 >>> end of ACL "check_etrn": ACCEPT
 >>> processing "accept" (TESTSUITE/test-config 58)
 >>> accept: condition test succeeded in ACL "check_etrn"
 >>> end of ACL "check_etrn": ACCEPT

diff --git a/test/stderr/3410 b/test/stderr/3410
index 80cf29925bc48d06b1c863edd2e6ea62555f8321..a8470e93cf22433eeee6eaebe1e8e8d360d1a5d6 100644 (file)
--- a/test/stderr/3410
+++ b/test/stderr/3410
@@ -6,13 +6,15 @@
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)

+>>> test in helo_lookup_domains? no (end of list)

 >>> using ACL "acl_5_6_9"
 >>> processing "accept" (TESTSUITE/test-config 19)
 >>>   message: You must authenticate
 >>> check authenticated = *
 >>> accept: condition test failed in ACL "acl_5_6_9"
 >>> accept: endpass encountered - denying access
 >>> using ACL "acl_5_6_9"
 >>> processing "accept" (TESTSUITE/test-config 19)
 >>>   message: You must authenticate
 >>> check authenticated = *
 >>> accept: condition test failed in ACL "acl_5_6_9"
 >>> accept: endpass encountered - denying access

-LOG: H=[5.6.9.1] F=<x@y> rejected RCPT <x@y>: You must authenticate
+LOG: H=(test) [5.6.9.1] F=<x@y> rejected RCPT <x@y>: You must authenticate
+>>> host in smtp_accept_max_nonmail_hosts? yes (matched "*")

 >>> rhu.barb in helo_lookup_domains? no (end of list)
 >>> host in dsn_advertise_hosts? no (option unset)
 >>> host in pipelining_advertise_hosts? yes (matched "*")
 >>> rhu.barb in helo_lookup_domains? no (end of list)
 >>> host in dsn_advertise_hosts? no (option unset)
 >>> host in pipelining_advertise_hosts? yes (matched "*")


@@ -41,12 +43,14 @@ LOG: H=[5.6.9.1] F=<x@y> rejected RCPT <x@y>: You must authenticate
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)

+>>> test in helo_lookup_domains? no (end of list)

 >>> using ACL "acl_5_6_10"
 >>> processing "accept" (TESTSUITE/test-config 24)
 >>> check authenticated = auth1
 >>> accept: condition test failed in ACL "acl_5_6_10"
 >>> end of ACL "acl_5_6_10": implicit DENY
 >>> using ACL "acl_5_6_10"
 >>> processing "accept" (TESTSUITE/test-config 24)
 >>> check authenticated = auth1
 >>> accept: condition test failed in ACL "acl_5_6_10"
 >>> end of ACL "acl_5_6_10": implicit DENY

-LOG: H=[5.6.10.1] F=<x@y> rejected RCPT <x@y>
+LOG: H=(test) [5.6.10.1] F=<x@y> rejected RCPT <x@y>
+>>> host in smtp_accept_max_nonmail_hosts? yes (matched "*")

 >>> rhu.barb in helo_lookup_domains? no (end of list)
 >>> host in dsn_advertise_hosts? no (option unset)
 >>> host in pipelining_advertise_hosts? yes (matched "*")
 >>> rhu.barb in helo_lookup_domains? no (end of list)
 >>> host in dsn_advertise_hosts? no (option unset)
 >>> host in pipelining_advertise_hosts? yes (matched "*")

diff --git a/test/stderr/5820 b/test/stderr/5820
index 7d3ee56272f25d1621ad2cb7acaeae2dfcb2a685..f5dbbfa2aeedbdaae80c97188e38df9a35af2e11 100644 (file)
--- a/test/stderr/5820
+++ b/test/stderr/5820
@@ -9,6 +9,7 @@
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)

+>>> test in helo_lookup_domains? no (end of list)

 >>> processing "accept" (TESTSUITE/test-config 88)
 >>> check verify = recipient/callout
 >>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 >>> processing "accept" (TESTSUITE/test-config 88)
 >>> check verify = recipient/callout
 >>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>


@@ -62,7 +63,7 @@
 >>> ----------- end verify ------------
 >>> accept: condition test succeeded in inline ACL
 >>> end of inline ACL: ACCEPT
 >>> ----------- end verify ------------
 >>> accept: condition test succeeded in inline ACL
 >>> end of inline ACL: ACCEPT

-LOG: unexpected disconnection while reading SMTP command from [127.0.0.1] D=qqs
+LOG: unexpected disconnection while reading SMTP command from (test) [127.0.0.1] D=qqs

 ### TLSA (2 0 1) (DANE-TA CERT SHA2-256)
 ### A server with a nonverifying cert and no TLSA
 ### A server with a verifying cert and no TLSA
 ### TLSA (2 0 1) (DANE-TA CERT SHA2-256)
 ### A server with a nonverifying cert and no TLSA
 ### A server with a verifying cert and no TLSA

diff --git a/test/stderr/5840 b/test/stderr/5840
index 8ece4e42bd474fb859dc212aa0c7aff0edcb6f68..633d7c6930b93a3a434cdc682f668bc2bc616076 100644 (file)
--- a/test/stderr/5840
+++ b/test/stderr/5840
@@ -9,6 +9,7 @@
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)

+>>> test in helo_lookup_domains? no (end of list)

 >>> processing "accept" (TESTSUITE/test-config 93)
 >>> check verify = recipient/callout
 >>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 >>> processing "accept" (TESTSUITE/test-config 93)
 >>> check verify = recipient/callout
 >>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>


@@ -62,7 +63,7 @@
 >>> ----------- end verify ------------
 >>> accept: condition test succeeded in inline ACL
 >>> end of inline ACL: ACCEPT
 >>> ----------- end verify ------------
 >>> accept: condition test succeeded in inline ACL
 >>> end of inline ACL: ACCEPT

-LOG: unexpected disconnection while reading SMTP command from [127.0.0.1] D=qqs
+LOG: unexpected disconnection while reading SMTP command from (test) [127.0.0.1] D=qqs

 ### TLSA (2 0 1) (DANE-TA CERT SHA2-256)
 ### TLSA (2 1 1)
 ### A server with a nonverifying cert and no TLSA
 ### TLSA (2 0 1) (DANE-TA CERT SHA2-256)
 ### TLSA (2 1 1)
 ### A server with a nonverifying cert and no TLSA

diff --git a/test/stdout/0002 b/test/stdout/0002
index 845b6b4af7c03d57d6209cb3a09699c2167d096d..0b9a95cd5fa566b4a6982a2d83449efb68a20175 100644 (file)
--- a/test/stdout/0002
+++ b/test/stdout/0002
@@ -985,6 +985,7 @@ xyz
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r

+250 myhost.test.ex Hello test [V4NET.0.0.0]\r

 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r


@@ -1012,6 +1013,7 @@ xyz
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r

+250 myhost.test.ex Hello test [V4NET.0.0.0]\r

 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r


@@ -1023,6 +1025,7 @@ xyz
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r

+250 myhost.test.ex Hello test [V4NET.0.0.0]\r

 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r

diff --git a/test/stdout/0003 b/test/stdout/0003
index 517f59fe8214973533ffe5db25eaf019c3c6e630..6d08675e67c6fe3b2892e9202580b10311f00a11 100644 (file)
--- a/test/stdout/0003
+++ b/test/stdout/0003
@@ -4,6 +4,7 @@
 **** This is not for real!
 
 220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 **** This is not for real!
 
 220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r

+250 the.local.host.name Hello test [1.1.1.1]\r

 250 OK\r
 550 Administrative prohibition\r
 250 Reset OK\r
 250 OK\r
 550 Administrative prohibition\r
 250 Reset OK\r

diff --git a/test/stdout/0004 b/test/stdout/0004
index 5595b3183f443a419a9132d872553102834c27aa..3669852cd20c5fa00140e904cb22507ebfb659d1 100644 (file)
--- a/test/stdout/0004
+++ b/test/stdout/0004
@@ -4,6 +4,7 @@
 **** This is not for real!
 
 220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 **** This is not for real!
 
 220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r

+250 the.local.host.name Hello test [1.1.1.1]\r

 250 OK\r
 550 Administrative prohibition\r
 250 Reset OK\r
 250 OK\r
 550 Administrative prohibition\r
 250 Reset OK\r

diff --git a/test/stdout/0005 b/test/stdout/0005
index 19cdc6c3ef81969c269ed933cd5bad8967f55ef6..0aaf1b52d3f4f7f7b65db65c7b70c9cb1e0810af 100644 (file)
--- a/test/stdout/0005
+++ b/test/stdout/0005
@@ -1,16 +1,19 @@
 220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r

+250 the.local.host.name Hello CALLER at test\r

 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
 250 OK id=10HmaX-0005vi-00\r
 221 the.local.host.name closing connection\r
 220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
 250 OK id=10HmaX-0005vi-00\r
 221 the.local.host.name closing connection\r
 220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r

+250 the.local.host.name Hello CALLER at test\r

 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
 250 OK id=10HmaY-0005vi-00\r
 221 the.local.host.name closing connection\r
 220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
 250 OK id=10HmaY-0005vi-00\r
 221 the.local.host.name closing connection\r
 220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r

+250 the.local.host.name Hello CALLER at test\r

 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r

diff --git a/test/stdout/0014 b/test/stdout/0014
index 10aae73d6d3f5261c3f6237aa9ef62f95a259fdf..6d377b79431933728b1be00de638fcaaf7f75e73 100644 (file)
--- a/test/stdout/0014
+++ b/test/stdout/0014
@@ -63,6 +63,7 @@ reply-to: jules@box3.plc.example
 env-from: "jules@box3.plc.example-is-not-known"@plc.example
   env-to: unknown@plc.example
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 env-from: "jules@box3.plc.example-is-not-known"@plc.example
   env-to: unknown@plc.example
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r

+250 myhost.test.ex Hello CALLER at test [10.0.0.2]\r

 250 OK\r
 550-Verification failed for <"jules@box3.plc.example-is-not-known"@plc.example>\r
 550-Unrouteable mail domain "plc.example"\r
 250 OK\r
 550-Verification failed for <"jules@box3.plc.example-is-not-known"@plc.example>\r
 550-Unrouteable mail domain "plc.example"\r

diff --git a/test/stdout/0022 b/test/stdout/0022
index 6dba84034b8e13f963386dd99f5b8d4758423fc8..311dd73035adff821fa5750a6379e0316837e09a 100644 (file)
--- a/test/stdout/0022
+++ b/test/stdout/0022
@@ -4,6 +4,7 @@
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r

+250 myhost.test.ex Hello test [V4NET.9.8.7]\r

 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r


@@ -18,6 +19,7 @@
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r

+250 myhost.test.ex Hello test [V4NET.9.8.7]\r

 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r


@@ -32,6 +34,7 @@
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r

+250 myhost.test.ex Hello test [V4NET.9.8.7]\r

 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r


@@ -46,6 +49,7 @@
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r

+250 myhost.test.ex Hello test [V4NET.9.8.7]\r

 250 OK\r
 451 forcibly deferred\r
 250 Accepted\r
 250 OK\r
 451 forcibly deferred\r
 250 Accepted\r


@@ -56,6 +60,7 @@
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r

+250 myhost.test.ex Hello test [V4NET.9.8.7]\r

 250 OK\r
 451 Temporary local problem - please try later\r
 221 myhost.test.ex closing connection\r
 250 OK\r
 451 Temporary local problem - please try later\r
 221 myhost.test.ex closing connection\r


@@ -65,6 +70,7 @@
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r

+250 myhost.test.ex Hello test [V4NET.9.8.7]\r

 250 OK\r
 250 Accepted\r
 250 Accepted\r
 250 OK\r
 250 Accepted\r
 250 Accepted\r


@@ -75,6 +81,7 @@
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r

+250 myhost.test.ex Hello test [V4NET.9.8.7]\r

 250 OK\r
 550 host data >A host-specific message<\r
 550 host data >A host-specific message<\r
 250 OK\r
 550 host data >A host-specific message<\r
 550 host data >A host-specific message<\r


@@ -82,6 +89,7 @@
 550 host data >A host-specific message<\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
 550 host data >A host-specific message<\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 test\r

 250 OK\r
 250 Accepted\r
 250 Accepted\r
 250 OK\r
 250 Accepted\r
 250 Accepted\r


@@ -107,6 +115,7 @@
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r

+250 myhost.test.ex Hello test [V4NET.9.8.7]\r

 250 OK\r
 550 forcibly dropped\r
 
 250 OK\r
 550 forcibly dropped\r
 


@@ -115,6 +124,7 @@
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r

+250 myhost.test.ex Hello test [V4NET.9.8.7]\r

 250 OK\r
 550 forcibly dropped\r
  0m   sss 10HmaX-0005vi-00 <CALLER@test.ex> *** frozen ***
 250 OK\r
 550 forcibly dropped\r
  0m   sss 10HmaX-0005vi-00 <CALLER@test.ex> *** frozen ***


@@ -128,6 +138,9 @@
 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
 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

+>>> helo test
+??? 250
+<<< 250 myhost.test.ex Hello test [127.0.0.1]

 >>> mail from:<x@y>
 ??? 250
 <<< 250 OK
 >>> mail from:<x@y>
 ??? 250
 <<< 250 OK

diff --git a/test/stdout/0023 b/test/stdout/0023
index a835f2a4eeaa6d1871189d960aca41ba8330c423..6f5af965f7660380a8cb3df02faede49ce12a0d5 100644 (file)
--- a/test/stdout/0023
+++ b/test/stdout/0023
@@ -4,6 +4,7 @@
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r

+250 myhost.test.ex Hello test [1.2.3.4]\r

 250 OK\r
 250 Accepted\r
 550 Administrative prohibition\r
 250 OK\r
 250 Accepted\r
 550 Administrative prohibition\r


@@ -21,6 +22,7 @@
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r

+250 myhost.test.ex Hello test [5.6.7.8]\r

 250 OK\r
 550 Administrative prohibition\r
 550 Administrative prohibition\r
 250 OK\r
 550 Administrative prohibition\r
 550 Administrative prohibition\r


@@ -33,6 +35,7 @@
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r

+250 myhost.test.ex Hello test [9.9.9.9]\r

 250 OK\r
 250 Accepted\r
 250 Accepted\r
 250 OK\r
 250 Accepted\r
 250 Accepted\r


@@ -43,6 +46,7 @@
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r

+250 myhost.test.ex Hello test [9.9.9.8]\r

 250 OK\r
 550 don't like this host\r
 550 don't like this host\r
 250 OK\r
 550 don't like this host\r
 550 don't like this host\r


@@ -53,6 +57,7 @@
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r

+250 myhost.test.ex Hello test [9.9.9.255]\r

 250 OK\r
 250 Accepted\r
 250 Accepted\r
 250 OK\r
 250 Accepted\r
 250 Accepted\r


@@ -63,6 +68,7 @@
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r

+250 myhost.test.ex Hello test [5.6.8.1]\r

 250 OK\r
 550 Administrative prohibition\r
 550 Administrative prohibition\r
 250 OK\r
 550 Administrative prohibition\r
 550 Administrative prohibition\r


@@ -87,6 +93,7 @@
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r

+250 myhost.test.ex Hello test [5.6.11.1]\r

 250 OK\r
 250 Accepted\r
 250 Accepted\r
 250 OK\r
 250 Accepted\r
 250 Accepted\r


@@ -99,6 +106,7 @@
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r

+250 myhost.test.ex Hello test [5.6.12.1]\r

 250 OK\r
 250 Accepted\r
 550 failed nested acl\r
 250 OK\r
 250 Accepted\r
 550 failed nested acl\r


@@ -109,6 +117,7 @@
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r

+250 myhost.test.ex Hello test [5.6.12.2]\r

 250 OK\r
 250 Accepted\r
 250 Accepted\r
 250 OK\r
 250 Accepted\r
 250 Accepted\r


@@ -119,6 +128,7 @@
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r

+250 myhost.test.ex Hello test [8.8.8.8]\r

 250 OK\r
 451 Temporary local problem - please try later\r
 221 myhost.test.ex closing connection\r
 250 OK\r
 451 Temporary local problem - please try later\r
 221 myhost.test.ex closing connection\r


@@ -128,6 +138,7 @@
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r

+250 myhost.test.ex Hello test [5.6.13.1]\r

 250 OK\r
 250 Accepted\r
 550 Administrative prohibition\r
 250 OK\r
 250 Accepted\r
 550 Administrative prohibition\r


@@ -139,6 +150,7 @@
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r

+250 myhost.test.ex Hello test [V4NET.11.12.13]\r

 250 OK\r
 550 host in DNS list rbl.test.ex: This is a test blacklisting message\r
 550 host in DNS list rbl.test.ex: This is a test blacklisting message\r
 250 OK\r
 550 host in DNS list rbl.test.ex: This is a test blacklisting message\r
 550 host in DNS list rbl.test.ex: This is a test blacklisting message\r


@@ -149,6 +161,7 @@
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r

+250 myhost.test.ex Hello test [V4NET.11.12.12]\r

 250 OK\r
 250 Accepted\r
 250 Accepted\r
 250 OK\r
 250 Accepted\r
 250 Accepted\r


@@ -159,6 +172,7 @@
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r

+250 myhost.test.ex Hello test [20.20.20.20]\r

 250 OK\r
 550-Verification failed for <x@y>\r
 550-Unrouteable address\r
 250 OK\r
 550-Verification failed for <x@y>\r
 550-Unrouteable address\r


@@ -171,6 +185,7 @@
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r

+250 myhost.test.ex Hello test [20.20.20.20]\r

 250 OK\r
 550 recipient verify failure\r
 250 Accepted\r
 250 OK\r
 550 recipient verify failure\r
 250 Accepted\r


@@ -181,6 +196,7 @@
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r

+250 myhost.test.ex Hello test [21.21.21.21]\r

 250 OK\r
 550 Unrouteable address\r
 250 Accepted\r
 250 OK\r
 550 Unrouteable address\r
 250 Accepted\r


@@ -203,6 +219,7 @@
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r

+250 myhost.test.ex Hello test [22.22.22.22]\r

 250 OK\r
 550 Administrative prohibition\r
 250 Accepted\r
 250 OK\r
 550 Administrative prohibition\r
 250 Accepted\r


@@ -213,6 +230,7 @@
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r

+250 myhost.test.ex Hello test [23.23.23.0]\r

 250 OK\r
 550-Verification failed for <x@y>\r
 550-Unrouteable address\r
 250 OK\r
 550-Verification failed for <x@y>\r
 550-Unrouteable address\r


@@ -227,6 +245,7 @@
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r

+250 myhost.test.ex Hello test [23.23.23.1]\r

 250 OK\r
 250 Accepted\r
 221 myhost.test.ex closing connection\r
 250 OK\r
 250 Accepted\r
 221 myhost.test.ex closing connection\r


@@ -236,6 +255,7 @@
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r

+250 myhost.test.ex Hello test [24.24.24.24]\r

 250 OK\r
 550 Administrative prohibition\r
 221 myhost.test.ex closing connection\r
 250 OK\r
 550 Administrative prohibition\r
 221 myhost.test.ex closing connection\r


@@ -245,6 +265,7 @@
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r

+250 myhost.test.ex Hello test [25.25.25.25]\r

 250 OK\r
 550 Administrative prohibition\r
 221 myhost.test.ex closing connection\r
 250 OK\r
 550 Administrative prohibition\r
 221 myhost.test.ex closing connection\r


@@ -254,6 +275,7 @@
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r

+250 myhost.test.ex Hello test [26.26.26.26]\r

 250 OK\r
 250 Accepted\r
 550 bounce messages can have only one recipient\r
 250 OK\r
 250 Accepted\r
 550 bounce messages can have only one recipient\r


@@ -265,6 +287,7 @@
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r

+250 myhost.test.ex Hello test [27.27.27.27]\r

 250 OK\r
 250 Accepted\r
 221 myhost.test.ex closing connection\r
 250 OK\r
 250 Accepted\r
 221 myhost.test.ex closing connection\r


@@ -274,6 +297,7 @@
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r

+250 myhost.test.ex Hello test [28.28.28.28]\r

 250 OK\r
 250 Accepted\r
 250 Reset OK\r
 250 OK\r
 250 Accepted\r
 250 Reset OK\r


@@ -289,6 +313,7 @@
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r

+250 myhost.test.ex Hello test [V4NET.0.0.3]\r

 250 OK\r
 250 Accepted\r
 221 myhost.test.ex closing connection\r
 250 OK\r
 250 Accepted\r
 221 myhost.test.ex closing connection\r


@@ -298,6 +323,7 @@
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r

+250 myhost.test.ex Hello test [V4NET.0.0.97]\r

 250 OK\r
 550 Administrative prohibition\r
 221 myhost.test.ex closing connection\r
 250 OK\r
 550 Administrative prohibition\r
 221 myhost.test.ex closing connection\r


@@ -307,6 +333,7 @@
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r

+250 myhost.test.ex Hello test [V4NET.99.99.96]\r

 250 OK\r
 451 Temporary local problem - please try later\r
 221 myhost.test.ex closing connection\r
 250 OK\r
 451 Temporary local problem - please try later\r
 221 myhost.test.ex closing connection\r


@@ -316,6 +343,7 @@
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r

+250 myhost.test.ex Hello test [V4NET.99.99.96]\r

 250 OK\r
 250 Accepted\r
 221 myhost.test.ex closing connection\r
 250 OK\r
 250 Accepted\r
 221 myhost.test.ex closing connection\r


@@ -325,6 +353,7 @@
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r

+250 myhost.test.ex Hello test [29.29.29.29]\r

 250 OK\r
 550 Administrative prohibition\r
 250 Reset OK\r
 250 OK\r
 550 Administrative prohibition\r
 250 Reset OK\r


@@ -337,6 +366,7 @@
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r

+250 myhost.test.ex Hello test [30.30.30.30]\r

 250 OK\r
 550-domain=test.ex\r
 550-value=V4NET.0.0.1\r
 250 OK\r
 550-domain=test.ex\r
 550-value=V4NET.0.0.1\r


@@ -358,16 +388,19 @@
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r

+250 myhost.test.ex Hello test [31.31.31.31]\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 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 test [32.32.32.32]\r

 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
 250 OK id=10HmaX-0005vi-00\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 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
 250 OK id=10HmaX-0005vi-00\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 test [32.32.32.32]\r

 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r


@@ -379,6 +412,7 @@
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r

+250 myhost.test.ex Hello test [33.33.33.33]\r

 250 OK\r
 550 sender verify failure\r
 550 sender verify failure\r
 250 OK\r
 550 sender verify failure\r
 550 sender verify failure\r


@@ -389,16 +423,19 @@
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r

+250 myhost.test.ex Hello test [44.44.44.1]\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 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 test [55.55.55.55]\r

 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
 250 OK id=10HmaZ-0005vi-00\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 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
 250 OK id=10HmaZ-0005vi-00\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 test [56.56.56.56]\r

 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r


@@ -441,6 +478,7 @@
 250 OK id=10HmbJ-0005vi-00\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 OK id=10HmbJ-0005vi-00\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 test [56.56.57.57]\r

 250 OK\r
 250 accepted by condition\r
 354 Enter message, ending with "." on a line by itself\r
 250 OK\r
 250 accepted by condition\r
 354 Enter message, ending with "." on a line by itself\r


@@ -454,12 +492,14 @@
 250 OK id=10HmbL-0005vi-00\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 OK id=10HmbL-0005vi-00\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 test [56.56.56.56]\r

 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
 250 OK id=10HmbM-0005vi-00\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 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
 250 OK id=10HmbM-0005vi-00\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 test [56.56.58.58]\r

 250 OK\r
 250 Accepted\r
 550 Administrative prohibition\r
 250 OK\r
 250 Accepted\r
 550 Administrative prohibition\r


@@ -471,11 +511,13 @@
 250 OK id=10HmbN-0005vi-00\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 OK id=10HmbN-0005vi-00\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 test [56.56.59.59]\r

 250 OK\r
 550-ACL message for verification failure\r
 550 Original was >here is a fail message<\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 OK\r
 550-ACL message for verification failure\r
 550 Original was >here is a fail message<\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 test [V4NET.11.12.13]\r

 250 OK\r
 550 host in DNS list rbl.test.ex: This is a test blacklisting message\r
 550 host in DNS list rbl.test.ex: This is a test blacklisting message\r
 250 OK\r
 550 host in DNS list rbl.test.ex: This is a test blacklisting message\r
 550 host in DNS list rbl.test.ex: This is a test blacklisting message\r


@@ -486,6 +528,7 @@
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r

+250 myhost.test.ex Hello test [60.60.60.60]\r

 250 OK\r
 250 Accepted\r
 550 Administrative prohibition\r
 250 OK\r
 250 Accepted\r
 550 Administrative prohibition\r

diff --git a/test/stdout/0024 b/test/stdout/0024
index d82af4d8cac05ba28b980fa1c0c0f33a2577906f..f4d0a7a0b39f1cafbf3d8e043e6a8f5a5fa75c8e 100644 (file)
--- a/test/stdout/0024
+++ b/test/stdout/0024
@@ -1,4 +1,5 @@
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\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 test [V4NET.0.0.0]\r

 250 OK\r
 250 Accepted\r
 550-Verification failed for <x@y>\r
 250 OK\r
 250 Accepted\r
 550-Verification failed for <x@y>\r


@@ -11,6 +12,7 @@
 250 OK id=10HmaX-0005vi-00\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 OK id=10HmaX-0005vi-00\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 test [V4NET.0.0.0]\r

 250 OK\r
 250 Accepted\r
 250 Accepted\r
 250 OK\r
 250 Accepted\r
 250 Accepted\r


@@ -22,6 +24,7 @@
 250 OK id=10HmaY-0005vi-00\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 OK id=10HmaY-0005vi-00\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 test [V4NET.255.255.0]\r

 250 OK\r
 550 unknown user\r
 550 Unrouteable address\r
 250 OK\r
 550 unknown user\r
 550 Unrouteable address\r


@@ -31,6 +34,7 @@
 250 OK id=10HmaZ-0005vi-00\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 OK id=10HmaZ-0005vi-00\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 test [V4NET.11.12.13]\r

 250 OK\r
 250 Accepted\r
 550-rejected because V4NET.11.12.13 is in a black list at rbl.test.ex\r
 250 OK\r
 250 Accepted\r
 550-rejected because V4NET.11.12.13 is in a black list at rbl.test.ex\r


@@ -41,6 +45,7 @@
 250 OK id=10HmbA-0005vi-00\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 OK id=10HmbA-0005vi-00\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 test [V4NET.11.12.16]\r

 250 OK\r
 250 Accepted\r
 250 Accepted\r
 250 OK\r
 250 Accepted\r
 250 Accepted\r


@@ -49,6 +54,7 @@
 250 OK id=10HmbB-0005vi-00\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 OK id=10HmbB-0005vi-00\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 test\r

 250 OK\r
 250 Accepted\r
 250 Accepted\r
 250 OK\r
 250 Accepted\r
 250 Accepted\r

diff --git a/test/stdout/0025 b/test/stdout/0025
index a31c2d2114e439017a675b2a731652b5dc4735f2..61e1cb5f161f1949310d6e9d85e411c71de3f22b 100644 (file)
--- a/test/stdout/0025
+++ b/test/stdout/0025
@@ -1,4 +1,5 @@
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\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 test\r

 250 OK\r
 550-Verification failed for <x@y>\r
 550-Unrouteable address\r
 250 OK\r
 550-Verification failed for <x@y>\r
 550-Unrouteable address\r

diff --git a/test/stdout/0026 b/test/stdout/0026
index 1fac53793f416810a060fe7a77d8d6885c09a89a..5d6e14f64752e4f10788630a59cf698e6dfbbf9a 100644 (file)
--- a/test/stdout/0026
+++ b/test/stdout/0026
@@ -1,46 +1,54 @@
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\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 test\r

 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
 250 OK id=10HmbD-0005vi-00\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 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
 250 OK id=10HmbD-0005vi-00\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 test\r

 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
 550 Administrative prohibition\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 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
 550 Administrative prohibition\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 test\r

 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
 550 Administrative prohibition\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 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
 550 Administrative prohibition\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 test\r

 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
 550 Administrative prohibition\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 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
 550 Administrative prohibition\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 test\r

 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
 550 Administrative prohibition\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 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
 550 Administrative prohibition\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 test\r

 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
 250 OK id=10HmbE-0005vi-00\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 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
 250 OK id=10HmbE-0005vi-00\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 test\r

 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
 550 Administrative prohibition\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 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
 550 Administrative prohibition\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 test\r

 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r


@@ -52,6 +60,7 @@
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r

+250 myhost.test.ex Hello test [10.0.0.0]\r

 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r


@@ -63,24 +72,28 @@
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r

+250 myhost.test.ex Hello test [10.0.0.0]\r

 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
 550 Administrative prohibition\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 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
 550 Administrative prohibition\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 test\r

 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
 250 OK id=10HmbG-0005vi-00\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 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
 250 OK id=10HmbG-0005vi-00\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 test\r

 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
 250 OK id=10HmbH-0005vi-00\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 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
 250 OK id=10HmbH-0005vi-00\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 test\r

 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r

diff --git a/test/stdout/0027 b/test/stdout/0027
index 5802969458689cee7307a91dffb0f00b4b8391e1..ab6717f715aa32ced945d2c6660ae1a45b6fbc41 100644 (file)
--- a/test/stdout/0027
+++ b/test/stdout/0027
@@ -1,4 +1,5 @@
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\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 test\r

 250 OK\r
 550 deny for userx\r
 550-Verification failed for <x@y>\r
 250 OK\r
 550 deny for userx\r
 550-Verification failed for <x@y>\r


@@ -6,11 +7,13 @@
 550 Sender verify failed\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
 550 Sender verify failed\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 test\r

 250 OK\r
 550 deny for userx\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 OK\r
 550 deny for userx\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 test\r

 250 OK\r
 451 Temporary local problem - please try later\r
 451 Temporary local problem - please try later\r
 250 OK\r
 451 Temporary local problem - please try later\r
 451 Temporary local problem - please try later\r


@@ -19,18 +22,21 @@
 451 Temporary local problem - please try later\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
 451 Temporary local problem - please try later\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 test\r

 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
 451 Temporary local problem - please try later\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 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
 451 Temporary local problem - please try later\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 test\r

 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
 451 Temporary local problem - please try later\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 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
 451 Temporary local problem - please try later\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 test\r

 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r

diff --git a/test/stdout/0028 b/test/stdout/0028
index 7b6c71023b188103058fcc72a555657e0cfb5c12..8bbf238649cf0e9d46318e0892c886766020eba7 100644 (file)
--- a/test/stdout/0028
+++ b/test/stdout/0028
@@ -1,4 +1,5 @@
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\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 test\r

 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r

diff --git a/test/stdout/0029 b/test/stdout/0029
index d523784db81fc63223e851595968690cc79b9987..9a0169b3a84f0af1215830c7b1435bc2c89acfc5 100644 (file)
--- a/test/stdout/0029
+++ b/test/stdout/0029
@@ -1,4 +1,5 @@
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\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 test\r

 250 OK\r
 250 Accepted\r
 250 Reset OK\r
 250 OK\r
 250 Accepted\r
 250 Reset OK\r

diff --git a/test/stdout/0030 b/test/stdout/0030
index e5b972dfa37158bba683db052fa8bb70552eb68c..9e8f0c260d0c836e74a435bff18e39db09dd2a28 100644 (file)
--- a/test/stdout/0030
+++ b/test/stdout/0030
@@ -1,4 +1,5 @@
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\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 test\r

 250 OK\r
 550 >>data from accept router<<\r
 550 <<data from redirect router>>\r
 250 OK\r
 550 >>data from accept router<<\r
 550 <<data from redirect router>>\r

diff --git a/test/stdout/0034 b/test/stdout/0034
index db83cd005d5b1ed3837165adde9b4cad5848f97a..950806d8cc1d5b1a12a899ad4e68cc3e7f3f4db2 100644 (file)
--- a/test/stdout/0034
+++ b/test/stdout/0034
@@ -27,6 +27,7 @@
 250 HELP\r
 554 Too many nonmail commands\r
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 250 HELP\r
 554 Too many nonmail commands\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 test\r

 250 Reset OK\r
 250 OK\r
 250 Accepted\r
 250 Reset OK\r
 250 OK\r
 250 Accepted\r

diff --git a/test/stdout/0049 b/test/stdout/0049
index 152cfdb8c72988776e296c0b4b382981c8fc2765..30863f9cb7ab3e96bf04de6a84b7ca22a4e56de4 100644 (file)
--- a/test/stdout/0049
+++ b/test/stdout/0049
@@ -1,10 +1,12 @@
 220 myhost.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 220 myhost.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r

+250 myhost.ex Hello CALLER at test\r

 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
 250 OK id=10HmbB-0005vi-00\r
 221 myhost.ex closing connection\r
 220 myhost.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
 250 OK id=10HmbB-0005vi-00\r
 221 myhost.ex closing connection\r
 220 myhost.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r

+250 myhost.ex Hello CALLER at test\r

 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r

diff --git a/test/stdout/0050 b/test/stdout/0050
index 1fc341806a64fb7d9199b1b57b6989f5dbbb5ba9..dba1bfe7d21a75eebf74978890978971e3353489 100644 (file)
--- a/test/stdout/0050
+++ b/test/stdout/0050
@@ -1,10 +1,12 @@
 220 myhost.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 220 myhost.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r

+250 myhost.ex Hello CALLER at test\r

 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
 250 OK id=10HmbB-0005vi-00\r
 221 myhost.ex closing connection\r
 220 myhost.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
 250 OK id=10HmbB-0005vi-00\r
 221 myhost.ex closing connection\r
 220 myhost.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r

+250 myhost.ex Hello CALLER at test\r

 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r

diff --git a/test/stdout/0056 b/test/stdout/0056
index b9acb02f253dce29a17973eb4c2c80b7ac17aa1e..cc2c780c35a5508ec9fd7264547fa5ca2eee176d 100644 (file)
--- a/test/stdout/0056
+++ b/test/stdout/0056
@@ -4,6 +4,7 @@
 **** This is not for real!
 
 220 myhost.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 **** This is not for real!
 
 220 myhost.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r

+250 myhost.ex Hello test [V4NET.0.0.1]\r

 250 OK\r
 250 Accepted\r
 250 Accepted\r
 250 OK\r
 250 Accepted\r
 250 Accepted\r

diff --git a/test/stdout/0057 b/test/stdout/0057
index cb1e1b4e50a61f244f172b5500d124b8254e847d..472e299ff82d18e9adb0e5103d20092480929d18 100644 (file)
--- a/test/stdout/0057
+++ b/test/stdout/0057
@@ -4,6 +4,7 @@
 **** This is not for real!
 
 220 myhost.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 **** This is not for real!
 
 220 myhost.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r

+250 myhost.ex Hello test [V4NET.0.0.1]\r

 250 OK\r
 250 Accepted\r
 550 relay not permitted\r
 250 OK\r
 250 Accepted\r
 550 relay not permitted\r

diff --git a/test/stdout/0058 b/test/stdout/0058
index 7be895339536034f53a51b78fd247d55d8315d42..13f71dc34c0df3027a94045eb12a9b2c3ccc8df3 100644 (file)
--- a/test/stdout/0058
+++ b/test/stdout/0058
@@ -4,6 +4,7 @@
 **** This is not for real!
 
 220 myhost.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 **** This is not for real!
 
 220 myhost.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r

+250 myhost.ex Hello test [V4NET.0.0.1]\r

 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r

diff --git a/test/stdout/0059 b/test/stdout/0059
index a8ee4d5ef69184868bc7751b36ea5bbfc696752d..c556ae77a18f25b3db138d300893b8bd1bd06501 100644 (file)
--- a/test/stdout/0059
+++ b/test/stdout/0059
@@ -4,6 +4,7 @@
 **** This is not for real!
 
 220 myhost.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 **** This is not for real!
 
 220 myhost.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r

+250 myhost.ex Hello test [V4NET.0.0.1]\r

 250 OK\r
 250 Accepted\r
 550 relay not permitted\r
 250 OK\r
 250 Accepted\r
 550 relay not permitted\r

diff --git a/test/stdout/0060 b/test/stdout/0060
index b240bf8a7e60334bc05f24b8a61d9b88a78402e9..3a98b3a51e99baf08949f6300c42cb849b198230 100644 (file)
--- a/test/stdout/0060
+++ b/test/stdout/0060
@@ -4,6 +4,7 @@
 **** This is not for real!
 
 220 myhost.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 **** This is not for real!
 
 220 myhost.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r

+250 myhost.ex Hello test [V4NET.0.0.1]\r

 250 OK\r
 250 Accepted\r
 250 Accepted\r
 250 OK\r
 250 Accepted\r
 250 Accepted\r


@@ -19,6 +20,7 @@
 **** This is not for real!
 
 220 myhost.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 **** This is not for real!
 
 220 myhost.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r

+250 myhost.ex Hello test [V4NET.0.0.2]\r

 250 OK\r
 250 Accepted\r
 550 relay not permitted\r
 250 OK\r
 250 Accepted\r
 550 relay not permitted\r


@@ -34,6 +36,7 @@
 **** This is not for real!
 
 220 myhost.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 **** This is not for real!
 
 220 myhost.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r

+250 myhost.ex Hello test [V4NET.0.0.5]\r

 250 OK\r
 250 Accepted\r
 250 Accepted\r
 250 OK\r
 250 Accepted\r
 250 Accepted\r


@@ -49,6 +52,7 @@
 **** This is not for real!
 
 220 myhost.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 **** This is not for real!
 
 220 myhost.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r

+250 myhost.ex Hello test [V4NET.0.0.6]\r

 250 OK\r
 250 Accepted\r
 250 Accepted\r
 250 OK\r
 250 Accepted\r
 250 Accepted\r


@@ -64,6 +68,7 @@
 **** This is not for real!
 
 220 myhost.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 **** This is not for real!
 
 220 myhost.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r

+250 myhost.ex Hello test [V4NET.255.0.1]\r

 250 OK\r
 250 Accepted\r
 550 relay not permitted\r
 250 OK\r
 250 Accepted\r
 550 relay not permitted\r


@@ -79,6 +84,7 @@
 **** This is not for real!
 
 220 myhost.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 **** This is not for real!
 
 220 myhost.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r

+250 myhost.ex Hello test [V4NET.255.0.2]\r

 250 OK\r
 250 Accepted\r
 550 relay not permitted\r
 250 OK\r
 250 Accepted\r
 550 relay not permitted\r


@@ -94,6 +100,7 @@
 **** This is not for real!
 
 220 myhost.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 **** This is not for real!
 
 220 myhost.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r

+250 myhost.ex Hello test [V4NET.255.0.3]\r

 250 OK\r
 250 Accepted\r
 550 relay not permitted\r
 250 OK\r
 250 Accepted\r
 550 relay not permitted\r


@@ -109,6 +116,7 @@
 **** This is not for real!
 
 220 myhost.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 **** This is not for real!
 
 220 myhost.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r

+250 myhost.ex Hello test [V4NET.255.0.4]\r

 250 OK\r
 250 Accepted\r
 550 relay not permitted\r
 250 OK\r
 250 Accepted\r
 550 relay not permitted\r

diff --git a/test/stdout/0061 b/test/stdout/0061
index 4ea10b08f9bdcdab542d714016bf0b034d3651e5..22bda1326f85787b25b72987aaa21f158f855c62 100644 (file)
--- a/test/stdout/0061
+++ b/test/stdout/0061
@@ -4,6 +4,7 @@
 **** This is not for real!
 
 220 ten-1.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 **** This is not for real!
 
 220 ten-1.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r

+250 ten-1.test.ex Hello test [V4NET.0.0.1]\r

 250 OK\r
 250 Accepted\r
 250 Accepted\r
 250 OK\r
 250 Accepted\r
 250 Accepted\r


@@ -19,6 +20,7 @@
 **** This is not for real!
 
 220 ten-1.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 **** This is not for real!
 
 220 ten-1.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r

+250 ten-1.test.ex Hello test [V4NET.0.0.2]\r

 250 OK\r
 250 Accepted\r
 550 relay not permitted\r
 250 OK\r
 250 Accepted\r
 550 relay not permitted\r

diff --git a/test/stdout/0062 b/test/stdout/0062
index 0a709b747fe6dedaa9aff95fd9596ef8002b7668..69ffa5d02e4a95cd82e1b5ca40534f86936284e8 100644 (file)
--- a/test/stdout/0062
+++ b/test/stdout/0062
@@ -4,6 +4,7 @@
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r

+250 myhost.test.ex Hello test [V4NET.0.0.1]\r

 250 OK\r
 250 Accepted\r
 550 relay not permitted\r
 250 OK\r
 250 Accepted\r
 550 relay not permitted\r


@@ -19,6 +20,7 @@
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r

+250 myhost.test.ex Hello test [V4NET.0.0.2]\r

 250 OK\r
 250 Accepted\r
 250 Accepted\r
 250 OK\r
 250 Accepted\r
 250 Accepted\r


@@ -34,6 +36,7 @@
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r

+250 myhost.test.ex Hello test [V4NET.0.0.3]\r

 250 OK\r
 250 Accepted\r
 250 Accepted\r
 250 OK\r
 250 Accepted\r
 250 Accepted\r

diff --git a/test/stdout/0063 b/test/stdout/0063
index f9a486d52f408835a32620994d854667f2077103..06e75e01c546218d27c31f60f3bc8e30214be04d 100644 (file)
--- a/test/stdout/0063
+++ b/test/stdout/0063
@@ -4,6 +4,7 @@
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r

+250 myhost.test.ex Hello test [V4NET.0.0.1]\r

 250 OK\r
 250 Accepted\r
 550 relay not permitted\r
 250 OK\r
 250 Accepted\r
 550 relay not permitted\r


@@ -19,6 +20,7 @@
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r

+250 myhost.test.ex Hello test [V4NET.0.0.2]\r

 250 OK\r
 250 Accepted\r
 250 Accepted\r
 250 OK\r
 250 Accepted\r
 250 Accepted\r

diff --git a/test/stdout/0064 b/test/stdout/0064
index f9a486d52f408835a32620994d854667f2077103..06e75e01c546218d27c31f60f3bc8e30214be04d 100644 (file)
--- a/test/stdout/0064
+++ b/test/stdout/0064
@@ -4,6 +4,7 @@
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r

+250 myhost.test.ex Hello test [V4NET.0.0.1]\r

 250 OK\r
 250 Accepted\r
 550 relay not permitted\r
 250 OK\r
 250 Accepted\r
 550 relay not permitted\r


@@ -19,6 +20,7 @@
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r

+250 myhost.test.ex Hello test [V4NET.0.0.2]\r

 250 OK\r
 250 Accepted\r
 250 Accepted\r
 250 OK\r
 250 Accepted\r
 250 Accepted\r

diff --git a/test/stdout/0065 b/test/stdout/0065
index 10b3f28b0ed7e1a45051a0e80874357eed5c7216..c3cec016fe2f3969ecdd5ad6bd9fc89864ec2107 100644 (file)
--- a/test/stdout/0065
+++ b/test/stdout/0065
@@ -4,6 +4,7 @@
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r

+250 myhost.test.ex Hello test [1.2.3.4]\r

 250 OK\r
 250 Accepted\r
 250 Accepted\r
 250 OK\r
 250 Accepted\r
 250 Accepted\r


@@ -19,6 +20,7 @@
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r

+250 myhost.test.ex Hello test [1.2.3.5]\r

 250 OK\r
 250 Accepted\r
 550 relay not permitted\r
 250 OK\r
 250 Accepted\r
 550 relay not permitted\r


@@ -34,6 +36,7 @@
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r

+250 myhost.test.ex Hello test [1.2.4.5]\r

 250 OK\r
 250 Accepted\r
 250 Accepted\r
 250 OK\r
 250 Accepted\r
 250 Accepted\r


@@ -49,6 +52,7 @@
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r

+250 myhost.test.ex Hello test [1.3.2.4]\r

 250 OK\r
 250 Accepted\r
 550 relay not permitted\r
 250 OK\r
 250 Accepted\r
 550 relay not permitted\r


@@ -64,6 +68,7 @@
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r

+250 myhost.test.ex Hello test [131.111.8.2]\r

 250 OK\r
 250 Accepted\r
 250 Accepted\r
 250 OK\r
 250 Accepted\r
 250 Accepted\r


@@ -79,6 +84,7 @@
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r

+250 myhost.test.ex Hello test [192.152.98.3]\r

 250 OK\r
 250 Accepted\r
 250 Accepted\r
 250 OK\r
 250 Accepted\r
 250 Accepted\r


@@ -94,6 +100,7 @@
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r

+250 myhost.test.ex Hello test [192.153.98.4]\r

 250 OK\r
 250 Accepted\r
 250 Accepted\r
 250 OK\r
 250 Accepted\r
 250 Accepted\r

diff --git a/test/stdout/0066 b/test/stdout/0066
index 2553bbf4c0c9eb3f8c5aa11b83ef619b860fc515..527308ee906e7a67986121d2c8f8aa4c3eec3af8 100644 (file)
--- a/test/stdout/0066
+++ b/test/stdout/0066
@@ -4,6 +4,7 @@
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r

+250 myhost.test.ex Hello test [1.2.3.4]\r

 250 OK\r
 250 Accepted\r
 250 Accepted\r
 250 OK\r
 250 Accepted\r
 250 Accepted\r


@@ -19,6 +20,7 @@
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r

+250 myhost.test.ex Hello test [1.2.3.5]\r

 250 OK\r
 250 Accepted\r
 550 relay not permitted\r
 250 OK\r
 250 Accepted\r
 550 relay not permitted\r


@@ -34,6 +36,7 @@
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r

+250 myhost.test.ex Hello test [1.2.4.5]\r

 250 OK\r
 250 Accepted\r
 250 Accepted\r
 250 OK\r
 250 Accepted\r
 250 Accepted\r


@@ -49,6 +52,7 @@
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r

+250 myhost.test.ex Hello test [1.3.2.4]\r

 250 OK\r
 250 Accepted\r
 550 relay not permitted\r
 250 OK\r
 250 Accepted\r
 550 relay not permitted\r


@@ -64,6 +68,7 @@
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r

+250 myhost.test.ex Hello test [131.111.8.2]\r

 250 OK\r
 250 Accepted\r
 250 Accepted\r
 250 OK\r
 250 Accepted\r
 250 Accepted\r


@@ -79,6 +84,7 @@
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r

+250 myhost.test.ex Hello test [192.152.98.3]\r

 250 OK\r
 250 Accepted\r
 250 Accepted\r
 250 OK\r
 250 Accepted\r
 250 Accepted\r


@@ -94,6 +100,7 @@
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r

+250 myhost.test.ex Hello test [V4NET.0.0.1]\r

 250 OK\r
 250 Accepted\r
 250 Accepted\r
 250 OK\r
 250 Accepted\r
 250 Accepted\r


@@ -109,6 +116,7 @@
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r

+250 myhost.test.ex Hello test [V4NET.11.12.13]\r

 250 OK\r
 250 Accepted\r
 550 relay not permitted\r
 250 OK\r
 250 Accepted\r
 550 relay not permitted\r


@@ -124,6 +132,7 @@
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r

+250 myhost.test.ex Hello test [V4NET.0.0.3]\r

 250 OK\r
 250 Accepted\r
 250 Accepted\r
 250 OK\r
 250 Accepted\r
 250 Accepted\r

diff --git a/test/stdout/0067 b/test/stdout/0067
index 78ae9110e8ce9d4e3299216a65af631c5796b250..49f661e0295813428ab5433950c6c1271f46ff76 100644 (file)
--- a/test/stdout/0067
+++ b/test/stdout/0067
@@ -4,6 +4,7 @@
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r

+250 myhost.test.ex Hello test [1.2.3.4]\r

 250 OK\r
 250 Accepted\r
 250 Reset OK\r
 250 OK\r
 250 Accepted\r
 250 Reset OK\r

diff --git a/test/stdout/0068 b/test/stdout/0068
index f974140d6b2133891853db150d81b605153c728d..6f46234ca0608e5aeae5bf7e795a8eae956476e4 100644 (file)
--- a/test/stdout/0068
+++ b/test/stdout/0068
@@ -4,6 +4,7 @@
 **** This is not for real!
 
 220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 **** This is not for real!
 
 220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r

+250 the.local.host.name Hello test [V4NET.10.10.10]\r

 250 OK\r
 250 Accepted\r
 250 Accepted\r
 250 OK\r
 250 Accepted\r
 250 Accepted\r

diff --git a/test/stdout/0069 b/test/stdout/0069
index 6a55298b96ee149b8a39a2e143677f1d48ae5456..7c59218b206cb0dc8dcd5974bdef50bd70ee7109 100644 (file)
--- a/test/stdout/0069
+++ b/test/stdout/0069
@@ -4,6 +4,7 @@
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r

+250 myhost.test.ex Hello ten-1.test.ex [V4NET.0.0.1]\r

 250 OK\r
 550 Administrative prohibition\r
 221 myhost.test.ex closing connection\r
 250 OK\r
 550 Administrative prohibition\r
 221 myhost.test.ex closing connection\r


@@ -13,6 +14,7 @@
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r

+250 myhost.test.ex Hello test [V4NET.0.0.13]\r

 250 OK\r
 550 Administrative prohibition\r
 221 myhost.test.ex closing connection\r
 250 OK\r
 550 Administrative prohibition\r
 221 myhost.test.ex closing connection\r


@@ -22,6 +24,7 @@
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r

+250 myhost.test.ex Hello test [V4NET.0.0.13]\r

 250 OK\r
 550 "Denied"\r
 221 myhost.test.ex closing connection\r
 250 OK\r
 550 "Denied"\r
 221 myhost.test.ex closing connection\r


@@ -31,6 +34,7 @@
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r

+250 myhost.test.ex Hello test [V4NET.0.0.13]\r

 250 OK\r
 250 Accepted\r
 221 myhost.test.ex closing connection\r
 250 OK\r
 250 Accepted\r
 221 myhost.test.ex closing connection\r


@@ -40,6 +44,7 @@
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r

+250 myhost.test.ex Hello test [V4NET.0.0.13]\r

 250 OK\r
 550 "Denied"\r
 221 myhost.test.ex closing connection\r
 250 OK\r
 550 "Denied"\r
 221 myhost.test.ex closing connection\r


@@ -49,6 +54,7 @@
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r

+250 myhost.test.ex Hello test [V4NET.0.0.13]\r

 250 OK\r
 550 Administrative prohibition\r
 221 myhost.test.ex closing connection\r
 250 OK\r
 550 Administrative prohibition\r
 221 myhost.test.ex closing connection\r


@@ -58,6 +64,7 @@
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r

+250 myhost.test.ex Hello test [V4NET.0.0.13]\r

 250 OK\r
 451 Temporary local problem - please try later\r
 221 myhost.test.ex closing connection\r
 250 OK\r
 451 Temporary local problem - please try later\r
 221 myhost.test.ex closing connection\r


@@ -67,6 +74,7 @@
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r

+250 myhost.test.ex Hello test [V4NET.0.0.13]\r

 250 OK\r
 250 Accepted\r
 221 myhost.test.ex closing connection\r
 250 OK\r
 250 Accepted\r
 221 myhost.test.ex closing connection\r

diff --git a/test/stdout/0077 b/test/stdout/0077
index 83096cb89277b41e1bb26c81fb39a88ea87867f5..eeb20bd2c216a85b293899f53e4daa6912a216a7 100644 (file)
--- a/test/stdout/0077
+++ b/test/stdout/0077
@@ -4,6 +4,7 @@
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r

+250 myhost.test.ex Hello test [127.0.0.1]\r

 250 OK\r
 250 Accepted\r
 221 myhost.test.ex closing connection\r
 250 OK\r
 250 Accepted\r
 221 myhost.test.ex closing connection\r


@@ -13,6 +14,7 @@
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r

+250 myhost.test.ex Hello test [V4NET.10.10.10]\r

 250 OK\r
 250 Accepted\r
 221 myhost.test.ex closing connection\r
 250 OK\r
 250 Accepted\r
 221 myhost.test.ex closing connection\r


@@ -22,6 +24,7 @@
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r

+250 myhost.test.ex Hello test [V4NET.0.0.1]\r

 250 OK\r
 550 Administrative prohibition\r
 221 myhost.test.ex closing connection\r
 250 OK\r
 550 Administrative prohibition\r
 221 myhost.test.ex closing connection\r

diff --git a/test/stdout/0079 b/test/stdout/0079
index 43135761246b6389d7930f7ee16221a67dca7915..5d0ea1853ce32930bdd903d3e2c067446949e500 100644 (file)
--- a/test/stdout/0079
+++ b/test/stdout/0079
@@ -42,6 +42,7 @@
 250 OK id=10HmaY-0005vi-00\r
 221 the.local.host.name closing connection\r
 220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 250 OK id=10HmaY-0005vi-00\r
 221 the.local.host.name closing connection\r
 220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r

+250 the.local.host.name Hello CALLER at test\r

 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r

diff --git a/test/stdout/0086 b/test/stdout/0086
index b3291834919c08c8960ffc118138892f0dac5d06..ac05e2ad07141e80de161e6b84a7dd879815f11f 100644 (file)
--- a/test/stdout/0086
+++ b/test/stdout/0086
@@ -4,6 +4,7 @@
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r

+250 myhost.test.ex Hello test [V4NET.10.10.10]\r

 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r


@@ -15,6 +16,7 @@
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r

+250 myhost.test.ex Hello test [V4NET.10.10.10]\r

 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r


@@ -26,6 +28,7 @@
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r

+250 myhost.test.ex Hello test [V4NET.10.10.10]\r

 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r


@@ -37,6 +40,7 @@
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r

+250 myhost.test.ex Hello test [V4NET.10.10.10]\r

 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r


@@ -48,6 +52,7 @@
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r

+250 myhost.test.ex Hello test [V4NET.10.10.10]\r

 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r


@@ -59,6 +64,7 @@
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r

+250 myhost.test.ex Hello test [V4NET.10.10.9]\r

 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r

diff --git a/test/stdout/0087 b/test/stdout/0087
index f9dd367472257cbb5ac070a8ecba9832619d5913..4893f48c24fb1f94627a06a2ef6ed52aa3ae5c83 100644 (file)
--- a/test/stdout/0087
+++ b/test/stdout/0087
@@ -4,6 +4,7 @@
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r

+250 myhost.test.ex Hello test [V4NET.10.10.10]\r

 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r


@@ -18,6 +19,7 @@
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r

+250 myhost.test.ex Hello test [V4NET.10.10.10]\r

 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r


@@ -32,6 +34,7 @@
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r

+250 myhost.test.ex Hello test [V4NET.10.10.10]\r

 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r


@@ -43,6 +46,7 @@
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r

+250 myhost.test.ex Hello test [V4NET.10.10.10]\r

 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r


@@ -57,6 +61,7 @@
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r

+250 myhost.test.ex Hello test [V4NET.10.10.10]\r

 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r

diff --git a/test/stdout/0091 b/test/stdout/0091
index 809bad0679cc13a15513082a1836bdc1e9e3eec3..27abdbb8cf65cdb8547fbdd10ece05984cc18b24 100644 (file)
--- a/test/stdout/0091
+++ b/test/stdout/0091
@@ -4,6 +4,7 @@
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r

+250 myhost.test.ex Hello test [V4NET.0.0.1]\r

 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r


@@ -15,6 +16,7 @@
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r

+250 myhost.test.ex Hello test [V4NET.0.0.2]\r

 250 OK\r
 550-Verification failed for <junk@jink.jonk.test.ex>\r
 550-Unrouteable address\r
 250 OK\r
 550-Verification failed for <junk@jink.jonk.test.ex>\r
 550-Unrouteable address\r


@@ -30,6 +32,7 @@
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r

+250 myhost.test.ex Hello test [V4NET.0.0.2]\r

 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r


@@ -41,6 +44,7 @@
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r

+250 myhost.test.ex Hello test [V4NET.0.0.2]\r

 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r

diff --git a/test/stdout/0092 b/test/stdout/0092
index a4df25c4d92ce4f725c42348ddb3a70dd708884f..ab30b24ffda7f750057fe8557a3d7f43326c202a 100644 (file)
--- a/test/stdout/0092
+++ b/test/stdout/0092
@@ -1,6 +1,7 @@
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 421 myhost.test.ex: SMTP command timeout - closing connection\r
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 421 myhost.test.ex: SMTP command timeout - 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 test\r

 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r


@@ -18,6 +19,7 @@
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r

+250 myhost.test.ex Hello test [V4NET.0.0.1]\r

 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r


@@ -28,6 +30,7 @@
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r

+250 myhost.test.ex Hello test [V4NET.0.0.1]\r

 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r


@@ -38,6 +41,7 @@
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r

+250 myhost.test.ex Hello test [V4NET.0.0.1]\r

 250 OK\r
 550 unrouteable address\r
 421 myhost.test.ex: SMTP command timeout - closing connection\r
 250 OK\r
 550 unrouteable address\r
 421 myhost.test.ex: SMTP command timeout - closing connection\r

diff --git a/test/stdout/0094 b/test/stdout/0094
index 475cfa047abe08f0673caf18922c28ef15b83d98..0fc00a7552268f12066b3fe23508b4c4cf3f643d 100644 (file)
--- a/test/stdout/0094
+++ b/test/stdout/0094
@@ -4,6 +4,7 @@
 **** This is not for real!
 
 220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 **** This is not for real!
 
 220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r

+250 the.local.host.name Hello test [V4NET.11.12.13]\r

 250 OK\r
 550 relay not permitted\r
 221 the.local.host.name closing connection\r
 250 OK\r
 550 relay not permitted\r
 221 the.local.host.name closing connection\r


@@ -13,10 +14,12 @@
 **** This is not for real!
 
 220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 **** This is not for real!
 
 220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r

+250 the.local.host.name Hello ten-1.test.ex [V4NET.0.0.1]\r

 250 OK\r
 550 relay not permitted\r
 221 the.local.host.name closing connection\r
 220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 250 OK\r
 550 relay not permitted\r
 221 the.local.host.name closing connection\r
 220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r

+250 the.local.host.name Hello root at test [V4NET.11.12.13]\r

 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r


@@ -28,17 +31,20 @@
 **** This is not for real!
 
 220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 **** This is not for real!
 
 220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r

+250 the.local.host.name Hello oneback.test.ex [V4NET.99.99.90]\r

 250 OK\r
 250 Accepted\r
 550 relay not permitted\r
 221 the.local.host.name closing connection\r
 220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 250 OK\r
 250 Accepted\r
 550 relay not permitted\r
 221 the.local.host.name closing connection\r
 220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r

+250 the.local.host.name Hello root at test [99.99.99.99]\r

 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
 250 OK id=10HmaY-0005vi-00\r
 221 the.local.host.name closing connection\r
 220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
 250 OK id=10HmaY-0005vi-00\r
 221 the.local.host.name closing connection\r
 220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r

+250 the.local.host.name Hello root at test [V4NET.99.99.96]\r

 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r

diff --git a/test/stdout/0121 b/test/stdout/0121
index d52013bcd483e0e3796ba4962d55b61a3d973938..f3fda94fb50265983a0210997821bd742f489df5 100644 (file)
--- a/test/stdout/0121
+++ b/test/stdout/0121
@@ -4,6 +4,7 @@
 **** This is not for real!
 
 220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 **** This is not for real!
 
 220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r

+250 the.local.host.name Hello test [127.0.0.1]\r

 250 OK\r
 550-Verification failed for <unknown@test.ex>\r
 550-Unrouteable address\r
 250 OK\r
 550-Verification failed for <unknown@test.ex>\r
 550-Unrouteable address\r

diff --git a/test/stdout/0124 b/test/stdout/0124
index f04d7043952459e21ffabfdf88e0e97d96d2d461..cbf9be049a869177d8c26a0194e7b1e1c4d8d8ef 100644 (file)
--- a/test/stdout/0124
+++ b/test/stdout/0124
@@ -4,6 +4,7 @@
 **** This is not for real!
 
 220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 **** This is not for real!
 
 220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r

+250 the.local.host.name Hello test [V4NET.0.0.97]\r

 250 OK\r
 550 relay not permitted\r
 250 Reset OK\r
 250 OK\r
 550 relay not permitted\r
 250 Reset OK\r

diff --git a/test/stdout/0127 b/test/stdout/0127
index 152cfdb8c72988776e296c0b4b382981c8fc2765..30863f9cb7ab3e96bf04de6a84b7ca22a4e56de4 100644 (file)
--- a/test/stdout/0127
+++ b/test/stdout/0127
@@ -1,10 +1,12 @@
 220 myhost.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 220 myhost.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r

+250 myhost.ex Hello CALLER at test\r

 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
 250 OK id=10HmbB-0005vi-00\r
 221 myhost.ex closing connection\r
 220 myhost.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
 250 OK id=10HmbB-0005vi-00\r
 221 myhost.ex closing connection\r
 220 myhost.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r

+250 myhost.ex Hello CALLER at test\r

 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r

diff --git a/test/stdout/0130 b/test/stdout/0130
index de1944523ea33ebb5f4249b13b3ca07c5ed16d3e..31b8640fed601fa904dc5d7f313e42671f31cb9b 100644 (file)
--- a/test/stdout/0130
+++ b/test/stdout/0130
@@ -4,6 +4,7 @@
 **** This is not for real!
 
 220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 **** This is not for real!
 
 220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r

+250 the.local.host.name Hello test [V4NET.0.0.0]\r

 250 OK\r
 451 Temporary local problem - please try later\r
 221 the.local.host.name closing connection\r
 250 OK\r
 451 Temporary local problem - please try later\r
 221 the.local.host.name closing connection\r

diff --git a/test/stdout/0136 b/test/stdout/0136
index 80398903a3f0b0d57982e69e3e335d2c602bad13..3e4577eeb1da2dcfc5dd679caf3f15cbb27750d1 100644 (file)
--- a/test/stdout/0136
+++ b/test/stdout/0136
@@ -1,4 +1,5 @@
 220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r

+250 the.local.host.name Hello CALLER at test\r

 250 OK\r
 250 Accepted\r
 250 Accepted\r
 250 OK\r
 250 Accepted\r
 250 Accepted\r


@@ -6,6 +7,7 @@
 250 OK id=10HmaX-0005vi-00\r
 221 the.local.host.name closing connection\r
 220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 250 OK id=10HmaX-0005vi-00\r
 221 the.local.host.name closing connection\r
 220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r

+250 the.local.host.name Hello CALLER at test\r

 250 OK\r
 250 Accepted\r
 250 Accepted\r
 250 OK\r
 250 Accepted\r
 250 Accepted\r

diff --git a/test/stdout/0145 b/test/stdout/0145
index 85f095c8473b0e48f4700ee0b0392c3002dfe2b6..cdbed500640a0caa89d2c9ea5ba8f23067e5cac8 100644 (file)
--- a/test/stdout/0145
+++ b/test/stdout/0145
@@ -5,6 +5,7 @@ x@mxt10.test.ex is undeliverable: all relevant MX records point to non-existent
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r

+250 myhost.test.ex Hello test [V4NET.9.8.7]\r

 250 OK\r
 550-Verification failed for <x@mxt10.test.ex>\r
 550-It appears that the DNS operator for mxt10.test.ex\r
 250 OK\r
 550-Verification failed for <x@mxt10.test.ex>\r
 550-It appears that the DNS operator for mxt10.test.ex\r


@@ -18,6 +19,7 @@ x@mxt10.test.ex is undeliverable: all relevant MX records point to non-existent
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r

+250 myhost.test.ex Hello test [V4NET.9.8.7]\r

 250 OK\r
 550-It appears that the DNS operator for mxt10.test.ex\r
 550-has installed an invalid MX record with an IP address\r
 250 OK\r
 550-It appears that the DNS operator for mxt10.test.ex\r
 550-has installed an invalid MX record with an IP address\r

diff --git a/test/stdout/0157 b/test/stdout/0157
index 30530c15a28259ec9d08e37bf057429d7113799c..3205e216141ee82b83082f1340ee91ac0c83bef2 100644 (file)
--- a/test/stdout/0157
+++ b/test/stdout/0157
@@ -4,6 +4,7 @@
 **** This is not for real!
 
 220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 **** This is not for real!
 
 220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r

+250 the.local.host.name Hello test [V4NET.0.0.1]\r

 250 OK\r
 550 invalid sender\r
 250 Reset OK\r
 250 OK\r
 550 invalid sender\r
 250 Reset OK\r


@@ -16,6 +17,7 @@
 **** This is not for real!
 
 220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 **** This is not for real!
 
 220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r

+250 the.local.host.name Hello test [V4NET.0.0.2]\r

 250 OK\r
 250 Accepted\r
 250 Reset OK\r
 250 OK\r
 250 Accepted\r
 250 Reset OK\r


@@ -28,6 +30,7 @@
 **** This is not for real!
 
 220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 **** This is not for real!
 
 220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r

+250 the.local.host.name Hello test [V4NET.0.0.3]\r

 250 OK\r
 550 relay not permitted\r
 250 Reset OK\r
 250 OK\r
 550 relay not permitted\r
 250 Reset OK\r

diff --git a/test/stdout/0162 b/test/stdout/0162
index 985c5a31cfbbecdd743d2f5a20d2e6be070be8ab..85ea504ac5a879a2410a8f470cc28dac443a4018 100644 (file)
--- a/test/stdout/0162
+++ b/test/stdout/0162
@@ -1,4 +1,5 @@
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\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 test\r

 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r

diff --git a/test/stdout/0175 b/test/stdout/0175
index 10cb2c731e37945fc7d18622eddc412a65bd0309..1291e5d10350aa408abd741f484ff7ab60f5653a 100644 (file)
--- a/test/stdout/0175
+++ b/test/stdout/0175
@@ -4,6 +4,7 @@
 **** This is not for real!
 
 220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 **** This is not for real!
 
 220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r

+250 the.local.host.name Hello test [V4NET.0.0.0]\r

 250 OK\r
 550 Sender verify failed\r
 503-All RCPT commands were rejected with this error:\r
 250 OK\r
 550 Sender verify failed\r
 503-All RCPT commands were rejected with this error:\r


@@ -17,6 +18,7 @@
 **** This is not for real!
 
 220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 **** This is not for real!
 
 220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r

+250 the.local.host.name Hello test [V4NET.0.0.0]\r

 250 OK\r
 550 Sender verify failed\r
 503-All RCPT commands were rejected with this error:\r
 250 OK\r
 550 Sender verify failed\r
 503-All RCPT commands were rejected with this error:\r


@@ -30,6 +32,7 @@
 **** This is not for real!
 
 220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 **** This is not for real!
 
 220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r

+250 the.local.host.name Hello test [V4NET.0.0.0]\r

 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r

diff --git a/test/stdout/0197 b/test/stdout/0197
index 72f08851ebf0f489a1b1a6ebcb292d126e13e5aa..1ebd902a3ac59bb1241d508f56dd3ea070303696 100644 (file)
--- a/test/stdout/0197
+++ b/test/stdout/0197
@@ -1,4 +1,5 @@
 220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r

+250 the.local.host.name Hello CALLER at test\r

 250 OK\r
 250 Accepted\r
 250 Accepted\r
 250 OK\r
 250 Accepted\r
 250 Accepted\r

diff --git a/test/stdout/0202 b/test/stdout/0202
index 2b1941f588598f1cdeb0ebf39d85a2c185ef6740..cb29f0f7c23f0298647d2465388b3de4e85c883f 100644 (file)
--- a/test/stdout/0202
+++ b/test/stdout/0202
@@ -1,10 +1,12 @@
 220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r

+250 the.local.host.name Hello CALLER at test\r

 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
 250 OK id=10HmaX-0005vi-00\r
 221 the.local.host.name closing connection\r
 220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
 250 OK id=10HmaX-0005vi-00\r
 221 the.local.host.name closing connection\r
 220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r

+250 the.local.host.name Hello CALLER at test\r

 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r

diff --git a/test/stdout/0212 b/test/stdout/0212
index 9f1626ae43c82b07b2722c926adcad5642e7a51b..eaf838062b9181264f6c8be0ae3f3307f6291f95 100644 (file)
--- a/test/stdout/0212
+++ b/test/stdout/0212
@@ -11,6 +11,7 @@
 > "smartuser.b@test.ex,a@test.ex"@test.ex verified
 > 
 220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 > "smartuser.b@test.ex,a@test.ex"@test.ex verified
 > 
 220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r

+250 the.local.host.name Hello CALLER at test [V4NET.0.0.0]\r

 250 OK\r
 250 Accepted\r
 550 unrouteable address\r
 250 OK\r
 250 Accepted\r
 550 unrouteable address\r

diff --git a/test/stdout/0214 b/test/stdout/0214
index 078e7a43d36e5271cd64fd1a32ea90e86a31e151..6e93eaa89800664231759b53499a24b373de906d 100644 (file)
--- a/test/stdout/0214
+++ b/test/stdout/0214
@@ -1,6 +1,9 @@
 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
 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

+>>> helo test
+??? 250
+<<< 250 myhost.test.ex Hello test [127.0.0.1]

 >>> mail from:<x@y.x>
 ??? 250
 <<< 250 OK
 >>> mail from:<x@y.x>
 ??? 250
 <<< 250 OK

diff --git a/test/stdout/0220 b/test/stdout/0220
index e437f3ed71dea60ab2b21b0d8dc89ebe8b800eff..943864680ebc1e5f8d1238be82fec5b8d30f3654 100644 (file)
--- a/test/stdout/0220
+++ b/test/stdout/0220
@@ -1,4 +1,5 @@
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\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 test\r

 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r

diff --git a/test/stdout/0221 b/test/stdout/0221
index 4f5339bb931404d4e65e0d805e05764794f5ac8b..26659dc89d10bd1ff7304440e6c32cd61c789548 100644 (file)
--- a/test/stdout/0221
+++ b/test/stdout/0221
@@ -1,4 +1,5 @@
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\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 test\r

 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r

diff --git a/test/stdout/0227 b/test/stdout/0227
index ff5f1359b9c96085e82ad60c3731405b880cef71..5c9ed50e7105d3f0a0f3fd0d8fdf4640c09a2b1b 100644 (file)
--- a/test/stdout/0227
+++ b/test/stdout/0227
@@ -1,12 +1,15 @@
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r

+250 myhost.test.ex Hello root at test [V4NET.0.0.1]\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 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 root at test [V4NET.0.0.2]\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 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 root at test [V4NET.0.0.1]\r

 250 OK\r
 550-Verification failed for <bad@localhost>\r
 550-Called:   127.0.0.1\r
 250 OK\r
 550-Verification failed for <bad@localhost>\r
 550-Called:   127.0.0.1\r


@@ -15,14 +18,17 @@
 550 Sender verify failed\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
 550 Sender verify failed\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 root at test [V4NET.0.0.1]\r

 250 OK\r
 451 Could not complete sender verify callout\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 OK\r
 451 Could not complete sender verify callout\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 root at test [V4NET.0.0.1]\r

 250 OK\r
 550 Sender verify failed\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 OK\r
 550 Sender verify failed\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 root at test [V4NET.0.0.1]\r

 250 OK\r
 550-Callback setup failed while verifying <uncheckable@localhost1>\r
 550-Called:   127.0.0.1\r
 250 OK\r
 550-Callback setup failed while verifying <uncheckable@localhost1>\r
 550-Called:   127.0.0.1\r


@@ -37,46 +43,55 @@
 550 Sender verify failed\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
 550 Sender verify failed\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 root at test [V4NET.0.0.1]\r

 250 OK\r
 550 Sender verify failed\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 OK\r
 550 Sender verify failed\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 root at test [V4NET.0.0.3]\r

 250 OK\r
 550-Callout verification failed:\r
 550 550 Recipient not liked\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 OK\r
 550-Callout verification failed:\r
 550 550 Recipient not liked\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 root at test [V4NET.0.0.3]\r

 250 OK\r
 550-Callout verification failed:\r
 550-550-Recipient not liked on two lines\r
 550 550 Here's the second\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 OK\r
 550-Callout verification failed:\r
 550-550-Recipient not liked on two lines\r
 550 550 Here's the second\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 root at test [V4NET.0.0.3]\r

 250 OK\r
 550-Callout verification failed:\r
 550 550 Recipient not liked, with bad char:(truncated)\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 OK\r
 550-Callout verification failed:\r
 550 550 Recipient not liked, with bad char:(truncated)\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 root at test [V4NET.0.0.3]\r

 250 OK\r
 451 Could not complete recipient verify callout\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 OK\r
 451 Could not complete recipient verify callout\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 root at test [V4NET.0.0.4]\r

 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
 550 Administrative prohibition\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 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
 550 Administrative prohibition\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 root at test [V4NET.0.0.4]\r

 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
 550 Administrative prohibition\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 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
 550 Administrative prohibition\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 root at test [V4NET.0.0.5]\r

 250 OK\r
 550 relay not permitted\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 OK\r
 550 relay not permitted\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 root at test [V4NET.0.0.5]\r

 250 OK\r
 550-Postmaster verification failed while checking <ok@localhost1>\r
 550-Called:   127.0.0.1\r
 250 OK\r
 550-Postmaster verification failed while checking <ok@localhost1>\r
 550-Called:   127.0.0.1\r


@@ -124,15 +139,18 @@
 550 relay not permitted\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
 550 relay not permitted\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 root at test [V4NET.0.0.3]\r

 250 OK\r
 550-Callout verification failed:\r
 550 550 Recipient not liked\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 OK\r
 550-Callout verification failed:\r
 550 550 Recipient not liked\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 root at test [V4NET.0.0.1]\r

 250 OK\r
 451 Could not complete sender verify callout\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 OK\r
 451 Could not complete sender verify callout\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 root at test [V4NET.0.0.1]\r

 250 OK\r
 451 Could not complete sender verify callout\r
 221 myhost.test.ex closing connection\r
 250 OK\r
 451 Could not complete sender verify callout\r
 221 myhost.test.ex closing connection\r

diff --git a/test/stdout/0230 b/test/stdout/0230
index 67e1ffec0e3325e87214f43ab51c766c250c734e..839ef8ee855d18549eab0a0041a627e5d323aef2 100644 (file)
--- a/test/stdout/0230
+++ b/test/stdout/0230
@@ -1,6 +1,9 @@
 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
 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

+>>> helo test
+??? 250
+<<< 250 myhost.test.ex Hello test [ip4.ip4.ip4.ip4]

 >>> mail from:<x@y.x>
 ??? 250
 <<< 250 OK
 >>> mail from:<x@y.x>
 ??? 250
 <<< 250 OK


@@ -21,6 +24,9 @@ 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
 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

+>>> helo test
+??? 250
+<<< 250 myhost.test.ex Hello test [127.0.0.1]

 >>> mail from:<x@y.x>
 ??? 250
 <<< 250 OK
 >>> mail from:<x@y.x>
 ??? 250
 <<< 250 OK


@@ -61,6 +67,7 @@ Connecting to ip4.ip4.ip4.ip4 port 1225 ... connected
 <<< 221 myhost.test.ex closing connection
 End of script
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 <<< 221 myhost.test.ex closing connection
 End of script
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r

+250 myhost.test.ex Hello root at test [V4NET.9.8.7]\r

 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r


@@ -74,6 +81,7 @@ End of script
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\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
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\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 root at test [V4NET.9.8.7]\r

 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r

diff --git a/test/stdout/0233 b/test/stdout/0233
index 0644977a24b4e6da615b09e360267b55ed9d0d50..3f3bc4f8d1d4cd9d1de8d7d3f0bd3eaea44f9c88 100644 (file)
--- a/test/stdout/0233
+++ b/test/stdout/0233
@@ -1,4 +1,5 @@
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\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 test\r

 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r

diff --git a/test/stdout/0234 b/test/stdout/0234
index 5609d5daff0440868d2b82d843d17283d45b00e5..57a423dc20eacfd4fd9c5a51933394b643c729d6 100644 (file)
--- a/test/stdout/0234
+++ b/test/stdout/0234
@@ -4,12 +4,14 @@
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r

+250 myhost.test.ex Hello test [V4NET.0.0.0]\r

 250 OK\r
 550 relay not permitted\r
 250 Accepted\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 OK\r
 550 relay not permitted\r
 250 Accepted\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 root at test [V4NET.0.0.0]\r

 250 OK\r
 550 relay not permitted\r
 250 Accepted\r
 250 OK\r
 550 relay not permitted\r
 250 Accepted\r

diff --git a/test/stdout/0251 b/test/stdout/0251
index 40d1eba56b75ce9a0d824796f5c2e1cca8c74579..bd774edc5fca9eac29627d11a3e052340dd4c7f3 100644 (file)
--- a/test/stdout/0251
+++ b/test/stdout/0251
@@ -4,6 +4,7 @@
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r

+250 myhost.test.ex Hello test [V4NET.0.0.0]\r

 250 OK\r
 250 Accepted\r
 250 Reset OK\r
 250 OK\r
 250 Accepted\r
 250 Reset OK\r


@@ -13,6 +14,9 @@
 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
 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

+>>> helo test
+??? 250
+<<< 250 myhost.test.ex Hello test [ip4.ip4.ip4.ip4]

 >>> mail from:<ok@sender>
 ??? 250
 <<< 250 OK
 >>> mail from:<ok@sender>
 ??? 250
 <<< 250 OK

diff --git a/test/stdout/0256 b/test/stdout/0256
index 0058c5ec23aa54d1854a0ab5a81bc7ae0202db4f..6622e82d8d1e7eec45ddcaec4253bd31c9e15361 100644 (file)
--- a/test/stdout/0256
+++ b/test/stdout/0256
@@ -1,4 +1,5 @@
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\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 test\r

 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r

diff --git a/test/stdout/0258 b/test/stdout/0258
index 824463e3ef850b77c6480716231db66c99142713..6a4b42b1b9949134c1d8dd01e4908c09d81065ed 100644 (file)
--- a/test/stdout/0258
+++ b/test/stdout/0258
@@ -1,10 +1,12 @@
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\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 test\r

 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
 250 OK id=10HmbF-0005vi-00\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 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
 250 OK id=10HmbF-0005vi-00\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 test\r

 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r

diff --git a/test/stdout/0281 b/test/stdout/0281
index 4b4b307fc66df411d4fff46ae7035d35f33da915..662b2d79a5a1e235a28ee886828de84db7a69da5 100644 (file)
--- a/test/stdout/0281
+++ b/test/stdout/0281
@@ -4,6 +4,7 @@
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r

+250 myhost.test.ex Hello test [V4NET.1.1.1]\r

 250 OK\r
 250 Accepted\r
 250 Accepted\r
 250 OK\r
 250 Accepted\r
 250 Accepted\r


@@ -29,6 +30,7 @@
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r

+250 myhost.test.ex Hello test [V4NET.10.10.10]\r

 250 OK\r
 250 Accepted\r
 221 myhost.test.ex closing connection\r
 250 OK\r
 250 Accepted\r
 221 myhost.test.ex closing connection\r


@@ -38,6 +40,7 @@
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r

+250 myhost.test.ex Hello test [127.0.0.1]\r

 250 OK\r
 250 Accepted\r
 221 myhost.test.ex closing connection\r
 250 OK\r
 250 Accepted\r
 221 myhost.test.ex closing connection\r


@@ -47,6 +50,7 @@
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r

+250 myhost.test.ex Hello test [V4NET.1.1.1]\r

 250 OK\r
 250 Accepted\r
 550 domain doesn't match @mx_primary\r
 250 OK\r
 250 Accepted\r
 550 domain doesn't match @mx_primary\r

diff --git a/test/stdout/0293 b/test/stdout/0293
index 63b499c00870d54608a6f086bea4eb899dc6cd93..7890fdf4ab8efd3752bedd3f13a6c3e36b70d356 100644 (file)
--- a/test/stdout/0293
+++ b/test/stdout/0293
@@ -1,4 +1,5 @@
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\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 test\r

 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r


@@ -10,6 +11,7 @@
 421 too many messages in this connection\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
 421 too many messages in this connection\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 test\r

 250 OK\r
 250 Reset OK\r
 250 OK\r
 250 OK\r
 250 Reset OK\r
 250 OK\r

diff --git a/test/stdout/0294 b/test/stdout/0294
index c1548160d19477170dd15f77bf0cc79ceb396dd3..dbc511d3d5a9aea14f75b5b37e1d085ee584aed0 100644 (file)
--- a/test/stdout/0294
+++ b/test/stdout/0294
@@ -1,4 +1,5 @@
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\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 test\r

 250 OK\r
 250 Accepted\r
 250 Accepted\r
 250 OK\r
 250 Accepted\r
 250 Accepted\r


@@ -19,6 +20,7 @@
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r

+250 myhost.test.ex Hello test [1.2.3.4]\r

 250 OK\r
 250 Accepted\r
 250 Accepted\r
 250 OK\r
 250 Accepted\r
 250 Accepted\r


@@ -29,11 +31,13 @@
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r

+250 myhost.test.ex Hello test [V4NET.9.8.7]\r

 250 OK\r
 250 Accepted\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 OK\r
 250 Accepted\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 test\r

 250 OK\r
 550 Administrative prohibition\r
 550 Administrative prohibition\r
 250 OK\r
 550 Administrative prohibition\r
 550 Administrative prohibition\r

diff --git a/test/stdout/0304 b/test/stdout/0304
index 2ff1e3ea3cb92be6281b8c723a90b1993ea41f3e..12f12dae7732de4e3d30f5db360ab491b5ef7103 100644 (file)
--- a/test/stdout/0304
+++ b/test/stdout/0304
@@ -4,6 +4,7 @@
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r

+250 myhost.test.ex Hello test [1.2.3.4]\r

 250 OK\r
 550 failed 7\r
 550 failed 8\r
 250 OK\r
 550 failed 7\r
 550 failed 8\r

diff --git a/test/stdout/0305 b/test/stdout/0305
index fda4811f525dc83bc8922007f4a6d5f097758cb9..48cd18527daaf86c6384041c2dbca24c29b470c2 100644 (file)
--- a/test/stdout/0305
+++ b/test/stdout/0305
@@ -4,6 +4,7 @@
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r

+250 myhost.test.ex Hello test [V4NET.2.3.4]\r

 250 OK\r
 250 Accepted\r
 550 Administrative prohibition\r
 250 OK\r
 250 Accepted\r
 550 Administrative prohibition\r

diff --git a/test/stdout/0306 b/test/stdout/0306
index cc6990ef37be8ed9ee359efaed8d78d447f91376..a0b4ca28932de9fd5116a0ba04badc0569dea852 100644 (file)
--- a/test/stdout/0306
+++ b/test/stdout/0306
@@ -4,6 +4,7 @@
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r

+250 myhost.test.ex Hello test [1.2.3.4]\r

 250 OK\r
 250 Accepted\r
 250 Reset OK\r
 250 OK\r
 250 Accepted\r
 250 Reset OK\r

diff --git a/test/stdout/0308 b/test/stdout/0308
index 7a003dc065a8a89be40bca5723cb96c6e76d318b..d5f915da3d329516eab43e5d6ce6c8d81eae26e6 100644 (file)
--- a/test/stdout/0308
+++ b/test/stdout/0308
@@ -4,6 +4,7 @@
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r

+250 myhost.test.ex Hello test [V4NET.0.0.97]\r

 250 OK\r
 250 Accepted\r
 221 myhost.test.ex closing connection\r
 250 OK\r
 250 Accepted\r
 221 myhost.test.ex closing connection\r


@@ -13,6 +14,7 @@
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r

+250 myhost.test.ex Hello test [V4NET.0.0.1]\r

 250 OK\r
 250 Accepted\r
 221 myhost.test.ex closing connection\r
 250 OK\r
 250 Accepted\r
 221 myhost.test.ex closing connection\r

diff --git a/test/stdout/0312 b/test/stdout/0312
index eed6d39b52338ba5a2c92f7d079aab669e6c64ce..24ec9297d0ef9d52d6ae4ace30c3ee2bd3e315dc 100644 (file)
--- a/test/stdout/0312
+++ b/test/stdout/0312
@@ -4,6 +4,7 @@
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r

+250 myhost.test.ex Hello test [V4NET.0.0.1]\r

 250 OK\r
 451 Temporary local problem - please try later\r
 221 myhost.test.ex closing connection\r
 250 OK\r
 451 Temporary local problem - please try later\r
 221 myhost.test.ex closing connection\r

diff --git a/test/stdout/0320 b/test/stdout/0320
index 18ba56443daa5c52f48229a2e5f1b8a7b2e84af9..ad12b2053a28490f51f613c5b81ce9f4472c9d4c 100644 (file)
--- a/test/stdout/0320
+++ b/test/stdout/0320
@@ -1,4 +1,5 @@
 220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r

+250 the.local.host.name Hello CALLER at test\r

 250 OK\r
 250 Accepted\r
 250 Accepted\r
 250 OK\r
 250 Accepted\r
 250 Accepted\r

diff --git a/test/stdout/0325 b/test/stdout/0325
index 91e52a8c32a4ea3b0fd83b6edf6546e7fe67f95d..5264c4c515281bbedab4022eca4c0e01170f6316 100644 (file)
--- a/test/stdout/0325
+++ b/test/stdout/0325
@@ -6,6 +6,7 @@ xxx@a.b.c
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r

+250 myhost.test.ex Hello test [V4NET.0.0.0]\r

 250 OK\r
 550 $domain_data=DOMAIN DATA $local_part_data=LOCAL PART DATA\r
 221 myhost.test.ex closing connection\r
 250 OK\r
 550 $domain_data=DOMAIN DATA $local_part_data=LOCAL PART DATA\r
 221 myhost.test.ex closing connection\r

diff --git a/test/stdout/0340 b/test/stdout/0340
index 057562f13d184852ed03c54a0b2cf8afe36e942d..21bb2e78b80e9220ff806fe84cf4917936ddfbad 100644 (file)
--- a/test/stdout/0340
+++ b/test/stdout/0340
@@ -1,4 +1,5 @@
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\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 test\r

 250 OK\r
 250 Accepted\r
 221 myhost.test.ex closing connection\r
 250 OK\r
 250 Accepted\r
 221 myhost.test.ex closing connection\r

diff --git a/test/stdout/0342 b/test/stdout/0342
index 5ccb71fe5d136b63643297e360a3e12a06cfa29a..d08cff7faa8fcd62da431f5514be2b2846525409 100644 (file)
--- a/test/stdout/0342
+++ b/test/stdout/0342
@@ -4,6 +4,7 @@
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r

+250 myhost.test.ex Hello test [1.2.3.4]\r

 250 OK\r
 250 Accepted\r
 221 myhost.test.ex closing connection\r
 250 OK\r
 250 Accepted\r
 221 myhost.test.ex closing connection\r

diff --git a/test/stdout/0362 b/test/stdout/0362
index f0eabc319bb123b002af029d8f931ca1764aa584..c4b6d0745acdfcabf1249de601451615164ba259 100644 (file)
--- a/test/stdout/0362
+++ b/test/stdout/0362
@@ -4,6 +4,7 @@
 **** This is not for real!
 
 220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 **** This is not for real!
 
 220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r

+250 the.local.host.name Hello test [V4NET.0.0.0]\r

 250 OK\r
 250 Accepted\r
 221 the.local.host.name closing connection\r
 250 OK\r
 250 Accepted\r
 221 the.local.host.name closing connection\r

diff --git a/test/stdout/0365 b/test/stdout/0365
index 17a50d08ca4fc3851e3cc67f7d46306b574dc091..fcd35a9b56157e9c74412173eefdce9b7c6d3cfd 100644 (file)
--- a/test/stdout/0365
+++ b/test/stdout/0365
@@ -1,4 +1,5 @@
 220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r

+250 the.local.host.name Hello CALLER at test\r

 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r


@@ -29,6 +30,7 @@
 250 Reset OK\r
 221 the.local.host.name closing connection\r
 220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 250 Reset OK\r
 221 the.local.host.name closing connection\r
 220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r

+250 the.local.host.name Hello CALLER at test\r

 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r

diff --git a/test/stdout/0372 b/test/stdout/0372
index 7639176a46367b7a706b8d909279894bc190e088..96688e56824ea1a843fe757f34ec4740f401458b 100644 (file)
--- a/test/stdout/0372
+++ b/test/stdout/0372
@@ -1,4 +1,5 @@
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\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 host.name [1.2.3.4]\r

 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r


@@ -9,6 +10,7 @@
 250 OK id=10HmaZ-0005vi-00\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 OK id=10HmaZ-0005vi-00\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 host2.name [4.3.2.1]\r

 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r

diff --git a/test/stdout/0376 b/test/stdout/0376
index a0af2cb92d587c745b1513e4a322bf43b8343d51..98a0177bf39f300e8e77aac44b871979463a68d3 100644 (file)
--- a/test/stdout/0376
+++ b/test/stdout/0376
@@ -1,16 +1,20 @@
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r

+250 myhost.test.ex Hello root at test [V4NET.0.0.1]\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 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 root at test [V4NET.0.0.1]\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 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 root at test [V4NET.0.0.1]\r

 250 OK\r
 451 Could not complete sender verify callout\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 OK\r
 451 Could not complete sender verify callout\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 root at test [V4NET.0.0.1]\r

 250 OK\r
 550-Verification failed for <bad@localhost>\r
 550-Called:   127.0.0.1\r
 250 OK\r
 550-Verification failed for <bad@localhost>\r
 550-Called:   127.0.0.1\r


@@ -19,12 +23,14 @@
 550 Sender verify failed\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
 550 Sender verify failed\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 root at test [V4NET.0.0.1]\r

 250 OK\r
 550-Verification failed for <bad@localhost>\r
 550-Previous (cached) callout verification failure\r
 550 Sender verify failed\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 OK\r
 550-Verification failed for <bad@localhost>\r
 550-Previous (cached) callout verification failure\r
 550 Sender verify failed\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 root at test [V4NET.0.0.1]\r

 250 OK\r
 550-Callback setup failed while verifying <ok@localhost>\r
 550-Called:   127.0.0.1\r
 250 OK\r
 550-Callback setup failed while verifying <ok@localhost>\r
 550-Called:   127.0.0.1\r


@@ -38,6 +44,7 @@
 550 Sender verify failed\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
 550 Sender verify failed\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 root at test [V4NET.0.0.1]\r

 250 OK\r
 550-Callback setup failed while verifying <ok@localhost>\r
 550-(result of an earlier callout reused).\r
 250 OK\r
 550-Callback setup failed while verifying <ok@localhost>\r
 550-(result of an earlier callout reused).\r


@@ -49,6 +56,7 @@
 550 Sender verify failed\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
 550 Sender verify failed\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 root at test [V4NET.0.0.2]\r

 250 OK\r
 550-Postmaster verification failed while checking <ok@otherhost>\r
 550-Called:   127.0.0.1\r
 250 OK\r
 550-Postmaster verification failed while checking <ok@otherhost>\r
 550-Called:   127.0.0.1\r


@@ -60,6 +68,7 @@
 550 Sender verify failed\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
 550 Sender verify failed\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 root at test [V4NET.0.0.2]\r

 250 OK\r
 550-Postmaster verification failed while checking <ok@otherhost>\r
 550-(result of earlier verification reused).\r
 250 OK\r
 550-Postmaster verification failed while checking <ok@otherhost>\r
 550-(result of earlier verification reused).\r


@@ -69,82 +78,101 @@
 550 Sender verify failed\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
 550 Sender verify failed\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 root at test [V4NET.0.0.2]\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 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 root at test [V4NET.0.0.2]\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 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 root at test [V4NET.0.0.3]\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 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 root at test [V4NET.0.0.3]\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 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 root at test [V4NET.0.0.4]\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 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 root at test [V4NET.0.0.4]\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 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 root at test [V4NET.0.0.4]\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 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 root at test [V4NET.0.0.4]\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 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 root at test [V4NET.0.0.2]\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 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 root at test [V4NET.0.0.2]\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 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 root at test [V4NET.0.0.3]\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 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 root at test [V4NET.0.0.3]\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 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 root at test [V4NET.0.0.3]\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 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 root at test [V4NET.0.0.5]\r

 250 OK\r
 451 Could not complete sender verify callout\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 OK\r
 451 Could not complete sender verify callout\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 root at test [V4NET.0.0.6]\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 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 root at test [V4NET.0.0.7]\r

 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
 250 OK id=10HmaX-0005vi-00\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 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
 250 OK id=10HmaX-0005vi-00\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 root at test [V4NET.0.0.8]\r

 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
 250 OK id=10HmaY-0005vi-00\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 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
 250 OK id=10HmaY-0005vi-00\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 root at test [V4NET.0.0.9]\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 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 root at test [V4NET.0.0.10]\r

 250 OK\r
 250 Accepted\r
 221 myhost.test.ex closing connection\r
 250 OK\r
 250 Accepted\r
 221 myhost.test.ex closing connection\r

diff --git a/test/stdout/0381 b/test/stdout/0381
index 057562f13d184852ed03c54a0b2cf8afe36e942d..1d85f486cf8ef17d724f12cdc01015fd5539a490 100644 (file)
--- a/test/stdout/0381
+++ b/test/stdout/0381
@@ -1,4 +1,5 @@
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\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 test [V4NET.99.99.97]\r

 250 OK\r
 250 Accepted\r
 221 myhost.test.ex closing connection\r
 250 OK\r
 250 Accepted\r
 221 myhost.test.ex closing connection\r

diff --git a/test/stdout/0386 b/test/stdout/0386
index 7ee79fd62fd02839414c995b13104f97c38b9f25..88c573afbce80e0eeb79e3d54e08f67f4d3458a2 100644 (file)
--- a/test/stdout/0386
+++ b/test/stdout/0386
@@ -4,6 +4,7 @@
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r

+250 myhost.test.ex Hello test [V4NET.9.8.7]\r

 250 OK\r
 550 No such user here\r
 250 Reset OK\r
 250 OK\r
 550 No such user here\r
 250 Reset OK\r


@@ -11,6 +12,7 @@
 550 No such user here\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
 550 No such user here\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 test [V4NET.11.12.13]\r

 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r

diff --git a/test/stdout/0387 b/test/stdout/0387
index 9129f01007e98372bb3d0869a9bb97a3cd94570a..3845b68e2fd0e41677a1ca860db4124ef6e85143 100644 (file)
--- a/test/stdout/0387
+++ b/test/stdout/0387
@@ -1,4 +1,5 @@
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\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 test\r

 250 OK\r
 250 Accepted\r
 250 Reset OK\r
 250 OK\r
 250 Accepted\r
 250 Reset OK\r


@@ -6,14 +7,17 @@
 550 Administrative prohibition\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
 550 Administrative prohibition\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 test [10.9.8.7]\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 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 test [192.168.4.5]\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 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 test [1.2.3.4]\r

 250 OK\r
 550 Administrative prohibition\r
 221 myhost.test.ex closing connection\r
 250 OK\r
 550 Administrative prohibition\r
 221 myhost.test.ex closing connection\r

diff --git a/test/stdout/0389 b/test/stdout/0389
index 49849423ca3fac9160ee19adf3979ebea5f7e22b..bbc87cfef56fcc214176b994c917744b3361614c 100644 (file)
--- a/test/stdout/0389
+++ b/test/stdout/0389
@@ -1,4 +1,5 @@
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\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 test\r

 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r


@@ -10,6 +11,7 @@ CALLER UID GID
 ddddddddd 0
 -received_time_usec .uuuuuu
 -received_time_complete tttt.uuuuuu
 ddddddddd 0
 -received_time_usec .uuuuuu
 -received_time_complete tttt.uuuuuu

+--helo_name test

 -ident CALLER
 -received_protocol local-smtp
 -aclm 0 22
 -ident CALLER
 -received_protocol local-smtp
 -aclm 0 22


@@ -25,7 +27,8 @@ XX
 1
 x@y
 
 1
 x@y
 

-dddP Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
+dddP Received: from CALLER (helo=test)
+       by myhost.test.ex with local-smtp (Exim x.yz)

        (envelope-from <CALLER@myhost.test.ex>)
        id 10HmaX-0005vi-00
        for x@y;
        (envelope-from <CALLER@myhost.test.ex>)
        id 10HmaX-0005vi-00
        for x@y;

diff --git a/test/stdout/0391 b/test/stdout/0391
index 5ccb71fe5d136b63643297e360a3e12a06cfa29a..d08cff7faa8fcd62da431f5514be2b2846525409 100644 (file)
--- a/test/stdout/0391
+++ b/test/stdout/0391
@@ -4,6 +4,7 @@
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r

+250 myhost.test.ex Hello test [1.2.3.4]\r

 250 OK\r
 250 Accepted\r
 221 myhost.test.ex closing connection\r
 250 OK\r
 250 Accepted\r
 221 myhost.test.ex closing connection\r

diff --git a/test/stdout/0395 b/test/stdout/0395
index 21f34430abd605ea2db2b6a958689a418cd2278a..51a86f42faab0f3e2597492457b095012e241a99 100644 (file)
--- a/test/stdout/0395
+++ b/test/stdout/0395
@@ -1,12 +1,13 @@
 501 sender address must contain a domain
 501 sender address must contain a domain

-Transaction started in line 0
-Error detected in line 1
+Transaction started in line 1
+Error detected in line 2

 mail from: userx
 501 recipient address must contain a domain
 mail from: userx
 501 recipient address must contain a domain

-Transaction started in line 0
-Error detected in line 2
+Transaction started in line 1
+Error detected in line 3

 rcpt to: userx
 220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 rcpt to: userx
 220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r

+250 the.local.host.name Hello CALLER at test\r

 250 OK\r
 501 userx: recipient address must contain a domain\r
 503-All RCPT commands were rejected with this error:\r
 250 OK\r
 501 userx: recipient address must contain a domain\r
 503-All RCPT commands were rejected with this error:\r


@@ -17,12 +18,14 @@ rcpt to: userx
 500 unrecognized command\r
 221 the.local.host.name closing connection\r
 220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 500 unrecognized command\r
 221 the.local.host.name closing connection\r
 220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r

+250 the.local.host.name Hello CALLER at test\r

 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
 250 OK id=10HmbE-0005vi-00\r
 221 the.local.host.name closing connection\r
 220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
 250 OK id=10HmbE-0005vi-00\r
 221 the.local.host.name closing connection\r
 220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r

+250 the.local.host.name Hello CALLER at test\r

 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r

diff --git a/test/stdout/0396 b/test/stdout/0396
index cb913473dc9e47d80923302d8a649d278294b6fc..e31145105f9315f759d0c6dcf9f0da75ede6de6b 100644 (file)
--- a/test/stdout/0396
+++ b/test/stdout/0396
@@ -1,4 +1,5 @@
 220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r

+250 the.local.host.name Hello CALLER at test\r

 250 OK\r
 550 Administrative prohibition\r
 221 the.local.host.name closing connection\r
 250 OK\r
 550 Administrative prohibition\r
 221 the.local.host.name closing connection\r

diff --git a/test/stdout/0398 b/test/stdout/0398
index 882015d493855e7f2187a71ccd46f5225b48e15c..e6c41915f17716a414770daaa348589f6aefa496 100644 (file)
--- a/test/stdout/0398
+++ b/test/stdout/0398
@@ -1,10 +1,12 @@
 220 mail.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 220 mail.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r

+250 mail.test.ex Hello CALLER at test\r

 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
 250 OK id=10HmaX-0005vi-00\r
 221 mail.test.ex closing connection\r
 220 mail.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
 250 OK id=10HmaX-0005vi-00\r
 221 mail.test.ex closing connection\r
 220 mail.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r

+250 mail.test.ex Hello CALLER at test\r

 250 OK\r
 550-Verification failed for <z@remote>\r
 550-Called:   127.0.0.1\r
 250 OK\r
 550-Verification failed for <z@remote>\r
 550-Called:   127.0.0.1\r


@@ -13,11 +15,13 @@
 550 Sender verify failed\r
 221 mail.test.ex closing connection\r
 220 mail.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 550 Sender verify failed\r
 221 mail.test.ex closing connection\r
 220 mail.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r

+250 mail.test.ex Hello CALLER at test\r

 250 OK\r
 250 Accepted\r
 250 Accepted\r
 221 mail.test.ex closing connection\r
 220 mail.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 250 OK\r
 250 Accepted\r
 250 Accepted\r
 221 mail.test.ex closing connection\r
 220 mail.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r

+250 mail.test.ex Hello CALLER at test\r

 250 OK\r
 250 Accepted\r
 250 Accepted\r
 250 OK\r
 250 Accepted\r
 250 Accepted\r

diff --git a/test/stdout/0407 b/test/stdout/0407
index aeedbf5bc7eacff8de9fd8bdc3eac3e43fce137d..5b43f0f2641d0b768c951923fd1b3cee86e21d9c 100644 (file)
--- a/test/stdout/0407
+++ b/test/stdout/0407
@@ -1,4 +1,5 @@
 220 mail.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 220 mail.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r

+250 mail.test.ex Hello CALLER at test\r

 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r

diff --git a/test/stdout/0410 b/test/stdout/0410
index c37b4ac90fc11f51bdbc0a3186b30c956b4e20fb..8e9aef0003c85857d418554737c40557b1465477 100644 (file)
--- a/test/stdout/0410
+++ b/test/stdout/0410
@@ -1,4 +1,5 @@
 220 mail.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 220 mail.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r

+250 mail.test.ex Hello CALLER at test\r

 250 OK\r
 250 Accepted\r
 250 Accepted\r
 250 OK\r
 250 Accepted\r
 250 Accepted\r

diff --git a/test/stdout/0413 b/test/stdout/0413
index 5c320fc9405da0c6d6497732fd579081d584820f..9dc30cb67976272b1aafbe09d7874e94bca5ccd5 100644 (file)
--- a/test/stdout/0413
+++ b/test/stdout/0413
@@ -1,4 +1,5 @@
 220 mail.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 220 mail.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r

+250 mail.test.ex Hello CALLER at test\r

 451 Could not complete sender verify callout\r
 250 Reset OK\r
 451 Could not complete sender verify callout\r
 451 Could not complete sender verify callout\r
 250 Reset OK\r
 451 Could not complete sender verify callout\r

diff --git a/test/stdout/0417 b/test/stdout/0417
index c0aaa28a9daf1f7cbe69245886e98b66ce7eee55..093c094c056ce83de63625705f96798f53734f79 100644 (file)
--- a/test/stdout/0417
+++ b/test/stdout/0417
@@ -1,9 +1,11 @@
 220 mail.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 220 mail.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r

+250 mail.test.ex Hello CALLER at test\r

 250 OK\r
 451 Temporary local problem - please try later\r
 451 Temporary local problem - please try later\r
 221 mail.test.ex closing connection\r
 220 mail.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 250 OK\r
 451 Temporary local problem - please try later\r
 451 Temporary local problem - please try later\r
 221 mail.test.ex closing connection\r
 220 mail.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r

+250 mail.test.ex Hello CALLER at test\r

 250 OK\r
 451-host lookup did not complete\r
 451 Could not complete sender verify\r
 250 OK\r
 451-host lookup did not complete\r
 451 Could not complete sender verify\r

diff --git a/test/stdout/0418 b/test/stdout/0418
index b108c99cc9990af7793421e23ce308f64c3a284a..23163d6a1dd4c07b39e180dab68a42d7443df081 100644 (file)
--- a/test/stdout/0418
+++ b/test/stdout/0418
@@ -1,4 +1,5 @@
 220 mail.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 220 mail.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r

+250 mail.test.ex Hello CALLER at test\r

 250 OK\r
 550-This is a message which is continued over several lines, with an\r
 550 interspersed comment\r
 250 OK\r
 550-This is a message which is continued over several lines, with an\r
 550 interspersed comment\r

diff --git a/test/stdout/0425 b/test/stdout/0425
index c37b4ac90fc11f51bdbc0a3186b30c956b4e20fb..8e9aef0003c85857d418554737c40557b1465477 100644 (file)
--- a/test/stdout/0425
+++ b/test/stdout/0425
@@ -1,4 +1,5 @@
 220 mail.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 220 mail.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r

+250 mail.test.ex Hello CALLER at test\r

 250 OK\r
 250 Accepted\r
 250 Accepted\r
 250 OK\r
 250 Accepted\r
 250 Accepted\r

diff --git a/test/stdout/0432 b/test/stdout/0432
index e36d048a3810ed77aef79fcd02519a36075fc047..ee0c5f591880095b7a484e46d862d191292b292b 100644 (file)
--- a/test/stdout/0432
+++ b/test/stdout/0432
@@ -4,6 +4,7 @@
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r

+250 myhost.test.ex Hello test [1.2.3.4]\r

 250 OK\r
 221 myhost.test.ex closing connection\r
 
 250 OK\r
 221 myhost.test.ex closing connection\r
 


@@ -12,6 +13,7 @@
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r

+250 myhost.test.ex Hello test [1.2.3.4]\r

 250 OK\r
 221 myhost.test.ex closing connection\r
 
 250 OK\r
 221 myhost.test.ex closing connection\r
 


@@ -20,6 +22,7 @@
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r

+250 myhost.test.ex Hello test [1.2.3.4]\r

 250 OK\r
 221 myhost.test.ex closing connection\r
 
 250 OK\r
 221 myhost.test.ex closing connection\r
 


@@ -28,6 +31,7 @@
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r

+250 myhost.test.ex Hello test [1.2.3.4]\r

 250 OK\r
 221 myhost.test.ex closing connection\r
 
 250 OK\r
 221 myhost.test.ex closing connection\r
 


@@ -36,6 +40,7 @@
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r

+250 myhost.test.ex Hello test [1.2.3.4]\r

 250 OK\r
 221 myhost.test.ex closing connection\r
 
 250 OK\r
 221 myhost.test.ex closing connection\r
 


@@ -44,6 +49,7 @@
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r

+250 myhost.test.ex Hello test [1.2.3.4]\r

 451 Could not complete sender verify callout\r
 221 myhost.test.ex closing connection\r
 
 451 Could not complete sender verify callout\r
 221 myhost.test.ex closing connection\r
 

diff --git a/test/stdout/0443 b/test/stdout/0443
index 81decfbb2ea2a5e9d5b164083dfed7f97193642f..41738763969b53e6cac3a2b03286079ad0204084 100644 (file)
--- a/test/stdout/0443
+++ b/test/stdout/0443
@@ -4,6 +4,7 @@
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r

+250 myhost.test.ex Hello test [V4NET.0.0.1]\r

 250 OK\r
 451 Could not complete sender verify callout\r
 221 myhost.test.ex closing connection\r
 250 OK\r
 451 Could not complete sender verify callout\r
 221 myhost.test.ex closing connection\r

diff --git a/test/stdout/0445 b/test/stdout/0445
index bf535813c2e1080f1db5ea1cf0d5dcb279b5acb1..e0fdc19bfd6fc848ae45b79f8574c0fd9e4e0cc2 100644 (file)
--- a/test/stdout/0445
+++ b/test/stdout/0445
@@ -4,6 +4,7 @@
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r

+250 myhost.test.ex Hello test [1.2.3.4]\r

 250 OK\r
 550-Verification failed for <lp1@x.y>\r
 550 Sender verify failed\r
 250 OK\r
 550-Verification failed for <lp1@x.y>\r
 550 Sender verify failed\r

diff --git a/test/stdout/0446 b/test/stdout/0446
index 4cb5a92076a2f9dc3fe82369fd7583bf0fa13e2f..3e01f186d16e2ff044b5d16d25f55933e5ce5c42 100644 (file)
--- a/test/stdout/0446
+++ b/test/stdout/0446
@@ -1,4 +1,5 @@
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\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 test\r

 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r

diff --git a/test/stdout/0453 b/test/stdout/0453
index b4d5604cbc9fc4cdbe857f847b8c3a4f7af66a4d..45a045b7baeaa3798e4d45f532fc8f7217d3e574 100644 (file)
--- a/test/stdout/0453
+++ b/test/stdout/0453
@@ -4,6 +4,7 @@
 501 Syntactically invalid HELO argument(s)\r
 501 Syntactically invalid HELO argument(s)\r
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 501 Syntactically invalid HELO argument(s)\r
 501 Syntactically invalid HELO argument(s)\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 test\r

 250 OK\r
 503 sender already given\r
 503-sender already given\r
 250 OK\r
 503 sender already given\r
 503-sender already given\r

diff --git a/test/stdout/0459 b/test/stdout/0459
index 741a7ff1ae32f9ba1cb218baff5577fbc2423680..68b3e46f5bbf7311a75d252b5857d1ee90e31436 100644 (file)
--- a/test/stdout/0459
+++ b/test/stdout/0459
@@ -1,4 +1,5 @@
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\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 test\r

 250 OK\r
 451 Temporary local problem - please try later\r
 221 myhost.test.ex closing connection\r
 250 OK\r
 451 Temporary local problem - please try later\r
 221 myhost.test.ex closing connection\r

diff --git a/test/stdout/0462 b/test/stdout/0462
index 585e2e08f9b7cb68abb1ab466e3f59f8f4af689f..747c8528584fa5d802e4a1da70ab22f77c53cb89 100644 (file)
--- a/test/stdout/0462
+++ b/test/stdout/0462
@@ -1,4 +1,5 @@
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r

+250 myhost.test.ex Hello root at test [V4NET.0.0.1]\r

 250 OK\r
 550-Postmaster verification failed while checking <Ok@localhost>\r
 550-Called:   127.0.0.1\r
 250 OK\r
 550-Postmaster verification failed while checking <Ok@localhost>\r
 550-Called:   127.0.0.1\r


@@ -11,6 +12,7 @@
 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 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 root at test [V4NET.0.0.2]\r

 250 OK\r
 550-Verification failed for <NOTok@elsewhere>\r
 550-Called:   127.0.0.1\r
 250 OK\r
 550-Verification failed for <NOTok@elsewhere>\r
 550-Called:   127.0.0.1\r


@@ -19,6 +21,7 @@
 550 Sender verify failed\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
 550 Sender verify failed\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 root at test [V4NET.0.0.2]\r

 250 OK\r
 550-Verification failed for <NOTok2@elsewhere>\r
 550-Called:   127.0.0.1\r
 250 OK\r
 550-Verification failed for <NOTok2@elsewhere>\r
 550-Called:   127.0.0.1\r

diff --git a/test/stdout/0464 b/test/stdout/0464
index 057562f13d184852ed03c54a0b2cf8afe36e942d..21bb2e78b80e9220ff806fe84cf4917936ddfbad 100644 (file)
--- a/test/stdout/0464
+++ b/test/stdout/0464
@@ -1,4 +1,5 @@
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\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 test\r

 250 OK\r
 250 Accepted\r
 221 myhost.test.ex closing connection\r
 250 OK\r
 250 Accepted\r
 221 myhost.test.ex closing connection\r

diff --git a/test/stdout/0465 b/test/stdout/0465
index 9dd9847eae5c443fd0a1d422940f98bf16b1e0f8..a9ba3afdc405a9a6dcd9afc619aad2395a13bc8a 100644 (file)
--- a/test/stdout/0465
+++ b/test/stdout/0465
@@ -1,14 +1,17 @@
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\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 test\r

 250 OK\r
 501 <abc@domain.>: domain missing or malformed\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 OK\r
 501 <abc@domain.>: domain missing or malformed\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 test\r

 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
 250 OK id=10HmaY-0005vi-00\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 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
 250 OK id=10HmaY-0005vi-00\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 test\r

 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r

diff --git a/test/stdout/0468 b/test/stdout/0468
index 2b100570d46a39145f827fb0104530f913104c3c..b601989a0ffcdc24bf9e98ff3980bdea9f089f07 100644 (file)
--- a/test/stdout/0468
+++ b/test/stdout/0468
@@ -1,4 +1,5 @@
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\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 test\r

 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r

diff --git a/test/stdout/0475 b/test/stdout/0475
index 2fc366e62b34f7e12ec92888698d3c1c0fd43a20..819cea3bcc8e57ee1301d9daca823c099cd539e1 100644 (file)
--- a/test/stdout/0475
+++ b/test/stdout/0475
@@ -4,6 +4,7 @@
 **** This is not for real!
 
 220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 **** This is not for real!
 
 220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r

+250 the.local.host.name Hello test [V4NET.0.0.0]\r

 250 OK\r
 451 Temporary local problem - please try later\r
 550 Administrative prohibition\r
 250 OK\r
 451 Temporary local problem - please try later\r
 550 Administrative prohibition\r

diff --git a/test/stdout/0483 b/test/stdout/0483
index 483ea4b256625ccb3094414e0006caa35dfcc4ce..8014e809603a34d235f78aebe415294c9a63463c 100644 (file)
--- a/test/stdout/0483
+++ b/test/stdout/0483
@@ -1,4 +1,5 @@
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\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 test\r

 250 OK\r
 250 Accepted\r
 550 Administrative prohibition\r
 250 OK\r
 250 Accepted\r
 550 Administrative prohibition\r

diff --git a/test/stdout/0488 b/test/stdout/0488
index 6b0b1c603f806f58cdc61b62432ad94651e55732..703afa585105fe80d965318bdfa70d0d778b7db9 100644 (file)
--- a/test/stdout/0488
+++ b/test/stdout/0488
@@ -1,4 +1,5 @@
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\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 test\r

 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r


@@ -10,6 +11,7 @@ CALLER UID GID
 ddddddddd 0
 -received_time_usec .uuuuuu
 -received_time_complete tttt.uuuuuu
 ddddddddd 0
 -received_time_usec .uuuuuu
 -received_time_complete tttt.uuuuuu

+--helo_name test

 -ident CALLER
 -received_protocol local-smtp
 -body_linecount 0
 -ident CALLER
 -received_protocol local-smtp
 -body_linecount 0


@@ -23,7 +25,8 @@ XX
 1
 userx@test.ex
 
 1
 userx@test.ex
 

-dddP Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
+dddP Received: from CALLER (helo=test)
+       by myhost.test.ex with local-smtp (Exim x.yz)

        (envelope-from <CALLER@myhost.test.ex>)
        id 10HmaX-0005vi-00
        for userx@test.ex;
        (envelope-from <CALLER@myhost.test.ex>)
        id 10HmaX-0005vi-00
        for userx@test.ex;

diff --git a/test/stdout/0490 b/test/stdout/0490
index fb456ca526411ac616bc3049f5d1a3d27accd483..3e2b0e0a4aa6a3e137c0e29d02b87aef754d3efe 100644 (file)
--- a/test/stdout/0490
+++ b/test/stdout/0490
@@ -1,4 +1,5 @@
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\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 test\r

 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r


@@ -14,6 +15,7 @@ CALLER UID GID
 ddddddddd 0
 -received_time_usec .uuuuuu
 -received_time_complete tttt.uuuuuu
 ddddddddd 0
 -received_time_usec .uuuuuu
 -received_time_complete tttt.uuuuuu

+--helo_name test

 -ident CALLER
 -received_protocol local-smtp
 -body_linecount 2
 -ident CALLER
 -received_protocol local-smtp
 -body_linecount 2


@@ -27,7 +29,8 @@ XX
 1
 bb@test.ex
 
 1
 bb@test.ex
 

-dddP Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
+dddP Received: from CALLER (helo=test)
+       by myhost.test.ex with local-smtp (Exim x.yz)

        (envelope-from <CALLER@myhost.test.ex>)
        id 10HmaY-0005vi-00
        for bb@test.ex;
        (envelope-from <CALLER@myhost.test.ex>)
        id 10HmaY-0005vi-00
        for bb@test.ex;

diff --git a/test/stdout/0496 b/test/stdout/0496
index 33be0890143b57610aece02890195cf612927936..d2cfe99cc15511ce41368bcb47b6d2d360e0947c 100644 (file)
--- a/test/stdout/0496
+++ b/test/stdout/0496
@@ -1,4 +1,5 @@
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\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 test\r

 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r

diff --git a/test/stdout/0500 b/test/stdout/0500
index b13f1d27516c20aedc81f2c65f9c597b273d4f14..bacc27a17117afce69fcaf40c032900452365265 100644 (file)
--- a/test/stdout/0500
+++ b/test/stdout/0500
@@ -1,4 +1,5 @@
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\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 test\r

 250 OK\r
 250 Accepted\r
 550-Verification failed for <x@y>\r
 250 OK\r
 250 Accepted\r
 550-Verification failed for <x@y>\r


@@ -6,6 +7,7 @@
 550 Sender verify failed\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
 550 Sender verify failed\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 test\r

 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r

diff --git a/test/stdout/0501 b/test/stdout/0501
index 057562f13d184852ed03c54a0b2cf8afe36e942d..21bb2e78b80e9220ff806fe84cf4917936ddfbad 100644 (file)
--- a/test/stdout/0501
+++ b/test/stdout/0501
@@ -1,4 +1,5 @@
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\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 test\r

 250 OK\r
 250 Accepted\r
 221 myhost.test.ex closing connection\r
 250 OK\r
 250 Accepted\r
 221 myhost.test.ex closing connection\r

diff --git a/test/stdout/0502 b/test/stdout/0502
index edb6d3156060c2b2bdc244f61376e01a8db603af..df6f28f9f3c7340ee0ecdca3db99cd11567d7985 100644 (file)
--- a/test/stdout/0502
+++ b/test/stdout/0502
@@ -1,4 +1,5 @@
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\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 test\r

 250 OK\r
 250 Accepted\r
 250 Accepted\r
 250 OK\r
 250 Accepted\r
 250 Accepted\r


@@ -17,6 +18,7 @@
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 221 Your message here\r
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 221 Your message here\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 test\r

 250 OK\r
 221 myhost.test.ex closing connection\r
 Connecting to 127.0.0.1 port 1225 ... connected
 250 OK\r
 221 myhost.test.ex closing connection\r
 Connecting to 127.0.0.1 port 1225 ... connected

diff --git a/test/stdout/0505 b/test/stdout/0505
index 597c2940f1d7d8d6949a2ae77c0f7fc4188260cf..67ed5291007312bef6213b06081a49542e44b3d9 100644 (file)
--- a/test/stdout/0505
+++ b/test/stdout/0505
@@ -1,10 +1,12 @@
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\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 test\r

 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
 451 Temporary local problem - please try later\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 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
 451 Temporary local problem - please try later\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 test\r

 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r

diff --git a/test/stdout/0507 b/test/stdout/0507
index 9156b51345bd7d39ed1dc70ca576360da00e695f..ac8c2e945ded3dce03c4b066a4211598fcaa24ec 100644 (file)
--- a/test/stdout/0507
+++ b/test/stdout/0507
@@ -1,22 +1,26 @@
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\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 test\r

 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
 250 OK id=10HmbA-0005vi-00\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 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
 250 OK id=10HmbA-0005vi-00\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 test\r

 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
 550 Administrative prohibition\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 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
 550 Administrative prohibition\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 test\r

 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
 550 Rejected after DATA: bcc recipient detected\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 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
 550 Rejected after DATA: bcc recipient detected\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 test\r

 250 OK\r
 250 Accepted\r
 250 Accepted\r
 250 OK\r
 250 Accepted\r
 250 Accepted\r


@@ -24,6 +28,7 @@
 250 OK id=10HmbB-0005vi-00\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 OK id=10HmbB-0005vi-00\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 test\r

 250 OK\r
 250 Accepted\r
 250 Accepted\r
 250 OK\r
 250 Accepted\r
 250 Accepted\r


@@ -32,6 +37,7 @@
 550 Administrative prohibition\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
 550 Administrative prohibition\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 test\r

 250 OK\r
 250 Accepted\r
 250 Accepted\r
 250 OK\r
 250 Accepted\r
 250 Accepted\r

diff --git a/test/stdout/0517 b/test/stdout/0517
index 58649f6f0c2693f97b950a6aa3dfc7a8ad7484c7..ec86b86778e630f73bd0514691bde7746a30723f 100644 (file)
--- a/test/stdout/0517
+++ b/test/stdout/0517
@@ -1,10 +1,12 @@
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\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 test\r

 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
 250 OK id=10HmaX-0005vi-00\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 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
 250 OK id=10HmaX-0005vi-00\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 test\r

 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r

diff --git a/test/stdout/0518 b/test/stdout/0518
index 478b304b417884b7dbeda997c17f82589e157395..c00eda1118c354d219a572c65766bcfec187b78c 100644 (file)
--- a/test/stdout/0518
+++ b/test/stdout/0518
@@ -1,4 +1,5 @@
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\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 test\r

 250 OK\r
 250 Accepted\r
 250 Accepted\r
 250 OK\r
 250 Accepted\r
 250 Accepted\r

diff --git a/test/stdout/0525 b/test/stdout/0525
index bf3f0911bb1584394e8c8d4846ff8d7961d92126..969cf1147307e1544703f46d76c35e7e5d05d7ef 100644 (file)
--- a/test/stdout/0525
+++ b/test/stdout/0525
@@ -1,4 +1,5 @@
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\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 test\r

 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r

diff --git a/test/stdout/0527 b/test/stdout/0527
index 98cca1761f09471c9da8b5a9d927e49556df1980..12ed3d135a20ba0fa63cdcc3462e142d8a504337 100644 (file)
--- a/test/stdout/0527
+++ b/test/stdout/0527
@@ -1,4 +1,5 @@
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\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 test\r

 250 OK\r
 451 Could not complete sender verify callout\r
 221 myhost.test.ex closing connection\r
 250 OK\r
 451 Could not complete sender verify callout\r
 221 myhost.test.ex closing connection\r

diff --git a/test/stdout/0530 b/test/stdout/0530
index 1a39f693c756cda1148c1f271dcad0ec1e24d306..fcfd7211f9926e52871c140156e06d5c3918f3fa 100644 (file)
--- a/test/stdout/0530
+++ b/test/stdout/0530
@@ -1,28 +1,33 @@
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\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 test\r

 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
 250 OK id=10HmbH-0005vi-00\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 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
 250 OK id=10HmbH-0005vi-00\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 test\r

 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
 250 OK id=10HmbJ-0005vi-00\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 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
 250 OK id=10HmbJ-0005vi-00\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 test\r

 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
 250 OK id=10HmbL-0005vi-00\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 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
 250 OK id=10HmbL-0005vi-00\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 test\r

 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
 250 OK id=10HmbN-0005vi-00\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 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
 250 OK id=10HmbN-0005vi-00\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 test\r

 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r

diff --git a/test/stdout/0532 b/test/stdout/0532
index 7d79c1ec75100b5924c42c66d0a55615dedacaad..c6d6c25a01744b30a28a5b48fcb9aabcfbf025fa 100644 (file)
--- a/test/stdout/0532
+++ b/test/stdout/0532
@@ -1,4 +1,5 @@
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\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 test\r

 250 OK\r
 250 Accepted\r
 550 Administrative prohibition\r
 250 OK\r
 250 Accepted\r
 550 Administrative prohibition\r

diff --git a/test/stdout/0538 b/test/stdout/0538
index 7a190581748416eaa3d0b09754c721257e17222a..44e9b8747233b0c01c8bf69e1ff4b0799f471036 100644 (file)
--- a/test/stdout/0538
+++ b/test/stdout/0538
@@ -1,4 +1,5 @@
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\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 test\r

 550-Callback setup failed while verifying <userx@broken.example>\r
 550-Called:   127.0.0.1\r
 550-Sent:     MAIL FROM:<>\r
 550-Callback setup failed while verifying <userx@broken.example>\r
 550-Called:   127.0.0.1\r
 550-Sent:     MAIL FROM:<>\r


@@ -11,10 +12,12 @@
 550 Sender verify failed\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
 550 Sender verify failed\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 test\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 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 test\r

 550-Callback setup failed while verifying <userx@broken.example>\r
 550-(result of an earlier callout reused).\r
 550-The initial connection, or a HELO or MAIL FROM:<> command was\r
 550-Callback setup failed while verifying <userx@broken.example>\r
 550-(result of an earlier callout reused).\r
 550-The initial connection, or a HELO or MAIL FROM:<> command was\r

diff --git a/test/stdout/0539 b/test/stdout/0539
index d260b66cc47261c1cf5af836cf880051aac4ce83..fe06886b1205a06becab872abc8fed851c37eca6 100644 (file)
--- a/test/stdout/0539
+++ b/test/stdout/0539
@@ -1,4 +1,5 @@
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\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 test\r

 550 Administrative prohibition\r
 550 Administrative prohibition\r
 550 Administrative prohibition\r
 550 Administrative prohibition\r
 550 Administrative prohibition\r
 550 Administrative prohibition\r

diff --git a/test/stdout/0540 b/test/stdout/0540
index 4d788a5e9d9f91bb1cd13605c8221c976594acf2..3cb76b53f911762c0a7a4c996fa07f4dd24c027a 100644 (file)
--- a/test/stdout/0540
+++ b/test/stdout/0540
@@ -1,4 +1,5 @@
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\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 test\r

 250 OK\r
 250 Accepted\r
 250 Accepted\r
 250 OK\r
 250 Accepted\r
 250 Accepted\r

diff --git a/test/stdout/0542 b/test/stdout/0542
index ce255a7443ca4c274d365117c63cacab9be92e38..1a262e6b416405ee7b490e8ce6fcce5caf412a2d 100644 (file)
--- a/test/stdout/0542
+++ b/test/stdout/0542
@@ -9,6 +9,7 @@
 > (userx@test.x, usery@test.ex)
 > 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 > (userx@test.x, usery@test.ex)
 > 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r

+250 myhost.test.ex Hello CALLER at test\r

 250 OK\r
 250 Accepted\r
 250 Accepted\r
 250 OK\r
 250 Accepted\r
 250 Accepted\r

diff --git a/test/stdout/0555 b/test/stdout/0555
index b821e7b4bc584a108ec622a22a1cb828ec573077..1f8ac8f4b7e2ac6f579745d158145b72bb246294 100644 (file)
--- a/test/stdout/0555
+++ b/test/stdout/0555
@@ -1,4 +1,5 @@
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\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 test\r

 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r


@@ -7,6 +8,7 @@
 550 recipient(s).\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
 550 recipient(s).\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 test\r

 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r

diff --git a/test/stdout/0561 b/test/stdout/0561
index d37cc1aa02d6ad33aaf28be3bef97a984bf734f0..f83fd5b80d89b26ff3d34ae8069683dcbfbc3df3 100644 (file)
--- a/test/stdout/0561
+++ b/test/stdout/0561
@@ -1,4 +1,5 @@
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\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 test\r

 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r


@@ -9,6 +10,7 @@
 250 OK id=10HmaY-0005vi-00\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 OK id=10HmaY-0005vi-00\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 test\r

 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r

diff --git a/test/stdout/0565 b/test/stdout/0565
index 5433ba49dcbe3eeed6b00c55cc5fa517da2b717a..bb366149e368f3fad9d24456bc51346ea934bde0 100644 (file)
--- a/test/stdout/0565
+++ b/test/stdout/0565
@@ -1,10 +1,12 @@
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\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 test\r

 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
 250 OK id=10HmaX-0005vi-00\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 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
 250 OK id=10HmaX-0005vi-00\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 test\r

 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r


@@ -24,7 +26,8 @@ RCPT TO:<x@y>
 250 Receiver OK
 DATA
 354 Send it
 250 Receiver OK
 DATA
 354 Send it

-Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
+Received: from CALLER (helo=test)
+       by myhost.test.ex with local-smtp (Exim x.yz)

        (envelope-from <CALLER@myhost.test.ex>)
        id 10HmaX-0005vi-00
        for x@y;
        (envelope-from <CALLER@myhost.test.ex>)
        id 10HmaX-0005vi-00
        for x@y;


@@ -54,7 +57,8 @@ RCPT TO:<x@test.ex>
 250 Receiver OK
 DATA
 354 Send it
 250 Receiver OK
 DATA
 354 Send it

-Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
+Received: from CALLER (helo=test)
+       by myhost.test.ex with local-smtp (Exim x.yz)

        (envelope-from <CALLER@myhost.test.ex>)
        id 10HmaY-0005vi-00
        for x@test.ex;
        (envelope-from <CALLER@myhost.test.ex>)
        id 10HmaY-0005vi-00
        for x@test.ex;

diff --git a/test/stdout/0567 b/test/stdout/0567
index 7d79c1ec75100b5924c42c66d0a55615dedacaad..c6d6c25a01744b30a28a5b48fcb9aabcfbf025fa 100644 (file)
--- a/test/stdout/0567
+++ b/test/stdout/0567
@@ -1,4 +1,5 @@
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\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 test\r

 250 OK\r
 250 Accepted\r
 550 Administrative prohibition\r
 250 OK\r
 250 Accepted\r
 550 Administrative prohibition\r

diff --git a/test/stdout/0569 b/test/stdout/0569
index 9d825581c89b2dbbce56383f35d493807a1d8cd6..d227953f232fba64bcdc06b01dc8bad8ba50274c 100644 (file)
--- a/test/stdout/0569
+++ b/test/stdout/0569
@@ -4,6 +4,7 @@
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r

+250 myhost.test.ex Hello test [V4NET.10.10.10]\r

 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r


@@ -18,6 +19,7 @@
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r

+250 myhost.test.ex Hello test [V4NET.10.10.10]\r

 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r


@@ -29,6 +31,7 @@
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r

+250 myhost.test.ex Hello test [V4NET.10.10.10]\r

 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r


@@ -40,6 +43,7 @@
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r

+250 myhost.test.ex Hello test [V4NET.10.10.10]\r

 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r


@@ -51,6 +55,7 @@
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r

+250 myhost.test.ex Hello test [V4NET.10.10.10]\r

 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r


@@ -65,6 +70,7 @@
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r

+250 myhost.test.ex Hello test [V4NET.10.10.10]\r

 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r

diff --git a/test/stdout/0575 b/test/stdout/0575
index d7ad1f32412ce33f2aa9b362e982b701d679348d..60c7174712b203484d2ce832f092338519d8683e 100644 (file)
--- a/test/stdout/0575
+++ b/test/stdout/0575
@@ -4,6 +4,7 @@
 **** This is not for real!
 
 220 mail.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 **** This is not for real!
 
 220 mail.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r

+250 mail.test.ex Hello test [V4NET.0.0.0]\r

 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r

diff --git a/test/stdout/0576 b/test/stdout/0576
index 0a0e014eeb77708025b6366c2e0af22800151968..48e29b7614d24f005012acc06a3970f297b5a137 100644 (file)
--- a/test/stdout/0576
+++ b/test/stdout/0576
@@ -1,4 +1,5 @@
 220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r

+250 the.local.host.name Hello CALLER at test\r

 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r


@@ -18,12 +19,14 @@
           alternate@test.ex
 
 220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
           alternate@test.ex
 
 220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r

+250 the.local.host.name Hello CALLER at test\r

 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
 250 OK id=10HmaZ-0005vi-00\r
 221 the.local.host.name closing connection\r
 220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
 250 OK id=10HmaZ-0005vi-00\r
 221 the.local.host.name closing connection\r
 220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r

+250 the.local.host.name Hello CALLER at test\r

 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r


@@ -31,6 +34,7 @@
 221 the.local.host.name closing connection\r
 ### load messages
 220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 221 the.local.host.name closing connection\r
 ### load messages
 220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r

+250 the.local.host.name Hello CALLER at test\r

 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r

diff --git a/test/stdout/0578 b/test/stdout/0578
index d3089e7e472b6ca47d4a2514ac6a0d3f454b58b5..42bc52d0b28fb871990c4953f7c1e2ea45b4a619 100644 (file)
--- a/test/stdout/0578
+++ b/test/stdout/0578
@@ -1,16 +1,20 @@
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r

+250 myhost.test.ex Hello root at test [V4NET.0.0.1]\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 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 root at test [V4NET.0.0.1]\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 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 root at test [V4NET.0.0.1]\r

 250 OK\r
 451 Could not complete sender verify callout\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 OK\r
 451 Could not complete sender verify callout\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 root at test [V4NET.0.0.1]\r

 250 OK\r
 550-Verification failed for <bad@localhost>\r
 550-Called:   127.0.0.1\r
 250 OK\r
 550-Verification failed for <bad@localhost>\r
 550-Called:   127.0.0.1\r


@@ -19,12 +23,14 @@
 550 Sender verify failed\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
 550 Sender verify failed\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 root at test [V4NET.0.0.1]\r

 250 OK\r
 550-Verification failed for <bad@localhost>\r
 550-Previous (cached) callout verification failure\r
 550 Sender verify failed\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 OK\r
 550-Verification failed for <bad@localhost>\r
 550-Previous (cached) callout verification failure\r
 550 Sender verify failed\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 root at test [V4NET.0.0.1]\r

 250 OK\r
 550-Callback setup failed while verifying <ok@localhost>\r
 550-Called:   127.0.0.1\r
 250 OK\r
 550-Callback setup failed while verifying <ok@localhost>\r
 550-Called:   127.0.0.1\r


@@ -38,6 +44,7 @@
 550 Sender verify failed\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
 550 Sender verify failed\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 root at test [V4NET.0.0.1]\r

 250 OK\r
 550-Callback setup failed while verifying <ok@localhost>\r
 550-(result of an earlier callout reused).\r
 250 OK\r
 550-Callback setup failed while verifying <ok@localhost>\r
 550-(result of an earlier callout reused).\r


@@ -49,6 +56,7 @@
 550 Sender verify failed\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
 550 Sender verify failed\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 root at test [V4NET.0.0.2]\r

 250 OK\r
 550-Postmaster verification failed while checking <ok@otherhost>\r
 550-Called:   127.0.0.1\r
 250 OK\r
 550-Postmaster verification failed while checking <ok@otherhost>\r
 550-Called:   127.0.0.1\r


@@ -60,6 +68,7 @@
 550 Sender verify failed\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
 550 Sender verify failed\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 root at test [V4NET.0.0.2]\r

 250 OK\r
 550-Postmaster verification failed while checking <ok@otherhost>\r
 550-(result of earlier verification reused).\r
 250 OK\r
 550-Postmaster verification failed while checking <ok@otherhost>\r
 550-(result of earlier verification reused).\r


@@ -69,82 +78,101 @@
 550 Sender verify failed\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
 550 Sender verify failed\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 root at test [V4NET.0.0.2]\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 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 root at test [V4NET.0.0.2]\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 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 root at test [V4NET.0.0.3]\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 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 root at test [V4NET.0.0.3]\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 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 root at test [V4NET.0.0.4]\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 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 root at test [V4NET.0.0.4]\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 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 root at test [V4NET.0.0.4]\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 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 root at test [V4NET.0.0.4]\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 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 root at test [V4NET.0.0.2]\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 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 root at test [V4NET.0.0.2]\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 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 root at test [V4NET.0.0.3]\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 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 root at test [V4NET.0.0.3]\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 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 root at test [V4NET.0.0.3]\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 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 root at test [V4NET.0.0.5]\r

 250 OK\r
 451 Could not complete sender verify callout\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 OK\r
 451 Could not complete sender verify callout\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 root at test [V4NET.0.0.6]\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 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 root at test [V4NET.0.0.7]\r

 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
 250 OK id=10HmaX-0005vi-00\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 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
 250 OK id=10HmaX-0005vi-00\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 root at test [V4NET.0.0.8]\r

 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
 250 OK id=10HmaY-0005vi-00\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 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
 250 OK id=10HmaY-0005vi-00\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 root at test [V4NET.0.0.9]\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 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 root at test [V4NET.0.0.10]\r

 250 OK\r
 250 Accepted\r
 221 myhost.test.ex closing connection\r
 250 OK\r
 250 Accepted\r
 221 myhost.test.ex closing connection\r

diff --git a/test/stdout/0580 b/test/stdout/0580
index 5d3d0bd04c75452ae46d793db7611c896d46db57..d9e7b18a30d275f202dc89d718a6ad1b9dae72a7 100644 (file)
--- a/test/stdout/0580
+++ b/test/stdout/0580
@@ -1,10 +1,12 @@
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\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 test\r

 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
 250 OK id=10HmaX-0005vi-00\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 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
 250 OK id=10HmaX-0005vi-00\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 test\r

 250 OK\r
 250 Accepted\r
 250 Accepted\r
 250 OK\r
 250 Accepted\r
 250 Accepted\r


@@ -12,6 +14,7 @@
 250 OK id=10HmaY-0005vi-00\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 OK id=10HmaY-0005vi-00\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 test\r

 250 OK\r
 250 Accepted\r
 250 Accepted\r
 250 OK\r
 250 Accepted\r
 250 Accepted\r


@@ -19,6 +22,7 @@
 250 OK id=10HmaZ-0005vi-00\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 OK id=10HmaZ-0005vi-00\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 test\r

 250 OK\r
 250 Accepted\r
 250 Accepted\r
 250 OK\r
 250 Accepted\r
 250 Accepted\r


@@ -26,6 +30,7 @@
 250 OK id=10HmbA-0005vi-00\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 OK id=10HmbA-0005vi-00\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 test\r

 250 OK\r
 250 Accepted\r
 250 Accepted\r
 250 OK\r
 250 Accepted\r
 250 Accepted\r


@@ -45,7 +50,8 @@ RCPT TO:<usery@test.ex>
 250 OK
 DATA
 354 hit me
 250 OK
 DATA
 354 hit me

-Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
+Received: from CALLER (helo=test)
+       by myhost.test.ex with local-smtp (Exim x.yz)

        (envelope-from <CALLER@myhost.test.ex>)
        id 10HmaX-0005vi-00
        for usery@test.ex;
        (envelope-from <CALLER@myhost.test.ex>)
        id 10HmaX-0005vi-00
        for usery@test.ex;


@@ -86,7 +92,8 @@ RCPT TO:<usery2@test.ex>
 250 OK
 DATA
 354 hit me
 250 OK
 DATA
 354 hit me

-Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
+Received: from CALLER (helo=test)
+       by myhost.test.ex with local-smtp (Exim x.yz)

        (envelope-from <CALLER@myhost.test.ex>)
        id 10HmaY-0005vi-00;
        Tue, 2 Mar 1999 09:44:33 +0000
        (envelope-from <CALLER@myhost.test.ex>)
        id 10HmaY-0005vi-00;
        Tue, 2 Mar 1999 09:44:33 +0000


@@ -126,7 +133,8 @@ RCPT TO:<usery@test.ex>
 250 OK
 DATA
 354 hit me
 250 OK
 DATA
 354 hit me

-Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
+Received: from CALLER (helo=test)
+       by myhost.test.ex with local-smtp (Exim x.yz)

        (envelope-from <CALLER@myhost.test.ex>)
        id 10HmaZ-0005vi-00;
        Tue, 2 Mar 1999 09:44:33 +0000
        (envelope-from <CALLER@myhost.test.ex>)
        id 10HmaZ-0005vi-00;
        Tue, 2 Mar 1999 09:44:33 +0000


@@ -154,7 +162,8 @@ RCPT TO:<usery5@test.ex>
 250 OK
 DATA
 354 hit me
 250 OK
 DATA
 354 hit me

-Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
+Received: from CALLER (helo=test)
+       by myhost.test.ex with local-smtp (Exim x.yz)

        (envelope-from <CALLER@myhost.test.ex>)
        id 10HmbA-0005vi-00;
        Tue, 2 Mar 1999 09:44:33 +0000
        (envelope-from <CALLER@myhost.test.ex>)
        id 10HmbA-0005vi-00;
        Tue, 2 Mar 1999 09:44:33 +0000


@@ -180,7 +189,8 @@ RCPT TO:<remote@test.ex>
 250 OK
 DATA
 354 hit me
 250 OK
 DATA
 354 hit me

-Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
+Received: from CALLER (helo=test)
+       by myhost.test.ex with local-smtp (Exim x.yz)

        (envelope-from <CALLER@myhost.test.ex>)
        id 10HmbB-0005vi-00;
        Tue, 2 Mar 1999 09:44:33 +0000
        (envelope-from <CALLER@myhost.test.ex>)
        id 10HmbB-0005vi-00;
        Tue, 2 Mar 1999 09:44:33 +0000

diff --git a/test/stdout/0584 b/test/stdout/0584
index 620e8f89fc3123f82906f177d5ad502f52ec2157..c18ad738345dcc6940ea7344e8e6e8855b6489d2 100644 (file)
--- a/test/stdout/0584
+++ b/test/stdout/0584
@@ -4,6 +4,7 @@
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r

+250 myhost.test.ex Hello test [127.0.0.1]\r

 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r


@@ -18,6 +19,7 @@
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r

+250 myhost.test.ex Hello test [127.0.0.1]\r

 250 OK\r
 550-Verification failed for <fail@test.ex>\r
 550-Unrouteable address\r
 250 OK\r
 550-Verification failed for <fail@test.ex>\r
 550-Unrouteable address\r


@@ -29,6 +31,7 @@
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r

+250 myhost.test.ex Hello test [127.0.0.1]\r

 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r

diff --git a/test/stdout/0585 b/test/stdout/0585
index 9c896e3e6b7b1690fbfc3297610593b0bb12465d..d2d019135200b68965edc18ecf44a1227fb1fff7 100644 (file)
--- a/test/stdout/0585
+++ b/test/stdout/0585
@@ -1,4 +1,5 @@
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\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 test\r

 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r


@@ -6,6 +7,7 @@
 221 myhost.test.ex closing connection\r
 ### Reject: no match
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 221 myhost.test.ex closing connection\r
 ### Reject: no match
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r

+250 myhost.test.ex Hello CALLER at test\r

 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r


@@ -13,6 +15,7 @@
 221 myhost.test.ex closing connection\r
 ### Reject, with specific SMTP message
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 221 myhost.test.ex closing connection\r
 ### Reject, with specific SMTP message
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r

+250 myhost.test.ex Hello CALLER at test\r

 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r


@@ -20,6 +23,7 @@
 221 myhost.test.ex closing connection\r
 ### Accept, matches in header CC:
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 221 myhost.test.ex closing connection\r
 ### Accept, matches in header CC:
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r

+250 myhost.test.ex Hello CALLER at test\r

 250 OK\r
 250 Accepted\r
 250 Accepted\r
 250 OK\r
 250 Accepted\r
 250 Accepted\r


@@ -28,6 +32,7 @@
 221 myhost.test.ex closing connection\r
 ### Reject: To: & CC: combo, an env rcpt missing
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 221 myhost.test.ex closing connection\r
 ### Reject: To: & CC: combo, an env rcpt missing
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r

+250 myhost.test.ex Hello CALLER at test\r

 250 OK\r
 250 Accepted\r
 250 Accepted\r
 250 OK\r
 250 Accepted\r
 250 Accepted\r


@@ -37,6 +42,7 @@
 221 myhost.test.ex closing connection\r
 ### Accept: Resent-To: & Resent-CC: combo
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 221 myhost.test.ex closing connection\r
 ### Accept: Resent-To: & Resent-CC: combo
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r

+250 myhost.test.ex Hello CALLER at test\r

 250 OK\r
 250 Accepted\r
 250 Accepted\r
 250 OK\r
 250 Accepted\r
 250 Accepted\r

diff --git a/test/stdout/0593 b/test/stdout/0593
index 2b1941f588598f1cdeb0ebf39d85a2c185ef6740..cb29f0f7c23f0298647d2465388b3de4e85c883f 100644 (file)
--- a/test/stdout/0593
+++ b/test/stdout/0593
@@ -1,10 +1,12 @@
 220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r

+250 the.local.host.name Hello CALLER at test\r

 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
 250 OK id=10HmaX-0005vi-00\r
 221 the.local.host.name closing connection\r
 220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
 250 OK id=10HmaX-0005vi-00\r
 221 the.local.host.name closing connection\r
 220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r

+250 the.local.host.name Hello CALLER at test\r

 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r

diff --git a/test/stdout/0596 b/test/stdout/0596
index 1c945590566e046df6c1634c3de0393cfe109623..77a8333948d9214dfdeae6abbd206aaf7cd123ba 100644 (file)
--- a/test/stdout/0596
+++ b/test/stdout/0596
@@ -1,4 +1,5 @@
 220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r

+250 the.local.host.name Hello CALLER at test\r

 250 OK\r
 250 Accepted\r
 250 Accepted\r
 250 OK\r
 250 Accepted\r
 250 Accepted\r


@@ -6,6 +7,7 @@
 250 OK id=10HmaX-0005vi-00\r
 221 the.local.host.name closing connection\r
 220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 250 OK id=10HmaX-0005vi-00\r
 221 the.local.host.name closing connection\r
 220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r

+250 the.local.host.name Hello CALLER at test\r

 250 OK\r
 250 Accepted\r
 250 Accepted\r
 250 OK\r
 250 Accepted\r
 250 Accepted\r

diff --git a/test/stdout/0599 b/test/stdout/0599
index 3c2710ecfa6091ee35b7777f96197d4e482a9fb5..c1737463c7122981828fe03c942aecfd99923916 100644 (file)
--- a/test/stdout/0599
+++ b/test/stdout/0599
@@ -1,4 +1,5 @@
 220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r

+250 the.local.host.name Hello CALLER at test\r

 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r

diff --git a/test/stdout/0600 b/test/stdout/0600
index 2b1941f588598f1cdeb0ebf39d85a2c185ef6740..cb29f0f7c23f0298647d2465388b3de4e85c883f 100644 (file)
--- a/test/stdout/0600
+++ b/test/stdout/0600
@@ -1,10 +1,12 @@
 220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r

+250 the.local.host.name Hello CALLER at test\r

 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
 250 OK id=10HmaX-0005vi-00\r
 221 the.local.host.name closing connection\r
 220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
 250 OK id=10HmaX-0005vi-00\r
 221 the.local.host.name closing connection\r
 220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r

+250 the.local.host.name Hello CALLER at test\r

 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r

diff --git a/test/stdout/0607 b/test/stdout/0607
index 47285d74a9ff4edfae9afb4ba864242c817841d7..1552847589329369797b0379772d62650e2cf1a5 100644 (file)
--- a/test/stdout/0607
+++ b/test/stdout/0607
@@ -1,4 +1,5 @@
 220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r

+250 the.local.host.name Hello CALLER at test\r

 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r

diff --git a/test/stdout/0609 b/test/stdout/0609
index 8ebf9a24faf39eaa45c64dbb76fe8dd0cfcb29e8..ebda39972be12ed9b384d0399b9b06a7b80760e8 100644 (file)
--- a/test/stdout/0609
+++ b/test/stdout/0609
@@ -1,6 +1,9 @@
 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
 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

+>>> helo test
+??? 250
+<<< 250 myhost.test.ex Hello test [127.0.0.1]

 >>> mail from:<x@y.test.ex>
 ??? 250
 <<< 250 OK
 >>> mail from:<x@y.test.ex>
 ??? 250
 <<< 250 OK


@@ -14,6 +17,9 @@ 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
 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

+>>> helo test
+??? 250
+<<< 250 myhost.test.ex Hello test [127.0.0.1]

 >>> mail from:<x@y.test.ex>
 ??? 250
 <<< 250 OK
 >>> mail from:<x@y.test.ex>
 ??? 250
 <<< 250 OK

diff --git a/test/stdout/0610 b/test/stdout/0610
index 7fceba939061cd5a74381a6201a2eb3f0cc30930..6b1d7a7104eb86c4f2f511abd88b047d04a44169 100644 (file)
--- a/test/stdout/0610
+++ b/test/stdout/0610
@@ -1,4 +1,5 @@
 220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r

+250 the.local.host.name Hello CALLER at test\r

 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r

diff --git a/test/stdout/0614 b/test/stdout/0614
index ee9b665a1fbced8595c6680283928ff0a969c026..e9cae83a40dd96f4b0f9cce36f751dfd1e88647f 100644 (file)
--- a/test/stdout/0614
+++ b/test/stdout/0614
@@ -1,4 +1,5 @@
 220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r

+250 the.local.host.name Hello CALLER at test\r

 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r

diff --git a/test/stdout/0615 b/test/stdout/0615
index a6da43d1d286d18823562363addca47e44e87c61..b0423fe2f312f1a5a2d3a16e5d05695552aa121e 100644 (file)
--- a/test/stdout/0615
+++ b/test/stdout/0615
@@ -1,4 +1,5 @@
 220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r

+250 the.local.host.name Hello CALLER at test\r

 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r

diff --git a/test/stdout/1002 b/test/stdout/1002
index 09717129e02cefbaaf2ba9805e1484a240b2f7b4..a5ab7a12b8e25b54f70d378c7811d1f9e7ea880c 100644 (file)
--- a/test/stdout/1002
+++ b/test/stdout/1002
@@ -4,6 +4,7 @@
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r

+250 myhost.test.ex Hello test [V4NET.1.1.1]\r

 250 OK\r
 250 Accepted\r
 550 domain doesn't match @mx_any/ignore=<;127.0.0.1;::1\r
 250 OK\r
 250 Accepted\r
 550 domain doesn't match @mx_any/ignore=<;127.0.0.1;::1\r

diff --git a/test/stdout/1103 b/test/stdout/1103
index df5777d7505def2b95c34a884225b03f7db5133a..717be0d36ff1cbc56d79c5d7f8e1d566bfa0982c 100644 (file)
--- a/test/stdout/1103
+++ b/test/stdout/1103
@@ -19,6 +19,17 @@ Connecting to ip4.ip4.ip4.ip4 port 1225 ... connected
 <<< 220 TLS go ahead
 Attempting to start TLS
 Succeeded in starting TLS
 <<< 220 TLS go ahead
 Attempting to start TLS
 Succeeded in starting TLS

+>>> ehlo test
+??? 250-
+<<< 250-myhost.test.ex Hello test [ip4.ip4.ip4.ip4]
+??? 250-
+<<< 250-SIZE 52428800
+??? 250-
+<<< 250-8BITMIME
+??? 250-
+<<< 250-PIPELINING
+??? 250
+<<< 250 HELP

 >>> mail from:<userx@test.ex>
 ??? 250
 <<< 250 OK
 >>> mail from:<userx@test.ex>
 ??? 250
 <<< 250 OK

diff --git a/test/stdout/1105 b/test/stdout/1105
index 7a0430c109bbc3b270e25510d56d43a4da3115a2..39f8610c21fa2043f2fe8291e841e60799d02247 100644 (file)
--- a/test/stdout/1105
+++ b/test/stdout/1105
@@ -1,6 +1,9 @@
 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
 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

+>>> helo test
+??? 250
+<<< 250 myhost.test.ex Hello test [127.0.0.1]

 >>> mail from:<userx@test.ex>
 ??? 250
 <<< 250 OK
 >>> mail from:<userx@test.ex>
 ??? 250
 <<< 250 OK


@@ -25,6 +28,17 @@ Connecting to 127.0.0.1 port 1225 ... connected
 <<< 220 TLS go ahead
 Attempting to start TLS
 Succeeded in starting TLS
 <<< 220 TLS go ahead
 Attempting to start TLS
 Succeeded in starting TLS

+>>> ehlo rhu.barb
+??? 250-
+<<< 250-myhost.test.ex Hello rhu.barb [127.0.0.1]
+??? 250-
+<<< 250-SIZE 52428800
+??? 250-
+<<< 250-8BITMIME
+??? 250-
+<<< 250-PIPELINING
+??? 250
+<<< 250 HELP

 >>> mail from:<userx@test.ex>
 ??? 250
 <<< 250 OK
 >>> mail from:<userx@test.ex>
 ??? 250
 <<< 250 OK

diff --git a/test/stdout/1108 b/test/stdout/1108
index c7a0df4c43fbb319dc71be636622cbc8117bcf4e..14e05d71dba57215c1b6512b24e121ea889c7560 100644 (file)
--- a/test/stdout/1108
+++ b/test/stdout/1108
@@ -19,6 +19,17 @@ Connecting to 127.0.0.1 port 1225 ... connected
 <<< 220 TLS go ahead
 Attempting to start TLS
 Succeeded in starting TLS
 <<< 220 TLS go ahead
 Attempting to start TLS
 Succeeded in starting TLS

+>>> ehlo rhu.barb
+??? 250-
+<<< 250-myhost.test.ex Hello rhu.barb [127.0.0.1]
+??? 250-
+<<< 250-SIZE 52428800
+??? 250-
+<<< 250-8BITMIME
+??? 250-
+<<< 250-PIPELINING
+??? 250
+<<< 250 HELP

 >>> mail from:<userx@test.ex>
 ??? 250
 <<< 250 OK
 >>> mail from:<userx@test.ex>
 ??? 250
 <<< 250 OK

diff --git a/test/stdout/1110 b/test/stdout/1110
index 27f78bd482fdc3b7822861188499c4b20c383a1f..2a896e50c5a8b04292c086452cf14ff311be9d2e 100644 (file)
--- a/test/stdout/1110
+++ b/test/stdout/1110
@@ -38,6 +38,9 @@ Attempting to start TLS
 Succeeded in starting TLS
 ??? 220
 <<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
 Succeeded in starting TLS
 ??? 220
 <<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000

+>>> helo test
+??? 250
+<<< 250 myhost.test.ex Hello test [ip4.ip4.ip4.ip4]

 >>> mail from:<userx@test.ex>
 ??? 250
 <<< 250 OK
 >>> mail from:<userx@test.ex>
 ??? 250
 <<< 250 OK

diff --git a/test/stdout/2002 b/test/stdout/2002
index 276c903e6ace01e4154678b103eb19736397cb82..58621f209ffc439c7055d7e188b86bd169e53bef 100644 (file)
--- a/test/stdout/2002
+++ b/test/stdout/2002
@@ -19,6 +19,17 @@ Connecting to 127.0.0.1 port 1225 ... connected
 <<< 220 TLS go ahead
 Attempting to start TLS
 Succeeded in starting TLS
 <<< 220 TLS go ahead
 Attempting to start TLS
 Succeeded in starting TLS

+>>> ehlo rhu.barb
+??? 250-
+<<< 250-myhost.test.ex Hello rhu.barb [127.0.0.1]
+??? 250-
+<<< 250-SIZE 52428800
+??? 250-
+<<< 250-8BITMIME
+??? 250-
+<<< 250-PIPELINING
+??? 250
+<<< 250 HELP

 >>> mail from:<CALLER@test.ex>
 ??? 250
 <<< 250 OK
 >>> mail from:<CALLER@test.ex>
 ??? 250
 <<< 250 OK


@@ -57,6 +68,9 @@ Connecting to 127.0.0.1 port 1225 ... connected
 <<< 220 TLS go ahead
 Attempting to start TLS
 Succeeded in starting TLS
 <<< 220 TLS go ahead
 Attempting to start TLS
 Succeeded in starting TLS

+>>> helo test
+??? 250
+<<< 250 myhost.test.ex Hello test [127.0.0.1]

 >>> mail from:<"name with spaces"@test.ex>
 ??? 250
 <<< 250 OK
 >>> mail from:<"name with spaces"@test.ex>
 ??? 250
 <<< 250 OK


@@ -123,6 +137,9 @@ Key file = TESTSUITE/aux-fixed/exim-ca/example.com/server2.example.com/server2.e
 <<< 220 TLS go ahead
 Attempting to start TLS
 Succeeded in starting TLS
 <<< 220 TLS go ahead
 Attempting to start TLS
 Succeeded in starting TLS

+>>> helo test
+??? 250
+<<< 250 myhost.test.ex Hello test [ip4.ip4.ip4.ip4]

 >>> mail from:<CALLER@test.ex>
 ??? 250
 <<< 250 OK
 >>> mail from:<CALLER@test.ex>
 ??? 250
 <<< 250 OK


@@ -161,6 +178,9 @@ Connecting to 127.0.0.1 port 1225 ... connected
 <<< 220 TLS go ahead
 Attempting to start TLS
 Succeeded in starting TLS
 <<< 220 TLS go ahead
 Attempting to start TLS
 Succeeded in starting TLS

+>>> helo test
+??? 250
+<<< 250 myhost.test.ex Hello test [127.0.0.1]

 >>> mail from:<CALLER@test.ex>
 ??? 250
 <<< 250 OK
 >>> mail from:<CALLER@test.ex>
 ??? 250
 <<< 250 OK


@@ -200,6 +220,9 @@ Connecting to 127.0.0.1 port 1225 ... connected
 <<< 220 TLS go ahead
 Attempting to start TLS
 Succeeded in starting TLS
 <<< 220 TLS go ahead
 Attempting to start TLS
 Succeeded in starting TLS

+>>> helo test
+??? 250
+<<< 250 myhost.test.ex Hello test [127.0.0.1]

 >>> mail from:<CALLER@test.ex>
 ??? 250
 <<< 250 OK
 >>> mail from:<CALLER@test.ex>
 ??? 250
 <<< 250 OK

diff --git a/test/stdout/2014 b/test/stdout/2014
index 829a86c427518b75d430ac724a18532d17fc8ad7..4eddd724cf0d249e011a14c3be601c0ec626f596 100644 (file)
--- a/test/stdout/2014
+++ b/test/stdout/2014
@@ -83,6 +83,9 @@ Key file = aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com
 <<< 220 TLS go ahead
 Attempting to start TLS
 Succeeded in starting TLS
 <<< 220 TLS go ahead
 Attempting to start TLS
 Succeeded in starting TLS

+>>> helo test
+??? 250
+<<< 250 myhost.test.ex Hello test [ip4.ip4.ip4.ip4]

 >>> mail from:<userx@test.ex>
 ??? 250
 <<< 250 OK
 >>> mail from:<userx@test.ex>
 ??? 250
 <<< 250 OK


@@ -117,6 +120,9 @@ Key file = aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com
 <<< 220 TLS go ahead
 Attempting to start TLS
 Succeeded in starting TLS
 <<< 220 TLS go ahead
 Attempting to start TLS
 Succeeded in starting TLS

+>>> helo test
+??? 250
+<<< 250 myhost.test.ex Hello test [127.0.0.1]

 >>> mail from:<userx@test.ex>
 ??? 250
 <<< 250 OK
 >>> mail from:<userx@test.ex>
 ??? 250
 <<< 250 OK


@@ -179,6 +185,9 @@ Key file = aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net
 <<< 220 TLS go ahead
 Attempting to start TLS
 Succeeded in starting TLS
 <<< 220 TLS go ahead
 Attempting to start TLS
 Succeeded in starting TLS

+>>> helo test
+??? 250
+<<< 250 myhost.test.ex Hello test [127.0.0.1]

 >>> mail from:<userx@test.ex>
 ??? 250
 <<< 250 OK
 >>> mail from:<userx@test.ex>
 ??? 250
 <<< 250 OK


@@ -214,7 +223,7 @@ Key file = aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.c
 Attempting to start TLS
 A TLS fatal alert has been received.
 Failed to start TLS
 Attempting to start TLS
 A TLS fatal alert has been received.
 Failed to start TLS

->>> mail from:<userx@test.ex>
+>>> helo test

 ??? 554
 <<< 554 Security failure
 End of script
 ??? 554
 <<< 554 Security failure
 End of script


@@ -242,6 +251,9 @@ Key file = aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.c
 <<< 220 TLS go ahead
 Attempting to start TLS
 Succeeded in starting TLS
 <<< 220 TLS go ahead
 Attempting to start TLS
 Succeeded in starting TLS

+>>> helo test
+??? 250
+<<< 250 myhost.test.ex Hello test [127.0.0.1]

 >>> mail from:<userx@test.ex>
 ??? 250
 <<< 250 OK
 >>> mail from:<userx@test.ex>
 ??? 250
 <<< 250 OK


@@ -276,6 +288,9 @@ Key file = aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com
 <<< 220 TLS go ahead
 Attempting to start TLS
 Succeeded in starting TLS
 <<< 220 TLS go ahead
 Attempting to start TLS
 Succeeded in starting TLS

+>>> helo test
+??? 250
+<<< 250 myhost.test.ex Hello test [ip4.ip4.ip4.ip4]

 >>> mail from:<userx@test.ex>
 ??? 250
 <<< 250 OK
 >>> mail from:<userx@test.ex>
 ??? 250
 <<< 250 OK

diff --git a/test/stdout/2029 b/test/stdout/2029
index 28be7c4215ba77b75345a7106eabb0eb950e488e..f2108b65d95c96959eb8f71d1576be3f78e2ea22 100644 (file)
--- a/test/stdout/2029
+++ b/test/stdout/2029
@@ -19,6 +19,9 @@ Connecting to 127.0.0.1 port 1225 ... connected
 <<< 220 TLS go ahead
 Attempting to start TLS
 Succeeded in starting TLS
 <<< 220 TLS go ahead
 Attempting to start TLS
 Succeeded in starting TLS

+>>> helo test
+??? 250
+<<< 250 myhost.test.ex Hello test [127.0.0.1]

 >>> mail from:<userx@test.ex>
 ??? 250
 <<< 250 OK
 >>> mail from:<userx@test.ex>
 ??? 250
 <<< 250 OK

diff --git a/test/stdout/2102 b/test/stdout/2102
index ecd88c6e3cb59f65609ea7907a84afbddc8727f0..4706a692d144a8faa10757cefa9e7ea5ae5df7e5 100644 (file)
--- a/test/stdout/2102
+++ b/test/stdout/2102
@@ -19,6 +19,17 @@ Connecting to 127.0.0.1 port 1225 ... connected
 <<< 220 TLS go ahead
 Attempting to start TLS
 Succeeded in starting TLS
 <<< 220 TLS go ahead
 Attempting to start TLS
 Succeeded in starting TLS

+>>> ehlo rhu.barb
+??? 250-
+<<< 250-myhost.test.ex Hello rhu.barb [127.0.0.1]
+??? 250-
+<<< 250-SIZE 52428800
+??? 250-
+<<< 250-8BITMIME
+??? 250-
+<<< 250-PIPELINING
+??? 250
+<<< 250 HELP

 >>> mail from:<a@test.ex>
 ??? 250
 <<< 250 OK
 >>> mail from:<a@test.ex>
 ??? 250
 <<< 250 OK


@@ -57,6 +68,17 @@ Connecting to 127.0.0.1 port 1225 ... connected
 <<< 220 TLS go ahead
 Attempting to start TLS
 Succeeded in starting TLS
 <<< 220 TLS go ahead
 Attempting to start TLS
 Succeeded in starting TLS

+>>> ehlo rhu.barb
+??? 250-
+<<< 250-myhost.test.ex Hello rhu.barb [127.0.0.1]
+??? 250-
+<<< 250-SIZE 52428800
+??? 250-
+<<< 250-8BITMIME
+??? 250-
+<<< 250-PIPELINING
+??? 250
+<<< 250 HELP

 >>> mail from:<"name with spaces"@test.ex>
 ??? 250
 <<< 250 OK
 >>> mail from:<"name with spaces"@test.ex>
 ??? 250
 <<< 250 OK


@@ -124,6 +146,17 @@ Key file = TESTSUITE/aux-fixed/exim-ca/example.com/server2.example.com/server2.e
 <<< 220 TLS go ahead
 Attempting to start TLS
 Succeeded in starting TLS
 <<< 220 TLS go ahead
 Attempting to start TLS
 Succeeded in starting TLS

+>>> ehlo rhu.barb
+??? 250-
+<<< 250-myhost.test.ex Hello rhu.barb [ip4.ip4.ip4.ip4]
+??? 250-
+<<< 250-SIZE 52428800
+??? 250-
+<<< 250-8BITMIME
+??? 250-
+<<< 250-PIPELINING
+??? 250
+<<< 250 HELP

 >>> mail from:<b@test.ex>
 ??? 250
 <<< 250 OK
 >>> mail from:<b@test.ex>
 ??? 250
 <<< 250 OK


@@ -162,6 +195,17 @@ Connecting to 127.0.0.1 port 1225 ... connected
 <<< 220 TLS go ahead
 Attempting to start TLS
 Succeeded in starting TLS
 <<< 220 TLS go ahead
 Attempting to start TLS
 Succeeded in starting TLS

+>>> ehlo rhu.barb
+??? 250-
+<<< 250-myhost.test.ex Hello rhu.barb [127.0.0.1]
+??? 250-
+<<< 250-SIZE 52428800
+??? 250-
+<<< 250-8BITMIME
+??? 250-
+<<< 250-PIPELINING
+??? 250
+<<< 250 HELP

 >>> mail from:<c@test.ex>
 ??? 250
 <<< 250 OK
 >>> mail from:<c@test.ex>
 ??? 250
 <<< 250 OK

diff --git a/test/stdout/2114.openssl_1_1_1 b/test/stdout/2114.openssl_1_1_1
index 215baf965b701bf5b60e81c15641366f027d1f78..a0b9fe33ed914cb89e9eea2a3fb3c47ac2590d03 100644 (file)
--- a/test/stdout/2114.openssl_1_1_1
+++ b/test/stdout/2114.openssl_1_1_1
@@ -92,6 +92,9 @@ Key file = aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com
 <<< 220 TLS go ahead
 Attempting to start TLS
 Succeeded in starting TLS
 <<< 220 TLS go ahead
 Attempting to start TLS
 Succeeded in starting TLS

+>>> helo test
+??? 250
+<<< 250 myhost.test.ex Hello test [ip4.ip4.ip4.ip4]

 >>> mail from:<userx@test.ex>
 ??? 250
 <<< 250 OK
 >>> mail from:<userx@test.ex>
 ??? 250
 <<< 250 OK


@@ -126,6 +129,9 @@ Key file = aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com
 <<< 220 TLS go ahead
 Attempting to start TLS
 Succeeded in starting TLS
 <<< 220 TLS go ahead
 Attempting to start TLS
 Succeeded in starting TLS

+>>> helo test
+??? 250
+<<< 250 myhost.test.ex Hello test [127.0.0.1]

 >>> mail from:<userx@test.ex>
 ??? 250
 <<< 250 OK
 >>> mail from:<userx@test.ex>
 ??? 250
 <<< 250 OK


@@ -192,6 +198,9 @@ Key file = aux-fixed/exim-ca/example.net/server1.example.net/server1.example.net
 <<< 220 TLS go ahead
 Attempting to start TLS
 Succeeded in starting TLS
 <<< 220 TLS go ahead
 Attempting to start TLS
 Succeeded in starting TLS

+>>> helo test
+??? 250
+<<< 250 myhost.test.ex Hello test [127.0.0.1]

 >>> mail from:<userx@test.ex>
 ??? 250
 <<< 250 OK
 >>> mail from:<userx@test.ex>
 ??? 250
 <<< 250 OK


@@ -258,6 +267,9 @@ Key file = aux-fixed/exim-ca/example.com/revoked1.example.com/revoked1.example.c
 <<< 220 TLS go ahead
 Attempting to start TLS
 Succeeded in starting TLS
 <<< 220 TLS go ahead
 Attempting to start TLS
 Succeeded in starting TLS

+>>> helo test
+??? 250
+<<< 250 myhost.test.ex Hello test [127.0.0.1]

 >>> mail from:<userx@test.ex>
 ??? 250
 <<< 250 OK
 >>> mail from:<userx@test.ex>
 ??? 250
 <<< 250 OK


@@ -292,6 +304,9 @@ Key file = aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com
 <<< 220 TLS go ahead
 Attempting to start TLS
 Succeeded in starting TLS
 <<< 220 TLS go ahead
 Attempting to start TLS
 Succeeded in starting TLS

+>>> helo test
+??? 250
+<<< 250 myhost.test.ex Hello test [ip4.ip4.ip4.ip4]

 >>> mail from:<userx@test.ex>
 ??? 250
 <<< 250 OK
 >>> mail from:<userx@test.ex>
 ??? 250
 <<< 250 OK

diff --git a/test/stdout/2132.openssl_1_1_1 b/test/stdout/2132.openssl_1_1_1
index 4421443564532992f6cc4dff1fdf8da93f3ba88c..6327b612a842cb03b751ec04e523c08fcb72e939 100644 (file)
--- a/test/stdout/2132.openssl_1_1_1
+++ b/test/stdout/2132.openssl_1_1_1
@@ -20,6 +20,9 @@ Connecting to 127.0.0.1 port 1225 ... connected
 <<< 220 TLS go ahead
 Attempting to start TLS
 Succeeded in starting TLS
 <<< 220 TLS go ahead
 Attempting to start TLS
 Succeeded in starting TLS

+>>> helo test
+??? 250
+<<< 250 myhost.test.ex Hello test [127.0.0.1]

 >>> mail from:<CALLER@test.ex>
 ??? 250
 <<< 250 OK
 >>> mail from:<CALLER@test.ex>
 ??? 250
 <<< 250 OK


@@ -59,6 +62,9 @@ Connecting to 127.0.0.1 port 1225 ... connected
 <<< 220 TLS go ahead
 Attempting to start TLS
 Succeeded in starting TLS
 <<< 220 TLS go ahead
 Attempting to start TLS
 Succeeded in starting TLS

+>>> helo test
+??? 250
+<<< 250 myhost.test.ex Hello test [127.0.0.1]

 >>> mail from:<"name with spaces"@test.ex>
 ??? 250
 <<< 250 OK
 >>> mail from:<"name with spaces"@test.ex>
 ??? 250
 <<< 250 OK


@@ -130,6 +136,9 @@ Key file = TESTSUITE/aux-fixed/exim-ca/example.com/server1.example.com/server1.e
 <<< 220 TLS go ahead
 Attempting to start TLS
 Succeeded in starting TLS
 <<< 220 TLS go ahead
 Attempting to start TLS
 Succeeded in starting TLS

+>>> helo test
+??? 250
+<<< 250 myhost.test.ex Hello test [ip4.ip4.ip4.ip4]

 >>> mail from:<CALLER@test.ex>
 ??? 250
 <<< 250 OK
 >>> mail from:<CALLER@test.ex>
 ??? 250
 <<< 250 OK

diff --git a/test/stdout/2150 b/test/stdout/2150
index 28be7c4215ba77b75345a7106eabb0eb950e488e..f2108b65d95c96959eb8f71d1576be3f78e2ea22 100644 (file)
--- a/test/stdout/2150
+++ b/test/stdout/2150
@@ -19,6 +19,9 @@ Connecting to 127.0.0.1 port 1225 ... connected
 <<< 220 TLS go ahead
 Attempting to start TLS
 Succeeded in starting TLS
 <<< 220 TLS go ahead
 Attempting to start TLS
 Succeeded in starting TLS

+>>> helo test
+??? 250
+<<< 250 myhost.test.ex Hello test [127.0.0.1]

 >>> mail from:<userx@test.ex>
 ??? 250
 <<< 250 OK
 >>> mail from:<userx@test.ex>
 ??? 250
 <<< 250 OK

diff --git a/test/stdout/2202 b/test/stdout/2202
index bcb3fa2048109ba573b7adef217e3f1a81b2b088..f2bf2f07c8f23697bf75bf7ce0b988a7d1d3a4a0 100644 (file)
--- a/test/stdout/2202
+++ b/test/stdout/2202
@@ -4,6 +4,7 @@
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r

+250 myhost.test.ex Hello test [ip4.ip4.ip4.ip4]\r

 250 OK\r
 550 Administrative prohibition\r
 221 myhost.test.ex closing connection\r
 250 OK\r
 550 Administrative prohibition\r
 221 myhost.test.ex closing connection\r

diff --git a/test/stdout/2600 b/test/stdout/2600
index 0a0a461ceab0bbe185d378e2e9f4f34c4615c517..74422c0daf97de25acc680841045cfa3b41542ae 100644 (file)
--- a/test/stdout/2600
+++ b/test/stdout/2600
@@ -18,6 +18,7 @@ after" id=newline
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r

+250 myhost.test.ex Hello test [10.0.0.0]\r

 250 OK\r
 550 relay not permitted\r
 550 relay not permitted\r
 250 OK\r
 550 relay not permitted\r
 550 relay not permitted\r


@@ -28,6 +29,7 @@ after" id=newline
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r

+250 myhost.test.ex Hello test [10.0.0.0]\r

 250 OK\r
 550 relay not permitted\r
 550 relay not permitted\r
 250 OK\r
 550 relay not permitted\r
 550 relay not permitted\r


@@ -38,6 +40,7 @@ after" id=newline
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r

+250 myhost.test.ex Hello test [10.10.10.10]\r

 250 OK\r
 250 Accepted\r
 250 Accepted\r
 250 OK\r
 250 Accepted\r
 250 Accepted\r

diff --git a/test/stdout/2610 b/test/stdout/2610
index fb89752f54d3bc31c2dd6836cd3f3a513c01ff41..961928b8e1fc324a2f12906d9d372291f7c0c508 100644 (file)
--- a/test/stdout/2610
+++ b/test/stdout/2610
@@ -29,6 +29,7 @@ name=Aristotle id=aaaa
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r

+250 myhost.test.ex Hello test [10.0.0.0]\r

 250 OK\r
 550 relay not permitted\r
 221 myhost.test.ex closing connection\r
 250 OK\r
 550 relay not permitted\r
 221 myhost.test.ex closing connection\r

diff --git a/test/stdout/2620 b/test/stdout/2620
index 8afeec94dae0bace4022ef10f13fe27149a5a350..bbad4d565789111da1b89ba2a86b1dd553e711f6 100644 (file)
--- a/test/stdout/2620
+++ b/test/stdout/2620
@@ -29,6 +29,7 @@ name=Aristotle id=aaaa
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r

+250 myhost.test.ex Hello test [10.0.0.0]\r

 250 OK\r
 550 relay not permitted\r
 550 relay not permitted\r
 250 OK\r
 550 relay not permitted\r
 550 relay not permitted\r

diff --git a/test/stdout/3202 b/test/stdout/3202
index df43ee850bcb3bf17af1685014e392c061b36086..eea6c3c1af6fcc30eded075fdac54850fe9fb25d 100644 (file)
--- a/test/stdout/3202
+++ b/test/stdout/3202
@@ -4,6 +4,7 @@
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r

+250 myhost.test.ex Hello test [1.1.1.1]\r

 250 OK\r
 451 Temporary local problem - please try later\r
 221 myhost.test.ex closing connection\r
 250 OK\r
 451 Temporary local problem - please try later\r
 221 myhost.test.ex closing connection\r


@@ -13,6 +14,7 @@
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r

+250 myhost.test.ex Hello test [1.1.2.1]\r

 250 OK\r
 451 Temporary local problem - please try later\r
 221 myhost.test.ex closing connection\r
 250 OK\r
 451 Temporary local problem - please try later\r
 221 myhost.test.ex closing connection\r


@@ -22,6 +24,7 @@
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r

+250 myhost.test.ex Hello test [1.1.3.1]\r

 250 OK\r
 451 Temporary local problem - please try later\r
 221 myhost.test.ex closing connection\r
 250 OK\r
 451 Temporary local problem - please try later\r
 221 myhost.test.ex closing connection\r

diff --git a/test/stdout/3204 b/test/stdout/3204
index 2af1ddf9a359a656033a2a9d2aaa14c8091b8075..1a62f08623432fc1552866aea9223f85655ceb99 100644 (file)
--- a/test/stdout/3204
+++ b/test/stdout/3204
@@ -4,6 +4,7 @@
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r

+250 myhost.test.ex Hello test [1.2.3.4]\r

 250 OK\r
 451 Temporary local problem - please try later\r
 221 myhost.test.ex closing connection\r
 250 OK\r
 451 Temporary local problem - please try later\r
 221 myhost.test.ex closing connection\r

diff --git a/test/stdout/3205 b/test/stdout/3205
index 2881c1b812326671333292a388583450ba15ae06..6722a0f0cbbe7609af002dd3282fa625ed708a91 100644 (file)
--- a/test/stdout/3205
+++ b/test/stdout/3205
@@ -4,6 +4,7 @@
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r

+250 myhost.test.ex Hello test [1.2.3.4]\r

 250 OK\r
 451 Temporary local problem - please try later\r
 221 myhost.test.ex closing connection\r
 250 OK\r
 451 Temporary local problem - please try later\r
 221 myhost.test.ex closing connection\r


@@ -13,6 +14,7 @@
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r

+250 myhost.test.ex Hello test [4.3.2.1]\r

 250 OK\r
 451 Temporary local problem - please try later\r
 221 myhost.test.ex closing connection\r
 250 OK\r
 451 Temporary local problem - please try later\r
 221 myhost.test.ex closing connection\r

diff --git a/test/stdout/3211 b/test/stdout/3211
index e066078a7d6d3b3528721b26c82ba5d206302312..2adf9be2d538f7a91a4ac4e22b592ba000546701 100644 (file)
--- a/test/stdout/3211
+++ b/test/stdout/3211
@@ -1,4 +1,5 @@
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\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 test\r

 250 OK\r
 451 Temporary local problem - please try later\r
 221 myhost.test.ex closing connection\r
 250 OK\r
 451 Temporary local problem - please try later\r
 221 myhost.test.ex closing connection\r


@@ -8,6 +9,7 @@
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r

+250 myhost.test.ex Hello test [1.2.3.4]\r

 250 OK\r
 451 Temporary local problem - please try later\r
 221 myhost.test.ex closing connection\r
 250 OK\r
 451 Temporary local problem - please try later\r
 221 myhost.test.ex closing connection\r


@@ -17,6 +19,7 @@
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r

+250 myhost.test.ex Hello test [1.2.3.4]\r

 250 OK\r
 451 Temporary local problem - please try later\r
 221 myhost.test.ex closing connection\r
 250 OK\r
 451 Temporary local problem - please try later\r
 221 myhost.test.ex closing connection\r

diff --git a/test/stdout/3400 b/test/stdout/3400
index c57747bdae6a29141b3682704fc96325cac511ed..5efa690dc7d0fc436c7a9d041ef667747dd5a145 100644 (file)
--- a/test/stdout/3400
+++ b/test/stdout/3400
@@ -4,6 +4,7 @@
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r

+250 myhost.test.ex Hello test [10.0.0.2]\r

 250 OK\r
 250 Reset OK\r
 250 <userx@test.ex> is deliverable\r
 250 OK\r
 250 Reset OK\r
 250 <userx@test.ex> is deliverable\r

diff --git a/test/stdout/3410 b/test/stdout/3410
index 5c356db81807d12aec441d24bd28d3a6fa2b8d2f..bc4b2abd3671cd40a20c2ca021e45a909f739589 100644 (file)
--- a/test/stdout/3410
+++ b/test/stdout/3410
@@ -4,6 +4,7 @@
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r

+250 myhost.test.ex Hello test [5.6.9.1]\r

 250 OK\r
 550 You must authenticate\r
 250 Reset OK\r
 250 OK\r
 550 You must authenticate\r
 250 Reset OK\r


@@ -23,6 +24,7 @@
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r

+250 myhost.test.ex Hello test [5.6.10.1]\r

 250 OK\r
 550 Administrative prohibition\r
 250 Reset OK\r
 250 OK\r
 550 Administrative prohibition\r
 250 Reset OK\r

diff --git a/test/stdout/5300 b/test/stdout/5300
index bb3956b69c577f5f483ea65a27a63fbeb9e57efe..1d697e438b837dce1981ace8967b1544c5cf6df9 100644 (file)
--- a/test/stdout/5300
+++ b/test/stdout/5300
@@ -7,6 +7,7 @@ x@[127.0.0.1]
           zz@test.ex
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
           zz@test.ex
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r

+250 myhost.test.ex Hello CALLER at test\r

 250 OK\r
 250 Accepted\r
 250 Accepted\r
 250 OK\r
 250 Accepted\r
 250 Accepted\r

diff --git a/test/stdout/5301 b/test/stdout/5301
index acbcbff58fe85bacb33eb0597ee0135ea7e95b0f..f19818566198b1b219fc09e3d807be98ffa65ea7 100644 (file)
--- a/test/stdout/5301
+++ b/test/stdout/5301
@@ -9,6 +9,7 @@ x@[abcd::dcba]
 x@[IPv6:cba::abc]
   router = r3, transport = t1
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 x@[IPv6:cba::abc]
   router = r3, transport = t1
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r

+250 myhost.test.ex Hello CALLER at test\r

 250 OK\r
 250 Accepted\r
 250 Accepted\r
 250 OK\r
 250 Accepted\r
 250 Accepted\r

diff --git a/test/stdout/5600 b/test/stdout/5600
index 51def7543aee60c4a3891a5323c2c095f9393ada..550ee1c3463350d58182c0c72ccb1c9d78a0fd0f 100644 (file)
--- a/test/stdout/5600
+++ b/test/stdout/5600
@@ -22,6 +22,9 @@ Key file = aux-fixed/cert2
 Attempting to start TLS
 Response verify OK
 Succeeded in starting TLS
 Attempting to start TLS
 Response verify OK
 Succeeded in starting TLS

+>>> helo test
+??? 250
+<<< 250 server1.example.com Hello test [ip4.ip4.ip4.ip4]

 >>> mail from:<userx@test.ex>
 ??? 250
 <<< 250 OK
 >>> mail from:<userx@test.ex>
 ??? 250
 <<< 250 OK

diff --git a/test/stdout/5610 b/test/stdout/5610
index 51def7543aee60c4a3891a5323c2c095f9393ada..550ee1c3463350d58182c0c72ccb1c9d78a0fd0f 100644 (file)
--- a/test/stdout/5610
+++ b/test/stdout/5610
@@ -22,6 +22,9 @@ Key file = aux-fixed/cert2
 Attempting to start TLS
 Response verify OK
 Succeeded in starting TLS
 Attempting to start TLS
 Response verify OK
 Succeeded in starting TLS

+>>> helo test
+??? 250
+<<< 250 server1.example.com Hello test [ip4.ip4.ip4.ip4]

 >>> mail from:<userx@test.ex>
 ??? 250
 <<< 250 OK
 >>> mail from:<userx@test.ex>
 ??? 250
 <<< 250 OK

diff --git a/test/stdout/5650 b/test/stdout/5650
index 8a72c0f6f21244db07a389e4f31508ea866873f3..77ea71e7dae112007e700dabc12c846da8ea23ad 100644 (file)
--- a/test/stdout/5650
+++ b/test/stdout/5650
@@ -20,6 +20,9 @@ Key file = aux-fixed/cert2
 ??? 220
 <<< 220 TLS go ahead
 Attempting to start TLS
 ??? 220
 <<< 220 TLS go ahead
 Attempting to start TLS

+>>> helo test
+??? 250
+<<< 250 server1.example.com Hello test [ip4.ip4.ip4.ip4]

 >>> mail from:<userx@test.ex>
 ??? 250
 <<< 250 OK
 >>> mail from:<userx@test.ex>
 ??? 250
 <<< 250 OK

diff --git a/test/stdout/5820 b/test/stdout/5820
index 1c517a3010e14f0dda06fce93c2052137e0d198d..34ef2bd41ef09056933252b89a70f0c9a841ac08 100644 (file)
--- a/test/stdout/5820
+++ b/test/stdout/5820
@@ -7,6 +7,7 @@
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r

+250 myhost.test.ex Hello test [127.0.0.1]\r

 250 OK\r
 250 Accepted\r
 421 myhost.test.ex lost input connection\r
 250 OK\r
 250 Accepted\r
 421 myhost.test.ex lost input connection\r

diff --git a/test/stdout/5840 b/test/stdout/5840
index 00c6cdc4e44e077142caf16cf9c9daa4c4fb6d01..13ff736dd963f12d2f8a2d05c9d33f60a336bccf 100644 (file)
--- a/test/stdout/5840
+++ b/test/stdout/5840
@@ -7,6 +7,7 @@
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 **** This is not for real!
 
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r

+250 myhost.test.ex Hello test [127.0.0.1]\r

 250 OK\r
 250 Accepted\r
 421 myhost.test.ex lost input connection\r
 250 OK\r
 250 Accepted\r
 421 myhost.test.ex lost input connection\r