diff options
| author | Pierre-Yves Ritschard <pyr@cvs.openbsd.org> | 2007-10-22 16:53:31 +0000 |
|---|---|---|
| committer | Pierre-Yves Ritschard <pyr@cvs.openbsd.org> | 2007-10-22 16:53:31 +0000 |
| commit | 862f47d32e95c459a45a285376f8a7b4a728f7a3 (patch) | |
| tree | cb0fa67a7d43a820929b8b2239524e87a7d462b6 /usr.sbin/relayd/parse.y | |
| parent | 5eb411e19f010eadeb4e61f51da2e7f589ac4fc2 (diff) | |
load certificates text at parse time. then load them in relay processes.
this separation will ease reload a bit more.
ok reyk@ who spotted a stupid mistake again...
Diffstat (limited to 'usr.sbin/relayd/parse.y')
| -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 02fbd69e545..8f1b36beb0e 100644 --- a/usr.sbin/relayd/parse.y +++ b/usr.sbin/relayd/parse.y @@ -1,4 +1,4 @@ -/* $OpenBSD: parse.y,v 1.74 2007/10/22 12:18:15 reyk Exp $ */ +/* $OpenBSD: parse.y,v 1.75 2007/10/22 16:53:30 pyr Exp $ */ /* * Copyright (c) 2006 Pierre-Yves Ritschard <pyr@openbsd.org> @@ -944,6 +944,11 @@ relay : RELAY STRING { rlay->proto = &conf->proto_default; rlay->conf.proto = conf->proto_default.id; } + if (relay_load_certfiles(rlay) == -1) { + yyerror("cannot load certificates for relay %s", + rlay->conf.name); + YYERROR; + } conf->relaycount++; SPLAY_INIT(&rlay->sessions); TAILQ_INSERT_HEAD(conf->relays, rlay, entry); |