There is a small change in the recent release of libspf_alt API that
affects Zmailer. (Hopefully there won't be much more in the future...)
Also, in a couple of places, I was printing debug messages even when
debug flag was not set. Please have a look:
Index: smtpserver/policytest.c
===================================================================
RCS file: /cvsroot/zmailer/smtpserver/policytest.c,v
retrieving revision 1.89
diff -u -r1.89 policytest.c
--- smtpserver/policytest.c 12 Apr 2004 12:13:11 -0000 1.89
+++ smtpserver/policytest.c 15 Apr 2004 11:50:30 -0000
@@ -1562,7 +1562,7 @@
#ifdef HAVE_SPF_ALT_SPF_H
if (state->check_spf) {
- type(NULL,0,NULL,"doing SPF_set_helo_dom(\"%s\")",str);
+ if (debug) type(NULL,0,NULL,"doing SPF_set_helo_dom(\"%s\")",str);
if (SPF_set_helo_dom(state->spfcid, str)) {
type(NULL,0,NULL,"SPF_set_helo_dom() failed");
state->check_spf=0;
@@ -1690,7 +1690,7 @@
if (state->check_spf) {
char *nstr=strdup(str);
nstr[len]='\0';
- type(NULL,0,NULL,"doing SPF_set_env_from(\"%s\")",nstr);
+ if (debug) type(NULL,0,NULL,"doing SPF_set_env_from(\"%s\")",nstr);
if (SPF_set_env_from(state->spfcid, nstr)) {
type(NULL,0,NULL,"SPF_set_env_from(\"%s\") failed",nstr);
state->check_spf=0;
@@ -1878,7 +1878,7 @@
#ifdef HAVE_SPF_ALT_SPF_H
if (state->check_spf) {
int spf_level;
- SPF_output_t spf_output=SPF_result(state->spfcid,state->spfdcid,NULL);
+ SPF_output_t spf_output=SPF_result(state->spfcid,state->spfdcid);
if (debug) {
type(NULL,0,NULL," SPF_result=%d (%s) reason=%d (%s) error=%d",
spf_output.result,
This is a digitally signed message part