From owner-svn-src-head@freebsd.org Sun Mar 29 02:28:22 2020
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@mailman.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mailman.nyi.freebsd.org (Postfix) with ESMTP id 2013026F27D;
Sun, 29 Mar 2020 02:28:22 +0000 (UTC)
(envelope-from kevans@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
[IPv6:2610:1c1:1:606c::19:3])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
server-signature RSA-PSS (4096 bits)
client-signature RSA-PSS (4096 bits) client-digest SHA256)
(Client CN "mxrelay.nyi.freebsd.org",
Issuer "Let's Encrypt Authority X3" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id 48qfdw5z0nz3wvc;
Sun, 29 Mar 2020 02:28:20 +0000 (UTC)
(envelope-from kevans@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
[IPv6:2610:1c1:1:6068::e6a:0])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client did not present a certificate)
by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id B41232004E;
Sun, 29 Mar 2020 02:28:15 +0000 (UTC)
(envelope-from kevans@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 02T2SF7c035921;
Sun, 29 Mar 2020 02:28:15 GMT (envelope-from kevans@FreeBSD.org)
Received: (from kevans@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id 02T2SFmk035920;
Sun, 29 Mar 2020 02:28:15 GMT (envelope-from kevans@FreeBSD.org)
Message-Id: <202003290228.02T2SFmk035920@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: kevans set sender to
kevans@FreeBSD.org using -f
From: Kyle Evans <kevans@FreeBSD.org>
Date: Sun, 29 Mar 2020 02:28:15 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
svn-src-head@freebsd.org
Subject: svn commit: r359414 - head/sbin/iscontrol
X-SVN-Group: head
X-SVN-Commit-Author: kevans
X-SVN-Commit-Paths: head/sbin/iscontrol
X-SVN-Commit-Revision: 359414
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
<svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 29 Mar 2020 02:28:23 -0000
Author: kevans
Date: Sun Mar 29 02:28:15 2020
New Revision: 359414
URL: https://svnweb.freebsd.org/changeset/base/359414
Log:
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
Modified:
head/sbin/iscontrol/iscontrol.c
head/sbin/iscontrol/iscontrol.h
Modified: head/sbin/iscontrol/iscontrol.c
==============================================================================
--- head/sbin/iscontrol/iscontrol.c Sun Mar 29 02:26:58 2020 (r359413)
+++ head/sbin/iscontrol/iscontrol.c Sun Mar 29 02:28:15 2020 (r359414)
@@ -82,6 +82,9 @@ token_t DigestMethods[] = {
{0, 0}
};
+int vflag;
+char *iscsidev;
+
u_char isid[6 + 6];
/*
| Default values
Modified: head/sbin/iscontrol/iscontrol.h
==============================================================================
--- head/sbin/iscontrol/iscontrol.h Sun Mar 29 02:26:58 2020 (r359413)
+++ head/sbin/iscontrol/iscontrol.h Sun Mar 29 02:28:15 2020 (r359414)
@@ -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);