# HG changeset patch
# User carl
# Date 1127792429 25200
# Node ID 6ac7ba4a83120245ea399350e3457479e303e5f8
# Parent 63e8633abc3453a2c0dd7155f778844cc6d01bcc
fix <> passed as <<>> to verification hosts
diff -r 63e8633abc34 -r 6ac7ba4a8312 ChangeLog
--- a/ChangeLog Sun Sep 25 08:38:29 2005 -0700
+++ b/ChangeLog Mon Sep 26 20:40:29 2005 -0700
@@ -1,5 +1,10 @@
$Id$
+5.9 2005-09-26
+ Fix a bug with empty return paths passed to the verification code.
+ That resulted in 'MAIL FROM:<<>>' being sent to the verification
+ mail server.
+
5.8 2005-09-25
Allow empty env_to at global context level to remove restrictions
on env_to values in child contexts.
diff -r 63e8633abc34 -r 6ac7ba4a8312 dnsbl.spec.in
--- a/dnsbl.spec.in Sun Sep 25 08:38:29 2005 -0700
+++ b/dnsbl.spec.in Mon Sep 26 20:40:29 2005 -0700
@@ -1,6 +1,6 @@
Summary: DNSBL Sendmail Milter
Name: dnsbl
-Version: 5.8
+Version: 5.9
Release: 2
Copyright: GPL
Group: System Environment/Daemons
diff -r 63e8633abc34 -r 6ac7ba4a8312 package.bash
--- a/package.bash Sun Sep 25 08:38:29 2005 -0700
+++ b/package.bash Mon Sep 26 20:40:29 2005 -0700
@@ -1,6 +1,6 @@
#!/bin/bash
-VER=dnsbl-5.8
+VER=dnsbl-5.9
mkdir $VER
target1=/home/httpd/html/510sg/util/dnsbl.tar.gz
target2=/home/httpd/html/510sg/dnsbl.conf
diff -r 63e8633abc34 -r 6ac7ba4a8312 src/context.cpp
--- a/src/context.cpp Sun Sep 25 08:38:29 2005 -0700
+++ b/src/context.cpp Mon Sep 26 20:40:29 2005 -0700
@@ -187,12 +187,16 @@
int SMTP::from(char *f) {
+ // the mail from address was originally passed in from sendmail enclosed in
+ // <>. to_lower_string() removed the <> and converted the rest to lowercase,
+ // except in the case of an empty return path, which was left as the two
+ // character string <>.
if (strncmp(efrom, f, maxlen)) {
rset();
strncpy(efrom, f, maxlen);
init();
append("MAIL FROM:<");
- append(f);
+ if (*f != '<') append(f);
append(">");
return cmd(NULL);
}
diff -r 63e8633abc34 -r 6ac7ba4a8312 xml/dnsbl.in
--- a/xml/dnsbl.in Sun Sep 25 08:38:29 2005 -0700
+++ b/xml/dnsbl.in Mon Sep 26 20:40:29 2005 -0700
@@ -2,7 +2,7 @@
-DNSBL Sendmail milter - Version 5.8
+DNSBL Sendmail milter - Version 5.9
Introduction