summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Denker <jsd@av8n.com>2012-11-25 04:44:01 (GMT)
committerJohn Denker <jsd@av8n.com>2012-11-25 04:44:01 (GMT)
commit9a783cb0791327367d85b63bf3e0e4e1aa215163 (patch)
treea1b769a8e2009e322a17c64cc79fc7663080cb4b
parentf7de8573f5521263449fd80a2d5cdf3901b96087 (diff)
reduce "junk" and other noise in log file
-rw-r--r--tools/libskrewt.c10
-rw-r--r--tools/sepofra.c6
2 files changed, 9 insertions, 7 deletions
diff --git a/tools/libskrewt.c b/tools/libskrewt.c
index d93a9e1..f51a8bc 100644
--- a/tools/libskrewt.c
+++ b/tools/libskrewt.c
@@ -217,10 +217,12 @@ int skrewt::dump_bigbuf(std::ostream& xout){
void check_spf(name_tester& fqdn, const string ip) {
sepofra my_spf;
try {
- my_spf.check(ip,
- fqdn.name,
- "junk",
- "morejunk", 0/* verbosity */);
+ my_spf.check(ip, /* IP */
+ fqdn.name, /* HELO */
+ "", /* mail_from */
+ "", /* rcpt_to */
+ 0 /* verbosity */
+ );
cerr << progid << " " << my_spf.explain() << endl;
// keep a copy of the result:
fqdn.spf = neutral;
diff --git a/tools/sepofra.c b/tools/sepofra.c
index 41cc784..25b73b7 100644
--- a/tools/sepofra.c
+++ b/tools/sepofra.c
@@ -156,9 +156,9 @@ string sepofra::explain() const {
build << "}";
}
/* ( */ build << ")";
- build << " client-ip=" << ip << ";";
- build << " envelope-from=" << mailfrom << ";";
- build << " helo=" << helo;
+ if (ip != "") build << " client-ip=" << ip << ";";
+ if (mailfrom != "") build << " envelope-from=" << mailfrom << ";";
+ if (helo != "") build << " helo=" << helo;
return build.str();
}