From 760270c44e03ee720bfa3900cacf0002388a52b4 Mon Sep 17 00:00:00 2001
From: Sascha Wildner <saw@online.de>
Date: Sat, 27 Jun 2020 22:55:18 +0200
Subject: [PATCH] iscontrol(8): Fix building with -fno-common.

-fno-common will be default in future compilers (GCC 10, for example).
---
 sbin/iscontrol/iscontrol.c | 7 +++----
 sbin/iscontrol/iscontrol.h | 6 ++----
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/sbin/iscontrol/iscontrol.c b/sbin/iscontrol/iscontrol.c
index 999cec4455..4b11be7956 100644
--- a/sbin/iscontrol/iscontrol.c
+++ b/sbin/iscontrol/iscontrol.c
@@ -58,10 +58,6 @@
 #define USAGE "[-dv] [-c file] [-n nickname] [-t target] [variable=value ...]"
 #define OPTIONS	"vdc:t:n:"
 
-#ifndef DEBUG
-//int	vflag;
-#endif
-
 token_t AuthMethods[] = {
      {"None",	NONE},
      {"KRB5",	KRB5},
@@ -79,6 +75,9 @@ token_t	DigestMethods[] = {
      {0, 0}
 };
 
+int	vflag;
+char	*iscsidev;
+
 u_char	isid[6 + 6];
 /*
  | Default values
diff --git a/sbin/iscontrol/iscontrol.h b/sbin/iscontrol/iscontrol.h
index 9fa0e25268..9198ad1a35 100644
--- a/sbin/iscontrol/iscontrol.h
+++ b/sbin/iscontrol/iscontrol.h
@@ -31,8 +31,6 @@
 #define INITIATORMOD "iscsi_initiator"
 
 #ifdef DEBUG
-int vflag;
-
 # define debug(level, fmt, args...)	do {if (level <= vflag) printf("%s: " fmt "\n", __func__ , ##args);} while(0)
 # define debug_called(level)		do {if (level <= vflag) printf("%s: called\n", __func__);} while(0)
 #else
@@ -150,8 +148,8 @@ void	pukeText(char *it, pdu_t *pp);
 
 int	lookup(token_t *tbl, char *m);
 
-int	vflag;
-char	*iscsidev;
+extern int	vflag;
+extern char	*iscsidev;
 
 void	parseArgs(int nargs, char **args, isc_opt_t *op);
 void	parseConfig(FILE *fd, char *key, isc_opt_t *op);
-- 
2.41.0