From 74f4997fe58ea48bf3d70061a45d56a3a9864d2b Mon Sep 17 00:00:00 2001 From: Stef Walter Date: Sat, 28 May 2005 18:40:40 +0000 Subject: Handle condition of server refusing data transfers more gracefully. --- ChangeLog | 3 +++ common/smtppass.c | 4 ++-- configure.in | 4 ++-- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index e5e171d..722347f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,6 @@ +1.5 + - Handle condition of server refusing data transfers more gracefully. + 1.4.1 [2005-04-15] - Fixed bug (introduced in 1.4) when Header was not present. diff --git a/common/smtppass.c b/common/smtppass.c index ccfdcf2..0008a8f 100644 --- a/common/smtppass.c +++ b/common/smtppass.c @@ -273,7 +273,7 @@ int sp_run(const char* configfile, const char* pidfile, int dbg_level) else if(g_state.outname != NULL && g_state.transparent) warnx("the " CFG_OUTADDR " option will be ignored when " CFG_TRANSPARENT " is enabled"); - sp_messagex(NULL, LOG_DEBUG, "starting up..."); + sp_messagex(NULL, LOG_DEBUG, "starting up (%s)...", VERSION); /* Drop privileges before daemonizing */ drop_privileges(); @@ -1485,7 +1485,7 @@ int sp_done_data(spctx_t* ctx) sp_messagex(ctx, LOG_DEBUG, "server refused data transfer"); - RETURN(-1); + RETURN(0); } sp_messagex(ctx, LOG_DEBUG, "sending from cache file: %s", ctx->cachename); diff --git a/configure.in b/configure.in index 2527c67..c589626 100644 --- a/configure.in +++ b/configure.in @@ -36,8 +36,8 @@ dnl Nate Nielsen dnl dnl Process this file with autoconf to produce a configure script. -AC_INIT(clamsmtp, 1.4.1, nielsen@memberwebs.com) -AM_INIT_AUTOMAKE(clamsmtp, 1.4.1) +AC_INIT(clamsmtp, 1.4.1.91, nielsen@memberwebs.com) +AM_INIT_AUTOMAKE(clamsmtp, 1.4.1.91) LDFLAGS="$LDFLAGS -L/usr/local/lib" CFLAGS="$CFLAGS -I/usr/local/include" -- cgit v1.2.3