From owner-svn-src-all@freebsd.org Fri Dec 11 10:58:27 2015 Return-Path: Delivered-To: svn-src-all@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 7288E9D7685; Fri, 11 Dec 2015 10:58:27 +0000 (UTC) (envelope-from bapt@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 3FF3912EA; Fri, 11 Dec 2015 10:58:27 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tBBAwQwN020939; Fri, 11 Dec 2015 10:58:26 GMT (envelope-from bapt@FreeBSD.org) Received: (from bapt@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tBBAwQKe020938; Fri, 11 Dec 2015 10:58:26 GMT (envelope-from bapt@FreeBSD.org) Message-Id: <201512111058.tBBAwQKe020938@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bapt set sender to bapt@FreeBSD.org using -f From: Baptiste Daroussin Date: Fri, 11 Dec 2015 10:58:26 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r292092 - head/usr.sbin/sesutil X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 11 Dec 2015 10:58:27 -0000 Author: bapt Date: Fri Dec 11 10:58:26 2015 New Revision: 292092 URL: https://svnweb.freebsd.org/changeset/base/292092 Log: sesutil: fix map not printing the status of the LED device in an array Sponsored by: Gandi.net Modified: head/usr.sbin/sesutil/eltsub.c Modified: head/usr.sbin/sesutil/eltsub.c ============================================================================== --- head/usr.sbin/sesutil/eltsub.c Fri Dec 11 07:24:25 2015 (r292091) +++ head/usr.sbin/sesutil/eltsub.c Fri Dec 11 10:58:26 2015 (r292092) @@ -185,10 +185,10 @@ stat2ascii(int eletype, u_char *cstat) (cstat[0] & 0x40) ? ", Prd.Fail" : "", (cstat[0] & 0x20) ? ", Disabled" : "", (cstat[0] & 0x10) ? ", Swapped" : "", - (eletype == ELMTYP_DEVICE && (cstat[2] & 0x02)) ? - ", LED=Locate" : "", - (eletype == ELMTYP_DEVICE && (cstat[3] & 0x20)) ? - ", LED=Fault" : "", + ((eletype == ELMTYP_DEVICE || eletype == ELMTYP_ARRAY_DEV) + && (cstat[2] & 0x02)) ? ", LED=Locate" : "", + ((eletype == ELMTYP_DEVICE || eletype == ELMTYP_ARRAY_DEV) + && (cstat[3] & 0x20)) ? ", LED=Fault" : "", cstat[0], cstat[1], cstat[2], cstat[3]); return (ebuf); }