From owner-svn-src-stable@freebsd.org  Tue Jun 13 15:23:50 2017
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:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 83458BF769B;
 Tue, 13 Jun 2017 15:23:50 +0000 (UTC)
 (envelope-from allanjude@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 mx1.freebsd.org (Postfix) with ESMTPS id 532837FE3C;
 Tue, 13 Jun 2017 15:23:50 +0000 (UTC)
 (envelope-from allanjude@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v5DFNnZ9047054;
 Tue, 13 Jun 2017 15:23:49 GMT (envelope-from allanjude@FreeBSD.org)
Received: (from allanjude@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v5DFNnm3047053;
 Tue, 13 Jun 2017 15:23:49 GMT (envelope-from allanjude@FreeBSD.org)
Message-Id: <201706131523.v5DFNnm3047053@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: allanjude set sender to
 allanjude@FreeBSD.org using -f
From: Allan Jude <allanjude@FreeBSD.org>
Date: Tue, 13 Jun 2017 15:23:49 +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: r319901 - stable/11/usr.sbin/sesutil
X-SVN-Group: stable-11
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.23
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: Tue, 13 Jun 2017 15:23:50 -0000

Author: allanjude
Date: Tue Jun 13 15:23:49 2017
New Revision: 319901
URL: https://svnweb.freebsd.org/changeset/base/319901

Log:
  MFC r319610:
    usr.sbin/sesutil: correct 'locate all off' to deactivate empty slot LEDs
  
  PR:		217409
  Approved by:	re (marius)

Modified:
  stable/11/usr.sbin/sesutil/sesutil.c
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/usr.sbin/sesutil/sesutil.c
==============================================================================
--- stable/11/usr.sbin/sesutil/sesutil.c	Tue Jun 13 14:57:48 2017	(r319900)
+++ stable/11/usr.sbin/sesutil/sesutil.c	Tue Jun 13 15:23:49 2017	(r319901)
@@ -252,6 +252,10 @@ sesled(int argc, char **argv, bool setfault)
 			break;
 		}
 		for (j = 0; j < nobj; j++) {
+			if (all) {
+				do_led(fd, objp[j].elm_idx, onoff, setfault);
+				continue;
+			}
 			memset(&objdn, 0, sizeof(objdn));
 			objdn.elm_idx = objp[j].elm_idx;
 			objdn.elm_names_size = 128;
@@ -265,11 +269,6 @@ sesled(int argc, char **argv, bool setfault)
 				continue;
 			}
 			if (objdn.elm_names_len > 0) {
-				if (all) {
-					do_led(fd, objdn.elm_idx,
-					    onoff, setfault);
-					continue;
-				}
 				if (disk_match(objdn.elm_devnames, disk, len)) {
 					do_led(fd, objdn.elm_idx,
 					    onoff, setfault);