Update patches for 2.4.17+caldav~beta7 release
Ondřej Surý
10 years ago
43 | 43 |
|
44 | 44 |
{ "defaultpartition", NULL, STRING }
|
45 | 45 |
/* The partition name used by default for new mailboxes. If not
|
46 | |
@@ -737,7 +741,10 @@ Blank lines and lines beginning with ``#
|
|
46 |
@@ -744,7 +748,10 @@ Blank lines and lines beginning with ``#
|
47 | 47 |
/* The list of remote realms whose users may authenticate using cross-realm
|
48 | 48 |
authentication identifiers. Separate each realm name by a space. (A
|
49 | 49 |
cross-realm identity is considered any identity returned by SASL
|
15 | 15 |
Also, it is possible that new daemons and utils in Cyrus 2.2 and 2.3 may
|
16 | 16 |
need similar patches.
|
17 | 17 |
|
18 | |
--- cyrus-imapd-2.4.orig/imap/backend.c
|
19 | |
+++ cyrus-imapd-2.4/imap/backend.c
|
20 | |
@@ -700,6 +700,7 @@ struct backend *backend_connect(struct b
|
21 | |
|
22 | |
if (r) {
|
23 | |
if (!ret_backend) free(ret);
|
24 | |
+ shutdown(sock, SHUT_RDWR);
|
25 | |
close(sock);
|
26 | |
ret = NULL;
|
27 | |
}
|
28 | 18 |
--- cyrus-imapd-2.4.orig/imap/fud.c
|
29 | 19 |
+++ cyrus-imapd-2.4/imap/fud.c
|
30 | 20 |
@@ -163,6 +163,15 @@ void shut_down(int code)
|
13 | 13 |
|
14 | 14 |
--- cyrus-imapd-2.4.orig/configure.in
|
15 | 15 |
+++ cyrus-imapd-2.4/configure.in
|
16 | |
@@ -1554,7 +1554,11 @@ enum {
|
|
16 |
@@ -1561,7 +1561,11 @@ enum {
|
17 | 17 |
SQUAT_ENGINE = 1,
|
18 | 18 |
|
19 | 19 |
/* should we have long LMTP error messages? */
|
0 | 0 |
--- cyrus-imapd-2.4.orig/lib/imapoptions
|
1 | 1 |
+++ cyrus-imapd-2.4/lib/imapoptions
|
2 | |
@@ -1044,12 +1044,13 @@ And the notification message will be ava
|
|
2 |
@@ -1051,12 +1051,13 @@ And the notification message will be ava
|
3 | 3 |
in minutes. The minimum value is 10, the default. */
|
4 | 4 |
|
5 | 5 |
{ "popuseacl", 0, SWITCH }
|
65 | 65 |
|
66 | 66 |
--- cyrus-imapd-2.4.orig/lib/imapoptions
|
67 | 67 |
+++ cyrus-imapd-2.4/lib/imapoptions
|
68 | |
@@ -1565,6 +1565,11 @@ product version in the capabilities */
|
|
68 |
@@ -1572,6 +1572,11 @@ product version in the capabilities */
|
69 | 69 |
the special use flag "\Drafts" added. Later versions of Cyrus
|
70 | 70 |
have a much more flexible RFC 6154 compatible system. */
|
71 | 71 |
|