--- a/usr/src/Makefile.lint	Mon Sep 11 21:56:06 2006 -0700
+++ b/usr/src/Makefile.lint	Mon Sep 11 22:51:59 2006 -0700
@@ -289,11 +289,13 @@
 	cmd/ztest \
 	lib/abi \
 	lib/auditd_plugins \
+	lib/brand/sn1 \
 	lib/crypt_modules \
 	lib/extendedFILE \
 	lib/libadt_jni \
 	lib/libaio \
 	lib/libavl \
+	lib/libbrand \
 	lib/libbsdmalloc \
 	lib/libbsm \
 	lib/libc \
@@ -408,8 +410,9 @@
 
 i386_SUBDIRS= \
 	cmd/biosdev \
+	cmd/fs.d/xmemfs \
 	cmd/rtc \
-	cmd/fs.d/xmemfs \
+	lib/brand/lx \
 	lib/cfgadm_plugins/sata
 
 sparc_SUBDIRS= \

--- a/usr/src/Makefile.master	Mon Sep 11 21:56:06 2006 -0700
+++ b/usr/src/Makefile.master	Mon Sep 11 22:51:59 2006 -0700
@@ -915,10 +915,10 @@
 	$(COMPILE.java) $<
 
 #
-# Rules to create message catalogue files from .sh, .c, .y, and .l files.
-# For .sh files, we extract all gettext strings with sed(1) (being careful
-# to permit multiple gettext strings on the same line), weed out the dups,
-# and build the catalogue with awk(1).
+# Rules to create message catalogue files from .sh, .ksh, .c, .y, and .l
+# files.  For .sh and .ksh files, we extract all gettext strings with
+# sed(1) (being careful to permit multiple gettext strings on the same
+# line), weed out the dups, and build the catalogue with awk(1).
 #
 
 .sh.po:
@@ -930,6 +930,15 @@
 		  -e "t a"					\
 	       $< | sort -u | awk '{ print "msgid\t" $$0 "\nmsgstr" }' > $@
 
+.ksh.po:
+	$(SED) -n -e ":a" 					\
+		  -e "h" 					\
+		  -e "s/.*gettext *\(\"[^\"]*\"\).*/\1/p"	\
+		  -e "x"					\
+		  -e "s/\(.*\)gettext *\"[^\"]*\"\(.*\)/\1\2/"	\
+		  -e "t a"					\
+	       $< | sort -u | awk '{ print "msgid\t" $$0 "\nmsgstr" }' > $@
+
 #
 # When using xgettext, we want messages to go to the default domain,
 # rather than the specified one.  This special version of the

--- a/usr/src/cmd/bsmrecord/audit_record_attr.txt	Mon Sep 11 21:56:06 2006 -0700
+++ b/usr/src/cmd/bsmrecord/audit_record_attr.txt	Mon Sep 11 22:51:59 2006 -0700
@@ -475,6 +475,19 @@
       comment=1, socket type, "type":
       comment=socket address
 
+label=AUE_BRANDSYS
+# generic mechanism to allow user-space and kernel components of a brand
+# to communicate.  The interpretation of the arguments to the call is
+# left entirely up to the brand.
+  format=arg1:arg2:arg3:arg4:arg5:arg6:arg7
+    comment=1, command, "cmd":
+    comment=2, command args, "arg":
+    comment=3, command args, "arg":
+    comment=4, command args, "arg":
+    comment=5, command args, "arg":
+    comment=6, command args, "arg":
+    comment=7, command args, "arg":
+
 label=AUE_BSMSYS
   skip=Not used.
 

--- a/usr/src/cmd/devfsadm/Makefile.com	Mon Sep 11 21:56:06 2006 -0700
+++ b/usr/src/cmd/devfsadm/Makefile.com	Mon Sep 11 22:51:59 2006 -0700
@@ -29,6 +29,7 @@
 include ../../Makefile.cmd
 
 COMMON = ..
+UTSBASE = $(COMMON)/../../uts
 
 DEVFSADM_MOD = devfsadm
 
@@ -66,7 +67,7 @@
 	$(COMMON)/md_link.c	\
 	$(COMMON)/dtrace_link.c	\
 	$(COMMON)/zfs_link.c	\
-	$(MISC_LINK_ISA).c
+	$(LINK_SRCS_($MACH))
 
 LINT_MODULES = $(LINK_SRCS:.c=.ln)
 
@@ -87,7 +88,7 @@
 	md_link.o		\
 	dtrace_link.o		\
 	zfs_link.o		\
-	$(MISC_LINK_ISA).o
+	$(LINK_OBJS_($MACH))
 
 LINK_MODS =			\
 	SUNW_disk_link.so	\
@@ -106,7 +107,7 @@
 	SUNW_md_link.so		\
 	SUNW_dtrace_link.so	\
 	SUNW_zfs_link.so	\
-	SUNW_$(MISC_LINK_ISA).so
+	$(LINK_MODS_$(MACH))
 
 DEVLINKTAB = devlink.tab
 DEVLINKTAB_SRC = $(COMMON)/$(DEVLINKTAB).sh
@@ -114,15 +115,15 @@
 COMPAT_LINKS = disks tapes ports audlinks devlinks drvconfig
 
 CPPFLAGS +=	-D_POSIX_PTHREAD_SEMANTICS -D_REENTRANT \
-		-I.. -I../../../uts/common -I$(MODLOADDIR)
-CFLAGS += $(CCVERBOSE) $(C_PICFLAGS) -I.. -I$(MODLOADDIR)
+		-I$(COMMON) -I$(UTSBASE)/common -I$(MODLOADDIR)
+CFLAGS += $(CCVERBOSE) $(C_PICFLAGS)
 
 LINTFLAGS += -erroff=E_NAME_USED_NOT_DEF2
 LINTFLAGS += -erroff=E_NAME_DEF_NOT_USED2
 LINTFLAGS += -erroff=E_NAME_MULTIPLY_DEF2
 
-LAZYLIBS =	$(ZLAZYLOAD) -lzonecfg -lbsm $(ZNOLAZYLOAD)
-lint := LAZYLIBS = -lzonecfg -lbsm
+LAZYLIBS =	$(ZLAZYLOAD) -lzonecfg -lbrand -lbsm $(ZNOLAZYLOAD)
+lint := LAZYLIBS = -lzonecfg -lbrand -lbsm
 LDLIBS += -ldevinfo -lgen -lsysevent -lnvpair -lcmd -ldoor $(LAZYLIBS) -lnsl
 
 SRCS = $(DEVFSADM_SRC) $(LINK_SRCS)

--- a/usr/src/cmd/devfsadm/i386/Makefile	Mon Sep 11 21:56:06 2006 -0700
+++ b/usr/src/cmd/devfsadm/i386/Makefile	Mon Sep 11 22:51:59 2006 -0700
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,17 +19,17 @@
 # CDDL HEADER END
 #
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
-#
-# Copyright (c) 1998 by Sun Microsystems, Inc.
-# All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
 #
-# cmd/devfsadm/i386/Makefile
-#
+#ident	"%Z%%M%	%I%	%E% SMI"
 
-MISC_LINK_ISA = misc_link_i386
-
+LINK_SRCS_i386 = misc_link_i386.c lx_link_i386.c
+LINK_OBJS_i386 = misc_link_i386.o lx_link_i386.o
+LINK_MODS_i386 = SUNW_misc_link_i386.so SUNW_lx_link_i386.so
 
 include ../Makefile.com
 
+lx_link_i386.o := CPPFLAGS += -I$(UTSBASE)/common/brand/lx
+
 install: all

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/devfsadm/i386/lx_link_i386.c	Mon Sep 11 22:51:59 2006 -0700
@@ -0,0 +1,86 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
+ *
+ * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+ * or http://www.opensolaris.org/os/licensing.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information: Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ */
+
+/*
+ * Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+ * Use is subject to license terms.
+ */
+
+#pragma ident	"%Z%%M%	%I%	%E% SMI"
+
+#include <devfsadm.h>
+#include <strings.h>
+#include <stdio.h>
+#include <sys/lx_ptm.h>
+#include <sys/lx_audio.h>
+
+static int lx_ptm(di_minor_t minor, di_node_t node);
+static int lx_audio(di_minor_t minor, di_node_t node);
+static int lx_systrace(di_minor_t minor, di_node_t node);
+
+static devfsadm_create_t lx_create_cbt[] = {
+	{ "pseudo", "ddi_pseudo", LX_PTM_DRV,
+	    TYPE_EXACT | DRV_EXACT, ILEVEL_0, lx_ptm },
+	{ "pseudo", "ddi_pseudo", LX_AUDIO_DRV,
+	    TYPE_EXACT | DRV_EXACT, ILEVEL_0, lx_audio },
+	{ "pseudo", "ddi_pseudo", "lx_systrace",
+	    TYPE_EXACT | DRV_EXACT, ILEVEL_0, lx_systrace },
+};
+
+DEVFSADM_CREATE_INIT_V0(lx_create_cbt);
+
+static int
+lx_ptm(di_minor_t minor, di_node_t node)
+{
+	char *mname = di_minor_name(minor);
+
+	if (strcmp(LX_PTM_MINOR_NODE, mname) == 0)
+		(void) devfsadm_mklink("brand/lx/ptmx", node, minor, 0);
+
+	return (DEVFSADM_CONTINUE);
+}
+
+static int
+lx_audio(di_minor_t minor, di_node_t node)
+{
+	char *mname = di_minor_name(minor);
+
+	if (strcmp(LXA_MINORNAME_DEVCTL, mname) == 0)
+		(void) devfsadm_mklink("brand/lx/audio_devctl", node, minor, 0);
+	if (strcmp(LXA_MINORNAME_DSP, mname) == 0)
+		(void) devfsadm_mklink("brand/lx/dsp", node, minor, 0);
+	if (strcmp(LXA_MINORNAME_MIXER, mname) == 0)
+		(void) devfsadm_mklink("brand/lx/mixer", node, minor, 0);
+
+	return (DEVFSADM_CONTINUE);
+}
+
+static int
+lx_systrace(di_minor_t minor, di_node_t node)
+{
+	char *mname = di_minor_name(minor);
+	char path[MAXPATHLEN];
+
+	(void) snprintf(path, sizeof (path), "dtrace/provider/%s", mname);
+	(void) devfsadm_mklink(path, node, minor, 0);
+
+	return (DEVFSADM_CONTINUE);
+}

--- a/usr/src/cmd/devfsadm/sparc/Makefile	Mon Sep 11 21:56:06 2006 -0700
+++ b/usr/src/cmd/devfsadm/sparc/Makefile	Mon Sep 11 22:51:59 2006 -0700
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,15 +19,14 @@
 # CDDL HEADER END
 #
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
-#
-# Copyright (c) 1998 by Sun Microsystems, Inc.
-# All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
 #
-# cmd/devfsadm/sparc/Makefile
-#
+#ident	"%Z%%M%	%I%	%E% SMI"
 
-MISC_LINK_ISA = misc_link_sparc
+LINK_SRCS_sparc = misc_link_sparc.c
+LINK_OBJS_sparc = misc_link_sparc.o
+LINK_MODS_sparc = SUNW_misc_link_sparc.so
 
 include ../Makefile.com
 

--- a/usr/src/cmd/fs.d/nfs/lib/nfs_tbind.c	Mon Sep 11 21:56:06 2006 -0700
+++ b/usr/src/cmd/fs.d/nfs/lib/nfs_tbind.c	Mon Sep 11 22:51:59 2006 -0700
@@ -29,6 +29,8 @@
 
 #pragma ident	"%Z%%M%	%I%	%E% SMI"
 
+#define	PORTMAP
+
 #include <tiuser.h>
 #include <fcntl.h>
 #include <netconfig.h>
@@ -36,6 +38,7 @@
 #include <errno.h>
 #include <syslog.h>
 #include <rpc/rpc.h>
+#include <rpc/pmap_prot.h>
 #include <sys/time.h>
 #include <sys/resource.h>
 #include <signal.h>
@@ -119,6 +122,9 @@
 int		(*Mysvc4)(int, struct netbuf *, struct netconfig *, int,
 		struct netbuf *);
 
+extern bool_t __pmap_set(const rpcprog_t program, const rpcvers_t version,
+    const struct netconfig *nconf, const struct netbuf *address);
+
 /*
  * Called to create and prepare a transport descriptor for in-kernel
  * RPC service.
@@ -467,7 +473,7 @@
  */
 void
 do_one(char *provider, NETSELDECL(proto), struct protob *protobp0,
-	int (*svc)(int, struct netbuf, struct netconfig *))
+	int (*svc)(int, struct netbuf, struct netconfig *), int use_pmap)
 {
 	register int sock;
 	struct protob *protobp;
@@ -511,9 +517,31 @@
 				strncasecmp(retnconf->nc_proto, NC_UDP, l) == 0)
 				continue;
 
-			(void) rpcb_unset(protobp->program, vers, retnconf);
-			(void) rpcb_set(protobp->program, vers, retnconf,
-					retaddr);
+			if (use_pmap) {
+				/*
+				 * Note that if we're using a portmapper
+				 * instead of rpcbind then we can't do an
+				 * unregister operation here.
+				 *
+				 * The reason is that the portmapper unset
+				 * operation removes all the entries for a
+				 * given program/version regardelss of
+				 * transport protocol.
+				 *
+				 * The caller of this routine needs to ensure
+				 * that __pmap_unset() has been called for all
+				 * program/version service pairs they plan
+				 * to support before they start registering
+				 * each program/version/protocol triplet.
+				 */
+				(void) __pmap_set(protobp->program, vers,
+				    retnconf, retaddr);
+			} else {
+				(void) rpcb_unset(protobp->program, vers,
+				    retnconf);
+				(void) rpcb_set(protobp->program, vers,
+				    retnconf, retaddr);
+			}
 		}
 	}
 
@@ -552,7 +580,7 @@
  */
 int
 do_all(struct protob *protobp,
-	int (*svc)(int, struct netbuf, struct netconfig *))
+	int (*svc)(int, struct netbuf, struct netconfig *), int use_pmap)
 {
 	struct netconfig *nconf;
 	NCONF_HANDLE *nc;
@@ -570,7 +598,7 @@
 		    (protobp->program != NFS4_CALLBACK ||
 		    strncasecmp(nconf->nc_proto, NC_UDP, l) != 0))
 			do_one(nconf->nc_device, nconf->nc_proto,
-				protobp, svc);
+				protobp, svc, use_pmap);
 	}
 	(void) endnetconfig(nc);
 	return (0);

--- a/usr/src/cmd/fs.d/nfs/lib/nfs_tbind.h	Mon Sep 11 21:56:06 2006 -0700
+++ b/usr/src/cmd/fs.d/nfs/lib/nfs_tbind.h	Mon Sep 11 22:51:59 2006 -0700
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -20,8 +19,8 @@
  * CDDL HEADER END
  */
 /*
- * Copyright 1996, 1999, 2001-2003 Sun Microsystems, Inc.
- * All rights reserved.  Use is subject to license terms.
+ * Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+ * Use is subject to license terms.
  */
 
 /*
@@ -77,9 +76,11 @@
 			struct nd_hostserv *, int);
 extern void	nfslib_log_tli_error(char *, int, struct netconfig *);
 extern int	do_all(struct protob *,
-			int (*)(int, struct netbuf, struct netconfig *));
+			int (*)(int, struct netbuf, struct netconfig *),
+			int use_pmap);
 extern void	do_one(char *, char *, struct protob *,
-			int (*)(int, struct netbuf, struct netconfig *));
+			int (*)(int, struct netbuf, struct netconfig *),
+			int use_pmap);
 extern void	poll_for_action(void);
 
 #ifdef __cplusplus

--- a/usr/src/cmd/fs.d/nfs/nfs4cbd/nfs4cbd.c	Mon Sep 11 21:56:06 2006 -0700
+++ b/usr/src/cmd/fs.d/nfs/nfs4cbd/nfs4cbd.c	Mon Sep 11 22:51:59 2006 -0700
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -20,7 +19,7 @@
  * CDDL HEADER END
  */
 /*
- * Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
@@ -202,7 +201,7 @@
 	protobp->program = NFS4_CALLBACK;
 	protobp->next = NULL;
 
-	if (do_all(protobp, NULL) == -1) {
+	if (do_all(protobp, NULL, 0) == -1) {
 		exit(1);
 	}
 

--- a/usr/src/cmd/fs.d/nfs/nfsd/nfsd.c	Mon Sep 11 21:56:06 2006 -0700
+++ b/usr/src/cmd/fs.d/nfs/nfsd/nfsd.c	Mon Sep 11 22:51:59 2006 -0700
@@ -536,7 +536,7 @@
 	protobp->next = (struct protob *)NULL;
 
 	if (allflag) {
-		if (do_all(protobp0, nfssvc) == -1)
+		if (do_all(protobp0, nfssvc, 0) == -1)
 			exit(1);
 	} else if (proto) {
 		/* there's more than one match for the same protocol */
@@ -551,7 +551,7 @@
 			if (strcmp(nconf->nc_proto, proto) == 0) {
 				protoFound = TRUE;
 				do_one(nconf->nc_device, NULL,
-					protobp0, nfssvc);
+					protobp0, nfssvc, 0);
 			}
 		}
 		(void) endnetconfig(nc);
@@ -560,12 +560,12 @@
 for protocol %s", proto);
 
 	} else if (provider)
-		do_one(provider, proto, protobp0, nfssvc);
+		do_one(provider, proto, protobp0, nfssvc, 0);
 	else {
 		for (providerp = defaultproviders;
 			*providerp != NULL; providerp++) {
 			provider = *providerp;
-			do_one(provider, NULL, protobp0, nfssvc);
+			do_one(provider, NULL, protobp0, nfssvc, 0);
 		}
 	}
 done:

--- a/usr/src/cmd/fs.d/nfs/statd/sm_svc.c	Mon Sep 11 21:56:06 2006 -0700
+++ b/usr/src/cmd/fs.d/nfs/statd/sm_svc.c	Mon Sep 11 22:51:59 2006 -0700
@@ -79,12 +79,17 @@
 #define	backup1		"statmon/sm.bak/"
 #define	state1		"statmon/state"
 
+extern void __use_portmapper(int);
+extern bool_t __pmap_unset(const rpcprog_t program, const rpcvers_t version);
+
 /*
  * User and group IDs to run as.  These are hardwired, rather than looked
  * up at runtime, because they are very unlikely to change and because they
  * provide some protection against bogus changes to the passwd and group
  * files.
  */
+uid_t	daemon_uid = DAEMON_UID;
+gid_t	daemon_gid = DAEMON_GID;
 
 char STATE[MAXPATHLEN], CURRENT[MAXPATHLEN], BACKUP[MAXPATHLEN];
 static char statd_home[MAXPATHLEN];
@@ -437,6 +442,7 @@
 	int mode;
 	int sz;
 	int connmaxrec = RPC_MAXDATASIZE;
+	int use_pmap = 0;
 
 	addrix = 0;
 	pathix = 0;
@@ -445,7 +451,7 @@
 	if (init_hostname() < 0)
 		exit(1);
 
-	while ((c = getopt(argc, argv, "Dd:a:p:r")) != EOF)
+	while ((c = getopt(argc, argv, "a:Dd:G:Pp:rU:")) != EOF)
 		switch (c) {
 		case 'd':
 			(void) sscanf(optarg, "%d", &debug);
@@ -474,6 +480,16 @@
 				(void) fprintf(stderr,
 				    "statd: -a exceeding maximum hostnames\n");
 			break;
+		case 'P':
+			__use_portmapper(1);
+			use_pmap = 1;
+			break;
+		case 'U':
+			(void) sscanf(optarg, "%d", &daemon_uid);
+			break;
+		case 'G':
+			(void) sscanf(optarg, "%d", &daemon_gid);
+			break;
 		case 'p':
 			if (strlen(optarg) < MAXPATHLEN) {
 				/* If the path_name array has not yet	   */
@@ -557,7 +573,7 @@
 		openlog("statd", LOG_PID, LOG_DAEMON);
 	}
 
-	(void) _create_daemon_lock(STATD, DAEMON_UID, DAEMON_GID);
+	(void) _create_daemon_lock(STATD, daemon_uid, daemon_gid);
 	/*
 	 * establish our lock on the lock file and write our pid to it.
 	 * exit if some other process holds the lock, or if there's any
@@ -598,6 +614,11 @@
 		syslog(LOG_INFO, "unable to set maximum RPC record size");
 	}
 
+	if (use_pmap) {
+		(void) __pmap_unset(SM_PROG, SM_VERS);
+		(void) __pmap_unset(NSM_ADDR_PROGRAM, NSM_ADDR_V1);
+	}
+
 	if (!svc_create(sm_prog_1, SM_PROG, SM_VERS, "netpath")) {
 	    syslog(LOG_ERR,
 		"statd: unable to create (SM_PROG, SM_VERS) for netpath.");
@@ -692,7 +713,7 @@
 
 	can_do_mlp = priv_ineffect(PRIV_NET_BINDMLP);
 	if (__init_daemon_priv(PU_RESETGROUPS|PU_CLEARLIMITSET,
-	    DAEMON_UID, DAEMON_GID, can_do_mlp ? PRIV_NET_BINDMLP : NULL,
+	    daemon_uid, daemon_gid, can_do_mlp ? PRIV_NET_BINDMLP : NULL,
 	    NULL) == -1) {
 		syslog(LOG_ERR, "can't run unprivileged: %m");
 		exit(1);
@@ -809,13 +830,13 @@
 	}
 
 	/* If already owned by daemon, don't bother changing. */
-	if (statp->st_uid == DAEMON_UID &&
-	    statp->st_gid == DAEMON_GID)
+	if (statp->st_uid == daemon_uid &&
+	    statp->st_gid == daemon_gid)
 		return (0);
 
 	if (debug)
 		printf("lchown %s daemon:daemon\n", path);
-	if (lchown(path, DAEMON_UID, DAEMON_GID) < 0) {
+	if (lchown(path, daemon_uid, daemon_gid) < 0) {
 		int error = errno;
 
 		syslog(LOG_WARNING, "can't chown %s to daemon: %m",

--- a/usr/src/cmd/mdb/Makefile.common	Mon Sep 11 21:56:06 2006 -0700
+++ b/usr/src/cmd/mdb/Makefile.common	Mon Sep 11 22:51:59 2006 -0700
@@ -32,6 +32,7 @@
 	libavl \
 	libc \
 	libnvpair \
+	libproc \
 	libsysevent \
 	libumem \
 	libuutil \

--- a/usr/src/cmd/mdb/common/kmdb/kvm.h	Mon Sep 11 21:56:06 2006 -0700
+++ b/usr/src/cmd/mdb/common/kmdb/kvm.h	Mon Sep 11 22:51:59 2006 -0700
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -20,7 +19,7 @@
  * CDDL HEADER END
  */
 /*
- * Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
@@ -95,8 +94,10 @@
 		GElf_Sym	_kmt_cmnint;
 		GElf_Sym	_kmt_cmntrap;
 		GElf_Sym	_kmt_sysenter;
+		GElf_Sym	_kmt_brand_sysenter;
 #if defined(__amd64)
 		GElf_Sym	_kmt_syscall;
+		GElf_Sym	_kmt_brand_syscall;
 #endif
 	} kmt_intrsyms;
 #endif

--- a/usr/src/cmd/mdb/common/mdb/mdb_main.c	Mon Sep 11 21:56:06 2006 -0700
+++ b/usr/src/cmd/mdb/common/mdb/mdb_main.c	Mon Sep 11 22:51:59 2006 -0700
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -20,7 +19,7 @@
  * CDDL HEADER END
  */
 /*
- * Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
@@ -583,9 +582,15 @@
 		}
 	}
 
+	if (rd_ctl(RD_CTL_SET_HELPPATH, (void *)mdb.m_root) != RD_OK) {
+		warn("cannot set librtld_db helper path to %s\n", mdb.m_root);
+		terminate(2);
+	}
+
 	if (mdb.m_debug & MDB_DBG_HELP)
 		terminate(0); /* Quit here if we've printed out the tokens */
 
+
 	if (Iflag != NULL && strchr(Iflag, ';') != NULL) {
 		warn("macro path cannot contain semicolons\n");
 		terminate(2);

--- a/usr/src/cmd/mdb/common/mdb/mdb_proc.c	Mon Sep 11 21:56:06 2006 -0700
+++ b/usr/src/cmd/mdb/common/mdb/mdb_proc.c	Mon Sep 11 22:51:59 2006 -0700
@@ -4519,6 +4519,18 @@
 	return (set_errno(EMDB_NOPROC));
 }
 
+static int
+pt_auxv(mdb_tgt_t *t, const auxv_t **auxvp)
+{
+	if (t->t_pshandle != NULL) {
+		*auxvp = Pgetauxvec(t->t_pshandle);
+		return (0);
+	}
+
+	return (set_errno(EMDB_NOPROC));
+}
+
+
 static const mdb_tgt_ops_t proc_ops = {
 	pt_setflags,				/* t_setflags */
 	(int (*)()) mdb_tgt_notsup,		/* t_setcontext */
@@ -4570,7 +4582,8 @@
 	pt_add_fault,				/* t_add_fault */
 	pt_getareg,				/* t_getareg */
 	pt_putareg,				/* t_putareg */
-	pt_stack_iter				/* t_stack_iter */
+	pt_stack_iter,				/* t_stack_iter */
+	pt_auxv					/* t_auxv */
 };
 
 /*

--- a/usr/src/cmd/mdb/common/mdb/mdb_pservice.c	Mon Sep 11 21:56:06 2006 -0700
+++ b/usr/src/cmd/mdb/common/mdb/mdb_pservice.c	Mon Sep 11 22:51:59 2006 -0700
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -20,7 +19,7 @@
  * CDDL HEADER END
  */
 /*
- * Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
@@ -229,14 +228,13 @@
 ps_err_e
 ps_pauxv(struct ps_prochandle *P, const auxv_t **auxvp)
 {
-	static const auxv_t auxv = { AT_NULL, 0 };
-
 	mdb_tgt_t *t = mdb_tgt_from_pshandle(P);
 
 	if (t == NULL)
 		return (ps_ops.ps_pauxv(P, auxvp));
 
-	*auxvp = &auxv;
+	if (mdb_tgt_auxv(t, auxvp) != 0)
+		return (PS_ERR);
 
 	return (PS_OK);
 }

--- a/usr/src/cmd/mdb/common/mdb/mdb_target.c	Mon Sep 11 21:56:06 2006 -0700
+++ b/usr/src/cmd/mdb/common/mdb/mdb_target.c	Mon Sep 11 22:51:59 2006 -0700
@@ -384,6 +384,12 @@
 	return (t->t_ops->t_dmodel(t));
 }
 
+int
+mdb_tgt_auxv(mdb_tgt_t *t, const auxv_t **auxvp)
+{
+	return (t->t_ops->t_auxv(t, auxvp));
+}
+
 ssize_t
 mdb_tgt_aread(mdb_tgt_t *t, mdb_tgt_as_t as,
 	void *buf, size_t n, mdb_tgt_addr_t addr)

--- a/usr/src/cmd/mdb/common/mdb/mdb_target_impl.h	Mon Sep 11 21:56:06 2006 -0700
+++ b/usr/src/cmd/mdb/common/mdb/mdb_target_impl.h	Mon Sep 11 22:51:59 2006 -0700
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -20,7 +19,7 @@
  * CDDL HEADER END
  */
 /*
- * Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
@@ -33,6 +32,7 @@
 #include <mdb/mdb_module.h>
 #include <mdb/mdb_list.h>
 #include <mdb/mdb_gelf.h>
+#include <sys/auxv.h>
 
 #ifdef	__cplusplus
 extern "C" {
@@ -133,6 +133,7 @@
 	int (*t_stack_iter)(mdb_tgt_t *, const mdb_tgt_gregset_t *,
 	    mdb_tgt_stack_f *, void *);
 
+	int (*t_auxv)(mdb_tgt_t *, const auxv_t **auxvp);
 } mdb_tgt_ops_t;
 
 /*
@@ -324,6 +325,8 @@
 
 extern mdb_vespec_t *mdb_tgt_vespec_lookup(mdb_tgt_t *, int);
 
+extern int mdb_tgt_auxv(mdb_tgt_t *, const auxv_t **);
+
 extern void mdb_tgt_vespec_hold(mdb_tgt_t *, mdb_vespec_t *);
 extern void mdb_tgt_vespec_rele(mdb_tgt_t *, mdb_vespec_t *);
 

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/mdb/common/modules/libproc/libproc.c	Mon Sep 11 22:51:59 2006 -0700
@@ -0,0 +1,353 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
+ *
+ * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+ * or http://www.opensolaris.org/os/licensing.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information: Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ */
+/*
+ * Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+ * Use is subject to license terms.
+ */
+
+#pragma ident	"%Z%%M%	%I%	%E% SMI"
+
+#include <libproc.h>
+#include <Pcontrol.h>
+#include <stddef.h>
+
+#include <mdb/mdb_modapi.h>
+
+typedef struct ps_prochandle ps_prochandle_t;
+
+/*
+ * addr::pr_symtab [-a | n]
+ *
+ * 	-a	Sort symbols by address
+ * 	-n	Sort symbols by name
+ *
+ * Given a sym_tbl_t, dump its contents in tabular form.  When given '-a' or
+ * '-n', we use the sorted tables 'sym_byaddr' or 'sym_byname', respectively.
+ */
+static int
+pr_symtab(uintptr_t addr, uint_t flags, int argc, const mdb_arg_t *argv)
+{
+	sym_tbl_t symtab;
+	Elf_Data data;
+#ifdef _LP64
+	Elf64_Sym sym;
+	int width = 16;
+#else
+	Elf32_Sym sym;
+	int width = 8;
+#endif
+	int i, idx, count;
+	char name[128];
+	int byaddr = FALSE;
+	int byname = FALSE;
+	uint_t *symlist;
+	size_t symlistsz;
+
+	if (mdb_getopts(argc, argv,
+	    'a', MDB_OPT_SETBITS, TRUE, &byaddr,
+	    'n', MDB_OPT_SETBITS, TRUE, &byname,
+	    NULL) != argc)
+		return (DCMD_USAGE);
+
+	if (byaddr && byname) {
+		mdb_warn("only one of '-a' or '-n' can be specified\n");
+		return (DCMD_USAGE);
+	}
+
+	if (!(flags & DCMD_ADDRSPEC))
+		return (DCMD_USAGE);
+
+	if (mdb_vread(&symtab, sizeof (sym_tbl_t), addr) == -1) {
+		mdb_warn("failed to read sym_tbl_t at %p", addr);
+		return (DCMD_ERR);
+	}
+
+	if (symtab.sym_count == 0) {
+		mdb_warn("no symbols present\n");
+		return (DCMD_ERR);
+	}
+
+	if (mdb_vread(&data, sizeof (Elf_Data),
+	    (uintptr_t)symtab.sym_data) == -1) {
+		mdb_warn("failed to read Elf_Data at %p", symtab.sym_data);
+		return (DCMD_ERR);
+	}
+
+	symlist = NULL;
+	if (byaddr || byname) {
+		uintptr_t src = byaddr ? (uintptr_t)symtab.sym_byaddr :
+		    (uintptr_t)symtab.sym_byname;
+
+		symlistsz = symtab.sym_count * sizeof (uint_t);
+		symlist = mdb_alloc(symlistsz, UM_SLEEP);
+		if (mdb_vread(symlist, symlistsz, src) == -1) {
+			mdb_warn("failed to read sorted symbols at %p", src);
+			return (DCMD_ERR);
+		}
+		count = symtab.sym_count;
+	} else {
+		count = symtab.sym_symn;
+	}
+
+	mdb_printf("%<u>%*s  %*s  %s%</u>\n", width, "ADDRESS", width,
+	    "SIZE", "NAME");
+
+	for (i = 0; i < count; i++) {
+		if (byaddr | byname)
+			idx = symlist[i];
+		else
+			idx = i;
+
+		if (mdb_vread(&sym, sizeof (sym), (uintptr_t)data.d_buf +
+		    idx * sizeof (sym)) == -1) {
+			mdb_warn("failed to read symbol at %p",
+			    (uintptr_t)data.d_buf + idx * sizeof (sym));
+			if (symlist)
+				mdb_free(symlist, symlistsz);
+			return (DCMD_ERR);
+		}
+
+		if (mdb_readstr(name, sizeof (name),
+		    (uintptr_t)symtab.sym_strs + sym.st_name) == -1) {
+			mdb_warn("failed to read symbol name at %p",
+			    symtab.sym_strs + sym.st_name);
+			name[0] = '\0';
+		}
+
+		mdb_printf("%0?p  %0?p  %s\n", sym.st_value, sym.st_size,
+		    name);
+	}
+
+	if (symlist)
+		mdb_free(symlist, symlistsz);
+
+	return (DCMD_OK);
+}
+
+/*
+ * addr::pr_addr2map search
+ *
+ * Given a ps_prochandle_t, convert the given address to the corresponding
+ * map_info_t.  Functionally equivalent to Paddr2mptr().
+ */
+static int
+pr_addr2map(uintptr_t addr, uint_t flags, int argc, const mdb_arg_t *argv)
+{
+	uintptr_t search;
+	ps_prochandle_t psp;
+	map_info_t *mp;
+	int lo, hi, mid;
+
+	if (!(flags & DCMD_ADDRSPEC) || argc != 1)
+		return (DCMD_USAGE);
+
+	if (argv[0].a_type == MDB_TYPE_IMMEDIATE)
+		search = argv[0].a_un.a_val;
+	else
+		search = mdb_strtoull(argv[0].a_un.a_str);
+
+	if (mdb_vread(&psp, sizeof (ps_prochandle_t), addr) == -1) {
+		mdb_warn("failed to read ps_prochandle at %p", addr);
+		return (DCMD_ERR);
+	}
+
+	lo = 0;
+	hi = psp.map_count;
+	while (lo <= hi) {
+		mid = (lo + hi) / 2;
+		mp = &psp.mappings[mid];
+
+		if ((addr - mp->map_pmap.pr_vaddr) < mp->map_pmap.pr_size) {
+			mdb_printf("%#lr\n", addr + offsetof(ps_prochandle_t,
+			    mappings) + (mp - psp.mappings) *
+			    sizeof (map_info_t));
+			return (DCMD_OK);
+		}
+
+		if (addr < mp->map_pmap.pr_vaddr)
+			hi = mid - 1;
+		else
+			lo = mid + 1;
+	}
+
+	mdb_warn("no corresponding map for %p\n", search);
+	return (DCMD_ERR);
+}
+
+/*
+ * ::walk pr_file_info
+ *
+ * Given a ps_prochandle_t, walk all its file_info_t structures.
+ */
+typedef struct {
+	uintptr_t	fiw_next;
+	int		fiw_count;
+} file_info_walk_t;
+
+static int
+pr_file_info_walk_init(mdb_walk_state_t *wsp)
+{
+	ps_prochandle_t psp;
+	file_info_walk_t *fiw;
+
+	if (wsp->walk_addr == NULL) {
+		mdb_warn("pr_file_info doesn't support global walks\n");
+		return (WALK_ERR);
+	}
+
+	if (mdb_vread(&psp, sizeof (ps_prochandle_t), wsp->walk_addr) == -1) {
+		mdb_warn("failed to read ps_prochandle at %p", wsp->walk_addr);
+		return (WALK_ERR);
+	}
+
+	fiw = mdb_alloc(sizeof (file_info_walk_t), UM_SLEEP);
+
+	fiw->fiw_next = (uintptr_t)psp.file_head.list_forw;
+	fiw->fiw_count = psp.num_files;
+	wsp->walk_data = fiw;
+
+	return (WALK_NEXT);
+}
+
+static int
+pr_file_info_walk_step(mdb_walk_state_t *wsp)
+{
+	file_info_walk_t *fiw = wsp->walk_data;
+	file_info_t f;
+	int status;
+
+	if (fiw->fiw_count == 0)
+		return (WALK_DONE);
+
+	if (mdb_vread(&f, sizeof (file_info_t), fiw->fiw_next) == -1) {
+		mdb_warn("failed to read file_info_t at %p", fiw->fiw_next);
+		return (WALK_ERR);
+	}
+
+	status = wsp->walk_callback(fiw->fiw_next, &f, wsp->walk_cbdata);
+
+	fiw->fiw_next = (uintptr_t)f.file_list.list_forw;
+	fiw->fiw_count--;
+
+	return (status);
+}
+
+static void
+pr_file_info_walk_fini(mdb_walk_state_t *wsp)
+{
+	file_info_walk_t *fiw = wsp->walk_data;
+	mdb_free(fiw, sizeof (file_info_walk_t));
+}
+
+/*
+ * ::walk pr_map_info
+ *
+ * Given a ps_prochandle_t, walk all its map_info_t structures.
+ */
+typedef struct {
+	uintptr_t	miw_next;
+	int		miw_count;
+	int		miw_current;
+} map_info_walk_t;
+
+static int
+pr_map_info_walk_init(mdb_walk_state_t *wsp)
+{
+	ps_prochandle_t psp;
+	map_info_walk_t *miw;
+
+	if (wsp->walk_addr == NULL) {
+		mdb_warn("pr_map_info doesn't support global walks\n");
+		return (WALK_ERR);
+	}
+
+	if (mdb_vread(&psp, sizeof (ps_prochandle_t), wsp->walk_addr) == -1) {
+		mdb_warn("failed to read ps_prochandle at %p", wsp->walk_addr);
+		return (WALK_ERR);
+	}
+
+	miw = mdb_alloc(sizeof (map_info_walk_t), UM_SLEEP);
+
+	miw->miw_next = (uintptr_t)psp.mappings;
+	miw->miw_count = psp.map_count;
+	miw->miw_current = 0;
+	wsp->walk_data = miw;
+
+	return (WALK_NEXT);
+}
+
+static int
+pr_map_info_walk_step(mdb_walk_state_t *wsp)
+{
+	map_info_walk_t *miw = wsp->walk_data;
+	map_info_t m;
+	int status;
+
+	if (miw->miw_current == miw->miw_count)
+		return (WALK_DONE);
+
+	if (mdb_vread(&m, sizeof (map_info_t), miw->miw_next) == -1) {
+		mdb_warn("failed to read map_info_t at %p", miw->miw_next);
+		return (WALK_DONE);
+	}
+
+	status = wsp->walk_callback(miw->miw_next, &m, wsp->walk_cbdata);
+
+	miw->miw_current++;
+	miw->miw_next += sizeof (map_info_t);
+
+	return (status);
+}
+
+static void
+pr_map_info_walk_fini(mdb_walk_state_t *wsp)
+{
+	map_info_walk_t *miw = wsp->walk_data;
+	mdb_free(miw, sizeof (map_info_walk_t));
+}
+
+static const mdb_dcmd_t dcmds[] = {
+	{ "pr_addr2map",  ":addr", "convert an adress into a map_info_t",
+	    pr_addr2map },
+	{ "pr_symtab",	":[-a | -n]", "print the contents of a sym_tbl_t",
+	    pr_symtab },
+	{ NULL }
+};
+
+static const mdb_walker_t walkers[] = {
+	{ "pr_file_info", "given a ps_prochandle, walk its file_info "
+	    "structures", pr_file_info_walk_init, pr_file_info_walk_step,
+	    pr_file_info_walk_fini },
+	{ "pr_map_info", "given a ps_prochandle, walk its map_info structures",
+	    pr_map_info_walk_init, pr_map_info_walk_step,
+	    pr_map_info_walk_fini },
+	{ NULL }
+};
+
+static const mdb_modinfo_t modinfo = {
+	MDB_API_VERSION, dcmds, walkers
+};
+
+const mdb_modinfo_t *
+_mdb_init(void)
+{
+	return (&modinfo);
+}

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/mdb/intel/amd64/libproc/Makefile	Mon Sep 11 22:51:59 2006 -0700
@@ -0,0 +1,47 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+#ident	"%Z%%M%	%I%	%E% SMI"
+
+MODULE = libproc.so
+MDBTGT = proc
+
+MODSRCS_DIR = ../../../common/modules/libproc
+
+MODSRCS = libproc.c
+
+include ../../../../Makefile.cmd
+include ../../../../Makefile.cmd.64
+include ../../Makefile.amd64
+include ../../../Makefile.module
+
+CFLAGS64 += -I../../../../../lib/libproc/common
+LINTFLAGS64 += -I../../../../../lib/libproc/common
+
+%.o: $(MODSRCS_DIR)/%.c
+	$(COMPILE.c) $<
+	$(CTFCONVERT_O)
+
+%.ln: $(MODSRCS_DIR)/%.c
+	$(LINT.c) -c $<

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/mdb/intel/ia32/libproc/Makefile	Mon Sep 11 22:51:59 2006 -0700
@@ -0,0 +1,46 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+#ident	"%Z%%M%	%I%	%E% SMI"
+
+MODULE = libproc.so
+MDBTGT = proc
+
+MODSRCS_DIR = ../../../common/modules/libproc
+
+MODSRCS = libproc.c
+
+include ../../../../Makefile.cmd
+include ../../Makefile.ia32
+include ../../../Makefile.module
+
+CFLAGS += -I../../../../../lib/libproc/common
+LINTFLAGS += -I../../../../../lib/libproc/common
+
+%.o: $(MODSRCS_DIR)/%.c
+	$(COMPILE.c) $<
+	$(CTFCONVERT_O)
+
+%.ln: $(MODSRCS_DIR)/%.c
+	$(LINT.c) -c $<

--- a/usr/src/cmd/mdb/intel/kmdb/kaif.c	Mon Sep 11 21:56:06 2006 -0700
+++ b/usr/src/cmd/mdb/intel/kmdb/kaif.c	Mon Sep 11 22:51:59 2006 -0700
@@ -69,6 +69,7 @@
 
 uintptr_t	kaif_kernel_handler;
 uintptr_t	kaif_sys_sysenter;
+uintptr_t	kaif_brand_sys_sysenter;
 
 int		kaif_trap_switch;
 
@@ -921,6 +922,10 @@
 	    "sys_sysenter")) == NULL)
 		return (set_errno(ENOENT));
 
+	if ((kaif_brand_sys_sysenter = kmdb_kdi_lookup_by_name("unix",
+	    "brand_sys_sysenter")) == NULL)
+		return (set_errno(ENOENT));
+
 	return (0);
 }
 

--- a/usr/src/cmd/mdb/intel/kmdb/kaif.h	Mon Sep 11 21:56:06 2006 -0700
+++ b/usr/src/cmd/mdb/intel/kmdb/kaif.h	Mon Sep 11 22:51:59 2006 -0700
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -20,7 +19,7 @@
  * CDDL HEADER END
  */
 /*
- * Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
@@ -80,6 +79,7 @@
 
 extern uintptr_t kaif_kernel_handler;
 extern uintptr_t kaif_sys_sysenter;
+extern uintptr_t kaif_brand_sys_sysenter;
 
 extern void kaif_trap_set_debugger(void);
 extern void kaif_trap_set_saved(kaif_cpusave_t *);

--- a/usr/src/cmd/mdb/intel/kmdb/kaif_start_isadep.c	Mon Sep 11 21:56:06 2006 -0700
+++ b/usr/src/cmd/mdb/intel/kmdb/kaif_start_isadep.c	Mon Sep 11 22:51:59 2006 -0700
@@ -72,7 +72,8 @@
 	 * See the comments in the kernel's T_SGLSTP handler for why we need to
 	 * do this.
 	 */
-	if (tt == T_SGLSTP && pc == kaif_sys_sysenter)
+	if (tt == T_SGLSTP &&
+	    (pc == kaif_sys_sysenter || pc == kaif_brand_sys_sysenter))
 		return (1);
 
 	return (0);

--- a/usr/src/cmd/mdb/intel/kmdb/kvm_isadep.c	Mon Sep 11 21:56:06 2006 -0700
+++ b/usr/src/cmd/mdb/intel/kmdb/kvm_isadep.c	Mon Sep 11 22:51:59 2006 -0700
@@ -627,8 +627,12 @@
 	    "cmntrap", &kmt->kmt_intrsyms._kmt_cmntrap, NULL);
 	(void) mdb_tgt_lookup_by_name(t, MDB_TGT_OBJ_EXEC,
 	    "sys_sysenter", &kmt->kmt_intrsyms._kmt_sysenter, NULL);
+	(void) mdb_tgt_lookup_by_name(t, MDB_TGT_OBJ_EXEC,
+	    "brand_sys_sysenter", &kmt->kmt_intrsyms._kmt_brand_sysenter, NULL);
 #if defined(__amd64)
 	(void) mdb_tgt_lookup_by_name(t, MDB_TGT_OBJ_EXEC,
 	    "sys_syscall", &kmt->kmt_intrsyms._kmt_syscall, NULL);
+	(void) mdb_tgt_lookup_by_name(t, MDB_TGT_OBJ_EXEC,
+	    "brand_sys_syscall", &kmt->kmt_intrsyms._kmt_brand_syscall, NULL);
 #endif
 }

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/mdb/sparc/v7/libproc/Makefile	Mon Sep 11 22:51:59 2006 -0700
@@ -0,0 +1,46 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+#ident	"%Z%%M%	%I%	%E% SMI"
+
+MODULE = libproc.so
+MDBTGT = proc
+
+MODSRCS_DIR = ../../../common/modules/libproc
+
+MODSRCS = libproc.c
+
+include ../../../../Makefile.cmd
+include ../../Makefile.sparcv7
+include ../../../Makefile.module
+
+CFLAGS += -I../../../../../lib/libproc/common
+LINTFLAGS += -I../../../../../lib/libproc/common
+
+%.o: $(MODSRCS_DIR)/%.c
+	$(COMPILE.c) $<
+	$(CTFCONVERT_O)
+
+%.ln: $(MODSRCS_DIR)/%.c
+	$(LINT.c) -c $<

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/mdb/sparc/v9/libproc/Makefile	Mon Sep 11 22:51:59 2006 -0700
@@ -0,0 +1,47 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+#ident	"%Z%%M%	%I%	%E% SMI"
+
+MODULE = libproc.so
+MDBTGT = proc
+
+MODSRCS_DIR = ../../../common/modules/libproc
+
+MODSRCS = libproc.c
+
+include ../../../../Makefile.cmd
+include ../../../../Makefile.cmd.64
+include ../../Makefile.sparcv9
+include ../../../Makefile.module
+
+CFLAGS64 += -I../../../../../lib/libproc/common
+LINTFLAGS64 += -I../../../../../lib/libproc/common
+
+%.o: $(MODSRCS_DIR)/%.c
+	$(COMPILE.c) $<
+	$(CTFCONVERT_O)
+
+%.ln: $(MODSRCS_DIR)/%.c
+	$(LINT.c) -c $<

--- a/usr/src/cmd/ptools/Makefile.bld	Mon Sep 11 21:56:06 2006 -0700
+++ b/usr/src/cmd/ptools/Makefile.bld	Mon Sep 11 22:51:59 2006 -0700
@@ -42,7 +42,7 @@
 LDLIBS_pflags	= -lproc
 LDLIBS_pldd	= -lproc
 LDLIBS_plgrp	= -lproc -llgrp
-LDLIBS_pmap	= -lproc
+LDLIBS_pmap	= -lproc -lzonecfg
 LDLIBS_pmadvise	= -lproc
 LDLIBS_ppriv	= -lproc
 LDLIBS_preap	= -lproc

--- a/usr/src/cmd/ptools/pargs/pargs.c	Mon Sep 11 21:56:06 2006 -0700
+++ b/usr/src/cmd/ptools/pargs/pargs.c	Mon Sep 11 22:51:59 2006 -0700
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -20,7 +19,7 @@
  * CDDL HEADER END
  */
 /*
- * Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
@@ -788,6 +787,9 @@
 	{ AT_SUN_MMU,		"AT_SUN_MMU",		at_null	},
 	{ AT_SUN_LDDATA,	"AT_SUN_LDDATA",	at_null	},
 	{ AT_SUN_AUXFLAGS,	"AT_SUN_AUXFLAGS",	at_flags },
+	{ AT_SUN_EMULATOR,	"AT_SUN_EMULATOR",	at_str	},
+	{ AT_SUN_BRANDNAME,	"AT_SUN_BRANDNAME",	at_str	},
+	{ AT_SUN_BRAND_PHDR,	"AT_SUN_BRAND_PHDR",	at_null	}
 };
 
 #define	N_AT_ENTS (sizeof (aux_arr) / sizeof (struct aux_id))

--- a/usr/src/cmd/ptools/pmap/pmap.c	Mon Sep 11 21:56:06 2006 -0700
+++ b/usr/src/cmd/ptools/pmap/pmap.c	Mon Sep 11 22:51:59 2006 -0700
@@ -44,6 +44,7 @@
 #include <sys/mman.h>
 #include <sys/lgrp_user.h>
 #include <libproc.h>
+#include <libzonecfg.h>
 
 #define	KILOBYTE	1024
 #define	MEGABYTE	(KILOBYTE * KILOBYTE)
@@ -598,18 +599,48 @@
 make_name(struct ps_prochandle *Pr, uintptr_t addr, const char *mapname,
 	char *buf, size_t bufsz)
 {
-	const pstatus_t *Psp = Pstatus(Pr);
-	char fname[100];
-	struct stat statb;
-	int len;
+	const pstatus_t		*Psp = Pstatus(Pr);
+	const psinfo_t		*pi = Ppsinfo(Pr);
+	char			fname[100];
+	struct stat		statb;
+	int			len;
+	char			zname[ZONENAME_MAX];
+	char			zpath[PATH_MAX];
+	char			objname[PATH_MAX];
 
 	if (!lflag && strcmp(mapname, "a.out") == 0 &&
 	    Pexecname(Pr, buf, bufsz) != NULL)
 		return (buf);
 
-	if (Pobjname(Pr, addr, buf, bufsz) != NULL) {
+	if (Pobjname(Pr, addr, objname, sizeof (objname)) != NULL) {
+		(void) strncpy(buf, objname, bufsz);
+
 		if (lflag)
 			return (buf);
+
+		if ((len = resolvepath(buf, buf, bufsz)) > 0) {
+			buf[len] = '\0';
+			return (buf);
+		}
+
+		/*
+		 * If the target is in a non-global zone, attempt to prepend
+		 * the zone path in order to give the global-zone caller the
+		 * real path to the file.
+		 */
+		if (getzonenamebyid(pi->pr_zoneid, zname,
+			sizeof (zname)) != -1 && strcmp(zname, "global") != 0 &&
+		    zone_get_zonepath(zname, zpath, sizeof (zpath)) == Z_OK) {
+			(void) strncat(zpath, "/root",
+			    MAXPATHLEN - strlen(zpath));
+
+			if (bufsz <= strlen(zpath))
+				return (NULL);
+
+			(void) strncpy(buf, zpath, bufsz);
+			(void) strncat(buf, objname, bufsz - strlen(zpath));
+		}
+
 		if ((len = resolvepath(buf, buf, bufsz)) > 0) {
 			buf[len] = '\0';
 			return (buf);

--- a/usr/src/cmd/renice/renice.c	Mon Sep 11 21:56:06 2006 -0700
+++ b/usr/src/cmd/renice/renice.c	Mon Sep 11 22:51:59 2006 -0700
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -20,7 +19,7 @@
  * CDDL HEADER END
  */
 /*
- * Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
@@ -337,7 +336,7 @@
 
 	if (setpriority(which, who, prio) < 0) {
 		(void) fprintf(stderr, gettext("renice: %s:"), who_s);
-		if (errno == EPERM && prio < oldprio)
+		if (errno == EACCES && prio < oldprio)
 			(void) fprintf(stderr, gettext(
 			    " Cannot lower nice value.\n"));
 		else

--- a/usr/src/cmd/sgs/librtld_db/common/_rtld_db.h	Mon Sep 11 21:56:06 2006 -0700
+++ b/usr/src/cmd/sgs/librtld_db/common/_rtld_db.h	Mon Sep 11 22:51:59 2006 -0700
@@ -51,9 +51,9 @@
 	ulong_t				rd_flags;	/* flags */
 	ulong_t				rd_rdebugvers;	/* rtld_db_priv.vers */
 	int				rd_dmodel;	/* data model */
+	rd_helper_t			rd_helper;	/* private to helper */
 };
 
-
 /*
  * Values for rd_flags
  */
@@ -63,10 +63,12 @@
 
 #define	RDAGLOCK(x)	(void) mutex_lock(&(x->rd_mutex));
 #define	RDAGUNLOCK(x)	(void) mutex_unlock(&(x->rd_mutex));
-#define	LOG(func)	(void) mutex_lock(&glob_mutex); \
-			if (rtld_db_logging) \
-				func; \
-			(void) mutex_unlock(&glob_mutex);
+#define	LOG(func)	{						\
+				(void) mutex_lock(&glob_mutex);		\
+				if (rtld_db_logging)			\
+					func;				\
+				(void) mutex_unlock(&glob_mutex);	\
+			}
 
 extern mutex_t		glob_mutex;
 extern int		rtld_db_version;

--- a/usr/src/cmd/sgs/librtld_db/common/librtld_db.msg	Mon Sep 11 21:56:06 2006 -0700
+++ b/usr/src/cmd/sgs/librtld_db/common/librtld_db.msg	Mon Sep 11 22:51:59 2006 -0700
@@ -81,6 +81,10 @@
 @ MSG_DB_NODYNDEBUG	"rtld_db: fde: no %lld found in .dynamic"
 @ MSG_DB_FINDDYNAMIC	"rtld_db: fde: DYNAMIC entry found tag: %d found. \
 			 val: 0x%llx"
+@ MSG_DB_HELPER_PREFIX	"/usr/lib/brand/"
+
+
+
 # Diagnostic messages
 
 @ MSG_DB_LOGENABLE	"rtld_db: logging enabled!"
@@ -95,6 +99,13 @@
 @ MSG_DB_RDEVENTGETMSG	"rtld_db: rd_event_getmsg(dmodel=%d, type=%d, \
 			 state=%d)"
 @ MSG_DB_RDOBJPADE	"rtld_db: rd_objpad_enable(padsize=0x%llx)"
+@ MSG_DB_64BIT_PREFIX	"64/";
+@ MSG_DB_BRAND_HELPERPATH_PREFIX "%s/%s/%s/%s%s_librtld_db.so.1"
+@ MSG_DB_BRAND_HELPERPATH "%s/%s/%s%s_librtld_db.so.1"
+@ MSG_DB_HELPERNOOPS	"rtld_db: helper lib loaded but ops not preset"
+@ MSG_DB_HELPERLOADED	"rtld_db: helper library loaded for brand \"%s\""
+@ MSG_DB_HELPERLOADFAILED "rtld_db: couldn't load brand helper library %s"
+@ MSG_DB_HELPERINITFAILED "rtld_db: brand helper library initialization failed"
 
 @ MSG_ER_OK		"no error"
 @ MSG_ER_ERR		"generic rtld_db.so error"
@@ -111,3 +122,4 @@
 @ MSG_SYM_DLACT		"rtld_db_dlactivity"
 @ MSG_SYM_RTBIND	"elf_rtbndr"
 @ MSG_SYM_DYNAMIC	"_DYNAMIC"
+@ MSG_SYM_BRANDOPS	"rtld_db_brand_ops"

--- a/usr/src/cmd/sgs/librtld_db/common/llib-lrtld_db	Mon Sep 11 21:56:06 2006 -0700
+++ b/usr/src/cmd/sgs/librtld_db/common/llib-lrtld_db	Mon Sep 11 22:51:59 2006 -0700
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -23,8 +22,8 @@
 /* PROTOLIB1 */
 
 /*
- * Copyright (c) 1998 by Sun Microsystems, Inc. 
- * All rights reserved. 
+ * Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+ * Use is subject to license terms.
  */ 
 
 #pragma ident	"%Z%%M%	%I%	%E% SMI"
@@ -38,6 +37,7 @@
 rd_err_e	rd_event_enable(rd_agent_t *, int);
 rd_err_e	rd_event_getmsg(rd_agent_t *, rd_event_msg_t *);
 rd_err_e	rd_init(int);
+rd_err_e	rd_ctl(int, void *);
 rd_err_e	rd_loadobj_iter(rd_agent_t *, rl_iter_f *,
 			void *);
 void		rd_log(const int);
@@ -45,4 +45,6 @@
 rd_err_e	rd_objpad_enable(struct rd_agent *, size_t);
 rd_err_e	rd_plt_resolution(rd_agent_t *, psaddr_t, lwpid_t,
 			psaddr_t, rd_plt_info_t *);
+void		rd_fix_phdrs(struct rd_agent *, Elf32_Dyn *, size_t,
+			uintptr_t);
 rd_err_e	rd_reset(struct rd_agent *);

--- a/usr/src/cmd/sgs/librtld_db/common/mapfile-vers	Mon Sep 11 21:56:06 2006 -0700
+++ b/usr/src/cmd/sgs/librtld_db/common/mapfile-vers	Mon Sep 11 22:51:59 2006 -0700
@@ -1,13 +1,12 @@
 #
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -32,11 +31,13 @@
 	rd_event_enable;
 	rd_event_getmsg;
 	rd_init;
+	rd_ctl;
 	rd_loadobj_iter;
 	rd_log;
 	rd_new;
 	rd_objpad_enable;
 	rd_plt_resolution;
+	rd_fix_phdrs;
 	rd_reset;
     local:
 	*;
@@ -53,4 +54,5 @@
 	ps_plog = PARENT;
 	ps_pread = PARENT;
 	ps_pwrite = PARENT;
+	ps_pbrandname = PARENT;
 };

--- a/usr/src/cmd/sgs/librtld_db/common/rd_elf.c	Mon Sep 11 21:56:06 2006 -0700
+++ b/usr/src/cmd/sgs/librtld_db/common/rd_elf.c	Mon Sep 11 22:51:59 2006 -0700
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -20,7 +19,7 @@
  * CDDL HEADER END
  */
 /*
- * Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
@@ -34,7 +33,9 @@
 #include	<rtld.h>
 #include	<_rtld_db.h>
 #include	<msg.h>
-
+#include	<limits.h>
+#include	<string.h>
+#include	<sys/param.h>
 
 /*
  * 64-bit builds are going to compile this module twice, the
@@ -63,7 +64,6 @@
 #define	TListnode		Listnode
 #endif	/* _LP64 */
 
-
 static rd_err_e
 validate_rdebug(struct rd_agent *rap)
 {
@@ -87,14 +87,14 @@
 	if (ps_pread(php, db_privp, (char *)&db_priv,
 	    sizeof (Rtld_db_priv)) != PS_OK) {
 		LOG(ps_plog(MSG_ORIG(MSG_DB_READPRIVFAIL_1),
-			EC_ADDR(db_privp)));
+		    EC_ADDR(db_privp)));
 		return (RD_DBERR);
 	}
 
 	if ((db_priv.rtd_version < R_RTLDDB_VERSION1) ||
 	    (db_priv.rtd_version > R_RTLDDB_VERSION)) {
 		LOG(ps_plog(MSG_ORIG(MSG_DB_BADPVERS),
-			db_priv.rtd_version, R_RTLDDB_VERSION));
+		    db_priv.rtd_version, R_RTLDDB_VERSION));
 		return (RD_NOCAPAB);
 	}
 
@@ -114,7 +114,7 @@
 	if (((rap->rd_flags & RDF_FL_COREFILE) == 0) &&
 	    (db_priv.rtd_version != R_RTLDDB_VERSION)) {
 		LOG(ps_plog(MSG_ORIG(MSG_DB_BADPVERS),
-			db_priv.rtd_version, R_RTLDDB_VERSION));
+		    db_priv.rtd_version, R_RTLDDB_VERSION));
 		return (RD_NOCAPAB);
 	}
 
@@ -122,8 +122,8 @@
 	rap->rd_rtlddbpriv = db_privp;
 
 	LOG(ps_plog(MSG_ORIG(MSG_DB_VALIDRDEBUG), EC_ADDR(rap->rd_rdebug),
-		R_RTLDDB_VERSION, rap->rd_rdebugvers,
-		rap->rd_flags & RDF_FL_COREFILE));
+	    R_RTLDDB_VERSION, rap->rd_rdebugvers,
+	    rap->rd_flags & RDF_FL_COREFILE));
 	return (RD_OK);
 }
 
@@ -140,7 +140,7 @@
 		if (ps_pread(php, dynaddr, (void *)(&d), sizeof (d)) !=
 		    PS_OK) {
 			LOG(ps_plog(MSG_ORIG(MSG_DB_READFAIL_4),
-				EC_ADDR(dynaddr)));
+			    EC_ADDR(dynaddr)));
 			return (RD_DBERR);
 		}
 		dynaddr += sizeof (d);
@@ -157,6 +157,17 @@
 	return (RD_DBERR);
 }
 
+extern char rtld_db_helper_path[MAXPATHLEN];
+
+#ifndef _ELF64
+void
+rd_fix_phdrs(struct rd_agent *rap, Elf32_Dyn *dp, size_t sz, uintptr_t a)
+{
+	if (rap->rd_helper.rh_ops != NULL)
+		rap->rd_helper.rh_ops->rho_fix_phdrs(rap, dp, sz, a);
+}
+#endif
+
 rd_err_e
 _rd_reset32(struct rd_agent *rap)
 {
@@ -164,6 +175,8 @@
 	struct ps_prochandle	*php = rap->rd_psp;
 	const auxv_t		*auxvp = NULL;
 	rd_err_e		rc = RD_OK;
+	char			brandname[MAXPATHLEN];
+	char			brandlib[MAXPATHLEN];
 
 	/*
 	 * librtld_db attempts three different methods to find
@@ -192,6 +205,7 @@
 	 *
 	 * Scan the aux vector looking for AT_BASE & AT_SUN_LDDATA
 	 */
+
 	if (ps_pauxv(php, &auxvp) != PS_OK) {
 		LOG(ps_plog(MSG_ORIG(MSG_DB_NOAUXV)));
 		rc = RD_ERR;
@@ -228,12 +242,12 @@
 		if (ps_pglobal_lookup(php, PS_OBJ_LDSO, MSG_ORIG(MSG_SYM_DEBUG),
 		    &symaddr) != PS_OK) {
 			LOG(ps_plog(MSG_ORIG(MSG_DB_LOOKFAIL),
-				MSG_ORIG(MSG_SYM_DEBUG)));
+			    MSG_ORIG(MSG_SYM_DEBUG)));
 			rc = RD_DBERR;
 		} else {
 			rap->rd_rdebug = symaddr;
 			LOG(ps_plog(MSG_ORIG(MSG_DB_SYMRDEBUG),
-				EC_ADDR(symaddr)));
+			    EC_ADDR(symaddr)));
 			rc = validate_rdebug(rap);
 		}
 	}
@@ -263,11 +277,58 @@
 		}
 	}
 
+	/*
+	 * If we are debugging a branded executable, load the appropriate helper
+	 * library, and call its initialization routine.
+	 */
+	if (ps_pbrandname(php, brandname, MAXPATHLEN) == PS_OK) {
+		const char *isa = "";
+
+#ifdef __amd64
+		isa = MSG_ORIG(MSG_DB_64BIT_PREFIX);
+#endif /* __amd64 */
+
+		if (rtld_db_helper_path[0] != '\0')
+			(void) snprintf(brandlib, MAXPATHLEN,
+			    MSG_ORIG(MSG_DB_BRAND_HELPERPATH_PREFIX),
+			    rtld_db_helper_path,
+			    MSG_ORIG(MSG_DB_HELPER_PREFIX), brandname, isa,
+			    brandname);
+		else
+			(void) snprintf(brandlib, MAXPATHLEN,
+			    MSG_ORIG(MSG_DB_BRAND_HELPERPATH),
+			    MSG_ORIG(MSG_DB_HELPER_PREFIX), brandname, isa,
+			    brandname);
+
+		if ((rap->rd_helper.rh_dlhandle = dlopen(brandlib,
+		    RTLD_LAZY | RTLD_LOCAL)) == NULL) {
+			LOG(ps_plog(MSG_ORIG(MSG_DB_HELPERLOADFAILED),
+			    brandlib));
+			return (RD_ERR);
+		}
+
+		if ((rap->rd_helper.rh_ops = dlsym(rap->rd_helper.rh_dlhandle,
+		    MSG_ORIG(MSG_SYM_BRANDOPS))) == NULL) {
+			LOG(ps_plog(MSG_ORIG(MSG_DB_HELPERNOOPS),
+			    brandlib));
+			return (RD_ERR);
+		}
+
+		rap->rd_helper.rh_data = rap->rd_helper.rh_ops->rho_init(php);
+		if (rap->rd_helper.rh_data == NULL) {
+			LOG(ps_plog(MSG_ORIG(MSG_DB_HELPERINITFAILED)));
+			(void) dlclose(rap->rd_helper.rh_dlhandle);
+			rap->rd_helper.rh_dlhandle = NULL;
+			rap->rd_helper.rh_ops = NULL;
+		} else
+			LOG(ps_plog(MSG_ORIG(MSG_DB_HELPERLOADED), brandname));
+	}
+
 	if ((rap->rd_flags & RDF_FL_COREFILE) == 0) {
 		if (ps_pglobal_lookup(php, PS_OBJ_LDSO,
 		    MSG_ORIG(MSG_SYM_PREINIT), &symaddr) != PS_OK) {
 			LOG(ps_plog(MSG_ORIG(MSG_DB_LOOKFAIL),
-				MSG_ORIG(MSG_SYM_PREINIT)));
+			    MSG_ORIG(MSG_SYM_PREINIT)));
 			return (RD_DBERR);
 		}
 		rap->rd_preinit = symaddr;
@@ -275,7 +336,7 @@
 		if (ps_pglobal_lookup(php, PS_OBJ_LDSO,
 		    MSG_ORIG(MSG_SYM_POSTINIT), &symaddr) != PS_OK) {
 			LOG(ps_plog(MSG_ORIG(MSG_DB_LOOKFAIL),
-				MSG_ORIG(MSG_SYM_POSTINIT)));
+			    MSG_ORIG(MSG_SYM_POSTINIT)));
 			return (RD_DBERR);
 		}
 		rap->rd_postinit = symaddr;
@@ -283,7 +344,7 @@
 		if (ps_pglobal_lookup(php, PS_OBJ_LDSO,
 		    MSG_ORIG(MSG_SYM_DLACT), &symaddr) != PS_OK) {
 			LOG(ps_plog(MSG_ORIG(MSG_DB_LOOKFAIL),
-				MSG_ORIG(MSG_SYM_DLACT)));
+			    MSG_ORIG(MSG_SYM_DLACT)));
 			return (RD_DBERR);
 		}
 		rap->rd_dlact = symaddr;
@@ -293,7 +354,6 @@
 	return (RD_OK);
 }
 
-
 rd_err_e
 _rd_event_enable32(rd_agent_t *rap, int onoff)
 {
@@ -357,7 +417,7 @@
 		emsg->u.state = RD_NOSTATE;
 
 	LOG(ps_plog(MSG_ORIG(MSG_DB_RDEVENTGETMSG), rap->rd_dmodel,
-		emsg->type, emsg->u.state));
+	    emsg->type, emsg->u.state));
 
 	return (RD_OK);
 }
@@ -392,9 +452,6 @@
 	return (RD_OK);
 }
 
-
-
-
 static rd_err_e
 iter_map(rd_agent_t *rap, unsigned long ident, psaddr_t lmaddr,
 	rl_iter_f *cb, void *client_data, uint_t *abort_iter)
@@ -431,9 +488,12 @@
 		}
 
 		lobj.rl_base = (psaddr_t)ADDR(&rmap);
-		lobj.rl_lmident = ident;
 		lobj.rl_flags = 0;
 		lobj.rl_refnameaddr = (psaddr_t)REFNAME(&rmap);
+		if (rap->rd_helper.rh_dlhandle != NULL)
+			lobj.rl_lmident = LM_ID_BRAND;
+		else
+			lobj.rl_lmident = ident;
 
 		/*
 		 * refnameaddr is only valid from a core file
@@ -491,21 +551,20 @@
 					lobj.rl_data_base = phdr.p_vaddr;
 					if (ehdr.e_type == ET_DYN)
 						lobj.rl_data_base +=
-							ADDR(&rmap);
+						    ADDR(&rmap);
 					break;
 				}
 				off += ehdr.e_phentsize;
 			}
 		}
 
-
 		/*
 		 * When we transfer control to the client we free the
 		 * lock and re-atain it after we've returned from the
 		 * client.  This is to avoid any deadlock situations.
 		 */
 		LOG(ps_plog(MSG_ORIG(MSG_DB_ITERMAP), cb, client_data,
-			EC_ADDR(lobj.rl_base), EC_ADDR(lobj.rl_lmident)));
+		    EC_ADDR(lobj.rl_base), EC_ADDR(lobj.rl_lmident)));
 		RDAGUNLOCK(rap);
 		if ((*cb)(&lobj, client_data) == 0) {
 			LOG(ps_plog(MSG_ORIG(MSG_DB_CALLBACKR0)));
@@ -532,7 +591,7 @@
 	uint_t		abort_iter = 0;
 
 	LOG(ps_plog(MSG_ORIG(MSG_DB_LOADOBJITER), rap->rd_dmodel, cb,
-		client_data));
+	    client_data));
 
 	if (ps_pread(rap->rd_psp, rap->rd_rtlddbpriv, (char *)&db_priv,
 	    sizeof (Rtld_db_priv)) != PS_OK) {
@@ -543,20 +602,20 @@
 
 	if (db_priv.rtd_dynlmlst == 0) {
 		LOG(ps_plog(MSG_ORIG(MSG_DB_LKMAPNOINIT),
-			EC_ADDR((uintptr_t)db_priv.rtd_dynlmlst)));
+		    EC_ADDR((uintptr_t)db_priv.rtd_dynlmlst)));
 		return (RD_NOMAPS);
 	}
 
 	if (ps_pread(rap->rd_psp, (psaddr_t)db_priv.rtd_dynlmlst, (char *)&list,
 	    sizeof (TList)) != PS_OK) {
 		LOG(ps_plog(MSG_ORIG(MSG_DB_READDBGFAIL_3),
-			EC_ADDR((uintptr_t)db_priv.rtd_dynlmlst)));
+		    EC_ADDR((uintptr_t)db_priv.rtd_dynlmlst)));
 		return (RD_DBERR);
 	}
 
 	if (list.head == 0) {
 		LOG(ps_plog(MSG_ORIG(MSG_DB_LKMAPNOINIT_1),
-			EC_ADDR((uintptr_t)list.head)));
+		    EC_ADDR((uintptr_t)list.head)));
 		return (RD_NOMAPS);
 	}
 
@@ -575,14 +634,14 @@
 		if (ps_pread(rap->rd_psp, (psaddr_t)lnp, (char *)&lnode,
 		    sizeof (TListnode)) != PS_OK) {
 			LOG(ps_plog(MSG_ORIG(MSG_DB_READDBGFAIL_4),
-				EC_ADDR(lnp)));
+			    EC_ADDR(lnp)));
 			return (RD_DBERR);
 		}
 
 		if (ps_pread(rap->rd_psp, (psaddr_t)lnode.data, (char *)&lml,
 		    sizeof (Lm_list)) != PS_OK) {
 			LOG(ps_plog(MSG_ORIG(MSG_DB_READDBGFAIL_5),
-				EC_ADDR((uintptr_t)lnode.data)));
+			    EC_ADDR((uintptr_t)lnode.data)));
 			return (RD_DBERR);
 		}
 
@@ -603,5 +662,13 @@
 		if (abort_iter)
 			break;
 	}
-	return (rc);
+
+	if (rc != RD_OK)
+		return (rc);
+
+	if (rap->rd_helper.rh_ops != NULL)
+		return (rap->rd_helper.rh_ops->rho_loadobj_iter(rap->rd_psp, cb,
+		    client_data, rap->rd_helper.rh_data));
+
+	return (RD_OK);
 }