[illumos-gate merge]

commit b13c8383ad6f847486face2fe8df9f0f50f068ed
    6992 devprop(1M) should work also with logical names
commit e64b5a1d424c9f5d94989cfbd14203251c97a024
    7117 Dangling references to usr/src/common/openssl

5 files changed, 11 insertions, 11 deletions

diff --git a/exception_lists/copyright b/exception_lists/copyright
index 2e4281fda5..a4d4794069 100644
--- a/exception_lists/copyright
+++ b/exception_lists/copyright
@@ -72,8 +72,6 @@ usr/src/common/bzip2/bzlib.c
 usr/src/common/bzip2/decompress.c
 usr/src/common/bzip2/bzlib_private.h
 usr/src/common/bzip2/huffman.c
-usr/src/common/openssl/crypto/krb5/krb5_asn.c
-usr/src/common/openssl/crypto/krb5/krb5_asn.h
 usr/src/grub/grub-0.97/stage2/Makefile.am
 usr/src/grub/grub-0.97/stage2/builtins.c
 usr/src/grub/grub-0.97/stage2/disk_io.c
diff --git a/exception_lists/cstyle b/exception_lists/cstyle
index 4fb4f616bf..6fdc23f42a 100644
--- a/exception_lists/cstyle
+++ b/exception_lists/cstyle
@@ -144,8 +144,6 @@ usr/src/common/bzip2/decompress.c
 usr/src/common/bzip2/bzlib_private.h
 usr/src/common/bzip2/huffman.c
 usr/src/common/crypto/chacha/chacha.c
-usr/src/common/openssl/crypto/krb5/krb5_asn.c
-usr/src/common/openssl/crypto/krb5/krb5_asn.h
 usr/src/grub/grub-0.97/grub/asmstub.c
 usr/src/grub/grub-0.97/stage2/bios.c
 usr/src/grub/grub-0.97/stage2/builtins.c
diff --git a/exception_lists/hdrchk b/exception_lists/hdrchk
index f7ba678cdc..42175648f2 100644
--- a/exception_lists/hdrchk
+++ b/exception_lists/hdrchk
@@ -46,7 +46,6 @@ usr/src/cmd/mandoc/mansearch.h
 usr/src/cmd/mandoc/mdoc.h
 usr/src/cmd/mandoc/out.h
 usr/src/cmd/mandoc/term.h
-usr/src/common/openssl/crypto/krb5/krb5_asn.h
 usr/src/grub/grub-0.97/stage2/shared.h
 usr/src/lib/libdwarf/common/cmplrs/dwarf_addr_finder.h
 usr/src/lib/libdwarf/common/config.h
diff --git a/usr/src/cmd/devprop/devprop.c b/usr/src/cmd/devprop/devprop.c
index 69306353a7..80bf0f4960 100644
--- a/usr/src/cmd/devprop/devprop.c
+++ b/usr/src/cmd/devprop/devprop.c
@@ -21,9 +21,9 @@
 /*
  * Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
+ * Copyright 2016 Nexenta Systems, Inc. All rights reserved.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
 
 #include <stdio.h>
 #include <unistd.h>
@@ -50,7 +50,7 @@ main(int argc, char *argv[])
 	uchar_t *val_b;
 	int *val_i;
 	int64_t *val_l;
-	char *val_s;
+	char *val_s, *ptr;
 	int n;
 
 	extern char *optarg;
@@ -73,7 +73,8 @@ case ch:					\
 	while ((c = getopt(argc, argv, ":n:vqbils")) != -1) {
 		switch (c) {
 		case 'n':
-			path = optarg;
+			if ((path = realpath(optarg, NULL)) == NULL)
+				path = optarg;
 			break;
 		case ':':
 			usage();
@@ -108,9 +109,14 @@ case ch:					\
 	 * "/devices", which we strip off here as di_init() expects
 	 * just the path to the node.
 	 */
-	if (strncmp("/devices/", path, strlen("/devices/")) == 0)
+	if (strncmp("/devices/", path, strlen("/devices/")) == 0) {
 		path += strlen("/devices");
 
+		/* cut off minor name */
+		if ((ptr = strrchr(path, ':')) != NULL)
+			*ptr = '\0';
+	}
+
 	if ((dn = di_init(path, DINFOPROP)) == DI_NODE_NIL) {
 		perror("di_init");
 		return (1);
diff --git a/usr/src/pkg/manifests/system-boot-wanboot.mf b/usr/src/pkg/manifests/system-boot-wanboot.mf
index ee8f0be815..16750a7ab1 100644
--- a/usr/src/pkg/manifests/system-boot-wanboot.mf
+++ b/usr/src/pkg/manifests/system-boot-wanboot.mf
@@ -21,7 +21,7 @@
 
 #
 # Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
-# Copyright 2012 OmniTI Computer Consulting, Inc.  All rights reserved.
+# Copyright 2016 OmniTI Computer Consulting, Inc.  All rights reserved.
 #
 
 set name=pkg.fmri value=pkg:/system/boot/wanboot@$(PKGVERS)
@@ -60,4 +60,3 @@ file path=usr/share/man/man1m/wanbootutil.1m
 legacy pkg=SUNWwbsup desc="Solaris WAN boot support" name="WAN boot support"
 license cr_Sun license=cr_Sun
 license lic_CDDL license=lic_CDDL
-license usr/src/common/openssl/LICENSE license=usr/src/common/openssl/LICENSE