svn commit: r231501 - in stable/8/usr.bin: chpass netstat su

Bjoern A. Zeeb bz at FreeBSD.org
Mon Mar 5 17:35:23 UTC 2012


On 11. Feb 2012, at 01:15 , Michael Tuexen wrote:

> Author: tuexen
> Date: Sat Feb 11 01:15:02 2012
> New Revision: 231501
> URL: http://svn.freebsd.org/changeset/base/231501
> 
> Log:
>  MFC r230555:
>  Don't print a warning when using netstat to print
>  SCTP statistics when there is not SCTP in the kernel.
>  This problem was reported by Sean Mahood.
> 
> Modified:
>  stable/8/usr.bin/netstat/sctp.c   (contents, props changed)
> Directory Properties:
>  stable/8/usr.bin/   (props changed)
>  stable/8/usr.bin/apply/   (props changed)
>  stable/8/usr.bin/ar/   (props changed)
>  stable/8/usr.bin/awk/   (props changed)
>  stable/8/usr.bin/biff/   (props changed)
>  stable/8/usr.bin/c89/   (props changed)
>  stable/8/usr.bin/c99/   (props changed)
>  stable/8/usr.bin/calendar/   (props changed)
>  stable/8/usr.bin/catman/   (props changed)
>  stable/8/usr.bin/checknr/   (props changed)
>  stable/8/usr.bin/chpass/Makefile   (props changed)
>  stable/8/usr.bin/column/   (props changed)
>  stable/8/usr.bin/comm/   (props changed)
>  stable/8/usr.bin/compress/   (props changed)
>  stable/8/usr.bin/cpio/   (props changed)
>  stable/8/usr.bin/cpuset/   (props changed)
>  stable/8/usr.bin/csup/   (props changed)
>  stable/8/usr.bin/du/   (props changed)
>  stable/8/usr.bin/ee/   (props changed)
>  stable/8/usr.bin/enigma/   (props changed)
>  stable/8/usr.bin/fetch/   (props changed)
>  stable/8/usr.bin/find/   (props changed)
>  stable/8/usr.bin/finger/   (props changed)
>  stable/8/usr.bin/fold/   (props changed)
>  stable/8/usr.bin/fstat/   (props changed)
>  stable/8/usr.bin/gcore/   (props changed)
>  stable/8/usr.bin/getopt/   (props changed)
>  stable/8/usr.bin/gzip/   (props changed)
>  stable/8/usr.bin/hexdump/   (props changed)
>  stable/8/usr.bin/indent/   (props changed)
>  stable/8/usr.bin/ipcs/   (props changed)
>  stable/8/usr.bin/jot/   (props changed)
>  stable/8/usr.bin/kdump/   (props changed)
>  stable/8/usr.bin/killall/   (props changed)
>  stable/8/usr.bin/ktrace/   (props changed)
>  stable/8/usr.bin/lastcomm/   (props changed)
>  stable/8/usr.bin/ldd/   (props changed)
>  stable/8/usr.bin/less/   (props changed)
>  stable/8/usr.bin/lex/   (props changed)
>  stable/8/usr.bin/limits/   (props changed)
>  stable/8/usr.bin/locale/   (props changed)
>  stable/8/usr.bin/locate/   (props changed)
>  stable/8/usr.bin/lock/   (props changed)
>  stable/8/usr.bin/lockf/   (props changed)
>  stable/8/usr.bin/logger/   (props changed)
>  stable/8/usr.bin/look/   (props changed)
>  stable/8/usr.bin/m4/   (props changed)
>  stable/8/usr.bin/mail/   (props changed)
>  stable/8/usr.bin/make/   (props changed)
>  stable/8/usr.bin/makewhatis/   (props changed)
>  stable/8/usr.bin/minigzip/   (props changed)
>  stable/8/usr.bin/ncal/   (props changed)
>  stable/8/usr.bin/netstat/   (props changed)
>  stable/8/usr.bin/netstat/Makefile   (props changed)
>  stable/8/usr.bin/netstat/atalk.c   (props changed)
>  stable/8/usr.bin/netstat/bpf.c   (props changed)
>  stable/8/usr.bin/netstat/if.c   (props changed)
>  stable/8/usr.bin/netstat/inet.c   (props changed)
>  stable/8/usr.bin/netstat/inet6.c   (props changed)
>  stable/8/usr.bin/netstat/ipsec.c   (props changed)
>  stable/8/usr.bin/netstat/ipx.c   (props changed)
>  stable/8/usr.bin/netstat/main.c   (props changed)
>  stable/8/usr.bin/netstat/mbuf.c   (props changed)
>  stable/8/usr.bin/netstat/mroute.c   (props changed)
>  stable/8/usr.bin/netstat/mroute6.c   (props changed)
>  stable/8/usr.bin/netstat/netgraph.c   (props changed)
>  stable/8/usr.bin/netstat/netisr.c   (props changed)
>  stable/8/usr.bin/netstat/netstat.1   (props changed)
>  stable/8/usr.bin/netstat/netstat.h   (props changed)
>  stable/8/usr.bin/netstat/pfkey.c   (props changed)
>  stable/8/usr.bin/netstat/route.c   (props changed)
>  stable/8/usr.bin/netstat/unix.c   (props changed)

This really splattered a lot of merge-info of stuff.  I noticed doing my own MFC and was quite doh!   Please be more careful in the future.


>  stable/8/usr.bin/newgrp/   (props changed)
>  stable/8/usr.bin/nfsstat/   (props changed)
>  stable/8/usr.bin/pathchk/   (props changed)
>  stable/8/usr.bin/perror/   (props changed)
>  stable/8/usr.bin/printf/   (props changed)
>  stable/8/usr.bin/procstat/   (props changed)
>  stable/8/usr.bin/rlogin/   (props changed)
>  stable/8/usr.bin/rpcgen/   (props changed)
>  stable/8/usr.bin/rpcinfo/   (props changed)
>  stable/8/usr.bin/rs/   (props changed)
>  stable/8/usr.bin/ruptime/   (props changed)
>  stable/8/usr.bin/script/   (props changed)
>  stable/8/usr.bin/sed/   (props changed)
>  stable/8/usr.bin/showmount/   (props changed)
>  stable/8/usr.bin/sockstat/   (props changed)
>  stable/8/usr.bin/split/   (props changed)
>  stable/8/usr.bin/stat/   (props changed)
>  stable/8/usr.bin/su/   (props changed)
>  stable/8/usr.bin/su/Makefile   (props changed)
>  stable/8/usr.bin/su/su.1   (props changed)
>  stable/8/usr.bin/su/su.c   (props changed)
>  stable/8/usr.bin/systat/   (props changed)
>  stable/8/usr.bin/tail/   (props changed)
>  stable/8/usr.bin/tar/   (props changed)
>  stable/8/usr.bin/tftp/   (props changed)
>  stable/8/usr.bin/tip/   (props changed)
>  stable/8/usr.bin/top/   (props changed)
>  stable/8/usr.bin/touch/   (props changed)
>  stable/8/usr.bin/tr/   (props changed)
>  stable/8/usr.bin/truss/   (props changed)
>  stable/8/usr.bin/uname/   (props changed)
>  stable/8/usr.bin/unifdef/   (props changed)
>  stable/8/usr.bin/uniq/   (props changed)
>  stable/8/usr.bin/unzip/   (props changed)
>  stable/8/usr.bin/usbhidaction/   (props changed)
>  stable/8/usr.bin/usbhidctl/   (props changed)
>  stable/8/usr.bin/uudecode/   (props changed)
>  stable/8/usr.bin/vmstat/   (props changed)
>  stable/8/usr.bin/w/   (props changed)
>  stable/8/usr.bin/wall/   (props changed)
>  stable/8/usr.bin/whois/   (props changed)
>  stable/8/usr.bin/xargs/   (props changed)
>  stable/8/usr.bin/xinstall/   (props changed)
>  stable/8/usr.bin/xlint/   (props changed)
>  stable/8/usr.bin/xz/   (props changed)
>  stable/8/usr.bin/yacc/   (props changed)
> 
> Modified: stable/8/usr.bin/netstat/sctp.c
> ==============================================================================
> --- stable/8/usr.bin/netstat/sctp.c	Sat Feb 11 01:13:35 2012	(r231500)
> +++ stable/8/usr.bin/netstat/sctp.c	Sat Feb 11 01:15:02 2012	(r231501)
> @@ -611,7 +611,8 @@ sctp_stats(u_long off, const char *name,
> 			memset(&zerostat, 0, len);
> 		if (sysctlbyname("net.inet.sctp.stats", &sctpstat, &len,
> 		    zflag ? &zerostat : NULL, zflag ? len : 0) < 0) {
> -			warn("sysctl: net.inet.sctp.stats");
> +			if (errno != ENOENT)
> +				warn("sysctl: net.inet.sctp.stats");
> 			return;
> 		}
> 	} else

-- 
Bjoern A. Zeeb                                 You have to have visions!
   It does not matter how good you are. It matters what good you do!



More information about the svn-src-all mailing list