From owner-svn-src-stable@freebsd.org  Mon Apr 16 17:22:10 2018
Return-Path: <owner-svn-src-stable@freebsd.org>
Delivered-To: svn-src-stable@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id ECE18F9592E;
 Mon, 16 Apr 2018 17:22:09 +0000 (UTC)
 (envelope-from trasz@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
 [IPv6:2610:1c1:1:606c::19:3])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client CN "mxrelay.nyi.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 9AB367FAEB;
 Mon, 16 Apr 2018 17:22:09 +0000 (UTC)
 (envelope-from trasz@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 95A0E20583;
 Mon, 16 Apr 2018 17:22:09 +0000 (UTC)
 (envelope-from trasz@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w3GHM9AP028578;
 Mon, 16 Apr 2018 17:22:09 GMT (envelope-from trasz@FreeBSD.org)
Received: (from trasz@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id w3GHM9GJ028563;
 Mon, 16 Apr 2018 17:22:09 GMT (envelope-from trasz@FreeBSD.org)
Message-Id: <201804161722.w3GHM9GJ028563@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: trasz set sender to
 trasz@FreeBSD.org using -f
From: Edward Tomasz Napierala <trasz@FreeBSD.org>
Date: Mon, 16 Apr 2018 17:22:09 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org
Subject: svn commit: r332620 - stable/11/usr.bin/iscsictl
X-SVN-Group: stable-11
X-SVN-Commit-Author: trasz
X-SVN-Commit-Paths: stable/11/usr.bin/iscsictl
X-SVN-Commit-Revision: 332620
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
 <svn-src-stable.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-stable>, 
 <mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable/>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 16 Apr 2018 17:22:10 -0000

Author: trasz
Date: Mon Apr 16 17:22:09 2018
New Revision: 332620
URL: https://svnweb.freebsd.org/changeset/base/332620

Log:
  MFC r330741:
  
  Make iscsictl(1) display "Disabled" status for disabled sessions.

Modified:
  stable/11/usr.bin/iscsictl/iscsictl.c
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/usr.bin/iscsictl/iscsictl.c
==============================================================================
--- stable/11/usr.bin/iscsictl/iscsictl.c	Mon Apr 16 17:21:26 2018	(r332619)
+++ stable/11/usr.bin/iscsictl/iscsictl.c	Mon Apr 16 17:22:09 2018	(r332620)
@@ -601,7 +601,8 @@ kernel_list(int iscsi_fd, const struct target *targ __
 			xo_emit("{V:name/%-36s/%s} {V:portal/%-16s/%s} ",
 			    conf->isc_target, conf->isc_target_addr);
 
-			if (state->iss_reason[0] != '\0') {
+			if (state->iss_reason[0] != '\0' &&
+			    conf->isc_enable != 0) {
 				xo_emit("{V:state/%s}\n", state->iss_reason);
 			} else {
 				if (conf->isc_discovery) {