diff -uNr postfix-2.3.2.orig/src/smtpd/smtpd.c postfix-2.3.2/src/smtpd/smtpd.c --- postfix-2.3.2.orig/src/smtpd/smtpd.c 2006-07-27 02:47:39.000000000 +0200 +++ postfix-2.3.2/src/smtpd/smtpd.c 2006-08-01 18:43:32.000000000 +0200 @@ -3915,7 +3915,7 @@ var_myhostname); /* Not: state->error_count++; */ } else { - smtpd_chat_reply(state, "220 %s", var_smtpd_banner); + smtpd_chat_reply_multiline(state, 220, var_smtpd_banner); } } diff -uNr postfix-2.3.2.orig/src/smtpd/smtpd_chat.c postfix-2.3.2/src/smtpd/smtpd_chat.c --- postfix-2.3.2.orig/src/smtpd/smtpd_chat.c 2006-07-10 22:24:52.000000000 +0200 +++ postfix-2.3.2/src/smtpd/smtpd_chat.c 2006-08-01 18:46:05.000000000 +0200 @@ -14,6 +14,11 @@ /* SMTPD_STATE *state; /* char *format; /* +/* void smtpd_chat_reply_multiline(state, smtp_reply_code, format, ...) +/* SMTPD_STATE *state; +/* int smtp_reply_code; +/* char *format; +/* /* void smtpd_chat_notify(state) /* SMTPD_STATE *state; /* @@ -32,6 +37,11 @@ /* replaced by 4xx (try again). In case of a 421 reply the /* SMTPD_FLAG_HANGUP flag is set for orderly disconnect. /* +/* smtpd_chat_reply_multiline() formats a server reply, sends it to +/* the client, and appends a copy to the SMTP transaction log. +/* The reply can contain embedded "\n"s which will be treated as +/* separators in a multiline reply. +/* /* smtpd_chat_notify() sends a copy of the SMTP transaction log /* to the postmaster for review. The postmaster notice is sent only /* when delivery is possible immediately. It is an error to call @@ -62,6 +72,8 @@ #include <time.h> #include <stdlib.h> /* 44BSD stdarg.h uses abort() */ #include <stdarg.h> +#include <string.h> +#include <ctype.h> /* Utility library. */ @@ -188,6 +200,65 @@ state->flags |= SMTPD_FLAG_HANGUP; } + + + + +/* trim_line - remove trailing whitespace and return a pointer to the first */ +/* non-space char in the string. Based on TRIM() in ../util/dict.c */ +/* WARNING: this function is DESTRUCTIVE. */ + +static char *trim_line( char *line ) { + char *p; + + for (p=line + strlen(line); p > line && ISSPACE(p[-1]); p--); + *p = 0; + + while ( ISSPACE(*line) ) + ++line; + + return ( line ); +} + +/* smtpd_chat_reply_multiline - convert multline string into seperate */ +/* lines, sending each one to smtpd_chat_reply() */ + +#define LINE_SEPARATOR "\n" + +void smtpd_chat_reply_multiline(SMTPD_STATE *state, int smtp_reply_code, char *format,...) +{ + va_list ap; + char *line, *line2; /* one line (of the multiline) reply */ + size_t size; /* size of a single line */ + static VSTRING *temp_line; /* SMTP reply before unescapeing */ + static VSTRING *multiline; /* SMTP reply after unescaping */ + + /* First-time intialization. */ + if (!temp_line) + temp_line = vstring_alloc(512); + if (!multiline) + multiline = vstring_alloc(512); + + va_start(ap, format); + vstring_vsprintf(temp_line, format, ap); + va_end(ap); + + /* unescape lines with "\\n", converting them to "\n" */ + unescape( multiline, STR(temp_line) ); + + line = STR(multiline); + while ( (size = strcspn(line, LINE_SEPARATOR)) < strlen(line) ) { + *(line + size) = 0; + + line2 = trim_line(line); + smtpd_chat_reply(state, "%03d-%s", smtp_reply_code, line2); + + line += size + 1; + } + line2 = trim_line(line); + smtpd_chat_reply(state, "%03d %s", smtp_reply_code, line2); +} + /* print_line - line_wrap callback */ static void print_line(const char *str, int len, int indent, char *context) diff -uNr postfix-2.3.2.orig/src/smtpd/smtpd_chat.h postfix-2.3.2/src/smtpd/smtpd_chat.h --- postfix-2.3.2.orig/src/smtpd/smtpd_chat.h 2006-04-24 20:48:28.000000000 +0200 +++ postfix-2.3.2/src/smtpd/smtpd_chat.h 2006-08-01 18:46:56.000000000 +0200 @@ -15,6 +15,7 @@ extern void smtpd_chat_reset(SMTPD_STATE *); extern void smtpd_chat_query(SMTPD_STATE *); extern void PRINTFLIKE(2, 3) smtpd_chat_reply(SMTPD_STATE *, const char *, ...); +extern void smtpd_chat_reply_multiline(SMTPD_STATE *, int, char *, ...); extern void smtpd_chat_notify(SMTPD_STATE *); /* LICENSE