summaryrefslogtreecommitdiff
path: root/mail/exim
diff options
context:
space:
mode:
authorKirill Ponomarev <krion@FreeBSD.org>2005-04-20 18:24:08 +0000
committerKirill Ponomarev <krion@FreeBSD.org>2005-04-20 18:24:08 +0000
commit29666178edb4e86077e75ac5d5cc5a470c08b79c (patch)
tree7feacfd45ec54d3ccd0927c4179634846afdd25e /mail/exim
parentUpdate to DAT 4473 (diff)
Do not reject files like /etc/group etc as input files.
Submitted by: Jan-Peter Koopmann <Jan-Peter.Koopmann at seceidos.de> Patched by: Philip Hazel <ph10 at cus dot cam.ac.uk>
Notes
Notes: svn path=/head/; revision=133802
Diffstat (limited to 'mail/exim')
-rw-r--r--mail/exim/Makefile2
-rw-r--r--mail/exim/files/patch-src_smtp__in.c22
2 files changed, 23 insertions, 1 deletions
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;
++ }
+ }
+ }
+