diff options
| author |   otto <otto@openbsd.org> | 2020-04-11 07:49:48 +0000 |
|---|---|---|
| committer | otto <otto@openbsd.org> | 2020-04-11 07:49:48 +0000 |
| commit | 6fe90a5a6047cb556fd28db0b206254204a27ba6 (patch) | |
| tree | 15c442903599229b76ff159fc5d8b036a66b89ff /usr.sbin/ntpd | |
| parent | sync (diff) | |
| download | wireguard-openbsd-6fe90a5a6047cb556fd28db0b206254204a27ba6.tar.xz wireguard-openbsd-6fe90a5a6047cb556fd28db0b206254204a27ba6.zip | |
Zap double definition of conf and make ibuf_dns static to avoid double
definition; from Michael Forney
Diffstat (limited to 'usr.sbin/ntpd')
| -rw-r--r-- | usr.sbin/ntpd/ntp.c | 4 | ||||
| -rw-r--r-- | usr.sbin/ntpd/ntp_dns.c | 4 | ||||
| -rw-r--r-- | usr.sbin/ntpd/parse.y | 3 |
3 files changed, 5 insertions, 6 deletions
diff --git a/usr.sbin/ntpd/ntp.c b/usr.sbin/ntpd/ntp.c index ea9a4e92274..ec3d6bc431f 100644 --- a/usr.sbin/ntpd/ntp.c +++ b/usr.sbin/ntpd/ntp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ntp.c,v 1.163 2020/02/12 19:14:56 otto Exp $ */ +/* $OpenBSD: ntp.c,v 1.164 2020/04/11 07:49:48 otto Exp $ */ /* * Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org> @@ -42,7 +42,7 @@ volatile sig_atomic_t ntp_quit = 0; struct imsgbuf *ibuf_main; -struct imsgbuf *ibuf_dns; +static struct imsgbuf *ibuf_dns; struct ntpd_conf *conf; struct ctl_conns ctl_conns; u_int peer_cnt; diff --git a/usr.sbin/ntpd/ntp_dns.c b/usr.sbin/ntpd/ntp_dns.c index 2e1a978338a..88391801c5e 100644 --- a/usr.sbin/ntpd/ntp_dns.c +++ b/usr.sbin/ntpd/ntp_dns.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ntp_dns.c,v 1.24 2019/06/27 15:18:42 otto Exp $ */ +/* $OpenBSD: ntp_dns.c,v 1.25 2020/04/11 07:49:48 otto Exp $ */ /* * Copyright (c) 2003-2008 Henning Brauer <henning@openbsd.org> @@ -39,7 +39,7 @@ #include "ntpd.h" volatile sig_atomic_t quit_dns = 0; -struct imsgbuf *ibuf_dns; +static struct imsgbuf *ibuf_dns; void sighdlr_dns(int); int dns_dispatch_imsg(struct ntpd_conf *); diff --git a/usr.sbin/ntpd/parse.y b/usr.sbin/ntpd/parse.y index 8d7ab09de34..81d19bbff43 100644 --- a/usr.sbin/ntpd/parse.y +++ b/usr.sbin/ntpd/parse.y @@ -1,4 +1,4 @@ -/* $OpenBSD: parse.y,v 1.76 2019/11/11 06:32:52 otto Exp $ */ +/* $OpenBSD: parse.y,v 1.77 2020/04/11 07:49:48 otto Exp $ */ /* * Copyright (c) 2002, 2003, 2004 Henning Brauer <henning@openbsd.org> @@ -57,7 +57,6 @@ int lgetc(int); int lungetc(int); int findeol(void); -struct ntpd_conf *conf; struct sockaddr_in query_addr4; struct sockaddr_in6 query_addr6; int poolseqnum; |