From c148b0f829c4a9b3c783a0a7e7c23b2c6bdb84e5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ask=20Bj=C3=B8rn=20Hansen?= <ask@develooper.com>
Date: Tue, 30 Oct 2001 09:55:06 +0000
Subject: [PATCH] v0.04

git-svn-id: https://svn.perl.org/qpsmtpd/trunk@1 958fd67b-6ff1-0310-b445-bb7760255be9
---
 {config => config.sample}/dnsbl_zones | 0
 {config => config.sample}/rhsbl_zones | 0
 qpsmtpd                               | 6 +++---
 3 files changed, 3 insertions(+), 3 deletions(-)
 rename {config => config.sample}/dnsbl_zones (100%)
 rename {config => config.sample}/rhsbl_zones (100%)

diff --git a/config/dnsbl_zones b/config.sample/dnsbl_zones
similarity index 100%
rename from config/dnsbl_zones
rename to config.sample/dnsbl_zones
diff --git a/config/rhsbl_zones b/config.sample/rhsbl_zones
similarity index 100%
rename from config/rhsbl_zones
rename to config.sample/rhsbl_zones
diff --git a/qpsmtpd b/qpsmtpd
index 284aee9..aeeffca 100755
--- a/qpsmtpd
+++ b/qpsmtpd
@@ -12,7 +12,7 @@
 #
 
 package QPsmtpd;
-$QPsmtpd::VERSION = "0.03";
+$QPsmtpd::VERSION = "0.04";
 use strict;
 $| = 1;
 use Mail::Address ();
@@ -58,8 +58,8 @@ while (<STDIN>) {
 sub dispatch {
   my ($cmd) = lc shift;
 
-  respond(553, $state{dnsbl_blocked})
-    if $state{dnsbl_blocked} and ($cmd ne "helo" and $cmd ne "ehlo");
+  respond(553, $state{dnsbl_blocked}), return 1
+    if $state{dnsbl_blocked} and ($cmd eq "mail" or $cmd eq "rcpt");
 
   if (exists $commands{$cmd}) {
     my ($result) = eval "&$cmd";