diff options
| author | Jonathan Gray <jsg@cvs.openbsd.org> | 2010-02-24 15:44:19 +0000 |
|---|---|---|
| committer | Jonathan Gray <jsg@cvs.openbsd.org> | 2010-02-24 15:44:19 +0000 |
| commit | 28e6dada12f12f25cb4eac7f5c9defc1a2a4cb05 (patch) | |
| tree | 286fe2c1e30252021d9b546923c6006b9a5a384c /usr.sbin | |
| parent | f8042fda445e644eadd15f9fb8b603be939acc1b (diff) | |
Sync the list of initialisation steps done for the default
relay protocol with that done for specified relay protocols.
Makes it possible to use SSL for the default relay protocol.
From boudewijn@indes.com in pr 6316
Diffstat (limited to 'usr.sbin')
| -rw-r--r-- | usr.sbin/relayd/parse.y | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/usr.sbin/relayd/parse.y b/usr.sbin/relayd/parse.y index a5fc9274186..0520135a079 100644 --- a/usr.sbin/relayd/parse.y +++ b/usr.sbin/relayd/parse.y @@ -1,4 +1,4 @@ -/* $OpenBSD: parse.y,v 1.142 2009/08/27 09:26:53 reyk Exp $ */ +/* $OpenBSD: parse.y,v 1.143 2010/02/24 15:44:18 jsg Exp $ */ /* * Copyright (c) 2007, 2008 Reyk Floeter <reyk@openbsd.org> @@ -2145,6 +2145,11 @@ parse_config(const char *filename, int opts) bzero(&conf->sc_proto_default, sizeof(conf->sc_proto_default)); conf->sc_proto_default.flags = F_USED; conf->sc_proto_default.cache = RELAY_CACHESIZE; + conf->sc_proto_default.tcpflags = TCPFLAG_DEFAULT; + conf->sc_proto_default.tcpbacklog = RELAY_BACKLOG; + conf->sc_proto_default.sslflags = SSLFLAG_DEFAULT; + (void)strlcpy(conf->sc_proto_default.sslciphers, SSLCIPHERS_DEFAULT, + sizeof(conf->sc_proto_default.sslciphers)); conf->sc_proto_default.type = RELAY_PROTO_TCP; (void)strlcpy(conf->sc_proto_default.name, "default", sizeof(conf->sc_proto_default.name)); |