thomas: server/patches/cyrus-imapd/cyrus-imapd-2.3.11 timsieved-starttls-sendcaps.patch, NONE, 1.1

cvs at kolab.org cvs at kolab.org
Fri Feb 1 19:07:14 CET 2008


Author: thomas

Update of /kolabrepository/server/patches/cyrus-imapd/cyrus-imapd-2.3.11
In directory doto:/tmp/cvs-serv24201

Added Files:
	timsieved-starttls-sendcaps.patch 
Log Message:
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

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.


--- NEW FILE: timsieved-starttls-sendcaps.patch ---
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

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.

--- src/cyrus/timsieved/parser.c	2007/11/26 20:23:06	1.44
+++ src/cyrus/timsieved/parser.c	2007/12/10 14:47:08	1.45
@@ -1,7 +1,7 @@
 /* parser.c -- parser used by timsieved
  * Tim Martin
  * 9/21/99
- * $Id: timsieved-starttls-sendcaps.patch,v 1.1 2008/02/01 18:07:11 thomas Exp $
+ * $Id: timsieved-starttls-sendcaps.patch,v 1.1 2008/02/01 18:07:11 thomas Exp $
  */
 /*
  * Copyright (c) 1998-2003 Carnegie Mellon University.  All rights reserved.
@@ -861,7 +861,7 @@ static int cmd_starttls(struct protstrea
 
     starttls_done = 1;
 
-    return result;
+    return capabilities(sieved_out, sieved_saslconn, starttls_done, authenticated);
 }
 #else
 static int cmd_starttls(struct protstream *sieved_out, struct protstream *sieved_in)





More information about the commits mailing list