X-Git-Url: https://code.citadel.org/?p=citadel.git;a=blobdiff_plain;f=citadel%2Fmodules%2Fsieve%2Fserv_sieve.c;fp=citadel%2Fmodules%2Fsieve%2Fserv_sieve.c;h=94d8a5fa34a0738a7374df3e718a3088c1e5dfa9;hp=ed69de8587f600d5cb00a265cc63d3085a7f9b32;hb=7c94d5bb68f1c448770d31205ec5ae12bd8a02ed;hpb=c8c89455faeb5a76d6ee2264f497b8f790e0e392

diff --git a/citadel/modules/sieve/serv_sieve.c b/citadel/modules/sieve/serv_sieve.c
index ed69de858..94d8a5fa3 100644
--- a/citadel/modules/sieve/serv_sieve.c
+++ b/citadel/modules/sieve/serv_sieve.c
@@ -2,7 +2,7 @@
  * This module glues libSieve to the Citadel server in order to implement
  * the Sieve mailbox filtering language (RFC 3028).
  *
- * Copyright (c) 1987-2012 by the citadel.org team
+ * Copyright (c) 1987-2015 by the citadel.org team
  *
  * This program is open source software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3.
@@ -124,7 +124,7 @@ int ctdl_redirect(sieve2_context_t *s, void *my)
 		return SIEVE2_ERROR_BADARGS;
 	}
 
-	msg = CtdlFetchMessage(cs->msgnum, 1);
+	msg = CtdlFetchMessage(cs->msgnum, 1, 1);
 	if (msg == NULL) {
 		SV_syslog(LOG_WARNING, "REDIRECT failed: unable to fetch msg %ld", cs->msgnum);
 		free_recipients(valid);
@@ -553,7 +553,7 @@ void sieve_do_msg(long msgnum, void *userdata) {
 	/*
 	 * Make sure you include message body so you can get those second-level headers ;)
 	 */
-	msg = CtdlFetchMessage(msgnum, 1);
+	msg = CtdlFetchMessage(msgnum, 1, 1);
 	if (msg == NULL) return;
 
 	/*
@@ -626,7 +626,7 @@ void sieve_do_msg(long msgnum, void *userdata) {
 	}
 	if (haschar(my.envelope_from, '@') == 0) {
 		strcat(my.envelope_from, "@");
-		strcat(my.envelope_from, config.c_fqdn);
+		strcat(my.envelope_from, CtdlGetConfigStr("c_fqdn"));
 	}
 
 	/* Keep track of the envelope-to address (use body-to if not found) */
@@ -652,7 +652,7 @@ void sieve_do_msg(long msgnum, void *userdata) {
 	}
 	if (haschar(my.envelope_to, '@') == 0) {
 		strcat(my.envelope_to, "@");
-		strcat(my.envelope_to, config.c_fqdn);
+		strcat(my.envelope_to, CtdlGetConfigStr("c_fqdn"));
 	}
 
 	CM_Free(msg);
@@ -749,7 +749,7 @@ void get_sieve_config_backend(long msgnum, void *userdata) {
 	long conflen;
 
 	u->config_msgnum = msgnum;
-	msg = CtdlFetchMessage(msgnum, 1);
+	msg = CtdlFetchMessage(msgnum, 1, 1);
 	if (msg == NULL) {
 		u->config_msgnum = (-1) ;
 		return;
@@ -1185,7 +1185,7 @@ void cmd_msiv(char *argbuf) {
 		extract_token(script_name, argbuf, 1, '|', sizeof script_name);
 		if (!IsEmptyStr(script_name)) {
 			cprintf("%d Transmit script now\n", SEND_LISTING);
-			script_content = CtdlReadMessageBody(HKEY("000"), config.c_maxmsglen, NULL, 0, 0);
+			script_content = CtdlReadMessageBody(HKEY("000"), CtdlGetConfigLong("c_maxmsglen"), NULL, 0, 0);
 			msiv_putscript(&u, script_name, script_content);
 			changes_made = 1;
 		}