X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Fsrc%2Ftransport.c;h=13f3c07fcfc34b214bf8256fe4cc567818f2afd3;hb=dc525e9633df9a3a21eb636ff070e2b3b6d02410;hp=62cbdc632a1d6f3ca4dc596bd9a65655858d7778;hpb=94431adbd61d7706fe6df3a19bcae043fec950bf;p=exim.git

diff --git a/src/src/transport.c b/src/src/transport.c
index 62cbdc632..13f3c07fc 100644
--- a/src/src/transport.c
+++ b/src/src/transport.c
@@ -66,7 +66,7 @@ optionlist optionlist_transports[] = {
                  (void *)offsetof(transport_instance, driver_name) },
   { "envelope_to_add",   opt_bool|opt_public,
                  (void *)(offsetof(transport_instance, envelope_to_add)) },
-#ifdef EXPERIMENTAL_EVENT
+#ifndef DISABLE_EVENT
   { "event_action",     opt_stringptr | opt_public,
                  (void *)offsetof(transport_instance, event_action) },
 #endif
@@ -1213,7 +1213,10 @@ transport_filter_timed_out = FALSE;
 /* If there is no filter command set up, call the internal function that does
 the actual work, passing it the incoming fd, and return its result. */
 
-if (transport_filter_argv == NULL)
+if (  !transport_filter_argv
+   || !*transport_filter_argv
+   || !**transport_filter_argv
+   )
   return internal_transport_write_message(addr, fd, options, size_limit,
     add_headers, remove_headers, check_string, escape_string,
     rewrite_rules, rewrite_existflags);