projects
/
citadel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
3a93adc
)
* Removed some temporary diagnostics that had been left in serv_sieve.c
author
Art Cancro
<ajc@citadel.org>
Fri, 6 Feb 2009 16:26:51 +0000
(16:26 +0000)
committer
Art Cancro
<ajc@citadel.org>
Fri, 6 Feb 2009 16:26:51 +0000
(16:26 +0000)
citadel/modules/sieve/serv_sieve.c
patch
|
blob
|
history
diff --git
a/citadel/modules/sieve/serv_sieve.c
b/citadel/modules/sieve/serv_sieve.c
index 2551a600efd5f1c39b0f0fdd9c9d9437e1701eba..d14f6bdf8da81856192848bae5db083aa43cdd5b 100644
(file)
--- 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;
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
/*
* libSieve clobbers the stack if it encounters badly formed
* headers. Sanitize our headers by stripping nonprintable
@@
-633,32
+627,14
@@
void sieve_do_msg(long msgnum, void *userdata) {
CtdlFreeMessage(msg);
CtdlFreeMessage(msg);
- if (u == NULL)
- {
- CtdlLogPrintf(CTDL_EMERG, "userdata got clobbz0red! aaaaaaaaghhh!!!!\n");
- abort();
- }
-
sieve2_setvalue_string(sieve2_context, "allheaders", 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));
}
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;
free(my.rfc822headers);
my.rfc822headers = NULL;
@@
-671,12
+647,6
@@
void sieve_do_msg(long msgnum, void *userdata) {
CtdlDeleteMessages(CC->room.QRname, &msgnum, 1, "");
}
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;
CtdlLogPrintf(CTDL_DEBUG, "Completed sieve processing on msg <%ld>\n", msgnum);
u->lastproc = msgnum;