diff options
| author | Florian Obser <florian@cvs.openbsd.org> | 2019-03-01 16:35:18 +0000 |
|---|---|---|
| committer | Florian Obser <florian@cvs.openbsd.org> | 2019-03-01 16:35:18 +0000 |
| commit | fe17616be87bf4ad45ef6942bd002c6b78eab169 (patch) | |
| tree | d35752cd1ef26c0d072c615f860ce9da4e6b8b3a | |
| parent | 3fb097b70054123b20871a954fceb824425cbfd1 (diff) | |
trailing whitespace
| -rw-r--r-- | sbin/slaacd/frontend.c | 6 | ||||
| -rw-r--r-- | usr.sbin/rad/frontend.c | 4 | ||||
| -rw-r--r-- | usr.sbin/rad/parse.y | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/sbin/slaacd/frontend.c b/sbin/slaacd/frontend.c index e8bd2a6a9a1..9bb7ed47579 100644 --- a/sbin/slaacd/frontend.c +++ b/sbin/slaacd/frontend.c @@ -1,4 +1,4 @@ -/* $OpenBSD: frontend.c,v 1.22 2018/07/23 17:25:52 florian Exp $ */ +/* $OpenBSD: frontend.c,v 1.23 2019/03/01 16:34:58 florian Exp $ */ /* * Copyright (c) 2017 Florian Obser <florian@openbsd.org> @@ -564,7 +564,7 @@ update_autoconf_addresses(uint32_t if_index, char* if_name) memset(&ifr6, 0, sizeof(ifr6)); (void) strlcpy(ifr6.ifr_name, if_name, sizeof(ifr6.ifr_name)); memcpy(&ifr6.ifr_addr, sin6, sizeof(ifr6.ifr_addr)); - + if (ioctl(ioctlsock, SIOCGIFNETMASK_IN6, (caddr_t)&ifr6) < 0) { log_warn("SIOCGIFNETMASK_IN6"); continue; @@ -605,7 +605,7 @@ update_autoconf_addresses(uint32_t if_index, char* if_name) log_debug("%s: %s link state down? %s", __func__, if_name, imsg_link_state.link_state == LINK_STATE_DOWN ? "yes" : "no"); - frontend_imsg_compose_main(IMSG_UPDATE_LINK_STATE, 0, + frontend_imsg_compose_main(IMSG_UPDATE_LINK_STATE, 0, &imsg_link_state, sizeof(imsg_link_state)); } diff --git a/usr.sbin/rad/frontend.c b/usr.sbin/rad/frontend.c index 4621c5f25c3..938bb099841 100644 --- a/usr.sbin/rad/frontend.c +++ b/usr.sbin/rad/frontend.c @@ -1,4 +1,4 @@ -/* $OpenBSD: frontend.c,v 1.20 2019/01/29 15:43:33 florian Exp $ */ +/* $OpenBSD: frontend.c,v 1.21 2019/03/01 16:35:17 florian Exp $ */ /* * Copyright (c) 2018 Florian Obser <florian@openbsd.org> @@ -871,7 +871,7 @@ get_interface_prefixes(struct ra_iface *ra_iface, struct ra_prefix_conf (void) strlcpy(ifr6.ifr_name, ra_iface->name, sizeof(ifr6.ifr_name)); memcpy(&ifr6.ifr_addr, sin6, sizeof(ifr6.ifr_addr)); - + if (ioctl(ioctlsock, SIOCGIFNETMASK_IN6, (caddr_t)&ifr6) < 0) continue; /* addr got deleted while we were looking */ diff --git a/usr.sbin/rad/parse.y b/usr.sbin/rad/parse.y index 49f50549f64..d69d6e603a4 100644 --- a/usr.sbin/rad/parse.y +++ b/usr.sbin/rad/parse.y @@ -1,4 +1,4 @@ -/* $OpenBSD: parse.y,v 1.12 2019/02/13 22:57:08 deraadt Exp $ */ +/* $OpenBSD: parse.y,v 1.13 2019/03/01 16:35:17 florian Exp $ */ /* * Copyright (c) 2018 Florian Obser <florian@openbsd.org> @@ -187,7 +187,7 @@ varset : STRING '=' string { conf_main : ra_opt_block { ra_options = &conf->ra_options; - } + } ; ra_opt_block : DEFAULT ROUTER yesno { |