From 6ca4bc388cebd44dcbf540fed2204c936054ec90 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ask=20Bj=C3=B8rn=20Hansen?= <ask@develooper.com>
Date: Thu, 5 May 2005 07:44:34 +0000
Subject: [PATCH]   Fix off-by-one line numbers in warnings from plugins
 (thanks to   Brian Grossman).

  update changes file with all (?) changes since 0.29


git-svn-id: https://svn.perl.org/qpsmtpd/trunk@411 958fd67b-6ff1-0310-b445-bb7760255be9
---
 CREDITS               | 15 ++++++++++-----
 Changes               | 29 +++++++++++++++++++++++++++++
 lib/Qpsmtpd/Plugin.pm |  2 +-
 3 files changed, 40 insertions(+), 6 deletions(-)

diff --git a/CREDITS b/CREDITS
index 0af70de..395f2dd 100644
--- a/CREDITS
+++ b/CREDITS
@@ -2,6 +2,14 @@ Jim Winstead <jimw@trainedmonkey.com>: the core "command dispatch"
 system in qpsmtpd is taken from his colobus nntp server.  The
 check_badmailfrom and check_mailrcptto plugins.
 
+John Peacock <jpeacock@cpan.org>: More changes, fixes and vast
+improvements for me to ever catch up on here.
+
+Matt Sergeant <matt@sergeant.org>: Clamav plugin.  Patch for the dnsbl
+plugin to give us all the dns results.  Resident SpamAssassin guru.
+PPerl. smtp-forward plugin. Documentation (yay!).  Lots of fixes and
+tweaks.  Apache module.  Event based high performance experiment.
+
 Devin Carraway <qpsmtpd@devin.com>: Patch to not accept half mails if
 the connection gets dropped at the wrong moment.  Support and enable
 taint checking. MAIL FROM host dns check configurable.  HELO hook.
@@ -15,10 +23,6 @@ Marius Kjeldahl <marius@kjeldahl.net>, Zukka Zitting
 
 Robert Spier <robert@perl.org>: Klez filter.
 
-Matt Sergeant <matt@sergeant.org>: Clamav plugin.  Patch for the dnsbl
-plugin to give us all the dns results.  Resident SpamAssassin guru.
-PPerl. smtp-forward plugin. Documentation (yay!).
-
 Rasjid Wilcox <rasjidw@openminddev.net>: Lots of patches as per the
 Changes file.
 
@@ -28,4 +32,5 @@ format for the dates in the "Received" headers.
 Gergely Risko <risko@risko.hu>: Fixed timeout bug when the client sent
 DATA and then stopped before sending the next line.
 
-... and many others per the Change file!
+... and many many others per the Changes file and subversion logs and
+    mailing list archives.  Thanks everyone!
diff --git a/Changes b/Changes
index 2c95e48..d6c98d0 100644
--- a/Changes
+++ b/Changes
@@ -1,6 +1,35 @@
 0.30 - 
 
+  Add plugable logging support include sample plugin which replicates
+  the existing core code.  Add OK hook.
+
+  Add new logging plugin, logging/adaptive, which logs at different
+  levels depending on whether the message was accepted/rejected. 
+
+  (See README.logging for information about the new logging system by
+  John Peacock)
+
+  plugins/auth/auth_ldap_bind - New plugin to authenticate against an
+  LDAP database. Thanks to Elliot Foster <elliotf@gratuitous.net>
+
+  plugins/auth/auth_flat_file - flat file auth plugin
+
+  Revamp Qpsmtpd::Constants so it is possible to retrieve the text
+  representation from the numeric (for logging purposes).
+
+  Store mail in memory up to a certain threshold (default 10k).
+
+  Remove needless restriction on temp_file() to allow the spool
+  directory path to include dots (as in ../)
+
+  Fix off-by-one line numbers in warnings from plugins (thanks to
+  Brian Grossman).
+
   Don't check the HELO host for rfc-ignorant compliance
+  
+  body_write patches from Brian Grossman
+
+  Fix for corruption problem under Apache
 
 
 0.29 - 2005/03/03
diff --git a/lib/Qpsmtpd/Plugin.pm b/lib/Qpsmtpd/Plugin.pm
index a2d9e9b..f636bd9 100644
--- a/lib/Qpsmtpd/Plugin.pm
+++ b/lib/Qpsmtpd/Plugin.pm
@@ -105,7 +105,7 @@ sub compile {
     }
     close F;
 
-    my $line = "\n#line 1 $file\n";
+    my $line = "\n#line 0 $file\n";
 
     if ($test_mode) {
         if (open(F, "t/plugin_tests/$plugin")) {