a35a8f
--- src/sieve/script.c	2008/03/24 20:08:46	1.67
a35a8f
+++ src/sieve/script.c	2009/09/02 13:56:18	1.68
a35a8f
@@ -40,7 +40,7 @@
a35a8f
  * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
a35a8f
  * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
a35a8f
  *
a35a8f
- * $Id: cyrus-imapd-2.3.13-bufov.patch,v 1.1 2009/09/07 14:37:58 mhlavink Exp $
a35a8f
+ * $Id: cyrus-imapd-2.3.13-bufov.patch,v 1.1 2009/09/07 14:37:58 mhlavink Exp $
a35a8f
  */
a35a8f
 
a35a8f
 #ifdef HAVE_CONFIG_H
a35a8f
@@ -688,7 +688,7 @@ static int do_sieve_error(int ret,
a35a8f
 	ret |= keep_ret;
a35a8f
         if (keep_ret == SIEVE_OK)
a35a8f
             snprintf(actions_string+strlen(actions_string),
a35a8f
-		     sizeof(actions_string)-strlen(actions_string),
a35a8f
+		     ACTIONS_STRING_LEN-strlen(actions_string),
a35a8f
 		     "Kept\n");
a35a8f
 	else {
a35a8f
 	    implicit_keep = 0;	/* don't try an implicit keep again */
a35a8f
@@ -742,7 +742,7 @@ static int do_action_list(sieve_interp_t
a35a8f
 	    
a35a8f
 	    if (ret == SIEVE_OK)
a35a8f
 		snprintf(actions_string+strlen(actions_string),
a35a8f
-			 sizeof(actions_string)-strlen(actions_string), 
a35a8f
+			 ACTIONS_STRING_LEN-strlen(actions_string), 
a35a8f
 			 "Rejected with: %s\n", a->u.rej.msg);
a35a8f
 
a35a8f
 	    break;
a35a8f
@@ -757,7 +757,7 @@ static int do_action_list(sieve_interp_t
a35a8f
 
a35a8f
 	    if (ret == SIEVE_OK)
a35a8f
 		snprintf(actions_string+strlen(actions_string),
a35a8f
-			 sizeof(actions_string)-strlen(actions_string),
a35a8f
+			 ACTIONS_STRING_LEN-strlen(actions_string),
a35a8f
 			 "Filed into: %s\n",a->u.fil.mailbox);
a35a8f
 	    break;
a35a8f
 	case ACTION_KEEP:
a35a8f
@@ -770,7 +770,7 @@ static int do_action_list(sieve_interp_t
a35a8f
 			       &errmsg);
a35a8f
 	    if (ret == SIEVE_OK)
a35a8f
 		snprintf(actions_string+strlen(actions_string),
a35a8f
-			 sizeof(actions_string)-strlen(actions_string),
a35a8f
+			 ACTIONS_STRING_LEN-strlen(actions_string),
a35a8f
 			 "Kept\n");
a35a8f
 	    break;
a35a8f
 	case ACTION_REDIRECT:
a35a8f
@@ -783,7 +783,7 @@ static int do_action_list(sieve_interp_t
a35a8f
 				   &errmsg);
a35a8f
 	    if (ret == SIEVE_OK)
a35a8f
 		snprintf(actions_string+strlen(actions_string),
a35a8f
-			 sizeof(actions_string)-strlen(actions_string),
a35a8f
+			 ACTIONS_STRING_LEN-strlen(actions_string),
a35a8f
 			 "Redirected to %s\n", a->u.red.addr);
a35a8f
 	    break;
a35a8f
 	case ACTION_DISCARD:
a35a8f
@@ -794,7 +794,7 @@ static int do_action_list(sieve_interp_t
a35a8f
 				      &errmsg);
a35a8f
 	    if (ret == SIEVE_OK)
a35a8f
 		snprintf(actions_string+strlen(actions_string),
a35a8f
-			 sizeof(actions_string)-strlen(actions_string),
a35a8f
+			 ACTIONS_STRING_LEN-strlen(actions_string),
a35a8f
 			 "Discarded\n");
a35a8f
 	    break;
a35a8f
 
a35a8f
@@ -820,12 +820,12 @@ static int do_action_list(sieve_interp_t
a35a8f
 
a35a8f
 		    if (ret == SIEVE_OK)
a35a8f
 			snprintf(actions_string+strlen(actions_string),
a35a8f
-				 sizeof(actions_string)-strlen(actions_string),
a35a8f
+				 ACTIONS_STRING_LEN-strlen(actions_string),
a35a8f
 				 "Sent vacation reply\n");
a35a8f
 
a35a8f
 		} else if (ret == SIEVE_DONE) {
a35a8f
 		    snprintf(actions_string+strlen(actions_string),
a35a8f
-			     sizeof(actions_string)-strlen(actions_string),
a35a8f
+			     ACTIONS_STRING_LEN-strlen(actions_string),
a35a8f
 			     "Vacation reply suppressed\n");
a35a8f
 
a35a8f
 		    ret = SIEVE_OK;