Fix CVE-2011-1431

1 files changed, 4 insertions, 1 deletions

diff --git a/qmail-smtpd.c b/qmail-smtpd.c
index b2c0263..3352911 100644
--- a/qmail-smtpd.c
+++ b/qmail-smtpd.c
@@ -813,6 +813,9 @@ int saferead(fd,buf,len) int fd; char *buf; int len;
 
 char ssinbuf[1024];
 substdio ssin = SUBSTDIO_FDBUF(saferead,0,ssinbuf,sizeof ssinbuf);
+#ifdef TLS
+void flush_io() { ssin.p = 0; flush(); }
+#endif
 
 struct qmail qqt;
 unsigned int bytestooverflow = 0;
@@ -1566,7 +1569,7 @@ struct commands smtpcommands[] = {
 , { "rset", smtp_rset, 0 }
 , { "help", smtp_help, flush }
 #ifdef TLS
-, { "starttls", smtp_tls, flush }
+, { "starttls", smtp_tls, flush_io }
 #endif
 , { "noop", err_noop, flush }
 , { "vrfy", err_vrfy, flush }