X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fsrc%2Fdeliver.c;h=65f148c07b93aadabd62b11d4a37d4303b5f2d33;hb=5ef5dd52d1ded8b0ffdf4708e1d00e4ef458b86a;hp=f3ae2208a85be40e10e63524dc63c3a52cd9ba54;hpb=23f3dc67a13f71bb8fdf2930052d3fdce85e9774;p=user%2Fhenk%2Fcode%2Fexim.git

diff --git a/src/src/deliver.c b/src/src/deliver.c
index f3ae2208a..65f148c07 100644
--- a/src/src/deliver.c
+++ b/src/src/deliver.c
@@ -785,12 +785,14 @@ if (action)
 return NULL;
 }
 
-static void
+void
 msg_event_raise(const uschar * event, const address_item * addr)
 {
 const uschar * save_domain = deliver_domain;
 uschar * save_local =  deliver_localpart;
 const uschar * save_host = deliver_host;
+const uschar * save_address = deliver_host_address;
+const int      save_port =   deliver_host_port;
 
 if (!addr->transport)
   return;
@@ -802,9 +804,13 @@ deliver_localpart = addr->local_part;
 deliver_host =   addr->host_used ? addr->host_used->name : NULL;
 
 (void) event_raise(addr->transport->event_action, event,
-	  addr->host_used || Ustrcmp(addr->transport->driver_name, "lmtp") == 0
-	  ? addr->message : NULL);
+	  addr->host_used
+          || Ustrcmp(addr->transport->driver_name, "smtp") == 0
+	  || Ustrcmp(addr->transport->driver_name, "lmtp") == 0
+	 ? addr->message : NULL); 
 
+deliver_host_port =    save_port;
+deliver_host_address = save_address;
 deliver_host =      save_host;
 deliver_localpart = save_local;
 deliver_domain =    save_domain;
@@ -1288,9 +1294,17 @@ else if (result == DEFER || result == PANIC)
         US strerror(addr->basic_errno));
 
     if (addr->host_used)
+      {
       s = string_append(s, &size, &ptr, 5,
 			US" H=", addr->host_used->name,
 			US" [",  addr->host_used->address, US"]");
+      if (LOGGING(outgoing_port))
+	{
+	int port = addr->host_used->port;
+	s = string_append(s, &size, &ptr, 2,
+	      US":", port == PORT_NONE ? US"25" : string_sprintf("%d", port));
+	}
+      }
 
     if (addr->message)
       s = string_append(s, &size, &ptr, 2, US": ", addr->message);