summaryrefslogtreecommitdiff
path: root/tools/libskrewt.c
diff options
context:
space:
mode:
Diffstat (limited to 'tools/libskrewt.c')
-rw-r--r--tools/libskrewt.c15
1 files changed, 9 insertions, 6 deletions
diff --git a/tools/libskrewt.c b/tools/libskrewt.c
index 5e06dea..5461fdd 100644
--- a/tools/libskrewt.c
+++ b/tools/libskrewt.c
@@ -2,6 +2,9 @@
#include "utils.h"
#include <sstream>
#include <signal.h>
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <netdb.h>
using namespace std;
@@ -327,7 +330,7 @@ void check_map2ip(name_tester& fqdn, const string ipstr) {
void check_name_ip(name_tester& fqdn, const string ip) {
if (ip == "") {
- cerr << "check_nane_ip: should never happen: email with no IP?" <<endl;
+ cerr << "check_name_ip: should never happen: email with no IP?" <<endl;
fqdn.spf = fqdn.map2ip = neutral;
return;
}
@@ -500,7 +503,7 @@ int skrewt::interstage(){
if (badnews.size() && !whitelisted){
cerr << progid << " " << join(", ", badnews) << endl;
- if (error_exit){
+ if (strictness){
cerr << progid << " ... badnews from '" << from
<< "' to '" << to
<< "'" << endl;
@@ -529,9 +532,9 @@ void dump(const list<conner> sitch){
// constructor
skrewt::skrewt()
- : spf_result(SPF_RESULT_INVALID),
+ : proximta_rDNS_flagged(0), spf_result(SPF_RESULT_INVALID),
boundary("x-xx-x"), msgsize(0), saw_blank_line(0), recno(0),
- maxsize(1000*1000), error_exit(0), mid_required(0),
+ maxsize(1000*1000), strictness(0), note(""), mid_required(0),
headerbuf(0), bigbuf(0),
lookahead(1, "")
{
@@ -632,8 +635,8 @@ int skrewt::body(std::istream& xin, std::ostream& xout){
if (verbosity) cerr << "textlines: " << textlines << endl;
if (!textlines) {
- cerr << progid << " rejection: no text: " << error_exit << endl;
- maybe_exeunt(ex_spam, error_exit);
+ cerr << progid << " rejection: no text: " << strictness << endl;
+ maybe_exeunt(ex_spam, strictness);
}
cerr << progid << " normal completion" << endl;
return(ex_good);