X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fmodules%2Fsieve%2Fserv_sieve.c;h=7d56d5e0a96842947dafe048f0183b56a6b6d270;hb=73d9309f82fc743794390f6ea82e19b593261f17;hp=88c72e9943556e8f759745fc9bfc8230123c40a3;hpb=182f984f6f03067f40a7e01bfa82df95f5605358;p=citadel.git diff --git a/citadel/modules/sieve/serv_sieve.c b/citadel/modules/sieve/serv_sieve.c index 88c72e994..7d56d5e0a 100644 --- a/citadel/modules/sieve/serv_sieve.c +++ b/citadel/modules/sieve/serv_sieve.c @@ -1,24 +1,16 @@ /* - * $Id$ - * * This module glues libSieve to the Citadel server in order to implement * the Sieve mailbox filtering language (RFC 3028). * - * Copyright (c) 1987-2010 by the citadel.org team + * Copyright (c) 1987-2012 by the citadel.org team * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 3 of the License, or - * (at your option) any later version. + * 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. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include "sysdep.h" @@ -51,7 +43,6 @@ #include "citserver.h" #include "support.h" #include "config.h" -#include "policy.h" #include "database.h" #include "msgbase.h" #include "internet_addressing.h" @@ -60,6 +51,17 @@ struct RoomProcList *sieve_list = NULL; char *msiv_extensions = NULL; +int SieveDebugEnable = 0; + +#define DBGLOG(LEVEL) if ((LEVEL != LOG_DEBUG) || (SieveDebugEnable != 0)) + +#define SV_syslog(LEVEL, FORMAT, ...) \ + DBGLOG(LEVEL) syslog(LEVEL, \ + "Sieve: " FORMAT, __VA_ARGS__) + +#define SVM_syslog(LEVEL, FORMAT) \ + DBGLOG(LEVEL) syslog(LEVEL, \ + "Sieve: " FORMAT); /* @@ -67,7 +69,7 @@ char *msiv_extensions = NULL; */ int ctdl_debug(sieve2_context_t *s, void *my) { - CtdlLogPrintf(CTDL_DEBUG, "Sieve: %s\n", sieve2_getvalue_string(s, "message")); + SV_syslog(LOG_DEBUG, "%s", sieve2_getvalue_string(s, "message")); return SIEVE2_OK; } @@ -77,9 +79,9 @@ int ctdl_debug(sieve2_context_t *s, void *my) */ int ctdl_errparse(sieve2_context_t *s, void *my) { - CtdlLogPrintf(CTDL_WARNING, "Error in script, line %d: %s\n", - sieve2_getvalue_int(s, "lineno"), - sieve2_getvalue_string(s, "message") + SV_syslog(LOG_WARNING, "Error in script, line %d: %s", + sieve2_getvalue_int(s, "lineno"), + sieve2_getvalue_string(s, "message") ); return SIEVE2_OK; } @@ -90,9 +92,9 @@ int ctdl_errparse(sieve2_context_t *s, void *my) */ int ctdl_errexec(sieve2_context_t *s, void *my) { - CtdlLogPrintf(CTDL_WARNING, "Error executing script: %s\n", - sieve2_getvalue_string(s, "message") - ); + SV_syslog(LOG_WARNING, "Error executing script: %s", + sieve2_getvalue_string(s, "message") + ); return SIEVE2_OK; } @@ -109,22 +111,22 @@ int ctdl_redirect(sieve2_context_t *s, void *my) safestrncpy(recp, sieve2_getvalue_string(s, "address"), sizeof recp); - CtdlLogPrintf(CTDL_DEBUG, "Action is REDIRECT, recipient <%s>\n", recp); + SV_syslog(LOG_DEBUG, "Action is REDIRECT, recipient <%s>", recp); valid = validate_recipients(recp, NULL, 0); if (valid == NULL) { - CtdlLogPrintf(CTDL_WARNING, "REDIRECT failed: bad recipient <%s>\n", recp); + SV_syslog(LOG_WARNING, "REDIRECT failed: bad recipient <%s>", recp); return SIEVE2_ERROR_BADARGS; } if (valid->num_error > 0) { - CtdlLogPrintf(CTDL_WARNING, "REDIRECT failed: bad recipient <%s>\n", recp); + SV_syslog(LOG_WARNING, "REDIRECT failed: bad recipient <%s>", recp); free_recipients(valid); return SIEVE2_ERROR_BADARGS; } msg = CtdlFetchMessage(cs->msgnum, 1); if (msg == NULL) { - CtdlLogPrintf(CTDL_WARNING, "REDIRECT failed: unable to fetch msg %ld\n", cs->msgnum); + SV_syslog(LOG_WARNING, "REDIRECT failed: unable to fetch msg %ld", cs->msgnum); free_recipients(valid); return SIEVE2_ERROR_BADARGS; } @@ -144,7 +146,7 @@ int ctdl_keep(sieve2_context_t *s, void *my) { struct ctdl_sieve *cs = (struct ctdl_sieve *)my; - CtdlLogPrintf(CTDL_DEBUG, "Action is KEEP\n"); + SVM_syslog(LOG_DEBUG, "Action is KEEP"); cs->keep = 1; cs->cancel_implicit_keep = 1; @@ -163,7 +165,7 @@ int ctdl_fileinto(sieve2_context_t *s, void *my) char foldername[256]; char original_room_name[ROOMNAMELEN]; - CtdlLogPrintf(CTDL_DEBUG, "Action is FILEINTO, destination is <%s>\n", dest_folder); + SV_syslog(LOG_DEBUG, "Action is FILEINTO, destination is <%s>", dest_folder); /* FILEINTO 'INBOX' is the same thing as KEEP */ if ( (!strcasecmp(dest_folder, "INBOX")) || (!strcasecmp(dest_folder, MAILROOM)) ) { @@ -186,7 +188,7 @@ int ctdl_fileinto(sieve2_context_t *s, void *my) } if (c != 0) { - CtdlLogPrintf(CTDL_WARNING, "FILEINTO failed: target <%s> does not exist\n", dest_folder); + SV_syslog(LOG_WARNING, "FILEINTO failed: target <%s> does not exist", dest_folder); return SIEVE2_ERROR_BADARGS; } @@ -217,7 +219,7 @@ int ctdl_discard(sieve2_context_t *s, void *my) { struct ctdl_sieve *cs = (struct ctdl_sieve *)my; - CtdlLogPrintf(CTDL_DEBUG, "Action is DISCARD\n"); + SVM_syslog(LOG_DEBUG, "Action is DISCARD"); /* Cancel the implicit keep. That's all there is to it. */ cs->cancel_implicit_keep = 1; @@ -234,11 +236,11 @@ int ctdl_reject(sieve2_context_t *s, void *my) struct ctdl_sieve *cs = (struct ctdl_sieve *)my; char *reject_text = NULL; - CtdlLogPrintf(CTDL_DEBUG, "Action is REJECT\n"); + SVM_syslog(LOG_DEBUG, "Action is REJECT"); /* If we don't know who sent the message, do a DISCARD instead. */ if (IsEmptyStr(cs->sender)) { - CtdlLogPrintf(CTDL_INFO, "Unknown sender. Doing DISCARD instead of REJECT.\n"); + SVM_syslog(LOG_INFO, "Unknown sender. Doing DISCARD instead of REJECT."); return ctdl_discard(s, my); } @@ -289,7 +291,7 @@ int ctdl_vacation(sieve2_context_t *s, void *my) char *vacamsg_text = NULL; char vacamsg_subject[1024]; - CtdlLogPrintf(CTDL_DEBUG, "Action is VACATION\n"); + SVM_syslog(LOG_DEBUG, "Action is VACATION"); message = sieve2_getvalue_string(s, "message"); if (message == NULL) return SIEVE2_ERROR_BADARGS; @@ -309,7 +311,7 @@ int ctdl_vacation(sieve2_context_t *s, void *my) for (vptr = cs->u->first_vacation; vptr != NULL; vptr = vptr->next) { if (!strcasecmp(vptr->fromaddr, cs->sender)) { if ( (time(NULL) - vptr->timestamp) < (days * 86400) ) { - CtdlLogPrintf(CTDL_DEBUG, "Already alerted <%s> recently.\n", cs->sender); + SV_syslog(LOG_DEBUG, "Already alerted <%s> recently.", cs->sender); return SIEVE2_OK; } } @@ -322,7 +324,7 @@ int ctdl_vacation(sieve2_context_t *s, void *my) } sprintf(vacamsg_text, - "Content-type: text/plain\n" + "Content-type: text/plain charset=utf-8\n" "\n" "%s\n" "\n" @@ -355,6 +357,7 @@ int ctdl_vacation(sieve2_context_t *s, void *my) /* If we get to this point, create a new record. */ vptr = malloc(sizeof(struct sdm_vacation)); + memset(vptr, 0, sizeof(struct sdm_vacation)); vptr->timestamp = time(NULL); safestrncpy(vptr->fromaddr, cs->sender, sizeof vptr->fromaddr); vptr->next = cs->u->first_vacation; @@ -393,8 +396,9 @@ int ctdl_getenvelope(sieve2_context_t *s, void *my) { struct ctdl_sieve *cs = (struct ctdl_sieve *)my; - CtdlLogPrintf(CTDL_DEBUG, "Action is GETENVELOPE\nEnvFrom: %s\n EnvTo: %s\n", - cs->envelope_from, cs->envelope_to); + SVM_syslog(LOG_DEBUG, "Action is GETENVELOPE"); + SV_syslog(LOG_DEBUG, "EnvFrom: %s", cs->envelope_from); + SV_syslog(LOG_DEBUG, "EnvTo: %s", cs->envelope_to); if (cs->envelope_from != NULL) { if ((cs->envelope_from[0] != '@')&&(cs->envelope_from[strlen(cs->envelope_from)-1] != '@')) { @@ -457,21 +461,36 @@ int ctdl_getsize(sieve2_context_t *s, void *my) /* - * Callback function to retrieve the sieve script + * Return a pointer to the active Sieve script. + * (Caller does NOT own the memory and should not free the returned pointer.) */ -int ctdl_getscript(sieve2_context_t *s, void *my) { +char *get_active_script(struct sdm_userdata *u) { struct sdm_script *sptr; - struct ctdl_sieve *cs = (struct ctdl_sieve *)my; - for (sptr=cs->u->first_script; sptr!=NULL; sptr=sptr->next) { + for (sptr=u->first_script; sptr!=NULL; sptr=sptr->next) { if (sptr->script_active > 0) { - CtdlLogPrintf(CTDL_DEBUG, "ctdl_getscript() is using script '%s'\n", sptr->script_name); - sieve2_setvalue_string(s, "script", sptr->script_content); - return SIEVE2_OK; + SV_syslog(LOG_DEBUG, "get_active_script() is using script '%s'", sptr->script_name); + return(sptr->script_content); } } - - CtdlLogPrintf(CTDL_DEBUG, "ctdl_getscript() found no active script\n"); + + SVM_syslog(LOG_DEBUG, "get_active_script() found no active script"); + return(NULL); +} + + +/* + * Callback function to retrieve the sieve script + */ +int ctdl_getscript(sieve2_context_t *s, void *my) { + struct ctdl_sieve *cs = (struct ctdl_sieve *)my; + + char *active_script = get_active_script(cs->u); + if (active_script != NULL) { + sieve2_setvalue_string(s, "script", active_script); + return SIEVE2_OK; + } + return SIEVE2_ERROR_GETSCRIPT; } @@ -482,7 +501,7 @@ int ctdl_getheaders(sieve2_context_t *s, void *my) { struct ctdl_sieve *cs = (struct ctdl_sieve *)my; - CtdlLogPrintf(CTDL_DEBUG, "ctdl_getheaders() was called\n"); + SVM_syslog(LOG_DEBUG, "ctdl_getheaders() was called"); sieve2_setvalue_string(s, "allheaders", cs->rfc822headers); return SIEVE2_OK; } @@ -503,7 +522,7 @@ void sieve_queue_room(struct ctdlroom *which_room) { ptr->next = sieve_list; sieve_list = ptr; end_critical_section(S_SIEVELIST); - CtdlLogPrintf(CTDL_DEBUG, "<%s> queued for Sieve processing\n", which_room->QRname); + SV_syslog(LOG_DEBUG, "<%s> queued for Sieve processing", which_room->QRname); } @@ -523,13 +542,13 @@ void sieve_do_msg(long msgnum, void *userdata) { if (u == NULL) { - CtdlLogPrintf(CTDL_EMERG, "Can't process message <%ld> without userdata!\n", msgnum); + SV_syslog(LOG_EMERG, "Can't process message <%ld> without userdata!", msgnum); return; } sieve2_context = u->sieve2_context; - CtdlLogPrintf(CTDL_DEBUG, "Performing sieve processing on msg <%ld>\n", msgnum); + SV_syslog(LOG_DEBUG, "Performing sieve processing on msg <%ld>", msgnum); /* * Make sure you include message body so you can get those second-level headers ;) @@ -541,15 +560,10 @@ void sieve_do_msg(long msgnum, void *userdata) { * Grab the message headers so we can feed them to libSieve. * Use HEADERS_ONLY rather than HEADERS_FAST in order to include second-level headers. */ - CC->redirect_buffer = malloc(SIZ); - CC->redirect_len = 0; - CC->redirect_alloc = SIZ; + CC->redirect_buffer = NewStrBufPlain(NULL, SIZ); CtdlOutputPreLoadedMsg(msg, MT_RFC822, HEADERS_ONLY, 0, 1, 0); - my.rfc822headers = CC->redirect_buffer; - headers_len = CC->redirect_len; - CC->redirect_buffer = NULL; - CC->redirect_len = 0; - CC->redirect_alloc = 0; + headers_len = StrLength(CC->redirect_buffer); + my.rfc822headers = SmashStrBuf(&CC->redirect_buffer); /* * libSieve clobbers the stack if it encounters badly formed @@ -642,13 +656,11 @@ void sieve_do_msg(long msgnum, void *userdata) { } CtdlFreeMessage(msg); - - sieve2_setvalue_string(sieve2_context, "allheaders", my.rfc822headers); - CtdlLogPrintf(CTDL_DEBUG, "Calling sieve2_execute()\n"); + SVM_syslog(LOG_DEBUG, "Calling sieve2_execute()"); res = sieve2_execute(sieve2_context, &my); if (res != SIEVE2_OK) { - CtdlLogPrintf(CTDL_CRIT, "sieve2_execute() returned %d: %s\n", res, sieve2_errstr(res)); + SV_syslog(LOG_CRIT, "sieve2_execute() returned %d: %s", res, sieve2_errstr(res)); } free(my.rfc822headers); @@ -659,11 +671,11 @@ void sieve_do_msg(long msgnum, void *userdata) { * if no other action was successfully taken. */ if ( (!my.keep) && (my.cancel_implicit_keep) ) { - CtdlLogPrintf(CTDL_DEBUG, "keep is 0 -- deleting message from inbox\n"); + SVM_syslog(LOG_DEBUG, "keep is 0 -- deleting message from inbox"); CtdlDeleteMessages(CC->room.QRname, &msgnum, 1, ""); } - CtdlLogPrintf(CTDL_DEBUG, "Completed sieve processing on msg <%ld>\n", msgnum); + SV_syslog(LOG_DEBUG, "Completed sieve processing on msg <%ld>", msgnum); u->lastproc = msgnum; return; @@ -761,33 +773,28 @@ void get_sieve_config_backend(long msgnum, void *userdata) { * otherwise it just frees the data structures.) */ void rewrite_ctdl_sieve_config(struct sdm_userdata *u, int yes_write_to_disk) { - char *text; + StrBuf *text; struct sdm_script *sptr; struct sdm_vacation *vptr; - size_t tsize; - - text = malloc(1024); - tsize = 1024; - snprintf(text, 1024, - "Content-type: application/x-citadel-sieve-config\n" - "\n" - CTDLSIEVECONFIGSEPARATOR - "lastproc|%ld" - CTDLSIEVECONFIGSEPARATOR - , - u->lastproc - ); + + text = NewStrBufPlain(NULL, SIZ); + StrBufPrintf(text, + "Content-type: application/x-citadel-sieve-config\n" + "\n" + CTDLSIEVECONFIGSEPARATOR + "lastproc|%ld" + CTDLSIEVECONFIGSEPARATOR + , + u->lastproc + ); while (u->first_script != NULL) { - size_t tlen; - tlen = strlen(text); - tsize = tlen + strlen(u->first_script->script_content) +256; - text = realloc(text, tsize); - sprintf(&text[strlen(text)], "script|%s|%d|%s" CTDLSIEVECONFIGSEPARATOR, - u->first_script->script_name, - u->first_script->script_active, - u->first_script->script_content - ); + StrBufAppendPrintf(text, + "script|%s|%d|%s" CTDLSIEVECONFIGSEPARATOR, + u->first_script->script_name, + u->first_script->script_active, + u->first_script->script_content + ); sptr = u->first_script; u->first_script = u->first_script->next; free(sptr->script_content); @@ -796,32 +803,26 @@ void rewrite_ctdl_sieve_config(struct sdm_userdata *u, int yes_write_to_disk) { if (u->first_vacation != NULL) { - tsize = strlen(text) + 256; - for (vptr = u->first_vacation; vptr != NULL; vptr = vptr->next) { - tsize += strlen(vptr->fromaddr + 32); - } - text = realloc(text, tsize); - - sprintf(&text[strlen(text)], "vacation|\n"); + StrBufAppendPrintf(text, "vacation|\n"); while (u->first_vacation != NULL) { if ( (time(NULL) - u->first_vacation->timestamp) < (MAX_VACATION * 86400)) { - sprintf(&text[strlen(text)], "%s|%ld\n", - u->first_vacation->fromaddr, - u->first_vacation->timestamp - ); + StrBufAppendPrintf(text, "%s|%ld\n", + u->first_vacation->fromaddr, + u->first_vacation->timestamp + ); } vptr = u->first_vacation; u->first_vacation = u->first_vacation->next; free(vptr); } - sprintf(&text[strlen(text)], CTDLSIEVECONFIGSEPARATOR); + StrBufAppendPrintf(text, CTDLSIEVECONFIGSEPARATOR); } if (yes_write_to_disk) { /* Save the config */ quickie_message("Citadel", NULL, NULL, u->config_roomname, - text, + ChrPtr(text), 4, "Sieve configuration" ); @@ -832,7 +833,7 @@ void rewrite_ctdl_sieve_config(struct sdm_userdata *u, int yes_write_to_disk) { } } - free (text); + FreeStrBuf (&text); } @@ -883,7 +884,7 @@ void sieve_do_room(char *roomname) { */ snprintf(u.config_roomname, sizeof u.config_roomname, "%010ld.%s", atol(roomname), USERCONFIGROOM); if (CtdlGetRoom(&CC->room, u.config_roomname) != 0) { - CtdlLogPrintf(CTDL_DEBUG, "<%s> does not exist. No processing is required.\n", u.config_roomname); + SV_syslog(LOG_DEBUG, "<%s> does not exist. No processing is required.", u.config_roomname); return; } @@ -895,14 +896,26 @@ void sieve_do_room(char *roomname) { get_sieve_config_backend, (void *)&u ); if (u.config_msgnum < 0) { - CtdlLogPrintf(CTDL_DEBUG, "No Sieve rules exist. No processing is required.\n"); + SVM_syslog(LOG_DEBUG, "No Sieve rules exist. No processing is required."); return; } - CtdlLogPrintf(CTDL_DEBUG, "Rules found. Performing Sieve processing for <%s>\n", roomname); + /* + * Check to see whether the script is empty and should not be processed. + * A script is considered non-empty if it contains at least one semicolon. + */ + if ( + (get_active_script(&u) == NULL) + || (strchr(get_active_script(&u), ';') == NULL) + ) { + SVM_syslog(LOG_DEBUG, "Sieve script is empty. No processing is required."); + return; + } + + SV_syslog(LOG_DEBUG, "Rules found. Performing Sieve processing for <%s>", roomname); if (CtdlGetRoom(&CC->room, roomname) != 0) { - CtdlLogPrintf(CTDL_CRIT, "ERROR: cannot load <%s>\n", roomname); + SV_syslog(LOG_CRIT, "ERROR: cannot load <%s>", roomname); return; } @@ -910,13 +923,13 @@ void sieve_do_room(char *roomname) { res = sieve2_alloc(&sieve2_context); if (res != SIEVE2_OK) { - CtdlLogPrintf(CTDL_CRIT, "sieve2_alloc() returned %d: %s\n", res, sieve2_errstr(res)); + SV_syslog(LOG_CRIT, "sieve2_alloc() returned %d: %s", res, sieve2_errstr(res)); return; } res = sieve2_callbacks(sieve2_context, ctdl_sieve_callbacks); if (res != SIEVE2_OK) { - CtdlLogPrintf(CTDL_CRIT, "sieve2_callbacks() returned %d: %s\n", res, sieve2_errstr(res)); + SV_syslog(LOG_CRIT, "sieve2_callbacks() returned %d: %s", res, sieve2_errstr(res)); goto BAIL; } @@ -927,7 +940,7 @@ void sieve_do_room(char *roomname) { my.u = &u; res = sieve2_validate(sieve2_context, &my); if (res != SIEVE2_OK) { - CtdlLogPrintf(CTDL_CRIT, "sieve2_validate() returned %d: %s\n", res, sieve2_errstr(res)); + SV_syslog(LOG_CRIT, "sieve2_validate() returned %d: %s", res, sieve2_errstr(res)); goto BAIL; } @@ -942,7 +955,7 @@ void sieve_do_room(char *roomname) { BAIL: res = sieve2_free(&sieve2_context); if (res != SIEVE2_OK) { - CtdlLogPrintf(CTDL_CRIT, "sieve2_free() returned %d: %s\n", res, sieve2_errstr(res)); + SV_syslog(LOG_CRIT, "sieve2_free() returned %d: %s", res, sieve2_errstr(res)); } /* Rewrite the config if we have to */ @@ -957,7 +970,7 @@ void perform_sieve_processing(void) { struct RoomProcList *ptr = NULL; if (sieve_list != NULL) { - CtdlLogPrintf(CTDL_DEBUG, "Begin Sieve processing\n"); + SVM_syslog(LOG_DEBUG, "Begin Sieve processing"); while (sieve_list != NULL) { char spoolroomname[ROOMNAMELEN]; safestrncpy(spoolroomname, sieve_list->name, sizeof spoolroomname); @@ -1274,7 +1287,7 @@ void ctdl_sieve_init(void) { strcpy(&cred[55], "..."); } - CtdlLogPrintf(CTDL_INFO, "%s\n",cred); + SV_syslog(LOG_INFO, "%s",cred); free(cred); /* Briefly initialize a Sieve parser instance just so we can list the @@ -1282,26 +1295,45 @@ void ctdl_sieve_init(void) { */ res = sieve2_alloc(&sieve2_context); if (res != SIEVE2_OK) { - CtdlLogPrintf(CTDL_CRIT, "sieve2_alloc() returned %d: %s\n", res, sieve2_errstr(res)); + SV_syslog(LOG_CRIT, "sieve2_alloc() returned %d: %s", res, sieve2_errstr(res)); return; } res = sieve2_callbacks(sieve2_context, ctdl_sieve_callbacks); if (res != SIEVE2_OK) { - CtdlLogPrintf(CTDL_CRIT, "sieve2_callbacks() returned %d: %s\n", res, sieve2_errstr(res)); + SV_syslog(LOG_CRIT, "sieve2_callbacks() returned %d: %s", res, sieve2_errstr(res)); goto BAIL; } msiv_extensions = strdup(sieve2_listextensions(sieve2_context)); - CtdlLogPrintf(CTDL_INFO, "Extensions: %s\n", msiv_extensions); + SV_syslog(LOG_INFO, "Extensions: %s", msiv_extensions); BAIL: res = sieve2_free(&sieve2_context); if (res != SIEVE2_OK) { - CtdlLogPrintf(CTDL_CRIT, "sieve2_free() returned %d: %s\n", res, sieve2_errstr(res)); + SV_syslog(LOG_CRIT, "sieve2_free() returned %d: %s", res, sieve2_errstr(res)); } } +void cleanup_sieve(void) +{ + struct RoomProcList *ptr, *ptr2; + + if (msiv_extensions != NULL) + free(msiv_extensions); + msiv_extensions = NULL; + + begin_critical_section(S_SIEVELIST); + ptr=sieve_list; + while (ptr != NULL) { + ptr2 = ptr->next; + free(ptr); + ptr = ptr2; + } + sieve_list = NULL; + end_critical_section(S_SIEVELIST); +} + int serv_sieve_room(struct ctdlroom *room) { if (!strcasecmp(&room->QRname[11], MAILROOM)) { @@ -1310,18 +1342,23 @@ int serv_sieve_room(struct ctdlroom *room) return 0; } +void LogSieveDebugEnable(const int n) +{ + SieveDebugEnable = n; +} CTDL_MODULE_INIT(sieve) { if (!threading) { - + CtdlRegisterDebugFlagHook(HKEY("sieve"), LogSieveDebugEnable, &SieveDebugEnable); ctdl_sieve_init(); CtdlRegisterProtoHook(cmd_msiv, "MSIV", "Manage Sieve scripts"); CtdlRegisterRoomHook(serv_sieve_room); CtdlRegisterSessionHook(perform_sieve_processing, EVT_HOUSE); + CtdlRegisterCleanupHook(cleanup_sieve); } - /* return our Subversion id for the Log */ - return "$Id$"; + /* return our module name for the log */ + return "sieve"; }