From: Ken Hornstein <kenh@pobox.com>
Date: Fri, 23 Sep 2016 18:14:26 +0000 (-0400)
Subject: Merge branch 'pop-tls'
X-Git-Url: https://diplodocus.org/git/nmh/commitdiff_plain/1d08c1e0c0de0d321883ece1c36bce851fe893c7?ds=sidebyside

Merge branch 'pop-tls'
---

1d08c1e0c0de0d321883ece1c36bce851fe893c7
diff --cc sbr/oauth.c
index 3433fba0,85fe7146..f4564d0f
mode 100755,100644..100755
--- a/sbr/oauth.c
+++ b/sbr/oauth.c
diff --cc uip/whatnowsbr.c
index 80386e95,8498f92c..d6c336f6
--- a/uip/whatnowsbr.c
+++ b/uip/whatnowsbr.c
@@@ -942,12 -942,11 +942,11 @@@ buildfile (char **argp, char *file
      X("client host", -6, CLIESW) \
      X("server host", 6, SERVSW) \
      X("snoop", -5, SNOOPSW) \
 -    X("draftfolder +folder", -6, SDRFSW) \
 -    X("draftmessage msg", -6, SDRMSW) \
 -    X("nodraftfolder", -3, SNDRFSW) \
 +    X("draftfolder +folder", 0, SDRFSW) \
 +    X("draftmessage msg", 0, SDRMSW) \
 +    X("nodraftfolder", 0, SNDRFSW) \
      X("sasl", SASLminc(4), SASLSW) \
      X("nosasl", SASLminc(6), NOSASLSW) \
-     X("saslmaxssf", SASLminc(10), SASLMXSSFSW) \
      X("saslmech", SASLminc(5), SASLMECHSW) \
      X("authservice", SASLminc(0), AUTHSERVICESW) \
      X("user username", SASLminc(4), USERSW) \