From 29666178edb4e86077e75ac5d5cc5a470c08b79c Mon Sep 17 00:00:00 2001 From: Kirill Ponomarev Date: Wed, 20 Apr 2005 18:24:08 +0000 Subject: Do not reject files like /etc/group etc as input files. Submitted by: Jan-Peter Koopmann Patched by: Philip Hazel --- mail/exim/Makefile | 2 +- mail/exim/files/patch-src_smtp__in.c | 22 ++++++++++++++++++++++ 2 files changed, 23 insertions(+), 1 deletion(-) create mode 100644 mail/exim/files/patch-src_smtp__in.c (limited to 'mail/exim') diff --git a/mail/exim/Makefile b/mail/exim/Makefile index 47f5b23f9fd8..1bf96df08038 100644 --- a/mail/exim/Makefile +++ b/mail/exim/Makefile @@ -7,7 +7,7 @@ PORTNAME= exim PORTVERSION?= ${EXIM_VERSION} -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= mail MASTER_SITES= ${MASTER_SITE_EXIM:S/$/:exim/} MASTER_SITE_SUBDIR= exim4/:exim diff --git a/mail/exim/files/patch-src_smtp__in.c b/mail/exim/files/patch-src_smtp__in.c new file mode 100644 index 000000000000..12c5e0584c13 --- /dev/null +++ b/mail/exim/files/patch-src_smtp__in.c @@ -0,0 +1,22 @@ + +$FreeBSD$ + +--- src/smtp_in.c.orig ++++ src/smtp_in.c +@@ -1610,6 +1610,8 @@ + &tzero) > 0) + { + int rc = read(fileno(smtp_in), smtp_inbuffer, in_buffer_size); ++ if (rc > 0) ++ { + if (rc > 150) rc = 150; + smtp_inbuffer[rc] = 0; + log_write(0, LOG_MAIN|LOG_REJECT, "SMTP protocol violation: " +@@ -1618,6 +1620,7 @@ + string_printing(smtp_inbuffer)); + smtp_printf("554 SMTP synchronization error\r\n"); + return FALSE; ++ } + } + } + -- cgit v1.2.3