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

Kezdőlap
Üzenet törlése
Válasz az üzenetre
Szerző: Philip Hazel
Dátum:  
Címzett: exim-cvs
Tárgy: [exim-cvs] cvs commit: exim/exim-doc/doc-txt ChangeLog NewStuff OptionLists.txt exim/exim-src ACKNOWLEDGMENTS exim/exim-src/src/auths README cram_md5.c plaintext.c plaintext.h spa.c exim/exim-src/s
ph10 2006/02/23 12:41:23 GMT

  Modified files:
    exim-doc/doc-txt     ChangeLog NewStuff OptionLists.txt 
    exim-src             ACKNOWLEDGMENTS 
    exim-src/src/auths   README cram_md5.c plaintext.c plaintext.h 
                         spa.c 
    exim-src/src/transports smtp.c 
    exim-test/confs      3401 3404 
    exim-test/log        3401 
    exim-test/scripts/3400-plaintext 3401 3404 
    exim-test/stdout     3401 3407 
  Log:
  Make server prompts available in $auth<n> when plaintext is running as a
  client.


  Revision  Changes    Path
  1.313     +9 -0      exim/exim-doc/doc-txt/ChangeLog
  1.90      +13 -0     exim/exim-doc/doc-txt/NewStuff
  1.18      +2 -1      exim/exim-doc/doc-txt/OptionLists.txt
  1.42      +2 -1      exim/exim-src/ACKNOWLEDGMENTS
  1.5       +2 -1      exim/exim-src/src/auths/README
  1.5       +6 -2      exim/exim-src/src/auths/cram_md5.c
  1.5       +40 -3     exim/exim-src/src/auths/plaintext.c
  1.4       +1 -0      exim/exim-src/src/auths/plaintext.h
  1.7       +2 -0      exim/exim-src/src/auths/spa.c
  1.22      +6 -1      exim/exim-src/src/transports/smtp.c
  1.2       +5 -0      exim/exim-test/confs/3401
  1.2       +1 -0      exim/exim-test/confs/3404
  1.2       +10 -0     exim/exim-test/log/3401
  1.2       +46 -0     exim/exim-test/scripts/3400-plaintext/3401
  1.2       +2 -0      exim/exim-test/scripts/3400-plaintext/3404
  1.2       +48 -0     exim/exim-test/stdout/3401
  1.2       +4 -0      exim/exim-test/stdout/3407


  Index: ChangeLog
  ===================================================================
  RCS file: /home/cvs/exim/exim-doc/doc-txt/ChangeLog,v
  retrieving revision 1.312
  retrieving revision 1.313
  diff -u -r1.312 -r1.313
  --- ChangeLog    22 Feb 2006 15:10:28 -0000    1.312
  +++ ChangeLog    23 Feb 2006 12:41:22 -0000    1.313
  @@ -1,4 +1,4 @@
  -$Cambridge: exim/exim-doc/doc-txt/ChangeLog,v 1.312 2006/02/22 15:10:28 ph10 Exp $
  +$Cambridge: exim/exim-doc/doc-txt/ChangeLog,v 1.313 2006/02/23 12:41:22 ph10 Exp $


   Change log file for Exim from version 4.21
   -------------------------------------------
  @@ -226,6 +226,15 @@
         and H retry rules. I suspect nobody ever tinkers with this value.


   PH/44 Added STRIP_COMMAND=/usr/bin/strip to the FreeBSD Makefile.
  +
  +PH/45 When the plaintext authenticator is running as a client, the server's
  +      challenges are checked to ensure they are valid base64 strings. By
  +      default, the authentication attempt is cancelled if an invalid string is
  +      received. Setting client_ignore_invalid_base64 true ignores these errors.
  +      The decoded challenge strings are now placed in $auth1, $auth2, etc. as
  +      they are received. Thus, the responses can be made to depend on the
  +      challenges. If an invalid string is ignored, an empty string is placed in
  +      the variable.



Exim version 4.60

  Index: NewStuff
  ===================================================================
  RCS file: /home/cvs/exim/exim-doc/doc-txt/NewStuff,v
  retrieving revision 1.89
  retrieving revision 1.90
  diff -u -r1.89 -r1.90
  --- NewStuff    22 Feb 2006 15:08:20 -0000    1.89
  +++ NewStuff    23 Feb 2006 12:41:22 -0000    1.90
  @@ -1,4 +1,4 @@
  -$Cambridge: exim/exim-doc/doc-txt/NewStuff,v 1.89 2006/02/22 15:08:20 ph10 Exp $
  +$Cambridge: exim/exim-doc/doc-txt/NewStuff,v 1.90 2006/02/23 12:41:22 ph10 Exp $


   New Features in Exim
   --------------------
  @@ -73,6 +73,19 @@
         to 24 hours. This avoids potential overflow problems when processing G
         and H retry rules, and it seems reasonable to require a retry at least
         once a day.
  +
  +PH/12 When the plaintext authenticator is running as a client, the server
  +      challenges are now checked to ensure they are valid base64 strings. The
  +      default action on failure is to abort the authentication. However, if
  +      client_ignore_invalid_base64 is set true, invalid responses are ignored.
  +
  +PH/13 When the plaintext authenticator is running as a client, the challenges
  +      from the server are placed in $auth1, $auth2, etc. as they are received.
  +      Thus, the challege that is received in response to sending the first
  +      string (with the AUTH command) can be used in the expansion of the second
  +      string, and so on. Currently, up to 3 challenge strings are available in
  +      this way. If an invalid base64 string is received when client_ignore_
  +      invalid_base64 is set, an empty string is put in the $auth<n> variable.



Version 4.60

  Index: OptionLists.txt
  ===================================================================
  RCS file: /home/cvs/exim/exim-doc/doc-txt/OptionLists.txt,v
  retrieving revision 1.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- OptionLists.txt    20 Feb 2006 16:31:48 -0000    1.17
  +++ OptionLists.txt    23 Feb 2006 12:41:22 -0000    1.18
  @@ -1,4 +1,4 @@
  -$Cambridge: exim/exim-doc/doc-txt/OptionLists.txt,v 1.17 2006/02/20 16:31:48 ph10 Exp $
  +$Cambridge: exim/exim-doc/doc-txt/OptionLists.txt,v 1.18 2006/02/23 12:41:22 ph10 Exp $


   LISTS OF EXIM OPTIONS
   ---------------------
  @@ -11,7 +11,7 @@
     4. Those that can appear in the build time configuration for the Exim monitor
        (Local/eximon.conf).


-This file was last updated for Exim release 4.60.
+This file was last updated for Exim release 4.61.


   1. RUN TIME OPTIONS
  @@ -124,6 +124,7 @@
   check_string                         string          "From "       appendfile        3.03
                                                        unset         pipe              3.03
   check_srv                            string*         unset         dnslookup         4.31
  +client_ignore_invalid_base64         boolean         false         plaintext         4.61
   client_name                          string*         +             cram_md5          3.10
   client_secret                        string*         unset         cram_md5          3.10
   client_send                          string*         unset         plaintext         3.10


  Index: ACKNOWLEDGMENTS
  ===================================================================
  RCS file: /home/cvs/exim/exim-src/ACKNOWLEDGMENTS,v
  retrieving revision 1.41
  retrieving revision 1.42
  diff -u -r1.41 -r1.42
  --- ACKNOWLEDGMENTS    14 Feb 2006 15:24:10 -0000    1.41
  +++ ACKNOWLEDGMENTS    23 Feb 2006 12:41:22 -0000    1.42
  @@ -1,4 +1,4 @@
  -$Cambridge: exim/exim-src/ACKNOWLEDGMENTS,v 1.41 2006/02/14 15:24:10 ph10 Exp $
  +$Cambridge: exim/exim-src/ACKNOWLEDGMENTS,v 1.42 2006/02/23 12:41:22 ph10 Exp $


EXIM ACKNOWLEDGEMENTS

@@ -20,7 +20,7 @@
Philip Hazel

Lists created: 20 November 2002
-Last updated: 13 February 2006
+Last updated: 23 February 2006


   THE OLD LIST
  @@ -71,6 +71,7 @@
   Ian Bell                  Analysis of a bug and an infelicity in clock tick code
                             Patch for ${quote_local_part
   Peter Benie               A number mistakes found by analysing the code
  +Johannes Berg             Suggested patch for authentication client $auth<n> support
   Matt Bernstein            LMTP over socket
                             Suggested patch for dnslists '&' feature
   Mike Bethune              Help with debugging an elusive ALRM signal bug


  Index: README
  ===================================================================
  RCS file: /home/cvs/exim/exim-src/src/auths/README,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- README    10 Feb 2006 14:25:43 -0000    1.4
  +++ README    23 Feb 2006 12:41:22 -0000    1.5
  @@ -1,4 +1,4 @@
  -$Cambridge: exim/exim-src/src/auths/README,v 1.4 2006/02/10 14:25:43 ph10 Exp $
  +$Cambridge: exim/exim-src/src/auths/README,v 1.5 2006/02/23 12:41:22 ph10 Exp $


AUTHS

  @@ -87,7 +87,8 @@
     FAIL        failed after reading a response;
                 either errno is set (for timeouts, I/O failures) or
                 the buffer contains the SMTP response line
  -  FORCEFAIL   failed without reading a response (often "fail" in expansion)
  +  CANCELLED   the client cancelled authentication (often "fail" in expansion)
  +              the buffer may contain a message; if not, *buffer = 0
     ERROR       local problem (typically expansion error); message in buffer


To communicate with the remote host the client should call

  Index: cram_md5.c
  ===================================================================
  RCS file: /home/cvs/exim/exim-src/src/auths/cram_md5.c,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- cram_md5.c    10 Feb 2006 14:25:43 -0000    1.4
  +++ cram_md5.c    23 Feb 2006 12:41:22 -0000    1.5
  @@ -1,4 +1,4 @@
  -/* $Cambridge: exim/exim-src/src/auths/cram_md5.c,v 1.4 2006/02/10 14:25:43 ph10 Exp $ */
  +/* $Cambridge: exim/exim-src/src/auths/cram_md5.c,v 1.5 2006/02/23 12:41:22 ph10 Exp $ */


   /*************************************************
   *     Exim - an Internet mail transport agent    *
  @@ -250,7 +250,7 @@
     smtp_inblock *inblock,                 /* input connection */
     smtp_outblock *outblock,               /* output connection */
     int timeout,                           /* command timeout */
  -  uschar *buffer,                          /* for reading response */
  +  uschar *buffer,                        /* for reading response */
     int buffsize)                          /* size of buffer */
   {
   auth_cram_md5_options_block *ob =
  @@ -266,7 +266,11 @@


   if (secret == NULL || name == NULL)
     {
  -  if (expand_string_forcedfail) return CANCELLED;
  +  if (expand_string_forcedfail)
  +    {
  +    *buffer = 0;           /* No message */
  +    return CANCELLED;
  +    }
     string_format(buffer, buffsize, "expansion of \"%s\" failed in "
       "%s authenticator: %s",
       (secret == NULL)? ob->client_secret : ob->client_name,


  Index: plaintext.c
  ===================================================================
  RCS file: /home/cvs/exim/exim-src/src/auths/plaintext.c,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- plaintext.c    10 Feb 2006 14:25:43 -0000    1.4
  +++ plaintext.c    23 Feb 2006 12:41:22 -0000    1.5
  @@ -1,4 +1,4 @@
  -/* $Cambridge: exim/exim-src/src/auths/plaintext.c,v 1.4 2006/02/10 14:25:43 ph10 Exp $ */
  +/* $Cambridge: exim/exim-src/src/auths/plaintext.c,v 1.5 2006/02/23 12:41:22 ph10 Exp $ */


   /*************************************************
   *     Exim - an Internet mail transport agent    *
  @@ -14,6 +14,8 @@
   /* Options specific to the plaintext authentication mechanism. */


   optionlist auth_plaintext_options[] = {
  +  { "client_ignore_invalid_base64", opt_bool,
  +      (void *)(offsetof(auth_plaintext_options_block, client_ignore_invalid_base64)) },
     { "client_send",        opt_stringptr,
         (void *)(offsetof(auth_plaintext_options_block, client_send)) },
     { "server_condition",   opt_stringptr,
  @@ -33,7 +35,8 @@
   auth_plaintext_options_block auth_plaintext_option_defaults = {
     NULL,              /* server_condition */
     NULL,              /* server_prompts */
  -  NULL               /* client_send */
  +  NULL,              /* client_send */
  +  FALSE              /* client_ignore_invalid_base64 */
   };



@@ -216,6 +219,7 @@
uschar *s;
BOOL first = TRUE;
int sep = 0;
+int auth_var_idx = 0;

/* The text is broken up into a number of different data items, which are
sent one by one. The first one is sent with the AUTH command; the remainder are
@@ -223,8 +227,9 @@

   while ((s = string_nextinlist(&text, &sep, big_buffer, big_buffer_size)) != NULL)
     {
  -  int i, len;
  +  int i, len, clear_len;
     uschar *ss = expand_string(s);
  +  uschar *clear;


     /* Forced expansion failure is not an error; authentication is abandoned. On
     all but the first string, we have to abandon the authentication attempt by
  @@ -239,7 +244,11 @@
         if (smtp_write_command(outblock, FALSE, "*\r\n") >= 0)
           (void) smtp_read_response(inblock, US buffer, buffsize, '2', timeout);
         }
  -    if (expand_string_forcedfail) return CANCELLED;
  +    if (expand_string_forcedfail)
  +      {
  +      *buffer = 0;       /* No message */
  +      return CANCELLED;
  +      }
       string_format(buffer, buffsize, "expansion of \"%s\" failed in %s "
         "authenticator: %s", ssave, ablock->name, expand_string_message);
       return ERROR;
  @@ -304,6 +313,34 @@
         "authenticator", ablock->name);
       return ERROR;
       }
  +
  +  /* Now that we know we'll continue, we put the received data into $auth<n>,
  +  if possible. First, decode it: buffer+4 skips over the SMTP status code. */
  +
  +  clear_len = auth_b64decode(buffer+4, &clear);
  +
  +  /* If decoding failed, the default is to terminate the authentication, and
  +  return FAIL, with the SMTP response still in the buffer. However, if client_
  +  ignore_invalid_base64 is set, we ignore the error, and put an empty string
  +  into $auth<n>. */
  +
  +  if (clear_len < 0)
  +    {
  +    uschar *save_bad = string_copy(buffer);
  +    if (!ob->client_ignore_invalid_base64)
  +      {
  +      if (smtp_write_command(outblock, FALSE, "*\r\n") >= 0)
  +        (void)smtp_read_response(inblock, US buffer, buffsize, '2', timeout);
  +      string_format(buffer, buffsize, "Invalid base64 string in server "
  +        "response \"%s\"", save_bad);
  +      return CANCELLED;
  +      }
  +    clear = US"";
  +    clear_len = 0;
  +    }
  +
  +  if (auth_var_idx < AUTH_VARS)
  +    auth_vars[auth_var_idx++] = string_copy(clear);
     }


/* Control should never actually get here. */

  Index: plaintext.h
  ===================================================================
  RCS file: /home/cvs/exim/exim-src/src/auths/plaintext.h,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- plaintext.h    7 Feb 2006 11:19:01 -0000    1.3
  +++ plaintext.h    23 Feb 2006 12:41:22 -0000    1.4
  @@ -1,4 +1,4 @@
  -/* $Cambridge: exim/exim-src/src/auths/plaintext.h,v 1.3 2006/02/07 11:19:01 ph10 Exp $ */
  +/* $Cambridge: exim/exim-src/src/auths/plaintext.h,v 1.4 2006/02/23 12:41:22 ph10 Exp $ */


   /*************************************************
   *     Exim - an Internet mail transport agent    *
  @@ -13,6 +13,7 @@
     uschar *server_condition;
     uschar *server_prompts;
     uschar *client_send;
  +  BOOL    client_ignore_invalid_base64;
   } auth_plaintext_options_block;


/* Data for reading the private options. */

  Index: spa.c
  ===================================================================
  RCS file: /home/cvs/exim/exim-src/src/auths/spa.c,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- spa.c    10 Feb 2006 14:25:43 -0000    1.6
  +++ spa.c    23 Feb 2006 12:41:22 -0000    1.7
  @@ -1,4 +1,4 @@
  -/* $Cambridge: exim/exim-src/src/auths/spa.c,v 1.6 2006/02/10 14:25:43 ph10 Exp $ */
  +/* $Cambridge: exim/exim-src/src/auths/spa.c,v 1.7 2006/02/23 12:41:22 ph10 Exp $ */


   /*************************************************
   *     Exim - an Internet mail transport agent    *
  @@ -262,6 +262,8 @@
          char *username, *password;


          /* Code added by PH to expand the options */
  +
  +       *buffer = 0;    /* Default no message when cancelled */


          username = CS expand_string(ob->spa_username);
          if (username == NULL)


  Index: smtp.c
  ===================================================================
  RCS file: /home/cvs/exim/exim-src/src/transports/smtp.c,v
  retrieving revision 1.21
  retrieving revision 1.22
  diff -u -r1.21 -r1.22
  --- smtp.c    21 Feb 2006 16:24:20 -0000    1.21
  +++ smtp.c    23 Feb 2006 12:41:23 -0000    1.22
  @@ -1,4 +1,4 @@
  -/* $Cambridge: exim/exim-src/src/transports/smtp.c,v 1.21 2006/02/21 16:24:20 ph10 Exp $ */
  +/* $Cambridge: exim/exim-src/src/transports/smtp.c,v 1.22 2006/02/23 12:41:23 ph10 Exp $ */


   /*************************************************
   *     Exim - an Internet mail transport agent    *
  @@ -1211,9 +1211,14 @@
               /* Failure by some other means. In effect, the authenticator
               decided it wasn't prepared to handle this case. Typically this
               is the result of "fail" in an expansion string. Do we need to
  -            log anything here? */
  +            log anything here? Feb 2006: a message is now put in the buffer
  +            if logging is required. */


               case CANCELLED:
  +            if (*buffer != 0)
  +              log_write(0, LOG_MAIN, "%s authenticator cancelled "
  +                "authentication H=%s [%s] %s", au->name, host->name,
  +                host->address, buffer);
               break;


               /* Internal problem, message in buffer. */


  Index: 3401
  ===================================================================
  RCS file: /home/cvs/exim/exim-test/confs/3401,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 3401    7 Feb 2006 10:34:26 -0000    1.1
  +++ 3401    23 Feb 2006 12:41:23 -0000    1.2
  @@ -28,6 +28,11 @@
     public_name = PLAIN
     client_send = ^userx^secret


+xlogin:
+ driver = plaintext
+ public_name = XLOGIN
+ client_send = : $auth1 : $auth1+$auth2
+

# ----- Routers -----


  Index: 3404
  ===================================================================
  RCS file: /home/cvs/exim/exim-test/confs/3404,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 3404    7 Feb 2006 10:34:26 -0000    1.1
  +++ 3404    23 Feb 2006 12:41:23 -0000    1.2
  @@ -27,6 +27,7 @@
     driver = plaintext
     public_name = LOGIN
     client_send = :userx:secret
  +  client_ignore_invalid_base64



# ----- Routers -----

  Index: 3401
  ===================================================================
  RCS file: /home/cvs/exim/exim-test/log/3401,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 3401    7 Feb 2006 10:34:46 -0000    1.1
  +++ 3401    23 Feb 2006 12:41:23 -0000    1.2
  @@ -29,3 +29,13 @@
   1999-03-02 09:44:33 10HmbF-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss
   1999-03-02 09:44:33 10HmbF-0005vi-00 => forcesender@??? R=try T=smtp_try H=127.0.0.1 [127.0.0.1]
   1999-03-02 09:44:33 10HmbF-0005vi-00 Completed
  +1999-03-02 09:44:33 10HmbG-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss
  +1999-03-02 09:44:33 10HmbG-0005vi-00 login authenticator cancelled authentication H=127.0.0.1 [127.0.0.1] Invalid base64 string in server response "334 User?"
  +1999-03-02 09:44:33 10HmbG-0005vi-00 ** userx@??? R=try T=smtp_try: SMTP error from remote mail server after MAIL FROM:<CALLER@???>: host 127.0.0.1 [127.0.0.1]: 550 Not now
  +1999-03-02 09:44:33 10HmbH-0005vi-00 <= <> R=10HmbG-0005vi-00 U=EXIMUSER P=local S=sss
  +1999-03-02 09:44:33 10HmbH-0005vi-00 ** CALLER@???: Unrouteable address
  +1999-03-02 09:44:33 10HmbH-0005vi-00 Frozen (delivery error message)
  +1999-03-02 09:44:33 10HmbG-0005vi-00 Completed
  +1999-03-02 09:44:33 10HmbI-0005vi-00 <= CALLER@??? U=CALLER P=local S=sss
  +1999-03-02 09:44:33 10HmbI-0005vi-00 => userx@??? R=try T=smtp_try H=127.0.0.1 [127.0.0.1]
  +1999-03-02 09:44:33 10HmbI-0005vi-00 Completed


  Index: 3401
  ===================================================================
  RCS file: /home/cvs/exim/exim-test/scripts/3400-plaintext/3401,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 3401    7 Feb 2006 10:54:49 -0000    1.1
  +++ 3401    23 Feb 2006 12:41:23 -0000    1.2
  @@ -138,4 +138,50 @@
   exim -odi forcesender@???
   .
   ****
  +# Bad basd64 from server; client aborts
  +server PORT_S
  +220 ESMTP
  +EHLO
  +250-OK
  +250-HELP
  +250 AUTH LOGIN
  +AUTH LOGIN
  +334 User?
  +*
  +501 Authentication cancelled
  +MAIL FROM:
  +550 Not now
  +QUIT
  +250 OK
  +****
  +exim -odi userx@???
  +.
  +****
  +# Test the server challenges in $auth<n>
  +server PORT_S
  +220 ESMTP
  +EHLO
  +250-OK
  +250-HELP
  +250 AUTH XLOGIN
  +AUTH XLOGIN
  +334 Y2hhbGxlbmdlLTE=
  +Y2hhbGxlbmdlLTE=
  +334 YW5vdGhlcm9uZQ==
  +Y2hhbGxlbmdlLTErYW5vdGhlcm9uZQ==
  +235 Authentication successful
  +MAIL FROM:
  +250 Sender OK
  +RCPT TO:
  +250 Recipient OK
  +DATA
  +354 Send data
  +.
  +250 OK
  +QUIT
  +250 OK
  +****
  +exim -odi userx@???
  +.
  +****
   no_msglog_check


  Index: 3404
  ===================================================================
  RCS file: /home/cvs/exim/exim-test/scripts/3400-plaintext/3404,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 3404    7 Feb 2006 10:54:49 -0000    1.1
  +++ 3404    23 Feb 2006 12:41:23 -0000    1.2
  @@ -45,6 +45,8 @@
   exim -v -oMas xxx@yyy -oMai zzz -odi userx@???
   .
   ****
  +# The server prompts sent here are not b64 encoded; hence they test
  +# client_ignore_invalid_base64.
   server PORT_S
   220 ESMTP
   EHLO


  Index: 3401
  ===================================================================
  RCS file: /home/cvs/exim/exim-test/stdout/3401,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 3401    7 Feb 2006 10:47:37 -0000    1.1
  +++ 3401    23 Feb 2006 12:41:23 -0000    1.2
  @@ -150,3 +150,51 @@
   QUIT
   250 OK
   End of script
  +Listening on port 1224 ... 
  +Connection request from [127.0.0.1]
  +220 ESMTP
  +EHLO myhost.test.ex
  +250-OK
  +250-HELP
  +250 AUTH LOGIN
  +AUTH LOGIN
  +334 User?
  +*
  +501 Authentication cancelled
  +MAIL FROM:<CALLER@???>
  +550 Not now
  +QUIT
  +250 OK
  +End of script
  +Listening on port 1224 ... 
  +Connection request from [127.0.0.1]
  +220 ESMTP
  +EHLO myhost.test.ex
  +250-OK
  +250-HELP
  +250 AUTH XLOGIN
  +AUTH XLOGIN
  +334 Y2hhbGxlbmdlLTE=
  +Y2hhbGxlbmdlLTE=
  +334 YW5vdGhlcm9uZQ==
  +Y2hhbGxlbmdlLTErYW5vdGhlcm9uZQ==
  +235 Authentication successful
  +MAIL FROM:<CALLER@???> AUTH=CALLER@???
  +250 Sender OK
  +RCPT TO:<userx@???>
  +250 Recipient OK
  +DATA
  +354 Send data
  +Received: from CALLER by myhost.test.ex with local (Exim x.yz)
  +    (envelope-from <CALLER@???>)
  +    id 10HmbI-0005vi-00
  +    for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
  +Message-Id: <E10HmbI-0005vi-00@???>
  +From: CALLER_NAME <CALLER@???>
  +Date: Tue, 2 Mar 1999 09:44:33 +0000
  +
  +.
  +250 OK
  +QUIT
  +250 OK
  +End of script


  Index: 3407
  ===================================================================
  RCS file: /home/cvs/exim/exim-test/stdout/3407,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 3407    7 Feb 2006 10:47:37 -0000    1.1
  +++ 3407    23 Feb 2006 12:41:23 -0000    1.2
  @@ -6,6 +6,7 @@
   server_debug_print = 
   server_mail_auth_condition = 
   server_set_id = 
  +no_client_ignore_invalid_base64
   client_send = 
   server_condition = xxx
   server_prompts = 
  @@ -17,6 +18,7 @@
   server_debug_print = 
   server_mail_auth_condition = 
   server_set_id = 
  +no_client_ignore_invalid_base64
   client_send = 
   server_condition = 
   server_prompts = 
  @@ -28,6 +30,7 @@
   server_debug_print = 
   server_mail_auth_condition = 
   server_set_id = 
  +no_client_ignore_invalid_base64
   client_send = 
   server_condition = 
   server_prompts = 
  @@ -39,6 +42,7 @@
   server_debug_print = 
   server_mail_auth_condition = 
   server_set_id = 
  +no_client_ignore_invalid_base64
   client_send = 
   server_condition = 
   server_prompts =