Add observability variables and provision for avoiding OCSP conflicts

[exim.git] / src / src / expand.c

diff --git a/src/src/expand.c b/src/src/expand.c
index 23009bc4f2f065f12f4704e1e0cee3bb7554eace..ba2c6f7cdc61fdb6de6de9b43ff1db5878f1438b 100644 (file)
--- a/src/src/expand.c
+++ b/src/src/expand.c
@@ -684,6 +684,9 @@ static var_entry var_table[] = {
   { "tls_out_bits",        vtype_int,         &tls_out.bits },
   { "tls_out_certificate_verified", vtype_int,&tls_out.certificate_verified },
   { "tls_out_cipher",      vtype_stringptr,   &tls_out.cipher },
+#ifdef EXPERIMENTAL_DANE
+  { "tls_out_dane",        vtype_bool,        &tls_out.dane_verified },
+#endif
   { "tls_out_ocsp",        vtype_int,         &tls_out.ocsp },
   { "tls_out_ourcert",     vtype_cert,        &tls_out.ourcert },
   { "tls_out_peercert",    vtype_cert,        &tls_out.peercert },
@@ -691,6 +694,9 @@ static var_entry var_table[] = {
 #if defined(SUPPORT_TLS)
   { "tls_out_sni",         vtype_stringptr,   &tls_out.sni },
 #endif
+#ifdef EXPERIMENTAL_DANE
+  { "tls_out_tlsa_usage",  vtype_int,         &tls_out.tlsa_usage },
+#endif
 
   { "tls_peerdn",          vtype_stringptr,   &tls_in.peerdn },        /* mind the alphabetical order! */
 #if defined(SUPPORT_TLS)
@@ -1879,7 +1885,8 @@ switch (vp->type)
   #endif
 
   }
-return NULL;  /* Fix broken static checkers, already done in if() above */
+
+return NULL;  /* Unknown variable. Silences static checkers. */
 }
 
 
@@ -6367,14 +6374,14 @@ while (*s != 0)
 
       case EOP_UTF8CLEAN:
         {
-        int seq_len, index = 0;
+        int seq_len = 0, index = 0;
         int bytes_left = 0;
         uschar seq_buff[4];                    /* accumulate utf-8 here */
         
         while (*sub != 0)
          {
          int complete;
-         long codepoint;
+         long codepoint = 0;
          uschar c;
 
          complete = 0;