Date: Wed, 28 Jan 2004 16:16:55 -0800 (PST) From: Peter Wemm <peter@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 46100 for review Message-ID: <200401290016.i0T0Gtsl020115@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=46100 Change 46100 by peter@peter_daintree on 2004/01/28 16:16:50 IFC @46099 Affected files ... .. //depot/projects/hammer/MAINTAINERS#14 integrate .. //depot/projects/hammer/Makefile.inc1#36 integrate .. //depot/projects/hammer/UPDATING#31 integrate .. //depot/projects/hammer/bin/kill/kill.c#3 integrate .. //depot/projects/hammer/bin/sh/eval.c#6 integrate .. //depot/projects/hammer/bin/sh/jobs.c#8 integrate .. //depot/projects/hammer/bin/sh/trap.c#2 integrate .. //depot/projects/hammer/contrib/bsnmp/FREEBSD-Xlist#1 branch .. //depot/projects/hammer/contrib/bsnmp/FREEBSD-upgrade#2 integrate .. //depot/projects/hammer/contrib/bsnmp/NEWS#2 integrate .. //depot/projects/hammer/contrib/bsnmp/README#2 integrate .. //depot/projects/hammer/contrib/bsnmp/TODO#2 integrate .. //depot/projects/hammer/contrib/bsnmp/VERSION#2 integrate .. //depot/projects/hammer/contrib/bsnmp/gensnmptree/gensnmptree.1#2 integrate .. //depot/projects/hammer/contrib/bsnmp/gensnmptree/gensnmptree.c#2 integrate .. //depot/projects/hammer/contrib/bsnmp/lib/asn1.3#2 integrate .. //depot/projects/hammer/contrib/bsnmp/lib/asn1.c#2 integrate .. //depot/projects/hammer/contrib/bsnmp/lib/asn1.h#2 integrate .. //depot/projects/hammer/contrib/bsnmp/lib/bsnmpagent.3#2 integrate .. //depot/projects/hammer/contrib/bsnmp/lib/bsnmpclient.3#2 integrate .. //depot/projects/hammer/contrib/bsnmp/lib/bsnmplib.3#2 integrate .. //depot/projects/hammer/contrib/bsnmp/lib/snmp.c#2 integrate .. //depot/projects/hammer/contrib/bsnmp/lib/snmp.h#2 integrate .. //depot/projects/hammer/contrib/bsnmp/lib/snmpagent.c#2 integrate .. //depot/projects/hammer/contrib/bsnmp/lib/snmpagent.h#2 integrate .. //depot/projects/hammer/contrib/bsnmp/lib/snmpclient.c#2 integrate .. //depot/projects/hammer/contrib/bsnmp/lib/snmpclient.h#2 integrate .. //depot/projects/hammer/contrib/bsnmp/lib/snmppriv.h#2 integrate .. //depot/projects/hammer/contrib/bsnmp/snmp_mibII/mibII.c#2 integrate .. //depot/projects/hammer/contrib/bsnmp/snmp_mibII/mibII.h#2 integrate .. //depot/projects/hammer/contrib/bsnmp/snmp_mibII/mibII_ifmib.c#2 integrate .. //depot/projects/hammer/contrib/bsnmp/snmp_mibII/mibII_ifstack.c#2 integrate .. //depot/projects/hammer/contrib/bsnmp/snmp_mibII/mibII_interfaces.c#2 integrate .. //depot/projects/hammer/contrib/bsnmp/snmp_mibII/mibII_ip.c#2 integrate .. //depot/projects/hammer/contrib/bsnmp/snmp_mibII/mibII_ipaddr.c#2 integrate .. //depot/projects/hammer/contrib/bsnmp/snmp_mibII/mibII_nettomedia.c#2 integrate .. //depot/projects/hammer/contrib/bsnmp/snmp_mibII/mibII_rcvaddr.c#2 integrate .. //depot/projects/hammer/contrib/bsnmp/snmp_mibII/mibII_route.c#2 integrate .. //depot/projects/hammer/contrib/bsnmp/snmp_mibII/mibII_tcp.c#2 integrate .. //depot/projects/hammer/contrib/bsnmp/snmp_mibII/mibII_tree.def#2 integrate .. //depot/projects/hammer/contrib/bsnmp/snmp_mibII/mibII_udp.c#2 integrate .. //depot/projects/hammer/contrib/bsnmp/snmp_mibII/snmp_mibII.3#2 integrate .. //depot/projects/hammer/contrib/bsnmp/snmp_mibII/snmp_mibII.h#2 integrate .. //depot/projects/hammer/contrib/bsnmp/snmpd/BEGEMOT-MIB.txt#2 integrate .. //depot/projects/hammer/contrib/bsnmp/snmpd/BEGEMOT-SNMPD.txt#2 integrate .. //depot/projects/hammer/contrib/bsnmp/snmpd/FOKUS-MIB.txt#2 integrate .. //depot/projects/hammer/contrib/bsnmp/snmpd/action.c#2 integrate .. //depot/projects/hammer/contrib/bsnmp/snmpd/bsnmpd.1#2 integrate .. //depot/projects/hammer/contrib/bsnmp/snmpd/config.c#2 integrate .. //depot/projects/hammer/contrib/bsnmp/snmpd/export.c#2 integrate .. //depot/projects/hammer/contrib/bsnmp/snmpd/main.c#2 integrate .. //depot/projects/hammer/contrib/bsnmp/snmpd/snmpd.config#2 integrate .. //depot/projects/hammer/contrib/bsnmp/snmpd/snmpd.h#2 integrate .. //depot/projects/hammer/contrib/bsnmp/snmpd/snmpd.sh#2 integrate .. //depot/projects/hammer/contrib/bsnmp/snmpd/snmpmod.3#2 integrate .. //depot/projects/hammer/contrib/bsnmp/snmpd/snmpmod.h#2 integrate .. //depot/projects/hammer/contrib/bsnmp/snmpd/trans_lsock.c#1 branch .. //depot/projects/hammer/contrib/bsnmp/snmpd/trans_lsock.h#1 branch .. //depot/projects/hammer/contrib/bsnmp/snmpd/trans_udp.c#1 branch .. //depot/projects/hammer/contrib/bsnmp/snmpd/trans_udp.h#1 branch .. //depot/projects/hammer/contrib/bsnmp/snmpd/trap.c#2 integrate .. //depot/projects/hammer/contrib/bsnmp/snmpd/tree.def#2 integrate .. //depot/projects/hammer/contrib/isc-dhcp/client/dhclient.c#7 integrate .. //depot/projects/hammer/contrib/smbfs/lib/smb/nb_net.c#2 integrate .. //depot/projects/hammer/contrib/traceroute/traceroute.c#2 integrate .. //depot/projects/hammer/crypto/openssh/FREEBSD-upgrade#6 integrate .. //depot/projects/hammer/etc/pccard_ether#8 integrate .. //depot/projects/hammer/etc/rc.d/cleartmp#6 integrate .. //depot/projects/hammer/etc/rc.d/ipfilter#14 integrate .. //depot/projects/hammer/gnu/usr.bin/binutils/gdb/Makefile#6 integrate .. //depot/projects/hammer/gnu/usr.bin/binutils/gdb/fbsd-kgdb-alpha.h#2 integrate .. //depot/projects/hammer/gnu/usr.bin/binutils/gdb/fbsd-kgdb-amd64.h#1 branch .. //depot/projects/hammer/gnu/usr.bin/binutils/gdb/fbsd-kgdb-arm.h#2 integrate .. //depot/projects/hammer/gnu/usr.bin/binutils/gdb/fbsd-kgdb-i386.h#3 integrate .. //depot/projects/hammer/gnu/usr.bin/binutils/gdb/fbsd-kgdb-ia64.h#2 integrate .. //depot/projects/hammer/gnu/usr.bin/binutils/gdb/fbsd-kgdb-powerpc.h#2 integrate .. //depot/projects/hammer/gnu/usr.bin/binutils/gdb/fbsd-kgdb-sparc64.h#2 integrate .. //depot/projects/hammer/gnu/usr.bin/binutils/gdb/fbsd-kgdb-x86_64.h#2 delete .. //depot/projects/hammer/gnu/usr.bin/binutils/gdb/kvm-fbsd.c#6 integrate .. //depot/projects/hammer/gnu/usr.bin/cc/cc_tools/Makefile#13 integrate .. //depot/projects/hammer/include/Makefile#19 integrate .. //depot/projects/hammer/lib/Makefile#29 integrate .. //depot/projects/hammer/lib/libbsnmp/modules/Makefile.inc#3 integrate .. //depot/projects/hammer/lib/libbsnmp/modules/snmp_mibII/Makefile#4 integrate .. //depot/projects/hammer/lib/libbsnmp/modules/snmp_mibII/genfiles#2 delete .. //depot/projects/hammer/lib/libbsnmp/modules/snmp_mibII/mibII_oid.h#2 delete .. //depot/projects/hammer/lib/libbsnmp/modules/snmp_mibII/mibII_tree.c#2 delete .. //depot/projects/hammer/lib/libbsnmp/modules/snmp_mibII/mibII_tree.h#2 delete .. //depot/projects/hammer/lib/libbsnmp/modules/snmp_netgraph/Makefile#4 integrate .. //depot/projects/hammer/lib/libbsnmp/modules/snmp_netgraph/genfiles#2 delete .. //depot/projects/hammer/lib/libbsnmp/modules/snmp_netgraph/netgraph_oid.h#2 delete .. //depot/projects/hammer/lib/libbsnmp/modules/snmp_netgraph/netgraph_tree.c#2 delete .. //depot/projects/hammer/lib/libbsnmp/modules/snmp_netgraph/netgraph_tree.h#2 delete .. //depot/projects/hammer/lib/libbsnmp/modules/snmp_netgraph/snmp_netgraph.c#3 integrate .. //depot/projects/hammer/lib/libc/stdio/vfwprintf.c#11 integrate .. //depot/projects/hammer/lib/libc/sys/poll.2#4 integrate .. //depot/projects/hammer/lib/libc/sys/read.2#4 integrate .. //depot/projects/hammer/lib/libc/sys/select.2#5 integrate .. //depot/projects/hammer/lib/libc/xdr/xdr_stdio.c#2 integrate .. //depot/projects/hammer/lib/libdisk/change.c#5 integrate .. //depot/projects/hammer/lib/libdisk/write_ia64_disk.c#9 integrate .. //depot/projects/hammer/lib/libfetch/fetch.3#7 integrate .. //depot/projects/hammer/lib/libnetgraph/Makefile#3 integrate .. //depot/projects/hammer/lib/libnetgraph/msg.c#3 integrate .. //depot/projects/hammer/lib/libnetgraph/netgraph.3#5 integrate .. //depot/projects/hammer/lib/libnetgraph/netgraph.h#2 integrate .. //depot/projects/hammer/lib/libnetgraph/sock.c#4 integrate .. //depot/projects/hammer/lib/libpam/modules/pam_lastlog/pam_lastlog.c#5 integrate .. //depot/projects/hammer/lib/libsdp/Makefile#3 integrate .. //depot/projects/hammer/lib/libusbhid/parse.c#4 integrate .. //depot/projects/hammer/release/Makefile#43 integrate .. //depot/projects/hammer/release/Makefile.inc.docports#7 integrate .. //depot/projects/hammer/release/alpha/boot_crunch.conf#3 integrate .. //depot/projects/hammer/release/amd64/boot_crunch.conf#3 integrate .. //depot/projects/hammer/release/doc/en_US.ISO8859-1/errata/article.sgml#13 integrate .. //depot/projects/hammer/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#45 integrate .. //depot/projects/hammer/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#55 integrate .. //depot/projects/hammer/release/i386/boot_crunch.conf#4 integrate .. //depot/projects/hammer/release/i386/dokern.sh#14 delete .. //depot/projects/hammer/release/i386/drivers.conf#17 delete .. //depot/projects/hammer/release/ia64/boot_crunch.conf#6 integrate .. //depot/projects/hammer/release/pc98/boot_crunch.conf#5 integrate .. //depot/projects/hammer/release/pc98/dokern.sh#12 delete .. //depot/projects/hammer/release/pc98/drivers-small.conf#4 delete .. //depot/projects/hammer/release/pc98/drivers.conf#9 delete .. //depot/projects/hammer/release/scripts/doFS.sh#13 integrate .. //depot/projects/hammer/release/scripts/driver-copy2.awk#2 delete .. //depot/projects/hammer/release/scripts/driver-desc.awk#2 delete .. //depot/projects/hammer/release/scripts/driver-remove.awk#2 delete .. //depot/projects/hammer/release/scripts/split-file.sh#1 branch .. //depot/projects/hammer/release/sparc64/boot_crunch.conf#4 integrate .. //depot/projects/hammer/sbin/atm/atmconfig/diag.c#3 integrate .. //depot/projects/hammer/sbin/atm/atmconfig/diag.h#2 integrate .. //depot/projects/hammer/sbin/disklabel/Makefile#2 delete .. //depot/projects/hammer/sbin/disklabel/disklabel.5#5 delete .. //depot/projects/hammer/sbin/disklabel/disklabel.8#9 delete .. //depot/projects/hammer/sbin/disklabel/disklabel.c#10 delete .. //depot/projects/hammer/sbin/disklabel/pathnames.h#2 delete .. //depot/projects/hammer/sbin/ffsinfo/ffsinfo.8#4 integrate .. //depot/projects/hammer/sbin/fsck_ffs/pass1.c#6 integrate .. //depot/projects/hammer/sbin/fsck_ffs/setup.c#9 integrate .. //depot/projects/hammer/sbin/growfs/growfs.8#6 integrate .. //depot/projects/hammer/sbin/ifconfig/ifconfig.c#12 integrate .. //depot/projects/hammer/sbin/ifconfig/ifconfig.h#4 integrate .. //depot/projects/hammer/sbin/ipfw/ipfw.8#18 integrate .. //depot/projects/hammer/sbin/ipfw/ipfw2.c#19 integrate .. //depot/projects/hammer/sbin/mksnap_ffs/mksnap_ffs.c#4 integrate .. //depot/projects/hammer/share/examples/etc/make.conf#15 integrate .. //depot/projects/hammer/share/man/man4/ata.4#7 integrate .. //depot/projects/hammer/share/man/man4/gdb.4#3 integrate .. //depot/projects/hammer/share/man/man4/gre.4#3 integrate .. //depot/projects/hammer/share/man/man4/ng_one2many.4#3 integrate .. //depot/projects/hammer/share/man/man4/uplcom.4#3 integrate .. //depot/projects/hammer/share/man/man4/witness.4#2 integrate .. //depot/projects/hammer/share/man/man5/make.conf.5#16 integrate .. //depot/projects/hammer/share/man/man7/release.7#16 integrate .. //depot/projects/hammer/share/man/man9/MUTEX_PROFILING.9#1 branch .. //depot/projects/hammer/share/man/man9/Makefile#25 integrate .. //depot/projects/hammer/share/man/man9/bus_alloc_resource.9#5 integrate .. //depot/projects/hammer/share/man/man9/bus_set_resource.9#3 integrate .. //depot/projects/hammer/share/man/man9/ifnet.9#10 integrate .. //depot/projects/hammer/share/man/man9/mac.9#4 integrate .. //depot/projects/hammer/share/man/man9/mutex.9#8 integrate .. //depot/projects/hammer/share/man/man9/pmap.9#3 integrate .. //depot/projects/hammer/share/man/man9/sbuf.9#5 integrate .. //depot/projects/hammer/share/man/man9/zone.9#6 integrate .. //depot/projects/hammer/share/mk/bsd.dep.mk#8 integrate .. //depot/projects/hammer/share/mk/bsd.info.mk#3 integrate .. //depot/projects/hammer/share/mk/bsd.lib.mk#12 integrate .. //depot/projects/hammer/share/mk/bsd.prog.mk#7 integrate .. //depot/projects/hammer/share/mk/sys.mk#10 integrate .. //depot/projects/hammer/share/syscons/keymaps/it.iso.kbd#3 integrate .. //depot/projects/hammer/share/termcap/termcap.src#8 integrate .. //depot/projects/hammer/sys/alpha/conf/GENERIC#15 integrate .. //depot/projects/hammer/sys/amd64/amd64/cpu_switch.S#19 integrate .. //depot/projects/hammer/sys/amd64/amd64/db_trace.c#14 integrate .. //depot/projects/hammer/sys/amd64/amd64/fpu.c#7 integrate .. //depot/projects/hammer/sys/amd64/amd64/genassym.c#30 integrate .. //depot/projects/hammer/sys/amd64/amd64/local_apic.c#30 integrate .. //depot/projects/hammer/sys/amd64/amd64/machdep.c#79 integrate .. //depot/projects/hammer/sys/amd64/amd64/mp_machdep.c#53 integrate .. //depot/projects/hammer/sys/amd64/amd64/trap.c#37 integrate .. //depot/projects/hammer/sys/amd64/amd64/vm_machdep.c#27 integrate .. //depot/projects/hammer/sys/amd64/conf/GENERIC#28 integrate .. //depot/projects/hammer/sys/amd64/include/cpufunc.h#18 integrate .. //depot/projects/hammer/sys/amd64/include/fpu.h#3 integrate .. //depot/projects/hammer/sys/amd64/include/md_var.h#22 integrate .. //depot/projects/hammer/sys/amd64/include/pcb.h#15 integrate .. //depot/projects/hammer/sys/amd64/include/reg.h#9 integrate .. //depot/projects/hammer/sys/amd64/include/smp.h#16 integrate .. //depot/projects/hammer/sys/amd64/include/specialreg.h#12 integrate .. //depot/projects/hammer/sys/amd64/isa/atpic.c#34 integrate .. //depot/projects/hammer/sys/amd64/pci/pci_cfgreg.c#11 integrate .. //depot/projects/hammer/sys/boot/Makefile#10 integrate .. //depot/projects/hammer/sys/boot/common/help.common#5 integrate .. //depot/projects/hammer/sys/boot/common/loader.8#8 integrate .. //depot/projects/hammer/sys/boot/forth/loader.conf#7 integrate .. //depot/projects/hammer/sys/boot/pc98/btx/btx/btx.s#2 integrate .. //depot/projects/hammer/sys/compat/freebsd32/freebsd32_misc.c#9 integrate .. //depot/projects/hammer/sys/compat/freebsd32/freebsd32_proto.h#9 integrate .. //depot/projects/hammer/sys/compat/freebsd32/freebsd32_syscall.h#9 integrate .. //depot/projects/hammer/sys/compat/freebsd32/freebsd32_syscalls.c#9 integrate .. //depot/projects/hammer/sys/compat/freebsd32/freebsd32_sysent.c#9 integrate .. //depot/projects/hammer/sys/compat/freebsd32/syscalls.master#12 integrate .. //depot/projects/hammer/sys/compat/ndis/kern_ndis.c#5 integrate .. //depot/projects/hammer/sys/compat/ndis/ndis_var.h#5 integrate .. //depot/projects/hammer/sys/compat/ndis/subr_ndis.c#5 integrate .. //depot/projects/hammer/sys/conf/NOTES#33 integrate .. //depot/projects/hammer/sys/conf/options.i386#24 integrate .. //depot/projects/hammer/sys/conf/options.pc98#19 integrate .. //depot/projects/hammer/sys/crypto/md5.c#4 integrate .. //depot/projects/hammer/sys/ddb/db_output.c#4 integrate .. //depot/projects/hammer/sys/dev/acpica/Osd/OsdTable.c#4 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi.c#21 integrate .. //depot/projects/hammer/sys/dev/acpica/acpivar.h#17 integrate .. //depot/projects/hammer/sys/dev/ar/if_ar.c#8 integrate .. //depot/projects/hammer/sys/dev/ata/ata-all.h#12 integrate .. //depot/projects/hammer/sys/dev/ata/ata-chipset.c#25 integrate .. //depot/projects/hammer/sys/dev/ata/ata-disk.c#15 integrate .. //depot/projects/hammer/sys/dev/ata/ata-lowlevel.c#9 integrate .. //depot/projects/hammer/sys/dev/ata/ata-queue.c#7 integrate .. //depot/projects/hammer/sys/dev/ata/atapi-cd.c#17 integrate .. //depot/projects/hammer/sys/dev/ata/atapi-fd.c#8 integrate .. //depot/projects/hammer/sys/dev/ata/atapi-tape.c#9 integrate .. //depot/projects/hammer/sys/dev/firewire/fwohci_pci.c#19 integrate .. //depot/projects/hammer/sys/dev/firewire/sbp_targ.c#4 integrate .. //depot/projects/hammer/sys/dev/if_ndis/if_ndis.c#5 integrate .. //depot/projects/hammer/sys/dev/if_ndis/if_ndisvar.h#5 integrate .. //depot/projects/hammer/sys/dev/isp/isp.c#10 integrate .. //depot/projects/hammer/sys/dev/isp/isp_freebsd.c#10 integrate .. //depot/projects/hammer/sys/dev/isp/isp_ioctl.h#3 integrate .. //depot/projects/hammer/sys/dev/isp/ispmbox.h#5 integrate .. //depot/projects/hammer/sys/dev/kbd/kbd.c#6 integrate .. //depot/projects/hammer/sys/dev/sound/pcm/ac97.c#10 integrate .. //depot/projects/hammer/sys/dev/sound/pcm/buffer.c#6 integrate .. //depot/projects/hammer/sys/dev/sound/pcm/buffer.h#5 integrate .. //depot/projects/hammer/sys/dev/sound/pcm/channel.c#8 integrate .. //depot/projects/hammer/sys/dev/sound/pcm/channel.h#4 integrate .. //depot/projects/hammer/sys/dev/sound/pcm/dsp.c#10 integrate .. //depot/projects/hammer/sys/dev/sound/pcm/sound.c#8 integrate .. //depot/projects/hammer/sys/dev/sound/pcm/sound.h#6 integrate .. //depot/projects/hammer/sys/dev/sound/pcm/vchan.c#5 integrate .. //depot/projects/hammer/sys/dev/sr/if_sr.c#9 integrate .. //depot/projects/hammer/sys/dev/usb/uftdi.c#7 integrate .. //depot/projects/hammer/sys/dev/usb/umass.c#16 integrate .. //depot/projects/hammer/sys/dev/usb/usbdevs#25 integrate .. //depot/projects/hammer/sys/dev/usb/usbdevs.h#24 integrate .. //depot/projects/hammer/sys/dev/usb/usbdevs_data.h#24 integrate .. //depot/projects/hammer/sys/geom/bde/g_bde_crypt.c#10 integrate .. //depot/projects/hammer/sys/geom/geom_dev.c#20 integrate .. //depot/projects/hammer/sys/geom/geom_disk.c#21 integrate .. //depot/projects/hammer/sys/geom/geom_event.c#16 integrate .. //depot/projects/hammer/sys/geom/geom_io.c#19 integrate .. //depot/projects/hammer/sys/geom/geom_subr.c#22 integrate .. //depot/projects/hammer/sys/gnu/ext2fs/ext2_vfsops.c#11 integrate .. //depot/projects/hammer/sys/i386/acpica/madt.c#8 integrate .. //depot/projects/hammer/sys/i386/conf/GENERIC#18 integrate .. //depot/projects/hammer/sys/i386/conf/NOTES#28 integrate .. //depot/projects/hammer/sys/i386/i386/apic_vector.s#6 integrate .. //depot/projects/hammer/sys/i386/i386/identcpu.c#11 integrate .. //depot/projects/hammer/sys/i386/i386/local_apic.c#6 integrate .. //depot/projects/hammer/sys/i386/i386/longrun.c#1 branch .. //depot/projects/hammer/sys/i386/i386/mp_machdep.c#27 integrate .. //depot/projects/hammer/sys/i386/i386/p4tcc.c#2 integrate .. //depot/projects/hammer/sys/i386/i386/pmap.c#28 integrate .. //depot/projects/hammer/sys/i386/i386/trap.c#22 integrate .. //depot/projects/hammer/sys/i386/isa/atpic_vector.s#4 integrate .. //depot/projects/hammer/sys/ia64/conf/GENERIC#13 integrate .. //depot/projects/hammer/sys/kern/kern_condvar.c#13 integrate .. //depot/projects/hammer/sys/kern/kern_fork.c#23 integrate .. //depot/projects/hammer/sys/kern/kern_idle.c#9 integrate .. //depot/projects/hammer/sys/kern/kern_intr.c#21 integrate .. //depot/projects/hammer/sys/kern/kern_jail.c#7 integrate .. //depot/projects/hammer/sys/kern/kern_malloc.c#13 integrate .. //depot/projects/hammer/sys/kern/kern_mutex.c#16 integrate .. //depot/projects/hammer/sys/kern/kern_ntptime.c#6 integrate .. //depot/projects/hammer/sys/kern/kern_poll.c#7 integrate .. //depot/projects/hammer/sys/kern/kern_prot.c#12 integrate .. //depot/projects/hammer/sys/kern/kern_shutdown.c#10 integrate .. //depot/projects/hammer/sys/kern/kern_sig.c#31 integrate .. //depot/projects/hammer/sys/kern/kern_subr.c#9 integrate .. //depot/projects/hammer/sys/kern/kern_sx.c#4 integrate .. //depot/projects/hammer/sys/kern/kern_synch.c#26 integrate .. //depot/projects/hammer/sys/kern/kern_thread.c#41 integrate .. //depot/projects/hammer/sys/kern/sched_4bsd.c#13 integrate .. //depot/projects/hammer/sys/kern/sched_ule.c#24 integrate .. //depot/projects/hammer/sys/kern/subr_smp.c#14 integrate .. //depot/projects/hammer/sys/kern/subr_trap.c#16 integrate .. //depot/projects/hammer/sys/kern/subr_turnstile.c#5 integrate .. //depot/projects/hammer/sys/kern/subr_witness.c#24 integrate .. //depot/projects/hammer/sys/modules/Makefile#35 integrate .. //depot/projects/hammer/sys/modules/netgraph/Makefile#7 integrate .. //depot/projects/hammer/sys/net/if.c#14 integrate .. //depot/projects/hammer/sys/net/if_atm.h#9 integrate .. //depot/projects/hammer/sys/net/if_gre.c#11 integrate .. //depot/projects/hammer/sys/net/if_gre.h#5 integrate .. //depot/projects/hammer/sys/net/if_media.h#8 integrate .. //depot/projects/hammer/sys/netgraph/atm/ng_atm.c#7 integrate .. //depot/projects/hammer/sys/netgraph/atm/ng_atm.h#4 integrate .. //depot/projects/hammer/sys/netgraph/bluetooth/drivers/h4/ng_h4.c#4 integrate .. //depot/projects/hammer/sys/netgraph/bluetooth/include/ng_btsocket.h#4 integrate .. //depot/projects/hammer/sys/netgraph/bluetooth/socket/ng_btsocket_hci_raw.c#8 integrate .. //depot/projects/hammer/sys/netgraph/netgraph.h#5 integrate .. //depot/projects/hammer/sys/netgraph/ng_base.c#10 integrate .. //depot/projects/hammer/sys/netgraph/ng_bpf.h#3 integrate .. //depot/projects/hammer/sys/netgraph/ng_bridge.c#7 integrate .. //depot/projects/hammer/sys/netgraph/ng_device.c#3 integrate .. //depot/projects/hammer/sys/netgraph/ng_etf.h#3 integrate .. //depot/projects/hammer/sys/netgraph/ng_ksocket.c#7 integrate .. //depot/projects/hammer/sys/netgraph/ng_message.h#7 integrate .. //depot/projects/hammer/sys/netgraph/ng_parse.c#4 integrate .. //depot/projects/hammer/sys/netgraph/ng_parse.h#4 integrate .. //depot/projects/hammer/sys/netgraph/ng_pppoe.c#7 integrate .. //depot/projects/hammer/sys/netgraph/ng_pppoe.h#4 integrate .. //depot/projects/hammer/sys/netgraph/ng_socket.c#5 integrate .. //depot/projects/hammer/sys/netgraph/ng_source.c#3 integrate .. //depot/projects/hammer/sys/netgraph/ng_source.h#3 integrate .. //depot/projects/hammer/sys/netinet/ip_gre.c#8 integrate .. //depot/projects/hammer/sys/netinet/raw_ip.c#15 integrate .. //depot/projects/hammer/sys/netinet/tcp_syncache.c#12 integrate .. //depot/projects/hammer/sys/netinet/udp_usrreq.c#13 integrate .. //depot/projects/hammer/sys/netinet6/nd6.c#11 integrate .. //depot/projects/hammer/sys/netipsec/ipsec.c#6 integrate .. //depot/projects/hammer/sys/netipsec/ipsec.h#6 integrate .. //depot/projects/hammer/sys/netipsec/xform_esp.c#6 integrate .. //depot/projects/hammer/sys/netipsec/xform_ipcomp.c#6 integrate .. //depot/projects/hammer/sys/netkey/key.c#15 integrate .. //depot/projects/hammer/sys/pc98/conf/GENERIC#13 integrate .. //depot/projects/hammer/sys/pc98/conf/NOTES#17 integrate .. //depot/projects/hammer/sys/powerpc/conf/GENERIC#13 integrate .. //depot/projects/hammer/sys/sparc64/conf/GENERIC#19 integrate .. //depot/projects/hammer/sys/sparc64/include/asmacros.h#5 integrate .. //depot/projects/hammer/sys/sys/_mutex.h#4 integrate .. //depot/projects/hammer/sys/sys/_task.h#1 branch .. //depot/projects/hammer/sys/sys/bio.h#9 integrate .. //depot/projects/hammer/sys/sys/jail.h#3 integrate .. //depot/projects/hammer/sys/sys/lock.h#6 integrate .. //depot/projects/hammer/sys/sys/proc.h#43 integrate .. //depot/projects/hammer/sys/sys/taskqueue.h#4 integrate .. //depot/projects/hammer/sys/ufs/ffs/ffs_vnops.c#18 integrate .. //depot/projects/hammer/sys/vm/swap_pager.c#20 integrate .. //depot/projects/hammer/sys/vm/vm_zeroidle.c#8 integrate .. //depot/projects/hammer/tools/tools/tinderbox/etc/Makefile#4 integrate .. //depot/projects/hammer/tools/tools/tinderbox/etc/current.rc#2 integrate .. //depot/projects/hammer/tools/tools/tinderbox/etc/experimental.rc#3 delete .. //depot/projects/hammer/tools/tools/tinderbox/etc/releng_5.rc#3 integrate .. //depot/projects/hammer/tools/tools/tinderbox/etc/stanley.rc#2 delete .. //depot/projects/hammer/tools/tools/tinderbox/tbmaster.1#6 integrate .. //depot/projects/hammer/tools/tools/tinderbox/tbmaster.pl#16 integrate .. //depot/projects/hammer/tools/tools/tinderbox/tinderbox.1#6 integrate .. //depot/projects/hammer/tools/tools/tinderbox/tinderbox.pl#9 integrate .. //depot/projects/hammer/tools/tools/tinderbox/www/Makefile#5 integrate .. //depot/projects/hammer/tools/tools/tinderbox/www/index.cgi#8 integrate .. //depot/projects/hammer/usr.bin/Makefile#24 integrate .. //depot/projects/hammer/usr.bin/fetch/fetch.1#6 integrate .. //depot/projects/hammer/usr.bin/killall/killall.1#4 integrate .. //depot/projects/hammer/usr.bin/killall/killall.c#8 integrate .. //depot/projects/hammer/usr.bin/login/login.c#6 integrate .. //depot/projects/hammer/usr.bin/make/str.c#6 integrate .. //depot/projects/hammer/usr.bin/mklocale/mklocale.1#8 integrate .. //depot/projects/hammer/usr.bin/script/script.c#4 integrate .. //depot/projects/hammer/usr.sbin/Makefile#40 integrate .. //depot/projects/hammer/usr.sbin/acpi/acpiconf/acpiconf.8#7 integrate .. //depot/projects/hammer/usr.sbin/bluetooth/Makefile#4 integrate .. //depot/projects/hammer/usr.sbin/bluetooth/sdpd/Makefile#1 branch .. //depot/projects/hammer/usr.sbin/bsnmpd/bsnmpd/Makefile#2 integrate .. //depot/projects/hammer/usr.sbin/bsnmpd/bsnmpd/genfiles#2 delete .. //depot/projects/hammer/usr.sbin/bsnmpd/bsnmpd/oid.h#2 delete .. //depot/projects/hammer/usr.sbin/bsnmpd/bsnmpd/tree.c#2 delete .. //depot/projects/hammer/usr.sbin/bsnmpd/bsnmpd/tree.h#2 delete .. //depot/projects/hammer/usr.sbin/chkgrp/chkgrp.8#2 integrate .. //depot/projects/hammer/usr.sbin/ctm/mkCTM/mkctm.c#3 integrate .. //depot/projects/hammer/usr.sbin/kldxref/kldxref.8#3 integrate .. //depot/projects/hammer/usr.sbin/ndiscvt/inf.c#4 integrate .. //depot/projects/hammer/usr.sbin/ngctl/Makefile#3 integrate .. //depot/projects/hammer/usr.sbin/ngctl/config.c#2 integrate .. //depot/projects/hammer/usr.sbin/ngctl/connect.c#2 integrate .. //depot/projects/hammer/usr.sbin/ngctl/debug.c#2 integrate .. //depot/projects/hammer/usr.sbin/ngctl/dot.c#2 integrate .. //depot/projects/hammer/usr.sbin/ngctl/list.c#3 integrate .. //depot/projects/hammer/usr.sbin/ngctl/main.c#5 integrate .. //depot/projects/hammer/usr.sbin/ngctl/mkpeer.c#2 integrate .. //depot/projects/hammer/usr.sbin/ngctl/msg.c#3 integrate .. //depot/projects/hammer/usr.sbin/ngctl/name.c#2 integrate .. //depot/projects/hammer/usr.sbin/ngctl/rmhook.c#2 integrate .. //depot/projects/hammer/usr.sbin/ngctl/show.c#2 integrate .. //depot/projects/hammer/usr.sbin/ngctl/status.c#2 integrate .. //depot/projects/hammer/usr.sbin/ngctl/types.c#2 integrate .. //depot/projects/hammer/usr.sbin/pkg_install/add/extract.c#4 integrate .. //depot/projects/hammer/usr.sbin/sysinstall/tcpip.c#4 integrate .. //depot/projects/hammer/usr.sbin/syslogd/syslogd.c#11 integrate Differences ... ==== //depot/projects/hammer/MAINTAINERS#14 (text+ko) ==== @@ -1,4 +1,4 @@ -$FreeBSD: src/MAINTAINERS,v 1.77 2003/08/01 17:54:11 mbr Exp $ +$FreeBSD: src/MAINTAINERS,v 1.78 2004/01/27 14:33:33 cperciva Exp $ subsystem login notes ----------------------------- @@ -47,6 +47,7 @@ dhcp mbr Needs to pre-approve commits to contrib/isc-dhcp, so changes can be made to the isc.org CVS repository. RELENG_4_* security-officer Requires Security Officer approval. +RELENG_5_* security-officer Requires Security Officer approval. libfetch des Advance notification requested. fetch des Advance notification requested. libpam des Pre-commit review requested. ==== //depot/projects/hammer/Makefile.inc1#36 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.402 2004/01/22 08:18:36 ru Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.403 2004/01/23 16:22:48 harti Exp $ # # Make command line options: # -DNO_DYNAMICROOT do not link /bin and /sbin dynamically @@ -647,6 +647,10 @@ _crunchgen= usr.sbin/crunch/crunchgen .endif +.if ${BOOTSTRAPPING} < 501114 +_gensnmptree= usr.sbin/bsnmpd/gensnmptree +.endif + .if ${BOOTSTRAPPING} < 500019 _kbdcontrol= usr.sbin/kbdcontrol .endif @@ -667,6 +671,7 @@ ${_yacc} \ usr.sbin/config \ ${_crunchgen} \ + ${_gensnmptree} \ ${_kbdcontrol} @${ECHODIR} "===> ${_tool}"; \ cd ${.CURDIR}/${_tool}; \ ==== //depot/projects/hammer/UPDATING#31 (text+ko) ==== @@ -17,6 +17,14 @@ developers choose to disable these features on build machines to maximize performance. +20040125: + ULE has entered into its probationary period as the default scheduler + in GENERIC. For the average user, interactivity is reported to be + better in many cases. On SMP machines ULE will be able to make more + efficient use of the available parallel resources. If you are not + running it now, please switch over, replacing the kernel option + SCHED_4BSD with SCHED_ULE. + 20031213: src/lib/libc/gen/initgroups.c:1.8 now causes logins to fail if the login process is unable to successfully set the @@ -1451,4 +1459,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.285 2003/12/15 19:19:16 jhb Exp $ +$FreeBSD: src/UPDATING,v 1.286 2004/01/26 09:57:04 ale Exp $ ==== //depot/projects/hammer/bin/kill/kill.c#3 (text+ko) ==== @@ -43,7 +43,7 @@ #endif /* not lint */ #endif #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/bin/kill/kill.c,v 1.16 2003/05/01 16:58:55 obrien Exp $"); +__FBSDID("$FreeBSD: src/bin/kill/kill.c,v 1.17 2004/01/28 19:04:14 njl Exp $"); #include <ctype.h> #include <err.h> @@ -82,7 +82,7 @@ errx(1, "illegal signal number: %s", *argv); if (numsig >= 128) numsig -= 128; - if (numsig <= 0 || numsig >= NSIG) + if (numsig <= 0 || numsig >= sys_nsig) nosig(*argv); printf("%s\n", sys_signame[numsig]); exit(0); @@ -112,7 +112,7 @@ numsig = strtol(*argv, &ep, 10); if (!**argv || *ep) errx(1, "illegal signal number: %s", *argv); - if (numsig < 0 || numsig >= NSIG) + if (numsig < 0 || numsig >= sys_nsig) nosig(*argv); } else nosig(*argv); @@ -146,7 +146,7 @@ if (!strncasecmp(sig, "sig", (size_t)3)) sig += 3; - for (n = 1; n < NSIG; n++) { + for (n = 1; n < sys_nsig; n++) { if (!strcasecmp(sys_signame[n], sig)) return (n); } @@ -167,9 +167,9 @@ { int n; - for (n = 1; n < NSIG; n++) { + for (n = 1; n < sys_nsig; n++) { (void)fprintf(fp, "%s", sys_signame[n]); - if (n == (NSIG / 2) || n == (NSIG - 1)) + if (n == (sys_nsig / 2) || n == (sys_nsig - 1)) (void)fprintf(fp, "\n"); else (void)fprintf(fp, " "); ==== //depot/projects/hammer/bin/sh/eval.c#6 (text+ko) ==== @@ -40,7 +40,7 @@ #endif #endif /* not lint */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/bin/sh/eval.c,v 1.40 2004/01/21 12:50:01 des Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/eval.c,v 1.41 2004/01/28 18:22:19 cracauer Exp $"); #include <paths.h> #include <signal.h> @@ -273,7 +273,8 @@ if (pendingsigs) dotrap(); if ((flags & EV_EXIT) || (eflag && exitstatus - && !(flags & EV_TESTED) && (n->type == NCMD))) + && !(flags & EV_TESTED) && (n->type == NCMD || + n->type == NSUBSHELL))) exitshell(exitstatus); } ==== //depot/projects/hammer/bin/sh/jobs.c#8 (text+ko) ==== @@ -40,7 +40,7 @@ #endif #endif /* not lint */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/bin/sh/jobs.c,v 1.64 2003/07/05 15:18:44 dds Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/jobs.c,v 1.65 2004/01/28 19:01:10 njl Exp $"); #include <fcntl.h> #include <signal.h> @@ -362,7 +362,7 @@ else #endif i = WTERMSIG(ps->status); - if ((i & 0x7F) < NSIG && sys_siglist[i & 0x7F]) + if ((i & 0x7F) < sys_nsig && sys_siglist[i & 0x7F]) scopy(sys_siglist[i & 0x7F], s); else fmtstr(s, 64, "Signal %d", i & 0x7F); @@ -985,7 +985,7 @@ if (!mflag || (thisjob->foreground && !WIFSTOPPED(status))) { i = WTERMSIG(status); - if ((i & 0x7F) < NSIG && sys_siglist[i & 0x7F]) + if ((i & 0x7F) < sys_nsig && sys_siglist[i & 0x7F]) out1str(sys_siglist[i & 0x7F]); else out1fmt("Signal %d", i & 0x7F); ==== //depot/projects/hammer/bin/sh/trap.c#2 (text+ko) ==== @@ -40,7 +40,7 @@ #endif #endif /* not lint */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/bin/sh/trap.c,v 1.25 2002/07/24 02:06:07 tjr Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/trap.c,v 1.26 2004/01/28 19:01:10 njl Exp $"); #include <signal.h> #include <unistd.h> @@ -106,8 +106,8 @@ if (strncasecmp(sig, "sig", 3) == 0) sig += 3; - for (n = 1; n < NSIG; n++) - if (strcasecmp(sys_signame[n], sig) == 0) + for (n = 1; n < sys_nsig; n++) + if (sys_signame[n] && strcasecmp(sys_signame[n], sig) == 0) return (n); } return (-1); @@ -122,7 +122,7 @@ { int n; - for (n = 1; n < NSIG; n++) { + for (n = 1; n < sys_nsig; n++) { out1fmt("%s", sys_signame[n]); if (n == (NSIG / 2) || n == (NSIG - 1)) out1str("\n"); @@ -142,7 +142,7 @@ int signo; if (argc <= 1) { - for (signo = 0 ; signo < NSIG ; signo++) { + for (signo = 0 ; signo < sys_nsig ; signo++) { if (trap[signo] != NULL) out1fmt("trap -- '%s' %s\n", trap[signo], (signo) ? sys_signame[signo] : "exit"); ==== //depot/projects/hammer/contrib/bsnmp/FREEBSD-upgrade#2 (text+ko) ==== @@ -1,4 +1,4 @@ -$FreeBSD: src/contrib/bsnmp/FREEBSD-upgrade,v 1.1 2003/11/10 08:56:56 harti Exp $ +$FreeBSD: src/contrib/bsnmp/FREEBSD-upgrade,v 1.2 2004/01/26 10:28:31 harti Exp $ This is the Begemot micro-SNMP daemon. It is the base for the ILMI daemon for ngATM. Be careful to feed changes back to the maintainer @@ -17,9 +17,6 @@ 4. resolve conflicts - 5. regenerate files in src/usr.sbin/bsnmpd/bsnmpd and - src/lib/libbsnmp/modules/* - - 6. commit changed files + 5. check the makefile in lib/libbsnmp and usr.sbin/bsnmp harti ==== //depot/projects/hammer/contrib/bsnmp/NEWS#2 (text+ko) ==== @@ -1,3 +1,24 @@ +09-Dec-2003 + First step on factoring out the transport mapping stuff into + loadable modules. + + Local stream sockets that check the clients privileges. + +03-Dec-2003 + Bump version to 1.5 but leave library version intact. + +03-Dec-2003 + Now works with libbegemot polling stuff instead of libisc. + Use --with-libbegemot[=path] to configure. + +03-Dec-2003 + Fix parsing of non-minimal ASN.1 integers. They are now disallowed. + Non-minimal lengths are allowed. + + Remove copyright clause 3 everywhere. + + Make an autoconf build infrastructure. + 08-Nov-2003 WARNS=6 fixed. ==== //depot/projects/hammer/contrib/bsnmp/README#2 (text+ko) ==== @@ -1,4 +1,4 @@ -Mon Nov 10 09:50:22 CET 2003 +Fri Dec 5 15:01:16 CET 2003 This is a mini-SNMP daemon. The basic daemon implements the system group and a number of private extensions to manage the UDP transport mapping, @@ -13,16 +13,16 @@ Installation ------------ -You need to apply the patch in the patches directory to your system sources. -This adds a sysctl to retrieve multicast address information from the kernel. - As usual by doing: - make obj ; make depend ; make ; make install + configure [--with-libbegemot[=path]] + make + make install This does not install a configuration file. The standard location for the configuration is /etc/snmpd.config, but can be overwritten on the command -line. An example configuration file is provided. +line. An example configuration file is provided. Use --with-libbegemot +to use libbegemot instead of libisc. Running ------- ==== //depot/projects/hammer/contrib/bsnmp/TODO#2 (text+ko) ==== @@ -1,5 +1,17 @@ snmpd_mibII: - handle HC counters by periodically polling the kernel counters. -snmpd_netgraph: - - make some tables writeable +snmpd: + - rethink transports a little bit: make them loadable and make + a private subtree for transports: + OK. Table not writeable yet. + + There should be a transport table that is indexed by the transport name. + This table can be used to load/unload transports at run time. + OK. Table not writeable yet. + + Then there can be a port table that is indexed by transport name and + port name. Plus a transport-specific table indexed by port name only. + + The transport table could contain a column of type OID that points + to the transport-specific table. ==== //depot/projects/hammer/contrib/bsnmp/VERSION#2 (text+ko) ==== @@ -1,1 +1,1 @@ -1.4 +1.5a ==== //depot/projects/hammer/contrib/bsnmp/gensnmptree/gensnmptree.1#2 (text+ko) ==== @@ -28,7 +28,7 @@ .\" NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, .\" EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" $Begemot: bsnmp/gensnmptree/gensnmptree.1,v 1.1 2002/08/15 13:27:44 hbb Exp $ +.\" $Begemot: bsnmp/gensnmptree/gensnmptree.1,v 1.2 2003/12/03 09:56:57 hbb Exp $ .\" .\" Author: Harti Brandt <harti@freebsd.org> .\" ==== //depot/projects/hammer/contrib/bsnmp/gensnmptree/gensnmptree.c#2 (text+ko) ==== @@ -30,7 +30,7 @@ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Begemot: bsnmp/gensnmptree/gensnmptree.c,v 1.34 2003/01/28 13:44:34 hbb Exp $ + * $Begemot: bsnmp/gensnmptree/gensnmptree.c,v 1.36 2003/12/03 09:56:57 hbb Exp $ * * Generate OID table from table description. * ==== //depot/projects/hammer/contrib/bsnmp/lib/asn1.3#2 (text+ko) ==== @@ -30,7 +30,7 @@ .\" NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, .\" EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" $Begemot: bsnmp/lib/asn1.3,v 1.2 2002/08/16 10:02:53 hbb Exp $ +.\" $Begemot: bsnmp/lib/asn1.3,v 1.3 2003/12/02 15:45:48 hbb Exp $ .\" .Dd August 15, 2002 .Dt asn1 3 ==== //depot/projects/hammer/contrib/bsnmp/lib/asn1.c#2 (text+ko) ==== @@ -30,7 +30,7 @@ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Begemot: bsnmp/lib/asn1.c,v 1.24 2003/01/28 13:44:34 hbb Exp $ + * $Begemot: bsnmp/lib/asn1.c,v 1.27 2003/12/08 17:11:58 hbb Exp $ * * ASN.1 for SNMP. */ @@ -244,6 +244,13 @@ err = ASN_ERR_OK; if (len > 8) err = ASN_ERR_RANGE; + else if (len > 1 && + ((*b->asn_cptr == 0x00 && (b->asn_cptr[1] & 0x80) == 0) || + (*b->asn_cptr == 0xff && (b->asn_cptr[1] & 0x80) == 0x80))) { + asn_error(b, "non-minimal integer"); + err = ASN_ERR_BADLEN; + } + if (*b->asn_cptr & 0x80) neg = 1; val = 0; @@ -332,6 +339,10 @@ /* negative integer or too larger */ *vp = 0xffffffffffffffffULL; err = ASN_ERR_RANGE; + } else if (len > 1 && + *b->asn_cptr == 0x00 && (b->asn_cptr[1] & 0x80) == 0) { + asn_error(b, "non-minimal unsigned"); + err = ASN_ERR_BADLEN; } while (len--) { @@ -718,7 +729,6 @@ return (ASN_ERR_OK); } - /* * Application types * ==== //depot/projects/hammer/contrib/bsnmp/lib/asn1.h#2 (text+ko) ==== @@ -30,7 +30,7 @@ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Begemot: bsnmp/lib/asn1.h,v 1.16 2002/02/11 10:19:57 hbb Exp $ + * $Begemot: bsnmp/lib/asn1.h,v 1.17 2003/12/02 15:52:37 hbb Exp $ * * ASN.1 for SNMP */ ==== //depot/projects/hammer/contrib/bsnmp/lib/bsnmpagent.3#2 (text+ko) ==== @@ -30,7 +30,7 @@ .\" NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, .\" EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" $Begemot: bsnmp/lib/bsnmpagent.3,v 1.1 2002/08/16 12:22:58 hbb Exp $ +.\" $Begemot: bsnmp/lib/bsnmpagent.3,v 1.2 2003/12/02 16:13:45 hbb Exp $ .\" .Dd August 16, 2002 .Dt bsnmpagent 3 ==== //depot/projects/hammer/contrib/bsnmp/lib/bsnmpclient.3#2 (text+ko) ==== @@ -30,7 +30,7 @@ .\" NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, .\" EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" $Begemot: bsnmp/lib/bsnmpclient.3,v 1.3 2002/12/11 15:54:07 hbb Exp $ +.\" $Begemot: bsnmp/lib/bsnmpclient.3,v 1.5 2003/12/08 17:11:58 hbb Exp $ .\" .Dd August 15, 2002 .Dt bsnmpclient 3 @@ -107,7 +107,7 @@ .Bd -literal -offset indent struct snmp_client { enum snmp_version version; - int local; /* use local socket */ + int trans; /* transport type to use */ /* these two are read-only for the application */ char *cport; /* port number as string */ @@ -147,13 +147,19 @@ .Xr bsnmplib 3 for applicable values. The default version is .Li SNMP_V2c . -.It Va local -If this is set to true, the library opens a -.Ux -domain socket rather than -an UDP socket. It uses the +.It Va trans +If this is +.Dv SNMP_TRANS_LOC_DGRAM +a local datagram socket is used. +If it is +.Dv SNMP_TRANS_LOC_STREAM +a local stream socket is used. +For +.Dv SNMP_TRANS_UDP +a UDP socket is created. +It uses the .Va chost -field as the path to the server's socket. +field as the path to the server's socket for local sockets. .It Va cport The SNMP agent's UDP port number. This may be a symbolic port number (from .Pa /etc/services ==== //depot/projects/hammer/contrib/bsnmp/lib/bsnmplib.3#2 (text+ko) ==== @@ -30,7 +30,7 @@ .\" NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, .\" EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" $Begemot: bsnmp/lib/bsnmplib.3,v 1.2 2002/08/16 10:02:53 hbb Exp $ +.\" $Begemot: bsnmp/lib/bsnmplib.3,v 1.3 2003/12/02 16:14:28 hbb Exp $ .\" .Dd August 15, 2002 .Dt bsnmplib 3 ==== //depot/projects/hammer/contrib/bsnmp/lib/snmp.c#2 (text+ko) ==== @@ -30,7 +30,7 @@ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Begemot: bsnmp/lib/snmp.c,v 1.34 2003/01/28 13:44:34 hbb Exp $ + * $Begemot: bsnmp/lib/snmp.c,v 1.37 2003/12/08 17:11:58 hbb Exp $ * * SNMP */ @@ -432,6 +432,64 @@ } /* + * Check whether what we have is the complete PDU by snooping at the + * enclosing structure header. This returns: + * -1 if there are ASN.1 errors + * 0 if we need more data + * > 0 the length of this PDU + */ +int +snmp_pdu_snoop(const struct asn_buf *b0) +{ + u_int length; + asn_len_t len; + struct asn_buf b = *b0; + + /* <0x10|0x20> <len> <data...> */ + + if (b.asn_len == 0) + return (0); + if (b.asn_cptr[0] != (ASN_TYPE_SEQUENCE | ASN_TYPE_CONSTRUCTED)) { + asn_error(&b, "bad sequence type %u", b.asn_cptr[0]); + return (-1); + } + b.asn_len--; + b.asn_cptr++; + + if (b.asn_len == 0) + return (0); + + if (*b.asn_cptr & 0x80) { + /* long length */ + length = *b.asn_cptr++ & 0x7f; + b.asn_len--; + if (length == 0) { + asn_error(&b, "indefinite length not supported"); + return (-1); + } + if (length > ASN_MAXLENLEN) { + asn_error(&b, "long length too long (%u)", length); + return (-1); + } + if (length > b.asn_len) + return (0); + len = 0; + while (length--) { + len = (len << 8) | *b.asn_cptr++; + b.asn_len--; + } + } else { + len = *b.asn_cptr++; + b.asn_len--; + } + + if (len > b.asn_len) + return (0); + + return (len + b.asn_cptr - b0->asn_cptr); +} + +/* * Encode the SNMP PDU without the variable bindings field. * We do this the rather uneffective way by * moving things around and assuming that the length field will never ==== //depot/projects/hammer/contrib/bsnmp/lib/snmp.h#2 (text+ko) ==== @@ -30,7 +30,7 @@ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Begemot: bsnmp/lib/snmp.h,v 1.27 2002/03/08 14:24:58 hbb Exp $ + * $Begemot: bsnmp/lib/snmp.h,v 1.29 2003/12/08 17:11:58 hbb Exp $ * * Header file for SNMP functions. */ @@ -164,6 +164,8 @@ enum snmp_code snmp_pdu_decode(struct asn_buf *b, struct snmp_pdu *pdu, int32_t *); enum snmp_code snmp_pdu_encode(struct snmp_pdu *pdu, struct asn_buf *resp_b); +int snmp_pdu_snoop(const struct asn_buf *); + void snmp_pdu_dump(const struct snmp_pdu *pdu); extern void (*snmp_error)(const char *, ...); ==== //depot/projects/hammer/contrib/bsnmp/lib/snmpagent.c#2 (text+ko) ==== @@ -30,7 +30,7 @@ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Begemot: bsnmp/lib/snmpagent.c,v 1.14 2003/01/30 11:23:00 hbb Exp $ + * $Begemot: bsnmp/lib/snmpagent.c,v 1.16 2003/12/03 09:55:58 hbb Exp $ * * SNMP Agent functions */ ==== //depot/projects/hammer/contrib/bsnmp/lib/snmpagent.h#2 (text+ko) ==== @@ -30,7 +30,7 @@ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200401290016.i0T0Gtsl020115>