From 04ad0f1a13d8d77ed396f789047f9e8619aec531 Mon Sep 17 00:00:00 2001 From: Art Cancro Date: Tue, 17 Oct 2006 20:19:15 +0000 Subject: [PATCH] Put in a stub for msiv_listextensions() to remind myself that we have to make that data available to serv_managesieve.c --- citadel/serv_sieve.c | 54 +++++++++++++++++++++++++------------------- citadel/serv_sieve.h | 1 + 2 files changed, 32 insertions(+), 23 deletions(-) diff --git a/citadel/serv_sieve.c b/citadel/serv_sieve.c index d810e8bed..f016491d7 100644 --- a/citadel/serv_sieve.c +++ b/citadel/serv_sieve.c @@ -604,6 +604,29 @@ void rewrite_ctdl_sieve_config(struct sdm_userdata *u) { } +/* + * This is our callback registration table for libSieve. + */ +sieve2_callback_t ctdl_sieve_callbacks[] = { + { SIEVE2_ACTION_REJECT, ctdl_reject }, + { SIEVE2_ACTION_NOTIFY, ctdl_notify }, + { SIEVE2_ACTION_VACATION, ctdl_vacation }, + { SIEVE2_ERRCALL_PARSE, ctdl_errparse }, + { SIEVE2_ERRCALL_RUNTIME, ctdl_errexec }, + { SIEVE2_ACTION_FILEINTO, ctdl_fileinto }, + { SIEVE2_ACTION_REDIRECT, ctdl_redirect }, + { SIEVE2_ACTION_DISCARD, ctdl_discard }, + { SIEVE2_ACTION_KEEP, ctdl_keep }, + { SIEVE2_SCRIPT_GETSCRIPT, ctdl_getscript }, + { SIEVE2_DEBUG_TRACE, ctdl_debug }, + { SIEVE2_MESSAGE_GETALLHEADERS, ctdl_getheaders }, + { SIEVE2_MESSAGE_GETSUBADDRESS, ctdl_getsubaddress }, + { SIEVE2_MESSAGE_GETENVELOPE, ctdl_getenvelope }, + { SIEVE2_MESSAGE_GETBODY, ctdl_getbody }, + { SIEVE2_MESSAGE_GETSIZE, ctdl_getsize }, + { 0 } +}; + /* * Perform sieve processing for a single room @@ -617,29 +640,6 @@ void sieve_do_room(char *roomname) { memset(&u, 0, sizeof u); - /* - * This is our callback registration table for libSieve. - */ - sieve2_callback_t ctdl_sieve_callbacks[] = { - { SIEVE2_ACTION_REJECT, ctdl_reject }, - { SIEVE2_ACTION_NOTIFY, ctdl_notify }, - { SIEVE2_ACTION_VACATION, ctdl_vacation }, - { SIEVE2_ERRCALL_PARSE, ctdl_errparse }, - { SIEVE2_ERRCALL_RUNTIME, ctdl_errexec }, - { SIEVE2_ACTION_FILEINTO, ctdl_fileinto }, - { SIEVE2_ACTION_REDIRECT, ctdl_redirect }, - { SIEVE2_ACTION_DISCARD, ctdl_discard }, - { SIEVE2_ACTION_KEEP, ctdl_keep }, - { SIEVE2_SCRIPT_GETSCRIPT, ctdl_getscript }, - { SIEVE2_DEBUG_TRACE, ctdl_debug }, - { SIEVE2_MESSAGE_GETALLHEADERS, ctdl_getheaders }, - { SIEVE2_MESSAGE_GETSUBADDRESS, ctdl_getsubaddress }, - { SIEVE2_MESSAGE_GETENVELOPE, ctdl_getenvelope }, - { SIEVE2_MESSAGE_GETBODY, ctdl_getbody }, - { SIEVE2_MESSAGE_GETSIZE, ctdl_getsize }, - { 0 } - }; - /* See if the user who owns this 'mailbox' has any Sieve scripts that * require execution. */ @@ -901,6 +901,14 @@ void msiv_putscript(struct sdm_userdata *u, char *script_name, char *script_cont } +/* + * Return the list of supported Sieve extensions + */ +char *msiv_listextensions(void) { + return "FIXME - this is not done yet"; +} + + /* * Citadel protocol to manage sieve scripts. * This is basically a simplified (read: doesn't resemble IMAP) version diff --git a/citadel/serv_sieve.h b/citadel/serv_sieve.h index 9c02ed649..c06eb09c6 100644 --- a/citadel/serv_sieve.h +++ b/citadel/serv_sieve.h @@ -51,5 +51,6 @@ int msiv_setactive(struct sdm_userdata *u, char *script_name); char *msiv_getscript(struct sdm_userdata *u, char *script_name); int msiv_deletescript(struct sdm_userdata *u, char *script_name); void msiv_putscript(struct sdm_userdata *u, char *script_name, char *script_content); +char *msiv_listextensions(void); #endif /* HAVE_LIBSIEVE */ -- 2.39.2