Browse Source

Zap double definition of conf and make ibuf_dns static to avoid double

definition; from Michael Forney
OPENBSD_6_7
otto 4 years ago
parent
commit
956b4239d9
3 changed files with 5 additions and 6 deletions
  1. +2
    -2
      src/usr.sbin/ntpd/ntp.c
  2. +2
    -2
      src/usr.sbin/ntpd/ntp_dns.c
  3. +1
    -2
      src/usr.sbin/ntpd/parse.y

+ 2
- 2
src/usr.sbin/ntpd/ntp.c View File

@ -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> * Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org>
@ -42,7 +42,7 @@
volatile sig_atomic_t ntp_quit = 0; volatile sig_atomic_t ntp_quit = 0;
struct imsgbuf *ibuf_main; struct imsgbuf *ibuf_main;
struct imsgbuf *ibuf_dns;
static struct imsgbuf *ibuf_dns;
struct ntpd_conf *conf; struct ntpd_conf *conf;
struct ctl_conns ctl_conns; struct ctl_conns ctl_conns;
u_int peer_cnt; u_int peer_cnt;


+ 2
- 2
src/usr.sbin/ntpd/ntp_dns.c View File

@ -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> * Copyright (c) 2003-2008 Henning Brauer <henning@openbsd.org>
@ -39,7 +39,7 @@
#include "ntpd.h" #include "ntpd.h"
volatile sig_atomic_t quit_dns = 0; volatile sig_atomic_t quit_dns = 0;
struct imsgbuf *ibuf_dns;
static struct imsgbuf *ibuf_dns;
void sighdlr_dns(int); void sighdlr_dns(int);
int dns_dispatch_imsg(struct ntpd_conf *); int dns_dispatch_imsg(struct ntpd_conf *);


+ 1
- 2
src/usr.sbin/ntpd/parse.y View File

@ -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> * Copyright (c) 2002, 2003, 2004 Henning Brauer <henning@openbsd.org>
@ -57,7 +57,6 @@ int lgetc(int);
int lungetc(int); int lungetc(int);
int findeol(void); int findeol(void);
struct ntpd_conf *conf;
struct sockaddr_in query_addr4; struct sockaddr_in query_addr4;
struct sockaddr_in6 query_addr6; struct sockaddr_in6 query_addr6;
int poolseqnum; int poolseqnum;


Loading…
Cancel
Save