Date: Sat, 15 Nov 2003 17:28:51 -0800 (PST) From: Peter Wemm <peter@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 42503 for review Message-ID: <200311160128.hAG1SpBD021032@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=42503 Change 42503 by peter@peter_overcee on 2003/11/15 17:27:56 IFC @42502 Affected files ... .. //depot/projects/hammer/UPDATING#27 integrate .. //depot/projects/hammer/etc/mac.conf#5 integrate .. //depot/projects/hammer/lib/libbsnmp/modules/snmp_netgraph/BEGEMOT-NETGRAPH.txt#2 integrate .. //depot/projects/hammer/lib/libbsnmp/modules/snmp_netgraph/snmp_netgraph.3#2 integrate .. //depot/projects/hammer/lib/libbsnmp/modules/snmp_netgraph/snmp_netgraph.c#2 integrate .. //depot/projects/hammer/lib/libc/locale/Makefile.inc#14 integrate .. //depot/projects/hammer/lib/libc/locale/big5.5#2 integrate .. //depot/projects/hammer/lib/libc/locale/euc.4#3 delete .. //depot/projects/hammer/lib/libc/locale/euc.5#1 branch .. //depot/projects/hammer/lib/libc/locale/gb18030.5#3 integrate .. //depot/projects/hammer/lib/libc/locale/gb2312.5#2 integrate .. //depot/projects/hammer/lib/libc/locale/gbk.5#3 integrate .. //depot/projects/hammer/lib/libc/locale/mbrune.3#5 integrate .. //depot/projects/hammer/lib/libc/locale/mskanji.5#2 integrate .. //depot/projects/hammer/lib/libc/locale/multibyte.3#7 integrate .. //depot/projects/hammer/lib/libc/locale/rune.3#6 integrate .. //depot/projects/hammer/lib/libc/locale/setlocale.3#5 integrate .. //depot/projects/hammer/lib/libc/locale/utf2.4#4 delete .. //depot/projects/hammer/lib/libc/locale/utf2.5#1 branch .. //depot/projects/hammer/lib/libc/locale/utf8.5#4 integrate .. //depot/projects/hammer/lib/libc/posix1e/mac.c#5 integrate .. //depot/projects/hammer/libexec/ftpd/ftpd.c#9 integrate .. //depot/projects/hammer/libexec/pppoed/pppoed.c#2 integrate .. //depot/projects/hammer/release/Makefile#40 integrate .. //depot/projects/hammer/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#37 integrate .. //depot/projects/hammer/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#45 integrate .. //depot/projects/hammer/share/examples/netgraph/ngctl#3 integrate .. //depot/projects/hammer/share/man/man4/acpi.4#13 integrate .. //depot/projects/hammer/share/man/man4/ng_atm.4#3 integrate .. //depot/projects/hammer/share/man/man4/ng_bpf.4#2 integrate .. //depot/projects/hammer/share/man/man4/ng_etf.4#2 integrate .. //depot/projects/hammer/share/man/man4/ng_pppoe.4#3 integrate .. //depot/projects/hammer/share/man/man4/pcm.4#6 integrate .. //depot/projects/hammer/share/man/man9/mbuf.9#9 integrate .. //depot/projects/hammer/sys/amd64/amd64/machdep.c#68 integrate .. //depot/projects/hammer/sys/amd64/include/pcpu.h#12 integrate .. //depot/projects/hammer/sys/boot/i386/boot2/boot2.c#9 integrate .. //depot/projects/hammer/sys/boot/pc98/btx/btxldr/btxldr.s#2 integrate .. //depot/projects/hammer/sys/conf/files#38 integrate .. //depot/projects/hammer/sys/conf/kern.post.mk#15 integrate .. //depot/projects/hammer/sys/conf/options.pc98#16 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi.c#15 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi_cpu.c#5 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi_package.c#1 branch .. //depot/projects/hammer/sys/dev/acpica/acpivar.h#14 integrate .. //depot/projects/hammer/sys/fs/fifofs/fifo_vnops.c#13 integrate .. //depot/projects/hammer/sys/geom/geom_subr.c#19 integrate .. //depot/projects/hammer/sys/i386/i386/mp_machdep.c#21 integrate .. //depot/projects/hammer/sys/i386/include/smptests.h#4 integrate .. //depot/projects/hammer/sys/i386/isa/cy.c#5 integrate .. //depot/projects/hammer/sys/ia64/ia64/machdep.c#29 integrate .. //depot/projects/hammer/sys/ia64/include/pcpu.h#3 integrate .. //depot/projects/hammer/sys/kern/kern_physio.c#9 integrate .. //depot/projects/hammer/sys/kern/kern_timeout.c#9 integrate .. //depot/projects/hammer/sys/kern/sched_ule.c#18 integrate .. //depot/projects/hammer/sys/kern/subr_witness.c#21 integrate .. //depot/projects/hammer/sys/kern/sysv_sem.c#11 integrate .. //depot/projects/hammer/sys/kern/vfs_aio.c#16 integrate .. //depot/projects/hammer/sys/kern/vfs_bio.c#24 integrate .. //depot/projects/hammer/sys/modules/acpi/Makefile#8 integrate .. //depot/projects/hammer/sys/modules/nfs4client/Makefile#1 branch .. //depot/projects/hammer/sys/modules/nfsclient/Makefile#3 integrate .. //depot/projects/hammer/sys/netinet/ip_fastfwd.c#2 integrate .. //depot/projects/hammer/sys/netinet/ip_input.c#22 integrate .. //depot/projects/hammer/sys/netinet/ip_var.h#14 integrate .. //depot/projects/hammer/sys/netinet6/ah.h#3 integrate .. //depot/projects/hammer/sys/netinet6/ah_core.c#6 integrate .. //depot/projects/hammer/sys/netinet6/ah_input.c#4 integrate .. //depot/projects/hammer/sys/netinet6/esp_core.c#6 integrate .. //depot/projects/hammer/sys/netinet6/esp_input.c#7 integrate .. //depot/projects/hammer/sys/netinet6/esp_output.c#5 integrate .. //depot/projects/hammer/sys/nfs4client/nfs4_subs.c#3 integrate .. //depot/projects/hammer/sys/nfs4client/nfs4_vfsops.c#2 integrate .. //depot/projects/hammer/sys/nfsclient/krpc_subr.c#7 integrate .. //depot/projects/hammer/sys/nfsclient/nfs.h#5 integrate .. //depot/projects/hammer/sys/pc98/conf/NOTES#11 integrate .. //depot/projects/hammer/sys/pc98/i386/machdep.c#23 integrate .. //depot/projects/hammer/sys/rpc/rpcclnt.c#3 integrate .. //depot/projects/hammer/sys/security/mac_test/mac_test.c#14 integrate .. //depot/projects/hammer/sys/sys/buf.h#9 integrate .. //depot/projects/hammer/sys/sys/mbuf.h#15 integrate .. //depot/projects/hammer/sys/sys/proc.h#39 integrate .. //depot/projects/hammer/sys/sys/reboot.h#4 integrate .. //depot/projects/hammer/sys/sys/sched.h#7 integrate .. //depot/projects/hammer/sys/ufs/ffs/ffs_rawread.c#8 integrate .. //depot/projects/hammer/sys/vm/vnode_pager.c#16 integrate .. //depot/projects/hammer/usr.bin/mklocale/mklocale.1#7 integrate .. //depot/projects/hammer/usr.sbin/IPXrouted/IPXrouted.8#4 integrate .. //depot/projects/hammer/usr.sbin/IPXrouted/Makefile#2 integrate .. //depot/projects/hammer/usr.sbin/IPXrouted/af.c#2 integrate .. //depot/projects/hammer/usr.sbin/IPXrouted/if.c#2 integrate .. //depot/projects/hammer/usr.sbin/IPXrouted/input.c#3 integrate .. //depot/projects/hammer/usr.sbin/IPXrouted/main.c#2 integrate .. //depot/projects/hammer/usr.sbin/IPXrouted/output.c#2 integrate .. //depot/projects/hammer/usr.sbin/IPXrouted/sap_tables.c#3 integrate .. //depot/projects/hammer/usr.sbin/IPXrouted/startup.c#2 integrate .. //depot/projects/hammer/usr.sbin/IPXrouted/tables.c#2 integrate .. //depot/projects/hammer/usr.sbin/IPXrouted/timer.c#2 integrate .. //depot/projects/hammer/usr.sbin/IPXrouted/trace.c#3 integrate .. //depot/projects/hammer/usr.sbin/bluetooth/bt3cfw/bt3cfw.c#4 integrate .. //depot/projects/hammer/usr.sbin/bluetooth/hcseriald/hcseriald.c#4 integrate .. //depot/projects/hammer/usr.sbin/ppp/netgraph.c#2 integrate .. //depot/projects/hammer/usr.sbin/ppp/tty.c#2 integrate Differences ... ==== //depot/projects/hammer/UPDATING#27 (text+ko) ==== @@ -24,11 +24,17 @@ `make world' as the new kernel will know about binaries using the old statfs structure, but an old kernel will not know about the new system calls that support the new statfs - structure. Running an old kernel after a `make world' will - cause programs such as `df' that do a statfs system call to - fail with a bad system call. Marco Wertejuk <wertejuk@mwcis.com> - also reports that cfsd (ports/security/cfs) needs to be - recompiled after these changes are installed. + structure. + Note that the backwards compatibility is only present when the + kernel is configured with the COMPAT_FREEBSD4 option. Since + even /bin/sh will not run with a new kernel without said option + you're pretty much dead in the water without it. Make sure you + have COMPAT_FREEBSD4! + Running an old kernel after a `make world' will cause programs + such as `df' that do a statfs system call to fail with a bad + system call. Marco Wertejuk <wertejuk@mwcis.com> also reports + that cfsd (ports/security/cfs) needs to be recompiled after + these changes are installed. ****************************DANGER******************************* @@ -1425,4 +1431,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.280 2003/11/14 08:07:13 mckusick Exp $ +$FreeBSD: src/UPDATING,v 1.281 2003/11/14 22:11:44 marcel Exp $ ==== //depot/projects/hammer/etc/mac.conf#5 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/etc/mac.conf,v 1.4 2003/11/11 03:30:29 rwatson Exp $ +# $FreeBSD: src/etc/mac.conf,v 1.5 2003/11/15 02:08:01 rwatson Exp $ # # TrustedBSD MAC userland policy configuration file. Kernel modules # export label information, and mac.conf indicates to userland @@ -14,4 +14,5 @@ default_labels file ?biba,?lomac,?mls,?sebsd default_labels ifnet ?biba,?lomac,?mls,?sebsd default_labels process ?biba,?lomac,?mls,?partition,?sebsd +default_labels socket ?biba,?lomac,?mls ==== //depot/projects/hammer/lib/libbsnmp/modules/snmp_netgraph/BEGEMOT-NETGRAPH.txt#2 (text+ko) ==== @@ -27,7 +27,7 @@ -- NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, -- EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -- --- $FreeBSD: src/lib/libbsnmp/modules/snmp_netgraph/BEGEMOT-NETGRAPH.txt,v 1.1 2003/11/10 09:17:34 harti Exp $ +-- $FreeBSD: src/lib/libbsnmp/modules/snmp_netgraph/BEGEMOT-NETGRAPH.txt,v 1.2 2003/11/15 15:26:34 harti Exp $ -- -- Private MIB for netgraph part of Begemot SNMP daemon. -- @@ -44,7 +44,7 @@ FROM BEGEMOT-MIB; begemotNg MODULE-IDENTITY - LAST-UPDATED "200201310000Z" + LAST-UPDATED "200311140000Z" ORGANIZATION "Fraunhofer FOKUS, CATS" CONTACT-INFO " Hartmut Brandt @@ -66,32 +66,32 @@ -- -------------------------------------------------------------------------- NgTypeName ::= TEXTUAL-CONVENTION - DISPLAY-HINT "15a" + DISPLAY-HINT "31a" STATUS current DESCRIPTION "Name of a netgraph type." - SYNTAX OCTET STRING (SIZE(1..15)) + SYNTAX OCTET STRING (SIZE(1..31)) NgNodeName ::= TEXTUAL-CONVENTION - DISPLAY-HINT "15a" + DISPLAY-HINT "31a" STATUS current DESCRIPTION "Name of a netgraph node." - SYNTAX OCTET STRING (SIZE(1..15)) + SYNTAX OCTET STRING (SIZE(1..31)) NgNodeNameOrEmpty ::= TEXTUAL-CONVENTION - DISPLAY-HINT "15a" + DISPLAY-HINT "31a" STATUS current DESCRIPTION "Name of a netgraph node." - SYNTAX OCTET STRING (SIZE(0..15)) + SYNTAX OCTET STRING (SIZE(0..31)) NgHookName ::= TEXTUAL-CONVENTION - DISPLAY-HINT "15a" + DISPLAY-HINT "31a" STATUS current DESCRIPTION "Name of a netgraph hook." - SYNTAX OCTET STRING (SIZE(1..15)) + SYNTAX OCTET STRING (SIZE(1..31)) NgNodeId ::= TEXTUAL-CONVENTION DISPLAY-HINT "x" ==== //depot/projects/hammer/lib/libbsnmp/modules/snmp_netgraph/snmp_netgraph.3#2 (text+ko) ==== @@ -27,9 +27,9 @@ .\" NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, .\" EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libbsnmp/modules/snmp_netgraph/snmp_netgraph.3,v 1.1 2003/11/10 09:17:34 harti Exp $ +.\" $FreeBSD: src/lib/libbsnmp/modules/snmp_netgraph/snmp_netgraph.3,v 1.2 2003/11/15 15:26:34 harti Exp $ .\" -.Dd October 7, 2003 +.Dd November 14, 2003 .Dt snmp_netgraph 3 .Os .Sh NAME @@ -289,8 +289,8 @@ and writes it to the buffer pointed to by .Fa name . This buffer should be at least -.Li NG_NODELEN -+ 1 long. The function returns the node id or 0 if the +.Li NG_NODESIZ +bytes long. The function returns the node id or 0 if the node is not found .Pp The function @@ -300,8 +300,8 @@ and writes it to the buffer pointed to by .Fa type . This buffer should be at least -.Li NG_TYPELEN -+ 1 long. The function returns the node id or 0 if the +.Li NG_TYPESIZ +bytes long. The function returns the node id or 0 if the node is not found. .Pp The function @@ -313,8 +313,8 @@ to the buffer pointed to by .Fa peer_hook . The buffer should be at least -.Li NG_HOOKLEN -+ 1 long. The function returns 0 if the node and the hook is found, -1 +.Li NG_HOOKSIZ +bytes long. The function returns 0 if the node and the hook is found, -1 otherwise. The function skips intermediate tee nodes (see .Xr ng_tee 4 ). .Pp ==== //depot/projects/hammer/lib/libbsnmp/modules/snmp_netgraph/snmp_netgraph.c#2 (text+ko) ==== @@ -27,7 +27,7 @@ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/lib/libbsnmp/modules/snmp_netgraph/snmp_netgraph.c,v 1.1 2003/11/10 09:17:34 harti Exp $ + * $FreeBSD: src/lib/libbsnmp/modules/snmp_netgraph/snmp_netgraph.c,v 1.2 2003/11/15 15:26:34 harti Exp $ * * Netgraph interface for SNMPd. */ @@ -79,7 +79,7 @@ struct csock_buf { STAILQ_ENTRY(csock_buf) link; struct ng_mesg *mesg; - char path[NG_PATHLEN + 1]; + char path[NG_PATHSIZ]; }; static STAILQ_HEAD(, csock_buf) csock_bufs = STAILQ_HEAD_INITIALIZER(csock_bufs); @@ -103,7 +103,7 @@ * Data messages are dispatched by hook names. */ struct datareg { - char hook[NG_HOOKLEN + 1]; + char hook[NG_HOOKSIZ]; ng_hook_f *func; void *arg; const struct lmodule *mod; @@ -124,7 +124,7 @@ /* netgraph type list */ struct ngtype { - char name[NG_TYPELEN + 1]; + char name[NG_TYPESIZ]; struct asn_oid index; TAILQ_ENTRY(ngtype) link; }; @@ -307,7 +307,7 @@ csock_input(int fd __unused, void *udata __unused) { struct ng_mesg *mesg; - char path[NG_PATHLEN + 1]; + char path[NG_PATHSIZ]; if ((mesg = csock_read(path)) == NULL) return; @@ -328,7 +328,7 @@ ng_output_node(const char *node, u_int cookie, u_int opcode, const void *arg, size_t arglen) { - char path[NG_PATHLEN + 1]; + char path[NG_PATHSIZ]; sprintf(path, "%s:", node); return (ng_output(path, cookie, opcode, arg, arglen)); @@ -337,7 +337,7 @@ ng_output_id(ng_ID_t node, u_int cookie, u_int opcode, const void *arg, size_t arglen) { - char path[NG_PATHLEN + 1]; + char path[NG_PATHSIZ]; sprintf(path, "[%x]:", node); return (ng_output(path, cookie, opcode, arg, arglen)); @@ -355,7 +355,7 @@ { int token, err; struct ng_mesg *mesg; - char rpath[NG_PATHLEN + 1]; + char rpath[NG_PATHSIZ]; struct csock_buf *b; struct timeval end, tv; @@ -420,7 +420,7 @@ ng_dialog_node(const char *node, u_int cookie, u_int opcode, const void *arg, size_t arglen) { - char path[NG_PATHLEN + 1]; + char path[NG_PATHSIZ]; sprintf(path, "%s:", node); return (ng_dialog(path, cookie, opcode, arg, arglen)); @@ -429,7 +429,7 @@ ng_dialog_id(ng_ID_t id, u_int cookie, u_int opcode, const void *arg, size_t arglen) { - char path[NG_PATHLEN + 1]; + char path[NG_PATHSIZ]; sprintf(path, "[%x]:", id); return (ng_dialog(path, cookie, opcode, arg, arglen)); @@ -453,7 +453,7 @@ { u_char *resbuf, embuf[100]; ssize_t len; - char hook[NG_HOOKLEN + 1]; + char hook[NG_HOOKSIZ]; struct datareg *d, *d1; if ((resbuf = malloc(resbufsiz + 1)) == NULL) { @@ -530,9 +530,9 @@ return (ENOMEM); strcpy(snmp_nodename, NODENAME); } else { - if ((snmp_nodename = malloc(NG_NODELEN + 1)) == NULL) + if ((snmp_nodename = malloc(NG_NODESIZ)) == NULL) return (ENOMEM); - snprintf(snmp_nodename, NG_NODELEN + 1, "%s", argv[0]); + strlcpy(snmp_nodename, argv[0], NG_NODESIZ); } /* fetch clockinfo (for the number of microseconds per tick) */ @@ -610,9 +610,9 @@ { struct ngm_connect conn; - snprintf(conn.path, NG_PATHLEN + 1, "%s:", node); - snprintf(conn.ourhook, NG_HOOKLEN + 1, ourhook); - snprintf(conn.peerhook, NG_HOOKLEN + 1, peerhook); + snprintf(conn.path, NG_PATHSIZ, "%s:", node); + strlcpy(conn.ourhook, ourhook, NG_HOOKSIZ); + strlcpy(conn.peerhook, peerhook, NG_HOOKSIZ); return (NgSendMsg(csock, ".:", NGM_GENERIC_COOKIE, NGM_CONNECT, &conn, sizeof(conn))); } @@ -621,9 +621,9 @@ { struct ngm_connect conn; - snprintf(conn.path, NG_PATHLEN + 1, "[%x]:", id); - snprintf(conn.ourhook, NG_HOOKLEN + 1, ourhook); - snprintf(conn.peerhook, NG_HOOKLEN + 1, peerhook); + snprintf(conn.path, NG_PATHSIZ, "[%x]:", id); + strlcpy(conn.ourhook, ourhook, NG_HOOKSIZ); + strlcpy(conn.peerhook, peerhook, NG_HOOKSIZ); return (NgSendMsg(csock, ".:", NGM_GENERIC_COOKIE, NGM_CONNECT, &conn, sizeof(conn))); } @@ -633,13 +633,13 @@ const char *peerhook) { struct ngm_connect conn; - char path[NG_PATHLEN + 1]; + char path[NG_PATHSIZ]; - snprintf(path, NG_PATHLEN + 1, "[%x]:", id); + snprintf(path, NG_PATHSIZ, "[%x]:", id); - snprintf(conn.path, NG_PATHLEN + 1, "[%x]:", peer); - snprintf(conn.ourhook, NG_HOOKLEN + 1, ourhook); - snprintf(conn.peerhook, NG_HOOKLEN + 1, peerhook); + snprintf(conn.path, NG_PATHSIZ, "[%x]:", peer); + strlcpy(conn.ourhook, ourhook, NG_HOOKSIZ); + strlcpy(conn.peerhook, peerhook, NG_HOOKSIZ); return (NgSendMsg(csock, path, NGM_GENERIC_COOKIE, NGM_CONNECT, &conn, sizeof(conn))); } @@ -649,17 +649,17 @@ const char *peerhook) { struct ngm_connect conn; - char path[NG_PATHLEN + 1]; + char path[NG_PATHSIZ]; ng_ID_t tee; if ((tee = ng_mkpeer_id(id, NULL, "tee", ourhook, "left")) == 0) return (-1); - snprintf(path, NG_PATHLEN + 1, "[%x]:", tee); + snprintf(path, NG_PATHSIZ, "[%x]:", tee); - snprintf(conn.path, NG_PATHLEN + 1, "[%x]:", peer); - snprintf(conn.ourhook, NG_HOOKLEN + 1, "right"); - snprintf(conn.peerhook, NG_HOOKLEN + 1, peerhook); + snprintf(conn.path, NG_PATHSIZ, "[%x]:", peer); + strlcpy(conn.ourhook, "right", NG_HOOKSIZ); + strlcpy(conn.peerhook, peerhook, NG_HOOKSIZ); return (NgSendMsg(csock, path, NGM_GENERIC_COOKIE, NGM_CONNECT, &conn, sizeof(conn))); } @@ -730,13 +730,13 @@ ng_mkpeer_id(ng_ID_t id, const char *nodename, const char *type, const char *hook, const char *peerhook) { - char path[NG_PATHLEN + 1]; + char path[NG_PATHSIZ]; struct ngm_mkpeer mkpeer; struct ngm_name name; - strcpy(mkpeer.type, type); - strcpy(mkpeer.ourhook, hook); - strcpy(mkpeer.peerhook, peerhook); + strlcpy(mkpeer.type, type, NG_TYPESIZ); + strlcpy(mkpeer.ourhook, hook, NG_HOOKSIZ); + strlcpy(mkpeer.peerhook, peerhook, NG_HOOKSIZ); sprintf(path, "[%x]:", id); if (NgSendMsg(csock, path, NGM_GENERIC_COOKIE, NGM_MKPEER, @@ -762,9 +762,9 @@ int ng_shutdown_id(ng_ID_t id) { - char path[NG_PATHLEN + 1]; + char path[NG_PATHSIZ]; - sprintf(path, "[%x]:", id); + snprintf(path, NG_PATHSIZ, "[%x]:", id); return (NgSendMsg(csock, path, NGM_GENERIC_COOKIE, NGM_SHUTDOWN, NULL, 0)); } @@ -777,7 +777,7 @@ { struct ngm_rmhook rmhook; - snprintf(rmhook.ourhook, NG_HOOKLEN + 1, "%s", ourhook); + strlcpy(rmhook.ourhook, ourhook, NG_HOOKSIZ); return (NgSendMsg(csock, ".:", NGM_GENERIC_COOKIE, NGM_RMHOOK, &rmhook, sizeof(rmhook))); } @@ -789,10 +789,10 @@ ng_rmhook_id(ng_ID_t id, const char *hook) { struct ngm_rmhook rmhook; - char path[NG_PATHLEN + 1]; + char path[NG_PATHSIZ]; - snprintf(rmhook.ourhook, NG_HOOKLEN + 1, "%s", hook); - sprintf(path, "[%x]:", id); + strlcpy(rmhook.ourhook, hook, NG_HOOKSIZ); + snprintf(path, NG_PATHSIZ, "[%x]:", id); return (NgSendMsg(csock, path, NGM_GENERIC_COOKIE, NGM_RMHOOK, &rmhook, sizeof(rmhook))); } @@ -1243,7 +1243,7 @@ case SNMP_OP_SET: if (index_decode(&value->var, sub, iidx, &name, &namelen)) return (SNMP_ERR_NO_CREATION); - if (namelen == 0 || namelen > NG_TYPELEN) { + if (namelen == 0 || namelen >= NG_TYPESIZ) { free(name); return (SNMP_ERR_NO_CREATION); } ==== //depot/projects/hammer/lib/libc/locale/Makefile.inc#14 (text+ko) ==== @@ -1,5 +1,5 @@ # from @(#)Makefile.inc 8.1 (Berkeley) 6/4/93 -# $FreeBSD: src/lib/libc/locale/Makefile.inc,v 1.50 2003/11/08 03:02:45 tjr Exp $ +# $FreeBSD: src/lib/libc/locale/Makefile.inc,v 1.51 2003/11/15 02:13:09 tjr Exp $ # locale sources .PATH: ${.CURDIR}/${MACHINE_ARCH}/locale ${.CURDIR}/locale @@ -31,8 +31,7 @@ wcrtomb.3 \ wcsrtombs.3 wcstod.3 wcstol.3 \ wctrans.3 wctype.3 wcwidth.3 -MAN+= euc.4 utf2.4 -MAN+= big5.5 gb18030.5 gb2312.5 gbk.5 mskanji.5 utf8.5 +MAN+= big5.5 euc.5 gb18030.5 gb2312.5 gbk.5 mskanji.5 utf2.5 utf8.5 MLINKS+=btowc.3 wctob.3 MLINKS+=isdigit.3 isnumber.3 ==== //depot/projects/hammer/lib/libc/locale/big5.5#2 (text+ko) ==== @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libc/locale/big5.5,v 1.1 2003/08/10 09:23:50 tjr Exp $ +.\" $FreeBSD: src/lib/libc/locale/big5.5,v 1.2 2003/11/15 02:26:04 tjr Exp $ .Dd August 7, 2003 .Dt BIG5 5 .Os @@ -43,6 +43,6 @@ the first in the range 0xA1 - 0xFE, the second in the range 0x40 - 0xFE. .Sh SEE ALSO -.Xr euc 4 , +.Xr euc 5 , .Xr gb18030 5 , .Xr utf8 5 ==== //depot/projects/hammer/lib/libc/locale/gb18030.5#3 (text+ko) ==== @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libc/locale/gb18030.5,v 1.4 2003/11/08 03:07:56 tjr Exp $ +.\" $FreeBSD: src/lib/libc/locale/gb18030.5,v 1.5 2003/11/15 02:26:04 tjr Exp $ .Dd August 10, 2003 .Dt GB18030 5 .Os @@ -59,7 +59,7 @@ 0x81-0xFE, have a second byte in the range 0x30-0x39, a third byte in the range 0x81-0xFE and a fourth byte in the range 0x30-0x39. .Sh SEE ALSO -.Xr euc 4 , +.Xr euc 5 , .Xr gb2312 5 , .Xr gbk 5 , .Xr utf8 5 ==== //depot/projects/hammer/lib/libc/locale/gb2312.5#2 (text+ko) ==== @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libc/locale/gb2312.5,v 1.1 2003/11/08 03:02:45 tjr Exp $ +.\" $FreeBSD: src/lib/libc/locale/gb2312.5,v 1.2 2003/11/15 02:26:04 tjr Exp $ .Dd November 7, 2003 .Dt GB2312 5 .Os @@ -46,7 +46,7 @@ Simplified Chinese characters are represented by two bytes, both in the range 0xA1-0xFE. .Sh SEE ALSO -.Xr euc 4 , +.Xr euc 5 , .Xr gb18030 5 , .Xr gbk 5 .Sh STANDARDS ==== //depot/projects/hammer/lib/libc/locale/gbk.5#3 (text+ko) ==== @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libc/locale/gbk.5,v 1.2 2003/11/08 03:07:56 tjr Exp $ +.\" $FreeBSD: src/lib/libc/locale/gbk.5,v 1.3 2003/11/15 02:26:04 tjr Exp $ .Dd August 10, 2003 .Dt GBK 5 .Os @@ -45,7 +45,7 @@ Chinese characters are represented by two bytes, beginning with a byte in the range 0x80-0xFE and ending with a byte in the range 0x40-0xFE. .Sh SEE ALSO -.Xr euc 4 , +.Xr euc 5 , .Xr gb18030 5 , .Xr gb2312 5 , .Xr utf8 5 ==== //depot/projects/hammer/lib/libc/locale/mbrune.3#5 (text+ko) ==== @@ -33,7 +33,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)mbrune.3 8.2 (Berkeley) 4/19/94 -.\" $FreeBSD: src/lib/libc/locale/mbrune.3,v 1.15 2003/02/06 11:04:46 charnier Exp $ +.\" $FreeBSD: src/lib/libc/locale/mbrune.3,v 1.16 2003/11/15 02:26:04 tjr Exp $ .\" .Dd April 19, 1994 .Dt MBRUNE 3 @@ -159,8 +159,8 @@ .Sh SEE ALSO .Xr rune 3 , .Xr setlocale 3 , -.Xr euc 4 , -.Xr utf2 4 , +.Xr euc 5 , +.Xr utf2 5 , .Xr utf8 5 .Sh HISTORY The ==== //depot/projects/hammer/lib/libc/locale/mskanji.5#2 (text+ko) ==== @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libc/locale/mskanji.5,v 1.2 2003/08/10 11:41:38 tjr Exp $ +.\" $FreeBSD: src/lib/libc/locale/mskanji.5,v 1.3 2003/11/15 02:26:04 tjr Exp $ .Dd August 7, 2003 .Dt MSKANJI 5 .Os @@ -65,5 +65,5 @@ extended characters). The second byte ranges from 0x40 - 0xFC, excluding 0x7F (delete). .Sh SEE ALSO -.Xr euc 4 , +.Xr euc 5 , .Xr utf8 5 ==== //depot/projects/hammer/lib/libc/locale/multibyte.3#7 (text+ko) ==== @@ -33,7 +33,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)multibyte.3 8.1 (Berkeley) 6/4/93 -.\" $FreeBSD: src/lib/libc/locale/multibyte.3,v 1.22 2003/11/08 03:23:11 tjr Exp $ +.\" $FreeBSD: src/lib/libc/locale/multibyte.3,v 1.23 2003/11/15 02:26:04 tjr Exp $ .\" .Dd August 10, 2003 .Dt MULTIBYTE 3 @@ -232,13 +232,13 @@ .Xr setlocale 3 , .Xr wcrtomb 3 , .Xr wcsrtombs 3 , -.Xr euc 4 , -.Xr utf2 4 , .Xr big5 5 , +.Xr euc 5 , .Xr gb18030 5 , .Xr gb2312 5 , .Xr gbk 5 , .Xr mskanji 5 , +.Xr utf2 5 , .Xr utf8 5 .Sh STANDARDS The ==== //depot/projects/hammer/lib/libc/locale/rune.3#6 (text+ko) ==== @@ -33,7 +33,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)rune.3 8.2 (Berkeley) 12/11/93 -.\" $FreeBSD: src/lib/libc/locale/rune.3,v 1.23 2003/09/08 19:57:14 ru Exp $ +.\" $FreeBSD: src/lib/libc/locale/rune.3,v 1.24 2003/11/15 02:26:04 tjr Exp $ .\" .Dd October 6, 2002 .Dt RUNE 3 @@ -267,8 +267,8 @@ .Sh SEE ALSO .Xr mbrune 3 , .Xr setlocale 3 , -.Xr euc 4 , -.Xr utf2 4 , +.Xr euc 5 , +.Xr utf2 5 , .Xr utf8 5 .Sh HISTORY These functions first appeared in ==== //depot/projects/hammer/lib/libc/locale/setlocale.3#5 (text+ko) ==== @@ -33,7 +33,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)setlocale.3 8.1 (Berkeley) 6/9/93 -.\" $FreeBSD: src/lib/libc/locale/setlocale.3,v 1.27 2003/05/22 13:02:27 ru Exp $ +.\" $FreeBSD: src/lib/libc/locale/setlocale.3,v 1.28 2003/11/15 02:26:04 tjr Exp $ .\" .Dd October 5, 2002 .Dt SETLOCALE 3 @@ -334,8 +334,8 @@ .Xr rune 3 , .Xr strcoll 3 , .Xr strxfrm 3 , -.Xr euc 4 , -.Xr utf2 4 , +.Xr euc 5 , +.Xr utf2 5 , .Xr utf8 5 .Sh STANDARDS The ==== //depot/projects/hammer/lib/libc/locale/utf8.5#4 (text+ko) ==== @@ -33,7 +33,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)utf2.4 8.1 (Berkeley) 6/4/93 -.\" $FreeBSD: src/lib/libc/locale/utf8.5,v 1.3 2002/11/29 17:35:09 ru Exp $ +.\" $FreeBSD: src/lib/libc/locale/utf8.5,v 1.4 2003/11/15 02:26:04 tjr Exp $ .\" .Dd October 30, 2002 .Dt UTF8 5 @@ -82,7 +82,7 @@ The .Nm encoding supersedes the -.Xr utf2 4 +.Xr utf2 5 encoding. The only differences between the two are that .Nm @@ -90,16 +90,16 @@ .Tn ISO 10646 whereas -.Xr utf2 4 +.Xr utf2 5 is limited to a 16-bit character set, and that -.Xr utf2 4 +.Xr utf2 5 accepts redundant, .No non- Ns Dq "shortest form" representations of characters. .Sh SEE ALSO -.Xr euc 4 , -.Xr utf2 4 +.Xr euc 5 , +.Xr utf2 5 .Rs .%A "Rob Pike" .%A "Ken Thompson" ==== //depot/projects/hammer/lib/libc/posix1e/mac.c#5 (text+ko) ==== @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libc/posix1e/mac.c,v 1.8 2003/08/30 14:51:01 rwatson Exp $ + * $FreeBSD: src/lib/libc/posix1e/mac.c,v 1.10 2003/11/15 04:05:49 rwatson Exp $ */ #include <sys/types.h> @@ -358,6 +358,11 @@ mac_prepare_type(struct mac **mac, const char *name) { struct label_default *ld; + int error; + + error = mac_maybe_init_internal(); + if (error != 0) + return (error); for (ld = LIST_FIRST(&label_default_head); ld != NULL; ld = LIST_NEXT(ld, ld_entries)) { @@ -372,47 +377,27 @@ int mac_prepare_ifnet_label(struct mac **mac) { - int error; - error = mac_maybe_init_internal(); - if (error != 0) - return (error); - return (mac_prepare_type(mac, "ifnet")); } int mac_prepare_file_label(struct mac **mac) { - int error; - error = mac_maybe_init_internal(); - if (error != 0) - return (error); - return (mac_prepare_type(mac, "file")); } int mac_prepare_packet_label(struct mac **mac) { - int error; - error = mac_maybe_init_internal(); - if (error != 0) - return (error); - return (mac_prepare_type(mac, "packet")); } int mac_prepare_process_label(struct mac **mac) { - int error; - - error = mac_maybe_init_internal(); - if (error != 0) - return (error); return (mac_prepare_type(mac, "process")); } ==== //depot/projects/hammer/libexec/ftpd/ftpd.c#9 (text+ko) ==== @@ -44,7 +44,7 @@ static char sccsid[] = "@(#)ftpd.c 8.4 (Berkeley) 4/16/94"; #endif static const char rcsid[] = - "$FreeBSD: src/libexec/ftpd/ftpd.c,v 1.146 2003/09/14 16:42:46 ume Exp $"; + "$FreeBSD: src/libexec/ftpd/ftpd.c,v 1.147 2003/11/15 11:08:26 yar Exp $"; #endif /* not lint */ /* @@ -1970,7 +1970,7 @@ static int send_data(FILE *instr, FILE *outstr, off_t blksize, off_t filesize, int isreg) { - int c, filefd, netfd; + int c, cp, filefd, netfd; char *buf; off_t cnt; @@ -1978,16 +1978,18 @@ switch (type) { case TYPE_A: + cp = '\0'; while ((c = getc(instr)) != EOF) { if (recvurg) goto got_oob; byte_count++; - if (c == '\n') { + if (c == '\n' && cp != '\r') { if (ferror(outstr)) goto data_err; (void) putc('\r', outstr); } (void) putc(c, outstr); + cp = c; } if (recvurg) goto got_oob; ==== //depot/projects/hammer/libexec/pppoed/pppoed.c#2 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/libexec/pppoed/pppoed.c,v 1.22 2002/05/14 12:33:40 brian Exp $ + * $FreeBSD: src/libexec/pppoed/pppoed.c,v 1.23 2003/11/15 15:26:34 harti Exp $ */ #include <sys/param.h> @@ -497,7 +497,7 @@ int main(int argc, char *argv[]) { - char hostname[MAXHOSTNAMELEN], *exec, rhook[NG_HOOKLEN + 1]; + char hostname[MAXHOSTNAMELEN], *exec, rhook[NG_HOOKSIZ]; unsigned char response[1024]; const char *label, *prog, *provider, *acname; struct ngm_connect ngc; ==== //depot/projects/hammer/release/Makefile#40 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/release/Makefile,v 1.823 2003/11/14 08:21:21 kuriyama Exp $ +# $FreeBSD: src/release/Makefile,v 1.824 2003/11/15 03:58:12 kuriyama Exp $ # # make release [BUILDNAME=somename] CHROOTDIR=/some/dir CVSROOT=/cvs/dir \ # [RELEASETAG=tag] @@ -695,7 +695,10 @@ ${RD}/trees/base/etc/services | \ sed -e '/^#.*$$/d' -e 's/[:space:]*#.*$$//g' \ > ${RD}/mfsfd/stand/etc/services + grep 'operator' ${RD}/trees/base/etc/group \ + > ${RD}/mfsfd/stand/etc/group ln ${RD}/mfsfd/stand/etc/services ${RD}/mfsfd/etc/services + ln ${RD}/mfsfd/stand/etc/group ${RD}/mfsfd/etc/group ln ${RD}/mfsfd/stand/etc/netconfig ${RD}/mfsfd/etc/netconfig cp ${RD}/trees/base/COPYRIGHT ${RD}/mfsfd/stand/help/COPYRIGHT.hlp .if !defined(NODOC) ==== //depot/projects/hammer/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#37 (text+ko) ==== @@ -29,7 +29,7 @@ <sect1 id="support"> <sect1info> - <pubdate>$FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml,v 1.198 2003/11/13 22:39:49 simon Exp $</pubdate> + <pubdate>$FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml,v 1.199 2003/11/15 05:24:10 bmah Exp $</pubdate> </sect1info> <title>Supported Devices</title> @@ -997,10 +997,7 @@ <para arch="i386,pc98,sparc64">FORE Systems, Inc. PCA-200E ATM PCI Adapters (hfa and &man.fatm.4; drivers)</para> - <para arch="i386,pc98">IDT 77201/211 NICStAR ATM Adapters (idt - driver)</para> - - <para arch="i386,pc98">FORE Systems, Inc. LE155 ATM Adapter (idt + <para arch="i386,pc98">IDT NICStAR 77201/211-based ATM Adapters (&man.idt.4; driver)</para> <para arch="i386,pc98,sparc64">FORE Systems, Inc. HE155 and HE622 ==== //depot/projects/hammer/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#45 (text+ko) ==== @@ -3,7 +3,7 @@ <corpauthor>The FreeBSD Project</corpauthor> - <pubdate>$FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml,v 1.650 2003/11/10 16:27:53 bmah Exp $</pubdate> + <pubdate>$FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml,v 1.651 2003/11/15 02:19:46 bmah Exp $</pubdate> <copyright> <year>2000</year> @@ -184,7 +184,7 @@ &merged;</para> <para arch="i386,pc98">The DRM kernel modules have been updated from - DRI CVS as of 23 October 2003. Among other changes, this + DRI CVS as of 12 November 2003. Among other changes, this change includes a newly-ported SiS 300/305/540/630/730 driver and mostly-complete SMPng locking.</para> @@ -429,6 +429,9 @@ </listitem> </itemizedlist> + <para>A number of fixes and updates to the IPv6 and IPSec code + have been imported from the KAME Project.</para> + <para>Support for the IPv6 Advanced Sockets API now conforms to RFC 3542 (also known as RFC 2292bis), rather than RFC 2292. Applications using this API have been updated @@ -499,6 +502,36 @@ <para>Some off-by-one errors in the smbfs that prevented it from working correctly with 15-character NetBIOS names have been fixed.</para> + <para>The sizes of some members of the <literal>statfs</literal> + structure have changed from 32 bits to 64 bits in order to + better support multi-terabyte filesystems. + + <itemizedlist> + <listitem> + <para>Users performing source upgrades across this change + must ensure that their kernel and userland bits are in + sync, by following the documented source upgrade + procedures.</para> + </listitem> + + <listitem> >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200311160128.hAG1SpBD021032>