X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/2e768e3cc0ce768373d3320eca4cdd08b8cf646a..71decbbc7b32f17449aa88c0297263c3ab324780:/uip/post.c

diff --git a/uip/post.c b/uip/post.c
index 9b8bcbef..9c7af29e 100644
--- a/uip/post.c
+++ b/uip/post.c
@@ -88,6 +88,7 @@
     X("user", SASLminc(-4), USERSW) \
     X("port server port name/number", 4, PORTSW) \
     X("tls", TLSminc(-3), TLSSW) \
+    X("initialtls", TLSminc(-10), INITTLSSW) \
     X("notls", TLSminc(-5), NTLSSW) \
     X("fileproc", -4, FILEPROCSW) \
     X("mhlproc", -3, MHLPROCSW) \
@@ -468,7 +469,11 @@ main (int argc, char **argv)
 		    continue;
 
 		case TLSSW:
-		    tls++;
+		    tls = 1;
+		    continue;
+
+		case INITTLSSW:
+		    tls = 2;
 		    continue;
 
 		case NTLSSW:
@@ -1071,7 +1076,7 @@ get_header (char *header, struct headers *table)
     struct headers *h;
 
     for (h = table; h->value; h++)
-	if (!mh_strcasecmp (header, h->value))
+	if (!strcasecmp (header ? header : "", h->value ? h->value : ""))
 	    return (h - table);
 
     return NOTOK;
@@ -1172,9 +1177,11 @@ insert (struct mailname *np)
 	    : &netaddrs;
 	    mp->m_next;
 	    mp = mp->m_next)
-	if (!mh_strcasecmp (np->m_host, mp->m_next->m_host)
-		&& !mh_strcasecmp (np->m_mbox, mp->m_next->m_mbox)
-		&& np->m_bcc == mp->m_next->m_bcc)
+	if (!strcasecmp (np->m_host ? np->m_host : "",
+			 mp->m_next->m_host ? mp->m_next->m_host : "") &&
+	    !strcasecmp (np->m_mbox ? np->m_mbox : "",
+			 mp->m_next->m_mbox ? mp->m_next->m_mbox : "") &&
+	    np->m_bcc == mp->m_next->m_bcc)
 	    return 0;
 
     mp->m_next = np;