reduce "junk" and other noise in log file

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();
 }