Fix non-EVENTS build

Broken-by: c4b57fddca

diff --git a/src/src/transports/smtp.c b/src/src/transports/smtp.c
index 1631817d948a5b86e6e55f79a5ca833f71c84d9d..ae4385a052162eb2120406828a667139e4db223e 100644 (file)
--- a/src/src/transports/smtp.c
+++ b/src/src/transports/smtp.c
@@ -1626,9 +1626,11 @@ if (!continue_hostname)
                                  string_sprintf("DANE error: tlsa lookup %s",
                                    rc == DEFER ? "DEFER" : "FAIL"),
                                  rc, FALSE);
                                  string_sprintf("DANE error: tlsa lookup %s",
                                    rc == DEFER ? "DEFER" : "FAIL"),
                                  rc, FALSE);

+# ifndef DISABLE_EVENT

                                (void) event_raise(sx->tblock->event_action,
                                  US"dane:fail", sx->dane_required
                                    ?  US"dane-required" : US"dnssec-invalid");
                                (void) event_raise(sx->tblock->event_action,
                                  US"dane:fail", sx->dane_required
                                    ?  US"dane-required" : US"dnssec-invalid");

+# endif

                                return rc;
          }
       }
                                return rc;
          }
       }


@@ -1637,8 +1639,10 @@ if (!continue_hostname)
       set_errno_nohost(sx->addrlist, ERRNO_DNSDEFER,
        string_sprintf("DANE error: %s lookup not DNSSEC", sx->host->name),
        FAIL, FALSE);
       set_errno_nohost(sx->addrlist, ERRNO_DNSDEFER,
        string_sprintf("DANE error: %s lookup not DNSSEC", sx->host->name),
        FAIL, FALSE);

+# ifndef DISABLE_EVENT

       (void) event_raise(sx->tblock->event_action,
        US"dane:fail", US"dane-required");
       (void) event_raise(sx->tblock->event_action,
        US"dane:fail", US"dane-required");

+# endif

       return FAIL;
       }
     }
       return FAIL;
       }
     }


@@ -1983,8 +1987,10 @@ if (  smtp_peer_options & OPTION_TLS
        log_write(0, LOG_MAIN,
          "DANE attempt failed; TLS connection to %s [%s]: %s",
          sx->host->name, sx->host->address, errstr);
        log_write(0, LOG_MAIN,
          "DANE attempt failed; TLS connection to %s [%s]: %s",
          sx->host->name, sx->host->address, errstr);

+#  ifndef DISABLE_EVENT

        (void) event_raise(sx->tblock->event_action,
          US"dane:fail", US"validation-failure");       /* could do with better detail */
        (void) event_raise(sx->tblock->event_action,
          US"dane:fail", US"validation-failure");       /* could do with better detail */

+#  endif

        }
 # endif
 
        }
 # endif
 


@@ -2079,7 +2085,7 @@ else if (  sx->smtps
   message = string_sprintf("a TLS session is required, but %s",
     smtp_peer_options & OPTION_TLS
     ? "an attempt to start TLS failed" : "the server did not offer TLS support");
   message = string_sprintf("a TLS session is required, but %s",
     smtp_peer_options & OPTION_TLS
     ? "an attempt to start TLS failed" : "the server did not offer TLS support");

-# ifdef SUPPORT_DANE
+# if defined(SUPPORT_DANE) && !defined(DISABLE_EVENT)

   if (sx->dane)
     (void) event_raise(sx->tblock->event_action, US"dane:fail",
       smtp_peer_options & OPTION_TLS
   if (sx->dane)
     (void) event_raise(sx->tblock->event_action, US"dane:fail",
       smtp_peer_options & OPTION_TLS