diff options
| author | Reyk Floeter <reyk@cvs.openbsd.org> | 2016-09-26 16:25:17 +0000 |
|---|---|---|
| committer | Reyk Floeter <reyk@cvs.openbsd.org> | 2016-09-26 16:25:17 +0000 |
| commit | a5be9b250b8aa2492828f3b6acea553a66f14bd8 (patch) | |
| tree | 9dea0fdd9b1145e455a9353745625eacab19bf04 /usr.sbin | |
| parent | 8be99a49a713b1a1e5baccb9a26fa3a0aa0b8057 (diff) | |
spacing
Diffstat (limited to 'usr.sbin')
| -rw-r--r-- | usr.sbin/relayd/control.c | 5 | ||||
| -rw-r--r-- | usr.sbin/relayd/parse.y | 5 | ||||
| -rw-r--r-- | usr.sbin/relayd/relay.c | 6 | ||||
| -rw-r--r-- | usr.sbin/relayd/relay_http.c | 4 |
4 files changed, 11 insertions, 9 deletions
diff --git a/usr.sbin/relayd/control.c b/usr.sbin/relayd/control.c index 516c4189aba..57a9a515b16 100644 --- a/usr.sbin/relayd/control.c +++ b/usr.sbin/relayd/control.c @@ -1,4 +1,4 @@ -/* $OpenBSD: control.c,v 1.53 2016/09/02 12:12:51 reyk Exp $ */ +/* $OpenBSD: control.c,v 1.54 2016/09/26 16:25:16 reyk Exp $ */ /* * Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org> @@ -359,7 +359,8 @@ control_dispatch_imsg(int fd, short event, void *arg) proc_forward_imsg(env->sc_ps, &imsg, PROC_PARENT, -1); break; case IMSG_CTL_POLL: - proc_compose(env->sc_ps, PROC_HCE, IMSG_CTL_POLL, NULL, 0); + proc_compose(env->sc_ps, PROC_HCE, + IMSG_CTL_POLL, NULL, 0); imsg_compose_event(&c->iev, IMSG_CTL_OK, 0, ps->ps_instance + 1, -1, NULL, 0); break; diff --git a/usr.sbin/relayd/parse.y b/usr.sbin/relayd/parse.y index 0b877207a35..12cab753ecf 100644 --- a/usr.sbin/relayd/parse.y +++ b/usr.sbin/relayd/parse.y @@ -1,4 +1,4 @@ -/* $OpenBSD: parse.y,v 1.211 2016/09/03 14:44:21 reyk Exp $ */ +/* $OpenBSD: parse.y,v 1.212 2016/09/26 16:25:16 reyk Exp $ */ /* * Copyright (c) 2007 - 2014 Reyk Floeter <reyk@openbsd.org> @@ -385,7 +385,8 @@ main : INTERVAL NUMBER { conf->sc_conf.opts |= $2; } | TIMEOUT timeout { - bcopy(&$2, &conf->sc_conf.timeout, sizeof(struct timeval)); + bcopy(&$2, &conf->sc_conf.timeout, + sizeof(struct timeval)); } | PREFORK NUMBER { if ($2 <= 0 || $2 > PROC_MAX_INSTANCES) { diff --git a/usr.sbin/relayd/relay.c b/usr.sbin/relayd/relay.c index 06097faf7f0..df0828c4157 100644 --- a/usr.sbin/relayd/relay.c +++ b/usr.sbin/relayd/relay.c @@ -1,4 +1,4 @@ -/* $OpenBSD: relay.c,v 1.214 2016/09/23 12:06:15 jsg Exp $ */ +/* $OpenBSD: relay.c,v 1.215 2016/09/26 16:25:16 reyk Exp $ */ /* * Copyright (c) 2006 - 2014 Reyk Floeter <reyk@openbsd.org> @@ -1305,7 +1305,8 @@ relay_from_table(struct rsession *con) /* handle all non-hashing algorithms */ host = rlt->rlt_host[idx]; DPRINTF("%s: session %d: table %s host %s, p 0x%016llx, idx %d", - __func__, con->se_id, table->conf.name, host->conf.name, p, idx); + __func__, con->se_id, table->conf.name, host->conf.name, + p, idx); } while (host != NULL) { @@ -2069,7 +2070,6 @@ relay_tls_ctx_create(struct relay *rlay) */ SSL_CTX_set_session_cache_mode(ctx, SSL_SESS_CACHE_OFF); - /* Set callback for TLS session tickets if enabled */ if (proto->tickets == -1) SSL_CTX_set_options(ctx, SSL_OP_NO_TICKET); diff --git a/usr.sbin/relayd/relay_http.c b/usr.sbin/relayd/relay_http.c index b9b5019a0b9..c5840bd96cf 100644 --- a/usr.sbin/relayd/relay_http.c +++ b/usr.sbin/relayd/relay_http.c @@ -1,4 +1,4 @@ -/* $OpenBSD: relay_http.c,v 1.62 2016/08/01 21:25:53 benno Exp $ */ +/* $OpenBSD: relay_http.c,v 1.63 2016/09/26 16:25:16 reyk Exp $ */ /* * Copyright (c) 2006 - 2016 Reyk Floeter <reyk@openbsd.org> @@ -1790,7 +1790,7 @@ relay_test(struct protocol *proto, struct ctl_relay_event *cre) DPRINTF("%s: session %d, res %d", __func__, con->se_id, res); if (res == RES_BAD || res == RES_INTERNAL) - return(res); + return (res); res = 0; r = TAILQ_NEXT(r, rule_entry); } |