From: Donald Sharp <sharpd@cumulusnetworks.com>
Date: Wed, 11 Oct 2017 13:34:44 +0000 (-0400)
Subject: isisd: Allow struct zebra_privs_t to be available
X-Git-Tag: frr-4.0-dev~195^2~7
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=76e292f99410bcf9181ddb37b802f1a5b197a9a2;p=matthieu%2Ffrr.git

isisd: Allow struct zebra_privs_t to be available

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
---

diff --git a/isisd/isis_bpf.c b/isisd/isis_bpf.c
index 2c8b126088..591af3b8ed 100644
--- a/isisd/isis_bpf.c
+++ b/isisd/isis_bpf.c
@@ -45,8 +45,6 @@
 
 #include "privs.h"
 
-extern struct zebra_privs_t isisd_privs;
-
 struct bpf_insn llcfilter[] = {
 	/* check first byte */
 	BPF_STMT(BPF_LD + BPF_B + BPF_ABS, ETH_ALEN),
diff --git a/isisd/isis_dlpi.c b/isisd/isis_dlpi.c
index 7ac8b54fa4..ccde4fbbe1 100644
--- a/isisd/isis_dlpi.c
+++ b/isisd/isis_dlpi.c
@@ -47,8 +47,6 @@
 
 #include "privs.h"
 
-extern struct zebra_privs_t isisd_privs;
-
 static t_uscalar_t dlpi_ctl[1024]; /* DLPI control messages */
 
 /*
diff --git a/isisd/isis_pfpacket.c b/isisd/isis_pfpacket.c
index e24901b0de..974d2b78cf 100644
--- a/isisd/isis_pfpacket.c
+++ b/isisd/isis_pfpacket.c
@@ -44,8 +44,6 @@
 
 #include "privs.h"
 
-extern struct zebra_privs_t isisd_privs;
-
 /* tcpdump -i eth0 'isis' -dd */
 static struct sock_filter isisfilter[] =
 	{
diff --git a/isisd/isisd.h b/isisd/isisd.h
index a10748fd45..427d314df6 100644
--- a/isisd/isisd.h
+++ b/isisd/isisd.h
@@ -33,6 +33,8 @@
 #include "isis_memory.h"
 #include "qobj.h"
 
+extern struct zebra_privs_t isisd_privs;
+
 /* uncomment if you are a developer in bug hunt */
 /* #define EXTREME_DEBUG  */
 /* #define EXTREME_DICT_DEBUG */
diff --git a/tests/isisd/test_fuzz_isis_tlv.c b/tests/isisd/test_fuzz_isis_tlv.c
index 1f5abba392..67a1593500 100644
--- a/tests/isisd/test_fuzz_isis_tlv.c
+++ b/tests/isisd/test_fuzz_isis_tlv.c
@@ -19,6 +19,8 @@ int isis_sock_init(struct isis_circuit *circuit)
 	return 0;
 }
 
+struct zebra_privs_t isisd_privs;
+
 static bool atexit_registered;
 
 static void show_meminfo_at_exit(void)
diff --git a/tests/isisd/test_isis_vertex_queue.c b/tests/isisd/test_isis_vertex_queue.c
index 674482cd17..0e473d7a6b 100644
--- a/tests/isisd/test_isis_vertex_queue.c
+++ b/tests/isisd/test_isis_vertex_queue.c
@@ -9,6 +9,8 @@ int isis_sock_init(struct isis_circuit *circuit)
 	return 0;
 }
 
+struct zebra_privs_t isisd_privs;
+
 static struct isis_vertex **vertices;
 static size_t vertex_count;