From f9b33c6dc5dbef581b550cc0d82934e9779e191f Mon Sep 17 00:00:00 2001
From: peter <peter@FreeBSD.org>
Date: Sun, 24 Jan 1999 07:46:43 +0000
Subject: Merge changes from vendor branch into our version

---
 contrib/sendmail/src/conf.c | 2 ++
 contrib/sendmail/src/conf.h | 6 ++++++
 2 files changed, 8 insertions(+)

(limited to 'contrib')

diff --git a/contrib/sendmail/src/conf.c b/contrib/sendmail/src/conf.c
index 82e7543..d2e826e 100644
--- a/contrib/sendmail/src/conf.c
+++ b/contrib/sendmail/src/conf.c
@@ -284,6 +284,8 @@ setdefaults(e)
 	ColonOkInAddr = TRUE;
 	DontLockReadFiles = TRUE;
 	DoubleBounceAddr = "postmaster";
+	MaxHeaderLines = MAXHDRLINES;
+	MaxHeaderLineLength = MAXHDRLINELEN;
 	snprintf(buf, sizeof buf, "%s%sdead.letter",
 		_PATH_VARTMP,
 		_PATH_VARTMP[sizeof _PATH_VARTMP - 2] == '/' ? "" : "/");
diff --git a/contrib/sendmail/src/conf.h b/contrib/sendmail/src/conf.h
index b9cdc68..8e5a637 100644
--- a/contrib/sendmail/src/conf.h
+++ b/contrib/sendmail/src/conf.h
@@ -69,6 +69,12 @@ struct rusage;	/* forward declaration to get gcc to shut up in wait.h */
 # else
 #  define MAXMACNAMELEN	20		/* max macro name length */
 # endif
+# ifndef MAXHDRLINES
+#  define MAXHDRLINES	1000		/* max lines in a message header */
+# endif
+# ifndef MAXHDRLINELEN
+#  define MAXHDRLINELEN	SMTPLINELIM	/* max length of a header line */
+# endif
 
 /**********************************************************************
 **  Compilation options.
-- 
cgit v1.1