5421 devzvol_readdir() needs to be more careful with strchr
Reviewed by: Keith Wesolowski <keith.wesolowski@joyent.com>
Reviewed by: Jerry Jelinek <jerry.jelinek@joyent.com>
Approved by: Dan McDonald <danmcd@omniti.com>
4643 nss_dns fails to obtain dns ttls
Reviewed by: Joshua M. Clulow <jmc@joyent.com>
Reviewed by: Dan McDonald <danmcd@omniti.com>
Reviewed by: Richard Lowe <richlowe@richlowe.net>
Approved by: Gordon Ross <gwr@nexenta.com>
5399 dd writes forver when count=0
Reviewed by: Dale Ghent <daleg@elemental.org>
Reviewed by: Garrett D'Amore <garrett@damore.org>
Approved by: Richard Lowe <richlowe@richlowe.net>
5096 getaddrinfo doesn't properly handle AI_ADDRCONFIG | AI_V4MAPPED
Reviewed by: Dan McDonald <danmcd@omniti.com>
Reviewed by: Jason King <jason.brian.king@gmail.com>
Approved by: Richard Lowe <richlowe@richlowe.net>
5200 ipf_stack_destroy error messages when halting zones
Reviewed by: Robert Mustacchi <rm@joyent.com>
Reviewed by: Igor Kozhukhov <ikozhukhov@gmail.com>
Reviewed by: Dan McDonald <danmcd@omniti.com>
Reviewed by: Darren Reed <darrenr@fastmail.net>
Approved by: Richard Lowe <richlowe@richlowe.net>
5199 "bad pkt state alloc" kstats due to echo replies
Reviewed by: Dan McDonald <danmcd@omniti.com>
Reviewed by: Darren Reed <darrenr@fastmail.net>
Approved by: Richard Lowe <richlowe@richlowe.net>
5198 Want alternate global zone rule set for each ipf netstack
5197 Global zone should be able to manage NGZ ipf state
Reviewed by: Jerry Jelinek <jerry.jelinek@joyent.com>
Reviewed by: Robert Mustacchi <rm@joyent.com>
Reviewed by: Dan McDonald <danmcd@omniti.com>
Reviewed by: Darren Reed <darrenr@fastmail.net>
Approved by: Richard Lowe <richlowe@richlowe.net>
5427 memory leak in libzfs when doing rollback
Reviewed by: Michael Tsymbalyuk <mtzaurus@gmail.com>
Reviewed by: Steven Hartland <killing@multiplay.co.uk>
Approved by: Dan McDonald <danmcd@omniti.com>
	[illumos-gate merge]

commit b7070b7dbcc2758a7f87cefb69ad42887a287152
    5427 memory leak in libzfs when doing rollback
commit 94bdecd9e84ae1042607002db3e64a6849da5874
    5198 Want alternate global zone rule set for each ipf netstack
    5197 Global zone should be able to manage NGZ ipf state
commit c67987612cd8324e1f3d1b5110086552d19a2d89
    5200 ipf_stack_destroy error messages when halting zones
commit 2f443e27e5988131d8b57bec58ee15f9227e0899
    5096 getaddrinfo doesn't properly handle AI_ADDRCONFIG | AI_V4MAPPED
commit e48cae6f8c603e9a18cdb49fdf939cd4e1753e62
    4643 nss_dns fails to obtain dns ttls

Conflicts:
	usr/src/uts/intel/ipf/ipf.global-objs.debug64
	usr/src/uts/common/inet/ipf/solaris.c
	usr/src/uts/common/inet/ipf/netinet/ipf_stack.h
	usr/src/uts/common/inet/ipf/netinet/ip_fil.h
	usr/src/uts/common/inet/ipf/ip_log.c
	usr/src/uts/common/inet/ipf/ip_fil_solaris.c
	usr/src/uts/common/inet/ipf/fil.c
	usr/src/man/man1m/ippool.1m
	usr/src/man/man1m/ipnat.1m
	usr/src/man/man1m/ipf.1m
	usr/src/lib/nsswitch/dns/common/dns_common.c
	usr/src/lib/nsswitch/dns/Makefile.com
	usr/src/lib/libzfs/common/libzfs_iter.c
	usr/src/cmd/ipf/tools/ippool.c
	usr/src/cmd/ipf/tools/ipnat.c
	usr/src/cmd/ipf/tools/ipmon.c
	usr/src/cmd/ipf/tools/ipfzone.c
	usr/src/cmd/ipf/tools/ipfstat.c
	usr/src/cmd/ipf/tools/ipfs.c
	usr/src/cmd/ipf/tools/ipf.c
	usr/src/cmd/ipf/lib/common/load_poolnode.c
	usr/src/cmd/ipf/lib/common/load_pool.c
	usr/src/cmd/ipf/lib/common/load_hashnode.c
	usr/src/cmd/ipf/lib/common/load_hash.c