summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'net-mail/cyrus-imapd/files/kolab/2.3.12/timsieved_starttls-sendcaps.patch')
-rw-r--r--net-mail/cyrus-imapd/files/kolab/2.3.12/timsieved_starttls-sendcaps.patch19
1 files changed, 19 insertions, 0 deletions
diff --git a/net-mail/cyrus-imapd/files/kolab/2.3.12/timsieved_starttls-sendcaps.patch b/net-mail/cyrus-imapd/files/kolab/2.3.12/timsieved_starttls-sendcaps.patch
new file mode 100644
index 0000000..48524e9
--- /dev/null
+++ b/net-mail/cyrus-imapd/files/kolab/2.3.12/timsieved_starttls-sendcaps.patch
@@ -0,0 +1,19 @@
+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.
+
+--- a/timsieved/parser.c 2007/11/26 20:23:06 1.44
++++ b/timsieved/parser.c 2007/12/10 14:47:08 1.45
+@@ -861,7 +861,7 @@ static int cmd_starttls(struct protstrea
+
+ starttls_done = 1;
+
+- return capabilities(sieved_out, sieved_saslconn, starttls_done, authenticated);
++ return result;
+ }
+ #else
+ static int cmd_starttls(struct protstream *sieved_out, struct protstream *sieved_in)