Basic DANE entry points

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

diff --git a/src/src/tls.c b/src/src/tls.c
index b5ef965951ff3634471f7777438ebf2052877481..f2ab56706201a8bbc267ea0a031b71366438604a 100644 (file)
--- a/src/src/tls.c
+++ b/src/src/tls.c
@@ -196,6 +196,8 @@ modify_variable(US"tls_sni",                  &dest_tsp->sni);
 #endif
 }
 
+
+#ifdef SUPPORT_TLS
 /************************************************
 *      TLS certificate name operations         *
 ************************************************/
@@ -239,7 +241,7 @@ uschar * match = NULL;
 int len;
 uschar * list = NULL;
 
-while (ele = string_nextinlist(&mod, &insep, NULL, 0))
+while ((ele = string_nextinlist(&mod, &insep, NULL, 0)))
   if (ele[0] != '>')
     match = ele;       /* field tag to match */
   else if (ele[1])
@@ -248,14 +250,14 @@ while (ele = string_nextinlist(&mod, &insep, NULL, 0))
 dn_to_list(dn);
 insep = ',';
 len = Ustrlen(match);
-while (ele = string_nextinlist(&dn, &insep, NULL, 0))
+while ((ele = string_nextinlist(&dn, &insep, NULL, 0)))
   if (Ustrncmp(ele, match, len) == 0 && ele[len] == '=')
     list = string_append_listele(list, outsep, ele+len+1);
 return list;
 }
 
 
-#ifdef EXPERIMENTAL_CERTNAMES
+# ifdef EXPERIMENTAL_CERTNAMES
 /* Compare a domain name with a possibly-wildcarded name. Wildcards
 are restricted to a single one, as the first element of patterns
 having at least three dot-separated elements.  Case-independent.
@@ -299,10 +301,10 @@ uschar * cmpname;
 if ((altnames = tls_cert_subject_altname(cert, US"dns")))
   {
   int alt_sep = '\n';
-  while (cmpname = string_nextinlist(&namelist, &cmp_sep, NULL, 0))
+  while ((cmpname = string_nextinlist(&namelist, &cmp_sep, NULL, 0)))
     {
     uschar * an = altnames;
-    while (certname = string_nextinlist(&an, &alt_sep, NULL, 0))
+    while ((certname = string_nextinlist(&an, &alt_sep, NULL, 0)))
       if (is_name_match(cmpname, certname))
        return TRUE;
     }
@@ -311,13 +313,12 @@ if ((altnames = tls_cert_subject_altname(cert, US"dns")))
 else if ((subjdn = tls_cert_subject(cert, NULL)))
   {
   int sn_sep = ',';
-  uschar * sn;
 
   dn_to_list(subjdn);
-  while (cmpname = string_nextinlist(&namelist, &cmp_sep, NULL, 0))
+  while ((cmpname = string_nextinlist(&namelist, &cmp_sep, NULL, 0)))
     {
     uschar * sn = subjdn;
-    while (certname = string_nextinlist(&sn, &sn_sep, NULL, 0))
+    while ((certname = string_nextinlist(&sn, &sn_sep, NULL, 0)))
       if (  *certname++ == 'C'
         && *certname++ == 'N'
         && *certname++ == '='
@@ -328,7 +329,8 @@ else if ((subjdn = tls_cert_subject(cert, NULL)))
   }
 return FALSE;
 }
-#endif
+# endif        /*EXPERIMENTAL_CERTNAMES*/
+#endif /*SUPPORT_TLS*/
 
 /* vi: aw ai sw=2
 */