opportunistic TLS

When the TLS handshake fails, retry delivery with TLS disabled

1 files changed, 19 insertions, 3 deletions

diff --git a/qmail-rspawn.c b/qmail-rspawn.c
index 9d838e6..40e5d52 100644
--- a/qmail-rspawn.c
+++ b/qmail-rspawn.c
@@ -25,6 +25,7 @@ int len;
  int k;
  int result;
  int orr;
+ int l;
 
  if (wait_crashed(wstat))
   { substdio_puts(ss,"Zqmail-remote crashed.\n"); return; }
@@ -48,8 +49,16 @@ int len;
      j = k + 1;
     }
 
+ j = 0;
+ for (k = 0;k < len;++k)
+   if (!s[k])
+    {
+     if (s[j] != 'l') break;
+     j = k + 1;
+    }
+
  orr = result;
- switch(s[0])
+ switch(s[j])
   {
    case 's': orr = 0; break;
    case 'h': orr = -1;
@@ -62,10 +71,17 @@ int len;
    case -1: substdio_put(ss,"D",1); break;
   }
 
- for (k = 1;k < len;)
+ for (k = l = 1;k < j;++k)
+   if (!s[k])
+    {
+     substdio_puts(ss,s + l);
+     l = k + 2;
+    }
+
+ for (k = j+1;k < len;)
    if (!s[k++])
     {
-     substdio_puts(ss,s + 1);
+     substdio_puts(ss,s + j + 1);
      if (result <= orr)
        if (k < len)
          switch(s[k])