[exim-cvs] cvs commit: exim/exim-doc/doc-txt ChangeLog exim…

Startseite
Nachricht löschen
Nachricht beantworten
Autor: Philip Hazel
Datum:  
To: exim-cvs
Betreff: [exim-cvs] cvs commit: exim/exim-doc/doc-txt ChangeLog exim/exim-src/src smtp_in.c exim/exim-src/src/auths get_data.c exim/exim-test/stderr 0002 0022 0094 0277 0294 0303 0362 0371 0381 0386 0391 03
ph10 2006/03/08 10:49:19 GMT

  Modified files:
    exim-doc/doc-txt     ChangeLog 
    exim-src/src         smtp_in.c 
    exim-src/src/auths   get_data.c 
    exim-test/stderr     0002 0022 0094 0277 0294 0303 0362 0371 
                         0381 0386 0391 0396 0398 0420 0432 0435 
                         0464 0465 0479 0487 2600 3201 3400 
  Log:
  Tidies to SMTP dialogue debugging output.


  Revision  Changes    Path
  1.325     +5 -0      exim/exim-doc/doc-txt/ChangeLog
  1.4       +1 -0      exim/exim-src/src/auths/get_data.c
  1.36      +12 -1     exim/exim-src/src/smtp_in.c
  1.3       +2 -2      exim/exim-test/stderr/0002
  1.2       +18 -18    exim/exim-test/stderr/0022
  1.3       +5 -5      exim/exim-test/stderr/0094
  1.2       +10 -10    exim/exim-test/stderr/0277
  1.2       +38 -38    exim/exim-test/stderr/0294
  1.2       +20 -20    exim/exim-test/stderr/0303
  1.2       +4 -4      exim/exim-test/stderr/0362
  1.2       +12 -12    exim/exim-test/stderr/0371
  1.3       +4 -4      exim/exim-test/stderr/0381
  1.2       +18 -18    exim/exim-test/stderr/0386
  1.2       +4 -4      exim/exim-test/stderr/0391
  1.2       +4 -4      exim/exim-test/stderr/0396
  1.2       +5 -5      exim/exim-test/stderr/0398
  1.2       +10 -10    exim/exim-test/stderr/0420
  1.2       +6 -6      exim/exim-test/stderr/0432
  1.2       +3 -3      exim/exim-test/stderr/0435
  1.2       +4 -4      exim/exim-test/stderr/0464
  1.3       +16 -16    exim/exim-test/stderr/0465
  1.2       +6 -6      exim/exim-test/stderr/0479
  1.2       +10 -10    exim/exim-test/stderr/0487
  1.2       +10 -10    exim/exim-test/stderr/2600
  1.2       +2 -2      exim/exim-test/stderr/3201
  1.4       +10 -10    exim/exim-test/stderr/3400


  Index: ChangeLog
  ===================================================================
  RCS file: /home/cvs/exim/exim-doc/doc-txt/ChangeLog,v
  retrieving revision 1.324
  retrieving revision 1.325
  diff -u -r1.324 -r1.325
  --- ChangeLog    8 Mar 2006 09:43:10 -0000    1.324
  +++ ChangeLog    8 Mar 2006 10:49:18 -0000    1.325
  @@ -1,4 +1,4 @@
  -$Cambridge: exim/exim-doc/doc-txt/ChangeLog,v 1.324 2006/03/08 09:43:10 ph10 Exp $
  +$Cambridge: exim/exim-doc/doc-txt/ChangeLog,v 1.325 2006/03/08 10:49:18 ph10 Exp $


Change log file for Exim from version 4.21
-------------------------------------------
@@ -290,6 +290,11 @@
JJ/08 exipick: added ! as generic prefix to negate any criteria format

   JJ/09 exipick: miscellaneous performance enhancements (~24% improvements)
  +
  +PH/57 Tidies in SMTP dialogue display in debug output: (i) It was not showing
  +      responses to authentication challenges, though it was showing the
  +      challenges; (ii) I've removed the CR characters from the debug output for
  +      SMTP output lines.



Exim version 4.60

  Index: smtp_in.c
  ===================================================================
  RCS file: /home/cvs/exim/exim-src/src/smtp_in.c,v
  retrieving revision 1.35
  retrieving revision 1.36
  diff -u -r1.35 -r1.36
  --- smtp_in.c    6 Mar 2006 16:05:12 -0000    1.35
  +++ smtp_in.c    8 Mar 2006 10:49:18 -0000    1.36
  @@ -1,4 +1,4 @@
  -/* $Cambridge: exim/exim-src/src/smtp_in.c,v 1.35 2006/03/06 16:05:12 ph10 Exp $ */
  +/* $Cambridge: exim/exim-src/src/smtp_in.c,v 1.36 2006/03/08 10:49:18 ph10 Exp $ */


   /*************************************************
   *     Exim - an Internet mail transport agent    *
  @@ -338,8 +338,13 @@


   DEBUG(D_receive)
     {
  +  uschar *cr, *end;
     va_start(ap, format);
     (void) string_vformat(big_buffer, big_buffer_size, format, ap);
  +  va_end(ap);
  +  end = big_buffer + Ustrlen(big_buffer);
  +  while ((cr = Ustrchr(big_buffer, '\r')) != NULL)   /* lose CRs */
  +    memmove(cr, cr + 1, (end--) - cr);
     debug_printf("SMTP>> %s", big_buffer);
     }


  @@ -2643,7 +2648,13 @@
       #endif


       (void)fwrite(s, 1, ptr, smtp_out);
  -    DEBUG(D_receive) debug_printf("SMTP>> %s", s);
  +    DEBUG(D_receive)
  +      {
  +      uschar *cr;
  +      while ((cr = Ustrchr(s, '\r')) != NULL)   /* lose CRs */
  +        memmove(cr, cr + 1, (ptr--) - (cr - s));
  +      debug_printf("SMTP>> %s", s);
  +      }
       helo_seen = TRUE;
       break;   /* HELO/EHLO */



  Index: get_data.c
  ===================================================================
  RCS file: /home/cvs/exim/exim-src/src/auths/get_data.c,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- get_data.c    7 Feb 2006 11:19:01 -0000    1.3
  +++ get_data.c    8 Mar 2006 10:49:18 -0000    1.4
  @@ -1,4 +1,4 @@
  -/* $Cambridge: exim/exim-src/src/auths/get_data.c,v 1.3 2006/02/07 11:19:01 ph10 Exp $ */
  +/* $Cambridge: exim/exim-src/src/auths/get_data.c,v 1.4 2006/03/08 10:49:18 ph10 Exp $ */


   /*************************************************
   *     Exim - an Internet mail transport agent    *
  @@ -40,6 +40,7 @@
     }
   if (p > 0 && big_buffer[p-1] == '\r') p--;
   big_buffer[p] = 0;
  +DEBUG(D_receive) debug_printf("SMTP<< %s\n", big_buffer);
   if (Ustrcmp(big_buffer, "*") == 0) return CANCELLED;
   *aptr = big_buffer;
   return OK;


  Index: 0002
  ===================================================================
  RCS file: /home/cvs/exim/exim-test/stderr/0002,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- 0002    13 Feb 2006 11:13:37 -0000    1.2
  +++ 0002    8 Mar 2006 10:49:18 -0000    1.3
  @@ -183,7 +183,7 @@
   lookup yielded: 
   host in "partial-lsearch;TESTSUITE/aux-fixed/0002.lsearch"? yes (matched "partial-lsearch;TESTSUITE/aux-fixed/0002.lsearch")
   deny: condition test succeeded
  -SMTP>> 550 Administrative prohibition
  +SMTP>> 550 Administrative prohibition
   LOG: MAIN REJECT
     H=ten-1.test.ex [V4NET.0.0.1] rejected connection in "connect" ACL
   search_tidyup called
  @@ -227,7 +227,7 @@
   host in "net-lsearch;TESTSUITE/aux-fixed/0002.lsearch"? no (end of list)
   deny: condition test failed
   end of ACL "connect2": implicit DENY
  -SMTP>> 550 Administrative prohibition
  +SMTP>> 550 Administrative prohibition
   LOG: MAIN REJECT
     H=[V4NET.0.0.2] rejected connection in "connect" ACL
   search_tidyup called


  Index: 0022
  ===================================================================
  RCS file: /home/cvs/exim/exim-test/stderr/0022,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 0022    7 Feb 2006 10:47:31 -0000    1.1
  +++ 0022    8 Mar 2006 10:49:18 -0000    1.2
  @@ -20,19 +20,19 @@
   host in helo_verify_hosts? no (option unset)
   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>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
   smtp_setup_msg entered
   SMTP<< mail from:<x@y>
  -SMTP>> 250 OK
  +SMTP>> 250 OK
   SMTP<< rcpt to:<warn_empty@???>
   using ACL "warn_empty"
   processing "warn"
   warn: condition test succeeded
   processing "accept"
   accept: condition test succeeded
  -SMTP>> 250 Accepted
  +SMTP>> 250 Accepted
   SMTP<< data
  -SMTP>> 354 Enter message, ending with "." on a line by itself
  +SMTP>> 354 Enter message, ending with "." on a line by itself
   search_tidyup called
   host in ignore_fromline_hosts? no (option unset)
   >>Headers received:
  @@ -51,10 +51,10 @@
   local_scan() returned 0 NULL
   LOG: MAIN
     <= x@y H=[V4NET.9.8.7] P=smtp S=sss
  -SMTP>> 250 OK id=10HmbF-0005vi-00
  +SMTP>> 250 OK id=10HmbF-0005vi-00
   smtp_setup_msg entered
   SMTP<< quit
  -SMTP>> 221 myhost.test.ex closing connection
  +SMTP>> 221 myhost.test.ex closing connection
   LOG: smtp_connection MAIN
     SMTP connection from [V4NET.9.8.7] closed by QUIT
   search_tidyup called
  @@ -81,10 +81,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)
  -SMTP>> 220 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<< mail from:<x@y>
  -SMTP>> 250 OK
  +SMTP>> 250 OK
   SMTP<< rcpt to:<warn_log@???>
   using ACL "warn_log"
   processing "warn"
  @@ -93,9 +93,9 @@
     H=[V4NET.9.8.7] Warning: warn log message
   processing "accept"
   accept: condition test succeeded
  -SMTP>> 250 Accepted
  +SMTP>> 250 Accepted
   SMTP<< data
  -SMTP>> 354 Enter message, ending with "." on a line by itself
  +SMTP>> 354 Enter message, ending with "." on a line by itself
   search_tidyup called
   host in ignore_fromline_hosts? no (option unset)
   >>Headers received:
  @@ -114,10 +114,10 @@
   local_scan() returned 0 NULL
   LOG: MAIN
     <= x@y H=[V4NET.9.8.7] P=smtp S=sss
  -SMTP>> 250 OK id=10HmbG-0005vi-00
  +SMTP>> 250 OK id=10HmbG-0005vi-00
   smtp_setup_msg entered
   SMTP<< quit
  -SMTP>> 221 myhost.test.ex closing connection
  +SMTP>> 221 myhost.test.ex closing connection
   LOG: smtp_connection MAIN
     SMTP connection from [V4NET.9.8.7] closed by QUIT
   search_tidyup called
  @@ -144,19 +144,19 @@
   host in helo_verify_hosts? no (option unset)
   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>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
   smtp_setup_msg entered
   SMTP<< mail from:<x@y>
  -SMTP>> 250 OK
  +SMTP>> 250 OK
   SMTP<< rcpt to:<warn_user@???>
   using ACL "warn_user"
   processing "warn"
   warn: condition test succeeded
   processing "accept"
   accept: condition test succeeded
  -SMTP>> 250 Accepted
  +SMTP>> 250 Accepted
   SMTP<< data
  -SMTP>> 354 Enter message, ending with "." on a line by itself
  +SMTP>> 354 Enter message, ending with "." on a line by itself
   search_tidyup called
   host in ignore_fromline_hosts? no (option unset)
   >>Headers received:
  @@ -178,10 +178,10 @@
   local_scan() returned 0 NULL
   LOG: MAIN
     <= x@y H=[V4NET.9.8.7] P=smtp S=sss
  -SMTP>> 250 OK id=10HmbH-0005vi-00
  +SMTP>> 250 OK id=10HmbH-0005vi-00
   smtp_setup_msg entered
   SMTP<< quit
  -SMTP>> 221 myhost.test.ex closing connection
  +SMTP>> 221 myhost.test.ex closing connection
   LOG: smtp_connection MAIN
     SMTP connection from [V4NET.9.8.7] closed by QUIT
   search_tidyup called


  Index: 0094
  ===================================================================
  RCS file: /home/cvs/exim/exim-test/stderr/0094,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- 0094    16 Feb 2006 10:05:34 -0000    1.2
  +++ 0094    8 Mar 2006 10:49:18 -0000    1.3
  @@ -106,10 +106,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)
  -SMTP>> 220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
  +SMTP>> 220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
   smtp_setup_msg entered
   SMTP<< mail from:<userx@???>
  -SMTP>> 250 OK
  +SMTP>> 250 OK
   SMTP<< rcpt to:<userx@???>
   using ACL "check_recipient"
   processing "accept"
  @@ -121,7 +121,7 @@
   test.ex in "test.ex"? yes (matched "test.ex")
   test.ex in "+local_domains"? yes (matched "+local_domains")
   accept: condition test succeeded
  -SMTP>> 250 Accepted
  +SMTP>> 250 Accepted
   SMTP<< rcpt to:<userx@???>
   using ACL "check_recipient"
   processing "accept"
  @@ -140,11 +140,11 @@
   accept: condition test failed
   processing "deny"
   deny: condition test succeeded
  -SMTP>> 550 relay not permitted
  +SMTP>> 550 relay not permitted
   LOG: MAIN REJECT
     H=oneback.test.ex [V4NET.99.99.90] F=<userx@???> rejected RCPT <userx@???>: relay not permitted
   SMTP<< quit
  -SMTP>> 221 the.local.host.name closing connection
  +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
   search_tidyup called


  Index: 0277
  ===================================================================
  RCS file: /home/cvs/exim/exim-test/stderr/0277,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 0277    7 Feb 2006 10:47:31 -0000    1.1
  +++ 0277    8 Mar 2006 10:49:18 -0000    1.2
  @@ -30,10 +30,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)
  -SMTP>> 220 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<< quit
  -SMTP>> 221 myhost.test.ex closing connection
  +SMTP>> 221 myhost.test.ex closing connection
   LOG: smtp_connection MAIN
     SMTP connection from [V4NET.2.3.4] closed by QUIT
   search_tidyup called
  @@ -65,10 +65,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)
  -SMTP>> 220 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<< quit
  -SMTP>> 221 myhost.test.ex closing connection
  +SMTP>> 221 myhost.test.ex closing connection
   LOG: smtp_connection MAIN
     SMTP connection from [V4NET.6.7.8] closed by QUIT
   search_tidyup called
  @@ -108,10 +108,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)
  -SMTP>> 220 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<< quit
  -SMTP>> 221 myhost.test.ex closing connection
  +SMTP>> 221 myhost.test.ex closing connection
   LOG: smtp_connection MAIN
     SMTP connection from [V4NET.10.11.12] closed by QUIT
   search_tidyup called
  @@ -151,10 +151,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)
  -SMTP>> 220 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<< quit
  -SMTP>> 221 myhost.test.ex closing connection
  +SMTP>> 221 myhost.test.ex closing connection
   LOG: smtp_connection MAIN
     SMTP connection from [V4NET.1.1.1] closed by QUIT
   search_tidyup called
  @@ -193,10 +193,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)
  -SMTP>> 220 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<< quit
  -SMTP>> 221 myhost.test.ex closing connection
  +SMTP>> 221 myhost.test.ex closing connection
   LOG: smtp_connection MAIN
     SMTP connection from [V4NET.2.2.2] closed by QUIT
   search_tidyup called


  Index: 0294
  ===================================================================
  RCS file: /home/cvs/exim/exim-test/stderr/0294,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 0294    7 Feb 2006 10:47:31 -0000    1.1
  +++ 0294    8 Mar 2006 10:49:18 -0000    1.2
  @@ -6,26 +6,26 @@
   sender address = NULL
   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>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
   smtp_setup_msg entered
   SMTP<< mail from:<x@y>
  -SMTP>> 250 OK
  +SMTP>> 250 OK
   SMTP<< rcpt to:<one@z>
  -SMTP>> 250 Accepted
  +SMTP>> 250 Accepted
   SMTP<< rcpt to:<one@z>
   rate limit RCPT: delay 0.25 sec
  -SMTP>> 250 Accepted
  +SMTP>> 250 Accepted
   SMTP<< rcpt to:<one@z>
   rate limit RCPT: delay 0.263 sec
  -SMTP>> 250 Accepted
  +SMTP>> 250 Accepted
   SMTP<< rcpt to:<one@z>
   rate limit RCPT: delay 0.276 sec
  -SMTP>> 250 Accepted
  +SMTP>> 250 Accepted
   SMTP<< rcpt to:<one@z>
   rate limit RCPT: delay 0.289 sec
  -SMTP>> 250 Accepted
  +SMTP>> 250 Accepted
   SMTP<< data
  -SMTP>> 354 Enter message, ending with "." on a line by itself
  +SMTP>> 354 Enter message, ending with "." on a line by itself
   >>Headers received:


   >>Headers after rewriting and local additions:
  @@ -45,15 +45,15 @@
   LOG: MAIN
     <= x@y U=CALLER P=local-smtp S=sss
   created log directory TESTSUITE/spool/log
  -SMTP>> 250 OK id=10HmaX-0005vi-00
  +SMTP>> 250 OK id=10HmaX-0005vi-00
   smtp_setup_msg entered
   SMTP<< mail from:<x@y>
   rate limit MAIL: delay 1 sec
  -SMTP>> 250 OK
  +SMTP>> 250 OK
   SMTP<< rcpt to:<two@z>
  -SMTP>> 250 Accepted
  +SMTP>> 250 Accepted
   SMTP<< data
  -SMTP>> 354 Enter message, ending with "." on a line by itself
  +SMTP>> 354 Enter message, ending with "." on a line by itself
   >>Headers received:


   >>Headers after rewriting and local additions:
  @@ -73,13 +73,13 @@
   Size of headers = sss
   LOG: MAIN
     <= x@y U=CALLER P=local-smtp S=sss
  -SMTP>> 250 OK id=10HmaY-0005vi-00
  +SMTP>> 250 OK id=10HmaY-0005vi-00
   smtp_setup_msg entered
   SMTP<< mail from:<x@y>
   rate limit MAIL: delay 2 sec
  -SMTP>> 250 OK
  +SMTP>> 250 OK
   SMTP<< quit
  -SMTP>> 221 myhost.test.ex closing connection
  +SMTP>> 221 myhost.test.ex closing connection
   LOG: smtp_connection MAIN
     SMTP connection from CALLER closed by QUIT
   >>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>>
  @@ -99,10 +99,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)
  -SMTP>> 220 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<< mail from:<x@y>
  -SMTP>> 250 OK
  +SMTP>> 250 OK
   SMTP<< rcpt to:<one@z>
   processing "deny"
   check local_parts = reject
  @@ -110,7 +110,7 @@
   deny: condition test failed
   processing "accept"
   accept: condition test succeeded
  -SMTP>> 250 Accepted
  +SMTP>> 250 Accepted
   SMTP<< rcpt to:<one@z>
   host in smtp_ratelimit_hosts? no (end of list)
   processing "deny"
  @@ -119,9 +119,9 @@
   deny: condition test failed
   processing "accept"
   accept: condition test succeeded
  -SMTP>> 250 Accepted
  +SMTP>> 250 Accepted
   SMTP<< quit
  -SMTP>> 221 myhost.test.ex closing connection
  +SMTP>> 221 myhost.test.ex closing connection
   LOG: smtp_connection MAIN
     SMTP connection from [1.2.3.4] closed by QUIT
   >>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>>
  @@ -141,10 +141,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)
  -SMTP>> 220 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<< mail from:<x@y>
  -SMTP>> 250 OK
  +SMTP>> 250 OK
   SMTP<< rcpt to:<one@z>
   processing "deny"
   check local_parts = reject
  @@ -152,7 +152,7 @@
   deny: condition test failed
   processing "accept"
   accept: condition test succeeded
  -SMTP>> 250 Accepted
  +SMTP>> 250 Accepted
   SMTP<< rcpt to:<one@z>
   host in smtp_ratelimit_hosts? yes (matched "V4NET.9.8.7")
   rate limit RCPT: delay 0.25 sec
  @@ -162,9 +162,9 @@
   deny: condition test failed
   processing "accept"
   accept: condition test succeeded
  -SMTP>> 250 Accepted
  +SMTP>> 250 Accepted
   SMTP<< quit
  -SMTP>> 221 myhost.test.ex closing connection
  +SMTP>> 221 myhost.test.ex closing connection
   LOG: smtp_connection MAIN
     SMTP connection from [V4NET.9.8.7] closed by QUIT
   >>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>>
  @@ -176,50 +176,50 @@
   sender address = NULL
   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>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
   smtp_setup_msg entered
   SMTP<< mail from:<x@y>
  -SMTP>> 250 OK
  +SMTP>> 250 OK
   SMTP<< rcpt to:<reject@z>
  -SMTP>> 550 Administrative prohibition
  +SMTP>> 550 Administrative prohibition
   LOG: MAIN REJECT
     U=CALLER F=<x@y> rejected RCPT <reject@z>
   SMTP<< rcpt to:<reject@z>
   rate limit RCPT: delay 0.25 sec
  -SMTP>> 550 Administrative prohibition
  +SMTP>> 550 Administrative prohibition
   LOG: MAIN REJECT
     U=CALLER F=<x@y> rejected RCPT <reject@z>
   SMTP<< rcpt to:<reject@z>
   rate limit RCPT: delay 0.263 sec
  -SMTP>> 550 Administrative prohibition
  +SMTP>> 550 Administrative prohibition
   LOG: MAIN REJECT
     U=CALLER F=<x@y> rejected RCPT <reject@z>
   SMTP<< rcpt to:<reject@z>
   rate limit RCPT: delay 0.276 sec
  -SMTP>> 550 Administrative prohibition
  +SMTP>> 550 Administrative prohibition
   LOG: MAIN REJECT
     U=CALLER F=<x@y> rejected RCPT <reject@z>
   SMTP<< rcpt to:<reject@z>
   rate limit RCPT: delay 0.289 sec
  -SMTP>> 550 Administrative prohibition
  +SMTP>> 550 Administrative prohibition
   LOG: MAIN REJECT
     U=CALLER F=<x@y> rejected RCPT <reject@z>
   SMTP<< rset
  -SMTP>> 250 Reset OK
  +SMTP>> 250 Reset OK
   SMTP<< mail from:<x@y>
   rate limit MAIL: delay 1 sec
  -SMTP>> 250 OK
  +SMTP>> 250 OK
   SMTP<< rcpt to:<reject@z>
  -SMTP>> 550 Administrative prohibition
  +SMTP>> 550 Administrative prohibition
   LOG: MAIN REJECT
     U=CALLER F=<x@y> rejected RCPT <reject@z>
   SMTP<< rset
  -SMTP>> 250 Reset OK
  +SMTP>> 250 Reset OK
   SMTP<< mail from:<x@y>
   rate limit MAIL: delay 2 sec
  -SMTP>> 250 OK
  +SMTP>> 250 OK
   SMTP<< quit
  -SMTP>> 221 myhost.test.ex closing connection
  +SMTP>> 221 myhost.test.ex closing connection
   LOG: smtp_connection MAIN
     SMTP connection from CALLER closed by QUIT
   >>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>>


  Index: 0303
  ===================================================================
  RCS file: /home/cvs/exim/exim-test/stderr/0303,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 0303    7 Feb 2006 10:47:31 -0000    1.1
  +++ 0303    8 Mar 2006 10:49:18 -0000    1.2
  @@ -63,7 +63,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)
  -SMTP>> 220 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<< EHLO [V4NET.2.3.4]
   [V4NET.2.3.4] in helo_lookup_domains? no (end of list)
  @@ -71,18 +71,18 @@
   sender_rcvhost = [V4NET.2.3.4]
   set_process_info: pppp handling incoming connection from ([V4NET.2.3.4]) [V4NET.2.3.4]
   host in pipelining_advertise_hosts? yes (matched "*")
  -SMTP>> 250-myhost.test.ex Hello [V4NET.2.3.4] [V4NET.2.3.4]
  -250-SIZE 52428800
  -250-PIPELINING
  -250 HELP
  +SMTP>> 250-myhost.test.ex Hello [V4NET.2.3.4] [V4NET.2.3.4]
  +250-SIZE 52428800
  +250-PIPELINING
  +250 HELP
   SMTP<< mail from:<>
  -SMTP>> 250 OK
  +SMTP>> 250 OK
   SMTP<< rcpt to:<x@y>
   processing "accept"
   accept: condition test succeeded
  -SMTP>> 250 Accepted
  +SMTP>> 250 Accepted
   SMTP<< data
  -SMTP>> 354 Enter message, ending with "." on a line by itself
  +SMTP>> 354 Enter message, ending with "." on a line by itself
   search_tidyup called
   >>Headers received:


  @@ -99,10 +99,10 @@
   local_scan() returned 0 NULL
   LOG: MAIN
     <= <> H=([V4NET.2.3.4]) [V4NET.2.3.4] P=esmtp S=sss
  -SMTP>> 250 OK id=10HmaX-0005vi-00
  +SMTP>> 250 OK id=10HmaX-0005vi-00
   smtp_setup_msg entered
   SMTP<< quit
  -SMTP>> 221 myhost.test.ex closing connection
  +SMTP>> 221 myhost.test.ex closing connection
   LOG: smtp_connection MAIN
     SMTP connection from ([V4NET.2.3.4]) [V4NET.2.3.4] closed by QUIT
   search_tidyup called
  @@ -130,25 +130,25 @@
   host in helo_verify_hosts? no (option unset)
   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>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
   smtp_setup_msg entered
   SMTP<< EHLO [V4NET.2.3.4]
   sender_fullhost = host.name.tld [V4NET.2.3.4]
   sender_rcvhost = host.name.tld ([V4NET.2.3.4])
   set_process_info: pppp handling incoming connection from host.name.tld [V4NET.2.3.4]
   host in pipelining_advertise_hosts? yes (matched "*")
  -SMTP>> 250-myhost.test.ex Hello host.name.tld [V4NET.2.3.4]
  -250-SIZE 52428800
  -250-PIPELINING
  -250 HELP
  +SMTP>> 250-myhost.test.ex Hello host.name.tld [V4NET.2.3.4]
  +250-SIZE 52428800
  +250-PIPELINING
  +250 HELP
   SMTP<< mail from:<>
  -SMTP>> 250 OK
  +SMTP>> 250 OK
   SMTP<< rcpt to:<x@y>
   processing "accept"
   accept: condition test succeeded
  -SMTP>> 250 Accepted
  +SMTP>> 250 Accepted
   SMTP<< data
  -SMTP>> 354 Enter message, ending with "." on a line by itself
  +SMTP>> 354 Enter message, ending with "." on a line by itself
   search_tidyup called
   >>Headers received:


  @@ -165,10 +165,10 @@
   local_scan() returned 0 NULL
   LOG: MAIN
     <= <> H=host.name.tld [V4NET.2.3.4] P=esmtp S=sss
  -SMTP>> 250 OK id=10HmaY-0005vi-00
  +SMTP>> 250 OK id=10HmaY-0005vi-00
   smtp_setup_msg entered
   SMTP<< quit
  -SMTP>> 221 myhost.test.ex closing connection
  +SMTP>> 221 myhost.test.ex closing connection
   LOG: smtp_connection MAIN
     SMTP connection from host.name.tld [V4NET.2.3.4] closed by QUIT
   search_tidyup called


  Index: 0362
  ===================================================================
  RCS file: /home/cvs/exim/exim-test/stderr/0362,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 0362    7 Feb 2006 10:47:31 -0000    1.1
  +++ 0362    8 Mar 2006 10:49:18 -0000    1.2
  @@ -20,10 +20,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)
  -SMTP>> 220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
  +SMTP>> 220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
   smtp_setup_msg entered
   SMTP<< mail from:<x@y>
  -SMTP>> 250 OK
  +SMTP>> 250 OK
   SMTP<< rcpt to:<x@???>
   using ACL "check_rcpt"
   processing "accept"
  @@ -71,9 +71,9 @@
     transport: t2
   ----------- end verify ------------
   accept: condition test succeeded
  -SMTP>> 250 Accepted
  +SMTP>> 250 Accepted
   SMTP<< quit
  -SMTP>> 221 the.local.host.name closing connection
  +SMTP>> 221 the.local.host.name closing connection
   LOG: smtp_connection MAIN
     SMTP connection from [V4NET.0.0.0] closed by QUIT
   search_tidyup called


  Index: 0371
  ===================================================================
  RCS file: /home/cvs/exim/exim-test/stderr/0371,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 0371    7 Feb 2006 10:47:31 -0000    1.1
  +++ 0371    8 Mar 2006 10:49:18 -0000    1.2
  @@ -27,7 +27,7 @@
   check set acl_c9 = $acl_c9; connect
                    = ; connect
   accept: condition test succeeded
  -SMTP>> 220 mail.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
  +SMTP>> 220 mail.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
   smtp_setup_msg entered
   SMTP<< ehlo something
   something in helo_lookup_domains? no (end of list)
  @@ -35,10 +35,10 @@
   sender_rcvhost = [V4NET.0.0.0] (helo=something)
   set_process_info: pppp handling incoming connection from (something) [V4NET.0.0.0]
   host in pipelining_advertise_hosts? yes (matched "*")
  -SMTP>> 250-mail.test.ex Hello something [V4NET.0.0.0]
  -250-SIZE 52428800
  -250-PIPELINING
  -250 HELP
  +SMTP>> 250-mail.test.ex Hello something [V4NET.0.0.0]
  +250-SIZE 52428800
  +250-PIPELINING
  +250 HELP
   SMTP<< mail from:<x@y>
   using ACL "mail"
   processing "accept"
  @@ -49,7 +49,7 @@
   check set acl_m0 = $acl_m0; mail
                    = ; mail
   accept: condition test succeeded
  -SMTP>> 250 OK
  +SMTP>> 250 OK
   SMTP<< rcpt to:<x@y>
   using ACL "rcpt"
   processing "accept"
  @@ -60,9 +60,9 @@
   check set acl_c0 = $acl_c0; rcpt
                    = ; connect; mail; rcpt
   accept: condition test succeeded
  -SMTP>> 250 Accepted
  +SMTP>> 250 Accepted
   SMTP<< data
  -SMTP>> 354 Enter message, ending with "." on a line by itself
  +SMTP>> 354 Enter message, ending with "." on a line by itself
   search_tidyup called
   >>Headers received:


  @@ -87,7 +87,7 @@
   local_scan() returned 0 NULL
   LOG: MAIN
     <= x@y H=(something) [V4NET.0.0.0] P=esmtp S=sss
  -SMTP>> 250 OK id=10HmaX-0005vi-00
  +SMTP>> 250 OK id=10HmaX-0005vi-00
   smtp_setup_msg entered
   SMTP<< vrfy x@y
   host in smtp_accept_max_nonmail_hosts? yes (matched "*")
  @@ -109,7 +109,7 @@
   no more routers
   LOG: MAIN
     VRFY failed for x@y H=(something) [V4NET.0.0.0]
  -SMTP>> 550 <x@y> Unrouteable address
  +SMTP>> 550 <x@y> Unrouteable address
   SMTP<< mail from:<x@y>
   using ACL "mail"
   processing "accept"
  @@ -120,9 +120,9 @@
   check set acl_m0 = $acl_m0; mail
                    = ; mail
   accept: condition test succeeded
  -SMTP>> 250 OK
  +SMTP>> 250 OK
   SMTP<< quit
  -SMTP>> 221 mail.test.ex closing connection
  +SMTP>> 221 mail.test.ex closing connection
   LOG: smtp_connection MAIN
     SMTP connection from (something) [V4NET.0.0.0] closed by QUIT
   search_tidyup called


  Index: 0381
  ===================================================================
  RCS file: /home/cvs/exim/exim-test/stderr/0381,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- 0381    16 Feb 2006 10:05:34 -0000    1.2
  +++ 0381    8 Mar 2006 10:49:18 -0000    1.3
  @@ -22,10 +22,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)
  -SMTP>> 220 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<< mail from:<notgov@???>
  -SMTP>> 250 OK
  +SMTP>> 250 OK
   SMTP<< rcpt to:<x@???>
   using ACL "check_rcpt"
   processing "warn"
  @@ -70,9 +70,9 @@
   warn: condition test failed
   processing "accept"
   accept: condition test succeeded
  -SMTP>> 250 Accepted
  +SMTP>> 250 Accepted
   SMTP<< quit
  -SMTP>> 221 myhost.test.ex closing connection
  +SMTP>> 221 myhost.test.ex closing connection
   LOG: smtp_connection MAIN
     SMTP connection from CALLER closed by QUIT
   search_tidyup called


  Index: 0386
  ===================================================================
  RCS file: /home/cvs/exim/exim-test/stderr/0386,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 0386    7 Feb 2006 10:47:31 -0000    1.1
  +++ 0386    8 Mar 2006 10:49:18 -0000    1.2
  @@ -22,10 +22,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)
  -SMTP>> 220 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<< mail from:<x@y>
  -SMTP>> 250 OK
  +SMTP>> 250 OK
   SMTP<< rcpt to:<1@b>
   read ACL from file TESTSUITE/aux-fixed/0386.acl1
   processing "accept"
  @@ -62,13 +62,13 @@
   require: condition test succeeded
   processing "deny"
   deny: condition test succeeded
  -SMTP>> 550 No such user here
  +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
   SMTP<< rset
  -SMTP>> 250 Reset OK
  +SMTP>> 250 Reset OK
   SMTP<< mail from:<x@y>
  -SMTP>> 250 OK
  +SMTP>> 250 OK
   SMTP<< rcpt to:<1@b>
   using ACL "TESTSUITE/aux-fixed/0386.acl1"
   processing "accept"
  @@ -104,11 +104,11 @@
   require: condition test succeeded
   processing "deny"
   deny: condition test succeeded
  -SMTP>> 550 No such user here
  +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
   SMTP<< quit
  -SMTP>> 221 myhost.test.ex closing connection
  +SMTP>> 221 myhost.test.ex closing connection
   LOG: smtp_connection MAIN
     SMTP connection from [V4NET.9.8.7] closed by QUIT
   search_tidyup called
  @@ -138,10 +138,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)
  -SMTP>> 220 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<< mail from:<x@y>
  -SMTP>> 250 OK
  +SMTP>> 250 OK
   SMTP<< rcpt to:<2@b>
   read ACL from file TESTSUITE/aux-fixed/0386.acl2
   processing "warn"
  @@ -160,9 +160,9 @@
   created log directory TESTSUITE/spool/log
   processing "accept"
   accept: condition test succeeded
  -SMTP>> 250 Accepted
  +SMTP>> 250 Accepted
   SMTP<< data
  -SMTP>> 354 Enter message, ending with "." on a line by itself
  +SMTP>> 354 Enter message, ending with "." on a line by itself
   search_tidyup called
   host in ignore_fromline_hosts? no (option unset)
   >>Headers received:
  @@ -187,7 +187,7 @@
   Size of headers = sss
   LOG: MAIN
     <= x@y H=[V4NET.11.12.13] U=CALLER P=smtp S=sss
  -SMTP>> 250 OK id=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=0xfbb95cfd -odi -Mc 10HmaX-0005vi-00
   Exim version x.yz ....
  @@ -299,9 +299,9 @@
   >>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>>
   smtp_setup_msg entered
   SMTP<< rset
  -SMTP>> 250 Reset OK
  +SMTP>> 250 Reset OK
   SMTP<< mail from:<x@y>
  -SMTP>> 250 OK
  +SMTP>> 250 OK
   SMTP<< rcpt to:<2@b>
   using ACL "TESTSUITE/aux-fixed/0386.acl2"
   processing "warn"
  @@ -315,9 +315,9 @@
     H=[V4NET.11.12.13] U=CALLER Warning: found in rbl.test.ex: This is a test blacklisting message
   processing "accept"
   accept: condition test succeeded
  -SMTP>> 250 Accepted
  +SMTP>> 250 Accepted
   SMTP<< data
  -SMTP>> 354 Enter message, ending with "." on a line by itself
  +SMTP>> 354 Enter message, ending with "." on a line by itself
   search_tidyup called
   host in ignore_fromline_hosts? no (option unset)
   >>Headers received:
  @@ -342,7 +342,7 @@
   Size of headers = sss
   LOG: MAIN
     <= x@y H=[V4NET.11.12.13] U=CALLER P=smtp S=sss
  -SMTP>> 250 OK id=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=0xfbb95cfd -odi -Mc 10HmaY-0005vi-00
   Exim version x.yz ....
  @@ -453,7 +453,7 @@
   >>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>>
   smtp_setup_msg entered
   SMTP<< quit
  -SMTP>> 221 myhost.test.ex closing connection
  +SMTP>> 221 myhost.test.ex closing connection
   LOG: smtp_connection MAIN
     SMTP connection from CALLER closed by QUIT
   search_tidyup called


  Index: 0391
  ===================================================================
  RCS file: /home/cvs/exim/exim-test/stderr/0391,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 0391    7 Feb 2006 10:47:31 -0000    1.1
  +++ 0391    8 Mar 2006 10:49:18 -0000    1.2
  @@ -20,10 +20,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)
  -SMTP>> 220 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<< mail from:<U@???>
  -SMTP>> 250 OK
  +SMTP>> 250 OK
   SMTP<< rcpt to:<B@???>
   using ACL "acl_rcpt"
   processing "accept"
  @@ -55,9 +55,9 @@
   ----------- end verify ------------
   sender U@??? verified ok as U@???
   accept: condition test succeeded
  -SMTP>> 250 Accepted
  +SMTP>> 250 Accepted
   SMTP<< quit
  -SMTP>> 221 myhost.test.ex closing connection
  +SMTP>> 221 myhost.test.ex closing connection
   LOG: smtp_connection MAIN
     SMTP connection from [1.2.3.4] closed by QUIT
   search_tidyup called


  Index: 0396
  ===================================================================
  RCS file: /home/cvs/exim/exim-test/stderr/0396,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 0396    7 Feb 2006 10:47:31 -0000    1.1
  +++ 0396    8 Mar 2006 10:49:18 -0000    1.2
  @@ -11,10 +11,10 @@
    in hosts_connection_nolog? no (option unset)
   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>> 220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
   smtp_setup_msg entered
   SMTP<< mail from:<x@y>
  -SMTP>> 250 OK
  +SMTP>> 250 OK
   SMTP<< rcpt to:<x@y>
   processing "accept"
   check domains = +fail
  @@ -22,12 +22,12 @@
   y in "+fail"? no (end of list)
   accept: condition test failed
   end of inline ACL: implicit DENY
  -SMTP>> 550 Administrative prohibition
  +SMTP>> 550 Administrative prohibition
   LOG: MAIN REJECT
     U=CALLER F=<x@y> rejected RCPT <x@y>
   created log directory TESTSUITE/spool/log
   SMTP<< quit
  -SMTP>> 221 the.local.host.name closing connection
  +SMTP>> 221 the.local.host.name closing connection
   LOG: smtp_connection MAIN
     SMTP connection from CALLER closed by QUIT
   search_tidyup called


  Index: 0398
  ===================================================================
  RCS file: /home/cvs/exim/exim-test/stderr/0398,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 0398    7 Feb 2006 10:47:31 -0000    1.1
  +++ 0398    8 Mar 2006 10:49:18 -0000    1.2
  @@ -11,10 +11,10 @@
    in hosts_connection_nolog? no (option unset)
   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>> 220 mail.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
   smtp_setup_msg entered
   SMTP<< mail from:<qq@remote>
  -SMTP>> 250 OK
  +SMTP>> 250 OK
   SMTP<< rcpt to:<abc@local>
   using ACL "rcpt"
   processing "deny"
  @@ -151,7 +151,7 @@
   remote in "remote"? yes (matched "remote")
   qq@remote in "qq@remote"? yes (matched "qq@remote")
   accept: condition test succeeded
  -SMTP>> 250 Accepted
  +SMTP>> 250 Accepted
   SMTP<< rcpt to:<xyz@local>
   using ACL "rcpt"
   processing "deny"
  @@ -228,9 +228,9 @@
   remote in "remote"? yes (matched "remote")
   qq@remote in "qq@remote"? yes (matched "qq@remote")
   accept: condition test succeeded
  -SMTP>> 250 Accepted
  +SMTP>> 250 Accepted
   SMTP<< quit
  -SMTP>> 221 mail.test.ex closing connection
  +SMTP>> 221 mail.test.ex closing connection
   LOG: smtp_connection MAIN
     SMTP connection from CALLER closed by QUIT
   search_tidyup called


  Index: 0420
  ===================================================================
  RCS file: /home/cvs/exim/exim-test/stderr/0420,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 0420    7 Feb 2006 10:47:31 -0000    1.1
  +++ 0420    8 Mar 2006 10:49:18 -0000    1.2
  @@ -20,16 +20,16 @@
   host in helo_verify_hosts? no (option unset)
   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>> 220 mail.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
   smtp_setup_msg entered
   SMTP<< mail from:<x@y>
  -SMTP>> 250 OK
  +SMTP>> 250 OK
   SMTP<< rcpt to:<x@y>
   processing "accept"
   accept: condition test succeeded
  -SMTP>> 250 Accepted
  +SMTP>> 250 Accepted
   SMTP<< data
  -SMTP>> 354 Enter message, ending with "." on a line by itself
  +SMTP>> 354 Enter message, ending with "." on a line by itself
   search_tidyup called
   host in ignore_fromline_hosts? no (option unset)
   >>Headers received:
  @@ -44,16 +44,16 @@
   local_scan() returned 0 NULL
   LOG: MAIN
     <= x@y H=[V4NET.0.0.0] P=smtp S=sss
  -SMTP>> 250 OK id=10HmaX-0005vi-00
  +SMTP>> 250 OK id=10HmaX-0005vi-00
   smtp_setup_msg entered
   SMTP<< mail from:<a@b>
  -SMTP>> 250 OK
  +SMTP>> 250 OK
   SMTP<< rcpt to:<x@y>
   processing "accept"
   accept: condition test succeeded
  -SMTP>> 250 Accepted
  +SMTP>> 250 Accepted
   SMTP<< data
  -SMTP>> 354 Enter message, ending with "." on a line by itself
  +SMTP>> 354 Enter message, ending with "." on a line by itself
   search_tidyup called
   host in ignore_fromline_hosts? no (option unset)
   >>Headers received:
  @@ -68,10 +68,10 @@
   local_scan() returned 0 NULL
   LOG: MAIN
     <= a@b H=[V4NET.0.0.0] P=smtp S=sss
  -SMTP>> 250 OK id=10HmaY-0005vi-00
  +SMTP>> 250 OK id=10HmaY-0005vi-00
   smtp_setup_msg entered
   SMTP<< quit
  -SMTP>> 221 mail.test.ex closing connection
  +SMTP>> 221 mail.test.ex closing connection
   LOG: smtp_connection MAIN
     SMTP connection from [V4NET.0.0.0] closed by QUIT
   search_tidyup called


  Index: 0432
  ===================================================================
  RCS file: /home/cvs/exim/exim-test/stderr/0432,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 0432    7 Feb 2006 10:47:31 -0000    1.1
  +++ 0432    8 Mar 2006 10:49:18 -0000    1.2
  @@ -45,7 +45,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)
  -SMTP>> 220 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<< mail from:<x@y>
   using ACL "mail"
  @@ -109,9 +109,9 @@
   ----------- end verify ------------
   sender x@y verified ok
   accept: condition test succeeded
  -SMTP>> 250 OK
  +SMTP>> 250 OK
   SMTP<< quit
  -SMTP>> 221 myhost.test.ex closing connection
  +SMTP>> 221 myhost.test.ex closing connection
   LOG: smtp_connection MAIN
     SMTP connection from [1.2.3.4] closed by QUIT
   search_tidyup called
  @@ -138,7 +138,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)
  -SMTP>> 220 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<< mail from:<x@y>
   using ACL "mail"
  @@ -183,9 +183,9 @@
   ----------- end verify ------------
   sender x@y verified ok
   accept: condition test succeeded
  -SMTP>> 250 OK
  +SMTP>> 250 OK
   SMTP<< quit
  -SMTP>> 221 myhost.test.ex closing connection
  +SMTP>> 221 myhost.test.ex closing connection
   LOG: smtp_connection MAIN
     SMTP connection from [1.2.3.4] closed by QUIT
   search_tidyup called


  Index: 0435
  ===================================================================
  RCS file: /home/cvs/exim/exim-test/stderr/0435,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 0435    7 Feb 2006 10:47:31 -0000    1.1
  +++ 0435    8 Mar 2006 10:49:18 -0000    1.2
  @@ -11,14 +11,14 @@
    in hosts_connection_nolog? no (option unset)
   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>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
   smtp_setup_msg entered
   SMTP<< HELO    ?
   LOG: smtp_syntax_error MAIN
     SMTP syntax error in "HELO    ?" U=CALLER NULL character(s) present (shown as '?')
  -SMTP>> 501 NULL characters are not allowed in SMTP commands
  +SMTP>> 501 NULL characters are not allowed in SMTP commands
   SMTP<< quit
  -SMTP>> 221 myhost.test.ex closing connection
  +SMTP>> 221 myhost.test.ex closing connection
   LOG: smtp_connection MAIN
     SMTP connection from CALLER closed by QUIT
   search_tidyup called


  Index: 0464
  ===================================================================
  RCS file: /home/cvs/exim/exim-test/stderr/0464,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 0464    7 Feb 2006 10:47:31 -0000    1.1
  +++ 0464    8 Mar 2006 10:49:18 -0000    1.2
  @@ -11,10 +11,10 @@
    in hosts_connection_nolog? no (option unset)
   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>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
   smtp_setup_msg entered
   SMTP<< mail from:<>
  -SMTP>> 250 OK
  +SMTP>> 250 OK
   SMTP<< rcpt to:<abc@domain1>
   using ACL "rcpt"
   processing "require"
  @@ -163,9 +163,9 @@
   require: condition test succeeded
   processing "accept"
   accept: condition test succeeded
  -SMTP>> 250 Accepted
  +SMTP>> 250 Accepted
   SMTP<< quit
  -SMTP>> 221 myhost.test.ex closing connection
  +SMTP>> 221 myhost.test.ex closing connection
   LOG: smtp_connection MAIN
     SMTP connection from CALLER closed by QUIT
   search_tidyup called


  Index: 0465
  ===================================================================
  RCS file: /home/cvs/exim/exim-test/stderr/0465,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- 0465    16 Feb 2006 10:05:34 -0000    1.2
  +++ 0465    8 Mar 2006 10:49:18 -0000    1.3
  @@ -11,16 +11,16 @@
    in hosts_connection_nolog? no (option unset)
   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>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
   smtp_setup_msg entered
   SMTP<< mail from:<>
  -SMTP>> 250 OK
  +SMTP>> 250 OK
   SMTP<< rcpt to:<abc@domain.>
   LOG: smtp_syntax_error MAIN
     SMTP syntax error in "rcpt to:<abc@domain.>" U=CALLER domain missing or malformed
  -SMTP>> 501 <abc@domain.>: domain missing or malformed
  +SMTP>> 501 <abc@domain.>: domain missing or malformed
   SMTP<< quit
  -SMTP>> 221 myhost.test.ex closing connection
  +SMTP>> 221 myhost.test.ex closing connection
   LOG: smtp_connection MAIN
     SMTP connection from CALLER closed by QUIT
   search_tidyup called
  @@ -39,16 +39,16 @@
    in hosts_connection_nolog? no (option unset)
   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>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
   smtp_setup_msg entered
   SMTP<< mail from:<>
  -SMTP>> 250 OK
  +SMTP>> 250 OK
   SMTP<< rcpt to:<abc@domain.>
   processing "accept"
   accept: condition test succeeded
  -SMTP>> 250 Accepted
  +SMTP>> 250 Accepted
   SMTP<< data
  -SMTP>> 354 Enter message, ending with "." on a line by itself
  +SMTP>> 354 Enter message, ending with "." on a line by itself
   search_tidyup called
   >>Headers received:
   To: abc@domain.
  @@ -77,10 +77,10 @@
   LOG: MAIN
     <= <> U=CALLER P=local-smtp S=sss
   created log directory TESTSUITE/spool/log
  -SMTP>> 250 OK id=10HmaY-0005vi-00
  +SMTP>> 250 OK id=10HmaY-0005vi-00
   smtp_setup_msg entered
   SMTP<< quit
  -SMTP>> 221 myhost.test.ex closing connection
  +SMTP>> 221 myhost.test.ex closing connection
   LOG: smtp_connection MAIN
     SMTP connection from CALLER closed by QUIT
   search_tidyup called
  @@ -98,16 +98,16 @@
    in hosts_connection_nolog? no (option unset)
   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>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
   smtp_setup_msg entered
   SMTP<< mail from:<>
  -SMTP>> 250 OK
  +SMTP>> 250 OK
   SMTP<< rcpt to:<abc@xyz>
   processing "accept"
   accept: condition test succeeded
  -SMTP>> 250 Accepted
  +SMTP>> 250 Accepted
   SMTP<< data
  -SMTP>> 354 Enter message, ending with "." on a line by itself
  +SMTP>> 354 Enter message, ending with "." on a line by itself
   search_tidyup called
   >>Headers received:
   To: abc@xyz.
  @@ -130,12 +130,12 @@
   check verify = header_syntax
   accept: condition test failed
   end of ACL "check_data": implicit DENY
  -SMTP>> 550 Administrative prohibition
  +SMTP>> 550 Administrative prohibition
   LOG: MAIN REJECT
     U=CALLER F=<> rejected after DATA: domain missing or malformed: failing address in "To:" header is: abc@xyz.
   smtp_setup_msg entered
   SMTP<< quit
  -SMTP>> 221 myhost.test.ex closing connection
  +SMTP>> 221 myhost.test.ex closing connection
   LOG: smtp_connection MAIN
     SMTP connection from CALLER closed by QUIT
   search_tidyup called


  Index: 0479
  ===================================================================
  RCS file: /home/cvs/exim/exim-test/stderr/0479,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 0479    7 Feb 2006 10:47:31 -0000    1.1
  +++ 0479    8 Mar 2006 10:49:18 -0000    1.2
  @@ -20,16 +20,16 @@
   host in helo_verify_hosts? no (option unset)
   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>> 220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
   smtp_setup_msg entered
   SMTP<< helo [1.2.3.4]
   [1.2.3.4] in helo_lookup_domains? no (end of list)
   sender_fullhost = ([1.2.3.4]) [1.2.3.4]
   sender_rcvhost = [1.2.3.4]
   set_process_info: pppp handling incoming connection from ([1.2.3.4]) [1.2.3.4]
  -SMTP>> 250 the.local.host.name Hello [1.2.3.4] [1.2.3.4]
  +SMTP>> 250 the.local.host.name Hello [1.2.3.4] [1.2.3.4]
   SMTP<< mail from:<a@b>
  -SMTP>> 250 OK
  +SMTP>> 250 OK
   SMTP<< rcpt to:<c@d>
   using ACL "rcpt"
   processing "require"
  @@ -67,7 +67,7 @@
   require: condition test succeeded
   processing "accept"
   accept: condition test succeeded
  -SMTP>> 250 Accepted
  +SMTP>> 250 Accepted
   SMTP<< rcpt to:<e@f>
   using ACL "rcpt"
   processing "require"
  @@ -80,9 +80,9 @@
   require: condition test succeeded
   processing "accept"
   accept: condition test succeeded
  -SMTP>> 250 Accepted
  +SMTP>> 250 Accepted
   SMTP<< quit
  -SMTP>> 221 the.local.host.name closing connection
  +SMTP>> 221 the.local.host.name closing connection
   LOG: smtp_connection MAIN
     SMTP connection from ([1.2.3.4]) [1.2.3.4] closed by QUIT
   search_tidyup called


  Index: 0487
  ===================================================================
  RCS file: /home/cvs/exim/exim-test/stderr/0487,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 0487    7 Feb 2006 10:47:31 -0000    1.1
  +++ 0487    8 Mar 2006 10:49:18 -0000    1.2
  @@ -12,22 +12,22 @@
    in hosts_connection_nolog? no (option unset)
   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>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
   smtp_setup_msg entered
   SMTP<< ehlo x.y
    in pipelining_advertise_hosts? yes (matched "*")
  -SMTP>> 250-myhost.test.ex Hello CALLER at x.y
  -250-SIZE 52428800
  -250-PIPELINING
  -250 HELP
  +SMTP>> 250-myhost.test.ex Hello CALLER at x.y
  +250-SIZE 52428800
  +250-PIPELINING
  +250 HELP
   SMTP<< mail from:<x@y>
  -SMTP>> 250 OK
  +SMTP>> 250 OK
   SMTP<< rcpt to:<userx@???>
   processing "accept"
   accept: condition test succeeded
  -SMTP>> 250 Accepted
  +SMTP>> 250 Accepted
   SMTP<< data
  -SMTP>> 354 Enter message, ending with "." on a line by itself
  +SMTP>> 354 Enter message, ending with "." on a line by itself
   search_tidyup called
   >>Headers received:
   From: unqualified
  @@ -54,7 +54,7 @@
   LOG: MAIN
     <= x@y U=CALLER P=local-esmtp S=sss
   created log directory TESTSUITE/spool/log
  -SMTP>> 250 OK id=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=0xfbb95cfd -odi -Mc 10HmaX-0005vi-00
   Exim version x.yz ....
  @@ -166,7 +166,7 @@
   >>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>>
   smtp_setup_msg entered
   SMTP<< quit
  -SMTP>> 221 myhost.test.ex closing connection
  +SMTP>> 221 myhost.test.ex closing connection
   LOG: smtp_connection MAIN
     SMTP connection from CALLER closed by QUIT
   search_tidyup called


  Index: 2600
  ===================================================================
  RCS file: /home/cvs/exim/exim-test/stderr/2600,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 2600    7 Feb 2006 10:47:31 -0000    1.1
  +++ 2600    8 Mar 2006 10:49:18 -0000    1.2
  @@ -126,10 +126,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)
  -SMTP>> 220 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<< mail from:<a@b>
  -SMTP>> 250 OK
  +SMTP>> 250 OK
   SMTP<< rcpt to:<c@d>
   using ACL "check_recipient"
   processing "accept"
  @@ -154,7 +154,7 @@
   accept: condition test failed
   processing "deny"
   deny: condition test succeeded
  -SMTP>> 550 relay not permitted
  +SMTP>> 550 relay not permitted
   LOG: MAIN REJECT
     H=[10.0.0.0] F=<a@b> rejected RCPT <c@d>: relay not permitted
   SMTP<< rcpt to:<c@d>
  @@ -182,11 +182,11 @@
   accept: condition test failed
   processing "deny"
   deny: condition test succeeded
  -SMTP>> 550 relay not permitted
  +SMTP>> 550 relay not permitted
   LOG: MAIN REJECT
     H=[10.0.0.0] F=<a@b> rejected RCPT <c@d>: relay not permitted
   SMTP<< quit
  -SMTP>> 221 myhost.test.ex closing connection
  +SMTP>> 221 myhost.test.ex closing connection
   LOG: smtp_connection MAIN
     SMTP connection from [10.0.0.0] closed by QUIT
   search_tidyup called
  @@ -213,10 +213,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)
  -SMTP>> 220 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<< mail from:<a@b>
  -SMTP>> 250 OK
  +SMTP>> 250 OK
   SMTP<< rcpt to:<c@d>
   using ACL "check_recipient"
   processing "accept"
  @@ -238,7 +238,7 @@
   host in "sqlite;TESTSUITE/aux-fixed/sqlitedb select * from them where id='10.10.10.10'"? yes (matched "sqlite;TESTSUITE/aux-fixed/sqlitedb select * from them where id='10.10.10.10'")
   host in "+relay_hosts"? yes (matched "+relay_hosts")
   accept: condition test succeeded
  -SMTP>> 250 Accepted
  +SMTP>> 250 Accepted
   SMTP<< rcpt to:<c@d>
   using ACL "check_recipient"
   processing "accept"
  @@ -261,9 +261,9 @@
   host in "sqlite;TESTSUITE/aux-fixed/sqlitedb select * from them where id='10.10.10.10'"? yes (matched "sqlite;TESTSUITE/aux-fixed/sqlitedb select * from them where id='10.10.10.10'")
   host in "+relay_hosts"? yes (matched "+relay_hosts")
   accept: condition test succeeded
  -SMTP>> 250 Accepted
  +SMTP>> 250 Accepted
   SMTP<< quit
  -SMTP>> 221 myhost.test.ex closing connection
  +SMTP>> 221 myhost.test.ex closing connection
   LOG: smtp_connection MAIN
     SMTP connection from [10.10.10.10] closed by QUIT
   search_tidyup called


  Index: 3201
  ===================================================================
  RCS file: /home/cvs/exim/exim-test/stderr/3201,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 3201    7 Feb 2006 10:47:31 -0000    1.1
  +++ 3201    8 Mar 2006 10:49:18 -0000    1.2
  @@ -35,7 +35,7 @@
   host in "testdb;fail"? no (end of list)
   deny: condition test failed
   end of ACL "connect1": implicit DENY
  -SMTP>> 550 Administrative prohibition
  +SMTP>> 550 Administrative prohibition
   LOG: MAIN REJECT
     H=[10.0.0.1] rejected connection in "connect" ACL
   search_tidyup called
  @@ -77,7 +77,7 @@
   host in "net-testdb;fail"? no (end of list)
   deny: condition test failed
   end of ACL "connect2": implicit DENY
  -SMTP>> 550 Administrative prohibition
  +SMTP>> 550 Administrative prohibition
   LOG: MAIN REJECT
     H=[10.0.0.2] rejected connection in "connect" ACL
   search_tidyup called


  Index: 3400
  ===================================================================
  RCS file: /home/cvs/exim/exim-test/stderr/3400,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- 3400    2 Mar 2006 12:25:48 -0000    1.3
  +++ 3400    8 Mar 2006 10:49:18 -0000    1.4
  @@ -383,7 +383,7 @@
   warn: condition test failed
   processing "accept"
   accept: condition test succeeded
  -SMTP>> 220 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<< ehlo testing.testing
   testing.testing in helo_lookup_domains? no (end of list)
  @@ -395,22 +395,22 @@
   host in "10.0.0.4"? no (end of list)
   host in "10.0.0.3 : 10.0.0.4"? no (end of list)
   host in auth_advertise_hosts? yes (matched "10.0.0.5")
  -SMTP>> 250-myhost.test.ex Hello CALLER at testing.testing [10.0.0.5]
  -250-SIZE 52428800
  -250-ETRN
  -250-EXPN
  -250-PIPELINING
  -250-AUTH MYLOGIN PLAIN EXPLAIN EXPANDED EXPANDFAIL DEFER LOGIN
  -250 HELP
  +SMTP>> 250-myhost.test.ex Hello CALLER at testing.testing [10.0.0.5]
  +250-SIZE 52428800
  +250-ETRN
  +250-EXPN
  +250-PIPELINING
  +250-AUTH MYLOGIN PLAIN EXPLAIN EXPANDED EXPANDFAIL DEFER LOGIN
  +250 HELP
   SMTP<< auth mylogin dXNlcnggc2VjcmV0
   mylogin authenticator:
     $auth1 = userx secret
     $1 = userx secret
   +++MYLOGIN $1="userx secret" $2="" $3=""
   expanded string: yes
  -SMTP>> 235 Authentication succeeded
  +SMTP>> 235 Authentication succeeded
   SMTP<< quit
  -SMTP>> 221 myhost.test.ex closing connection
  +SMTP>> 221 myhost.test.ex closing connection
   LOG: smtp_connection MAIN
     SMTP connection from CALLER closed by QUIT
   search_tidyup called