# HG changeset patch
# User Carl Byington <carl@five-ten-sg.com>
# Date 1509731412 25200
# Node ID 1686cb6392693318921c334a802037e163626981
# Parent  f084285ceb5260300c7adbd6bc228858a99e48fb
code cleanup

diff -r f084285ceb52 -r 1686cb639269 ChangeLog
--- a/ChangeLog	Fri Nov 03 10:07:00 2017 -0700
+++ b/ChangeLog	Fri Nov 03 10:50:12 2017 -0700
@@ -1,3 +1,6 @@
+6.65 2017-11-03
+    code cleanup
+
 6.64 2017-11-03
     fix syslog for long messages
     supress dkim checks for mail from localhost
diff -r f084285ceb52 -r 1686cb639269 NEWS
--- a/NEWS	Fri Nov 03 10:07:00 2017 -0700
+++ b/NEWS	Fri Nov 03 10:50:12 2017 -0700
@@ -1,3 +1,4 @@
+6.65 2017-11-03 code cleanup
 6.64 2017-11-03 fix syslog for long messages, supress dkim checks for mail from localhost
 6.63 2017-10-24 allow syslogging of long txt records
 6.62 2017-10-03 include arpa/nameser.h earlier
diff -r f084285ceb52 -r 1686cb639269 configure.in
--- a/configure.in	Fri Nov 03 10:07:00 2017 -0700
+++ b/configure.in	Fri Nov 03 10:50:12 2017 -0700
@@ -1,6 +1,6 @@
 
 AC_PREREQ(2.59)
-AC_INIT(dnsbl,6.64,carl@five-ten-sg.com)
+AC_INIT(dnsbl,6.65,carl@five-ten-sg.com)
 AC_CONFIG_SRCDIR([config.h.in])
 AC_CONFIG_HEADER([config.h])
 AC_CONFIG_MACRO_DIR([m4])
diff -r f084285ceb52 -r 1686cb639269 dnsbl.spec.in
--- a/dnsbl.spec.in	Fri Nov 03 10:07:00 2017 -0700
+++ b/dnsbl.spec.in	Fri Nov 03 10:50:12 2017 -0700
@@ -155,6 +155,9 @@
 
 
 %changelog
+* Fri Nov 03 2017 Carl Byington <carl@five-ten-sg.com> - 6.65-1
+- code cleanup
+
 * Fri Nov 03 2017 Carl Byington <carl@five-ten-sg.com> - 6.64-1
 - fix syslog for long messages
 - supress dkim checks for mail from localhost
diff -r f084285ceb52 -r 1686cb639269 src/context.cpp
--- a/src/context.cpp	Fri Nov 03 10:07:00 2017 -0700
+++ b/src/context.cpp	Fri Nov 03 10:50:12 2017 -0700
@@ -932,8 +932,8 @@
             if (debug_syslog > 1) {
                 char buf[maxlen];
                 char msg[maxlen];
-                snprintf(msg, sizeof(msg), "%s: extend whitelist reply from <%s> in context %s", queueid, from, get_full_name(buf,maxlen));
-                my_syslog(msg);
+                snprintf(msg, sizeof(msg), "extend whitelist reply from <%s> in context %s", from, get_full_name(buf,maxlen));
+                my_syslog(queueid, msg);
             }
             w->sent(strdup(from));
         }
diff -r f084285ceb52 -r 1686cb639269 src/dnsbl.cpp
--- a/src/dnsbl.cpp	Fri Nov 03 10:07:00 2017 -0700
+++ b/src/dnsbl.cpp	Fri Nov 03 10:50:12 2017 -0700
@@ -1325,7 +1325,7 @@
             if (priv.client_dns_name) {
                 char text[500];
                 snprintf(text, sizeof(text), "forged dns client name %s", priv.client_dns_name);
-                my_syslog(text);
+                my_syslog(&priv, text);
             }
         }
     }
diff -r f084285ceb52 -r 1686cb639269 src/scanner.cpp
--- a/src/scanner.cpp	Fri Nov 03 10:07:00 2017 -0700
+++ b/src/scanner.cpp	Fri Nov 03 10:50:12 2017 -0700
@@ -1287,7 +1287,6 @@
         memcpy(mbuf, buf, n);
         mbuf[n] = '\0';
         snprintf(msg, sizeof(msg), "%s sees %s", myname, mbuf);
-        msg[sizeof(msg)-1] = '\0';
         memory->syslog(msg);
     }
     for (int i=0; i<len; i++) {