From 60f466403f6883c74b254f7c7209032de290a628 Mon Sep 17 00:00:00 2001
From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Tue, 15 Dec 2015 13:01:14 +0000
Subject: [PATCH] Show the enclosure name and id in sesutil map

Sponsored by:	Gandi.net
---
 usr.sbin/sesutil/sesutil.c | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/usr.sbin/sesutil/sesutil.c b/usr.sbin/sesutil/sesutil.c
index 5c96070a0fb8..0f04c07461be 100644
--- a/usr.sbin/sesutil/sesutil.c
+++ b/usr.sbin/sesutil/sesutil.c
@@ -302,6 +302,7 @@ static int
 objmap(int argc, char **argv __unused)
 {
 	struct sbuf *extra;
+	encioc_string_t stri;
 	encioc_elm_devnames_t e_devname;
 	encioc_elm_status_t e_status;
 	encioc_elm_desc_t e_desc;
@@ -310,6 +311,7 @@ objmap(int argc, char **argv __unused)
 	int fd;
 	unsigned int j, nobj;
 	size_t i;
+	char str[32];
 
 	if (argc != 1) {
 		usage(stderr, "map");
@@ -355,6 +357,15 @@ objmap(int argc, char **argv __unused)
 		}
 
 		printf("%s:\n", g.gl_pathv[i] + 5);
+		stri.bufsiz = sizeof(str);
+		stri.buf = &str[0];
+		if (ioctl(fd, ENCIOC_GETENCNAME, (caddr_t) &stri) == 0)
+			printf("\tEnclosure Name: %s\n", stri.buf);
+		stri.bufsiz = sizeof(str);
+		stri.buf = &str[0];
+		if (ioctl(fd, ENCIOC_GETENCID, (caddr_t) &stri) == 0)
+			printf("\tEnclosure ID: %s\n", stri.buf);
+
 		for (j = 0; j < nobj; j++) {
 			/* Get the status of the element */
 			memset(&e_status, 0, sizeof(e_status));