net-mail/cyrus-imapd/files/kolab/2.3.14/timsieved_starttls-sendcaps.patch


1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21

This patch was downloaded from https://bugzilla.andrew.cmu.edu/cgi-bin/cvsweb.cgi/src/cyrus/timsieved/parser.c.diff?r1=1.44;r2=1.45
(minus the CVS keywords)

It should be reverse-applied with patch -p2 -R to work around the kontact
behaviour described in kolab/issue2443 (kontact aborts sieve when imapd sends
capabilities after starttls) and can be dropped as soon as kontact has a way
to work with old and new cyrus imapd servers.

diff -r 1688e25afb65 timsieved/parser.c
--- a/timsieved/parser.c	Thu Apr 23 23:28:07 2009 +0200
+++ b/timsieved/parser.c	Thu Apr 23 23:28:54 2009 +0200
@@ -908,8 +908,7 @@
 
     starttls_done = 1;
 
-    return capabilities(sieved_out, sieved_saslconn, starttls_done,
-			authenticated, sasl_ssf);
+    return result;
 }
 #else
 static int cmd_starttls(struct protstream *sieved_out, struct protstream *sieved_in)