[illumos-gate merge]

commit e2c8add4a6cefe2fe3a4b140f54561823d493bcc
    5732 nightly.sh should use check-paths.out to be useful for .gitignore
commit b52c8fbe58cfd9f349fdfa6cc5cb6f5731946a2b
    5731 make a clean clobber
commit 58d7f9e61903e78a381912527dc9dacb6e7feddc
    5734 IPFGENITER needs to know when to hit the brakes
commit 546c3aa8e92003d6d783c7172f237b41667539e2
    5733 ipf should only forward when forwarding is enabled
commit a252e0074e35e9003ab1dc3797dccf29ff16ae73
    1152 ping(1M) doesn't mention -D (DONTFRAG) option

15 files changed, 6 insertions, 2 deletions

diff --git a/usr/src/cmd/cmd-inet/usr.sadm/dhcpmgr/com/sun/dhcpmgr/ui/back.gif b/usr/src/cmd/cmd-inet/usr.sadm/dhcpmgr/com/sun/dhcpmgr/ui/back.gif
deleted file mode 100644
index cf4492d4a9..0000000000
--- a/usr/src/cmd/cmd-inet/usr.sadm/dhcpmgr/com/sun/dhcpmgr/ui/back.gif
+++ /dev/null
diff --git a/usr/src/cmd/cmd-inet/usr.sadm/dhcpmgr/com/sun/dhcpmgr/ui/down.gif b/usr/src/cmd/cmd-inet/usr.sadm/dhcpmgr/com/sun/dhcpmgr/ui/down.gif
deleted file mode 100644
index 8f6b6fcb37..0000000000
--- a/usr/src/cmd/cmd-inet/usr.sadm/dhcpmgr/com/sun/dhcpmgr/ui/down.gif
+++ /dev/null
diff --git a/usr/src/cmd/cmd-inet/usr.sadm/dhcpmgr/com/sun/dhcpmgr/ui/next.gif b/usr/src/cmd/cmd-inet/usr.sadm/dhcpmgr/com/sun/dhcpmgr/ui/next.gif
deleted file mode 100644
index 3bc001f36c..0000000000
--- a/usr/src/cmd/cmd-inet/usr.sadm/dhcpmgr/com/sun/dhcpmgr/ui/next.gif
+++ /dev/null
diff --git a/usr/src/cmd/cmd-inet/usr.sadm/dhcpmgr/com/sun/dhcpmgr/ui/up.gif b/usr/src/cmd/cmd-inet/usr.sadm/dhcpmgr/com/sun/dhcpmgr/ui/up.gif
deleted file mode 100644
index 86cbb96df6..0000000000
--- a/usr/src/cmd/cmd-inet/usr.sadm/dhcpmgr/com/sun/dhcpmgr/ui/up.gif
+++ /dev/null
diff --git a/usr/src/cmd/cmd-inet/usr.sadm/dhcpmgr/help/art/bannersmc.gif b/usr/src/cmd/cmd-inet/usr.sadm/dhcpmgr/help/art/bannersmc.gif
deleted file mode 100644
index 7a02477953..0000000000
--- a/usr/src/cmd/cmd-inet/usr.sadm/dhcpmgr/help/art/bannersmc.gif
+++ /dev/null
diff --git a/usr/src/cmd/cmd-inet/usr.sadm/dhcpmgr/help/art/dot1.gif b/usr/src/cmd/cmd-inet/usr.sadm/dhcpmgr/help/art/dot1.gif
deleted file mode 100644
index 726e2105b7..0000000000
--- a/usr/src/cmd/cmd-inet/usr.sadm/dhcpmgr/help/art/dot1.gif
+++ /dev/null
diff --git a/usr/src/cmd/cmd-inet/usr.sadm/dhcpmgr/help/art/dot2.gif b/usr/src/cmd/cmd-inet/usr.sadm/dhcpmgr/help/art/dot2.gif
deleted file mode 100644
index e60df401b0..0000000000
--- a/usr/src/cmd/cmd-inet/usr.sadm/dhcpmgr/help/art/dot2.gif
+++ /dev/null
diff --git a/usr/src/cmd/cmd-inet/usr.sadm/dhcpmgr/help/art/folder.gif b/usr/src/cmd/cmd-inet/usr.sadm/dhcpmgr/help/art/folder.gif
deleted file mode 100644
index 6e5d77cdb2..0000000000
--- a/usr/src/cmd/cmd-inet/usr.sadm/dhcpmgr/help/art/folder.gif
+++ /dev/null
diff --git a/usr/src/cmd/cmd-inet/usr.sadm/dhcpmgr/help/art/macro2.gif b/usr/src/cmd/cmd-inet/usr.sadm/dhcpmgr/help/art/macro2.gif
deleted file mode 100644
index ee1a6d5374..0000000000
--- a/usr/src/cmd/cmd-inet/usr.sadm/dhcpmgr/help/art/macro2.gif
+++ /dev/null
diff --git a/usr/src/cmd/cmd-inet/usr.sadm/dhcpmgr/help/art/macroflow.gif b/usr/src/cmd/cmd-inet/usr.sadm/dhcpmgr/help/art/macroflow.gif
deleted file mode 100644
index 54f0a3c249..0000000000
--- a/usr/src/cmd/cmd-inet/usr.sadm/dhcpmgr/help/art/macroflow.gif
+++ /dev/null
diff --git a/usr/src/cmd/cmd-inet/usr.sadm/dhcpmgr/help/art/tip2.gif b/usr/src/cmd/cmd-inet/usr.sadm/dhcpmgr/help/art/tip2.gif
deleted file mode 100644
index 34f6c24155..0000000000
--- a/usr/src/cmd/cmd-inet/usr.sadm/dhcpmgr/help/art/tip2.gif
+++ /dev/null
diff --git a/usr/src/cmd/cmd-inet/usr.sbin/ping/ping.c b/usr/src/cmd/cmd-inet/usr.sbin/ping/ping.c
index b6f8416623..2146efd67b 100644
--- a/usr/src/cmd/cmd-inet/usr.sbin/ping/ping.c
+++ b/usr/src/cmd/cmd-inet/usr.sbin/ping/ping.c
@@ -2393,7 +2393,7 @@ usage(char *cmdname)
 	Fprintf(stderr, "usage: %s host [timeout]\n", cmdname);
 	Fprintf(stderr,
 /* CSTYLED */
-"usage: %s -s [-l | U] [abdDLnRrv] [-A addr_family] [-c traffic_class]\n\t"
+"usage: %s -s [-l | -U] [-abdDLnRrv] [-A addr_family] [-c traffic_class]\n\t"
 "[-g gateway [-g gateway ...]] [-N nexthop] [-F flow_label] [-I interval]\n\t"
 "[-i interface] [-P tos] [-p port] [-t ttl] host [data_size] [npackets]\n",
 	    cmdname);
diff --git a/usr/src/cmd/dtrace/test/tst/common/Makefile b/usr/src/cmd/dtrace/test/tst/common/Makefile
index efa32d9179..95ada26513 100644
--- a/usr/src/cmd/dtrace/test/tst/common/Makefile
+++ b/usr/src/cmd/dtrace/test/tst/common/Makefile
@@ -83,6 +83,8 @@ json/tst.usdt.o: json/usdt.h
 json/usdt.h: json/usdt.d
 	$(DTRACE) -h -s json/usdt.d -o json/usdt.h
 
+CLOBBERFILES +=	json/usdt.h
+
 json/usdt.o: json/usdt.d json/tst.usdt.o
 	$(COMPILE.d) -o json/usdt.o -s json/usdt.d json/tst.usdt.o
 
diff --git a/usr/src/cmd/mandoc/Makefile b/usr/src/cmd/mandoc/Makefile
index 6d2e3491d9..08cea9764a 100644
--- a/usr/src/cmd/mandoc/Makefile
+++ b/usr/src/cmd/mandoc/Makefile
@@ -24,6 +24,8 @@ ROOTPROGS =	$(ROOTBIN)/mandoc $(ROOTLIB)/mandoc_preconv
 
 OBJS=		$(preconv_OBJS) $(mandoc_OBJS)
 
+CLOBBERFILES +=	$(PROGS)
+
 include		$(SRC)/cmd/Makefile.cmd
 include		$(SRC)/cmd/mandoc/Makefile.common
 
diff --git a/usr/src/cmd/sendmail/aux/Makefile b/usr/src/cmd/sendmail/aux/Makefile
index 5e9b873df3..455879af02 100644
--- a/usr/src/cmd/sendmail/aux/Makefile
+++ b/usr/src/cmd/sendmail/aux/Makefile
@@ -36,7 +36,7 @@ USRSBINPROG=	etrn makemap editmap
 LIBSMTPSMPROG= mailq
 
 # $(PROG) by default
-CLOBBERFILES=	$(LIBPROG) $(USRSBINPROG)
+CLOBBERFILES=	$(LIBPROG) $(USRSBINPROG) $(LIBSMTPSMPROG)
 
 OBJS= 		$(PROG:%=%.o)