| 1 |
dertobi123 09/09/03 20:19:18 |
| 2 |
|
| 3 |
Added: cyrus-imapd-2.3.14-bug283596-2.patch |
| 4 |
Removed: cyrus-imapd-2.3.14-bug283596.patch |
| 5 |
Log: |
| 6 |
Fix patch |
| 7 |
(Portage version: 2.2_rc40/cvs/Linux i686) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 net-mail/cyrus-imapd/files/cyrus-imapd-2.3.14-bug283596-2.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-mail/cyrus-imapd/files/cyrus-imapd-2.3.14-bug283596-2.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-mail/cyrus-imapd/files/cyrus-imapd-2.3.14-bug283596-2.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: cyrus-imapd-2.3.14-bug283596-2.patch |
| 16 |
=================================================================== |
| 17 |
--- src/sieve/script.c 2008/03/24 20:08:46 1.67 |
| 18 |
+++ src/sieve/script.c 2009/09/02 13:56:18 1.68 |
| 19 |
@@ -40,7 +40,7 @@ |
| 20 |
* AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING |
| 21 |
* OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. |
| 22 |
* |
| 23 |
- * $Id: script.c,v 1.67 2008/03/24 20:08:46 murch Exp $ |
| 24 |
+ * $Id: script.c,v 1.68 2009/09/02 13:56:18 brong Exp $ |
| 25 |
*/ |
| 26 |
|
| 27 |
#ifdef HAVE_CONFIG_H |
| 28 |
@@ -688,7 +688,7 @@ static int do_sieve_error(int ret, |
| 29 |
ret |= keep_ret; |
| 30 |
if (keep_ret == SIEVE_OK) |
| 31 |
snprintf(actions_string+strlen(actions_string), |
| 32 |
- sizeof(actions_string)-strlen(actions_string), |
| 33 |
+ ACTIONS_STRING_LEN-strlen(actions_string), |
| 34 |
"Kept\n"); |
| 35 |
else { |
| 36 |
implicit_keep = 0; /* don't try an implicit keep again */ |
| 37 |
@@ -742,7 +742,7 @@ static int do_action_list(sieve_interp_t |
| 38 |
|
| 39 |
if (ret == SIEVE_OK) |
| 40 |
snprintf(actions_string+strlen(actions_string), |
| 41 |
- sizeof(actions_string)-strlen(actions_string), |
| 42 |
+ ACTIONS_STRING_LEN-strlen(actions_string), |
| 43 |
"Rejected with: %s\n", a->u.rej.msg); |
| 44 |
|
| 45 |
break; |
| 46 |
@@ -757,7 +757,7 @@ static int do_action_list(sieve_interp_t |
| 47 |
|
| 48 |
if (ret == SIEVE_OK) |
| 49 |
snprintf(actions_string+strlen(actions_string), |
| 50 |
- sizeof(actions_string)-strlen(actions_string), |
| 51 |
+ ACTIONS_STRING_LEN-strlen(actions_string), |
| 52 |
"Filed into: %s\n",a->u.fil.mailbox); |
| 53 |
break; |
| 54 |
case ACTION_KEEP: |
| 55 |
@@ -770,7 +770,7 @@ static int do_action_list(sieve_interp_t |
| 56 |
&errmsg); |
| 57 |
if (ret == SIEVE_OK) |
| 58 |
snprintf(actions_string+strlen(actions_string), |
| 59 |
- sizeof(actions_string)-strlen(actions_string), |
| 60 |
+ ACTIONS_STRING_LEN-strlen(actions_string), |
| 61 |
"Kept\n"); |
| 62 |
break; |
| 63 |
case ACTION_REDIRECT: |
| 64 |
@@ -783,7 +783,7 @@ static int do_action_list(sieve_interp_t |
| 65 |
&errmsg); |
| 66 |
if (ret == SIEVE_OK) |
| 67 |
snprintf(actions_string+strlen(actions_string), |
| 68 |
- sizeof(actions_string)-strlen(actions_string), |
| 69 |
+ ACTIONS_STRING_LEN-strlen(actions_string), |
| 70 |
"Redirected to %s\n", a->u.red.addr); |
| 71 |
break; |
| 72 |
case ACTION_DISCARD: |
| 73 |
@@ -794,7 +794,7 @@ static int do_action_list(sieve_interp_t |
| 74 |
&errmsg); |
| 75 |
if (ret == SIEVE_OK) |
| 76 |
snprintf(actions_string+strlen(actions_string), |
| 77 |
- sizeof(actions_string)-strlen(actions_string), |
| 78 |
+ ACTIONS_STRING_LEN-strlen(actions_string), |
| 79 |
"Discarded\n"); |
| 80 |
break; |
| 81 |
|
| 82 |
@@ -820,12 +820,12 @@ static int do_action_list(sieve_interp_t |
| 83 |
|
| 84 |
if (ret == SIEVE_OK) |
| 85 |
snprintf(actions_string+strlen(actions_string), |
| 86 |
- sizeof(actions_string)-strlen(actions_string), |
| 87 |
+ ACTIONS_STRING_LEN-strlen(actions_string), |
| 88 |
"Sent vacation reply\n"); |
| 89 |
|
| 90 |
} else if (ret == SIEVE_DONE) { |
| 91 |
snprintf(actions_string+strlen(actions_string), |
| 92 |
- sizeof(actions_string)-strlen(actions_string), |
| 93 |
+ ACTIONS_STRING_LEN-strlen(actions_string), |
| 94 |
"Vacation reply suppressed\n"); |
| 95 |
|
| 96 |
ret = SIEVE_OK; |
Archives