blob: 2a696f2fb384c35d6da6a1ec89bfb58899e550a7 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
|
diff -u -r openntpd-6.2p3-orig/include/sys/types.h openntpd-6.2p3/include/sys/types.h
--- openntpd-6.2p3-orig/include/sys/types.h 2017-10-23 05:15:41.000000000 -0700
+++ openntpd-6.2p3/include/sys/types.h 2020-05-05 19:57:57.039447282 -0700
@@ -22,6 +22,10 @@
# define __bounded__(x, y, z)
#endif
+#if !defined(HAVE_ATTRIBUTE__PACKED) && !defined(__packed)
+# define __packed __attribute__((__packed__))
+#endif
+
/*
* Define BSD-style unsigned bits types for systems that do not have them.
*/
diff -u -r openntpd-6.2p3-orig/src/ntp.c openntpd-6.2p3/src/ntp.c
--- openntpd-6.2p3-orig/src/ntp.c 2017-06-19 06:23:10.000000000 -0700
+++ openntpd-6.2p3/src/ntp.c 2020-05-05 19:55:01.041306344 -0700
@@ -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 -u -r openntpd-6.2p3-orig/src/ntp_dns.c openntpd-6.2p3/src/ntp_dns.c
--- openntpd-6.2p3-orig/src/ntp_dns.c 2017-06-19 06:23:10.000000000 -0700
+++ openntpd-6.2p3/src/ntp_dns.c 2020-05-05 19:55:30.325662563 -0700
@@ -33,7 +33,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(void);
diff -u -r openntpd-6.2p3-orig/src/parse.c openntpd-6.2p3/src/parse.c
--- openntpd-6.2p3-orig/src/parse.c 2017-10-30 01:57:56.000000000 -0700
+++ openntpd-6.2p3/src/parse.c 2020-05-05 19:55:56.505981067 -0700
@@ -101,7 +101,6 @@
int lungetc(int);
int findeol(void);
-struct ntpd_conf *conf;
struct sockaddr_in query_addr4;
struct sockaddr_in6 query_addr6;
diff -u -r openntpd-6.2p3-orig/src/parse.y openntpd-6.2p3/src/parse.y
--- openntpd-6.2p3-orig/src/parse.y 2017-10-30 01:57:40.000000000 -0700
+++ openntpd-6.2p3/src/parse.y 2020-05-05 19:55:51.504920219 -0700
@@ -57,7 +57,6 @@
int lungetc(int);
int findeol(void);
-struct ntpd_conf *conf;
struct sockaddr_in query_addr4;
struct sockaddr_in6 query_addr6;
|
