File KOLAB_cyrus-imapd-2.3.18_timsieved_starttls-sendcaps.patch of Package cyrus-imapd.3194

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.

Index: cyrus-imapd-2.3.17/timsieved/parser.c
===================================================================
--- cyrus-imapd-2.3.17.orig/timsieved/parser.c
+++ cyrus-imapd-2.3.17/timsieved/parser.c
@@ -912,8 +912,7 @@ static int cmd_starttls(struct protstrea
 
     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)