summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStef Walter <stef@memberwebs.com>2004-08-25 22:57:22 +0000
committerStef Walter <stef@memberwebs.com>2004-08-25 22:57:22 +0000
commitdf0df5f265e9a14ae1e63c771520da84feb654bf (patch)
tree4876230a9fca992b8643b3d58da347d8ddff63b9
parent3ab559f02970d9f7e8c73a3854f405cab43158d1 (diff)
Reset log line on HELO and EHLO
-rw-r--r--common/smtppass.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/common/smtppass.c b/common/smtppass.c
index 0a20777..e26ea07 100644
--- a/common/smtppass.c
+++ b/common/smtppass.c
@@ -754,6 +754,9 @@ static int smtp_passthru(clamsmtp_context_t* ctx)
{
messagex(ctx, LOG_DEBUG, "filtering EHLO response");
filter_ehlo = 1;
+
+ /* A new message */
+ logline[0] = 0;
}
/*
@@ -782,7 +785,8 @@ static int smtp_passthru(clamsmtp_context_t* ctx)
add_to_logline(logline, "to=", ctx->line + r);
/* Reset log line */
- else if(is_first_word(ctx->line, RSET_CMD, KL(RSET_CMD)))
+ else if(is_first_word(ctx->line, RSET_CMD, KL(RSET_CMD)) ||
+ is_first_word(ctx->line, HELO_CMD, KL(HELO_CMD)))
logline[0] = 0;
/* All other commands just get passed through to server */