Ensure acl_not_smtp_start is called for -bS input.

diff --git a/doc/doc-txt/ChangeLog b/doc/doc-txt/ChangeLog
index 4a7f77c7a3675e149881f182d7a717bf0fc994c0..1f9911d16db7237deaeec10d9d2147cc8d7ebd20 100644 (file)
--- a/doc/doc-txt/ChangeLog
+++ b/doc/doc-txt/ChangeLog
@@ -1,4 +1,4 @@
-$Cambridge: exim/doc/doc-txt/ChangeLog,v 1.462 2007/01/23 15:08:45 ph10 Exp $
+$Cambridge: exim/doc/doc-txt/ChangeLog,v 1.463 2007/01/25 15:51:28 ph10 Exp $

 
 Change log file for Exim from version 4.21
 -------------------------------------------
 
 Change log file for Exim from version 4.21
 -------------------------------------------


@@ -54,6 +54,12 @@ PH/08 Added $smtp_count_at_connection_start, deliberately with a long name.
 
 PH/09 Installed PCRE release 7.0.
 
 
 PH/09 Installed PCRE release 7.0.
 

+PH/10 The acl_not_smtp_start ACL was, contrary to the documentation, not being
+      run for batched SMTP input. It is now run at the start of every message
+      in the batch. While fixing this I discovered that the process information
+      (output by running exiwhat) was not always getting set for -bs and -bS
+      input. This is fixed, and it now also says "batched" for BSMTP.
+

 
 Exim version 4.66
 -----------------
 
 Exim version 4.66
 -----------------

diff --git a/src/src/exim.c b/src/src/exim.c
index 553f47d997457d71fcc80ade90a18cb4ba78ca37..6f80dd131c10e1976e6c9948b65d88ead716302f 100644 (file)
--- a/src/src/exim.c
+++ b/src/src/exim.c
@@ -1,4 +1,4 @@
-/* $Cambridge: exim/src/src/exim.c,v 1.53 2007/01/17 11:29:39 ph10 Exp $ */
+/* $Cambridge: exim/src/src/exim.c,v 1.54 2007/01/25 15:51:28 ph10 Exp $ */

 
 /*************************************************
 *     Exim - an Internet mail transport agent    *
 
 /*************************************************
 *     Exim - an Internet mail transport agent    *


@@ -4487,16 +4487,17 @@ but fd 1 will not be set. This also happens for passed SMTP channels. */
 
 if (fstat(1, &statbuf) < 0) (void)dup2(0, 1);
 
 
 if (fstat(1, &statbuf) < 0) (void)dup2(0, 1);
 

-/* Set up the incoming protocol name and the state of the program. Root
-is allowed to force received protocol via the -oMr option above, and if we are
-in a non-local SMTP state it means we have come via inetd and the process info
-has already been set up. We don't set received_protocol here for smtp input,
-as it varies according to batch/HELO/EHLO/AUTH/TLS. */
+/* Set up the incoming protocol name and the state of the program. Root is
+allowed to force received protocol via the -oMr option above. If we have come
+via inetd, the process info has already been set up. We don't set
+received_protocol here for smtp input, as it varies according to
+batch/HELO/EHLO/AUTH/TLS. */

 
 if (smtp_input)
   {
 
 if (smtp_input)
   {

-  if (sender_local) set_process_info("accepting a local SMTP message from <%s>",
-    sender_address);
+  if (!is_inetd) set_process_info("accepting a local %sSMTP message from <%s>",
+    smtp_batched_input? "batched " : "",
+    (sender_address!= NULL)? sender_address : originator_login);

   }
 else
   {
   }
 else
   {


@@ -4523,8 +4524,8 @@ if ((!smtp_input || smtp_batched_input) && !receive_check_fs(0))
   return EXIT_FAILURE;
   }
 
   return EXIT_FAILURE;
   }
 

-/* If this is smtp input of any kind, handle the start of the SMTP
-session.
+/* If this is smtp input of any kind, real or batched, handle the start of the
+SMTP session.

 
 NOTE: We do *not* call smtp_log_no_mail() if smtp_start_session() fails,
 because a log line has already been written for all its failure exists
 
 NOTE: We do *not* call smtp_log_no_mail() if smtp_start_session() fails,
 because a log line has already been written for all its failure exists


@@ -4617,20 +4618,13 @@ while (more)
   store_reset(reset_point);
   message_id[0] = 0;
 
   store_reset(reset_point);
   message_id[0] = 0;
 

-  /* In the SMTP case, we have to handle the initial SMTP input and build the
-  recipients list, before calling receive_msg() to read the message proper.
-  Whatever sender address is actually given in the SMTP transaction is
-  actually ignored for local senders - we use the actual sender, which is
-  normally either the underlying user running this process or a -f argument
-  provided by a trusted caller. It is saved in real_sender_address.
-
-  However, if this value is NULL, we are dealing with a trusted caller when
-  -f was not used; in this case, the SMTP sender is allowed to stand.
-
-  Also, if untrusted_set_sender is set, we permit sender addresses that match
-  anything in its list.
-
-  The variable raw_sender_address holds the sender address before rewriting. */
+  /* Handle the SMTP case; call smtp_setup_mst() to deal with the initial SMTP
+  input and build the recipients list, before calling receive_msg() to read the
+  message proper. Whatever sender address is given in the SMTP transaction is
+  often ignored for local senders - we use the actual sender, which is normally
+  either the underlying user running this process or a -f argument provided by
+  a trusted caller. It is saved in real_sender_address. The test for whether to
+  accept the SMTP sender is encapsulated in receive_check_set_sender(). */

 
   if (smtp_input)
     {
 
   if (smtp_input)
     {


@@ -4643,6 +4637,23 @@ while (more)
         sender_address = raw_sender = real_sender_address;
         sender_address_unrewritten = NULL;
         }
         sender_address = raw_sender = real_sender_address;
         sender_address_unrewritten = NULL;
         }

+
+      /* For batched SMTP, we have to run the acl_not_smtp_start ACL, since it
+      isn't really SMTP, so no other ACL will run until the acl_not_smtp one at
+      the very end. The result of the ACL is ignored (as for other non-SMTP
+      messages). It is run for its potential side effects. */
+
+      if (smtp_batched_input && acl_not_smtp_start != NULL)
+        {
+        uschar *user_msg, *log_msg;
+        enable_dollar_recipients = TRUE;
+        (void)acl_check(ACL_WHERE_NOTSMTP_START, NULL, acl_not_smtp_start,
+          &user_msg, &log_msg);
+        enable_dollar_recipients = FALSE;
+        }
+
+      /* Now get the data for the message */
+

       more = receive_msg(extract_recipients);
       if (message_id[0] == 0)
         {
       more = receive_msg(extract_recipients);
       if (message_id[0] == 0)
         {

diff --git a/test/confs/0535 b/test/confs/0535
index 6504807f972373ebbbab328d7953f0347dea6da6..a45a374b7b880b7396f5589ef9746787bec11008 100644 (file)
--- a/test/confs/0535
+++ b/test/confs/0535
@@ -24,6 +24,7 @@ one:
        control = suppress_local_fixups
        add_header = X-Added: $recipients
 
        control = suppress_local_fixups
        add_header = X-Added: $recipients
 

+

 # ----- Routers -----
 
 begin routers
 # ----- Routers -----
 
 begin routers

diff --git a/test/confs/0548 b/test/confs/0548
index 18ef2abdd4d8a40048fed6c9ab46d72522564c9d..6306943de3e1d277174dd0c4289f805065f84833 100644 (file)
--- a/test/confs/0548
+++ b/test/confs/0548
@@ -15,6 +15,7 @@ gecos_name = CALLER_NAME
 acl_smtp_connect = acl_connect
 acl_smtp_rcpt = acl_rcpt
 qualify_domain = test.ex
 acl_smtp_connect = acl_connect
 acl_smtp_rcpt = acl_rcpt
 qualify_domain = test.ex

+queue_run_in_order

 
 
 # ----- ACLs -----
 
 
 # ----- ACLs -----

diff --git a/test/log/0535 b/test/log/0535
index e737ee2325b4d3e38059fcc56c49d4eb66496bf2..b4e13c8066b0bd3d72b9095e48752b6d1f3c4042 100644 (file)
--- a/test/log/0535
+++ b/test/log/0535
@@ -4,3 +4,9 @@
 1999-03-02 09:44:33 10HmaY-0005vi-00 <= nofix@test.ex U=CALLER P=local 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 <= nofix@test.ex U=CALLER P=local 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 10HmaZ-0005vi-00 <= x@y U=CALLER P=local-bsmtp 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 10HmbA-0005vi-00 <= nofix@test.ex U=CALLER P=local-bsmtp S=sss
+1999-03-02 09:44:33 10HmbA-0005vi-00 => userx <userx@test.ex> R=r1 T=t1
+1999-03-02 09:44:33 10HmbA-0005vi-00 Completed

diff --git a/test/mail/0535.userx b/test/mail/0535.userx
index 4ca2d61569196a526826ccdce1a6c46125708b8a..e3994508e4b786b214776519be06846a602d8c88 100644 (file)
--- a/test/mail/0535.userx
+++ b/test/mail/0535.userx
@@ -18,3 +18,23 @@ X-Added: userx@test.ex
 
 No headers supplied.
 
 
 No headers supplied.
 

+From x@y Tue Mar 02 09:44:33 1999
+Received: from CALLER by myhost.test.ex with local-bsmtp (Exim x.yz)
+       (envelope-from <x@y>)
+       id 10HmaZ-0005vi-00
+       for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+Message-Id: <E10HmaZ-0005vi-00@myhost.test.ex>
+From: x@y
+Date: Tue, 2 Mar 1999 09:44:33 +0000
+
+No headers supplied.
+
+From nofix@test.ex Tue Mar 02 09:44:33 1999
+Received: from CALLER by myhost.test.ex with local-bsmtp (Exim x.yz)
+       (envelope-from <nofix@test.ex>)
+       id 10HmbA-0005vi-00
+       for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+X-Added: userx@test.ex
+
+No headers supplied.
+

diff --git a/test/scripts/0000-Basic/0535 b/test/scripts/0000-Basic/0535
index 237fa4c9c03a907f64327637fa7eab6a52d3155a..72a1a1533b82bc95c3746336e9e89370d034b23d 100644 (file)
--- a/test/scripts/0000-Basic/0535
+++ b/test/scripts/0000-Basic/0535
@@ -5,3 +5,15 @@ No headers supplied.
 exim -odi -f nofix@test.ex userx@test.ex
 No headers supplied.
 ****
 exim -odi -f nofix@test.ex userx@test.ex
 No headers supplied.
 ****

+exim -odi -bS
+mail from:<x@y>
+rcpt to:<userx@test.ex>
+data
+No headers supplied.
+.
+mail from:<nofix@test.ex>
+rcpt to:<userx@test.ex>
+data
+No headers supplied.
+.
+****

diff --git a/test/stderr/0381 b/test/stderr/0381
index bca2de5bfdf5701eb9a990f2966d42cac4ea963f..a026767b8777dbbca7a1f34ddb01b56dcf073deb 100644 (file)
--- a/test/stderr/0381
+++ b/test/stderr/0381
@@ -13,6 +13,7 @@ sender address = NULL
 sender_fullhost = [V4NET.99.99.97]
 sender_rcvhost = [V4NET.99.99.97] (ident=CALLER)
 set_process_info: pppp handling incoming connection from [V4NET.99.99.97] via -oMa
 sender_fullhost = [V4NET.99.99.97]
 sender_rcvhost = [V4NET.99.99.97] (ident=CALLER)
 set_process_info: pppp handling incoming connection from [V4NET.99.99.97] via -oMa

+set_process_info: pppp accepting a local SMTP message from <CALLER>

 host in hosts_connection_nolog? no (option unset)
 LOG: smtp_connection MAIN
   SMTP connection from CALLER
 host in hosts_connection_nolog? no (option unset)
 LOG: smtp_connection MAIN
   SMTP connection from CALLER

diff --git a/test/stderr/0386 b/test/stderr/0386
index 8ff9bda89d98c414e0312c102369662a53872a41..a06f5294af30ecddf9d34a19575a4356248ac0da 100644 (file)
--- a/test/stderr/0386
+++ b/test/stderr/0386
@@ -133,6 +133,7 @@ sender address = NULL
 sender_fullhost = [V4NET.11.12.13]
 sender_rcvhost = [V4NET.11.12.13] (ident=CALLER)
 set_process_info: pppp handling incoming connection from [V4NET.11.12.13] via -oMa
 sender_fullhost = [V4NET.11.12.13]
 sender_rcvhost = [V4NET.11.12.13] (ident=CALLER)
 set_process_info: pppp handling incoming connection from [V4NET.11.12.13] via -oMa

+set_process_info: pppp accepting a local SMTP message from <CALLER>

 host in hosts_connection_nolog? no (option unset)
 LOG: smtp_connection MAIN
   SMTP connection from CALLER
 host in hosts_connection_nolog? no (option unset)
 LOG: smtp_connection MAIN
   SMTP connection from CALLER

diff --git a/test/stderr/0465 b/test/stderr/0465
index f429e3c47f14052096fe3232f24eb05d57b56917..4c84b14539f234e3fd22248847406d27a6531c59 100644 (file)
--- a/test/stderr/0465
+++ b/test/stderr/0465
@@ -10,6 +10,7 @@ changed uid/gid: privilege not needed
   uid=EXIM_UID gid=EXIM_GID pid=pppp
 originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
 sender address = NULL
   uid=EXIM_UID gid=EXIM_GID pid=pppp
 originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
 sender address = NULL

+set_process_info: pppp accepting a local SMTP message from <CALLER>

  in hosts_connection_nolog? no (option unset)
 LOG: smtp_connection MAIN
   SMTP connection from CALLER
  in hosts_connection_nolog? no (option unset)
 LOG: smtp_connection MAIN
   SMTP connection from CALLER


@@ -40,6 +41,7 @@ changed uid/gid: privilege not needed
   uid=EXIM_UID gid=EXIM_GID pid=pppp
 originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
 sender address = NULL
   uid=EXIM_UID gid=EXIM_GID pid=pppp
 originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
 sender address = NULL

+set_process_info: pppp accepting a local SMTP message from <CALLER>

  in hosts_connection_nolog? no (option unset)
 LOG: smtp_connection MAIN
   SMTP connection from CALLER
  in hosts_connection_nolog? no (option unset)
 LOG: smtp_connection MAIN
   SMTP connection from CALLER


@@ -101,6 +103,7 @@ changed uid/gid: privilege not needed
   uid=EXIM_UID gid=EXIM_GID pid=pppp
 originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
 sender address = NULL
   uid=EXIM_UID gid=EXIM_GID pid=pppp
 originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
 sender address = NULL

+set_process_info: pppp accepting a local SMTP message from <CALLER>

  in hosts_connection_nolog? no (option unset)
 LOG: smtp_connection MAIN
   SMTP connection from CALLER
  in hosts_connection_nolog? no (option unset)
 LOG: smtp_connection MAIN
   SMTP connection from CALLER

diff --git a/test/stderr/0487 b/test/stderr/0487
index 584672a7e2fc1970cb217f527d71b5805767c826..73c10e8910b5121ead83d7ebe8958a19a1949f05 100644 (file)
--- a/test/stderr/0487
+++ b/test/stderr/0487
@@ -12,6 +12,7 @@ seeking password data for user "CALLER": using cached result
 getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
 originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
 sender address = NULL
 getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
 originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
 sender address = NULL

+set_process_info: pppp accepting a local SMTP message from <CALLER>

  in hosts_connection_nolog? no (option unset)
 LOG: smtp_connection MAIN
   SMTP connection from CALLER
  in hosts_connection_nolog? no (option unset)
 LOG: smtp_connection MAIN
   SMTP connection from CALLER

diff --git a/test/stderr/3400 b/test/stderr/3400
index a2cc076eff32defe671d07cb9ac17c6bf109c352..896c60266589f59f8fb2b72ba6d4bcd0723e3b6f 100644 (file)
--- a/test/stderr/3400
+++ b/test/stderr/3400
@@ -368,6 +368,7 @@ sender address = NULL
 sender_fullhost = [10.0.0.5]
 sender_rcvhost = [10.0.0.5] (ident=CALLER)
 set_process_info: pppp handling incoming connection from [10.0.0.5] via -oMa
 sender_fullhost = [10.0.0.5]
 sender_rcvhost = [10.0.0.5] (ident=CALLER)
 set_process_info: pppp handling incoming connection from [10.0.0.5] via -oMa

+set_process_info: pppp accepting a local SMTP message from <CALLER>

 host in hosts_connection_nolog? no (option unset)
 LOG: smtp_connection MAIN
   SMTP connection from CALLER
 host in hosts_connection_nolog? no (option unset)
 LOG: smtp_connection MAIN
   SMTP connection from CALLER