Date: Thu, 7 Jun 2012 22:47:54 +0000 (UTC) From: Attilio Rao <attilio@FreeBSD.org> To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r236726 - in user/attilio/vmcontention: . cddl/contrib/opensolaris/lib/libzfs/common cddl/lib/libdtrace contrib/bind9 contrib/bind9/lib/dns contrib/bsnmp/snmp_mibII gnu/lib/libsupc++ in... Message-ID: <201206072247.q57Mls3e016132@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: attilio Date: Thu Jun 7 22:47:53 2012 New Revision: 236726 URL: http://svn.freebsd.org/changeset/base/236726 Log: MFC Added: user/attilio/vmcontention/cddl/lib/libdtrace/io.d - copied unchanged from r236725, head/cddl/lib/libdtrace/io.d user/attilio/vmcontention/share/man/man4/filemon.4 - copied unchanged from r236725, head/share/man/man4/filemon.4 user/attilio/vmcontention/sys/dev/filemon/ - copied from r236725, head/sys/dev/filemon/ user/attilio/vmcontention/sys/modules/filemon/ - copied from r236725, head/sys/modules/filemon/ user/attilio/vmcontention/tools/regression/filemon/ - copied from r236725, head/tools/regression/filemon/ user/attilio/vmcontention/tools/tools/ifpifa/ - copied from r236725, head/tools/tools/ifpifa/ user/attilio/vmcontention/usr.sbin/pciconf/err.c - copied unchanged from r236725, head/usr.sbin/pciconf/err.c Modified: user/attilio/vmcontention/Makefile.inc1 user/attilio/vmcontention/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c user/attilio/vmcontention/contrib/bind9/CHANGES user/attilio/vmcontention/contrib/bind9/lib/dns/rdata.c user/attilio/vmcontention/contrib/bind9/lib/dns/rdataslab.c user/attilio/vmcontention/contrib/bind9/version user/attilio/vmcontention/contrib/bsnmp/snmp_mibII/mibII_tcp.c user/attilio/vmcontention/gnu/lib/libsupc++/Version.map user/attilio/vmcontention/include/fmtmsg.h user/attilio/vmcontention/kerberos5/Makefile.inc user/attilio/vmcontention/kerberos5/lib/libasn1/Makefile user/attilio/vmcontention/kerberos5/lib/libgssapi_spnego/Makefile user/attilio/vmcontention/kerberos5/lib/libhdb/Makefile user/attilio/vmcontention/kerberos5/lib/libhx509/Makefile user/attilio/vmcontention/kerberos5/lib/libroken/Makefile user/attilio/vmcontention/kerberos5/lib/libvers/Makefile user/attilio/vmcontention/kerberos5/libexec/kdigest/Makefile user/attilio/vmcontention/kerberos5/tools/slc/Makefile user/attilio/vmcontention/kerberos5/usr.bin/hxtool/Makefile user/attilio/vmcontention/kerberos5/usr.bin/kadmin/Makefile user/attilio/vmcontention/kerberos5/usr.bin/kcc/Makefile user/attilio/vmcontention/kerberos5/usr.sbin/iprop-log/Makefile user/attilio/vmcontention/kerberos5/usr.sbin/ktutil/Makefile user/attilio/vmcontention/lib/libc++/Makefile user/attilio/vmcontention/lib/libc/gen/getnetgrent.c user/attilio/vmcontention/lib/libc/gen/posix_spawnattr_getflags.3 user/attilio/vmcontention/lib/libc/include/port_before.h user/attilio/vmcontention/lib/libc/net/getaddrinfo.c user/attilio/vmcontention/lib/libc/stdlib/realpath.c user/attilio/vmcontention/lib/libc/sys/stat.2 user/attilio/vmcontention/lib/libcrypt/crypt.3 user/attilio/vmcontention/lib/libcxxrt/Makefile user/attilio/vmcontention/lib/libelf/elf.3 user/attilio/vmcontention/lib/libelf/elf_begin.3 user/attilio/vmcontention/lib/libelf/gelf.3 user/attilio/vmcontention/lib/libgpib/gpib.3 user/attilio/vmcontention/lib/libgssapi/gss_unwrap.3 user/attilio/vmcontention/lib/libgssapi/gss_wrap.3 user/attilio/vmcontention/lib/libpmc/pmc.3 user/attilio/vmcontention/lib/libprocstat/libprocstat.c user/attilio/vmcontention/lib/librpcsec_gss/rpc_gss_get_error.3 user/attilio/vmcontention/lib/librpcsec_gss/rpc_gss_get_mech_info.3 user/attilio/vmcontention/lib/librpcsec_gss/rpc_gss_get_principal_name.3 user/attilio/vmcontention/lib/librpcsec_gss/rpc_gss_get_versions.3 user/attilio/vmcontention/lib/librpcsec_gss/rpc_gss_getcred.3 user/attilio/vmcontention/lib/librpcsec_gss/rpc_gss_is_installed.3 user/attilio/vmcontention/lib/librpcsec_gss/rpc_gss_max_data_length.3 user/attilio/vmcontention/lib/librpcsec_gss/rpc_gss_mech_to_oid.3 user/attilio/vmcontention/lib/librpcsec_gss/rpc_gss_oid_to_mech.3 user/attilio/vmcontention/lib/librpcsec_gss/rpc_gss_qop_to_num.3 user/attilio/vmcontention/lib/librpcsec_gss/rpc_gss_seccreate.3 user/attilio/vmcontention/lib/librpcsec_gss/rpc_gss_set_callback.3 user/attilio/vmcontention/lib/librpcsec_gss/rpc_gss_set_defaults.3 user/attilio/vmcontention/lib/librpcsec_gss/rpc_gss_set_svc_name.3 user/attilio/vmcontention/lib/librpcsec_gss/rpc_gss_svc_max_data_length.3 user/attilio/vmcontention/lib/libusb/libusb20.3 user/attilio/vmcontention/sbin/camcontrol/camcontrol.8 user/attilio/vmcontention/sbin/camcontrol/camcontrol.c user/attilio/vmcontention/sbin/hastd/primary.c user/attilio/vmcontention/sbin/ifconfig/ifconfig.8 user/attilio/vmcontention/sbin/setkey/setkey.8 user/attilio/vmcontention/share/man/man4/Makefile user/attilio/vmcontention/share/man/man4/acpi_panasonic.4 user/attilio/vmcontention/share/man/man4/ahci.4 user/attilio/vmcontention/share/man/man4/ata.4 user/attilio/vmcontention/share/man/man4/bce.4 user/attilio/vmcontention/share/man/man4/firewire.4 user/attilio/vmcontention/share/man/man4/io.4 user/attilio/vmcontention/share/man/man4/ip.4 user/attilio/vmcontention/share/man/man4/man4.i386/sbni.4 user/attilio/vmcontention/share/man/man4/mps.4 user/attilio/vmcontention/share/man/man4/mpt.4 user/attilio/vmcontention/share/man/man4/mvs.4 user/attilio/vmcontention/share/man/man4/ng_ksocket.4 user/attilio/vmcontention/share/man/man4/run.4 user/attilio/vmcontention/share/man/man4/scsi.4 user/attilio/vmcontention/share/man/man4/siis.4 user/attilio/vmcontention/share/man/man4/snd_hda.4 user/attilio/vmcontention/share/man/man4/usb.4 user/attilio/vmcontention/share/man/man4/vlan.4 user/attilio/vmcontention/share/man/man5/make.conf.5 user/attilio/vmcontention/share/man/man5/rc.conf.5 user/attilio/vmcontention/share/man/man7/development.7 user/attilio/vmcontention/share/man/man9/rwlock.9 user/attilio/vmcontention/share/misc/committers-src.dot user/attilio/vmcontention/share/mk/bsd.sys.mk user/attilio/vmcontention/sys/amd64/acpica/acpi_wakeup.c user/attilio/vmcontention/sys/amd64/amd64/minidump_machdep.c user/attilio/vmcontention/sys/amd64/amd64/pmap.c user/attilio/vmcontention/sys/amd64/include/atomic.h user/attilio/vmcontention/sys/arm/arm/locore.S user/attilio/vmcontention/sys/arm/at91/at91.c user/attilio/vmcontention/sys/arm/at91/at91_machdep.c user/attilio/vmcontention/sys/arm/at91/at91_mci.c user/attilio/vmcontention/sys/arm/at91/at91_pmc.c user/attilio/vmcontention/sys/arm/at91/at91_reset.S user/attilio/vmcontention/sys/arm/at91/at91_spi.c user/attilio/vmcontention/sys/arm/at91/at91_spireg.h user/attilio/vmcontention/sys/arm/at91/at91reg.h user/attilio/vmcontention/sys/arm/at91/at91rm9200.c user/attilio/vmcontention/sys/arm/at91/at91rm92reg.h user/attilio/vmcontention/sys/arm/at91/at91sam9260.c user/attilio/vmcontention/sys/arm/at91/at91sam9g20.c user/attilio/vmcontention/sys/arm/at91/at91var.h user/attilio/vmcontention/sys/arm/conf/ETHERNUT5 user/attilio/vmcontention/sys/arm/econa/econa_machdep.c user/attilio/vmcontention/sys/arm/include/cpu.h user/attilio/vmcontention/sys/arm/mv/mv_machdep.c user/attilio/vmcontention/sys/arm/s3c2xx0/s3c24x0_machdep.c user/attilio/vmcontention/sys/arm/sa11x0/assabet_machdep.c user/attilio/vmcontention/sys/arm/xscale/i80321/ep80219_machdep.c user/attilio/vmcontention/sys/arm/xscale/i80321/iq31244_machdep.c user/attilio/vmcontention/sys/arm/xscale/i8134x/crb_machdep.c user/attilio/vmcontention/sys/arm/xscale/ixp425/avila_machdep.c user/attilio/vmcontention/sys/arm/xscale/pxa/pxa_machdep.c user/attilio/vmcontention/sys/boot/i386/boot2/boot2.c user/attilio/vmcontention/sys/boot/ofw/libofw/ofw_disk.c user/attilio/vmcontention/sys/boot/sparc64/loader/main.c user/attilio/vmcontention/sys/cam/ata/ata_da.c user/attilio/vmcontention/sys/cam/ata/ata_pmp.c user/attilio/vmcontention/sys/cam/ata/ata_xpt.c user/attilio/vmcontention/sys/cam/cam_ccb.h user/attilio/vmcontention/sys/cam/cam_debug.h user/attilio/vmcontention/sys/cam/cam_periph.c user/attilio/vmcontention/sys/cam/cam_xpt.c user/attilio/vmcontention/sys/cam/cam_xpt.h user/attilio/vmcontention/sys/cam/ctl/scsi_ctl.c user/attilio/vmcontention/sys/cam/scsi/scsi_all.c user/attilio/vmcontention/sys/cam/scsi/scsi_all.h user/attilio/vmcontention/sys/cam/scsi/scsi_cd.c user/attilio/vmcontention/sys/cam/scsi/scsi_da.c user/attilio/vmcontention/sys/cam/scsi/scsi_pt.c user/attilio/vmcontention/sys/cam/scsi/scsi_sa.c user/attilio/vmcontention/sys/cam/scsi/scsi_target.c user/attilio/vmcontention/sys/cam/scsi/scsi_xpt.c user/attilio/vmcontention/sys/cddl/dev/dtrace/amd64/dtrace_subr.c user/attilio/vmcontention/sys/cddl/dev/dtrace/i386/dtrace_subr.c user/attilio/vmcontention/sys/conf/NOTES user/attilio/vmcontention/sys/conf/options user/attilio/vmcontention/sys/conf/options.arm user/attilio/vmcontention/sys/contrib/pf/net/pf.c user/attilio/vmcontention/sys/dev/acpica/Osd/OsdSynch.c user/attilio/vmcontention/sys/dev/acpica/acpi.c user/attilio/vmcontention/sys/dev/acpica/acpi_ec.c user/attilio/vmcontention/sys/dev/acpica/acpivar.h user/attilio/vmcontention/sys/dev/ae/if_ae.c user/attilio/vmcontention/sys/dev/ahci/ahci.c user/attilio/vmcontention/sys/dev/aic7xxx/aicasm/Makefile user/attilio/vmcontention/sys/dev/aic7xxx/aicasm/aicasm.c user/attilio/vmcontention/sys/dev/ata/ata-all.c user/attilio/vmcontention/sys/dev/ath/if_ath.c user/attilio/vmcontention/sys/dev/ath/if_ath_misc.h user/attilio/vmcontention/sys/dev/ath/if_ath_rx.c user/attilio/vmcontention/sys/dev/bge/if_bge.c user/attilio/vmcontention/sys/dev/bge/if_bgereg.h user/attilio/vmcontention/sys/dev/e1000/if_igb.c user/attilio/vmcontention/sys/dev/flash/at45d.c user/attilio/vmcontention/sys/dev/isp/isp.c user/attilio/vmcontention/sys/dev/isp/isp_freebsd.c user/attilio/vmcontention/sys/dev/isp/isp_freebsd.h user/attilio/vmcontention/sys/dev/isp/ispvar.h user/attilio/vmcontention/sys/dev/iwn/if_iwn.c user/attilio/vmcontention/sys/dev/ixgbe/ixgbe.c user/attilio/vmcontention/sys/dev/jme/if_jme.c user/attilio/vmcontention/sys/dev/mmc/mmc.c user/attilio/vmcontention/sys/dev/mmc/mmcsd.c user/attilio/vmcontention/sys/dev/mvs/mvs.c user/attilio/vmcontention/sys/dev/siis/siis.c user/attilio/vmcontention/sys/dev/sym/sym_hipd.c user/attilio/vmcontention/sys/dev/usb/usb_device.c user/attilio/vmcontention/sys/dev/usb/usb_generic.c user/attilio/vmcontention/sys/dev/usb/wlan/if_rum.c user/attilio/vmcontention/sys/dev/usb/wlan/if_run.c user/attilio/vmcontention/sys/dev/usb/wlan/if_ural.c user/attilio/vmcontention/sys/fs/nfsclient/nfs_clbio.c user/attilio/vmcontention/sys/geom/multipath/g_multipath.c user/attilio/vmcontention/sys/i386/acpica/acpi_wakeup.c user/attilio/vmcontention/sys/i386/i386/minidump_machdep.c user/attilio/vmcontention/sys/i386/i386/pmap.c user/attilio/vmcontention/sys/i386/include/atomic.h user/attilio/vmcontention/sys/i386/xen/pmap.c user/attilio/vmcontention/sys/ia64/acpica/acpi_wakeup.c user/attilio/vmcontention/sys/kern/init_main.c user/attilio/vmcontention/sys/kern/kern_shutdown.c user/attilio/vmcontention/sys/kern/uipc_syscalls.c user/attilio/vmcontention/sys/kern/vfs_bio.c user/attilio/vmcontention/sys/kern/vfs_subr.c user/attilio/vmcontention/sys/kern/vfs_vnops.c user/attilio/vmcontention/sys/modules/Makefile user/attilio/vmcontention/sys/modules/wpi/Makefile user/attilio/vmcontention/sys/net/bpf.c user/attilio/vmcontention/sys/net/if_tap.c user/attilio/vmcontention/sys/netinet/libalias/libalias.3 user/attilio/vmcontention/sys/netinet/sctp_asconf.c user/attilio/vmcontention/sys/netinet/sctp_input.c user/attilio/vmcontention/sys/netinet/sctp_output.c user/attilio/vmcontention/sys/netinet/sctp_pcb.c user/attilio/vmcontention/sys/netinet/sctputil.c user/attilio/vmcontention/sys/netinet/sctputil.h user/attilio/vmcontention/sys/netinet/tcp_input.c user/attilio/vmcontention/sys/netinet6/in6.c user/attilio/vmcontention/sys/netinet6/ip6_input.c user/attilio/vmcontention/sys/sys/buf.h user/attilio/vmcontention/sys/sys/param.h user/attilio/vmcontention/sys/vm/swap_pager.c user/attilio/vmcontention/sys/x86/x86/dump_machdep.c user/attilio/vmcontention/tools/tools/syscall_timing/syscall_timing.c user/attilio/vmcontention/tools/tools/tinybsd/README user/attilio/vmcontention/usr.bin/find/find.1 user/attilio/vmcontention/usr.bin/gzip/zmore.1 user/attilio/vmcontention/usr.bin/kdump/kdump.1 user/attilio/vmcontention/usr.bin/kdump/kdump.c user/attilio/vmcontention/usr.bin/man/man.conf.5 user/attilio/vmcontention/usr.bin/usbhidctl/usbhidctl.1 user/attilio/vmcontention/usr.sbin/adduser/rmuser.8 user/attilio/vmcontention/usr.sbin/arp/arp.4 user/attilio/vmcontention/usr.sbin/bluetooth/bthidcontrol/bthidcontrol.8 user/attilio/vmcontention/usr.sbin/bluetooth/btpand/btpand.8 user/attilio/vmcontention/usr.sbin/bluetooth/hccontrol/hccontrol.8 user/attilio/vmcontention/usr.sbin/bluetooth/l2control/l2control.8 user/attilio/vmcontention/usr.sbin/bluetooth/sdpcontrol/sdpcontrol.8 user/attilio/vmcontention/usr.sbin/cpucontrol/amd.c user/attilio/vmcontention/usr.sbin/ctladm/ctladm.8 user/attilio/vmcontention/usr.sbin/daemon/daemon.8 user/attilio/vmcontention/usr.sbin/daemon/daemon.c user/attilio/vmcontention/usr.sbin/digictl/digictl.8 user/attilio/vmcontention/usr.sbin/fwcontrol/fwcontrol.8 user/attilio/vmcontention/usr.sbin/gssd/gssd.8 user/attilio/vmcontention/usr.sbin/inetd/inetd.c user/attilio/vmcontention/usr.sbin/inetd/inetd.h user/attilio/vmcontention/usr.sbin/jail/jail.8 user/attilio/vmcontention/usr.sbin/jail/jail.conf.5 user/attilio/vmcontention/usr.sbin/ndiscvt/ndiscvt.8 user/attilio/vmcontention/usr.sbin/newsyslog/newsyslog.8 user/attilio/vmcontention/usr.sbin/pciconf/Makefile user/attilio/vmcontention/usr.sbin/pciconf/cap.c user/attilio/vmcontention/usr.sbin/pciconf/pciconf.8 user/attilio/vmcontention/usr.sbin/pciconf/pciconf.c user/attilio/vmcontention/usr.sbin/pciconf/pciconf.h user/attilio/vmcontention/usr.sbin/pmcstat/pmcstat.8 user/attilio/vmcontention/usr.sbin/pmcstat/pmcstat_log.c user/attilio/vmcontention/usr.sbin/setfib/setfib.1 user/attilio/vmcontention/usr.sbin/syslogd/syslogd.8 Directory Properties: user/attilio/vmcontention/ (props changed) user/attilio/vmcontention/cddl/contrib/opensolaris/ (props changed) user/attilio/vmcontention/contrib/bind9/ (props changed) user/attilio/vmcontention/gnu/lib/ (props changed) user/attilio/vmcontention/lib/libc/ (props changed) user/attilio/vmcontention/sbin/ (props changed) user/attilio/vmcontention/share/man/man4/ (props changed) user/attilio/vmcontention/sys/ (props changed) user/attilio/vmcontention/sys/boot/ (props changed) user/attilio/vmcontention/sys/conf/ (props changed) user/attilio/vmcontention/sys/contrib/pf/ (props changed) user/attilio/vmcontention/usr.sbin/jail/ (props changed) user/attilio/vmcontention/usr.sbin/ndiscvt/ (props changed) Modified: user/attilio/vmcontention/Makefile.inc1 ============================================================================== --- user/attilio/vmcontention/Makefile.inc1 Thu Jun 7 19:48:45 2012 (r236725) +++ user/attilio/vmcontention/Makefile.inc1 Thu Jun 7 22:47:53 2012 (r236726) @@ -242,7 +242,7 @@ BMAKE= MAKEOBJDIRPREFIX=${WORLDTMP} \ SSP_CFLAGS= \ -DWITHOUT_HTML -DWITHOUT_INFO -DNO_LINT -DWITHOUT_MAN \ -DNO_PIC -DNO_PROFILE -DNO_SHARED \ - -DNO_CPU_CFLAGS -DNO_WARNS -DNO_CTF + -DNO_CPU_CFLAGS -DNO_WARNS -DNO_CTF -DEARLY_BUILD # build-tools stage TMAKE= MAKEOBJDIRPREFIX=${OBJTREE} \ @@ -252,7 +252,7 @@ TMAKE= MAKEOBJDIRPREFIX=${OBJTREE} \ BOOTSTRAPPING=${OSRELDATE} \ SSP_CFLAGS= \ -DNO_LINT \ - -DNO_CPU_CFLAGS -DNO_WARNS -DNO_CTF + -DNO_CPU_CFLAGS -DNO_WARNS -DNO_CTF -DEARLY_BUILD # cross-tools stage XMAKE= TOOLS_PREFIX=${WORLDTMP} ${BMAKE} \ @@ -487,7 +487,8 @@ build32: .for _dir in lib/ncurses/ncurses lib/ncurses/ncursesw lib/libmagic cd ${.CURDIR}/${_dir}; \ MAKEOBJDIRPREFIX=${OBJTREE}/lib32 ${MAKE} SSP_CFLAGS= DESTDIR= \ - DIRPRFX=${_dir}/ build-tools + DIRPRFX=${_dir}/ -DNO_LINT -DNO_CPU_CFLAGS -DNO_WARNS -DNO_CTF \ + -DEARLY_BUILD build-tools .endfor cd ${.CURDIR}; \ ${LIB32WMAKE} -f Makefile.inc1 libraries @@ -829,7 +830,7 @@ buildkernel: cd ${KRNLOBJDIR}/${_kernel}; \ PATH=${BPATH}:${PATH} \ MAKESRCPATH=${KERNSRCDIR}/dev/aic7xxx/aicasm \ - ${MAKE} SSP_CFLAGS= -DNO_CPU_CFLAGS -DNO_CTF \ + ${MAKE} SSP_CFLAGS= -DNO_CPU_CFLAGS -DNO_CTF -DEARLY_BUILD \ -f ${KERNSRCDIR}/dev/aic7xxx/aicasm/Makefile # XXX - Gratuitously builds aicasm in the ``makeoptions NO_MODULES'' case. .if !defined(MODULES_WITH_WORLD) && !defined(NO_MODULES) && exists(${KERNSRCDIR}/modules) @@ -837,7 +838,7 @@ buildkernel: cd ${KERNSRCDIR}/modules/aic7xxx/aicasm; \ PATH=${BPATH}:${PATH} \ MAKEOBJDIRPREFIX=${KRNLOBJDIR}/${_kernel}/modules \ - ${MAKE} SSP_CFLAGS= -DNO_CPU_CFLAGS -DNO_CTF ${target} + ${MAKE} SSP_CFLAGS= -DNO_CPU_CFLAGS -DNO_CTF -DEARLY_BUILD ${target} .endfor .endif .if !defined(NO_KERNELDEPEND) Modified: user/attilio/vmcontention/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c ============================================================================== --- user/attilio/vmcontention/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c Thu Jun 7 19:48:45 2012 (r236725) +++ user/attilio/vmcontention/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c Thu Jun 7 22:47:53 2012 (r236726) @@ -23,6 +23,7 @@ * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. * Copyright 2010 Nexenta Systems, Inc. All rights reserved. * Copyright (c) 2011 by Delphix. All rights reserved. + * Copyright (c) 2012 DEY Storage Systems, Inc. All rights reserved. * Copyright (c) 2011-2012 Pawel Jakub Dawidek <pawel@dawidek.net>. * All rights reserved. * Copyright (c) 2012 Martin Matuska <mm@FreeBSD.org>. All rights reserved. @@ -2321,6 +2322,17 @@ zfs_prop_get(zfs_handle_t *zhp, zfs_prop } break; + case ZFS_PROP_GUID: + /* + * GUIDs are stored as numbers, but they are identifiers. + * We don't want them to be pretty printed, because pretty + * printing mangles the ID into a truncated and useless value. + */ + if (get_numeric_property(zhp, prop, src, &source, &val) != 0) + return (-1); + (void) snprintf(propbuf, proplen, "%llu", (u_longlong_t)val); + break; + default: switch (zfs_prop_get_type(prop)) { case PROP_TYPE_NUMBER: Copied: user/attilio/vmcontention/cddl/lib/libdtrace/io.d (from r236725, head/cddl/lib/libdtrace/io.d) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/attilio/vmcontention/cddl/lib/libdtrace/io.d Thu Jun 7 22:47:53 2012 (r236726, copy of r236725, head/cddl/lib/libdtrace/io.d) @@ -0,0 +1,220 @@ +/* + * CDDL HEADER START + * + * 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] + * + * CDDL HEADER END + * + * $FreeBSD$ + */ +/* + * Copyright 2006 Sun Microsystems, Inc. All rights reserved. + * Use is subject to license terms. + */ + +#pragma ident "%Z%%M% %I% %E% SMI" + +#pragma D depends_on module unix +#pragma D depends_on provider io + +inline int B_BUSY = B_BUSY; +#pragma D binding "1.0" B_BUSY +inline int B_DONE = 0x00000200; +#pragma D binding "1.0" B_DONE +inline int B_ERROR = B_ERROR; +#pragma D binding "1.0" B_ERROR +inline int B_PAGEIO = B_PAGEIO; +#pragma D binding "1.0" B_PAGEIO +inline int B_PHYS = B_PHYS; +#pragma D binding "1.0" B_PHYS +inline int B_READ = B_READ; +#pragma D binding "1.0" B_READ +inline int B_WRITE = B_WRITE; +#pragma D binding "1.0" B_WRITE +inline int B_ASYNC = 0x00000004; +#pragma D binding "1.0" B_ASYNC + +typedef struct bufinfo { + int b_flags; /* buffer status */ + size_t b_bcount; /* number of bytes */ + caddr_t b_addr; /* buffer address */ + uint64_t b_lblkno; /* block # on device */ + uint64_t b_blkno; /* expanded block # on device */ + size_t b_resid; /* # of bytes not transferred */ + size_t b_bufsize; /* size of allocated buffer */ + caddr_t b_iodone; /* I/O completion routine */ + int b_error; /* expanded error field */ + dev_t b_edev; /* extended device */ +} bufinfo_t; + +#pragma D binding "1.0" translator +translator bufinfo_t < struct buf *B > { + b_flags = B->b_flags; + b_addr = B->b_un.b_addr; + b_bcount = B->b_bcount; + b_lblkno = B->_b_blkno._f; + b_blkno = sizeof (long) == 8 ? B->_b_blkno._f : B->_b_blkno._p._l; + b_resid = B->b_resid; + b_bufsize = B->b_bufsize; + b_iodone = (caddr_t)B->b_iodone; + b_error = B->b_error; + b_edev = B->b_edev; +}; + +typedef struct devinfo { + int dev_major; /* major number */ + int dev_minor; /* minor number */ + int dev_instance; /* instance number */ + string dev_name; /* name of device */ + string dev_statname; /* name of device + instance/minor */ + string dev_pathname; /* pathname of device */ +} devinfo_t; + +#pragma D binding "1.0" translator +translator devinfo_t < struct buf *B > { + dev_major = B->b_dip != NULL ? getmajor(B->b_edev) : + getmajor(B->b_file->v_vfsp->vfs_dev); + dev_minor = B->b_dip != NULL ? getminor(B->b_edev) : + getminor(B->b_file->v_vfsp->vfs_dev); + dev_instance = B->b_dip == NULL ? + getminor(B->b_file->v_vfsp->vfs_dev) : + ((struct dev_info *)B->b_dip)->devi_instance; + dev_name = B->b_dip == NULL ? "nfs" : + stringof(`devnamesp[getmajor(B->b_edev)].dn_name); + dev_statname = strjoin(B->b_dip == NULL ? "nfs" : + stringof(`devnamesp[getmajor(B->b_edev)].dn_name), + lltostr(B->b_dip == NULL ? getminor(B->b_file->v_vfsp->vfs_dev) : + ((struct dev_info *)B->b_dip)->devi_instance == 0 && + ((struct dev_info *)B->b_dip)->devi_parent != NULL && + ((struct dev_info *)B->b_dip)->devi_parent->devi_node_name == + "pseudo" ? getminor(B->b_edev) : + ((struct dev_info *)B->b_dip)->devi_instance)); + dev_pathname = B->b_dip == NULL ? "<nfs>" : + ddi_pathname(B->b_dip, getminor(B->b_edev)); +}; + +typedef struct fileinfo { + string fi_name; /* name (basename of fi_pathname) */ + string fi_dirname; /* directory (dirname of fi_pathname) */ + string fi_pathname; /* full pathname */ + offset_t fi_offset; /* offset within file */ + string fi_fs; /* filesystem */ + string fi_mount; /* mount point of file system */ + int fi_oflags; /* open(2) flags for file descriptor */ +} fileinfo_t; + +#pragma D binding "1.0" translator +translator fileinfo_t < struct buf *B > { + fi_name = B->b_file == NULL ? "<none>" : + B->b_file->v_path == NULL ? "<unknown>" : + basename(cleanpath(B->b_file->v_path)); + fi_dirname = B->b_file == NULL ? "<none>" : + B->b_file->v_path == NULL ? "<unknown>" : + dirname(cleanpath(B->b_file->v_path)); + fi_pathname = B->b_file == NULL ? "<none>" : + B->b_file->v_path == NULL ? "<unknown>" : + cleanpath(B->b_file->v_path); + fi_offset = B->b_offset; + fi_fs = B->b_file == NULL ? "<none>" : + stringof(B->b_file->v_op->vnop_name); + fi_mount = B->b_file == NULL ? "<none>" : + B->b_file->v_vfsp->vfs_vnodecovered == NULL ? "/" : + B->b_file->v_vfsp->vfs_vnodecovered->v_path == NULL ? "<unknown>" : + cleanpath(B->b_file->v_vfsp->vfs_vnodecovered->v_path); + fi_oflags = 0; +}; + +/* + * The following inline constants can be used to examine fi_oflags when using + * the fds[] array or a translated fileinfo_t. Note that the various open + * flags behave as a bit-field *except* for O_RDONLY, O_WRONLY, and O_RDWR. + * To test the open mode, you write code similar to that used with the fcntl(2) + * F_GET[X]FL command, such as: if ((fi_oflags & O_ACCMODE) == O_WRONLY). + */ +inline int O_ACCMODE = 0x0003; +#pragma D binding "1.1" O_ACCMODE + +inline int O_RDONLY = 0x0000; +#pragma D binding "1.1" O_RDONLY +inline int O_WRONLY = 0x0001; +#pragma D binding "1.1" O_WRONLY +inline int O_RDWR = 0x0002; +#pragma D binding "1.1" O_RDWR + +inline int O_APPEND = 0x0008; +#pragma D binding "1.1" O_APPEND +inline int O_CREAT = 0x0200; +#pragma D binding "1.1" O_CREAT +inline int O_DSYNC = O_DSYNC; +#pragma D binding "1.1" O_DSYNC +inline int O_EXCL = 0x0800; +#pragma D binding "1.1" O_EXCL +inline int O_LARGEFILE = O_LARGEFILE; +#pragma D binding "1.1" O_LARGEFILE +inline int O_NOCTTY = 0x8000; +#pragma D binding "1.1" O_NOCTTY +inline int O_NONBLOCK = 0x0004; +#pragma D binding "1.1" O_NONBLOCK +inline int O_NDELAY = 0x0004; +#pragma D binding "1.1" O_NDELAY +inline int O_RSYNC = O_RSYNC; +#pragma D binding "1.1" O_RSYNC +inline int O_SYNC = 0x0080; +#pragma D binding "1.1" O_SYNC +inline int O_TRUNC = 0x0400; +#pragma D binding "1.1" O_TRUNC +inline int O_XATTR = O_XATTR; +#pragma D binding "1.1" O_XATTR + +#pragma D binding "1.1" translator +translator fileinfo_t < struct file *F > { + fi_name = F == NULL ? "<none>" : + F->f_vnode->v_path == NULL ? "<unknown>" : + basename(cleanpath(F->f_vnode->v_path)); + fi_dirname = F == NULL ? "<none>" : + F->f_vnode->v_path == NULL ? "<unknown>" : + dirname(cleanpath(F->f_vnode->v_path)); + fi_pathname = F == NULL ? "<none>" : + F->f_vnode->v_path == NULL ? "<unknown>" : + cleanpath(F->f_vnode->v_path); + fi_offset = F == NULL ? 0 : F->f_offset; + fi_fs = F == NULL ? "<none>" : stringof(F->f_vnode->v_op->vnop_name); + fi_mount = F == NULL ? "<none>" : + F->f_vnode->v_vfsp->vfs_vnodecovered == NULL ? "/" : + F->f_vnode->v_vfsp->vfs_vnodecovered->v_path == NULL ? "<unknown>" : + cleanpath(F->f_vnode->v_vfsp->vfs_vnodecovered->v_path); + fi_oflags = F == NULL ? 0 : F->f_flag + (int)FOPEN; +}; + +inline fileinfo_t fds[int fd] = xlate <fileinfo_t> ( + fd >= 0 && fd < curthread->t_procp->p_user.u_finfo.fi_nfiles ? + curthread->t_procp->p_user.u_finfo.fi_list[fd].uf_file : NULL); + +#pragma D attributes Stable/Stable/Common fds +#pragma D binding "1.1" fds + +#pragma D binding "1.2" translator +translator fileinfo_t < struct vnode *V > { + fi_name = V->v_path == NULL ? "<unknown>" : + basename(cleanpath(V->v_path)); + fi_dirname = V->v_path == NULL ? "<unknown>" : + dirname(cleanpath(V->v_path)); + fi_pathname = V->v_path == NULL ? "<unknown>" : cleanpath(V->v_path); + fi_fs = stringof(V->v_op->vnop_name); + fi_mount = V->v_vfsp->vfs_vnodecovered == NULL ? "/" : + V->v_vfsp->vfs_vnodecovered->v_path == NULL ? "<unknown>" : + cleanpath(V->v_vfsp->vfs_vnodecovered->v_path); +}; Modified: user/attilio/vmcontention/contrib/bind9/CHANGES ============================================================================== --- user/attilio/vmcontention/contrib/bind9/CHANGES Thu Jun 7 19:48:45 2012 (r236725) +++ user/attilio/vmcontention/contrib/bind9/CHANGES Thu Jun 7 22:47:53 2012 (r236726) @@ -1,3 +1,8 @@ + --- 9.8.3-P1 released --- + +3331. [security] dns_rdataslab_fromrdataset could produce bad + rdataslabs. [RT #29644] + --- 9.8.3 released --- 3318. [tuning] Reduce the amount of work performed while holding a Modified: user/attilio/vmcontention/contrib/bind9/lib/dns/rdata.c ============================================================================== --- user/attilio/vmcontention/contrib/bind9/lib/dns/rdata.c Thu Jun 7 19:48:45 2012 (r236725) +++ user/attilio/vmcontention/contrib/bind9/lib/dns/rdata.c Thu Jun 7 22:47:53 2012 (r236726) @@ -329,8 +329,8 @@ dns_rdata_compare(const dns_rdata_t *rda REQUIRE(rdata1 != NULL); REQUIRE(rdata2 != NULL); - REQUIRE(rdata1->data != NULL); - REQUIRE(rdata2->data != NULL); + REQUIRE(rdata1->length == 0 || rdata1->data != NULL); + REQUIRE(rdata2->length == 0 || rdata2->data != NULL); REQUIRE(DNS_RDATA_VALIDFLAGS(rdata1)); REQUIRE(DNS_RDATA_VALIDFLAGS(rdata2)); @@ -360,8 +360,8 @@ dns_rdata_casecompare(const dns_rdata_t REQUIRE(rdata1 != NULL); REQUIRE(rdata2 != NULL); - REQUIRE(rdata1->data != NULL); - REQUIRE(rdata2->data != NULL); + REQUIRE(rdata1->length == 0 || rdata1->data != NULL); + REQUIRE(rdata2->length == 0 || rdata2->data != NULL); REQUIRE(DNS_RDATA_VALIDFLAGS(rdata1)); REQUIRE(DNS_RDATA_VALIDFLAGS(rdata2)); Modified: user/attilio/vmcontention/contrib/bind9/lib/dns/rdataslab.c ============================================================================== --- user/attilio/vmcontention/contrib/bind9/lib/dns/rdataslab.c Thu Jun 7 19:48:45 2012 (r236725) +++ user/attilio/vmcontention/contrib/bind9/lib/dns/rdataslab.c Thu Jun 7 22:47:53 2012 (r236726) @@ -126,6 +126,11 @@ isc_result_t dns_rdataslab_fromrdataset(dns_rdataset_t *rdataset, isc_mem_t *mctx, isc_region_t *region, unsigned int reservelen) { + /* + * Use &removed as a sentinal pointer for duplicate + * rdata as rdata.data == NULL is valid. + */ + static unsigned char removed; struct xrdata *x; unsigned char *rawbuf; #if DNS_RDATASET_FIXED @@ -169,6 +174,7 @@ dns_rdataslab_fromrdataset(dns_rdataset_ INSIST(result == ISC_R_SUCCESS); dns_rdata_init(&x[i].rdata); dns_rdataset_current(rdataset, &x[i].rdata); + INSIST(x[i].rdata.data != &removed); #if DNS_RDATASET_FIXED x[i].order = i; #endif @@ -201,8 +207,7 @@ dns_rdataslab_fromrdataset(dns_rdataset_ */ for (i = 1; i < nalloc; i++) { if (compare_rdata(&x[i-1].rdata, &x[i].rdata) == 0) { - x[i-1].rdata.data = NULL; - x[i-1].rdata.length = 0; + x[i-1].rdata.data = &removed; #if DNS_RDATASET_FIXED /* * Preserve the least order so A, B, A -> A, B @@ -292,7 +297,7 @@ dns_rdataslab_fromrdataset(dns_rdataset_ #endif for (i = 0; i < nalloc; i++) { - if (x[i].rdata.data == NULL) + if (x[i].rdata.data == &removed) continue; #if DNS_RDATASET_FIXED offsettable[x[i].order] = rawbuf - offsetbase; Modified: user/attilio/vmcontention/contrib/bind9/version ============================================================================== --- user/attilio/vmcontention/contrib/bind9/version Thu Jun 7 19:48:45 2012 (r236725) +++ user/attilio/vmcontention/contrib/bind9/version Thu Jun 7 22:47:53 2012 (r236726) @@ -6,5 +6,5 @@ MAJORVER=9 MINORVER=8 PATCHVER=3 -RELEASETYPE= -RELEASEVER= +RELEASETYPE=-P +RELEASEVER=1 Modified: user/attilio/vmcontention/contrib/bsnmp/snmp_mibII/mibII_tcp.c ============================================================================== --- user/attilio/vmcontention/contrib/bsnmp/snmp_mibII/mibII_tcp.c Thu Jun 7 19:48:45 2012 (r236725) +++ user/attilio/vmcontention/contrib/bsnmp/snmp_mibII/mibII_tcp.c Thu Jun 7 22:47:53 2012 (r236726) @@ -109,10 +109,12 @@ fetch_tcp(void) ptr = (struct xinpgen *)(void *)((char *)ptr + ptr->xig_len)) { tp = (struct xtcpcb *)ptr; if (tp->xt_inp.inp_gencnt > xinpgen->xig_gen || - (tp->xt_inp.inp_vflag & INP_IPV4) == 0) + (tp->xt_inp.inp_vflag & (INP_IPV4|INP_IPV6)) == 0) continue; - tcp_total++; + if (tp->xt_inp.inp_vflag & INP_IPV4) + tcp_total++; + if (tp->xt_tp.t_state == TCPS_ESTABLISHED || tp->xt_tp.t_state == TCPS_CLOSE_WAIT) tcp_count++; Modified: user/attilio/vmcontention/gnu/lib/libsupc++/Version.map ============================================================================== --- user/attilio/vmcontention/gnu/lib/libsupc++/Version.map Thu Jun 7 19:48:45 2012 (r236725) +++ user/attilio/vmcontention/gnu/lib/libsupc++/Version.map Thu Jun 7 22:47:53 2012 (r236726) @@ -126,11 +126,19 @@ CXXABI_1.3 { # __gnu_cxx::_verbose_terminate_handler() _ZN9__gnu_cxx27__verbose_terminate_handlerEv; - # new / delete operators + # operator new and new[], 32-bit size_t _Znaj; _ZnajRKSt9nothrow_t; _Znwj; _ZnwjRKSt9nothrow_t; + + # operator new and new[], 64-bit size_t + _Znam; + _ZnamRKSt9nothrow_t; + _Znwm; + _ZnwmRKSt9nothrow_t; + + # operator delete and delete[] _ZdaPv; _ZdaPvRKSt9nothrow_t; _ZdlPv; Modified: user/attilio/vmcontention/include/fmtmsg.h ============================================================================== --- user/attilio/vmcontention/include/fmtmsg.h Thu Jun 7 19:48:45 2012 (r236725) +++ user/attilio/vmcontention/include/fmtmsg.h Thu Jun 7 22:47:53 2012 (r236726) @@ -32,7 +32,7 @@ /* Source of condition is... */ #define MM_HARD 0x0001 /* ...hardware. */ #define MM_SOFT 0x0002 /* ...software. */ -#define MM_FIRM 0x0004 /* ...fireware. */ +#define MM_FIRM 0x0004 /* ...firmware. */ /* Condition detected by... */ #define MM_APPL 0x0010 /* ...application. */ Modified: user/attilio/vmcontention/kerberos5/Makefile.inc ============================================================================== --- user/attilio/vmcontention/kerberos5/Makefile.inc Thu Jun 7 19:48:45 2012 (r236725) +++ user/attilio/vmcontention/kerberos5/Makefile.inc Thu Jun 7 22:47:53 2012 (r236726) @@ -46,3 +46,7 @@ CLEANFILES+= ${_ET}.h ${_ET}.c .endfor .endif # defined(SRCS) + +ASN1_COMPILE= asn1_compile +MAKE_ROKEN= make-roken +SLC= slc Modified: user/attilio/vmcontention/kerberos5/lib/libasn1/Makefile ============================================================================== --- user/attilio/vmcontention/kerberos5/lib/libasn1/Makefile Thu Jun 7 19:48:45 2012 (r236725) +++ user/attilio/vmcontention/kerberos5/lib/libasn1/Makefile Thu Jun 7 22:47:53 2012 (r236726) @@ -56,8 +56,6 @@ INCS+= krb5_asn1.h \ digest_asn1.h \ kx509_asn1.h -ASN1_COMPILE= asn1_compile - ${GEN_CMS}: cms.asn1 cms.opt ${ASN1_COMPILE} --one-code-file \ --option-file=${.ALLSRC:M*.opt} ${.ALLSRC:M*.asn1} cms_asn1 Modified: user/attilio/vmcontention/kerberos5/lib/libgssapi_spnego/Makefile ============================================================================== --- user/attilio/vmcontention/kerberos5/lib/libgssapi_spnego/Makefile Thu Jun 7 19:48:45 2012 (r236725) +++ user/attilio/vmcontention/kerberos5/lib/libgssapi_spnego/Makefile Thu Jun 7 22:47:53 2012 (r236726) @@ -38,8 +38,6 @@ CFLAGS+=-I${KRB5DIR}/lib/roken -I. CLEANFILES= ${GEN} ${GEN:S/.x$/.c/:S/.hx$/.h/} \ spnego_asn1_files spnego_asn1-template.c -ASN1_COMPILE= asn1_compile - ${GEN}: spnego.asn1 spnego.opt ${ASN1_COMPILE} --option-file=${.ALLSRC:M*.opt} \ ${.ALLSRC:M*.asn1} spnego_asn1 Modified: user/attilio/vmcontention/kerberos5/lib/libhdb/Makefile ============================================================================== --- user/attilio/vmcontention/kerberos5/lib/libhdb/Makefile Thu Jun 7 19:48:45 2012 (r236725) +++ user/attilio/vmcontention/kerberos5/lib/libhdb/Makefile Thu Jun 7 22:47:53 2012 (r236726) @@ -84,8 +84,6 @@ GEN= asn1_Salt.x \ CLEANFILES= ${GEN} ${GEN:S/.x$/.c/:S/.hx$/.h/} hdb_asn1_files \ hdb_asn1-template.[ch]* -ASN1_COMPILE= asn1_compile - ${GEN}: hdb.asn1 ${ASN1_COMPILE} ${.ALLSRC:M*.asn1} hdb_asn1 Modified: user/attilio/vmcontention/kerberos5/lib/libhx509/Makefile ============================================================================== --- user/attilio/vmcontention/kerberos5/lib/libhx509/Makefile Thu Jun 7 19:48:45 2012 (r236725) +++ user/attilio/vmcontention/kerberos5/lib/libhx509/Makefile Thu Jun 7 22:47:53 2012 (r236726) @@ -269,8 +269,6 @@ CLEANFILES= ${GEN} ${GEN:S/.x$/.c/:S/.hx INCS+= ocsp_asn1.h pkcs10_asn1.h crmf_asn1.h -ASN1_COMPILE= asn1_compile - ${GEN_OCSP}: ocsp.asn1 ocsp.opt ${ASN1_COMPILE} --option-file=${.ALLSRC:M*.opt} \ ${.ALLSRC:M*.asn1} ocsp_asn1 Modified: user/attilio/vmcontention/kerberos5/lib/libroken/Makefile ============================================================================== --- user/attilio/vmcontention/kerberos5/lib/libroken/Makefile Thu Jun 7 19:48:45 2012 (r236725) +++ user/attilio/vmcontention/kerberos5/lib/libroken/Makefile Thu Jun 7 22:47:53 2012 (r236726) @@ -82,8 +82,6 @@ CFLAGS+=-I${KRB5DIR}/lib/roken -I. CLEANFILES= roken.h -MAKE_ROKEN= make-roken - roken.h: ${MAKE_ROKEN} > ${.TARGET} Modified: user/attilio/vmcontention/kerberos5/lib/libvers/Makefile ============================================================================== --- user/attilio/vmcontention/kerberos5/lib/libvers/Makefile Thu Jun 7 19:48:45 2012 (r236725) +++ user/attilio/vmcontention/kerberos5/lib/libvers/Makefile Thu Jun 7 22:47:53 2012 (r236726) @@ -7,8 +7,6 @@ CFLAGS+=-I. -I${KRB5DIR}/lib/roken CLEANFILES= roken.h -MAKE_ROKEN= make-roken - roken.h: ${MAKE_ROKEN} > ${.TARGET} Modified: user/attilio/vmcontention/kerberos5/libexec/kdigest/Makefile ============================================================================== --- user/attilio/vmcontention/kerberos5/libexec/kdigest/Makefile Thu Jun 7 19:48:45 2012 (r236725) +++ user/attilio/vmcontention/kerberos5/libexec/kdigest/Makefile Thu Jun 7 22:47:53 2012 (r236726) @@ -14,7 +14,7 @@ SRCS= kdigest.c \ kdigest-commands.h kdigest-commands.h: kdigest-commands.in - slc ${.ALLSRC:M*.in} + ${SLC} ${.ALLSRC:M*.in} .for ext in c o kdigest-commands.${ext}: kdigest-commands.h Modified: user/attilio/vmcontention/kerberos5/tools/slc/Makefile ============================================================================== --- user/attilio/vmcontention/kerberos5/tools/slc/Makefile Thu Jun 7 19:48:45 2012 (r236725) +++ user/attilio/vmcontention/kerberos5/tools/slc/Makefile Thu Jun 7 22:47:53 2012 (r236726) @@ -15,7 +15,7 @@ CFLAGS+=-I${KRB5DIR}/lib/roken -I${KRB5D CLEANFILES= roken.h roken.h: - make-roken > ${.TARGET} + ${MAKE_ROKEN} > ${.TARGET} # ${.OBJDIR}/../make-roken/make-roken > ${.TARGET} Modified: user/attilio/vmcontention/kerberos5/usr.bin/hxtool/Makefile ============================================================================== --- user/attilio/vmcontention/kerberos5/usr.bin/hxtool/Makefile Thu Jun 7 19:48:45 2012 (r236725) +++ user/attilio/vmcontention/kerberos5/usr.bin/hxtool/Makefile Thu Jun 7 22:47:53 2012 (r236726) @@ -11,7 +11,7 @@ LDADD= -lhx509 -lroken -lasn1 -lcrypto - SRCS= hxtool.c hxtool-commands.c hxtool-commands.h hxtool-commands.h: hxtool-commands.in - slc ${.ALLSRC:M*.in} + ${SLC} ${.ALLSRC:M*.in} .for ext in c o hxtool-commands.${ext}: hxtool-commands.h Modified: user/attilio/vmcontention/kerberos5/usr.bin/kadmin/Makefile ============================================================================== --- user/attilio/vmcontention/kerberos5/usr.bin/kadmin/Makefile Thu Jun 7 19:48:45 2012 (r236725) +++ user/attilio/vmcontention/kerberos5/usr.bin/kadmin/Makefile Thu Jun 7 22:47:53 2012 (r236726) @@ -39,7 +39,7 @@ LDFLAGS=${LDAPLDFLAGS} .include <bsd.prog.mk> kadmin-commands.h: ${KRB5DIR}/kadmin/kadmin-commands.in - slc ${.ALLSRC:M*.in} + ${SLC} ${.ALLSRC:M*.in} .for ext in o c kadmin-commands.${ext}: kadmin-commands.h Modified: user/attilio/vmcontention/kerberos5/usr.bin/kcc/Makefile ============================================================================== --- user/attilio/vmcontention/kerberos5/usr.bin/kcc/Makefile Thu Jun 7 19:48:45 2012 (r236725) +++ user/attilio/vmcontention/kerberos5/usr.bin/kcc/Makefile Thu Jun 7 22:47:53 2012 (r236726) @@ -20,7 +20,7 @@ SRCS= kcc.c \ copy_cred_cache.c kcc-commands.h: kcc-commands.in - slc ${.ALLSRC:M*.in} + ${SLC} ${.ALLSRC:M*.in} .for ext in c o kcc-commands.${ext}: kcc-commands.h Modified: user/attilio/vmcontention/kerberos5/usr.sbin/iprop-log/Makefile ============================================================================== --- user/attilio/vmcontention/kerberos5/usr.sbin/iprop-log/Makefile Thu Jun 7 19:48:45 2012 (r236725) +++ user/attilio/vmcontention/kerberos5/usr.sbin/iprop-log/Makefile Thu Jun 7 22:47:53 2012 (r236726) @@ -14,7 +14,7 @@ LDADD= -lkadm5srv -lhdb -lkrb5 -lasn1 -l ${LIBVERS} -ledit iprop-commands.h: iprop-commands.in - slc ${.ALLSRC:M*.in} + ${SLC} ${.ALLSRC:M*.in} .for ext in c o iprop-commands.${ext}: iprop-commands.h Modified: user/attilio/vmcontention/kerberos5/usr.sbin/ktutil/Makefile ============================================================================== --- user/attilio/vmcontention/kerberos5/usr.sbin/ktutil/Makefile Thu Jun 7 19:48:45 2012 (r236725) +++ user/attilio/vmcontention/kerberos5/usr.sbin/ktutil/Makefile Thu Jun 7 22:47:53 2012 (r236726) @@ -25,7 +25,7 @@ LDADD= -lkadm5clnt -lkrb5 ${LIBSL} -lrok .include <bsd.prog.mk> ktutil-commands.h: ${KRB5DIR}/admin/ktutil-commands.in - slc ${.ALLSRC:M*.in} + ${SLC} ${.ALLSRC:M*.in} .for ext in c o ktutil-commands.${ext}: ktutil-commands.h Modified: user/attilio/vmcontention/lib/libc++/Makefile ============================================================================== --- user/attilio/vmcontention/lib/libc++/Makefile Thu Jun 7 19:48:45 2012 (r236725) +++ user/attilio/vmcontention/lib/libc++/Makefile Thu Jun 7 22:47:53 2012 (r236726) @@ -1,156 +1,163 @@ # $FreeBSD$ -LIBCXXRTDIR= ${.CURDIR}/../../contrib/libcxxrt -HDRDIR= ${.CURDIR}/../../contrib/libc++/include -SRCDIR= ${.CURDIR}/../../contrib/libc++/src -CXXINCLUDEDIR= ${INCLUDEDIR}/c++/v${SHLIB_MAJOR} +LIBCXXRTDIR= ${.CURDIR}/../../contrib/libcxxrt +HDRDIR= ${.CURDIR}/../../contrib/libc++/include +SRCDIR= ${.CURDIR}/../../contrib/libc++/src +CXXINCLUDEDIR= ${INCLUDEDIR}/c++/v${SHLIB_MAJOR} .PATH: ${SRCDIR} -LIB= c++ -SHLIB_MAJOR= 1 +LIB= c++ +SHLIB_MAJOR= 1 -SRCS+= algorithm.cpp\ - bind.cpp\ - chrono.cpp\ - condition_variable.cpp\ - debug.cpp\ - exception.cpp\ - future.cpp\ - hash.cpp\ - ios.cpp\ - iostream.cpp\ - locale.cpp\ - memory.cpp\ - mutex.cpp\ - new.cpp\ - random.cpp\ - regex.cpp\ - stdexcept.cpp\ - string.cpp\ - strstream.cpp\ - system_error.cpp\ - thread.cpp\ - typeinfo.cpp\ - utility.cpp\ - valarray.cpp - -WARNS= 0 -CXXFLAGS+= -I${HDRDIR} -I${LIBCXXRTDIR} -std=c++0x -nostdlib -DLIBCXXRT - -DPADD= ${LIBCXXRT} -LDADD= -lcxxrt -LDFLAGS+= --verbose -INCSGROUPS= STD EXT - -STD_HEADERS= __bit_reference\ - __config\ - __debug\ - __functional_03\ - __functional_base\ - __functional_base_03\ - __hash_table\ - __locale\ - __mutex_base\ - __split_buffer\ - __sso_allocator\ - __std_stream\ - __tree\ - __tuple\ - __tuple_03\ - __undef_min_max\ - algorithm\ - array\ - atomic\ - bitset\ - cassert\ - ccomplex\ - cctype\ - cerrno\ - cfenv\ - cfloat\ - chrono\ - cinttypes\ - ciso646\ - climits\ - clocale\ - cmath\ - codecvt\ - complex\ - complex.h\ - condition_variable\ - csetjmp\ - csignal\ - cstdarg\ - cstdbool\ - cstddef\ - cstdint\ - cstdio\ - cstdlib\ - cstring\ - ctgmath\ - ctime\ - cwchar\ - cwctype\ - deque\ - exception\ - forward_list\ - fstream\ - functional\ - future\ - initializer_list\ - iomanip\ - ios\ - iosfwd\ - iostream\ - istream\ - iterator\ - limits\ - list\ - locale\ - map\ - memory\ - mutex\ - new\ - numeric\ - ostream\ - queue\ - random\ - ratio\ - regex\ - scoped_allocator\ - set\ - sstream\ - stack\ - stdexcept\ - streambuf\ - string\ - strstream\ - system_error\ - tgmath.h\ - thread\ - tuple\ - type_traits\ - typeindex\ - typeinfo\ - unordered_map\ - unordered_set\ - utility\ - valarray\ - vector +SRCS+= algorithm.cpp\ + bind.cpp\ + chrono.cpp\ + condition_variable.cpp\ + debug.cpp\ + exception.cpp\ + future.cpp\ + hash.cpp\ + ios.cpp\ + iostream.cpp\ + locale.cpp\ + memory.cpp\ + mutex.cpp\ + new.cpp\ + random.cpp\ + regex.cpp\ + stdexcept.cpp\ + string.cpp\ + strstream.cpp\ + system_error.cpp\ + thread.cpp\ + typeinfo.cpp\ + utility.cpp\ + valarray.cpp + +WARNS= 0 +CXXFLAGS+= -I${HDRDIR} -I${LIBCXXRTDIR} -std=c++0x -nostdlib -DLIBCXXRT + +DPADD= ${LIBCXXRT} +LDADD= -lcxxrt +LDFLAGS+= --verbose +INCSGROUPS= STD EXT + +STD_HEADERS= __bit_reference\ + __config\ + __debug\ + __functional_03\ + __functional_base\ + __functional_base_03\ + __hash_table\ + __locale\ + __mutex_base\ + __split_buffer\ + __sso_allocator\ + __std_stream\ + __tree\ + __tuple\ + __tuple_03\ + __undef_min_max\ + algorithm\ + array\ + atomic\ + bitset\ + cassert\ + ccomplex\ + cctype\ + cerrno\ + cfenv\ + cfloat\ + chrono\ + cinttypes\ + ciso646\ + climits\ + clocale\ + cmath\ + codecvt\ + complex\ + complex.h\ + condition_variable\ + csetjmp\ + csignal\ + cstdarg\ + cstdbool\ + cstddef\ + cstdint\ + cstdio\ + cstdlib\ + cstring\ + ctgmath\ + ctime\ + cwchar\ + cwctype\ + deque\ + exception\ + forward_list\ + fstream\ + functional\ + future\ + initializer_list\ + iomanip\ + ios\ + iosfwd\ + iostream\ + istream\ + iterator\ + limits\ + list\ + locale\ + map\ + memory\ + mutex\ + new\ + numeric\ + ostream\ + queue\ + random\ + ratio\ + regex\ + scoped_allocator\ + set\ + sstream\ + stack\ + stdexcept\ + streambuf\ + string\ + strstream\ + system_error\ + tgmath.h\ + thread\ + tuple\ + type_traits\ + typeindex\ + typeinfo\ + unordered_map\ + unordered_set\ + utility\ + valarray\ + vector +RT_HEADERS= cxxabi.h\ + unwind.h\ + unwind-arm.h\ + unwind-itanium.h .for hdr in ${STD_HEADERS} -STD+= ${HDRDIR}/${hdr} +STD+= ${HDRDIR}/${hdr} .endfor -STDDIR= ${CXXINCLUDEDIR} +.for hdr in ${RT_HEADERS} +STD+= ${LIBCXXRTDIR}/${hdr} +.endfor +STDDIR= ${CXXINCLUDEDIR} -EXT_HEADERS= __hash\ - hash_map\ - hash_set +EXT_HEADERS= __hash\ + hash_map\ + hash_set .for hdr in ${EXT_HEADERS} -EXT+= ${HDRDIR}/ext/${hdr} +EXT+= ${HDRDIR}/ext/${hdr} .endfor -EXTDIR= ${CXXINCLUDEDIR}/ext +EXTDIR= ${CXXINCLUDEDIR}/ext .include <bsd.lib.mk> Modified: user/attilio/vmcontention/lib/libc/gen/getnetgrent.c ============================================================================== --- user/attilio/vmcontention/lib/libc/gen/getnetgrent.c Thu Jun 7 19:48:45 2012 (r236725) +++ user/attilio/vmcontention/lib/libc/gen/getnetgrent.c Thu Jun 7 22:47:53 2012 (r236726) @@ -309,28 +309,30 @@ _revnetgr_lookup(char* lookupdom, char* for (rot = 0; ; rot++) { switch (rot) { - case(0): + case 0: snprintf(key, MAXHOSTNAMELEN, "%s.%s", str, dom ? dom : lookupdom); break; - case(1): + case 1: snprintf(key, MAXHOSTNAMELEN, "%s.*", str); break; - case(2): + case 2: snprintf(key, MAXHOSTNAMELEN, "*.%s", dom ? dom : lookupdom); break; - case(3): + case 3: snprintf(key, MAXHOSTNAMELEN, "*.*"); break; - default: return (0); + default: + return (0); } y = yp_match(lookupdom, map, key, strlen(key), &result, - &resultlen); + &resultlen); if (y == 0) { rv = _listmatch(result, group, resultlen); free(result); - if (rv) return (1); + if (rv) + return (1); } else if (y != YPERR_KEY) { /* * If we get an error other than 'no @@ -417,14 +419,14 @@ innetgr(const char *group, const char *h static int parse_netgrp(const char *group) { - char *spos, *epos; - int len, strpos; + struct netgrp *grp; + struct linelist *lp = linehead; + char **ng; + char *epos, *gpos, *pos, *spos; + int freepos, len, strpos; #ifdef DEBUG int fields; #endif - char *pos, *gpos; - struct netgrp *grp; - struct linelist *lp = linehead; /* * First, see if the line has already been read in. @@ -454,49 +456,48 @@ parse_netgrp(const char *group) /* Watch for null pointer dereferences, dammit! */ while (pos != NULL && *pos != '\0') { if (*pos == '(') { - grp = (struct netgrp *)malloc(sizeof (struct netgrp)); + grp = malloc(sizeof(*grp)); if (grp == NULL) return (1); - bzero((char *)grp, sizeof (struct netgrp)); + ng = grp->ng_str; + bzero(grp, sizeof(*grp)); pos++; gpos = strsep(&pos, ")"); #ifdef DEBUG fields = 0; #endif for (strpos = 0; strpos < 3; strpos++) { - if ((spos = strsep(&gpos, ","))) { -#ifdef DEBUG - fields++; -#endif - while (*spos == ' ' || *spos == '\t') - spos++; - if ((epos = strpbrk(spos, " \t"))) { - *epos = '\0'; - len = epos - spos; - } else - len = strlen(spos); - if (len > 0) { - grp->ng_str[strpos] = (char *) - malloc(len + 1); - if (grp->ng_str[strpos] == NULL) { - int freepos; - for (freepos = 0; freepos < strpos; freepos++) - free(grp->ng_str[freepos]); - free(grp); - return (1); - } - bcopy(spos, grp->ng_str[strpos], - len + 1); - } - } else { + if ((spos = strsep(&gpos, ",")) == NULL) { /* *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201206072247.q57Mls3e016132>