Release version 1.9

4 files changed, 40 insertions, 6 deletions

diff --git a/.gitignore b/.gitignore
index 6c4df4f..aadccbe 100644
--- a/.gitignore
+++ b/.gitignore
@@ -24,3 +24,6 @@ Makefile.in
 /config.guess
 /autom4te.cache
 /aclocal.m4
+/0*-*.patch
+
+/doc/*.html
diff --git a/NEWS b/NEWS
index 548caa3..b872ccc 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,14 @@
+1.9 [2011-01-23]
+ - Fix build warnings.
+ - Fix problem on linux not detecting netfilter headers.
+ - Add true transparent proxying, where both client and server have no
+   knowledge of the proxy. Documented at the proxsmtp web page.
+ - Use capabilities to have transparent proxying without running as root.
+ - Implement a simple reject filter, so no scripts need to be run.
+ - Allow skipping of filtering for authenticated connections.
+ - Bump up the top number of simultaneous connections.
+ - Add client IP addresses to the log line.
+
 1.8 [2008-06-30]
  - Make the XFOWARD HELO available as a environment variable in scripts. [Glenn Matthys]
  - Send an RSET to the server after filter fails an email.
diff --git a/configure.in b/configure.in
index 9fb4744..d750d26 100644
--- a/configure.in
+++ b/configure.in
@@ -32,8 +32,8 @@ dnl DAMAGE.
 
 
 dnl Process this file with autoconf to produce a configure script.
-AC_INIT(proxsmtp, 1.8, stef@memberwebs.com)
-AM_INIT_AUTOMAKE(proxsmtp, 1.8)
+AC_INIT(proxsmtp, 1.9, stef@memberwebs.com)
+AM_INIT_AUTOMAKE(proxsmtp, 1.9)
 
 LDFLAGS="$LDFLAGS -L/usr/local/lib"
 CFLAGS="$CFLAGS -I/usr/local/include"
diff --git a/doc/proxsmtpd.conf.5 b/doc/proxsmtpd.conf.5
index 4a1f783..323db3a 100644
--- a/doc/proxsmtpd.conf.5
+++ b/doc/proxsmtpd.conf.5
@@ -79,7 +79,13 @@ The amount of time in seconds to wait for the
 .Ar FilterCommand
 to process email data.
 .Pp
-[ Default: 30 seconds ] 
+[ Default: 30 seconds ]
+.It Ar FilterReject
+The rejection message used when
+.Ar FilterType
+is set to 'reject'.
+.Pp
+[ Default: 530 Email Rejected ]
 .It Ar FilterType
 When set to 'pipe' the email data is piped through the 
 .Ar FilterCommand
@@ -90,6 +96,11 @@ using the
 .Ar EMAIL
 environment variable.
 .Pp
+When set to 'reject' then email is immediately rejected using message defined
+by the
+.Ar FilterReject
+option.
+.Pp
 [ Default: pipe ]
 .It Ar Header
 A header to add to scanned messages. Put an empty value to suppress adding
@@ -129,6 +140,11 @@ The address of the SMTP server to send email to once it's been scanned. See
 syntax of addreses below. 
 .Pp
 [ Required ]
+.It Ar Skip
+Whether to skip certain kinds of connections or email from running through
+the filter. Specify 'authenticated' to skip SMTP authenticated connections.
+.Pp
+[ Optional ]
 .It Ar TempDirectory
 The directory to write temp files to. 
 .Pp
@@ -140,11 +156,15 @@ The number of seconds to wait while reading data from network connections.
 .Pp
 [ Default: 180 seconds ]
 .It Ar TransparentProxy
-This option enables transparent proxy support, which allows you to route all 
-SMTP traffic that's going through a gateway through proxsmtp which will then 
-send it on to its final destination. This setup usually involves firewall 
+Setting this option to 'client' enables transparent proxy support, which allows
+you to route all SMTP traffic that's going through a gateway through proxsmtp which
+will then send it on to its final destination. This setup usually involves firewall
 rules which redirect traffic to proxsmtp, and the setup varies from OS to OS.
 .Pp
+Specify 'full' to enable a true transparent proxy where neither the client or
+server are aware of the proxy by way of the packet headers. This setup usually involves
+routers to redirect traffic to proxsmtp, and the setup varies from OS to OS.
+.Pp
 [ Default: off ]
 .It Ar User
 The user to run as. If this option is specified then