| author | John Beck <John.Beck@Oracle.COM> |
| Wed, 04 Mar 2015 13:49:36 -0800 | |
| changeset 3916 | 1224230f8337 |
| parent 3649 | 4006eaaa7d29 |
| child 4769 | 70480c18ca65 |
| permissions | -rw-r--r-- |
|
3649
4006eaaa7d29
20355401 add sendmail to Userland
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
1 |
# This patch is Solaris-specific and thus has not been contributed upstream. |
|
4006eaaa7d29
20355401 add sendmail to Userland
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
2 |
|
|
4006eaaa7d29
20355401 add sendmail to Userland
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
3 |
--- sendmail-8.14.9/cf/m4/proto.m4.~1~ 2014-05-16 13:40:15.000000000 -0700 |
|
4006eaaa7d29
20355401 add sendmail to Userland
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
4 |
+++ sendmail-8.14.9/cf/m4/proto.m4 2014-12-04 12:35:10.676548742 -0800 |
|
4006eaaa7d29
20355401 add sendmail to Userland
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
5 |
@@ -6,6 +6,9 @@ |
|
4006eaaa7d29
20355401 add sendmail to Userland
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
6 |
# Copyright (c) 1988, 1993 |
|
4006eaaa7d29
20355401 add sendmail to Userland
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
7 |
# The Regents of the University of California. All rights reserved. |
|
4006eaaa7d29
20355401 add sendmail to Userland
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
8 |
# |
|
4006eaaa7d29
20355401 add sendmail to Userland
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
9 |
+# Copyright 2004 Sun Microsystems, Inc. All rights reserved. |
|
4006eaaa7d29
20355401 add sendmail to Userland
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
10 |
+# Use is subject to license terms. |
|
4006eaaa7d29
20355401 add sendmail to Userland
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
11 |
+# |
|
4006eaaa7d29
20355401 add sendmail to Userland
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
12 |
# By using this file, you agree to the terms and conditions set |
|
4006eaaa7d29
20355401 add sendmail to Userland
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
13 |
# forth in the LICENSE file which can be found at the top level of |
|
4006eaaa7d29
20355401 add sendmail to Userland
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
14 |
# the sendmail distribution. |
|
4006eaaa7d29
20355401 add sendmail to Userland
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
15 |
@@ -16,7 +19,7 @@ |
|
4006eaaa7d29
20355401 add sendmail to Userland
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
16 |
VERSIONID(`$Id: proto.m4,v 8.762 2013-11-22 20:51:13 ca Exp $') |
|
4006eaaa7d29
20355401 add sendmail to Userland
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
17 |
|
|
4006eaaa7d29
20355401 add sendmail to Userland
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
18 |
# level CF_LEVEL config file format |
|
4006eaaa7d29
20355401 add sendmail to Userland
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
19 |
-V`'CF_LEVEL`'ifdef(`NO_VENDOR',`', `/ifdef(`VENDOR_NAME', `VENDOR_NAME', `Berkeley')') |
|
4006eaaa7d29
20355401 add sendmail to Userland
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
20 |
+V`'CF_LEVEL`'ifdef(`NO_VENDOR',`', `/ifdef(`VENDOR_NAME', `VENDOR_NAME', `Sun')') |
|
4006eaaa7d29
20355401 add sendmail to Userland
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
21 |
divert(-1) |
|
4006eaaa7d29
20355401 add sendmail to Userland
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
22 |
|
|
4006eaaa7d29
20355401 add sendmail to Userland
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
23 |
dnl if MAILER(`local') not defined: do it ourself; be nice |
|
4006eaaa7d29
20355401 add sendmail to Userland
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
24 |
@@ -597,7 +600,7 @@ |
|
4006eaaa7d29
20355401 add sendmail to Userland
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
25 |
_OPTION(ControlSocketName, `confCONTROL_SOCKET_NAME', `/var/spool/mqueue/.control') |
|
4006eaaa7d29
20355401 add sendmail to Userland
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
26 |
|
|
4006eaaa7d29
20355401 add sendmail to Userland
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
27 |
# Maximum MIME header length to protect MUAs |
|
4006eaaa7d29
20355401 add sendmail to Userland
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
28 |
-_OPTION(MaxMimeHeaderLength, `confMAX_MIME_HEADER_LENGTH', `0/0') |
|
4006eaaa7d29
20355401 add sendmail to Userland
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
29 |
+_OPTION(MaxMimeHeaderLength, `confMAX_MIME_HEADER_LENGTH', `2048/1024') |
|
4006eaaa7d29
20355401 add sendmail to Userland
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
30 |
|
|
4006eaaa7d29
20355401 add sendmail to Userland
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
31 |
# Maximum length of the sum of all headers |
|
4006eaaa7d29
20355401 add sendmail to Userland
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
32 |
_OPTION(MaxHeadersLength, `confMAX_HEADERS_LENGTH', `32768') |