Date: Sat, 5 Dec 2009 22:07:17 GMT From: Alexander Motin <mav@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 171432 for review Message-ID: <200912052207.nB5M7HVX093151@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://p4web.freebsd.org/chv.cgi?CH=171432 Change 171432 by mav@mav_mavbook on 2009/12/05 22:06:39 IFC Affected files ... .. //depot/projects/scottl-camlock/src/ObsoleteFiles.inc#20 integrate .. //depot/projects/scottl-camlock/src/bin/date/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/bin/date/date.c#3 integrate .. //depot/projects/scottl-camlock/src/contrib/bsnmp/snmp_mibII/BEGEMOT-MIB2-MIB.txt#2 integrate .. //depot/projects/scottl-camlock/src/contrib/bsnmp/snmp_mibII/mibII.c#3 integrate .. //depot/projects/scottl-camlock/src/contrib/bsnmp/snmp_mibII/mibII.h#2 integrate .. //depot/projects/scottl-camlock/src/contrib/bsnmp/snmp_mibII/mibII_begemot.c#2 integrate .. //depot/projects/scottl-camlock/src/contrib/bsnmp/snmp_mibII/mibII_tree.def#2 integrate .. //depot/projects/scottl-camlock/src/contrib/gcc/config/freebsd-spec.h#4 integrate .. //depot/projects/scottl-camlock/src/contrib/groff/tmac/doc-syms#3 integrate .. //depot/projects/scottl-camlock/src/crypto/openssl/ssl/s3_lib.c#3 integrate .. //depot/projects/scottl-camlock/src/crypto/openssl/ssl/s3_pkt.c#3 integrate .. //depot/projects/scottl-camlock/src/crypto/openssl/ssl/s3_srvr.c#4 integrate .. //depot/projects/scottl-camlock/src/etc/Makefile#6 integrate .. //depot/projects/scottl-camlock/src/etc/defaults/rc.conf#11 integrate .. //depot/projects/scottl-camlock/src/etc/mtree/BSD.var.dist#2 integrate .. //depot/projects/scottl-camlock/src/etc/rc.d/Makefile#9 integrate .. //depot/projects/scottl-camlock/src/etc/rc.d/ip6fw#4 delete .. //depot/projects/scottl-camlock/src/etc/rc.d/ipfw#6 integrate .. //depot/projects/scottl-camlock/src/etc/rc.firewall#4 integrate .. //depot/projects/scottl-camlock/src/etc/rc.firewall6#3 delete .. //depot/projects/scottl-camlock/src/lib/Makefile#5 integrate .. //depot/projects/scottl-camlock/src/lib/csu/amd64/Makefile#3 integrate .. //depot/projects/scottl-camlock/src/lib/csu/arm/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/lib/csu/i386-elf/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/lib/csu/i386-elf/crt1.c#2 delete .. //depot/projects/scottl-camlock/src/lib/csu/i386-elf/crt1_c.c#1 branch .. //depot/projects/scottl-camlock/src/lib/csu/i386-elf/crt1_s.S#1 branch .. //depot/projects/scottl-camlock/src/lib/csu/ia64/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/lib/csu/mips/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/lib/csu/powerpc/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/lib/csu/sparc64/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/lib/libc/gen/exec.c#4 integrate .. //depot/projects/scottl-camlock/src/lib/libc/gen/fdevname.c#2 integrate .. //depot/projects/scottl-camlock/src/lib/libc/gen/getlogin.c#2 integrate .. //depot/projects/scottl-camlock/src/lib/libc/gen/getttyent.c#3 integrate .. //depot/projects/scottl-camlock/src/lib/libc/gen/nlist.c#2 integrate .. //depot/projects/scottl-camlock/src/lib/libc/gen/pause.c#2 integrate .. //depot/projects/scottl-camlock/src/lib/libc/gen/pwcache.c#2 integrate .. //depot/projects/scottl-camlock/src/lib/libc/gen/raise.c#2 integrate .. //depot/projects/scottl-camlock/src/lib/libc/gen/sleep.c#2 integrate .. //depot/projects/scottl-camlock/src/lib/libc/gen/termios.c#3 integrate .. //depot/projects/scottl-camlock/src/lib/libc/gen/timezone.c#2 integrate .. //depot/projects/scottl-camlock/src/lib/libc/gen/usleep.c#2 integrate .. //depot/projects/scottl-camlock/src/lib/libc/gmon/gmon.c#2 integrate .. //depot/projects/scottl-camlock/src/lib/libc/nls/es_ES.ISO8859-1.msg#2 integrate .. //depot/projects/scottl-camlock/src/lib/libc/posix1e/acl_to_text.c#4 integrate .. //depot/projects/scottl-camlock/src/lib/libc/rpc/svc.c#3 integrate .. //depot/projects/scottl-camlock/src/lib/libc/stdio/findfp.c#3 integrate .. //depot/projects/scottl-camlock/src/lib/libc/stdio/funopen.c#2 integrate .. //depot/projects/scottl-camlock/src/lib/libc/stdlib/system.c#2 integrate .. //depot/projects/scottl-camlock/src/lib/libc/string/strcmp.3#3 integrate .. //depot/projects/scottl-camlock/src/lib/libc/sys/__error.c#2 integrate .. //depot/projects/scottl-camlock/src/lib/libulog/Makefile#1 branch .. //depot/projects/scottl-camlock/src/lib/libulog/Symbol.map#1 branch .. //depot/projects/scottl-camlock/src/lib/libulog/ulog.h#1 branch .. //depot/projects/scottl-camlock/src/lib/libulog/ulog_getutxent.3#1 branch .. //depot/projects/scottl-camlock/src/lib/libulog/ulog_getutxent.c#1 branch .. //depot/projects/scottl-camlock/src/lib/libulog/ulog_internal.h#1 branch .. //depot/projects/scottl-camlock/src/lib/libulog/ulog_login.3#1 branch .. //depot/projects/scottl-camlock/src/lib/libulog/ulog_login.c#1 branch .. //depot/projects/scottl-camlock/src/lib/libulog/ulog_login_pseudo.c#1 branch .. //depot/projects/scottl-camlock/src/lib/libulog/ulog_pututxline.c#1 branch .. //depot/projects/scottl-camlock/src/lib/libulog/ulog_setutxfile.3#1 branch .. //depot/projects/scottl-camlock/src/lib/libulog/ulog_util.c#1 branch .. //depot/projects/scottl-camlock/src/lib/libutil/libutil.h#3 integrate .. //depot/projects/scottl-camlock/src/libexec/Makefile#4 integrate .. //depot/projects/scottl-camlock/src/libexec/ulog-helper/Makefile#1 branch .. //depot/projects/scottl-camlock/src/libexec/ulog-helper/ulog-helper.c#1 branch .. //depot/projects/scottl-camlock/src/sbin/init/Makefile#4 integrate .. //depot/projects/scottl-camlock/src/sbin/init/init.c#4 integrate .. //depot/projects/scottl-camlock/src/sbin/ipfw/dummynet.c#5 integrate .. //depot/projects/scottl-camlock/src/sbin/reboot/Makefile#3 integrate .. //depot/projects/scottl-camlock/src/sbin/reboot/reboot.c#4 integrate .. //depot/projects/scottl-camlock/src/share/man/man4/man4.powerpc/Makefile#3 integrate .. //depot/projects/scottl-camlock/src/share/man/man4/man4.powerpc/adb.4#1 branch .. //depot/projects/scottl-camlock/src/share/man/man4/man4.powerpc/akbd.4#1 branch .. //depot/projects/scottl-camlock/src/share/man/man4/man4.powerpc/ams.4#1 branch .. //depot/projects/scottl-camlock/src/share/man/man4/man4.powerpc/cuda.4#1 branch .. //depot/projects/scottl-camlock/src/share/man/man4/man4.powerpc/pmu.4#2 integrate .. //depot/projects/scottl-camlock/src/share/man/man9/VOP_OPENCLOSE.9#3 integrate .. //depot/projects/scottl-camlock/src/share/mk/bsd.libnames.mk#5 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/amd64/mca.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/include/mca.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_cd.c#32 integrate .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#15 integrate .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zvol.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/compat/freebsd32/freebsd32_proto.h#26 integrate .. //depot/projects/scottl-camlock/src/sys/compat/freebsd32/freebsd32_syscall.h#25 integrate .. //depot/projects/scottl-camlock/src/sys/compat/freebsd32/freebsd32_syscalls.c#25 integrate .. //depot/projects/scottl-camlock/src/sys/compat/freebsd32/freebsd32_sysent.c#25 integrate .. //depot/projects/scottl-camlock/src/sys/compat/freebsd32/syscalls.master#27 integrate .. //depot/projects/scottl-camlock/src/sys/compat/linux/linux_ioctl.c#22 integrate .. //depot/projects/scottl-camlock/src/sys/compat/linux/linux_ioctl.h#11 integrate .. //depot/projects/scottl-camlock/src/sys/compat/linux/linux_videodev.h#1 branch .. //depot/projects/scottl-camlock/src/sys/compat/linux/linux_videodev_compat.h#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/ata/ata-pci.c#18 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ata/chipsets/ata-ahci.c#14 integrate .. //depot/projects/scottl-camlock/src/sys/dev/bge/if_bge.c#30 integrate .. //depot/projects/scottl-camlock/src/sys/dev/hwpmc/hwpmc_x86.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ichsmb/ichsmb_pci.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/if_ndis/if_ndis.c#22 integrate .. //depot/projects/scottl-camlock/src/sys/dev/iir/iir_ctrl.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/dev/isp/isp_freebsd.c#29 integrate .. //depot/projects/scottl-camlock/src/sys/dev/isp/isp_freebsd.h#21 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/controller/ehci_pci.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/controller/uhci_pci.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/fs/nfs/nfs_commonacl.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/fs/nfs/nfs_commonport.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/fs/nfs/nfs_commonsubs.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/fs/nfs/nfs_var.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/fs/nfs/nfsport.h#8 integrate .. //depot/projects/scottl-camlock/src/sys/fs/nfsclient/nfs_clrpcops.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/fs/nfsclient/nfs_clvnops.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/fs/portalfs/portal_vnops.c#11 integrate .. //depot/projects/scottl-camlock/src/sys/geom/mirror/g_mirror.c#12 integrate .. //depot/projects/scottl-camlock/src/sys/geom/mirror/g_mirror.h#6 integrate .. //depot/projects/scottl-camlock/src/sys/gnu/fs/reiserfs/reiserfs_vfsops.c#11 integrate .. //depot/projects/scottl-camlock/src/sys/i386/conf/NOTES#29 integrate .. //depot/projects/scottl-camlock/src/sys/i386/i386/mca.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/i386/include/mca.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/ia64/ia64/machdep.c#21 integrate .. //depot/projects/scottl-camlock/src/sys/ia64/include/bus.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/ia64/include/cpufunc.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/ia64/include/ia64_cpu.h#6 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_sig.c#29 integrate .. //depot/projects/scottl-camlock/src/sys/kern/vfs_acl.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/in.h#16 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/ip_carp.c#19 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/ipfw/ip_dummynet.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/ipfw/ip_fw2.c#11 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/raw_ip.c#27 integrate .. //depot/projects/scottl-camlock/src/sys/nfsserver/nfs_serv.c#18 integrate .. //depot/projects/scottl-camlock/src/sys/pc98/conf/NOTES#19 integrate .. //depot/projects/scottl-camlock/src/sys/powerpc/aim/machdep.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/sys/param.h#35 integrate .. //depot/projects/scottl-camlock/src/sys/vm/uma_int.h#7 integrate .. //depot/projects/scottl-camlock/src/tools/tools/sysbuild/sysbuild.sh#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/Makefile#4 integrate .. //depot/projects/scottl-camlock/src/usr.bin/make/proc.c#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/systat/Makefile#4 integrate .. //depot/projects/scottl-camlock/src/usr.bin/systat/vmstat.c#3 integrate .. //depot/projects/scottl-camlock/src/usr.bin/users/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/users/users.c#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/wall/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/wall/wall.c#3 integrate .. //depot/projects/scottl-camlock/src/usr.bin/who/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/who/who.c#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/write/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/write/write.c#3 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/bsnmpd/modules/snmp_pf/pf_snmp.c#3 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/freebsd-update/freebsd-update.sh#5 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/mountd/exports.5#4 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/nfsd/nfsv4.4#3 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/nfsd/stablerestart.5#3 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/ypserv/yp_main.c#3 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/ypserv/yp_server.c#2 integrate Differences ... ==== //depot/projects/scottl-camlock/src/ObsoleteFiles.inc#20 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/ObsoleteFiles.inc,v 1.213 2009/11/18 00:56:05 delphij Exp $ +# $FreeBSD: src/ObsoleteFiles.inc,v 1.215 2009/12/05 17:46:51 antoine Exp $ # # This file lists old files (OLD_FILES), libraries (OLD_LIBS) and # directories (OLD_DIRS) which should get removed at an update. Recently @@ -14,8 +14,14 @@ # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last. # +# 20091202: unify rc.firewall and rc.firewall6. +OLD_FILES+=etc/rc.d/ip6fw +OLD_FILES+=etc/rc.firewall6 +OLD_FILES+=usr/share/examples/etc/rc.firewall6 # 20091117: removal of rc.early(8) link OLD_FILES+=usr/share/man/man8/rc.early.8.gz +# 20091117: usr/share/zoneinfo/GMT link removed +OLD_FILES+=usr/share/zoneinfo/GMT # 20091027: pselect.3 implemented as syscall OLD_FILES+=usr/share/man/man3/pselect.3.gz # 20091005: fusword.9 and susword.9 removed ==== //depot/projects/scottl-camlock/src/bin/date/Makefile#2 (text+ko) ==== @@ -1,9 +1,9 @@ # @(#)Makefile 8.1 (Berkeley) 5/31/93 -# $FreeBSD: src/bin/date/Makefile,v 1.11 2003/06/13 07:04:01 markm Exp $ +# $FreeBSD: src/bin/date/Makefile,v 1.12 2009/12/05 20:09:50 ed Exp $ PROG= date SRCS= date.c netdate.c vary.c -DPADD= ${LIBUTIL} -LDADD= -lutil +DPADD= ${LIBULOG} +LDADD= -lulog .include <bsd.prog.mk> ==== //depot/projects/scottl-camlock/src/bin/date/date.c#3 (text+ko) ==== @@ -40,7 +40,7 @@ #endif #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/bin/date/date.c,v 1.48 2008/02/07 16:04:24 ru Exp $"); +__FBSDID("$FreeBSD: src/bin/date/date.c,v 1.49 2009/12/05 20:09:50 ed Exp $"); #include <sys/param.h> #include <sys/time.h> @@ -48,11 +48,12 @@ #include <ctype.h> #include <err.h> #include <locale.h> -#include <libutil.h> #include <stdio.h> #include <stdlib.h> #include <string.h> #include <syslog.h> +#define _ULOG_POSIX_NAMES +#include <ulog.h> #include <unistd.h> #include "extern.h" @@ -181,6 +182,7 @@ static void setthetime(const char *fmt, const char *p, int jflag, int nflag) { + struct utmpx utx; struct tm *lt; struct timeval tv; const char *dot, *t; @@ -271,12 +273,16 @@ if (!jflag) { /* set the time */ if (nflag || netsettime(tval)) { - logwtmp("|", "date", ""); + utx.ut_type = OLD_TIME; + gettimeofday(&utx.ut_tv, NULL); + pututxline(&utx); tv.tv_sec = tval; tv.tv_usec = 0; if (settimeofday(&tv, (struct timezone *)NULL)) err(1, "settimeofday (timeval)"); - logwtmp("{", "date", ""); + utx.ut_type = NEW_TIME; + gettimeofday(&utx.ut_tv, NULL); + pututxline(&utx); } if ((p = getlogin()) == NULL) ==== //depot/projects/scottl-camlock/src/contrib/bsnmp/snmp_mibII/BEGEMOT-MIB2-MIB.txt#2 (text) ==== @@ -39,7 +39,7 @@ FROM BEGEMOT-IP-MIB; begemotMib2 MODULE-IDENTITY - LAST-UPDATED "200602130000Z" + LAST-UPDATED "200908030000Z" ORGANIZATION "German Aerospace Center" CONTACT-INFO " Hartmut Brandt @@ -54,6 +54,12 @@ E-mail: harti@freebsd.org" DESCRIPTION "The MIB for private mib2 stuff." + REVISION "200908030000Z" + DESCRIPTION + "Second edition adds begemotIfDataPoll object." + REVISION "200602130000Z" + DESCRIPTION + "Initial revision." ::= { begemotIp 1 } begemotIfMaxspeed OBJECT-TYPE @@ -87,4 +93,14 @@ bit rate in its MIB." ::= { begemotMib2 3 } +begemotIfDataPoll OBJECT-TYPE + SYNTAX TimeTicks + UNITS "deciseconds" + MAX-ACCESS read-write + STATUS current + DESCRIPTION + "The rate at which the mib2 module will poll interface data." + DEFVAL { 100 } + ::= { begemotMib2 4 } + END ==== //depot/projects/scottl-camlock/src/contrib/bsnmp/snmp_mibII/mibII.c#3 (text+ko) ==== @@ -117,6 +117,15 @@ /* HC update timer handle */ static void *hc_update_timer; +/* Idle poll timer */ +static void *mibII_poll_timer; + +/* interfaces' data poll interval */ +u_int mibII_poll_ticks; + +/* Idle poll hook */ +static void mibII_idle(void *arg __unused); + /*****************************/ static const struct asn_oid oid_ifMIB = OIDX_ifMIB; @@ -410,6 +419,20 @@ mibif_hc_update_interval = ticks; } +/** + * Restart the idle poll timer. + */ +void +mibif_restart_mibII_poll_timer(void) +{ + if (mibII_poll_timer != NULL) + timer_stop(mibII_poll_timer); + + if ((mibII_poll_timer = timer_start_repeat(mibII_poll_ticks * 10, + mibII_poll_ticks * 10, mibII_idle, NULL, module)) == NULL) + syslog(LOG_ERR, "timer_start(%u): %m", mibII_poll_ticks); +} + /* * Fetch new MIB data. */ @@ -1553,7 +1576,7 @@ * Idle function */ static void -mibII_idle(void) +mibII_idle(void *arg __unused) { struct mibifa *ifa; @@ -1608,6 +1631,10 @@ ipForward_reg = or_register(&oid_ipForward, "The MIB module for the display of CIDR multipath IP Routes.", module); + + mibII_poll_timer = NULL; + mibII_poll_ticks = MIBII_POLL_TICKS; + mibif_restart_mibII_poll_timer(); } /* @@ -1651,6 +1678,11 @@ static int mibII_fini(void) { + if (mibII_poll_timer != NULL ) { + timer_stop(mibII_poll_timer); + mibII_poll_timer = NULL; + } + if (route_fd != NULL) fd_deselect(route_fd); if (route != -1) @@ -1690,7 +1722,7 @@ "This module implements the interface and ip groups.", mibII_init, mibII_fini, - mibII_idle, /* idle */ + NULL, /* idle */ NULL, /* dump */ NULL, /* config */ mibII_start, ==== //depot/projects/scottl-camlock/src/contrib/bsnmp/snmp_mibII/mibII.h#2 (text+ko) ==== @@ -211,6 +211,14 @@ /* re-compute update interval */ void mibif_reset_hc_timer(void); +/* interfaces' data poll interval */ +extern u_int mibII_poll_ticks; + +/* restart the data poll timer */ +void mibif_restart_mibII_poll_timer(void); + +#define MIBII_POLL_TICKS 100 + /* get interfaces and interface addresses. */ void mib_fetch_interfaces(void); ==== //depot/projects/scottl-camlock/src/contrib/bsnmp/snmp_mibII/mibII_begemot.c#2 (text) ==== @@ -59,6 +59,11 @@ ctx->scratch->int1 = mibif_force_hc_update_interval; mibif_force_hc_update_interval = value->v.uint32; return (SNMP_ERR_NOERROR); + + case LEAF_begemotIfDataPoll: + ctx->scratch->int1 = mibII_poll_ticks; + mibII_poll_ticks = value->v.uint32; + return (SNMP_ERR_NOERROR); } abort(); @@ -68,6 +73,10 @@ case LEAF_begemotIfForcePoll: mibif_force_hc_update_interval = ctx->scratch->int1; return (SNMP_ERR_NOERROR); + + case LEAF_begemotIfDataPoll: + mibII_poll_ticks = ctx->scratch->int1; + return (SNMP_ERR_NOERROR); } abort(); @@ -78,6 +87,10 @@ mibif_force_hc_update_interval = ctx->scratch->int1; mibif_reset_hc_timer(); return (SNMP_ERR_NOERROR); + + case LEAF_begemotIfDataPoll: + mibif_restart_mibII_poll_timer(); + return (SNMP_ERR_NOERROR); } abort(); } @@ -98,6 +111,10 @@ case LEAF_begemotIfForcePoll: value->v.uint32 = mibif_force_hc_update_interval; return (SNMP_ERR_NOERROR); + + case LEAF_begemotIfDataPoll: + value->v.uint32 = mibII_poll_ticks; + return (SNMP_ERR_NOERROR); } abort(); } ==== //depot/projects/scottl-camlock/src/contrib/bsnmp/snmp_mibII/mibII_tree.def#2 (text+ko) ==== @@ -240,6 +240,7 @@ (1 begemotIfMaxspeed COUNTER64 op_begemot_mibII GET) (2 begemotIfPoll TIMETICKS op_begemot_mibII GET) (3 begemotIfForcePoll TIMETICKS op_begemot_mibII GET SET) + (4 begemotIfDataPoll TIMETICKS op_begemot_mibII GET SET) ) ) ) ==== //depot/projects/scottl-camlock/src/contrib/gcc/config/freebsd-spec.h#4 (text+ko) ==== @@ -18,7 +18,7 @@ the Free Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -/* $FreeBSD: src/contrib/gcc/config/freebsd-spec.h,v 1.26 2009/07/14 21:19:13 kan Exp $ */ +/* $FreeBSD: src/contrib/gcc/config/freebsd-spec.h,v 1.27 2009/12/02 16:34:20 kib Exp $ */ /* Common FreeBSD configuration. All FreeBSD architectures should include this file, which will specify @@ -103,9 +103,10 @@ %{p:gcrt1.o%s} \ %{!p: \ %{profile:gcrt1.o%s} \ - %{!profile:crt1.o%s}}}} \ + %{!profile: \ + %{pie: Scrt1.o%s;:crt1.o%s}}}}} \ crti.o%s \ - %{static:crtbeginT.o%s;shared:crtbeginS.o%s;:crtbegin.o%s}" + %{static:crtbeginT.o%s;shared|pie:crtbeginS.o%s;:crtbegin.o%s}" /* Provide an ENDFILE_SPEC appropriate for FreeBSD/i386. Here we tack on our own magical crtend.o file (see crtstuff.c) which provides part of @@ -113,8 +114,7 @@ entering `main', followed by the normal "finalizer" file, `crtn.o'. */ #define FBSD_ENDFILE_SPEC "\ - %{!shared:crtend.o%s} \ - %{shared:crtendS.o%s} \ + %{shared|pie:crtendS.o%s;:crtend.o%s} \ crtn.o%s " /* Provide a LIB_SPEC appropriate for FreeBSD as configured and as ==== //depot/projects/scottl-camlock/src/contrib/groff/tmac/doc-syms#3 (text+ko) ==== @@ -777,6 +777,7 @@ .ds doc-str-Lb-librt \*[Px] \*[doc-str-Lb]Real-time Library (librt, \-lrt) .ds doc-str-Lb-libtermcap Termcap Access Library (libtermcap, \-ltermcap) .ds doc-str-Lb-libusbhid USB Human Interface Devices Library (libusbhid, \-lusbhid) +.ds doc-str-Lb-libulog User Login Record Library (libulog, \-lulog) .ds doc-str-Lb-libutil System Utilities Library (libutil, \-lutil) .ds doc-str-Lb-libx86_64 x86_64 Architecture Library (libx86_64, \-lx86_64) .ds doc-str-Lb-libz Compression Library (libz, \-lz) ==== //depot/projects/scottl-camlock/src/crypto/openssl/ssl/s3_lib.c#3 (text+ko) ==== @@ -2592,6 +2592,9 @@ if (s->s3->flags & SSL3_FLAGS_NO_RENEGOTIATE_CIPHERS) return(0); + if (1) + return(0); + s->s3->renegotiate=1; return(1); } ==== //depot/projects/scottl-camlock/src/crypto/openssl/ssl/s3_pkt.c#3 (text+ko) ==== @@ -983,9 +983,7 @@ if (s->msg_callback) s->msg_callback(0, s->version, SSL3_RT_HANDSHAKE, s->s3->handshake_fragment, 4, s, s->msg_callback_arg); - if (SSL_is_init_finished(s) && - !(s->s3->flags & SSL3_FLAGS_NO_RENEGOTIATE_CIPHERS) && - !s->s3->renegotiate) + if (0) { ssl3_renegotiate(s); if (ssl3_renegotiate_check(s)) @@ -1116,8 +1114,7 @@ /* Unexpected handshake message (Client Hello, or protocol violation) */ if ((s->s3->handshake_fragment_len >= 4) && !s->in_handshake) { - if (((s->state&SSL_ST_MASK) == SSL_ST_OK) && - !(s->s3->flags & SSL3_FLAGS_NO_RENEGOTIATE_CIPHERS)) + if (0) { #if 0 /* worked only because C operator preferences are not as expected (and * because this is not really needed for clients except for detecting ==== //depot/projects/scottl-camlock/src/crypto/openssl/ssl/s3_srvr.c#4 (text+ko) ==== @@ -718,6 +718,13 @@ #endif STACK_OF(SSL_CIPHER) *ciphers=NULL; + if (s->new_session) + { + al=SSL_AD_HANDSHAKE_FAILURE; + SSLerr(SSL_F_SSL3_GET_CLIENT_HELLO, ERR_R_INTERNAL_ERROR); + goto f_err; + } + /* We do this so that we will respond with our native type. * If we are TLSv1 and we get SSLv3, we will respond with TLSv1, * This down switching should be handled by a different method. ==== //depot/projects/scottl-camlock/src/etc/Makefile#6 (text+ko) ==== @@ -1,5 +1,5 @@ # from: @(#)Makefile 5.11 (Berkeley) 5/21/91 -# $FreeBSD: src/etc/Makefile,v 1.377 2009/11/13 11:26:44 ed Exp $ +# $FreeBSD: src/etc/Makefile,v 1.378 2009/12/02 15:05:26 ume Exp $ .include <bsd.own.mk> @@ -15,7 +15,7 @@ inetd.conf libalias.conf login.access login.conf mac.conf motd \ netconfig network.subr networks newsyslog.conf nsswitch.conf \ phones profile protocols \ - rc rc.bsdextended rc.firewall rc.firewall6 rc.initdiskless \ + rc rc.bsdextended rc.firewall rc.initdiskless \ rc.sendmail rc.shutdown \ rc.subr remote rpc services shells \ sysctl.conf syslog.conf ==== //depot/projects/scottl-camlock/src/etc/defaults/rc.conf#11 (text+ko) ==== @@ -15,7 +15,7 @@ # For a more detailed explanation of all the rc.conf variables, please # refer to the rc.conf(5) manual page. # -# $FreeBSD: src/etc/defaults/rc.conf,v 1.363 2009/10/21 09:43:22 brueffer Exp $ +# $FreeBSD: src/etc/defaults/rc.conf,v 1.364 2009/12/02 15:05:26 ume Exp $ ############################################################## ### Important initial Boot-time options #################### @@ -118,7 +118,10 @@ firewall_quiet="NO" # Set to YES to suppress rule display firewall_logging="NO" # Set to YES to enable events logging firewall_flags="" # Flags passed to ipfw when type is a file -firewall_client_net="192.0.2.0/24" # Network address for "client" firewall. +firewall_client_net="192.0.2.0/24" # IPv4 Network address for "client" + # firewall. +#firewall_client_net_ipv6="2001:db8:2:1::/64" # IPv6 network prefix for + # "client" firewall. firewall_simple_iif="ed1" # Inside network interface for "simple" # firewall. firewall_simple_inet="192.0.2.16/28" # Inside network address for "simple" @@ -127,12 +130,22 @@ # firewall. firewall_simple_onet="192.0.2.0/28" # Outside network address for "simple" # firewall. +#firewall_simple_iif_ipv6="ed1" # Inside IPv6 network interface for "simple" + # firewall. +#firewall_simple_inet_ipv6="2001:db8:2:800::/56" # Inside IPv6 network prefix + # for "simple" firewall. +#firewall_simple_oif_ipv6="ed0" # Outside IPv6 network interface for "simple" + # firewall. +#firewall_simple_onet_ipv6="2001:db8:2:0::/56" # Outside IPv6 network prefix + # for "simple" firewall. firewall_myservices="" # List of TCP ports on which this host # offers services for "workstation" firewall. firewall_allowservices="" # List of IPs which have access to # $firewall_myservices for "workstation" # firewall. -firewall_trusted="" # List of IPs which have full access to this +firewall_trusted="" # List of IPv4s which have full access to this + # host for "workstation" firewall. +firewall_trusted_ipv6="" # List of IPv6s which have full access to this # host for "workstation" firewall. firewall_logdeny="NO" # Set to YES to log default denied incoming # packets for "workstation" firewall. @@ -472,13 +485,6 @@ # faithd(8) setup. ipv6_ipv4mapping="NO" # Set to "YES" to enable IPv4 mapped IPv6 addr # communication. (like ::ffff:a.b.c.d) -ipv6_firewall_enable="NO" # Set to YES to enable IPv6 firewall - # functionality -ipv6_firewall_script="/etc/rc.firewall6" # Which script to run to set up the IPv6 firewall -ipv6_firewall_type="UNKNOWN" # IPv6 Firewall type (see /etc/rc.firewall6) -ipv6_firewall_quiet="NO" # Set to YES to suppress rule display -ipv6_firewall_logging="NO" # Set to YES to enable events logging -ipv6_firewall_flags="" # Flags passed to ip6fw when type is a file ipv6_ipfilter_rules="/etc/ipf6.rules" # rules definition file for ipfilter, # see /usr/src/contrib/ipfilter/rules # for examples ==== //depot/projects/scottl-camlock/src/etc/mtree/BSD.var.dist#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/mtree/BSD.var.dist,v 1.75 2006/08/31 09:51:33 cperciva Exp $ +# $FreeBSD: src/etc/mtree/BSD.var.dist,v 1.76 2009/12/03 09:18:40 cperciva Exp $ # # Please see the file src/etc/mtree/README before making changes to this file. # @@ -32,7 +32,7 @@ db entropy uname=operator gname=operator mode=0700 .. - freebsd-update + freebsd-update mode=0700 .. ipf mode=0700 .. ==== //depot/projects/scottl-camlock/src/etc/rc.d/Makefile#9 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/rc.d/Makefile,v 1.101 2009/09/12 22:13:41 hrs Exp $ +# $FreeBSD: src/etc/rc.d/Makefile,v 1.102 2009/12/02 15:05:26 ume Exp $ .include <bsd.own.mk> @@ -15,7 +15,7 @@ hcsecd \ hostapd hostid hostid_save hostname \ inetd initrandom \ - ip6addrctl ip6fw ipfilter ipfs ipfw ipmon \ + ip6addrctl ipfilter ipfs ipfw ipmon \ ipnat ipsec ipxrouted \ jail \ kadmind kerberos keyserv kldxref kpasswdd \ ==== //depot/projects/scottl-camlock/src/etc/rc.d/ipfw#6 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/ipfw,v 1.21 2009/06/26 01:04:50 dougb Exp $ +# $FreeBSD: src/etc/rc.d/ipfw,v 1.22 2009/12/02 15:05:26 ume Exp $ # # PROVIDE: ipfw @@ -17,6 +17,8 @@ stop_cmd="ipfw_stop" required_modules="ipfw" +set_rcvar_obsolete ipv6_firewall_enable + ipfw_prestart() { if checkyesno dummynet_enable; then @@ -61,7 +63,13 @@ # Enable the firewall # if ! ${SYSCTL_W} net.inet.ip.fw.enable=1 1>/dev/null 2>&1; then - warn "failed to enable firewall" + warn "failed to enable IPv4 firewall" + fi + if afexists inet6; then + if ! ${SYSCTL_W} net.inet6.ip6.fw.enable=1 1>/dev/null 2>&1 + then + warn "failed to enable IPv6 firewall" + fi fi } @@ -70,6 +78,9 @@ # Disable the firewall # ${SYSCTL_W} net.inet.ip.fw.enable=0 + if afexists inet6; then + ${SYSCTL_W} net.inet6.ip6.fw.enable=0 + fi if [ -f /etc/rc.d/natd ] ; then /etc/rc.d/natd quietstop fi ==== //depot/projects/scottl-camlock/src/etc/rc.firewall#4 (text+ko) ==== @@ -23,7 +23,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/etc/rc.firewall,v 1.60 2008/08/15 19:20:59 jhb Exp $ +# $FreeBSD: src/etc/rc.firewall,v 1.61 2009/12/02 15:05:26 ume Exp $ # # @@ -85,12 +85,42 @@ ${fwcmd} add 100 pass all from any to any via lo0 ${fwcmd} add 200 deny all from any to 127.0.0.0/8 ${fwcmd} add 300 deny ip from 127.0.0.0/8 to any + if [ $ipv6_available -eq 0 ]; then + ${fwcmd} add 400 deny all from any to ::1 + ${fwcmd} add 500 deny all from ::1 to any + fi +} + +setup_ipv6_mandatory () { + [ $ipv6_available -eq 0 ] || return 0 + + ############ + # Only in rare cases do you want to change these rules + # + # ND + # + # DAD + ${fwcmd} add pass ipv6-icmp from :: to ff02::/16 + # RS, RA, NS, NA, redirect... + ${fwcmd} add pass ipv6-icmp from fe80::/10 to fe80::/10 + ${fwcmd} add pass ipv6-icmp from fe80::/10 to ff02::/16 + + # Allow ICMPv6 destination unreach + ${fwcmd} add pass ipv6-icmp from any to any icmp6types 1 + + # Allow NS/NA/toobig (don't filter it out) + ${fwcmd} add pass ipv6-icmp from any to any icmp6types 2,135,136 } if [ -n "${1}" ]; then firewall_type="${1}" fi +. /etc/rc.subr +. /etc/network.subr +afexists inet6 +ipv6_available=$? + ############ # Set quiet mode if requested # @@ -109,6 +139,7 @@ ${fwcmd} -f flush setup_loopback +setup_ipv6_mandatory ############ # Network Address Translation. All packets are passed to natd(8) @@ -166,11 +197,13 @@ # against people from outside your own network. # # Configuration: - # firewall_client_net: Network address of local network. + # firewall_client_net: Network address of local IPv4 network. + # firewall_client_net_ipv6: Network address of local IPv6 network. ############ # set this to your local network net="$firewall_client_net" + net6="$firewall_client_net_ipv6" # Allow limited broadcast traffic from my own net. ${fwcmd} add pass all from ${net} to 255.255.255.255 @@ -178,6 +211,16 @@ # Allow any traffic to or from my own net. ${fwcmd} add pass all from me to ${net} ${fwcmd} add pass all from ${net} to me + if [ -n "$net6" ]; then + ${fwcmd} add pass all from me6 to ${net6} + ${fwcmd} add pass all from ${net6} to me6 + fi + + if [ -n "$net6" ]; then + # Allow any link-local multicast traffic + ${fwcmd} add pass all from fe80::/10 to ff02::/16 + ${fwcmd} add pass all from ${net6} to ff02::/16 + fi # Allow TCP through if setup succeeded ${fwcmd} add pass tcp from any to any established @@ -212,23 +255,38 @@ # on the inside at this machine for those services. # # Configuration: - # firewall_simple_iif: Inside network interface. - # firewall_simple_inet: Inside network address. - # firewall_simple_oif: Outside network interface. - # firewall_simple_onet: Outside network address. + # firewall_simple_iif: Inside IPv4 network interface. + # firewall_simple_inet: Inside IPv4 network address. + # firewall_simple_oif: Outside IPv4 network interface. + # firewall_simple_onet: Outside IPv4 network address. + # firewall_simple_iif_ipv6: Inside IPv6 network interface. + # firewall_simple_inet_ipv6: Inside IPv6 network prefix. + # firewall_simple_oif_ipv6: Outside IPv6 network interface. + # firewall_simple_onet_ipv6: Outside IPv6 network prefix. ############ # set these to your outside interface network oif="$firewall_simple_oif" onet="$firewall_simple_onet" + oif6="${firewall_simple_oif_ipv6:-$firewall_simple_oif}" + onet6="$firewall_simple_onet_ipv6" # set these to your inside interface network iif="$firewall_simple_iif" inet="$firewall_simple_inet" + iif6="${firewall_simple_iif_ipv6:-$firewall_simple_iif}" + inet6="$firewall_simple_inet_ipv6" # Stop spoofing ${fwcmd} add deny all from ${inet} to any in via ${oif} ${fwcmd} add deny all from ${onet} to any in via ${iif} + if [ -n "$inet6" ]; then + ${fwcmd} add deny all from ${inet6} to any in via ${oif6} + if [ -n "$onet6" ]; then + ${fwcmd} add deny all from ${onet6} to any in \ + via ${iif6} + fi + fi # Stop RFC1918 nets on the outside interface ${fwcmd} add deny all from any to 10.0.0.0/8 via ${oif} @@ -254,7 +312,7 @@ case ${natd_enable} in [Yy][Ee][Ss]) if [ -n "${natd_interface}" ]; then - ${fwcmd} add divert natd all from any to any via ${natd_interface} + ${fwcmd} add divert natd ip4 from any to any via ${natd_interface} fi ;; esac @@ -273,6 +331,55 @@ ${fwcmd} add deny all from 224.0.0.0/4 to any via ${oif} ${fwcmd} add deny all from 240.0.0.0/4 to any via ${oif} + if [ -n "$inet6" ]; then + # Stop unique local unicast address on the outside interface + ${fwcmd} add deny all from fc00::/7 to any via ${oif6} + ${fwcmd} add deny all from any to fc00::/7 via ${oif6} + + # Stop site-local on the outside interface + ${fwcmd} add deny all from fec0::/10 to any via ${oif6} + ${fwcmd} add deny all from any to fec0::/10 via ${oif6} + + # Disallow "internal" addresses to appear on the wire. + ${fwcmd} add deny all from ::ffff:0.0.0.0/96 to any \ + via ${oif6} + ${fwcmd} add deny all from any to ::ffff:0.0.0.0/96 \ + via ${oif6} + + # Disallow packets to malicious IPv4 compatible prefix. + ${fwcmd} add deny all from ::224.0.0.0/100 to any via ${oif6} + ${fwcmd} add deny all from any to ::224.0.0.0/100 via ${oif6} + ${fwcmd} add deny all from ::127.0.0.0/104 to any via ${oif6} + ${fwcmd} add deny all from any to ::127.0.0.0/104 via ${oif6} + ${fwcmd} add deny all from ::0.0.0.0/104 to any via ${oif6} + ${fwcmd} add deny all from any to ::0.0.0.0/104 via ${oif6} + ${fwcmd} add deny all from ::255.0.0.0/104 to any via ${oif6} + ${fwcmd} add deny all from any to ::255.0.0.0/104 via ${oif6} + + ${fwcmd} add deny all from ::0.0.0.0/96 to any via ${oif6} + ${fwcmd} add deny all from any to ::0.0.0.0/96 via ${oif6} + + # Disallow packets to malicious 6to4 prefix. + ${fwcmd} add deny all from 2002:e000::/20 to any via ${oif6} + ${fwcmd} add deny all from any to 2002:e000::/20 via ${oif6} + ${fwcmd} add deny all from 2002:7f00::/24 to any via ${oif6} + ${fwcmd} add deny all from any to 2002:7f00::/24 via ${oif6} + ${fwcmd} add deny all from 2002:0000::/24 to any via ${oif6} + ${fwcmd} add deny all from any to 2002:0000::/24 via ${oif6} + ${fwcmd} add deny all from 2002:ff00::/24 to any via ${oif6} + ${fwcmd} add deny all from any to 2002:ff00::/24 via ${oif6} + + ${fwcmd} add deny all from 2002:0a00::/24 to any via ${oif6} + ${fwcmd} add deny all from any to 2002:0a00::/24 via ${oif6} + ${fwcmd} add deny all from 2002:ac10::/28 to any via ${oif6} + ${fwcmd} add deny all from any to 2002:ac10::/28 via ${oif6} + ${fwcmd} add deny all from 2002:c0a8::/32 to any via ${oif6} + ${fwcmd} add deny all from any to 2002:c0a8::/32 via ${oif6} + + ${fwcmd} add deny all from ff05::/16 to any via ${oif6} + ${fwcmd} add deny all from any to ff05::/16 via ${oif6} + fi + # Allow TCP through if setup succeeded ${fwcmd} add pass tcp from any to any established @@ -291,7 +398,11 @@ ${fwcmd} add pass tcp from any to me 80 setup # Reject&Log all setup of incoming connections from the outside - ${fwcmd} add deny log tcp from any to any in via ${oif} setup + ${fwcmd} add deny log ip4 from any to any in via ${oif} setup proto tcp + if [ -n "$inet6" ]; then + ${fwcmd} add deny log ip6 from any to any in via ${oif6} \ + setup proto tcp + fi # Allow setup of any other TCP connection ${fwcmd} add pass tcp from any to any setup @@ -313,7 +424,7 @@ # offers services. # firewall_allowservices: List of IPs which has access to # $firewall_myservices. - # firewall_trusted: List of IPs which has full access + # firewall_trusted: List of IPv4s which has full access # to this host. Be very carefull # when setting this. This option can # seriously degrade the level of @@ -324,25 +435,44 @@ # firewall_nologports: List of TCP/UDP ports for which # denied incomming packets are not # logged. - + # firewall_trusted_ipv6: List of IPv6s which has full access + # to this host. Be very carefull + # when setting this. This option can + # seriously degrade the level of + # protection provided by the firewall. + # Allow packets for which a state has been built. ${fwcmd} add check-state # For services permitted below. ${fwcmd} add pass tcp from me to any established + if [ $ipv6_available -eq 0 ]; then + ${fwcmd} add pass tcp from me6 to any established + fi # Allow any connection out, adding state for each. ${fwcmd} add pass tcp from me to any setup keep-state ${fwcmd} add pass udp from me to any keep-state ${fwcmd} add pass icmp from me to any keep-state + if [ $ipv6_available -eq 0 ]; then + ${fwcmd} add pass tcp from me6 to any setup keep-state + ${fwcmd} add pass udp from me6 to any keep-state + ${fwcmd} add pass ipv6-icmp from me6 to any keep-state + fi # Allow DHCP. ${fwcmd} add pass udp from 0.0.0.0 68 to 255.255.255.255 67 out ${fwcmd} add pass udp from any 67 to me 68 in ${fwcmd} add pass udp from any 67 to 255.255.255.255 68 in + if [ $ipv6_available -eq 0 ]; then + ${fwcmd} add pass udp from fe80::/10 to me6 546 in + fi # Some servers will ping the IP while trying to decide if it's # still in use. ${fwcmd} add pass icmp from any to any icmptype 8 + if [ $ipv6_available -eq 0 ]; then + ${fwcmd} add pass ipv6-icmp from any to any icmp6type 128,129 + fi # Allow "mandatory" ICMP in. ${fwcmd} add pass icmp from any to any icmptype 3,4,11 @@ -361,6 +491,9 @@ for i in ${firewall_allowservices} ; do for j in ${firewall_myservices} ; do ${fwcmd} add pass tcp from $i to me $j + if [ $ipv6_available -eq 0 ]; then + ${fwcmd} add pass tcp from $i to me6 $j + fi done done >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200912052207.nB5M7HVX093151>