diff options
| -rw-r--r-- | usr.sbin/smtpd/parse.y | 4 | ||||
| -rw-r--r-- | usr.sbin/smtpd/smtpd.conf.5 | 5 | ||||
| -rw-r--r-- | usr.sbin/smtpd/smtpd.h | 3 |
3 files changed, 7 insertions, 5 deletions
diff --git a/usr.sbin/smtpd/parse.y b/usr.sbin/smtpd/parse.y index 3e067ab715a..8df85213131 100644 --- a/usr.sbin/smtpd/parse.y +++ b/usr.sbin/smtpd/parse.y @@ -1,4 +1,4 @@ -/* $OpenBSD: parse.y,v 1.105 2012/10/04 19:49:53 gilles Exp $ */ +/* $OpenBSD: parse.y,v 1.106 2012/10/08 20:35:16 gilles Exp $ */ /* * Copyright (c) 2008 Gilles Chehade <gilles@openbsd.org> @@ -1315,7 +1315,7 @@ parse_config(struct smtpd *x_conf, const char *filename, int opts) conf = x_conf; bzero(conf, sizeof(*conf)); - conf->sc_maxsize = SIZE_MAX; + conf->sc_maxsize = DEFAULT_MAX_BODY_SIZE; conf->sc_maps = calloc(1, sizeof(*conf->sc_maps)); conf->sc_rules = calloc(1, sizeof(*conf->sc_rules)); diff --git a/usr.sbin/smtpd/smtpd.conf.5 b/usr.sbin/smtpd/smtpd.conf.5 index 94732394e82..c4ad73862b0 100644 --- a/usr.sbin/smtpd/smtpd.conf.5 +++ b/usr.sbin/smtpd/smtpd.conf.5 @@ -1,4 +1,4 @@ -.\" $OpenBSD: smtpd.conf.5,v 1.69 2012/10/05 07:00:47 jmc Exp $ +.\" $OpenBSD: smtpd.conf.5,v 1.70 2012/10/08 20:35:16 gilles Exp $ .\" .\" Copyright (c) 2008 Janne Johansson <jj@openbsd.org> .\" Copyright (c) 2009 Jacek Masiulaniec <jacekm@dobremiasto.net> @@ -16,7 +16,7 @@ .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. .\" .\" -.Dd $Mdocdate: October 5 2012 $ +.Dd $Mdocdate: October 8 2012 $ .Dt SMTPD.CONF 5 .Os .Sh NAME @@ -196,6 +196,7 @@ Specify a maximum message size of bytes. The argument may contain a multiplier, as documented in .Xr scan_scaled 3 . +The default maximum message size is 35MB if none is specified. .It Xo .Ic queue .Ic compression Op Ar gzip diff --git a/usr.sbin/smtpd/smtpd.h b/usr.sbin/smtpd/smtpd.h index d508227392c..37959ed865d 100644 --- a/usr.sbin/smtpd/smtpd.h +++ b/usr.sbin/smtpd/smtpd.h @@ -1,4 +1,4 @@ -/* $OpenBSD: smtpd.h,v 1.380 2012/10/07 17:21:37 eric Exp $ */ +/* $OpenBSD: smtpd.h,v 1.381 2012/10/08 20:35:16 gilles Exp $ */ /* * Copyright (c) 2008 Gilles Chehade <gilles@openbsd.org> @@ -32,6 +32,7 @@ #define MAX_NAME_SIZE 64 #define MAX_HOPS_COUNT 100 +#define DEFAULT_MAX_BODY_SIZE (35*1024*1024) #define MAX_TAG_SIZE 32 |