--- a/usr/src/cmd/Makefile	Sun Dec 28 13:11:10 2014 -0800
+++ b/usr/src/cmd/Makefile	Sun Jan 04 07:19:22 2015 -0800
@@ -808,6 +808,7 @@
 ksh:	shcomp isaexec
 mdb:	terminfo
 print:	lp
+fmt:	mailx
 
 $(FIRST_SUBDIRS) $(BWOSDIRS) $(SUBDIRS) $(AUDITSUBDIRS): FRC
 	@if [ -f $@/Makefile  ]; then \

--- a/usr/src/cmd/dd/dd.c	Sun Dec 28 13:11:10 2014 -0800
+++ b/usr/src/cmd/dd/dd.c	Sun Jan 04 07:19:22 2015 -0800
@@ -147,6 +147,7 @@
 static off_t	oseekn;	/* number of output records to seek past */
 static unsigned long long	count;	/* number of input records to copy */
 			/* (0 = all) */
+static boolean_t ecount;	/* explicit count given */
 static int	trantype; /* BSD or SVr4 compatible EBCDIC */
 
 static char		*string;	/* command arg pointer */
@@ -571,6 +572,7 @@
 		if (match("count="))
 		{
 			count = number(BIG);
+			ecount = B_TRUE;
 			continue;
 		}
 		if (match("files="))
@@ -1009,8 +1011,7 @@
 			nstats = 0;
 		}
 
-		if ((count == 0) || (nifr+nipr < count))
-		{
+		if ((count == 0 && ecount == B_FALSE) || (nifr+nipr < count)) {
 		/* If proceed on error is enabled, zero the input buffer */
 
 			if (cflag&NERR)

--- a/usr/src/cmd/fmt/Makefile	Sun Dec 28 13:11:10 2014 -0800
+++ b/usr/src/cmd/fmt/Makefile	Sun Jan 04 07:19:22 2015 -0800
@@ -33,6 +33,7 @@
 
 include ../Makefile.cmd
 
+LDLIBS += -lcmdutils
 CERRWARN += -_gcc=-Wno-switch
 CERRWARN += -_gcc=-Wno-parentheses
 

--- a/usr/src/cmd/fmt/fmt.c	Sun Dec 28 13:11:10 2014 -0800
+++ b/usr/src/cmd/fmt/fmt.c	Sun Jan 04 07:19:22 2015 -0800
@@ -86,7 +86,7 @@
 
 void (*(split))(wchar_t []);
 extern int scrwidth(wchar_t);
-extern int ishead(char []);
+extern boolean_t is_headline(const char *);
 
 
 static void fill_hdrbuf(wchar_t []);
@@ -240,13 +240,13 @@
 			}
 			/*
 			 * Need to convert string from wchar_t to char,
-			 * since this is what ishead() expects.  Since we
+			 * since this is what is_headline() expects.  Since we
 			 * only want to make sure cp points to a "From" line
 			 * of the email, we don't have to alloc
 			 * BUFSIZ * MB_LEN_MAX to cbuf.
 			 */
 			wcstombs(cbuf, cp, (BUFSIZ - 1));
-			if (ishead(cbuf)) {
+			if (is_headline(cbuf) == B_TRUE) {
 				hdr_state = in_hdr;
 				fill_hdrbuf(canonb);
 			} else {

--- a/usr/src/cmd/ipf/lib/common/load_hash.c	Sun Dec 28 13:11:10 2014 -0800
+++ b/usr/src/cmd/ipf/lib/common/load_hash.c	Sun Jan 04 07:19:22 2015 -0800
@@ -7,15 +7,16 @@
  *
  * Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
+ *
+ * Copyright (c) 2014, Joyent, Inc.  All rights reserved.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 #include <fcntl.h>
 #include <sys/ioctl.h>
 #include "ipf.h"
 #include "netinet/ip_lookup.h"
 #include "netinet/ip_htable.h"
+#include "ipfzone.h"
 
 static int hashfd = -1;
 
@@ -35,6 +36,10 @@
 		hashfd = open(IPLOOKUP_NAME, O_RDWR);
 	if ((hashfd == -1) && ((opts & OPT_DONOTHING) == 0))
 		return -1;
+	if (setzone(hashfd) != 0) {
+		close(hashfd);
+		return -1;
+	}
 
 	for (n = 0, a = list; a != NULL; a = a->ipe_next)
 		n++;

--- a/usr/src/cmd/ipf/lib/common/load_hashnode.c	Sun Dec 28 13:11:10 2014 -0800
+++ b/usr/src/cmd/ipf/lib/common/load_hashnode.c	Sun Jan 04 07:19:22 2015 -0800
@@ -7,15 +7,16 @@
  *
  * Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
+ *
+ * Copyright (c) 2014, Joyent, Inc.  All rights reserved.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 #include <fcntl.h>
 #include <sys/ioctl.h>
 #include "ipf.h"
 #include "netinet/ip_lookup.h"
 #include "netinet/ip_htable.h"
+#include "ipfzone.h"
 
 static int hashfd = -1;
 
@@ -34,6 +35,10 @@
 		hashfd = open(IPLOOKUP_NAME, O_RDWR);
 	if ((hashfd == -1) && ((opts & OPT_DONOTHING) == 0))
 		return -1;
+	if (setzone(hashfd) != 0) {
+		close(hashfd);
+		return -1;
+	}
 
 	op.iplo_type = IPLT_HASH;
 	op.iplo_unit = unit;

--- a/usr/src/cmd/ipf/lib/common/load_pool.c	Sun Dec 28 13:11:10 2014 -0800
+++ b/usr/src/cmd/ipf/lib/common/load_pool.c	Sun Jan 04 07:19:22 2015 -0800
@@ -7,15 +7,16 @@
  *
  * Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
+ *
+ * Copyright (c) 2014, Joyent, Inc.  All rights reserved.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 #include <fcntl.h>
 #include <sys/ioctl.h>
 #include "ipf.h"
 #include "netinet/ip_lookup.h"
 #include "netinet/ip_pool.h"
+#include "ipfzone.h"
 
 static int poolfd = -1;
 
@@ -32,6 +33,10 @@
 		poolfd = open(IPLOOKUP_NAME, O_RDWR);
 	if ((poolfd == -1) && ((opts & OPT_DONOTHING) == 0))
 		return -1;
+	if (setzone(poolfd) != 0) {
+		close(poolfd);
+		return -1;
+	}
 
 	op.iplo_unit = plp->ipo_unit;
 	op.iplo_type = IPLT_POOL;

--- a/usr/src/cmd/ipf/lib/common/load_poolnode.c	Sun Dec 28 13:11:10 2014 -0800
+++ b/usr/src/cmd/ipf/lib/common/load_poolnode.c	Sun Jan 04 07:19:22 2015 -0800
@@ -4,6 +4,8 @@
  * See the IPFILTER.LICENCE file for details on licencing.
  *
  * $Id: load_poolnode.c,v 1.3.2.1 2004/03/06 14:33:29 darrenr Exp $
+ *
+ * Copyright (c) 2014, Joyent, Inc.  All rights reserved.
  */
 
 #include <fcntl.h>
@@ -11,6 +13,7 @@
 #include "ipf.h"
 #include "netinet/ip_lookup.h"
 #include "netinet/ip_pool.h"
+#include "ipfzone.h"
 
 static int poolfd = -1;
 
@@ -29,6 +32,10 @@
 		poolfd = open(IPLOOKUP_NAME, O_RDWR);
 	if ((poolfd == -1) && ((opts & OPT_DONOTHING) == 0))
 		return -1;
+	if (setzone(poolfd) != 0) {
+		close(poolfd);
+		return -1;
+	}
 
 	op.iplo_unit = role;
 	op.iplo_type = IPLT_POOL;

--- a/usr/src/cmd/ipf/tools/Makefile.tools	Sun Dec 28 13:11:10 2014 -0800
+++ b/usr/src/cmd/ipf/tools/Makefile.tools	Sun Jan 04 07:19:22 2015 -0800
@@ -24,17 +24,19 @@
 #
 # Copyright 2013 Nexenta Systems, Inc.  All rights reserved.
 #
+# Copyright (c) 2012, Joyent Inc. All rights reserved.
+#
 
 PROG=		ipf ipfs ipmon ipnat ippool ipfstat
 IPFPROG=	ipftest
 
-IPF_OBJS=	ipf.o ipfcomp.o ipf_y.o ipf_l.o
-IPFS_OBJS=	ipfs.o
-IPFSTAT_OBJS=	ipfstat.o
-IPMON_OBJS=	ipmon.o ipmon_y.o ipmon_l.o
-IPNAT_OBJS=	ipnat.o ipnat_y.o ipnat_l.o
-IPPOOL_OBJS=	ippool.o ippool_y.o ippool_l.o
-IPFTEST_OBJS=	ipftest.o  \
+IPF_OBJS=	ipf.o ipfcomp.o ipfzone.o ipf_y.o ipf_l.o
+IPFS_OBJS=	ipfs.o ipfzone.o
+IPFSTAT_OBJS=	ipfstat.o ipfzone.o
+IPMON_OBJS=	ipmon.o ipfzone.o ipmon_y.o ipmon_l.o
+IPNAT_OBJS=	ipnat.o ipfzone.o ipnat_y.o ipnat_l.o
+IPPOOL_OBJS=	ippool.o ipfzone.o ippool_y.o ippool_l.o
+IPFTEST_OBJS=	ipftest.o ipfzone.o \
 		ip_fil.o ip_state.o ip_compat.o \
 		ip_frag.o ip_nat.o ip_nat6.o fil.o \
 		ip_htable.o ip_lookup.o \

--- a/usr/src/cmd/ipf/tools/ipf.c	Sun Dec 28 13:11:10 2014 -0800
+++ b/usr/src/cmd/ipf/tools/ipf.c	Sun Jan 04 07:19:22 2015 -0800
@@ -5,6 +5,8 @@
  *
  * Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
+ *
+ * Copyright (c) 2014, Joyent, Inc.  All rights reserved.
  */
 
 #ifdef	__FreeBSD__
@@ -20,6 +22,7 @@
 #include <fcntl.h>
 #include <sys/ioctl.h>
 #include "netinet/ipl.h"
+#include "ipfzone.h"
 
 #if !defined(lint)
 static const char sccsid[] = "@(#)ipf.c	1.23 6/5/96 (C) 1993-2000 Darren Reed";
@@ -62,9 +65,9 @@
 
 static void usage()
 {
-	fprintf(stderr, "usage: ipf [-6AdDEInoPrRsvVyzZ] %s %s %s\n",
+	fprintf(stderr, "usage: ipf [-6AdDEGInoPrRsvVyzZ] %s %s %s",
 		"[-l block|pass|nomatch|state|nat]", "[-cc] [-F i|o|a|s|S|u]",
-		"[-f filename] [-T <tuneopts>]");
+		"[-f filename] [-T <tuneopts>] [zonename]\n");
 	exit(1);
 }
 
@@ -74,11 +77,21 @@
 char *argv[];
 {
 	int c;
+	const char *optstr = "6Ac:dDEf:F:GIl:noPrRsT:vVyzZ";
 
 	if (argc < 2)
 		usage();
 
-	while ((c = getopt(argc, argv, "6Ac:dDEf:F:Il:noPrRsT:vVyzZ")) != -1) {
+	/*
+	 * We need to set the zone name before calling the functions
+	 * in the switch statement below. Note that ipf.c differs from the other
+	 * tools in the ipfilter suite: the zone name is specified as the
+	 * last argument, while the other tools use the -z option. ipf
+	 * already has a -z option, so the last argument is used instead.
+	 */
+	getzonearg(argc, argv, optstr);
+
+	while ((c = getopt(argc, argv, optstr)) != -1) {
 		switch (c)
 		{
 		case '?' :
@@ -111,6 +124,9 @@
 		case 'F' :
 			flushfilter(optarg);
 			break;
+		case 'G' :
+			/* Already handled by getzonearg() above */
+			break;
 		case 'I' :
 			opts ^= OPT_INACTIVE;
 			break;
@@ -187,6 +203,12 @@
 		if ((fd = open(ipfdev, O_RDWR)) == -1)
 			if ((fd = open(ipfdev, O_RDONLY)) == -1)
 				perror("open device");
+
+	if (setzone(fd) != 0) {
+		close(fd);
+		return -2;
+	}
+
 	return fd;
 }
 
@@ -307,6 +329,11 @@
 		if (opts & OPT_VERBOSE)
 			printf("set state log flag\n");
 		xfd = open(IPSTATE_NAME, O_RDWR);
+		if (xfd >= 0 && setzone(xfd) != 0) {
+			close(xfd);
+			xfd = -1;
+		}
+
 		if (xfd >= 0) {
 			logopt = 0;
 			if (ioctl(xfd, SIOCGETLG, &logopt))
@@ -324,6 +351,11 @@
 		if (opts & OPT_VERBOSE)
 			printf("set nat log flag\n");
 		xfd = open(IPNAT_NAME, O_RDWR);
+		if (xfd >= 0 && setzone(xfd) != 0) {
+			close(xfd);
+			xfd = -1;
+		}
+
 		if (xfd >= 0) {
 			logopt = 0;
 			if (ioctl(xfd, SIOCGETLG, &logopt))
@@ -516,6 +548,11 @@
 		return 1;
 	}
 
+	if (setzone(vfd) != 0) {
+		close(vfd);
+		return 1;
+	}
+
 	if (ioctl(vfd, SIOCGETFS, &ipfo)) {
 		perror("ioctl(SIOCGETFS)");
 		close(vfd);

--- a/usr/src/cmd/ipf/tools/ipfs.c	Sun Dec 28 13:11:10 2014 -0800
+++ b/usr/src/cmd/ipf/tools/ipfs.c	Sun Jan 04 07:19:22 2015 -0800
@@ -5,6 +5,8 @@
  *
  * Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
+ *
+ * Copyright (c) 2014, Joyent, Inc.  All rights reserved.
  */
 
 #ifdef	__FreeBSD__
@@ -44,6 +46,7 @@
 #include <resolv.h>
 #include "ipf.h"
 #include "netinet/ipl.h"
+#include "ipfzone.h"
 
 #if !defined(lint)
 static const char rcsid[] = "@(#)Id: ipfs.c,v 1.12 2003/12/01 01:56:53 darrenr Exp";
@@ -86,14 +89,17 @@
 
 void usage()
 {
-	fprintf(stderr, "usage: %s [-nv] -l\n", progname);
-	fprintf(stderr, "usage: %s [-nv] -u\n", progname);
-	fprintf(stderr, "usage: %s [-nv] [-d <dir>] -R\n", progname);
-	fprintf(stderr, "usage: %s [-nv] [-d <dir>] -W\n", progname);
-	fprintf(stderr, "usage: %s [-nv] [-N|-S] [-f <file>] -r\n", progname);
-	fprintf(stderr, "usage: %s [-nv] [-N|-S] [-f <file>] -w\n", progname);
-	fprintf(stderr, "usage: %s [-nv] [-N|-S] -f <file> -i <if1>,<if2>\n",
-		progname);
+	const char *zoneopt = "[-G|-z zonename] ";
+	fprintf(stderr, "usage: %s %s[-nv] -l\n", progname, zoneopt);
+	fprintf(stderr, "usage: %s %s[-nv] -u\n", progname, zoneopt);
+	fprintf(stderr, "usage: %s %s[-nv] [-d <dir>] -R\n", progname, zoneopt);
+	fprintf(stderr, "usage: %s %s[-nv] [-d <dir>] -W\n", progname, zoneopt);
+	fprintf(stderr, "usage: %s %s[-nv] [-N|-S] [-f <file>] -r\n", progname,
+		zoneopt);
+	fprintf(stderr, "usage: %s %s[-nv] [-N|-S] [-f <file>] -w\n", progname,
+		zoneopt);
+	fprintf(stderr, "usage: %s %s[-nv] [-N|-S] -f <file> -i <if1>,<if2>\n",
+		progname, zoneopt);
 	exit(1);
 }
 
@@ -218,7 +224,7 @@
 	char *dirname = NULL, *filename = NULL, *ifs = NULL;
 
 	progname = argv[0];
-	while ((c = getopt(argc, argv, "d:f:lNnSRruvWw")) != -1)
+	while ((c = getopt(argc, argv, "d:f:G:lNnSRruvWwz:")) != -1)
 		switch (c)
 		{
 		case 'd' :
@@ -233,6 +239,9 @@
 			else
 				usage();
 			break;
+		case 'G' :
+			setzonename_global(optarg);
+			break;
 		case 'i' :
 			ifs = optarg;
 			set = 1;
@@ -287,6 +296,9 @@
 			rw = 3;
 			set = 1;
 			break;
+		case 'z' :
+			setzonename(optarg);
+			break;
 		case '?' :
 		default :
 			usage();
@@ -355,6 +367,12 @@
 	if ((fd = open(ipfdev, O_RDWR)) == -1)
 		if ((fd = open(ipfdev, O_RDONLY)) == -1)
 			perror("open device");
+
+	if (setzone(fd) != 0) {
+		close(fd);
+		fd = -1;
+	}
+
 	return fd;
 }
 

--- a/usr/src/cmd/ipf/tools/ipfstat.c	Sun Dec 28 13:11:10 2014 -0800
+++ b/usr/src/cmd/ipf/tools/ipfstat.c	Sun Jan 04 07:19:22 2015 -0800
@@ -5,6 +5,8 @@
  *
  * Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
+ *
+ * Copyright (c) 2014, Joyent, Inc.  All rights reserved.
  */
 
 #ifdef __FreeBSD__
@@ -71,6 +73,7 @@
 #if defined(__NetBSD__) || (__OpenBSD__)
 # include <paths.h>
 #endif
+#include "ipfzone.h"
 
 #if !defined(lint)
 static const char sccsid[] = "@(#)fils.c	1.21 4/20/96 (C) 1993-2000 Darren Reed";
@@ -177,6 +180,7 @@
 #else
 	fprintf(stderr, "       %s -t [-C] ", name);
 #endif
+	fprintf(stderr, "[-G|-z zonename] ");
 	fprintf(stderr, "[-D destination address] [-P protocol] [-S source address] [-T refresh time]\n");
 	exit(1);
 }
@@ -207,9 +211,9 @@
 	u_32_t frf;
 
 #ifdef	USE_INET6
-	options = "6aACdfghIilnostvD:M:N:P:RS:T:";
+	options = "6aACdfgG:hIilnostvD:M:N:P:RS:T:z:";
 #else
-	options = "aACdfghIilnostvD:M:N:P:RS:T:";
+	options = "aACdfgG:hIilnostvD:M:N:P:RS:T:z:";
 #endif
 
 	saddr.in4.s_addr = INADDR_ANY; 	/* default any v4 source addr */
@@ -223,13 +227,16 @@
 	opterr = 0;
 
 	/*
-	 * Parse these two arguments now lest there be any buffer overflows
+	 * Parse these four arguments now lest there be any buffer overflows
 	 * in the parsing of the rest.
 	 */
 	myoptind = optind;
 	while ((c = getopt(argc, argv, options)) != -1) {
 		switch (c)
 		{
+		case 'G' :
+			setzonename_global(optarg);
+			break;
 		case 'M' :
 			memf = optarg;
 			live_kernel = 0;
@@ -238,6 +245,9 @@
 			kern = optarg;
 			live_kernel = 0;
 			break;
+		case 'z' :
+			setzonename(optarg);
+			break;
 		}
 	}
 	optind = myoptind;
@@ -247,11 +257,22 @@
 			perror("open(IPSTATE_NAME)");
 			exit(-1);
 		}
+
+		if (setzone(state_fd) != 0) {
+			close(state_fd);
+			exit(-1);
+		}
+
 		if ((ipf_fd = open(device, O_RDONLY)) == -1) {
 			fprintf(stderr, "open(%s)", device);
 			perror("");
 			exit(-1);
 		}
+
+		if (setzone(ipf_fd) != 0) {
+			close(ipf_fd);
+			exit(-1);
+		}
 	}
 
 	if (kern != NULL || memf != NULL) {
@@ -298,6 +319,9 @@
 		case 'g' :
 			opts |= OPT_GROUPS;
 			break;
+		case 'G' :
+			/* Already handled by getzoneopt() above */
+			break;
 		case 'h' :
 			opts |= OPT_HITS;
 			break;
@@ -360,6 +384,9 @@
 			opts |= OPT_VERBOSE;
 			opts |= OPT_UNDEF;
 			break;
+		case 'z' :
+			/* Already handled by getzoneopt() above */
+			break;
 		default :
 			usage(argv[0]);
 			break;
@@ -482,6 +509,11 @@
 			exit(-1);
 		}
 
+		if (setzone(ipf_fd) != 0) {
+			close(ipf_fd);
+			exit(-1);
+		}
+
 		bzero((caddr_t)&ipfo, sizeof(ipfo));
 		ipfo.ipfo_rev = IPFILTER_VERSION;
 		ipfo.ipfo_size = sizeof(fr_authstat_t);

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/ipf/tools/ipfzone.c	Sun Jan 04 07:19:22 2015 -0800
@@ -0,0 +1,161 @@
+/*
+ * Copyright (c) 2014 Joyent, Inc.  All rights reserved.
+ * Use is subject to license terms.
+ *
+ * See the IPFILTER.LICENCE file for details on licensing.
+ */
+
+
+#include <errno.h>
+#include <net/if.h>
+#include <stdio.h>
+#include <string.h>
+#include <unistd.h>
+#include <zone.h>
+
+#include "netinet/ip_fil.h"
+#include "ipfzone.h"
+
+static ipfzoneobj_t	ipzo;
+static boolean_t	do_setzone = 0;
+static int		num_setzones = 0;
+
+extern int	errno;
+extern int	opterr;
+extern int	optind;
+extern char	*optarg;
+
+/*
+ * Get the zonename if it's the last argument and set the zonename
+ * in ipfzo to it. This is used by ipf(1m) only - all of the other tools
+ * specify the zone with the -z option, and therefore use getzoneopt() below.
+ */
+void
+getzonearg(int argc, char *argv[], const char *optstr)
+{
+	int c;
+
+	/*
+	 * Don't warn about unknown options - let subsequent calls to
+	 * getopt() handle this.
+	 */
+	opterr = 0;
+
+	/*
+	 * getopt is also used here to set optind so that we can
+	 * determine if the last argument belongs to a flag or is
+	 * actually a zonename.
+	 */
+	while ((c = getopt(argc, argv, optstr)) != -1) {
+		if (c == 'G')
+			ipzo.ipfz_gz = 1;
+	}
+
+	if (optind < argc)
+		setzonename(argv[optind]);
+
+	/*
+	 * Reset optind and opterr so the next getopt call will go through all
+	 * of argv again and warn about unknown options.
+	 */
+	optind = 1;
+	opterr = 1;
+}
+
+/*
+ * Get a -z option from argv and set the zonename in ipfzo accordingly
+ */
+void
+getzoneopt(int argc, char *argv[], const char *optstr)
+{
+	int c;
+
+	/*
+	 * Don't warn about unknown options - let subsequent calls to
+	 * getopt() handle this.
+	 */
+	opterr = 0;
+
+	while ((c = getopt(argc, argv, optstr)) != -1) {
+		if (c == 'G')
+			setzonename_global(optarg);
+
+		if (c == 'z')
+			setzonename(optarg);
+	}
+
+	/*
+	 * Reset optind and opterr so the next getopt call will go through all
+	 * of argv again and warn about unknown options.
+	 */
+	optind = 1;
+	opterr = 1;
+}
+
+/*
+ * Set the zonename in ipfzo to the given string: this is the zone all further
+ * ioctls will act on.
+ */
+void
+setzonename(const char *zonename)
+{
+	memcpy(ipzo.ipfz_zonename, zonename, sizeof (ipzo.ipfz_zonename));
+	do_setzone = B_TRUE;
+	num_setzones++;
+}
+
+/*
+ * Set the zonename in ipfo, and the gz flag. This indicates that we want all
+ * further ioctls to act on the GZ-controlled stack for that zone.
+ */
+void
+setzonename_global(const char *zonename)
+{
+	setzonename(zonename);
+	ipzo.ipfz_gz = 1;
+}
+
+/*
+ * Set the zone that all further ioctls will operate on. See the "GZ-controlled
+ * and per-zone stacks" note at the top of ip_fil_solaris.c for further
+ * explanation.
+ */
+int
+setzone(int fd)
+{
+	if (!do_setzone)
+		return (0);
+
+	if (num_setzones > 1) {
+		(void) fprintf(stderr,
+		    "Only one of -G and -z may be set\n");
+		return (-1);
+	}
+
+	if (ipzo.ipfz_gz == 1 &&
+	    getzoneidbyname(ipzo.ipfz_zonename) == GLOBAL_ZONEID) {
+		(void) fprintf(stderr,
+		    "-G cannot be used with the global zone\n");
+		return (-1);
+	}
+
+	if (ioctl(fd, SIOCIPFZONESET, &ipzo) == -1) {
+		switch (errno) {
+		case ENODEV:
+			(void) fprintf(stderr,
+			    "Could not find running zone: %s\n",
+			    ipzo.ipfz_zonename);
+			break;
+		case EACCES:
+			(void) fprintf(stderr,
+			    "Permission denied setting zone: %s\n",
+			    ipzo.ipfz_zonename);
+			break;
+		default:
+			perror("Error setting zone");
+		}
+		return (-1);
+	}
+
+	return (0);
+}

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/ipf/tools/ipfzone.h	Sun Jan 04 07:19:22 2015 -0800
@@ -0,0 +1,17 @@
+/*
+ * Copyright (c) 2013 Joyent, Inc.  All rights reserved.
+ * Use is subject to license terms.
+ *
+ * See the IPFILTER.LICENCE file for details on licensing.
+ */
+
+#ifndef	__IPFZONE_H__
+#define	__IPFZONE_H__
+
+void getzonearg(int, char *[], const char *);
+void getzoneopt(int, char *[], const char *);
+int setzone(int);
+void setzonename(const char *);
+void setzonename_global(const char *);
+
+#endif /* __IPFZONE_H__ */

--- a/usr/src/cmd/ipf/tools/ipmon.c	Sun Dec 28 13:11:10 2014 -0800
+++ b/usr/src/cmd/ipf/tools/ipmon.c	Sun Jan 04 07:19:22 2015 -0800
@@ -5,6 +5,8 @@
  *
  * Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
+ *
+ * Copyright (c) 2014, Joyent, Inc.  All rights reserved.
  */
 
 
@@ -78,6 +80,7 @@
 #include "netinet/ip_state.h"
 #include "netinet/ip_proxy.h"
 #include "ipmon.h"
+#include "ipfzone.h"
 
 #if !defined(lint)
 static const char sccsid[] = "@(#)ipmon.c	1.21 6/5/96 (C)1993-2000 Darren Reed";
@@ -1340,10 +1343,10 @@
 static void usage(prog)
 char *prog;
 {
-	fprintf(stderr, "%s: [-abDFhnpstvxX] %s %s %s %s %s %s\n",
-		prog, "[-N device]", "[ [-o [NSI]] [-O [NSI]]",
-		"[-P pidfile]", "[-S device]", "[-f device]",
-		"filename");
+	fprintf(stderr, "%s: [-abDFhnpstvxX] %s %s %s %s %s %s %s\n",
+		prog, "[-G|-z zonename]", "[-N device]",
+		"[ [-o [NSI]] [-O [NSI]]", "[-P pidfile]", "[-S device]",
+		"[-f device]", "filename");
 	exit(1);
 }
 
@@ -1380,6 +1383,11 @@
 		exit(1);
 	}
 
+	if (setzone(fd) != 0) {
+		close(fd);
+		exit(1);
+	}
+
 	if (ioctl(fd, SIOCIPFFB, &flushed) == 0) {
 		printf("%d bytes flushed from log buffer\n",
 			flushed);
@@ -1444,6 +1452,7 @@
 	char	buf[DEFAULT_IPFLOGSIZE], *iplfile[3], *s;
 	extern	int	optind;
 	extern	char	*optarg;
+	const	char	*optstr = "?abB:C:Df:G:FhnN:o:O:pP:sS:tvxXz:";
 
 	fd[0] = fd[1] = fd[2] = -1;
 	fdt[0] = fdt[1] = fdt[2] = -1;
@@ -1451,7 +1460,13 @@
 	iplfile[1] = IPNAT_NAME;
 	iplfile[2] = IPSTATE_NAME;
 
-	while ((c = getopt(argc, argv, "?abB:C:Df:FhnN:o:O:pP:sS:tvxX")) != -1)
+	/*
+	 * We need to set the zone name before calling openlog in
+	 * the switch statement below
+	 */
+	getzoneopt(argc, argv, optstr);
+
+	while ((c = getopt(argc, argv, optstr)) != -1)
 		switch (c)
 		{
 		case 'a' :
@@ -1483,6 +1498,9 @@
 			flushlogs(iplfile[1], log);
 			flushlogs(iplfile[2], log);
 			break;
+		case 'G' :
+			/* Already handled by getzoneopt() above */
+			break;
 		case 'n' :
 			opts |= OPT_RESOLVE;
 			break;
@@ -1535,6 +1553,9 @@
 		case 'X' :
 			opts |= OPT_HEXHDR;
 			break;
+		case 'z' :
+			/* Already handled by getzoneopt() above */
+			break;
 		default :
 		case 'h' :
 		case '?' :
@@ -1571,6 +1592,12 @@
 				exit(1);
 				/* NOTREACHED */
 			}
+
+			if (setzone(fd[i]) != 0) {
+				close(fd[i]);
+				exit(1);
+			}
+
 			if (!(regular[i] = !S_ISCHR(sb.st_mode)))
 				devices++;
 		}

--- a/usr/src/cmd/ipf/tools/ipnat.c	Sun Dec 28 13:11:10 2014 -0800
+++ b/usr/src/cmd/ipf/tools/ipnat.c	Sun Jan 04 07:19:22 2015 -0800
@@ -7,6 +7,8 @@
  *
  * Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
+ *
+ * Copyright (c) 2014, Joyent, Inc.  All rights reserved.
  */
 
 #include <stdio.h>
@@ -55,6 +57,7 @@
 #include "ipf.h"
 #include "netinet/ipl.h"
 #include "kmem.h"
+#include "ipfzone.h"
 
 #ifdef	__hpux
 # define	nlist	nlist64
@@ -95,7 +98,8 @@
 void usage(name)
 char *name;
 {
-	fprintf(stderr, "Usage: %s [-CdFhlnrRsv] [-f filename]\n", name);
+	fprintf(stderr, "Usage: %s [-CdFhlnrRsv] [-f filename]", name);
+	fprintf(stderr, " [-G|-z zonename]\n");
 	exit(1);
 }
 
@@ -117,7 +121,7 @@
 	kernel = NULL;
 	mode = O_RDWR;
 
-	while ((c = getopt(argc, argv, "CdFf:hlM:N:nrRsv")) != -1)
+	while ((c = getopt(argc, argv, "CdFf:G:hlM:N:nrRsvz:")) != -1)
 		switch (c)
 		{
 		case 'C' :
@@ -132,6 +136,9 @@
 		case 'F' :
 			opts |= OPT_FLUSH;
 			break;
+		case 'G' :
+			setzonename_global(optarg);
+			break;
 		case 'h' :
 			opts |=OPT_HITS;
 			break;
@@ -162,6 +169,9 @@
 		case 'v' :
 			opts |= OPT_VERBOSE;
 			break;
+		case 'z' :
+			setzonename(optarg);
+			break;
 		default :
 			usage(argv[0]);
 		}
@@ -195,6 +205,11 @@
 			exit(1);
 		}
 
+		if (setzone(fd) != 0) {
+			close(fd);
+			exit(1);
+		}
+
 		bzero((char *)&obj, sizeof(obj));
 		obj.ipfo_rev = IPFILTER_VERSION;
 		obj.ipfo_size = sizeof(*nsp);

--- a/usr/src/cmd/ipf/tools/ippool.c	Sun Dec 28 13:11:10 2014 -0800
+++ b/usr/src/cmd/ipf/tools/ippool.c	Sun Jan 04 07:19:22 2015 -0800
@@ -5,10 +5,10 @@
  *
  * Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
+ *
+ * Copyright (c) 2014, Joyent, Inc.  All rights reserved.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 #include <sys/types.h>
 #include <sys/time.h>
 #include <sys/param.h>
@@ -41,6 +41,7 @@
 #include "netinet/ip_pool.h"
 #include "netinet/ip_htable.h"
 #include "kmem.h"
+#include "ipfzone.h"
 
 extern	int	ippool_yyparse __P((void));
 extern	int	ippool_yydebug;
@@ -71,15 +72,21 @@
 void usage(prog)
 char *prog;
 {
+	const char *zoneopt = "[-G|-z zonename] ";
 	fprintf(stderr, "Usage:\t%s\n", prog);
-	fprintf(stderr, "\t\t\t-a [-dnv] [-m <name>] [-o <role>] -i <ipaddr>[/netmask]\n");
-	fprintf(stderr, "\t\t\t-A [-dnv] [-m <name>] [-o <role>] [-S <seed>] [-t <type>]\n");
-	fprintf(stderr, "\t\t\t-f <file> [-dnuv]\n");
-	fprintf(stderr, "\t\t\t-F [-dv] [-o <role>] [-t <type>]\n");
-	fprintf(stderr, "\t\t\t-l [-dv] [-m <name>] [-t <type>]\n");
-	fprintf(stderr, "\t\t\t-r [-dnv] [-m <name>] [-o <role>] -i <ipaddr>[/netmask]\n");
-	fprintf(stderr, "\t\t\t-R [-dnv] [-m <name>] [-o <role>] [-t <type>]\n");
-	fprintf(stderr, "\t\t\t-s [-dtv] [-M <core>] [-N <namelist>]\n");
+	fprintf(stderr, "\t\t\t-a [-dnv] %s[-m <name>] [-o <role>] -i <ipaddr>[/netmask]\n",
+	    zoneopt);
+	fprintf(stderr, "\t\t\t-A [-dnv] %s[-m <name>] [-o <role>] [-S <seed>] [-t <type>]\n",
+	    zoneopt);
+	fprintf(stderr, "\t\t\t-f <file> %s[-dnuv]\n", zoneopt);
+	fprintf(stderr, "\t\t\t-F [-dv] %s[-o <role>] [-t <type>]\n", zoneopt);
+	fprintf(stderr, "\t\t\t-l [-dv] %s[-m <name>] [-t <type>]\n", zoneopt);
+	fprintf(stderr, "\t\t\t-r [-dnv] %s[-m <name>] [-o <role>] -i <ipaddr>[/netmask]\n",
+	    zoneopt);
+	fprintf(stderr, "\t\t\t-R [-dnv] %s[-m <name>] [-o <role>] [-t <type>]\n",
+	    zoneopt);
+	fprintf(stderr, "\t\t\t-s [-dtv] %s[-M <core>] [-N <namelist>]\n",
+	    zoneopt);
 	exit(1);
 }
 
@@ -140,13 +147,16 @@
 	role = IPL_LOGIPF;
 	bzero((char *)&node, sizeof(node));
 
-	while ((c = getopt(argc, argv, "di:m:no:Rv")) != -1)
+	while ((c = getopt(argc, argv, "di:G:m:no:Rvz:")) != -1)
 		switch (c)
 		{
 		case 'd' :
 			opts |= OPT_DEBUG;
 			ippool_yydebug++;
 			break;
+		case 'G' :
+			setzonename_global(optarg);
+			break;
 		case 'i' :
 			s = strchr(optarg, '/');
 			if (s == NULL)
@@ -182,6 +192,9 @@
 		case 'v' :
 			opts |= OPT_VERBOSE;
 			break;
+		case 'z' :
+			setzonename(optarg);
+			break;
 		}
 
 	if (opts & OPT_DEBUG)
@@ -219,13 +232,16 @@
 	bzero((char *)&iph, sizeof(iph));
 	bzero((char *)&pool, sizeof(pool));
 
-	while ((c = getopt(argc, argv, "dm:no:RS:t:v")) != -1)
+	while ((c = getopt(argc, argv, "dG:m:no:RS:t:vz:")) != -1)
 		switch (c)
 		{
 		case 'd' :
 			opts |= OPT_DEBUG;
 			ippool_yydebug++;
 			break;
+		case 'G' :
+			setzonename_global(optarg);
+			break;
 		case 'm' :
 			poolname = optarg;
 			break;
@@ -255,6 +271,9 @@
 		case 'v' :
 			opts |= OPT_VERBOSE;
 			break;
+		case 'z' :
+			setzonename(optarg);
+			break;
 		}
 
 	if (opts & OPT_DEBUG)
@@ -308,13 +327,16 @@
 
 	infile = optarg;
 
-	while ((c = getopt(argc, argv, "dnRuv")) != -1)
+	while ((c = getopt(argc, argv, "dG:nRuvz:")) != -1)
 		switch (c)
 		{
 		case 'd' :
 			opts |= OPT_DEBUG;
 			ippool_yydebug++;
 			break;
+		case 'G' :
+			setzonename_global(optarg);
+			break;
 		case 'n' :
 			opts |= OPT_DONOTHING;
 			break;
@@ -327,6 +349,9 @@
 		case 'v' :
 			opts |= OPT_VERBOSE;
 			break;
+		case 'z' :
+			setzonename(optarg);
+			break;
 		}
 
 	if (opts & OPT_DEBUG)
@@ -338,6 +363,11 @@
 			perror("open(IPLOOKUP_NAME)");
 			exit(1);
 		}
+
+		if (setzone(fd) != 0) {
+			close(fd);
+			exit(1);
+		}
 	}
 
 	if (ippool_parsefile(fd, infile, ioctl) != 0)
@@ -365,12 +395,15 @@
 	poolname = NULL;
 	role = IPL_LOGALL;
 
-	while ((c = getopt(argc, argv, "dm:M:N:o:Rt:v")) != -1)
+	while ((c = getopt(argc, argv, "dG:m:M:N:o:Rt:vz:")) != -1)
 		switch (c)
 		{
 		case 'd' :
 			opts |= OPT_DEBUG;
 			break;
+		case 'G' :
+			setzonename_global(optarg);
+			break;
 		case 'm' :
 			poolname = optarg;
 			break;
@@ -402,6 +435,9 @@
 		case 'v' :
 			opts |= OPT_VERBOSE;
 			break;
+		case 'z' :
+			setzonename(optarg);
+			break;
 		}
 
 	if (opts & OPT_DEBUG)
@@ -413,6 +449,11 @@
 			perror("open(IPLOOKUP_NAME)");
 			exit(1);
 		}
+
+		if (setzone(fd) != 0) {
+			close(fd);
+			exit(1);
+		}
 	}
 
 	bzero((char *)&op, sizeof(op));
@@ -615,12 +656,15 @@
 
 	bzero((char *)&op, sizeof(op));
 
-	while ((c = getopt(argc, argv, "dM:N:o:t:v")) != -1)
+	while ((c = getopt(argc, argv, "dG:M:N:o:t:vz:")) != -1)
 		switch (c)
 		{
 		case 'd' :
 			opts |= OPT_DEBUG;
 			break;
+		case 'G' :
+			setzonename_global(optarg);
+			break;
 		case 'M' :
 			live_kernel = 0;
 			core = optarg;
@@ -647,6 +691,9 @@
 		case 'v' :
 			opts |= OPT_VERBOSE;
 			break;
+		case 'z' :
+			setzonename(optarg);
+			break;
 		}
 
 	if (opts & OPT_DEBUG)
@@ -658,6 +705,11 @@
 			perror("open(IPLOOKUP_NAME)");
 			exit(1);
 		}
+
+		if (setzone(fd) != 0) {
+			close(fd);
+			exit(1);
+		}
 	}
 
 	if (type == IPLT_ALL || type == IPLT_POOL) {
@@ -705,7 +757,7 @@
 	type = IPLT_ALL;
 	role = IPL_LOGALL;
 
-	while ((c = getopt(argc, argv, "do:t:v")) != -1)
+	while ((c = getopt(argc, argv, "do:t:vz:")) != -1)
 		switch (c)
 		{
 		case 'd' :
@@ -728,6 +780,9 @@
 		case 'v' :
 			opts |= OPT_VERBOSE;
 			break;
+		case 'z' :
+			setzonename(optarg);
+			break;
 		}
 
 	if (opts & OPT_DEBUG)
@@ -739,6 +794,11 @@
 			perror("open(IPLOOKUP_NAME)");
 			exit(1);
 		}
+
+		if (setzone(fd) != 0) {
+			close(fd);
+			exit(1);
+		}
 	}
 
 	bzero((char *)&flush, sizeof(flush));

--- a/usr/src/cmd/mailx/Makefile	Sun Dec 28 13:11:10 2014 -0800
+++ b/usr/src/cmd/mailx/Makefile	Sun Jan 04 07:19:22 2015 -0800
@@ -22,6 +22,8 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright 2014 Joyent, Inc.
+#
 # cmd/mailx/Makefile
 
 PROG= mailx
@@ -62,7 +64,7 @@
 CERRWARN +=	-_gcc=-Wno-unused-variable
 CERRWARN +=	-_gcc=-Wno-clobbered
 LINTFLAGS= 	-hb
-LDLIBS +=	-lmail
+LDLIBS +=	-lmail -lcmdutils
 LDFLAGS +=	$(MAPFILE.NGB:%=-M%)
 
 CLOBBERFILES += $(MAILXHELP)

--- a/usr/src/cmd/mailx/cmd1.c	Sun Dec 28 13:11:10 2014 -0800
+++ b/usr/src/cmd/mailx/cmd1.c	Sun Jan 04 07:19:22 2015 -0800
@@ -19,6 +19,11 @@
  *
  * CDDL HEADER END
  */
+
+/*
+ * Copyright 2014 Joyent, Inc.
+ */
+
 /*
  * Copyright 2001 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
@@ -37,8 +42,7 @@
  * contributors.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
+#include <err.h>
 #include "rcv.h"
 #include <locale.h>
 
@@ -213,10 +217,14 @@
 	char *fromline;
 	char pbuf[LINESIZE];
 	char name[LINESIZE];
-	struct headline hl;
+	headline_t *hl;
 	register char *cp;
 	int showto;
 
+	if (headline_alloc(&hl) != 0) {
+		err(1, "could not allocate memory");
+	}
+
 	mp = &message[mesg-1];
 	ibuf = setinput(mp);
 	readline(ibuf, headline);
@@ -248,9 +256,14 @@
 			dispc = 'H';
 	if (mp->m_flag & MBOX)
 		dispc = 'M';
-	parse(headline, &hl, pbuf);
-	if (hl.l_date == NOSTR)
-		hl.l_date = "<Unknown date>";
+	if (parse_headline(headline, hl) == -1) {
+		headline_reset(hl);
+	}
+	if (custr_len(hl->hl_date) == 0) {
+		if (custr_append(hl->hl_date, "<Unknown date>") != 0) {
+			err(1, "could not print header");
+		}
+	}
 
 	/*
 	 * Netnews interface?
@@ -299,11 +312,14 @@
 	}
 	if (mp->m_text) {
 		printf("%16.16s %4ld/%-5ld %-.25s\n",
-			hl.l_date, mp->m_lines, mp->m_size, subjline);
+		    custr_cstr(hl->hl_date), mp->m_lines, mp->m_size,
+		    subjline);
 	} else {
-		printf("%16.16s binary/%-5ld %-.25s\n", hl.l_date, mp->m_size,
-		    subjline);
+		printf("%16.16s binary/%-5ld %-.25s\n", custr_cstr(hl->hl_date),
+		    mp->m_size, subjline);
 	}
+
+	headline_free(hl);
 }
 
 /*

--- a/usr/src/cmd/mailx/fio.c	Sun Dec 28 13:11:10 2014 -0800
+++ b/usr/src/cmd/mailx/fio.c	Sun Jan 04 07:19:22 2015 -0800
@@ -21,6 +21,10 @@
  */
 
 /*
+ * Copyright 2014 Joyent, Inc.
+ */
+
+/*
  * Copyright 1999 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
@@ -28,8 +32,6 @@
 /*	Copyright (c) 1984, 1986, 1987, 1988, 1989 AT&T	*/
 /*	  All Rights Reserved  	*/
 
-#pragma	ident	"%Z%%M%	%I%	%E% SMI"
-
 #include "rcv.h"
 #include <locale.h>
 #include <wordexp.h>
@@ -174,7 +176,7 @@
 		}
 
 		/* Look for a From line that starts a new message */
-		if (blankline && linebuf[0] == 'F' && ishead(linebuf)) {
+		if (blankline && linebuf[0] == 'F' && is_headline(linebuf)) {
 			if (msgCount > 0 && !newmail) {
 				message[msgCount-1].m_size = s;
 				message[msgCount-1].m_lines = l;
@@ -755,7 +757,7 @@
 		if (debug) fprintf(stderr, "%s\n", name);
 		return (name);
 	}
-	if (wordexp(name, &wrdexp_buf, 0) != 0) {
+	if (wordexp(name, &wrdexp_buf, WRDE_NOCMD) != 0) {
 		fprintf(stderr, gettext("Syntax error in \"%s\"\n"), name);
 		fflush(stderr);
 		return (NOSTR);

--- a/usr/src/cmd/mailx/hdr/def.h	Sun Dec 28 13:11:10 2014 -0800
+++ b/usr/src/cmd/mailx/hdr/def.h	Sun Jan 04 07:19:22 2015 -0800
@@ -20,6 +20,10 @@
  */
 
 /*
+ * Copyright 2014 Joyent, Inc.
+ */
+
+/*
  * Copyright (c) 1985, 2010, Oracle and/or its affiliates. All rights reserved.
  */
 
@@ -60,6 +64,7 @@
 #include <stdlib.h>
 #include <ulimit.h>
 #include <wait.h>
+#include <libcmdutils.h>
 #endif
 #ifdef VMUNIX
 #include <sys/wait.h>
@@ -204,11 +209,11 @@
  * line
  */
 
-struct headline {
-	char	*l_from;	/* The name of the sender */
-	char	*l_tty;		/* His tty string (if any) */
-	char	*l_date;	/* The entire date string */
-};
+typedef struct headline {
+	custr_t	*hl_from;	/* The name of the sender */
+	custr_t	*hl_tty;	/* His tty string (if any) */
+	custr_t	*hl_date;	/* The entire date string */
+} headline_t;
 
 #define	GTO	1		/* Grab To: line */
 #define	GSUBJECT 2		/* Likewise, Subject: line */
@@ -486,6 +491,9 @@
 extern char	*hcontents(char hfield[]);
 extern int	headerp(register char *line);
 extern int	headers(int *msgvec);
+extern int	headline_alloc(headline_t **);
+extern void	headline_free(headline_t *);
+extern void	headline_reset(headline_t *);
 extern int	help(void);
 extern char	*helppath(char *file);
 extern char	*hfield(char field[], struct message *mp,
@@ -497,7 +505,7 @@
 extern int	inc(void);
 extern void	inithost(void);
 extern int	isdir(char name[]);
-extern int	ishead(char linebuf[]);
+extern boolean_t is_headline(const char *);
 extern int	ishfield(char linebuf[], char field[]);
 extern int	ishost(char *sys, char *rest);
 extern int	isign(char *field, int saving);
@@ -533,7 +541,7 @@
 extern int	outof(struct name *names, FILE *fo);
 extern struct name	*outpre(struct name *to);
 extern void	panic(char *str);
-extern void	parse(char line[], struct headline *hl, char pbuf[]);
+extern int	parse_headline(const char *, headline_t *);
 extern int	pcmdlist(void);
 extern int	pdot(void);
 extern int	preserve(int *msgvec);

--- a/usr/src/cmd/mailx/head.c	Sun Dec 28 13:11:10 2014 -0800
+++ b/usr/src/cmd/mailx/head.c	Sun Jan 04 07:19:22 2015 -0800
@@ -19,6 +19,11 @@
  *
  * CDDL HEADER END
  */
+
+/*
+ * Copyright 2014 Joyent, Inc.
+ */
+
 /*
  * Copyright 1995 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
@@ -38,7 +43,7 @@
  * contributors.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
+#include <err.h>
 
 #include "rcv.h"
 
@@ -49,115 +54,188 @@
  * Routines for processing and detecting headlines.
  */
 
-static char	*copyin(char src[], char **space);
-static char	*nextword(char wp[], char wbuf[]);
+static int nextword(const char *, custr_t *, const char **);
 
 /*
  * See if the passed line buffer is a mail header.
  * Return true if yes.
  */
-
-int 
-ishead(char linebuf[])
+boolean_t
+is_headline(const char *linebuf)
 {
-	register char *cp;
-	struct headline hl;
-	char parbuf[BUFSIZ];
+	headline_t *hl;
+	boolean_t ret;
 
-	cp = linebuf;
-	if (strncmp("From ", cp, 5) != 0)
-		return(0);
-	parse(cp, &hl, parbuf);
-	if (hl.l_from == NOSTR) {
-		return(0);
+	if (strncmp("From ", linebuf, 5) != 0) {
+		return (B_FALSE);
 	}
-	return(1);
+
+	if (headline_alloc(&hl) != 0 || parse_headline(linebuf, hl) != 0) {
+		err(1, "could not parse headline");
+	}
+
+	ret = custr_len(hl->hl_from) > 0 ? B_TRUE : B_FALSE;
+
+	headline_free(hl);
+	return (ret);
 }
 
 /*
- * Split a headline into its useful components.
- * Copy the line into dynamic string space, then set
- * pointers into the copied line in the passed headline
- * structure.  Actually, it scans.
+ * Manage headline_t objects:
  */
-void 
-parse(char line[], struct headline *hl, char pbuf[])
+void
+headline_free(headline_t *hl)
 {
-	register char *cp, *dp;
-	char *sp;
-	char word[LINESIZE];
+	custr_free(hl->hl_from);
+	custr_free(hl->hl_tty);
+	custr_free(hl->hl_date);
+	free(hl);
+}
+
+int
+headline_alloc(headline_t **hl)
+{
+	int en;
+	headline_t *t;
 
-	hl->l_from = NOSTR;
-	hl->l_date = NOSTR;
-	cp = line;
-	sp = pbuf;
+	if ((t = calloc(1, sizeof (*t))) == NULL) {
+		return (-1);
+	}
+
+	if (custr_alloc(&t->hl_from) != 0 || custr_alloc(&t->hl_tty) != 0 ||
+	    custr_alloc(&t->hl_date) != 0) {
+		en = errno;
 
-	/*
-	 * Skip the first "word" of the line, which should be "From"
-	 * anyway.
-	 */
+		headline_free(t);
 
-	cp = nextword(cp, word);
-	dp = nextword(cp, word);
-	if (!equal(word, ""))
-		hl->l_from = copyin(word, &sp);
-	if (dp != NOSTR)
-		hl->l_date = copyin(dp, &sp);
+		errno = en;
+		return (-1);
+	}
+
+	*hl = t;
+	return (0);
 }
 
 /*
- * Copy the string on the left into the string on the right
- * and bump the right (reference) string pointer by the length.
- * Thus, dynamically allocate space in the right string, copying
- * the left string into it.
+ * Clear all of the strings in a headline_t:
  */
+void
+headline_reset(headline_t *hl)
+{
+	custr_reset(hl->hl_from);
+	custr_reset(hl->hl_tty);
+	custr_reset(hl->hl_date);
+}
 
-static char *
-copyin(char src[], char **space)
+int
+parse_headline(const char *line, headline_t *hl)
 {
-	register char *cp, *top;
-	register int s;
+	const char *c = line;
+
+	headline_reset(hl);
+
+	/*
+	 * Load the first word from the line and ensure that it is "From".
+	 */
+	if (nextword(c, hl->hl_from, &c) != 0) {
+		return (-1);
+	}
+	if (strcmp(custr_cstr(hl->hl_from), "From") != 0) {
+		errno = EINVAL;
+		return (-1);
+	}
+	custr_reset(hl->hl_from);
 
-	s = strlen(src);
-	cp = *space;
-	top = cp;
-	strcpy(cp, src);
-	cp += s + 1;
-	*space = cp;
-	return(top);
+	/*
+	 * The next word will be the From address.
+	 */
+	if (nextword(c, hl->hl_from, &c) != 0) {
+		return (-1);
+	}
+
+	/*
+	 * If there is a next word, the rest of the string is the Date.
+	 */
+	if (c != NULL) {
+		if (custr_append(hl->hl_date, c) != 0) {
+			return (-1);
+		}
+	}
+
+	errno = 0;
+	return (0);
 }
 
 /*
- * Collect a liberal (space, tab delimited) word into the word buffer
- * passed.  Also, return a pointer to the next word following that,
- * or NOSTR if none follow.
+ * Collect a space- or tab-delimited word into the word buffer, if one is
+ * passed.  The double quote character (") can be used to include whitespace
+ * within a word.  Set "nextword" to the location of the first character of the
+ * _next_ word, or NULL if there were no more words.  Returns 0 on success or
+ * -1 otherwise.
  */
+static int
+nextword(const char *input, custr_t *word, const char **nextword)
+{
+	boolean_t in_quotes = B_FALSE;
+	const char *c = input != NULL ? input : "";
+
+	/*
+	 * Collect the first word into the word buffer, if one is provided.
+	 */
+	for (;;) {
+		if (*c == '\0') {
+			/*
+			 * We have reached the end of the string.
+			 */
+			*nextword = NULL;
+			return (0);
+		}
 
-static char *
-nextword(char wp[], char wbuf[])
-{
-	register char *cp, *cp2;
+		if (*c == '"') {
+			/*
+			 * Either beginning or ending a quoted string.
+			 */
+			in_quotes = in_quotes ? B_FALSE : B_TRUE;
+		}
 
-	if ((cp = wp) == NOSTR) {
-		copy("", wbuf);
-		return(NOSTR);
+		if (!in_quotes && (*c == ' ' || *c == '\t')) {
+			/*
+			 * We have reached a whitespace region.
+			 */
+			break;
+		}
+
+		/*
+		 * Copy this character into the word buffer.
+		 */
+		if (word != NULL) {
+			if (custr_appendc(word, *c) != 0) {
+				return (-1);
+			}
+		}
+		c++;
 	}
-	cp2 = wbuf;
-	while (!any(*cp, " \t") && *cp != '\0')
-		if (*cp == '"') {
-			*cp2++ = *cp++;
-			while (*cp != '\0' && *cp != '"')
-				*cp2++ = *cp++;
-			if (*cp == '"')
-				*cp2++ = *cp++;
-		} else
-			*cp2++ = *cp++;
-	*cp2 = '\0';
-	while (any(*cp, " \t"))
-		cp++;
-	if (*cp == '\0')
-		return(NOSTR);
-	return(cp);
+
+	/*
+	 * Find the beginning of the next word, if there is one.
+	 */
+	for (;;) {
+		if (*c == '\0') {
+			/*
+			 * We have reached the end of the string.
+			 */
+			*nextword = NULL;
+			return (0);
+
+		} else if (*c != ' ' && *c != '\t') {
+			/*
+			 * We have located the next word.
+			 */
+			*nextword = c;
+			return (0);
+		}
+		c++;
+	}
 }
 
 /*

--- a/usr/src/cmd/mailx/main.c	Sun Dec 28 13:11:10 2014 -0800
+++ b/usr/src/cmd/mailx/main.c	Sun Jan 04 07:19:22 2015 -0800
@@ -37,8 +37,6 @@
  * contributors.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 #include "rcv.h"
 #ifndef preSVr4
 #include <locale.h>
@@ -104,7 +102,6 @@
 	progname = argv[0];
 	if (progname[strlen(progname) - 1] != 'x') {
 		assign("bsdcompat", "");
-		assign("escapeok", "");		/* XXX */
 	}
 	myegid = getegid();
 	myrgid = getgid();

--- a/usr/src/cmd/mailx/misc/mailx.rc	Sun Dec 28 13:11:10 2014 -0800
+++ b/usr/src/cmd/mailx/misc/mailx.rc	Sun Jan 04 07:19:22 2015 -0800
@@ -21,8 +21,6 @@
 # Copyright 2000 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
 # The following 3 settings produce the familiar Solaris behavior.
 set appenddeadletter
 unset pipeignore
@@ -44,8 +42,6 @@
 	set LISTER="ls -LF"
 	# default is to allow editing of message windows
 	set editmessagewindow
-	# have to allow ~ escapes even though not using tty
-	set escapeok
 endif
 
 # most mail headers are uninteresting to most people.  here we ignore all

--- a/usr/src/cmd/mailx/names.c	Sun Dec 28 13:11:10 2014 -0800
+++ b/usr/src/cmd/mailx/names.c	Sun Jan 04 07:19:22 2015 -0800
@@ -191,7 +191,7 @@
 /*
  * For each recipient in the passed name list with a /
  * in the name, append the message to the end of the named file
- * and remove him from the recipient list.
+ * and remove them from the recipient list.
  *
  * Recipients whose name begins with | are piped through the given
  * program and removed.
@@ -212,6 +212,9 @@
 	char line[BUFSIZ];
 #endif
 
+	if (value("expandaddr") == NOSTR)
+		return (nout);
+
 	for (np = names; np != NIL; np = np->n_flink) {
 		if (!isfileaddr(np->n_name) && np->n_name[0] != '|')
 			continue;
@@ -599,14 +602,15 @@
 		panic("No names to unpack");
 
 	/*
-	 * Compute the number of extra arguments we will need.
-	 * We need at least 2 extra -- one for "mail" and one for
-	 * the terminating 0 pointer.
-	 * Additional spots may be needed to pass along -r and -f to
-	 * the host mailer.
+	 * Compute the number of extra arguments we will need.  We need at least
+	 * 3 extra -- one for "mail", one for a terminating -- to stop sendmail
+	 * option processing, and one for the terminating 0 pointer.
+	 *
+	 * Additional spots may be needed to pass along -r and -f to the host
+	 * mailer.
 	 */
 
-	extra = 2;
+	extra = 3;
 
 	if (rflag != NOSTR)
 		extra += 2;
@@ -636,6 +640,7 @@
 		snprintf(hbuf, sizeof (hbuf), "%d", hflag);
 		*ap++ = savestr(hbuf);
 	}
+	*ap++ = "--";
 	while (n != NIL) {
 		if (n->n_type & GDEL) {
 			n = n->n_flink;

--- a/usr/src/cmd/mailx/receipt.c	Sun Dec 28 13:11:10 2014 -0800
+++ b/usr/src/cmd/mailx/receipt.c	Sun Jan 04 07:19:22 2015 -0800
@@ -19,6 +19,11 @@
  *
  * CDDL HEADER END
  */
+
+/*
+ * Copyright 2014 Joyent, Inc.
+ */
+
 /*
  * Copyright 1998 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
@@ -38,7 +43,7 @@
  * contributors.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
+#include <err.h>
 
 #include "rcv.h"
 
@@ -47,12 +52,12 @@
 void 
 receipt(struct message *mp)
 {
-	struct headline	hl;
 	char	head[LINESIZE];
 	char	buf[BUFSIZ];
 	FILE	*pp, *fp;
 	char	*mail, *s;
 
+
 	if ((mail = value("sendmail")) == 0)
 #ifdef SENDMAIL
 		mail = SENDMAIL;
@@ -63,16 +68,27 @@
 	 || icsubstr(hfield(">to", mp, addto), "/receipt")) {
 		snprintf(buf, sizeof (buf), "%s %s", mail, skin(nameof(mp)));
 		if (pp = npopen(buf, "w")) {
+			headline_t *hl;
+
+			if (headline_alloc(&hl) != 0) {
+				err(1, "could not allocate memory");
+			}
+
 			fp = setinput(mp);
 			readline(fp, head);
-			parse(head, &hl, buf);
-			if (hl.l_date != NOSTR)
-				fprintf(pp, "Original-Date: %s\n", hl.l_date);
+			if (parse_headline(head, hl) != 0) {
+				headline_reset(hl);
+			}
+			if (custr_len(hl->hl_date) > 0) {
+				fprintf(pp, "Original-Date: %s\n",
+				    custr_cstr(hl->hl_date));
+			}
 			if (s = hfield("message-id", mp, addone))
 				fprintf(pp, "Original-Message-ID: %s\n", s);
 			s = hfield("subject", mp, addone);
 			fprintf(pp, "Subject: RR: %s\n", s ? s : "(none)");
 			npclose(pp);
+			headline_free(hl);
 		}
 	}
 }

--- a/usr/src/cmd/mdb/common/modules/zfs/zfs.c	Sun Dec 28 13:11:10 2014 -0800
+++ b/usr/src/cmd/mdb/common/modules/zfs/zfs.c	Sun Jan 04 07:19:22 2015 -0800
@@ -960,7 +960,16 @@
 	static const char *bytestats[] = {
 		"p", "c", "c_min", "c_max", "size", "duplicate_buffers_size",
 		"arc_meta_used", "arc_meta_limit", "arc_meta_max",
-		"arc_meta_min", "hdr_size", "data_size", "other_size",
+		"arc_meta_min", "hdr_size", "data_size", "metadata_size",
+		"other_size", "anon_size", "anon_evictable_data",
+		"anon_evictable_metadata", "mru_size", "mru_evictable_data",
+		"mru_evictable_metadata", "mru_ghost_size",
+		"mru_ghost_evictable_data", "mru_ghost_evictable_metadata",
+		"mfu_size", "mfu_evictable_data", "mfu_evictable_metadata",
+		"mfu_ghost_size", "mfu_ghost_evictable_data",
+		"mfu_ghost_evictable_metadata", "evict_l2_cached",
+		"evict_l2_eligible", "evict_l2_ineligible", "l2_read_bytes",
+		"l2_write_bytes", "l2_size", "l2_asize", "l2_hdr_size",
 		NULL
 	};
 

--- a/usr/src/cmd/ndmpadm/ndmpadm_main.c	Sun Dec 28 13:11:10 2014 -0800
+++ b/usr/src/cmd/ndmpadm/ndmpadm_main.c	Sun Jan 04 07:19:22 2015 -0800
@@ -616,14 +616,14 @@
 		if (strncmp(auth_type, ndmp_auth_table[i].auth_type,
 		    strlen(ndmp_auth_table[i].auth_type)) == 0) {
 			auth_type_flag = 1;
-			if ((ndmp_set_prop((char *)ndmp_auth_table[i].username,
+			if ((ndmp_set_prop(ndmp_auth_table[i].username,
 			    username)) == -1) {
 				(void) fprintf(stdout,
 				    gettext("Could not set username - %s\n"),
 				    ndmp_strerror(ndmp_errno));
 				continue;
 			}
-			if ((ndmp_set_prop((char *)ndmp_auth_table[i].password,
+			if ((ndmp_set_prop(ndmp_auth_table[i].password,
 			    enc_password)) == -1) {
 				(void) fprintf(stdout,
 				    gettext("Could not set password - %s\n"),
@@ -677,14 +677,14 @@
 		if (strncmp(auth_type, ndmp_auth_table[i].auth_type,
 		    strlen(ndmp_auth_table[i].auth_type)) == 0) {
 			auth_type_flag = 1;
-			if ((ndmp_set_prop((char *)ndmp_auth_table[i].username,
+			if ((ndmp_set_prop(ndmp_auth_table[i].username,
 			    "")) == -1) {
 				(void) fprintf(stdout,
 				    gettext("Could not clear username - %s\n"),
 				    ndmp_strerror(ndmp_errno));
 				continue;
 			}
-			if ((ndmp_set_prop((char *)ndmp_auth_table[i].password,
+			if ((ndmp_set_prop(ndmp_auth_table[i].password,
 			    "")) == -1) {
 				(void) fprintf(stdout,
 				    gettext("Could not clear password - %s\n"),

--- a/usr/src/cmd/sgs/libld/common/unwind.c	Sun Dec 28 13:11:10 2014 -0800
+++ b/usr/src/cmd/sgs/libld/common/unwind.c	Sun Jan 04 07:19:22 2015 -0800
@@ -634,7 +634,7 @@
 						 * field.
 						 */
 					    (void) dwarf_ehe_extract(
-						&data[off + ndx],
+						&data[off],
 						&ndx, ciePflag,
 						ofl->ofl_dehdr->e_ident, B_FALSE,
 						shdr->sh_addr, off + ndx, 0);

--- a/usr/src/cmd/utmpd/Makefile	Sun Dec 28 13:11:10 2014 -0800
+++ b/usr/src/cmd/utmpd/Makefile	Sun Jan 04 07:19:22 2015 -0800
@@ -18,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-#
+# Copyright 2014 Shruti V Sampat <shrutisampat@gmail.com>
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
@@ -34,8 +34,6 @@
 
 FILEMODE = 555
 
-CERRWARN += -_gcc=-Wno-extra
-
 .KEEP_STATE:
 
 all: $(PROG)

--- a/usr/src/cmd/utmpd/utmpd.c	Sun Dec 28 13:11:10 2014 -0800
+++ b/usr/src/cmd/utmpd/utmpd.c	Sun Jan 04 07:19:22 2015 -0800
@@ -19,6 +19,10 @@
  * CDDL HEADER END
  */
 /*
+ * Copyright 2014 Shruti V Sampat <shrutisampat@gmail.com>
+ */
+
+/*
  * Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
@@ -177,8 +181,7 @@
  */
 
 int
-main(argc, argv)
-	char **argv;
+main(int argc, char *argv[])
 {
 	char *defp;
 	struct rlimit rlim;
@@ -189,7 +192,7 @@
 
 	if (getuid() != 0)  {
 		(void) fprintf(stderr,
-			"You must be root to run this program\n");
+		    "You must be root to run this program\n");
 		fatal("You must be root to run this program");
 	}
 
@@ -199,9 +202,9 @@
 			Debug = 1;
 		} else {
 			(void) fprintf(stderr,
-				"%s: Wrong number of arguments\n", prog_name);
+			    "%s: Wrong number of arguments\n", prog_name);
 			(void) fprintf(stderr,
-				"Usage: %s [-debug]\n", prog_name);
+			    "Usage: %s [-debug]\n", prog_name);
 			exit(2);
 		}
 	}
@@ -349,7 +352,7 @@
 	register struct pollfd *pfd;
 	register int i;
 	pid_t pid;
-	int ret_val;
+	int ret_val = 0;
 	int timeout;
 	static time_t last_timeout  = 0;
 	static int bad_error  = 0;	/* Count of POLL errors */

--- a/usr/src/cmd/ypcmd/ypinit.sh	Sun Dec 28 13:11:10 2014 -0800
+++ b/usr/src/cmd/ypcmd/ypinit.sh	Sun Jan 04 07:19:22 2015 -0800
@@ -19,6 +19,7 @@
 #
 # CDDL HEADER END
 #
+# Copyright 2014 Nexenta Systems, Inc.  All rights reserved.
 #
 # Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
@@ -29,8 +30,6 @@
 # Portions of this source code were derived from Berkeley 4.3 BSD
 # under license from the Regents of the University of California.
 
-#ident	"%Z%%M%	%I%	%E% SMI"
-
 # set -xv
 YPXFR=/usr/lib/netsvc/yp/ypxfr
 MAKEPATH=/usr/ccs/bin
@@ -50,6 +49,7 @@
 master=""
 got_host_list=F
 first_time=T
+non_interactive=F
 exit_on_error=F
 errors_in_setup=F
 
@@ -84,12 +84,13 @@
 # To do cleanup
 trap '/usr/bin/rm -f $hf' 0 1 2 3 15
 
+# Check out total number of arguments
 case $# in
 1)	case $1 in
 	-c)	clientp=T;;
 	-m)	masterp=T;;
 	*)	echo 'usage:'
-		echo '	ypinit -c'
+		echo '	ypinit -c [server_name...]'
 		echo '	ypinit -m'
 		echo '	ypinit -s master_server'
 		echo ""
@@ -111,9 +112,13 @@
 			echo "server not found in $hosts_file or $hosts6_file"
 			exit 1
 		fi;;
-		
+
+	# the case with more than one argument with the '-c' option
+	# is a subject to enter non-interactive mode
+	-c)	clientp=T; non_interactive=T;
+		;;
 	*)	echo 'usage:'
-		echo '	ypinit -c'
+		echo '	ypinit -c [server_name...]'
 		echo '	ypinit -m'
 		echo '	ypinit -s master_server'
 		echo ""
@@ -125,10 +130,14 @@
 master_server must be an existing reachable yp server."
 		exit 1;;
 	esac;;
-3)	case $1 in
-	-c)	clientp=T;;
+*)	case $1 in
+
+	# the case with more than one argument with the '-c' option
+	# is a subject to enter non-interactive mode
+	-c)	clientp=T; non_interactive=T;
+		;;
 	*)	echo 'usage:'
-		echo '	ypinit -c'
+		echo '	ypinit -c [server_name...]'
 		echo '	ypinit -m'
 		echo '	ypinit -s master_server'
 		echo ""
@@ -140,19 +149,6 @@
 master_server must be an existing reachable yp server."
 		exit 1;;
 	esac;;
-
-*)	echo 'usage:'
-	echo '	ypinit -c'
-	echo '	ypinit -m'
-	echo '	ypinit -s master_server'
-	echo ""
-	echo "\
-where -c is used to set up a yp client, -m is used to build a master "
-	echo "\
-yp server data base, and -s is used for a slave data base."
-	echo "\
-master_server must be an existing reachable yp server."
-	exit 1;;
 esac
 
 if [ $? -ne 0 ]
@@ -222,97 +218,114 @@
 
 if [ $slavep = F ]
 then
-	while [ $got_host_list = F ]; do
-		touch $hf    # make sure file exists
-		echo ""
-		echo "\
+	if [ $non_interactive = F ]
+	then
+		while [ $got_host_list = F ]; do
+			touch $hf    # make sure file exists
+			echo ""
+			echo "\
 In order for NIS to operate sucessfully, we have to construct a list of the "
-		echo "\
+			echo "\
 NIS servers.  Please continue to add the names for YP servers in order of"
-		echo "\
+			echo "\
 preference, one per line.  When you are done with the list, type a <control D>"
-		echo "\
+			echo "\
 or a return on a line by itself."
-		if [ $masterp = T ]
-		then
-			echo $host > $hf
-			echo "\tnext host to add:  $host"
-		elif [ -f $binding_file ]
-		then
-			if [ $first_time = T ]
+			if [ $masterp = T ]
+			then
+				echo $host > $hf
+				echo "\tnext host to add:  $host"
+			elif [ -f $binding_file ]
 			then
-				for h in `cat $binding_file`
-				do
-					echo $h >> $hf
-					echo "\tnext host to add:  $h"
-				done
+				if [ $first_time = T ]
+				then
+					for h in `cat $binding_file`
+					do
+						echo $h >> $hf
+						echo "\tnext host to add:  $h"
+					done
+				fi
 			fi
-		fi
+
+			echo  "\tnext host to add:  \c"
 
-		echo  "\tnext host to add:  \c"
+			while read h ; test -n "$h"
+			do
+				#
+				# Host should be in the v4 or v6 hosts file or
+				# reasonably resemble an IP address.  We'll do a
+				# sanity check that a v4 addr is one word consisting
+				# of only numbers and the "." character,
+				# which should guard against fully qualified
+				# hostnames and most malformed entries.  IPv6
+				# addresses can be numbers, hex letters, and have
+				# at least one ":" character and possibly one or
+				# more "." characters for embedded v4 addresses
+				#
+				if ( grep $h $hosts_file $hosts6_file > /dev/null ) || \
+				    ( test $clientp = T && `is_valid_ipaddr $h` )
+				then
+					echo $h >> $hf
+					echo  "\tnext host to add:  \c"
+				else
+					echo "host $h not found in $hosts_file or" \
+					    "$hosts6_file.\nNot added to the list."
+					echo ""
+					echo  "Do you wish to abort [y/n: y]  \c"
+					read cont_ok
+
+					case $cont_ok in
+					n*)	echo "\tnext host to add:  \c";;
+					N*)	echo "\tnext host to add:  \c";;
+					*)	exit 1;;
+					esac
+				fi
+			done
 
-		while read h ; test -n "$h"
-		do
-			#
-			# Host should be in the v4 or v6 hosts file or
-			# reasonably resemble an IP address.  We'll do a
-			# sanity check that a v4 addr is one word consisting
-			# of only numbers and the "." character,
-			# which should guard against fully qualified
-			# hostnames and most malformed entries.  IPv6
-			# addresses can be numbers, hex letters, and have
-			# at least one ":" character and possibly one or
-			# more "." characters for embedded v4 addresses
-			#
-			if ( grep $h $hosts_file $hosts6_file > /dev/null ) || \
-			    ( test $clientp = T && `is_valid_ipaddr $h` )
+			echo ""
+			if [ -s $hf ]
 			then
-				echo $h >> $hf
-				echo  "\tnext host to add:  \c"
+				echo "The current list of yp servers looks like this:"
+				echo ""
+				cat $hf
+				echo ""
+				echo "Is this correct?  [y/n: y]  \c"
 			else
-				echo "host $h not found in $hosts_file or" \
+				echo "You have not added any server information."
+				echo ""
+				echo "Do you still wish to exit? [y/n: y]  \c"
+			fi
+
+			read hlist_ok
+
+			case $hlist_ok in
+			n*)	got_host_list=F
+				first_time=F
+				rm $hf
+				echo "Let's try the whole thing again...";;
+			N*)	got_host_list=F
+				first_time=F
+				rm $hf
+				echo "Let's try the whole thing again...";;
+			*)	got_host_list=T;;
+			esac
+		done
+	else
+		shift
+		> $hf
+		while [[ $# > 0 ]]; do
+			if ( grep $1 $hosts_file $hosts6_file > /dev/null ) || \
+			    ( `is_valid_ipaddr $1` )
+			then
+				echo $1 >> $hf
+			else
+				echo "host $1 not found in $hosts_file or" \
 				    "$hosts6_file.\nNot added to the list."
 				echo ""
-				echo  "Do you wish to abort [y/n: y]  \c"
-				read cont_ok
-
-				case $cont_ok in
-				n*)	echo "\tnext host to add:  \c";;	
-				N*)	echo "\tnext host to add:  \c";;	
-				*)	exit 1;;
-				esac
 			fi
-
+			shift
 		done
-
-		echo ""
-		if [ -s $hf ]
-		then
-			echo "The current list of yp servers looks like this:"
-			echo ""
-			cat $hf
-			echo ""
-			echo "Is this correct?  [y/n: y]  \c"
-		else
-			echo "You have not added any server information."
-			echo ""
-			echo "Do you still wish to exit? [y/n: y]  \c"
-		fi
-
-		read hlist_ok
-
-		case $hlist_ok in
-		n*)	got_host_list=F
-			first_time=F
-			rm $hf
-			echo "Let's try the whole thing again...";;
-		N*)	got_host_list=F
-			first_time=F
-			rm $hf
-			echo "Let's try the whole thing again...";;
-		*)	got_host_list=T;;
-		esac
-	done
+	fi
 
 	if [ -s $hf ]
 	then

--- a/usr/src/cmd/zoneadm/zoneadm.c	Sun Dec 28 13:11:10 2014 -0800
+++ b/usr/src/cmd/zoneadm/zoneadm.c	Sun Jan 04 07:19:22 2015 -0800
@@ -1023,6 +1023,18 @@
 		(void) fprintf(stderr, gettext("%s is not owned by root.\n"),
 		    rpath);
 		err = B_TRUE;
+
+		/* Try to change owner */
+		if (cmd_num != CMD_VERIFY) {
+			(void) fprintf(stderr, gettext("%s: changing owner "
+			    "to root.\n"), rpath);
+			if (chown(rpath, 0, -1) != 0) {
+				zperror(rpath, B_FALSE);
+				return (Z_ERR);
+			} else {
+				err = B_FALSE;
+			}
+		}
 	}
 	err |= bad_mode_bit(stbuf.st_mode, S_IRUSR, B_TRUE, rpath);
 	err |= bad_mode_bit(stbuf.st_mode, S_IWUSR, B_TRUE, rpath);
@@ -1034,6 +1046,17 @@
 	err |= bad_mode_bit(stbuf.st_mode, S_IWOTH, B_FALSE, rpath);
 	err |= bad_mode_bit(stbuf.st_mode, S_IXOTH, B_FALSE, rpath);
 
+	/* If the group perms are wrong, fix them */
+	if (err && (cmd_num != CMD_VERIFY)) {
+		(void) fprintf(stderr, gettext("%s: changing permissions "
+		    "to 0700.\n"), rpath);
+		if (chmod(rpath, S_IRWXU) != 0) {
+			zperror(path, B_FALSE);
+		} else {
+			err = B_FALSE;
+		}
+	}
+
 	(void) snprintf(ppath, sizeof (ppath), "%s/..", path);
 	if ((res = resolvepath(ppath, rppath, sizeof (rppath))) == -1) {
 		zperror(ppath, B_FALSE);

--- a/usr/src/cmd/ztest/ztest.c	Sun Dec 28 13:11:10 2014 -0800
+++ b/usr/src/cmd/ztest/ztest.c	Sun Jan 04 07:19:22 2015 -0800
@@ -3905,7 +3905,7 @@
 		 * assign an arcbuf to a dbuf.
 		 */
 		for (j = 0; j < s; j++) {
-			if (i != 5) {
+			if (i != 5 || chunksize < (SPA_MINBLOCKSIZE * 2)) {
 				bigbuf_arcbufs[j] =
 				    dmu_request_arcbuf(bonus_db, chunksize);
 			} else {
@@ -3929,7 +3929,8 @@
 			umem_free(packbuf, packsize);
 			umem_free(bigbuf, bigsize);
 			for (j = 0; j < s; j++) {
-				if (i != 5) {
+				if (i != 5 ||
+				    chunksize < (SPA_MINBLOCKSIZE * 2)) {
 					dmu_return_arcbuf(bigbuf_arcbufs[j]);
 				} else {
 					dmu_return_arcbuf(
@@ -3973,7 +3974,7 @@
 		}
 		for (off = bigoff, j = 0; j < s; j++, off += chunksize) {
 			dmu_buf_t *dbt;
-			if (i != 5) {
+			if (i != 5 || chunksize < (SPA_MINBLOCKSIZE * 2)) {
 				bcopy((caddr_t)bigbuf + (off - bigoff),
 				    bigbuf_arcbufs[j]->b_data, chunksize);
 			} else {
@@ -3990,7 +3991,7 @@
 				VERIFY(dmu_buf_hold(os, bigobj, off,
 				    FTAG, &dbt, DMU_READ_NO_PREFETCH) == 0);
 			}
-			if (i != 5) {
+			if (i != 5 || chunksize < (SPA_MINBLOCKSIZE * 2)) {
 				dmu_assign_arcbuf(bonus_db, off,
 				    bigbuf_arcbufs[j], tx);
 			} else {

--- a/usr/src/head/netdb.h	Sun Dec 28 13:11:10 2014 -0800
+++ b/usr/src/head/netdb.h	Sun Jan 04 07:19:22 2015 -0800
@@ -131,7 +131,10 @@
 	struct addrinfo *ai_next;	/* next structure in linked list */
 };
 
-
+/*
+ * The flag 0x8000 is currently reserved for private use between libnsl and
+ * libsocket. See lib/libsocket/inet/getaddrinfo.c for more information.
+ */
 /* addrinfo flags */
 #define	AI_PASSIVE	0x0008	/* intended for bind() + listen() */
 #define	AI_CANONNAME	0x0010	/* return canonical version of host */

--- a/usr/src/lib/libcmdutils/Makefile.com	Sun Dec 28 13:11:10 2014 -0800
+++ b/usr/src/lib/libcmdutils/Makefile.com	Sun Jan 04 07:19:22 2015 -0800
@@ -25,7 +25,8 @@
 
 LIBRARY=	libcmdutils.a
 VERS=		.1
-CMD_OBJS=	avltree.o sysattrs.o writefile.o process_xattrs.o uid.o gid.o
+CMD_OBJS=	avltree.o sysattrs.o writefile.o process_xattrs.o uid.o gid.o \
+		custr.o
 COM_OBJS=	list.o
 OBJECTS=	$(CMD_OBJS) $(COM_OBJS)
 

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/lib/libcmdutils/common/custr.c	Sun Jan 04 07:19:22 2015 -0800
@@ -0,0 +1,135 @@
+/*
+ * This file and its contents are supplied under the terms of the
+ * Common Development and Distribution License ("CDDL"), version 1.0.
+ * You may only use this file in accordance with the terms of version
+ * 1.0 of the CDDL.
+ *
+ * A full copy of the text of the CDDL should have accompanied this
+ * source.  A copy of the CDDL is also available via the Internet at
+ * http://www.illumos.org/license/CDDL.
+ */
+
+/*
+ * String utility functions with dynamic memory management.
+ */
+
+/*
+ * Copyright 2014, Joyent, Inc.
+ */
+
+#include <stdlib.h>
+#include <err.h>
+#include <string.h>
+
+#include "libcmdutils.h"
+
+struct custr {
+	size_t cus_strlen;
+	size_t cus_datalen;
+	char *cus_data;
+};
+
+#define	STRING_CHUNK_SIZE	64
+
+void
+custr_reset(custr_t *cus)
+{
+	if (cus->cus_data == NULL)
+		return;
+
+	cus->cus_strlen = 0;
+	cus->cus_data[0] = '\0';
+}
+
+size_t
+custr_len(custr_t *cus)
+{
+	return (cus->cus_strlen);
+}
+
+const char *
+custr_cstr(custr_t *cus)
+{
+	return (cus->cus_data);
+}
+
+int
+custr_appendc(custr_t *cus, char newc)
+{
+	char news[2];
+
+	news[0] = newc;
+	news[1] = '\0';
+
+	return (custr_append(cus, news));
+}
+
+int
+custr_append(custr_t *cus, const char *news)
+{
+	size_t len = strlen(news);
+	size_t chunksz = STRING_CHUNK_SIZE;
+
+	while (chunksz < len) {
+		chunksz *= 2;
+	}
+
+	if (len + cus->cus_strlen + 1 >= cus->cus_datalen) {
+		char *new_data;
+		size_t new_datalen = cus->cus_datalen + chunksz;
+
+		/*
+		 * Allocate replacement memory:
+		 */
+		if ((new_data = malloc(new_datalen)) == NULL) {
+			return (-1);
+		}
+
+		/*
+		 * Copy existing data into replacement memory and free
+		 * the old memory.
+		 */
+		if (cus->cus_data != NULL) {
+			(void) memcpy(new_data, cus->cus_data,
+			    cus->cus_strlen + 1);
+			free(cus->cus_data);
+		}
+
+		/*
+		 * Swap in the replacement buffer:
+		 */
+		cus->cus_data = new_data;
+		cus->cus_datalen = new_datalen;
+	}
+	/*
+	 * Append new string to existing string:
+	 */
+	(void) memcpy(cus->cus_data + cus->cus_strlen, news, len + 1);
+	cus->cus_strlen += len;
+
+	return (0);
+}
+
+int
+custr_alloc(custr_t **cus)
+{
+	custr_t *t;
+
+	if ((t = calloc(1, sizeof (*t))) == NULL) {
+		*cus = NULL;
+		return (-1);
+	}
+
+	*cus = t;
+	return (0);
+}
+
+void
+custr_free(custr_t *cus)
+{
+	if (cus == NULL)
+		return;
+
+	free(cus->cus_data);
+	free(cus);
+}

--- a/usr/src/lib/libcmdutils/common/mapfile-vers	Sun Dec 28 13:11:10 2014 -0800
+++ b/usr/src/lib/libcmdutils/common/mapfile-vers	Sun Jan 04 07:19:22 2015 -0800
@@ -42,6 +42,13 @@
 SYMBOL_VERSION SUNWprivate_1.1 {
     global:
 	add_tnode;
+	custr_alloc;
+	custr_append;
+	custr_appendc;
+	custr_cstr;
+	custr_free;
+	custr_len;
+	custr_reset;
 	destroy_tree;
 	findnextgid;
 	findnextuid;

--- a/usr/src/lib/libcmdutils/libcmdutils.h	Sun Dec 28 13:11:10 2014 -0800
+++ b/usr/src/lib/libcmdutils/libcmdutils.h	Sun Jan 04 07:19:22 2015 -0800
@@ -25,6 +25,9 @@
 /*
  * Copyright (c) 2013 RackTop Systems.
  */
+/*
+ * Copyright 2014 Joyent, Inc.
+ */
 
 /*
  * Declarations for the functions in libcmdutils.
@@ -140,6 +143,46 @@
  */
 extern int findnextgid(gid_t, gid_t, gid_t *);
 
+
+
+		/* dynamic string utilities */
+
+typedef struct custr custr_t;
+
+/*
+ * Allocate and free a "custr_t" dynamic string object.  Returns 0 on success
+ * and -1 otherwise.
+ */
+extern int custr_alloc(custr_t **);
+extern void custr_free(custr_t *);
+
+/*
+ * Append a single character, or a NUL-terminated string of characters, to a
+ * dynamic string.  Returns 0 on success and -1 otherwise.  The dynamic string
+ * will be unmodified if the function returns -1.
+ */
+extern int custr_appendc(custr_t *, char);
+extern int custr_append(custr_t *, const char *);
+
+/*
+ * Determine the length in bytes, not including the NUL terminator, of the
+ * dynamic string.
+ */
+extern size_t custr_len(custr_t *);
+
+/*
+ * Clear the contents of a dynamic string.  Does not free the underlying
+ * memory.
+ */
+extern void custr_reset(custr_t *);
+
+/*
+ * Retrieve a const pointer to a NUL-terminated string version of the contents
+ * of the dynamic string.  Storage for this string should not be freed, and
+ * the pointer will be invalidated by any mutations to the dynamic string.
+ */
+extern const char *custr_cstr(custr_t *str);
+
 #ifdef	__cplusplus
 }
 #endif

--- a/usr/src/lib/libipadm/common/libipadm.c	Sun Dec 28 13:11:10 2014 -0800
+++ b/usr/src/lib/libipadm/common/libipadm.c	Sun Jan 04 07:19:22 2015 -0800
@@ -18,8 +18,10 @@
  *
  * CDDL HEADER END
  */
+
 /*
  * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright 2014 Nexenta Systems, Inc.  All rights reserved.
  */
 
 #include <stdio.h>
@@ -806,14 +808,14 @@
 		status = ipadm_errno2status(err);
 		goto done;
 	}
-	nvlsize = rvalp->ir_nvlsize;
-	nvlbuf = (char *)rvalp + sizeof (ipmgmt_get_rval_t);
 
 	/*
-	 * nvlbuf contains a list of nvlists, each of which represents
-	 * configuration information for the given interface(s)
+	 * Daemon reply pointed to by rvalp contains ipmgmt_get_rval_t structure
+	 * followed by a list of packed nvlists, each of which represents
+	 * configuration information for the given interface(s).
 	 */
-	err = nvlist_unpack(nvlbuf, nvlsize, allifs, NV_ENCODE_NATIVE);
+	err = nvlist_unpack((char *)rvalp + sizeof (ipmgmt_get_rval_t),
+	    rvalp->ir_nvlsize, allifs, NV_ENCODE_NATIVE);
 	if (err != 0)
 		status = ipadm_errno2status(err);
 done:

--- a/usr/src/lib/libndmp/common/libndmp.h	Sun Dec 28 13:11:10 2014 -0800
+++ b/usr/src/lib/libndmp/common/libndmp.h	Sun Jan 04 07:19:22 2015 -0800
@@ -37,6 +37,7 @@
  */
 /* Copyright (c) 2007, The Storage Networking Industry Association. */
 /* Copyright (c) 1996, 1997 PDC, Network Appliance. All Rights Reserved */
+/* Copyright 2014 Nexenta Systems, Inc.  All rights reserved. */
 #ifndef	_LIBNDMP_H
 #define	_LIBNDMP_H
 
@@ -347,11 +348,11 @@
 extern int ndmp_set_dbglevel(int);
 extern const char *ndmp_strerror(int);
 extern int ndmp_door_status(void);
-extern int ndmp_get_prop(char *, char **);
-extern int ndmp_set_prop(char *, char *);
+extern int ndmp_get_prop(const char *, char **);
+extern int ndmp_set_prop(const char *, const char *);
 extern int ndmp_service_refresh(void);
-extern char *ndmp_base64_encode(char *);
-extern char *ndmp_base64_decode(char *);
+extern char *ndmp_base64_encode(const char *);
+extern char *ndmp_base64_decode(const char *);
 extern ndmp_door_ctx_t *ndmp_door_decode_start(char *, int);
 extern int ndmp_door_decode_finish(ndmp_door_ctx_t *);
 extern ndmp_door_ctx_t *ndmp_door_encode_start(char *, int);

--- a/usr/src/lib/libndmp/common/libndmp_base64.c	Sun Dec 28 13:11:10 2014 -0800
+++ b/usr/src/lib/libndmp/common/libndmp_base64.c	Sun Jan 04 07:19:22 2015 -0800
@@ -36,6 +36,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
+/* Copyright 2014 Nexenta Systems, Inc.  All rights reserved. */
 
 #include <stdio.h>
 #include <sys/types.h>
@@ -47,9 +48,6 @@
 #define	NDMP_ENC_LEN	1024
 #define	NDMP_DEC_LEN	256
 
-char *ndmp_base64_encode(char *);
-char *ndmp_base64_decode(char *);
-
 static boolean_t ndmp_is_base64(unsigned char);
 
 static char *b64_data =
@@ -61,9 +59,9 @@
 	return (isalnum(c) || (c == '+') || (c == '/'));
 }
 
-/* caller should use the encloded string and then free the string. */
+/* caller should use the encoded string and then free the string. */
 char *
-ndmp_base64_encode(char *str_to_encode)
+ndmp_base64_encode(const char *str_to_encode)
 {
 	int ret_cnt = 0;
 	int i = 0, j = 0;
@@ -115,7 +113,7 @@
 }
 
 char *
-ndmp_base64_decode(char *encoded_str)
+ndmp_base64_decode(const char *encoded_str)
 {
 	int len = strlen(encoded_str);
 	int i = 0, j = 0;
@@ -136,8 +134,10 @@
 		en_ind++;
 		if (i == 4) {
 			for (i = 0; i < 4; i++) {
-				if ((p = strchr(b64_data, arr_4[i])) == NULL)
+				if ((p = strchr(b64_data, arr_4[i])) == NULL) {
+					free(ret);
 					return (NULL);
+				}
 
 				arr_4[i] = (int)(p - b64_data);
 			}
@@ -161,8 +161,10 @@
 			arr_4[j] = 0;
 
 		for (j = 0; j < 4; j++) {
-			if ((p = strchr(b64_data, arr_4[j])) == NULL)
+			if ((p = strchr(b64_data, arr_4[j])) == NULL) {
+				free(ret);
 				return (NULL);
+			}
 
 			arr_4[j] = (int)(p - b64_data);
 		}

--- a/usr/src/lib/libndmp/common/libndmp_prop.c	Sun Dec 28 13:11:10 2014 -0800
+++ b/usr/src/lib/libndmp/common/libndmp_prop.c	Sun Jan 04 07:19:22 2015 -0800
@@ -75,15 +75,17 @@
 } ndmp_scfhandle_t;
 
 static int ndmp_config_saveenv(ndmp_scfhandle_t *);
-static ndmp_scfhandle_t *ndmp_smf_scf_init(char *);
+static ndmp_scfhandle_t *ndmp_smf_scf_init(const char *);
 static void ndmp_smf_scf_fini(ndmp_scfhandle_t *);
 static int ndmp_smf_start_transaction(ndmp_scfhandle_t *);
 static int ndmp_smf_end_transaction(ndmp_scfhandle_t *);
-static int ndmp_smf_set_property(ndmp_scfhandle_t *, char *, char *);
-static int ndmp_smf_get_property(ndmp_scfhandle_t *, char *, char *, size_t);
-static int ndmp_smf_create_service_pgroup(ndmp_scfhandle_t *, char *);
-static int ndmp_smf_delete_property(ndmp_scfhandle_t *, char *);
-static int ndmp_smf_get_pg_name(ndmp_scfhandle_t *, char *, char **);
+static int ndmp_smf_set_property(ndmp_scfhandle_t *, const char *,
+		const char *);
+static int ndmp_smf_get_property(ndmp_scfhandle_t *, const char *, char *,
+		size_t);
+static int ndmp_smf_create_service_pgroup(ndmp_scfhandle_t *, const char *);
+static int ndmp_smf_delete_property(ndmp_scfhandle_t *, const char *);
+static int ndmp_smf_get_pg_name(ndmp_scfhandle_t *, const char *, char **);
 
 /*
  * This routine send a refresh signal to ndmpd service which cause ndmpd
@@ -105,7 +107,7 @@
  * defined otherwise it would be NULL.
  */
 int
-ndmp_get_prop(char *prop, char **value)
+ndmp_get_prop(const char *prop, char **value)
 {
 	ndmp_scfhandle_t *handle = NULL;
 	char *lval = (char *)malloc(NDMP_PROP_LEN);
@@ -141,7 +143,7 @@
 }
 
 int
-ndmp_set_prop(char *env, char *env_val)
+ndmp_set_prop(const char *env, const char *env_val)
 {
 	ndmp_scfhandle_t *handle = NULL;
 	char *pgname;
@@ -176,7 +178,7 @@
 }
 
 static int
-ndmp_smf_get_pg_name(ndmp_scfhandle_t *h, char *pname, char **pgname)
+ndmp_smf_get_pg_name(ndmp_scfhandle_t *h, const char *pname, char **pgname)
 {
 	scf_value_t *value;
 	scf_property_t *prop;
@@ -250,7 +252,7 @@
  * ndmp_scfhandle_t pointer if success.
  */
 static ndmp_scfhandle_t *
-ndmp_smf_scf_init(char *svc_name)
+ndmp_smf_scf_init(const char *svc_name)
 {
 	ndmp_scfhandle_t *handle;
 
@@ -301,7 +303,7 @@
  * Create a new property group at service level.
  */
 static int
-ndmp_smf_create_service_pgroup(ndmp_scfhandle_t *handle, char *pgroup)
+ndmp_smf_create_service_pgroup(ndmp_scfhandle_t *handle, const char *pgroup)
 {
 	int err;
 
@@ -397,7 +399,7 @@
  * Deletes property in current pg
  */
 static int
-ndmp_smf_delete_property(ndmp_scfhandle_t *handle, char *propname)
+ndmp_smf_delete_property(ndmp_scfhandle_t *handle, const char *propname)
 {
 	scf_transaction_entry_t *entry = NULL;
 
@@ -430,7 +432,7 @@
  */
 static int
 ndmp_smf_set_property(ndmp_scfhandle_t *handle,
-    char *propname, char *valstr)
+    const char *propname, const char *valstr)
 {
 	int ret = 0;
 	scf_value_t *value = NULL;
@@ -516,7 +518,7 @@
  * memory allocated.
  */
 static int
-ndmp_smf_get_property(ndmp_scfhandle_t *handle, char *propname,
+ndmp_smf_get_property(ndmp_scfhandle_t *handle, const char *propname,
     char *valstr, size_t sz)
 {
 	int ret = 0;

--- a/usr/src/lib/libnsl/nss/getipnodeby.c	Sun Dec 28 13:11:10 2014 -0800
+++ b/usr/src/lib/libnsl/nss/getipnodeby.c	Sun Jan 04 07:19:22 2015 -0800
@@ -73,6 +73,8 @@
  * IPNODE_LOOKUPIPNODES	getipnodebyname() needs to lookup the name in ipnodes.
  * IPNODE_LOOKUPHOSTS	getipnodebyname() needs to lookup the name in hosts.
  * IPNODE_ISLITERAL	The name supplied is a literal address string.
+ * IPNODE_UNMAP		The user doesn't want v4 mapped addresses if no IPv6
+ * 			interfaces are plumbed on the system.
  */
 #define	IPNODE_WANTIPV6		0x00000001u
 #define	IPNODE_WANTIPV4		0x00000002u
@@ -80,9 +82,16 @@
 #define	IPNODE_LOOKUPIPNODES	0x00000008u
 #define	IPNODE_LOOKUPHOSTS	0x00000010u
 #define	IPNODE_LITERAL		0x00000020u
+#define	IPNODE_UNMAP		0x00000040u
 #define	IPNODE_IPV4		(IPNODE_WANTIPV4 | IPNODE_IPV4IFNOIPV6)
 
 /*
+ * The private flag between libsocket and libnsl. See
+ * lib/libsocket/inet/getaddrinfo.c for more information.
+ */
+#define	AI_ADDRINFO	0x8000
+
+/*
  * The default set of bits corresponding to a getipnodebyname() flags
  * argument of AI_DEFAULT.
  */
@@ -162,6 +171,10 @@
 			} else if (flags & AI_ALL) {
 				ipnode_bits &= ~IPNODE_IPV4IFNOIPV6;
 			}
+			if ((flags & AI_ADDRCONFIG) && !ipv6configured &&
+			    (flags & AI_ADDRINFO)) {
+				ipnode_bits |= IPNODE_UNMAP;
+			}
 		} else {
 			ipnode_bits &= ~IPNODE_IPV4;
 		}
@@ -343,7 +356,18 @@
 			else if (!(ipnode_bits & IPNODE_WANTIPV6))
 				hp = __filter_addresses(AF_INET6, buf6->result);
 
-			if (hp == NULL)
+			/*
+			 * We've been asked to unmap v4 addresses. This
+			 * situation implies IPNODE_WANTIPV4 and
+			 * !IPNODE_WANTIPV6.
+			 */
+			if (hp != NULL && (ipnode_bits & IPNODE_UNMAP)) {
+				/*
+				 * Just set hp to a new value, cleanup: will
+				 * free the old one
+				 */
+				hp = __mappedtov4(hp, error_num);
+			} else if (hp == NULL)
 				*error_num = NO_ADDRESS;
 		}
 

--- a/usr/src/lib/libsocket/inet/getaddrinfo.c	Sun Dec 28 13:11:10 2014 -0800
+++ b/usr/src/lib/libsocket/inet/getaddrinfo.c	Sun Jan 04 07:19:22 2015 -0800
@@ -69,6 +69,17 @@
 #define	AI_MASK		(AI_PASSIVE | AI_CANONNAME | AI_NUMERICHOST \
 	| AI_ADDRCONFIG | AI_NUMERICSERV | AI_V4MAPPED | AI_ALL)
 #define	ANY		0
+
+/*
+ * This is a private, undocumented, flag that getaddrinfo() uses for
+ * getipnodebyname(). In the case of AI_ADDRCONFIG && AI_V4MAPPED, if there are
+ * no IPv6 addresses, getaddrinfo() should return non-IPv4 mapped addresses. On
+ * the flip side, getipnodebyname() is defined by RFC 2553 to explicitly do so.
+ * Therefore this private flag indicates to getaddrinfo that we shouldn't do
+ * this.
+ */
+#define	AI_ADDRINFO	0x8000
+
 /* function prototypes for used by getaddrinfo() routine */
 static int get_addr(int family, const char *hostname, struct addrinfo *aip,
 	struct addrinfo *cur, ushort_t port, int version);
@@ -602,7 +613,7 @@
 	/* if hostname argument is literal, name service doesn't get called */
 	if (family == PF_UNSPEC) {
 		hp = getipnodebyname(_hostname, AF_INET6, AI_ALL |
-		    aip->ai_flags | AI_V4MAPPED, &errnum);
+		    aip->ai_flags | AI_V4MAPPED | AI_ADDRINFO, &errnum);
 	} else {
 		hp = getipnodebyname(_hostname, family, aip->ai_flags, &errnum);
 	}

--- a/usr/src/lib/libzfs/common/libzfs_iter.c	Sun Dec 28 13:11:10 2014 -0800
+++ b/usr/src/lib/libzfs/common/libzfs_iter.c	Sun Jan 04 07:19:22 2015 -0800
@@ -22,7 +22,7 @@
 /*
  * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2013 by Delphix. All rights reserved.
- * Copyright 2013 Nexenta Systems, Inc.  All rights reserved.
+ * Copyright 2014 Nexenta Systems, Inc.  All rights reserved.
  */
 
 #include <stdio.h>
@@ -186,9 +186,6 @@
 	fnvlist_add_boolean(props, zfs_prop_to_name(ZFS_PROP_CREATETXG));
 	fnvlist_add_boolean(props, zfs_prop_to_name(ZFS_PROP_CREATION));
 
-	/* Allocate an nvlist to hold the bookmarks. */
-	bmarks = fnvlist_alloc();
-
 	if ((err = lzc_get_bookmarks(zhp->zfs_name, props, &bmarks)) != 0)
 		goto out;
 

--- a/usr/src/lib/nsswitch/dns/Makefile.com	Sun Dec 28 13:11:10 2014 -0800
+++ b/usr/src/lib/nsswitch/dns/Makefile.com	Sun Jan 04 07:19:22 2015 -0800
@@ -22,8 +22,6 @@
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
 # lib/nsswitch/dns/Makefile.com
 
 LIBRARY =	libnss_dns.a
@@ -46,5 +44,5 @@
 
 LINTFLAGS +=	-erroff=E_GLOBAL_COULD_BE_STATIC2
 
-LDLIBS +=	-lnsl
+LDLIBS +=	-lnsl -lsocket
 DYNLIB1 =	nss_dns.so$(VERS)

--- a/usr/src/lib/nsswitch/dns/common/dns_common.c	Sun Dec 28 13:11:10 2014 -0800
+++ b/usr/src/lib/nsswitch/dns/common/dns_common.c	Sun Jan 04 07:19:22 2015 -0800
@@ -22,12 +22,19 @@
  * Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
+/*
+ * Copyright (c) 2013, Joyent, Inc.  All rights reserved.
+ */
 
 /*
  *	dns_common.c
  */
 
 #include "dns_common.h"
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <ifaddrs.h>
+#include <net/if.h>
 
 #pragma weak	dn_expand
 #pragma weak	res_ninit
@@ -321,6 +328,51 @@
 	return (NSS_NOTFOUND);
 }
 
+static int
+_nss_has_interfaces(boolean_t *v4, boolean_t *v6)
+{
+	struct ifaddrs *ifp, *i;
+	struct in_addr in4;
+	struct in6_addr in6;
+	const struct in6_addr in6addr_any = IN6ADDR_ANY_INIT;
+
+	*v4 = *v6 = B_FALSE;
+
+	if (getifaddrs(&ifp) != 0)
+		return (-1);
+
+	for (i = ifp; i != NULL; i = i->ifa_next) {
+		if (i->ifa_flags & IFF_LOOPBACK)
+			continue;
+		if ((i->ifa_flags & IFF_UP) == 0)
+			continue;
+
+		if (i->ifa_addr->sa_family == AF_INET) {
+			if (*v4 != B_FALSE)
+				continue;
+
+			if (((struct sockaddr_in *)i->ifa_addr)->
+			    sin_addr.s_addr == INADDR_ANY)
+				continue;
+			*v4 = B_TRUE;
+		}
+
+		if (i->ifa_addr->sa_family == AF_INET6) {
+			if (*v6 != B_FALSE)
+				continue;
+
+			if (memcmp(&in6addr_any,
+			    &((struct sockaddr_in6 *)i->ifa_addr)->sin6_addr,
+			    sizeof (struct in6_addr)) == 0)
+				continue;
+			*v6 = B_TRUE;
+		}
+	}
+
+	freeifaddrs(ifp);
+	return (0);
+}
+
 /*
  * nss_dns_gethost_withttl(void *buffer, size_t bufsize, int ipnode)
  *      nss2 get hosts/ipnodes with ttl backend DNS search engine.
@@ -331,13 +383,6 @@
  * Additionally in the extended results a nssuint_t ttl is placed.
  * This ttl is the lessor of the ttl's extracted from the result.
  *
- * ***Currently the first version of this API only performs simple
- *    single res_nsearch lookups for with T_A or T_AAAA results.
- *    Other searches are deferred to the generic API w/t ttls.
- *
- *    This function is not a generic res_* operation.  It only performs
- *    a single T_A or T_AAAA lookups***
- *
  * RETURNS:  NSS_SUCCESS or NSS_ERROR
  *	If an NSS_ERROR result is returned, nscd is expected
  *	to resubmit the gethosts request using the old style
@@ -384,11 +429,14 @@
 	int		af;
 	char		*ap, *apc;
 	int		hlen = 0, alen, iplen, len, isans;
+	boolean_t	has_v4 = B_FALSE, has_v6 = B_FALSE;
+	int		flags, family, pass2 = 0;
 
 	statp = &stat;
 	(void) memset(statp, '\0', sizeof (struct __res_state));
-	if (res_ninit(statp) == -1)
+	if (res_ninit(statp) == -1) {
 		return (NSS_ERROR);
+	}
 
 	ap = apc = (char *)aliases;
 	alen = 0;
@@ -404,33 +452,152 @@
 		return (NSS_ERROR);
 	}
 
+	/*
+	 * There may be flags set when we are handling ipnode. There are three
+	 * different values for flags:
+	 *
+	 *  o AI_V4MAPPED
+	 *  o AI_ALL
+	 *  o AI_ADDRCONFIG
+	 *
+	 * The first two only have a meaning when af_family is ipv6. The latter
+	 * means something in both cases. These flags are documented in
+	 * getipnodebyname(3SOCKET), though the combinations leave a little
+	 * something to be desired. It would be great if we could actually use
+	 * getipnodebyname directly here since it already knows how to handle
+	 * this kind of logic; however, we're not quite so lucky. Ideally we
+	 * would add such an interface to libresolv.so.2 to handle this kind of
+	 * thing, but that's rather painful as well. We'll summarize what has to
+	 * happen below:
+	 *
+	 * AI_ALL is only meaningful when AI_V4MAPPED is also specified. Both
+	 * are ignored if the family is not AF_INET6
+	 *
+	 * family == AF_INET, flags | AI_ADDRCONFIG
+	 *  - lookup A records iff we have v4 plumbed
+	 * family == AF_INET, !(flags | AI_ADDRCONFIG)
+	 *  - lookup A records
+	 * family == AF_INET6, flags == 0 || flags == AI_ALL
+	 *  - lookup AAAA records
+	 * family == AF_INET6, flags | AI_V4MAPPED
+	 *  - lookup AAAA, if none, lookup A
+	 * family == AF_INET6, flags | AI_ADDRCONFIG
+	 *  - lookup AAAA records if ipv6
+	 * family == AF_INET6, flags | AI_V4MAPPED && flags | AI_ALL
+	 *  - lookup AAAA records, lookup A records
+	 * family == AF_INET6, flags | AI_V4MAPPED && flags | AI_ADDRCONFIG
+	 *  - lookup AAAA records if ipv6
+	 *  - If no AAAA && ipv4 exists, lookup A
+	 * family == AF_INET6, flags | AI_V4MAPPED && flags | AI_ADDRCONFIG &&
+	 * flags | AI_ALL
+	 *  - lookup AAAA records if ipv6
+	 *  - loookup A records if ipv4
+	 */
 	if (ipnode) {
 		/* initially only handle the simple cases */
-		if (arg.key.ipnode.flags != 0) {
-			res_ndestroy(statp);
-			return (NSS_ERROR);
+		name = arg.key.ipnode.name;
+		flags = arg.key.ipnode.flags;
+		family = arg.key.ipnode.af_family;
+		if (flags != 0) {
+			/*
+			 * Figure out our first pass. We'll determine if we need
+			 * to do a second pass afterwards once we successfully
+			 * finish our first pass.
+			 */
+			if ((flags & AI_ADDRCONFIG) != 0) {
+				if (_nss_has_interfaces(&has_v4, &has_v6) !=
+				    0) {
+					res_ndestroy(statp);
+					return (NSS_ERROR);
+				}
+				/* Impossible situations... */
+				if (family == AF_INET && has_v4 == B_FALSE) {
+					res_ndestroy(statp);
+					return (NSS_NOTFOUND);
+				}
+				if (family == AF_INET6 && has_v6 == B_FALSE &&
+				    !(flags & AI_V4MAPPED)) {
+					res_ndestroy(statp);
+					return (NSS_NOTFOUND);
+				}
+				if (family == AF_INET6 && has_v6)
+					qtype = T_AAAA;
+				if (family == AF_INET || (family == AF_INET6 &&
+				    has_v6 == B_FALSE && flags & AI_V4MAPPED))
+					qtype = T_A;
+			} else {
+				has_v4 = has_v6 = B_TRUE;
+				if (family == AF_INET6)
+					qtype = T_AAAA;
+				else
+					qtype = T_A;
+			}
+		} else {
+			if (family == AF_INET6)
+				qtype = T_AAAA;
+			else
+				qtype = T_A;
 		}
-		name = arg.key.ipnode.name;
-		if (arg.key.ipnode.af_family == AF_INET6)
-			qtype = T_AAAA;
-		else
-			qtype = T_A;
 	} else {
 		name = arg.key.name;
 		qtype = T_A;
 	}
+
+searchagain:
 	ret = res_nsearch(statp, name, C_IN, qtype, resbuf.buf, NS_MAXMSG);
 	if (ret == -1) {
-		if (statp->res_h_errno == HOST_NOT_FOUND) {
+		/*
+		 * We want to continue on unless we got NO_RECOVERY. Otherwise,
+		 * HOST_NOT_FOUND, TRY_AGAIN, and NO_DATA all suggest to me that
+		 * we should keep going.
+		 */
+		if (statp->res_h_errno == NO_RECOVERY) {
+			/* else lookup error - handle in general code */
+			res_ndestroy(statp);
+			return (NSS_ERROR);
+		}
+
+		/*
+		 * We found something on our first pass. Make sure that we do
+		 * not clobber this information. This ultimately means that we
+		 * were successful.
+		 */
+		if (pass2 == 2)
+			goto out;
+
+		/*
+		 * If we're on the second pass (eg. we need to check both for A
+		 * and AAAA records), or we were only ever doing a search for
+		 * one type of record and are not supposed to do a second pass,
+		 * then we need to return that we couldn't find anything to the
+		 * user.
+		 */
+		if (pass2 == 1 || flags == 0 || family == AF_INET ||
+		    (family == AF_INET6 && !(flags & AI_V4MAPPED))) {
 			pbuf->p_herrno = HOST_NOT_FOUND;
 			pbuf->p_status = NSS_NOTFOUND;
 			pbuf->data_len = 0;
 			res_ndestroy(statp);
 			return (NSS_NOTFOUND);
 		}
-		/* else lookup error - handle in general code */
-		res_ndestroy(statp);
-		return (NSS_ERROR);
+
+		/*
+		 * If we were only requested to search for flags on an IPv6
+		 * interface or we have no IPv4 interface, we stick to only
+		 * doing a single pass and bail now.
+		 */
+		if ((flags & AI_ADDRCONFIG) && !(flags & AI_ALL) &&
+		    has_v4 == B_FALSE) {
+			pbuf->p_herrno = HOST_NOT_FOUND;
+			pbuf->p_status = NSS_NOTFOUND;
+			pbuf->data_len = 0;
+			res_ndestroy(statp);
+			return (NSS_NOTFOUND);
+		}
+		qtype = T_A;
+		flags = 0;
+		pass2 = 1;
+		goto searchagain;
 	}
 
 	cp = resbuf.buf;
@@ -579,6 +746,16 @@
 		*bptr++ = '\n';
 		blen++;
 	}
+
+	/* Depending on our flags we may need to go back another time. */
+	if (qtype == T_AAAA && family == AF_INET6 &&
+	    ((flags & AI_V4MAPPED) != 0) && ((flags & AI_ALL) != 0) &&
+	    has_v4 == B_TRUE) {
+		qtype = T_A;
+		pass2 = 2; /* Indicate that we found data this pass */
+		goto searchagain;
+	}
+
 	/* Presumably the buffer is now filled. */
 	len = ROUND_UP(blen, sizeof (nssuint_t));
 	/* still room? */
@@ -587,6 +764,7 @@
 		res_ndestroy(statp);
 		return (NSS_ERROR);
 	}
+out:
 	pbuf->ext_off = pbuf->data_off + len;
 	pbuf->ext_len = sizeof (nssuint_t);
 	pbuf->data_len = blen;

--- a/usr/src/lib/pylibbe/common/libbe_py.c	Sun Dec 28 13:11:10 2014 -0800
+++ b/usr/src/lib/pylibbe/common/libbe_py.c	Sun Jan 04 07:19:22 2015 -0800
@@ -857,6 +857,11 @@
 		return (B_FALSE);
 	}
 
+	if (PyDict_SetItemString(*listDict, BE_ATTR_GLOBAL_ACTIVE,
+	    (be->be_global_active ? Py_True : Py_False)) != 0) {
+		return (B_FALSE);
+	}
+
 	if (be->be_space_used != 0) {
 		if (PyDict_SetItemString(*listDict, BE_ATTR_SPACE,
 		    PyLong_FromUnsignedLongLong(be->be_space_used)) != 0) {

--- a/usr/src/man/man1/Makefile	Sun Dec 28 13:11:10 2014 -0800
+++ b/usr/src/man/man1/Makefile	Sun Jan 04 07:19:22 2015 -0800
@@ -180,6 +180,7 @@
 	 	krb5-config.1			\
 	 	ksh93.1				\
 	 	ktutil.1			\
+		kvmstat.1			\
 	 	lari.1				\
 	 	last.1				\
 	 	lastcomm.1			\

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/man/man1/kvmstat.1	Sun Jan 04 07:19:22 2015 -0800
@@ -0,0 +1,118 @@
+.\"
+.\" This file and its contents are supplied under the terms of the
+.\" Common Development and Distribution License ("CDDL"), version 1.0.
+.\" You may only use this file in accordance with the terms of version
+.\" 1.0 of the CDDL.
+.\"
+.\" A full copy of the text of the CDDL should have accompanied this
+.\" source.  A copy of the CDDL is also available via the Internet at
+.\" http://www.illumos.org/license/CDDL.
+.\"
+.\"
+.\" Copyright (c) 2014, Joyent, Inc.
+.\"
+.Dd Dec 20, 2014
+.Dt KVMSTAT 1
+.Os
+.Sh NAME
+.Nm kvmstat
+.Nd report KVM statistics
+.Sh SYNOPSIS
+.Nm kvmstat
+.Oo
+.Ar interval
+.Op Ar count
+.Oc
+.Sh DESCRIPTION
+.Nm
+reports the activity of running KVM virtual machines and their exit activity,
+injected interrupts, emulations, and more, on a per virtual CPU basis.
+.Lp
+.Nm
+should be used when trying to get a rough sense of guest activity from the
+hypervisor's perspective, and allows one to understand from a low-level
+perspective, what kind of activity is going on inside of the virtual machine. In
+addition,
+.Nm
+is useful for diagnosing reports of pathological or faulty behavior inside of
+guests. While there is no expected range of values for the fields displayed as
+that varies with the use of virtual machines, if all of the virtual CPUs for a
+given virtual machine are consistently zero, then that may indicate that a
+problem has occurred, for example, a panic inside of the guest or a bug in the
+hypervisor.
+.Lp
+If no operands are specified, then
+.Nm
+will display statistics every second until the program is terminated.
+.Ss Output Fields
+Every
+.Ar interval
+.Nm
+will report data with the following fields:
+.Bl -tag -width Ds
+.It Nm pid
+Identifier of the process controlling the virtual CPU.
+.It Nm vcpu
+Virtual CPU identifier relative to its virtual machine.
+.It Nm exits
+Count of all virtual machine exits for the virtual CPU over
+.Ar interval .
+.It Nm haltx
+Count of virtual machine exits due to the guest executing the
+.Sy HLT
+instruction for the virtual CPU over
+.Ar interval .
+.It Nm irqx
+Count of virtual machine exits due to a pending external interrupt arriving
+on the physical CPU that the virtual CPU was actively running on over
+.Ar interval .
+.It Nm irqwx
+Count of virtual machine exits due to an open interrupt window on the
+virtual CPU over
+.Ar interval .
+.It Nm iox
+Count of virtual machine exits due to the execution of an I/O instruction,
+such as
+.Sy inb ,
+on the virtual CPU over
+.Ar interval .
+.It Nm mmiox
+Count of virtual machine exits due to performing memory mapped I/O on the
+virtual CPU over
+.Ar interval .
+.It Nm irqs
+Count of interrupts injected into the virtual CPU over
+.Ar interval .
+.It Nm emul
+Count of instructions the hypervisor had to emulate on behalf of the guest
+virtual CPU over
+.Ar interval .
+.It Nm eptv
+Count of extended page table violations serviced on the virtual CPU over
+.Ar interval .
+.El
+.Sh OPERANDS
+The following operands are supported:
+.Bl -hang -width Ds
+.It Ar count
+.Bd -filled -compact
+Specifies the number of times that the statistics are repeated. If not
+specified,
+.Nm
+will continue until it is terminated.
+.Ed
+.It Ar interval
+.Bd -filled -compact
+Specifies the number of seconds between reports of statistics. If not specified,
+reports are generated every second.
+.Ed
+.El
+.Sh STABILITY
+The arguments are
+.Sy committed ,
+while the output format is
+.Sy Not an interface .
+.Sh SEE ALSO
+.Xr iostat 1M ,
+.Xr mpstat 1M ,
+.Xr attributes 5

--- a/usr/src/man/man1/mailx.1	Sun Dec 28 13:11:10 2014 -0800
+++ b/usr/src/man/man1/mailx.1	Sun Jan 04 07:19:22 2015 -0800
@@ -9,7 +9,7 @@
 .\" 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]
-.TH MAILX 1 "Sep 19, 2001"
+.TH MAILX 1 "Dec 18, 2014"
 .SH NAME
 mailx \- interactive message processing system
 .SH SYNOPSIS
@@ -36,7 +36,6 @@
 .fi
 
 .SH DESCRIPTION
-.sp
 .LP
 The mail utilities listed above provide a comfortable, flexible environment for
 sending and receiving mail messages electronically.
@@ -64,7 +63,6 @@
 \fBCommands\fR as in the primary \fBmailbox\fR. This gives rise within these
 pages to the notion of a current \fBmailbox\fR.
 .SH OPTIONS
-.sp
 .LP
 On the command line options start with a dash (\(mi). Any other arguments are
 taken to be destinations (recipients). If no recipients are specified,
@@ -294,7 +292,6 @@
 .RE
 
 .SH OPERANDS
-.sp
 .LP
 The following operands are supported:
 .sp
@@ -308,7 +305,6 @@
 
 .SH USAGE
 .SS "Starting Mail"
-.sp
 .LP
 At startup time, \fBmailx\fR executes the system startup file
 \fB/etc/mail/mailx.rc\fR. If invoked as \fBmail\fR or \fBMail\fR, the system
@@ -380,7 +376,6 @@
 escape character followed by a single command letter and optional arguments.
 See \fBTilde Escapes\fR for a summary of these commands.
 .SS "Reading Mail"
-.sp
 .LP
 Each message is assigned a sequential number, and there is at any time the
 notion of a current message, marked by a right angle bracket (>) in the header
@@ -544,20 +539,23 @@
 shell conventions (see \fBsh\fR(1)). Special characters are recognized by
 certain commands and are documented with the commands below.
 .SS "Sending Mail"
-.sp
 .LP
 Recipients listed on the command line may be of three types: login names, shell
 commands, or alias groups. Login names may be any network address, including
 mixed network addressing. If mail is found to be undeliverable, an attempt is
-made to return it to the sender's \fBmailbox\fR. If the recipient name begins
-with a pipe symbol ( | ), the rest of the name is taken to be a shell command
-to pipe the message through. This provides an automatic interface with any
-program that reads the standard input, such as \fBlp\fR(1) for recording
-outgoing mail on paper. Alias groups are set by the \fBa\fRlias command (see
-\fBCommands\fR below) or in a system startup file (for example,
-\fB$HOME/.mailrc\fR). Aliases are lists of recipients of any type.
+made to return it to the sender's \fBmailbox\fR. If the \fBexpandaddr\fR option
+is not set (the default), then the following rules do not apply and the name of
+the recipient must be a local mailbox or network address. If the recipient name
+begins with a pipe symbol ( | ), the rest of the name is taken to be a shell
+command to pipe the message through. This provides an automatic interface with
+any program that reads the standard input, such as \fBlp\fR(1) for recording
+outgoing mail on paper.
+.sp
+.LP
+Alias groups are set by the \fBa\fRlias command (see \fBCommands\fR below) or in
+a system startup file (for example, \fB$HOME/.mailrc\fR). Aliases are lists of
+recipients of any type.
 .SS "Forwarding Mail"
-.sp
 .LP
 To forward a specific message, include it in a message to the desired
 recipients with the \fB~f\fR or \fB~m\fR tilde escapes. See \fBTilde\fR
@@ -569,7 +567,6 @@
 your mail to a new host by forwarding it to your new address if it is not yet
 listed in the \fBNIS\fR aliases domain.
 .SS "Commands"
-.sp
 .LP
 Regular commands are of the form
 .sp
@@ -768,6 +765,18 @@
 .sp
 .ne 2
 .na
+\fB\fBexpandaddr\fR\fR
+.ad
+.sp .6
+.RS 4n
+Causes recipient addresses to be expanded based on the discussion in the section
+\fBSending Mail\fR. Note that enabling this option allows for addresses that can
+cause arbitrary command execution by starting with the \fB|\fR character.
+.RE
+
+.sp
+.ne 2
+.na
 \fB\fBex\fRit\fR
 .ad
 .br
@@ -1621,7 +1630,6 @@
 .RE
 
 .SS "Tilde Escapes"
-.sp
 .LP
 The following tilde escape commands can be used when composing mail to send.
 These may be entered only from \fIinput mode\fR, by beginning a line with the
@@ -1905,7 +1913,6 @@
 .RE
 
 .SS "Internal Variables"
-.sp
 .LP
 The following variables are internal variables. They may be imported from the
 execution environment or set using the \fBse\fRt command at any time. The
@@ -2539,12 +2546,10 @@
 .RE
 
 .SS "Large File Behavior"
-.sp
 .LP
 See \fBlargefile\fR(5) for the description of the behavior of \fBmailx\fR when
 encountering files greater than or equal to 2 Gbyte ( 2^31 bytes).
 .SH ENVIRONMENT VARIABLES
-.sp
 .LP
 See \fBenviron\fR(5) for descriptions of the following environment variables
 that affect the execution of \fBmailx\fR: \fBHOME\fR, \fBLANG\fR,
@@ -2661,7 +2666,6 @@
 .RE
 
 .SH EXIT STATUS
-.sp
 .LP
 When the \fB-e\fR option is specified, the following exit values are returned:
 .sp
@@ -2706,7 +2710,6 @@
 .RE
 
 .SH FILES
-.sp
 .ne 2
 .na
 \fB\fB$HOME/.mailrc\fR\fR
@@ -2788,7 +2791,6 @@
 .RE
 
 .SH ATTRIBUTES
-.sp
 .LP
 See \fBattributes\fR(5) for descriptions of the following attributes:
 .sp
@@ -2804,7 +2806,6 @@
 .TE
 
 .SH SEE ALSO
-.sp
 .LP
 \fBbiff\fR(1B), \fBecho\fR(1), \fBed\fR(1), \fBex\fR(1), \fBfmt\fR(1),
 \fBlp\fR(1), \fBls\fR(1), \fBmail\fR(1), \fBmail\fR(1B), \fBmailcompat\fR(1),
@@ -2813,7 +2814,6 @@
 \fBpasswd\fR(4), \fBattributes\fR(5), \fBenviron\fR(5), \fBlargefile\fR(5),
 \fBstandards\fR(5)
 .SH NOTES
-.sp
 .LP
 Where \fIshell-command\fR is shown as valid, arguments are not always allowed.
 Experimentation is recommended.

--- a/usr/src/man/man1m/ipf.1m	Sun Dec 28 13:11:10 2014 -0800
+++ b/usr/src/man/man1m/ipf.1m	Sun Jan 04 07:19:22 2015 -0800
@@ -2,19 +2,19 @@
 .\" To view license terms, attribution, and copyright for IP Filter, the default path is /usr/lib/ipf/IPFILTER.LICENCE. If the Solaris operating environment has been installed anywhere other than the default, modify the given path to access the file at the installed
 .\" location.
 .\" Portions Copyright (c) 2009, Sun Microsystems Inc. All Rights Reserved.
-.TH IPF 1M "Feb 25, 2009"
+.\" Portions Copyright (c) 2014, Joyent, Inc. All Rights Reserved.
+.TH IPF 1M "Oct 7, 2014"
 .SH NAME
 ipf \- alter packet filtering lists for IP packet input and output
 .SH SYNOPSIS
 .LP
 .nf
-\fBipf\fR [\fB-6AdDEInoPRrsvVyzZ\fR] [\fB-l\fR block | pass | nomatch]
+\fBipf\fR [\fB-6AdDEGInoPRrsvVyzZ\fR] [\fB-l\fR block | pass | nomatch]
      [\fB-T\fR \fIoptionlist\fR] [\fB-F\fR i | o | a | s | S] \fB-f\fR \fIfilename\fR
-     [\fB-f\fR \fIfilename\fR...]
+     [\fB-f\fR \fIfilename\fR...] [\fIzonename\fR]
 .fi
 
 .SH DESCRIPTION
-.sp
 .LP
 The \fBipf\fR utility is part of a suite of commands associated with the
 Solaris IP Filter feature. See \fBipfilter\fR(5).
@@ -34,7 +34,6 @@
 \fB/dev/ipl\fR, and \fB/dev/ipstate\fR. The default permissions of these files
 require \fBipf\fR to be run as root for all operations.
 .SS "Enabling Solaris IP Filter Feature"
-.sp
 .LP
 Solaris IP Filter is installed with the Solaris operating system. However,
 packet filtering is not enabled by default. Use the following procedure to
@@ -159,7 +158,6 @@
 activated.
 .RE
 .SH OPTIONS
-.sp
 .LP
 The following options are supported:
 .sp
@@ -257,6 +255,17 @@
 .sp
 .ne 2
 .na
+\fB\fB-G\fR\fR
+.ad
+.sp .6
+.RS 4n
+Make changes to the Global Zone-controlled ipfilter for the zone given as an
+argument. See the \fBZONES\fR section for more information.
+.RE
+
+.sp
+.ne 2
+.na
 \fB\fB-I\fR\fR
 .ad
 .sp .6
@@ -459,8 +468,25 @@
 affect fragment or state statistics.
 .RE
 
+.SH ZONES
+.LP
+Each non-global zone has two ipfilter instances: the in-zone ipfilter, which
+can be controlled from both the zone itself and the global zone, and the
+Global Zone-controlled (GZ-controlled) instance, which can only be controlled
+from the Global Zone. The non-global zone is not able to observe or control
+the GZ-controlled ipfilter.
+
+ipf optionally takes a zone name as an argument, which will change the
+ipfilter settings for that zone, rather than the current one. The zonename
+option is only available in the Global Zone. Using it in any other zone will
+return an error. If the \fB-G\fR option is specified with this argument, the
+Global Zone-controlled ipfilter is operated on. If \fB-G\fR is not specified,
+the in-zone ipfilter is operated on. Note that ipf differs from the other
+ipfilter tools in how the zone name is specified. It takes the zone name as the
+last argument, while all of the other tools take the zone name as an argument
+to the \fB-G\fR and \fB-z\fR options.
+
 .SH FILES
-.sp
 .ne 2
 .na
 \fB\fB/dev/ipauth\fR\fR
@@ -499,7 +525,6 @@
 .RE
 
 .SH ATTRIBUTES
-.sp
 .LP
 See \fBattributes\fR(5) for descriptions of the following attributes:
 .sp
@@ -515,16 +540,14 @@
 .TE
 
 .SH SEE ALSO
-.sp
 .LP
 \fBipfstat\fR(1M), \fBipmon\fR(1M), \fBipnat\fR(1M), \fBippool\fR(1M),
 \fBsvcadm\fR(1M), \fBsvc.ipfd\fR(1M), \fBipf\fR(4), \fBipnat.conf\fR(4),
-\fBippool\fR(4), \fBattributes\fR(5), \fBipfilter\fR(5)
+\fBippool\fR(4), \fBattributes\fR(5), \fBipfilter\fR(5), \fBzones(5)\fR
 .sp
 .LP
 \fI\fR
 .SH DIAGNOSTICS
-.sp
 .LP
 Needs to be run as root for the packet filtering lists to actually be affected
 inside the kernel.