# HG changeset patch
# User carl
# Date 1127487514 25200
# Node ID f8963ddf71435d55ddce4fe5773a8c5b7f6f3070
# Parent 91c27c00048f172b15c423ac88cb7d380ba99740
failed to return a value from parse_verify()
diff -r 91c27c00048f -r f8963ddf7143 ChangeLog
--- a/ChangeLog Thu Sep 22 21:57:08 2005 -0700
+++ b/ChangeLog Fri Sep 23 07:58:34 2005 -0700
@@ -1,5 +1,9 @@
$Id$
+5.7 2005-09-23
+ Failed to return a value from parse_verify() which caused failures
+ to load the configuration.
+
5.6 2005-09-22
Tokenizer errors now go thru the syslog code, so they are visible
when generated during config file reloads during normal operation.
diff -r 91c27c00048f -r f8963ddf7143 dnsbl.spec.in
--- a/dnsbl.spec.in Thu Sep 22 21:57:08 2005 -0700
+++ b/dnsbl.spec.in Fri Sep 23 07:58:34 2005 -0700
@@ -1,6 +1,6 @@
Summary: DNSBL Sendmail Milter
Name: dnsbl
-Version: 5.6
+Version: 5.7
Release: 2
Copyright: GPL
Group: System Environment/Daemons
diff -r 91c27c00048f -r f8963ddf7143 package.bash
--- a/package.bash Thu Sep 22 21:57:08 2005 -0700
+++ b/package.bash Fri Sep 23 07:58:34 2005 -0700
@@ -1,6 +1,6 @@
#!/bin/bash
-VER=dnsbl-5.6
+VER=dnsbl-5.7
mkdir $VER
target1=/home/httpd/html/510sg/util/dnsbl.tar.gz
target2=/home/httpd/html/510sg/dnsbl.conf
diff -r 91c27c00048f -r f8963ddf7143 src/context.cpp
--- a/src/context.cpp Thu Sep 22 21:57:08 2005 -0700
+++ b/src/context.cpp Fri Sep 23 07:58:34 2005 -0700
@@ -1034,6 +1034,7 @@
if (!tsa(tok, token_semi)) return false;
me.set_verify(host);
add_verify_host(host);
+ return true;
}
@@ -1168,20 +1169,24 @@
// parse a config file
//
bool load_conf(CONFIG &dc, char *fn) {
+ int count = 0;
TOKEN tok(fn, &dc.config_files);
while (true) {
char *have = tok.next();
if (!have) break;
if (have == token_context) {
if (!parse_context(tok, dc, NULL)) {
+ tok.token_error("load_conf() failed to parse context");
return false;
}
+ else count++;
}
else {
tok.token_error(token_context, have);
return false;
}
}
+ tok.token_error("load_conf() found %d contexts in %s", count, fn);
return (dc.default_context) ? true : false;
}
diff -r 91c27c00048f -r f8963ddf7143 src/context.h
--- a/src/context.h Thu Sep 22 21:57:08 2005 -0700
+++ b/src/context.h Fri Sep 23 07:58:34 2005 -0700
@@ -39,7 +39,7 @@
int pending; // unread bytes in buffer, not including the null terminator
char buffer[maxlen];
public:
- SMTP(int f) {fd = f; error = false; efrom[0] = '\0';};
+ SMTP(int f) {fd = f; error = false; now(); efrom[0] = '\0'; init();};
~SMTP() {if (!error) quit(); closefd();};
void init() {pending = 0; buffer[0] = '\0';};
void append(char *c) {strncat(buffer, c, max(0, maxlen-1-(int)strlen(c)));};
diff -r 91c27c00048f -r f8963ddf7143 xml/dnsbl.in
--- a/xml/dnsbl.in Thu Sep 22 21:57:08 2005 -0700
+++ b/xml/dnsbl.in Fri Sep 23 07:58:34 2005 -0700
@@ -2,7 +2,7 @@
-DNSBL Sendmail milter - Version 5.6
+DNSBL Sendmail milter - Version 5.7
Introduction