diff options
Diffstat (limited to 'usr/src')
19 files changed, 39 insertions, 13 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 Binary files differdeleted 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 Binary files differdeleted 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 Binary files differdeleted 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 Binary files differdeleted 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 Binary files differdeleted 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 Binary files differdeleted 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 Binary files differdeleted 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 Binary files differdeleted 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 Binary files differdeleted 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 Binary files differdeleted 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 Binary files differdeleted 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) diff --git a/usr/src/lib/fm/topo/maps/Joyent,Joyent-Compute-Platform-1101/Makefile b/usr/src/lib/fm/topo/maps/Joyent,Joyent-Compute-Platform-1101/Makefile index 072ea71be7..2127b7c31a 100644 --- a/usr/src/lib/fm/topo/maps/Joyent,Joyent-Compute-Platform-1101/Makefile +++ b/usr/src/lib/fm/topo/maps/Joyent,Joyent-Compute-Platform-1101/Makefile @@ -38,4 +38,6 @@ SRCDIR = ../Joyent,Joyent-Compute-Platform-1101 PLATFORM = Joyent-Compute-Platform-1101 TOPOBASE = ../i86pc/i86pc-hc-topology.xml +CLOBBERFILES += $(TOPOFILE) + include ../Makefile.map diff --git a/usr/src/man/man1m/ping.1m b/usr/src/man/man1m/ping.1m index 6aa5ecc604..4097ca8bb8 100644 --- a/usr/src/man/man1m/ping.1m +++ b/usr/src/man/man1m/ping.1m @@ -4,7 +4,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 PING 1M "Sep 7, 2006" +.TH PING 1M "Feb 20, 2015" .SH NAME ping \- send ICMP (ICMP6) ECHO_REQUEST packets to network hosts .SH SYNOPSIS @@ -15,7 +15,7 @@ ping \- send ICMP (ICMP6) ECHO_REQUEST packets to network hosts .LP .nf -\fB/usr/sbin/ping\fR \fB-s\fR [\fB-l\fR | \fB-U\fR] [\fB-abdlLnrRv\fR] [\fB-A\fR \fIaddr_family\fR] +\fB/usr/sbin/ping\fR \fB-s\fR [\fB-l\fR | \fB-U\fR] [\fB-abdDLnrRv\fR] [\fB-A\fR \fIaddr_family\fR] [\fB-c\fR \fItraffic_class\fR] [\fB-g\fR \fIgateway\fR [\fB-g\fR \fIgateway\fR...]] [\fB-N\fR \fInext_hop_router\fR] [\fB-F\fR \fIflow_label\fR] [\fB-I\fR \fIinterval\fR] [\fB-i\fR \fIinterface\fR] [\fB-P\fR \fItos\fR] [\fB-p\fR \fIport\fR] [\fB-t\fR \fIttl\fR] \fIhost\fR @@ -23,7 +23,6 @@ ping \- send ICMP (ICMP6) ECHO_REQUEST packets to network hosts .fi .SH DESCRIPTION -.sp .LP The utility \fBping\fR utilizes the \fBICMP\fR (\fBICMP6\fR in IPv6) protocol's \fBECHO_REQUEST\fR datagram to elicit an \fBICMP\fR (\fBICMP6\fR) @@ -68,7 +67,6 @@ displays a summary of this information upon termination or timeout. The default When using \fBping\fR for fault isolation, first \fBping\fR the local host to verify that the local network interface is running. .SH OPTIONS -.sp .LP The following options are supported: .sp @@ -100,6 +98,16 @@ host is unknown and exits. .sp .ne 2 .na +\fB\fB-D\fR\fR +.ad +.RS 24n +Don't allow probe packets to be fragmented. If the packet size exceeds the MTU +of a gateway it passes through, the gateway will reject it. +.RE + +.sp +.ne 2 +.na \fB\fB-F\fR\ \fIflow_label\fR\fR .ad .RS 24n @@ -336,7 +344,6 @@ from the target host. .RE .SH OPERANDS -.sp .ne 2 .na \fB\fIhost\fR\fR @@ -389,7 +396,6 @@ This example shows the \fBndd\fR module, \fB/dev/icmp\fR, used to set the .sp .SH EXIT STATUS -.sp .LP The following exit values are returned: .sp @@ -412,7 +418,6 @@ machine was not alive. .RE .SH SEE ALSO -.sp .LP \fBifconfig\fR(1M), \fBin.routed\fR(1M), \fBndd\fR(1M), \fBnetstat\fR(1M), \fBrpcinfo\fR(1M), \fBtraceroute\fR(1M), \fBattributes\fR(5), \fBicmp\fR(7P), diff --git a/usr/src/tools/scripts/nightly.sh b/usr/src/tools/scripts/nightly.sh index f5bce4fb08..9960b97e7d 100644 --- a/usr/src/tools/scripts/nightly.sh +++ b/usr/src/tools/scripts/nightly.sh @@ -2136,9 +2136,9 @@ if [ "$CHECK_PATHS" = y -a "$N_FLAG" != y ]; then >>$mail_msg_file arg=-b [ "$build_ok" = y ] && arg= - checkpaths $arg $checkroot > $SRC/checkpaths.out 2>&1 - if [[ -s $SRC/checkpaths.out ]]; then - tee -a $LOGFILE < $SRC/checkpaths.out >> $mail_msg_file + checkpaths $arg $checkroot > $SRC/check-paths.out 2>&1 + if [[ -s $SRC/check-paths.out ]]; then + tee -a $LOGFILE < $SRC/check-paths.out >> $mail_msg_file build_extras_ok=n fi fi diff --git a/usr/src/uts/common/inet/ipf/ip_nat.c b/usr/src/uts/common/inet/ipf/ip_nat.c index a3c8ecef5e..b556d0983e 100644 --- a/usr/src/uts/common/inet/ipf/ip_nat.c +++ b/usr/src/uts/common/inet/ipf/ip_nat.c @@ -5533,7 +5533,16 @@ ipf_stack_t *ifs; RWLOCK_EXIT(&ifs->ifs_ipf_nat); return EINVAL; } - + + /* + * Note, this loop is based on the number of items that a user + * requested. The user can request any number, potentially far more than + * the number of items that actually exist. If a user does that, we'll + * break out of this by setting the value of count to 1 which terminates + * the loop. This should be fine from an ioctl perspective, because the + * last entry that we insert will be the zero entry which terminates the + * chain. + */ dst = itp->igi_data; for (count = itp->igi_nitems; count > 0; count--) { /* @@ -5594,6 +5603,7 @@ ipf_stack_t *ifs; error = EFAULT; if (t->ipt_data == NULL) { ipf_freetoken(t, ifs); + count = 1; break; } else { if (hm != NULL) { @@ -5603,6 +5613,7 @@ ipf_stack_t *ifs; } if (nexthm->hm_next == NULL) { ipf_freetoken(t, ifs); + count = 1; break; } dst += sizeof(*nexthm); @@ -5617,6 +5628,7 @@ ipf_stack_t *ifs; error = EFAULT; if (t->ipt_data == NULL) { ipf_freetoken(t, ifs); + count = 1; break; } else { if (ipn != NULL) { @@ -5626,6 +5638,7 @@ ipf_stack_t *ifs; } if (nextipnat->in_next == NULL) { ipf_freetoken(t, ifs); + count = 1; break; } dst += sizeof(*nextipnat); @@ -5640,12 +5653,14 @@ ipf_stack_t *ifs; error = EFAULT; if (t->ipt_data == NULL) { ipf_freetoken(t, ifs); + count = 1; break; } else { if (nat != NULL) fr_natderef(&nat, ifs); if (nextnat->nat_next == NULL) { ipf_freetoken(t, ifs); + count = 1; break; } dst += sizeof(*nextnat); |
