diff options
| author | Gilles Chehade <gilles@cvs.openbsd.org> | 2013-02-17 12:28:31 +0000 |
|---|---|---|
| committer | Gilles Chehade <gilles@cvs.openbsd.org> | 2013-02-17 12:28:31 +0000 |
| commit | 38f8a2c1ed45d304620f2733b780f8b34c2df003 (patch) | |
| tree | 2b1638cfd483894e70e28872e8859ed88b15caa8 | |
| parent | d4b0de1fb48a2a4bcd27c9514910424de4859371 (diff) | |
disable queue compression temporarily, we lack the smtpctl bits
| -rw-r--r-- | usr.sbin/smtpd/parse.y | 27 | ||||
| -rw-r--r-- | usr.sbin/smtpd/smtpd.conf.5 | 10 |
2 files changed, 5 insertions, 32 deletions
diff --git a/usr.sbin/smtpd/parse.y b/usr.sbin/smtpd/parse.y index 36d7538cc92..32c96b39543 100644 --- a/usr.sbin/smtpd/parse.y +++ b/usr.sbin/smtpd/parse.y @@ -1,4 +1,4 @@ -/* $OpenBSD: parse.y,v 1.114 2013/02/14 12:30:49 gilles Exp $ */ +/* $OpenBSD: parse.y,v 1.115 2013/02/17 12:28:30 gilles Exp $ */ /* * Copyright (c) 2008 Gilles Chehade <gilles@poolp.org> @@ -129,7 +129,7 @@ typedef struct { %type <v.number> port from auth ssl size expire sender %type <v.object> tables tablenew tableref destination alias virtual usermapping userbase credentials %type <v.maddr> relay_as -%type <v.string> certificate tag tagged compression relay_source listen_helo relay_helo relay_backup +%type <v.string> certificate tag tagged relay_source listen_helo relay_helo relay_backup %% grammar : /* empty */ @@ -329,30 +329,10 @@ credentials : AUTH tables { | /* empty */ { $$ = 0; } ; -compression : COMPRESSION { - $$ = strdup("gzip"); - if ($$ == NULL) { - yyerror("strdup"); - YYERROR; - } - } - | COMPRESSION STRING { $$ = $2; } - ; - listen_helo : HOSTNAME STRING { $$ = $2; } | /* empty */ { $$ = NULL; } -main : QUEUE compression { - conf->sc_queue_compress_algo = strdup($2); - if (conf->sc_queue_compress_algo == NULL) { - yyerror("strdup"); - free($2); - YYERROR; - } - conf->sc_queue_flags |= QUEUE_COMPRESS; - free($2); - } - | BOUNCEWARN { +main : BOUNCEWARN { bzero(conf->sc_bounce_warn, sizeof conf->sc_bounce_warn); } bouncedelays | EXPIRE STRING { @@ -978,7 +958,6 @@ lookup(char *s) { "backup", BACKUP }, { "bounce-warn", BOUNCEWARN }, { "certificate", CERTIFICATE }, - { "compression", COMPRESSION }, { "deliver", DELIVER }, { "domain", DOMAIN }, { "expire", EXPIRE }, diff --git a/usr.sbin/smtpd/smtpd.conf.5 b/usr.sbin/smtpd/smtpd.conf.5 index 29678ffd269..120465b593e 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.90 2013/02/15 22:43:21 eric Exp $ +.\" $OpenBSD: smtpd.conf.5,v 1.91 2013/02/17 12:28:30 gilles Exp $ .\" .\" Copyright (c) 2008 Janne Johansson <jj@openbsd.org> .\" Copyright (c) 2009 Jacek Masiulaniec <jacekm@dobremiasto.net> @@ -17,7 +17,7 @@ .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. .\" .\" -.Dd $Mdocdate: February 15 2013 $ +.Dd $Mdocdate: February 17 2013 $ .Dt SMTPD.CONF 5 .Os .Sh NAME @@ -525,12 +525,6 @@ 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 Ic queue compression Op Ar gzip -Enable transparent deflating and inflating of all envelopes -and messages. -The only supported algorithm at the moment is gzip. -Envelopes and messages may be inspected using -.Xr gzcat 1 . .It Ic table Ar name Oo Ar type : Oc Ns Ar config Tables are used to provide additional configuration information for .Xr smtpd 8 |