/*
- * $Id: serv_sieve.c 3850 2005-09-13 14:00:24Z ajc $
+ * $Id$
*
* This module glues libSieve to the Citadel server in order to implement
* the Sieve mailbox filtering language (RFC 3028).
*/
int ctdl_debug(sieve2_context_t *s, void *my)
{
- static int ctdl_libsieve_debug = 0;
+ static int ctdl_libsieve_debug = 1;
if (ctdl_libsieve_debug) {
/*
}
if (valid->num_error > 0) {
lprintf(CTDL_WARNING, "REDIRECT failed: bad recipient <%s>\n", recp);
- free(valid);
+ free_recipients(valid);
return SIEVE2_ERROR_BADARGS;
}
msg = CtdlFetchMessage(cs->msgnum, 1);
if (msg == NULL) {
lprintf(CTDL_WARNING, "REDIRECT failed: unable to fetch msg %ld\n", cs->msgnum);
- free(valid);
+ free_recipients(valid);
return SIEVE2_ERROR_BADARGS;
}
CtdlSubmitMsg(msg, valid, NULL);
cs->cancel_implicit_keep = 1;
- free(valid);
+ free_recipients(valid);
CtdlFreeMessage(msg);
return SIEVE2_OK;
}
c = getroom(&CC->room, foldername);
/* Then a regular room name match (public and private rooms) */
- if (c < 0) {
+ if (c != 0) {
safestrncpy(foldername, dest_folder, sizeof foldername);
c = getroom(&CC->room, foldername);
}
- if (c < 0) {
+ if (c != 0) {
lprintf(CTDL_WARNING, "FILEINTO failed: target <%s> does not exist\n", dest_folder);
return SIEVE2_ERROR_BADARGS;
}
struct ctdl_sieve *cs = (struct ctdl_sieve *)my;
lprintf(CTDL_DEBUG, "Action is GETENVELOPE\n");
- sieve2_setvalue_string(s, "to", cs->envelope_to);
- sieve2_setvalue_string(s, "from", cs->envelope_from);
+ if (strlen(cs->envelope_to) > 0) {
+ sieve2_setvalue_string(s, "to", cs->envelope_to);
+ }
+ if (strlen(cs->envelope_from) > 0) {
+ sieve2_setvalue_string(s, "from", cs->envelope_from);
+ }
return SIEVE2_OK;
}
ptr->next = sieve_list;
sieve_list = ptr;
end_critical_section(S_SIEVELIST);
+ lprintf(CTDL_DEBUG, "<%s> queued for Sieve processing\n", which_room->QRname);
}
strcpy(my.envelope_to, "");
}
- free(msg);
+ CtdlFreeMessage(msg);
sieve2_setvalue_string(sieve2_context, "allheaders", my.rfc822headers);
char *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"
);
while (u->first_script != NULL) {
- text = realloc(text, strlen(text) + strlen(u->first_script->script_content) + 256);
+ 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,
if (u->first_vacation != NULL) {
- size_t realloc_len = strlen(text) + 256;
+ tsize = strlen(text) + 256;
for (vptr = u->first_vacation; vptr != NULL; vptr = vptr->next) {
- realloc_len += strlen(vptr->fromaddr + 32);
+ tsize += strlen(vptr->fromaddr + 32);
}
- text = realloc(text, realloc_len);
+ text = realloc(text, tsize);
sprintf(&text[strlen(text)], "vacation|\n");
while (u->first_vacation != NULL) {
4,
"Sieve configuration"
);
-
+
+ free (text);
/* And delete the old one */
if (u->config_msgnum > 0) {
CtdlDeleteMessages(u->config_roomname, &u->config_msgnum, 1, "");
}
+int serv_sieve_room(struct ctdlroom *room)
+{
+ if (!strcasecmp(&room->QRname[11], MAILROOM)) {
+ sieve_queue_room(room);
+ }
+ return 0;
+}
char *serv_sieve_init(void)
{
ctdl_sieve_init();
CtdlRegisterProtoHook(cmd_msiv, "MSIV", "Manage Sieve scripts");
- return "$Id: serv_sieve.c 3850 2005-09-13 14:00:24Z ajc $";
+ CtdlRegisterRoomHook(serv_sieve_room);
+ return "$Id$";
}
#else /* HAVE_LIBSIEVE */
char *serv_sieve_init(void)
{
lprintf(CTDL_INFO, "This server is missing libsieve. Mailbox filtering will be disabled.\n");
- return "$Id: serv_sieve.c 3850 2005-09-13 14:00:24Z ajc $";
+
+ /* return our Subversion id for the Log */
+ return "$Id$";
}
#endif /* HAVE_LIBSIEVE */