changeset 165:bf828f785407 stable-6-0-5

fix unitialized variable
author carl
date Sun, 26 Aug 2007 20:54:58 -0700
parents 5809bcdc325b
children 7161d8451fcf
files ChangeLog NEWS configure.in dnsbl.conf dnsbl.rc src/dnsbl.cpp
diffstat 6 files changed, 11 insertions(+), 69 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Sun Aug 26 19:43:35 2007 -0700
+++ b/ChangeLog	Sun Aug 26 20:54:58 2007 -0700
@@ -1,5 +1,11 @@
     $Id$
 
+6.05 2007-07-26
+    Fix unitialized variable in my spamassassin code.
+
+6.04 2007-07-26
+    Add spamassassin integration via spamc, code from spamass-milter.
+
 6.03 2007-07-14
     Don't add auto whitelist entries for our own domains.
 
--- a/NEWS	Sun Aug 26 19:43:35 2007 -0700
+++ b/NEWS	Sun Aug 26 20:54:58 2007 -0700
@@ -1,5 +1,7 @@
     $Id$
 
+6.05 2007-07-26 Fix unitialized variable in my spamassassin code.
+6.04 2007-07-26 Add spamassassin integration via spamc, code from spamass-milter.
 6.03 2007-07-14 Don't add auto whitelist entries for our own domains.
 6.02 2007-07-10 Allow manual updates to the auto whitelisting files.
 6.01 2007-07-07 GPL3. Block mail to recipients that cannot reply. Start auto whitelisting.
--- a/configure.in	Sun Aug 26 19:43:35 2007 -0700
+++ b/configure.in	Sun Aug 26 20:54:58 2007 -0700
@@ -1,6 +1,6 @@
 
 AC_PREREQ(2.59)
-AC_INIT(dnsbl,6.04,carl@five-ten-sg.com)
+AC_INIT(dnsbl,6.05,carl@five-ten-sg.com)
 AC_CONFIG_SRCDIR([config.h.in])
 AC_CONFIG_HEADER([config.h])
 
--- a/dnsbl.conf	Sun Aug 26 19:43:35 2007 -0700
+++ b/dnsbl.conf	Sun Aug 26 20:54:58 2007 -0700
@@ -102,6 +102,6 @@
         # dcc_from { include "/var/dcc/whitecommon"; };
     };
 
-    # autowhite 90 "my-auto-whitelist";
+    autowhite 90 "my-auto-whitelist";
 };
 
--- a/dnsbl.rc	Sun Aug 26 19:43:35 2007 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,67 +0,0 @@
-#!/bin/sh
-#
-# dnsbl   This script controls the dnsbl milter daemon.
-#
-#
-# chkconfig: 2345 79 31
-# description: dnsbl is an interface between MTA and the various dns blocking lists
-# processname: dnsbl
-# pidfile: /var/run/dnsbl.pid
-# Source function library.
-#
-. /etc/rc.d/init.d/functions
-
-# Source networking configuration.
-. /etc/sysconfig/network
-
-RETVAL=0
-# See how we were called.
-case "$1" in
-    start)
-        # Start daemons.
-        echo -n "Starting dnsbl-milter: "
-        if [ ! -f /var/lock/subsys/dnsbl ]; then
-            cd SYSCONFDIR/dnsbl     # conf file is here
-            SBINDIR/dnsbl -d 10 -r /var/run/dnsbl/dnsbl.resolver.sock -p local:/var/run/dnsbl/dnsbl.sock
-            RETVAL=$?
-            pid=`pidof -s SBINDIR/dnsbl`
-            if [ $pid ]
-            then
-                success "Starting dnsbl milter:"
-                touch /var/lock/subsys/dnsbl
-                echo
-            else
-                failure "Starting dnsbl milter:"
-                echo
-            fi
-        else
-            echo -n "already running! "
-            failure "dnsbl milter already running!"
-            echo
-        fi
-
-        ;;
-    stop)
-        # Stop daemons.
-        echo -n "Shutting down dnsbl-milter: "
-        killproc dnsbl
-        RETVAL=$?
-        echo
-        [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/dnsbl
-        ;;
-    restart|reload)
-        $0 stop
-        $0 start
-        RETVAL=$?
-        ;;
-    status)
-        status dnsbl
-        RETVAL=$?
-        ;;
-    *)
-        echo "Usage: dnsbl {start|stop|restart|status}"
-        exit 1
-esac
-exit $RETVAL
-
-# $Id$
--- a/src/dnsbl.cpp	Sun Aug 26 19:43:35 2007 -0700
+++ b/src/dnsbl.cpp	Sun Aug 26 20:54:58 2007 -0700
@@ -253,6 +253,7 @@
 	only_whites 		= true;
 	memory				= NULL;
 	scanner 			= NULL;
+	assassin			= NULL;
 	content_suffix		= NULL;
 	content_message 	= NULL;
 	uribl_suffix		= NULL;