diff options
| author | Stef Walter <stef@memberwebs.com> | 2007-06-21 22:48:49 +0000 |
|---|---|---|
| committer | Stef Walter <stef@memberwebs.com> | 2007-06-21 22:48:49 +0000 |
| commit | 899d91e7fe956341a805b3744037530afc6d210f (patch) | |
| tree | d0b6f13b864b5a5ef9fc3f76abd07efef8407148 | |
| parent | 4093e901218ff6293aa9543f6468b75edc23c9f1 (diff) | |
Send an RSET to the server after filter fails some data.
| -rw-r--r-- | AUTHORS | 1 | ||||
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rw-r--r-- | common/smtppass.c | 6 | ||||
| -rw-r--r-- | configure.in | 4 |
4 files changed, 12 insertions, 2 deletions
@@ -19,3 +19,4 @@ Greg Hackney <hackney@swbell.net> Billy B. Bilano <mr.bill.bilano@email.server.unix.bill.bilano.biz> Loic Le Loarer <loic.le-loarer@polytechnique.org> Jeff Fisher <jeff@lfchosting.com> +Guy Helmer <ghelmer@palisadesys.com> @@ -1,3 +1,6 @@ +1.8 + - Send an RSET to the server after filter fails an email. + 1.7 [2007-05-28] - Use my real name 'Stef Walter' See: http://memberwebs.com/nielsen/ diff --git a/common/smtppass.c b/common/smtppass.c index 25d657c..5532927 100644 --- a/common/smtppass.c +++ b/common/smtppass.c @@ -98,6 +98,7 @@ spthread_t; #define SMTP_DATA "DATA" CRLF #define SMTP_NOOP "NOOP" CRLF +#define SMTP_RSET "RSET" CRLF #define SMTP_XCLIENT "XCLIENT ADDR=%s" CRLF #define SMTP_BANNER "220 smtp.passthru" CRLF #define SMTP_HELO_RSP "250 smtp.passthru" CRLF @@ -1711,6 +1712,11 @@ int sp_fail_data(spctx_t* ctx, const char* smtp_status) if(spio_write_data(ctx, &(ctx->client), smtp_status) == -1) return -1; + /* Tell the server to forget about the current message */ + if(spio_write_data(ctx, &(ctx->server), SMTP_RSET) == -1 || + read_server_response(ctx) == -1) + return -1; + return 0; } diff --git a/configure.in b/configure.in index fc2636e..64a4d3a 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.7, stef@memberwebs.com) -AM_INIT_AUTOMAKE(proxsmtp, 1.7) +AC_INIT(proxsmtp, 1.7.90, stef@memberwebs.com) +AM_INIT_AUTOMAKE(proxsmtp, 1.7.90) LDFLAGS="$LDFLAGS -L/usr/local/lib" CFLAGS="$CFLAGS -I/usr/local/include" |