X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fmodules%2Fsieve%2Fserv_sieve.c;h=d14f6bdf8da81856192848bae5db083aa43cdd5b;hb=59ae30024c9b448e321f0ea9521f5d155ac65612;hp=473a8dcf9cc7e8860f54f48b548cb3db46473298;hpb=c86759641df76c81c3c2273f2dcf71a656d61033;p=citadel.git

diff --git a/citadel/modules/sieve/serv_sieve.c b/citadel/modules/sieve/serv_sieve.c
index 473a8dcf9..d14f6bdf8 100644
--- a/citadel/modules/sieve/serv_sieve.c
+++ b/citadel/modules/sieve/serv_sieve.c
@@ -535,12 +535,6 @@ void sieve_do_msg(long msgnum, void *userdata) {
 	CC->redirect_len = 0;
 	CC->redirect_alloc = 0;
 
-	if (u == NULL)
-	{
-		CtdlLogPrintf(CTDL_EMERG, "userdata got clobbz0red!  aaaaaaaaghhh!!!!\n");
-		abort();
-	}
-
 	/*
 	 * libSieve clobbers the stack if it encounters badly formed
 	 * headers.  Sanitize our headers by stripping nonprintable
@@ -633,35 +627,14 @@ void sieve_do_msg(long msgnum, void *userdata) {
 
 	CtdlFreeMessage(msg);
 
-	if (u == NULL)
-	{
-		CtdlLogPrintf(CTDL_EMERG, "userdata got clobbz0red!  aaaaaaaaghhh!!!!\n");
-		abort();
-	}
-
-
-	CtdlLogPrintf(CTDL_DEBUG, "HEADERS-------\n%s\n", my.rfc822headers);
-
 	sieve2_setvalue_string(sieve2_context, "allheaders", my.rfc822headers);
 	
-	if (u == NULL)
-	{
-		CtdlLogPrintf(CTDL_EMERG, "userdata got clobbz0red!  aaaaaaaaghhh!!!!\n");
-		abort();
-	}
-
 	CtdlLogPrintf(CTDL_DEBUG, "Calling sieve2_execute()\n");
 	res = sieve2_execute(sieve2_context, &my);
 	if (res != SIEVE2_OK) {
 		CtdlLogPrintf(CTDL_CRIT, "sieve2_execute() returned %d: %s\n", res, sieve2_errstr(res));
 	}
 
-	if (u == NULL)
-	{
-		CtdlLogPrintf(CTDL_EMERG, "userdata got clobbz0red!  aaaaaaaaghhh!!!!\n");
-		abort();
-	}
-
 	free(my.rfc822headers);
 	my.rfc822headers = NULL;
 
@@ -674,12 +647,6 @@ void sieve_do_msg(long msgnum, void *userdata) {
 		CtdlDeleteMessages(CC->room.QRname, &msgnum, 1, "");
 	}
 
-	if (u == NULL)
-	{
-		CtdlLogPrintf(CTDL_EMERG, "userdata got clobbz0red!  aaaaaaaaghhh!!!!\n");
-		abort();
-	}
-
 	CtdlLogPrintf(CTDL_DEBUG, "Completed sieve processing on msg <%ld>\n", msgnum);
 	u->lastproc = msgnum;