libical, expat, and libsieve are now *required*.

[citadel.git] / citadel / modules / sieve / serv_sieve.c

diff --git a/citadel/modules/sieve/serv_sieve.c b/citadel/modules/sieve/serv_sieve.c
index e6cf9aebf9ab6d05476a134c7196e2d9687f1c3c..726d58d504fafd552fbee56178e427a91782993e 100644 (file)
--- a/citadel/modules/sieve/serv_sieve.c
+++ b/citadel/modules/sieve/serv_sieve.c
@@ -42,13 +42,7 @@
 #include "database.h"
 #include "msgbase.h"
 #include "internet_addressing.h"
-
-
 #include "ctdl_module.h"
-
-
-#ifdef HAVE_LIBSIEVE
-
 #include "serv_sieve.h"
 
 struct RoomProcList *sieve_list = NULL;
@@ -104,7 +98,7 @@ int ctdl_redirect(sieve2_context_t *s, void *my)
 
        lprintf(CTDL_DEBUG, "Action is REDIRECT, recipient <%s>\n", recp);
 
-       valid = validate_recipients(recp);
+       valid = validate_recipients(recp, NULL, 0);
        if (valid == NULL) {
                lprintf(CTDL_WARNING, "REDIRECT failed: bad recipient <%s>\n", recp);
                return SIEVE2_ERROR_BADARGS;
@@ -506,7 +500,7 @@ void sieve_queue_room(struct ctdlroom *which_room) {
  */
 void sieve_do_msg(long msgnum, void *userdata) {
        struct sdm_userdata *u = (struct sdm_userdata *) userdata;
-       sieve2_context_t *sieve2_context = u->sieve2_context;
+       sieve2_context_t *sieve2_context;
        struct ctdl_sieve my;
        int res;
        struct CtdlMessage *msg;
@@ -520,6 +514,8 @@ void sieve_do_msg(long msgnum, void *userdata) {
                return;
        }
 
+       sieve2_context = u->sieve2_context;
+
        lprintf(CTDL_DEBUG, "Performing sieve processing on msg <%ld>\n", msgnum);
 
        msg = CtdlFetchMessage(msgnum, 0);
@@ -1288,26 +1284,15 @@ int serv_sieve_room(struct ctdlroom *room)
        return 0;
 }
 
-#endif /* HAVE_LIBSIEVE */
-
 CTDL_MODULE_INIT(sieve)
 {
        if (!threading)
        {
-#ifdef HAVE_LIBSIEVE
 
                ctdl_sieve_init();
                CtdlRegisterProtoHook(cmd_msiv, "MSIV", "Manage Sieve scripts");
-
                CtdlRegisterRoomHook(serv_sieve_room);
-
                CtdlRegisterSessionHook(perform_sieve_processing, EVT_HOUSE);
-
-#else  /* HAVE_LIBSIEVE */
-
-               lprintf(CTDL_INFO, "This server is missing libsieve.  Mailbox filtering will be disabled.\n");
-
-#endif /* HAVE_LIBSIEVE */
        }
        
         /* return our Subversion id for the Log */