From 1ed0b3daec696defa58ca88916a6b8b29f779991 Mon Sep 17 00:00:00 2001 From: kevans Date: Sun, 29 Mar 2020 02:28:15 +0000 Subject: [PATCH] iscontrol: move definition of vflag/iscsidev to iscontrol.c Mark the declaration extern as these are used elsewhere; this fixes the build with -fno-common. MFC after: 3 days --- sbin/iscontrol/iscontrol.c | 3 +++ sbin/iscontrol/iscontrol.h | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/sbin/iscontrol/iscontrol.c b/sbin/iscontrol/iscontrol.c index 967795ba8356..a623d0ca81e3 100644 --- a/sbin/iscontrol/iscontrol.c +++ b/sbin/iscontrol/iscontrol.c @@ -82,6 +82,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 cc7a6cb772e7..dddb21bb562e 100644 --- a/sbin/iscontrol/iscontrol.h +++ b/sbin/iscontrol/iscontrol.h @@ -149,8 +149,8 @@ int recvpdu(isess_t *sess, 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);