Date: Sun, 22 Apr 2007 14:53:39 GMT From: Oleksandr Tymoshenko <gonzo@FreeBSD.org> To: Perforce Change Reviews <perforce@FreeBSD.org> Subject: PERFORCE change 118588 for review Message-ID: <200704221453.l3MErdaj043307@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=118588 Change 118588 by gonzo@gonzo_jeeves on 2007/04/22 14:52:59 IFC Affected files ... .. //depot/projects/mips2/src/ObsoleteFiles.inc#5 integrate .. //depot/projects/mips2/src/UPDATING#5 integrate .. //depot/projects/mips2/src/compat/opensolaris/misc/fsshare.c#2 integrate .. //depot/projects/mips2/src/contrib/opensolaris/cmd/zdb/zdb.c#2 integrate .. //depot/projects/mips2/src/contrib/opensolaris/lib/libzfs/common/libzfs_changelist.c#2 integrate .. //depot/projects/mips2/src/contrib/opensolaris/lib/libzfs/common/libzfs_config.c#2 integrate .. //depot/projects/mips2/src/contrib/opensolaris/lib/libzfs/common/libzfs_import.c#2 integrate .. //depot/projects/mips2/src/contrib/top/top.c#3 integrate .. //depot/projects/mips2/src/lib/libarchive/archive_write_disk_set_standard_lookup.c#2 integrate .. //depot/projects/mips2/src/lib/libc/net/rthdr.c#2 integrate .. //depot/projects/mips2/src/lib/libc/stdio/fputs.3#3 integrate .. //depot/projects/mips2/src/libexec/ftpd/ftpd.8#3 integrate .. //depot/projects/mips2/src/release/doc/en_US.ISO8859-1/relnotes/article.sgml#3 integrate .. //depot/projects/mips2/src/sbin/fdisk_pc98/fdisk.8#3 integrate .. //depot/projects/mips2/src/sbin/fdisk_pc98/fdisk.c#2 integrate .. //depot/projects/mips2/src/sbin/ping6/ping6.c#2 integrate .. //depot/projects/mips2/src/share/man/man4/Makefile#5 integrate .. //depot/projects/mips2/src/share/man/man4/sbsh.4#2 integrate .. //depot/projects/mips2/src/share/man/man4/worm.4#2 delete .. //depot/projects/mips2/src/share/man/man8/nanobsd.8#2 integrate .. //depot/projects/mips2/src/share/man/man9/pseudofs.9#2 integrate .. //depot/projects/mips2/src/share/misc/committers-ports.dot#3 integrate .. //depot/projects/mips2/src/share/misc/committers-src.dot#3 integrate .. //depot/projects/mips2/src/sys/amd64/amd64/pmap.c#7 integrate .. //depot/projects/mips2/src/sys/amd64/include/vmparam.h#2 integrate .. //depot/projects/mips2/src/sys/bsm/audit.h#3 integrate .. //depot/projects/mips2/src/sys/bsm/audit_internal.h#3 integrate .. //depot/projects/mips2/src/sys/bsm/audit_kevents.h#4 integrate .. //depot/projects/mips2/src/sys/bsm/audit_record.h#4 integrate .. //depot/projects/mips2/src/sys/cam/cam_periph.c#4 integrate .. //depot/projects/mips2/src/sys/cam/cam_periph.h#3 integrate .. //depot/projects/mips2/src/sys/cam/cam_sim.c#3 integrate .. //depot/projects/mips2/src/sys/cam/cam_sim.h#3 integrate .. //depot/projects/mips2/src/sys/cam/cam_xpt.c#4 integrate .. //depot/projects/mips2/src/sys/cam/scsi/scsi_da.c#5 integrate .. //depot/projects/mips2/src/sys/cam/scsi/scsi_pt.c#4 integrate .. //depot/projects/mips2/src/sys/cam/scsi/scsi_sa.c#4 integrate .. //depot/projects/mips2/src/sys/compat/linprocfs/linprocfs.c#4 integrate .. //depot/projects/mips2/src/sys/compat/opensolaris/kern/opensolaris_vfs.c#2 integrate .. //depot/projects/mips2/src/sys/conf/files#5 integrate .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/fs/zfs/spa.c#2 integrate .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/fs/zfs/vdev.c#2 integrate .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#2 integrate .. //depot/projects/mips2/src/sys/contrib/opensolaris/uts/common/fs/zfs/zio.c#2 integrate .. //depot/projects/mips2/src/sys/dev/aic7xxx/aic79xx.c#3 integrate .. //depot/projects/mips2/src/sys/dev/aic7xxx/aic79xx.h#4 integrate .. //depot/projects/mips2/src/sys/dev/aic7xxx/aic7xxx.c#3 integrate .. //depot/projects/mips2/src/sys/dev/aic7xxx/aic7xxx.h#3 integrate .. //depot/projects/mips2/src/sys/dev/aic7xxx/aic7xxx_inline.h#2 integrate .. //depot/projects/mips2/src/sys/dev/ath/if_ath.c#4 integrate .. //depot/projects/mips2/src/sys/dev/cxgb/cxgb_sge.c#3 integrate .. //depot/projects/mips2/src/sys/dev/cxgb/sys/uipc_mvec.c#2 integrate .. //depot/projects/mips2/src/sys/dev/ral/rt2560.c#4 integrate .. //depot/projects/mips2/src/sys/dev/sound/pci/envy24.c#3 integrate .. //depot/projects/mips2/src/sys/dev/sound/pci/envy24ht.c#2 integrate .. //depot/projects/mips2/src/sys/dev/sound/pcm/ac97.c#3 integrate .. //depot/projects/mips2/src/sys/dev/sound/pcm/ac97.h#3 integrate .. //depot/projects/mips2/src/sys/dev/sound/pcm/ac97_patch.c#3 integrate .. //depot/projects/mips2/src/sys/dev/sound/pcm/ac97_patch.h#3 integrate .. //depot/projects/mips2/src/sys/dev/usb/if_ural.c#4 integrate .. //depot/projects/mips2/src/sys/dev/wi/if_wi.c#3 integrate .. //depot/projects/mips2/src/sys/fs/devfs/devfs_vnops.c#5 integrate .. //depot/projects/mips2/src/sys/i386/i386/pmap.c#6 integrate .. //depot/projects/mips2/src/sys/i386/include/vmparam.h#3 integrate .. //depot/projects/mips2/src/sys/ia64/include/vmparam.h#3 integrate .. //depot/projects/mips2/src/sys/kern/kern_malloc.c#4 integrate .. //depot/projects/mips2/src/sys/kern/sched_ule.c#3 integrate .. //depot/projects/mips2/src/sys/kern/uipc_syscalls.c#5 integrate .. //depot/projects/mips2/src/sys/netgraph/ng_ppp.c#3 integrate .. //depot/projects/mips2/src/sys/netinet/sctp.h#2 integrate .. //depot/projects/mips2/src/sys/netinet/sctp_indata.c#3 integrate .. //depot/projects/mips2/src/sys/netinet/sctp_indata.h#2 integrate .. //depot/projects/mips2/src/sys/netinet/sctp_input.c#3 integrate .. //depot/projects/mips2/src/sys/netinet/sctp_lock_bsd.h#2 integrate .. //depot/projects/mips2/src/sys/netinet/sctp_output.c#3 integrate .. //depot/projects/mips2/src/sys/netinet/sctp_pcb.c#3 integrate .. //depot/projects/mips2/src/sys/netinet/sctp_pcb.h#2 integrate .. //depot/projects/mips2/src/sys/netinet/sctp_structs.h#3 integrate .. //depot/projects/mips2/src/sys/netinet/sctp_uio.h#3 integrate .. //depot/projects/mips2/src/sys/netinet/sctp_usrreq.c#3 integrate .. //depot/projects/mips2/src/sys/netinet/sctp_var.h#3 integrate .. //depot/projects/mips2/src/sys/netinet/sctputil.c#3 integrate .. //depot/projects/mips2/src/sys/netinet/sctputil.h#3 integrate .. //depot/projects/mips2/src/sys/netinet/tcp.h#3 integrate .. //depot/projects/mips2/src/sys/netinet/tcp_input.c#4 integrate .. //depot/projects/mips2/src/sys/netinet/tcp_output.c#4 integrate .. //depot/projects/mips2/src/sys/netinet/tcp_syncache.c#4 integrate .. //depot/projects/mips2/src/sys/netinet/tcp_var.h#4 integrate .. //depot/projects/mips2/src/sys/netinet6/in6_pcb.c#4 integrate .. //depot/projects/mips2/src/sys/nfsclient/nfs_lock.c#3 integrate .. //depot/projects/mips2/src/sys/nfsserver/nfs_syscalls.c#3 integrate .. //depot/projects/mips2/src/sys/pci/if_vr.c#4 integrate .. //depot/projects/mips2/src/sys/pci/if_vrreg.h#4 integrate .. //depot/projects/mips2/src/sys/pci/intpm.c#3 integrate .. //depot/projects/mips2/src/sys/powerpc/powerpc/nexus.c#3 integrate .. //depot/projects/mips2/src/sys/security/audit/audit_syscalls.c#4 integrate .. //depot/projects/mips2/src/sys/security/mac/mac_audit.c#1 branch .. //depot/projects/mips2/src/sys/security/mac/mac_framework.h#2 integrate .. //depot/projects/mips2/src/sys/security/mac/mac_policy.h#2 integrate .. //depot/projects/mips2/src/sys/security/mac_biba/mac_biba.c#4 integrate .. //depot/projects/mips2/src/sys/security/mac_bsdextended/mac_bsdextended.c#3 integrate .. //depot/projects/mips2/src/sys/security/mac_lomac/mac_lomac.c#3 integrate .. //depot/projects/mips2/src/sys/security/mac_mls/mac_mls.c#3 integrate .. //depot/projects/mips2/src/sys/security/mac_stub/mac_stub.c#3 integrate .. //depot/projects/mips2/src/sys/security/mac_test/mac_test.c#3 integrate .. //depot/projects/mips2/src/sys/sparc64/include/vmparam.h#2 integrate .. //depot/projects/mips2/src/sys/sun4v/include/vmparam.h#2 integrate .. //depot/projects/mips2/src/sys/sys/priv.h#3 integrate .. //depot/projects/mips2/src/sys/sys/socket.h#4 integrate .. //depot/projects/mips2/src/tools/regression/netinet6/inet6_rth/Makefile#1 branch .. //depot/projects/mips2/src/tools/regression/netinet6/inet6_rth/inet6_rth-segments.c#1 branch .. //depot/projects/mips2/src/tools/regression/netinet6/inet6_rth/test_subr.c#1 branch .. //depot/projects/mips2/src/tools/regression/netinet6/inet6_rth/test_subr.h#1 branch .. //depot/projects/mips2/src/tools/regression/sockets/sendfile/Makefile#3 integrate .. //depot/projects/mips2/src/tools/regression/sockets/sendfile/sendfile.c#3 integrate .. //depot/projects/mips2/src/tools/regression/usr.bin/sed/regress.sh#3 integrate .. //depot/projects/mips2/src/tools/sched/schedgraph.py#3 integrate .. //depot/projects/mips2/src/tools/tools/nanobsd/nanobsd.sh#4 integrate .. //depot/projects/mips2/src/usr.bin/make/GNode.h#2 integrate .. //depot/projects/mips2/src/usr.bin/make/main.c#4 integrate .. //depot/projects/mips2/src/usr.bin/make/make.c#2 integrate .. //depot/projects/mips2/src/usr.bin/make/targ.c#2 integrate .. //depot/projects/mips2/src/usr.bin/sed/extern.h#2 integrate .. //depot/projects/mips2/src/usr.bin/sed/main.c#2 integrate .. //depot/projects/mips2/src/usr.bin/sed/process.c#3 integrate .. //depot/projects/mips2/src/usr.bin/sed/sed.1#2 integrate .. //depot/projects/mips2/src/usr.sbin/daemon/daemon.c#3 integrate .. //depot/projects/mips2/src/usr.sbin/pmcstat/pmcstat.c#3 integrate Differences ... ==== //depot/projects/mips2/src/ObsoleteFiles.inc#5 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/ObsoleteFiles.inc,v 1.79 2007/04/17 01:02:55 thompsa Exp $ +# $FreeBSD: src/ObsoleteFiles.inc,v 1.80 2007/04/20 23:47:30 brueffer Exp $ # # This file lists old files (OLD_FILES), libraries (OLD_LIBS) and # directories (OLD_DIRS) which should get removed at an update. Recently @@ -14,6 +14,8 @@ # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last. # +# 20070421: worm.4 removed +OLD_FILES+=usr/share/man/man4/worm.4.gz # 20070417: trunk(4) renamed to lagg(4) OLD_FILES+=usr/include/net/if_trunk.h # 20070409: uuidgen moved to /bin/ ==== //depot/projects/mips2/src/UPDATING#5 (text+ko) ==== @@ -21,17 +21,6 @@ developers choose to disable these features on build machines to maximize performance. -20070418: - A new acct(5) format is imminent. If you want to maintain access - to your accounting files, use the new lastcomm(1) -X functionality to - export them into text format, and keep around a copy of the lastcomm - binary. An updated lastcomm(1) program will allow you to import - the text files into the new acct(5) format. The change will also - invalidate the condensed summary files /var/account/savacct and - /var/account/usracct. If your process accounting system relies - on them, you will need to save their contents in a readable format - before the switch. - 20070417: The new trunk(4) driver has been renamed to lagg(4) as it better reflects its purpose. ifconfig will need to be recompiled. @@ -778,4 +767,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.487 2007/04/18 17:34:59 dds Exp $ +$FreeBSD: src/UPDATING,v 1.488 2007/04/19 17:08:54 dds Exp $ ==== //depot/projects/mips2/src/compat/opensolaris/misc/fsshare.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/compat/opensolaris/misc/fsshare.c,v 1.1 2007/04/06 01:08:59 pjd Exp $"); +__FBSDID("$FreeBSD: src/compat/opensolaris/misc/fsshare.c,v 1.2 2007/04/21 13:17:23 pjd Exp $"); #include <sys/param.h> #include <stdio.h> @@ -99,21 +99,30 @@ /* * Function translate options to a format acceptable by exports(5), eg. * - * -ro -network=192.168.0.0 -mask=255.255.255.0 -maproot=0 + * -ro -network=192.168.0.0 -mask=255.255.255.0 -maproot=0 freefall.freebsd.org 69.147.83.54 * * Accepted input formats: * - * ro,network=192.168.0.0,mask=255.255.255.0,maproot=0 - * ro network=192.168.0.0 mask=255.255.255.0 maproot=0 - * -ro,-network=192.168.0.0,-mask=255.255.255.0,-maproot=0 - * -ro -network=192.168.0.0 -mask=255.255.255.0 -maproot=0 + * ro,network=192.168.0.0,mask=255.255.255.0,maproot=0,freefall.freebsd.org + * ro network=192.168.0.0 mask=255.255.255.0 maproot=0 freefall.freebsd.org + * -ro,-network=192.168.0.0,-mask=255.255.255.0,-maproot=0,freefall.freebsd.org + * -ro -network=192.168.0.0 -mask=255.255.255.0 -maproot=0 freefall.freebsd.org + * + * Recognized keywords: + * + * ro, maproot, mapall, mask, network, alldirs, public, webnfs, index, quiet + * */ +static const char *known_opts[] = { "ro", "maproot", "mapall", "mask", + "network", "alldirs", "public", "webnfs", "index", "quiet", NULL }; static char * translate_opts(const char *shareopts) { static char newopts[OPTSSIZE]; - char oldopts[OPTSSIZE], opt[64]; + char oldopts[OPTSSIZE]; char *o, *s = NULL; + unsigned int i; + size_t len; strlcpy(oldopts, shareopts, sizeof(oldopts)); newopts[0] = '\0'; @@ -121,8 +130,16 @@ while ((o = strsep(&s, "-, ")) != NULL) { if (o[0] == '\0') continue; - snprintf(opt, sizeof(opt), "-%s ", o); - strlcat(newopts, opt, sizeof(newopts)); + for (i = 0; known_opts[i] != NULL; i++) { + len = strlen(known_opts[i]); + if (strncmp(known_opts[i], o, len) == 0 && + (o[len] == '\0' || o[len] == '=')) { + strlcat(newopts, "-", sizeof(newopts)); + break; + } + } + strlcat(newopts, o, sizeof(newopts)); + strlcat(newopts, " ", sizeof(newopts)); } return (newopts); } ==== //depot/projects/mips2/src/contrib/opensolaris/cmd/zdb/zdb.c#2 (text+ko) ==== @@ -932,11 +932,11 @@ if (doi.doi_checksum != ZIO_CHECKSUM_INHERIT || verbosity >= 6) (void) snprintf(aux + strlen(aux), sizeof (aux), " (K=%s)", - zio_checksum_table[doi.doi_checksum].ci_name); + zio_checksum_table[doi.doi_checksum].ci_name); if (doi.doi_compress != ZIO_COMPRESS_INHERIT || verbosity >= 6) (void) snprintf(aux + strlen(aux), sizeof (aux), " (Z=%s)", - zio_compress_table[doi.doi_compress].ci_name); + zio_compress_table[doi.doi_compress].ci_name); (void) printf("%10lld %3u %5s %5s %5s %5s %s%s\n", (u_longlong_t)object, doi.doi_indirection, iblk, dblk, lsize, @@ -1441,7 +1441,7 @@ (u_longlong_t)zb->zb_objset, (u_longlong_t)zb->zb_object, (u_longlong_t)blkid2offset(bc->bc_dnode, - zb->zb_level, zb->zb_blkid), + zb->zb_level, zb->zb_blkid), blkbuf); } @@ -1951,8 +1951,8 @@ spa_close(spa, (void *)zdb_read_block); error = spa_open(spa_name, spap, (void *)zdb_read_block); if (error) - fatal("Failed to open pool '%s': errno = %d\n", - spa_name, error); + fatal("Failed to open pool '%s': %s", + spa_name, strerror(error)); spa = *spap; } @@ -2156,7 +2156,7 @@ } if (error) - fatal("can't open %s: error %d", argv[0], error); + fatal("can't open %s: %s", argv[0], strerror(error)); argv++; if (--argc > 0) { ==== //depot/projects/mips2/src/contrib/opensolaris/lib/libzfs/common/libzfs_changelist.c#2 (text+ko) ==== @@ -339,22 +339,15 @@ changelist_free(prop_changelist_t *clp) { prop_changenode_t *cn; - uu_list_walk_t *walk; + void *cookie; if (clp->cl_list) { - verify((walk = uu_list_walk_start(clp->cl_list, - UU_WALK_ROBUST)) != NULL); - - while ((cn = uu_list_walk_next(walk)) != NULL) { - - uu_list_remove(clp->cl_list, cn); - + cookie = NULL; + while ((cn = uu_list_teardown(clp->cl_list, &cookie)) != NULL) { zfs_close(cn->cn_handle); free(cn); } - uu_list_walk_end(walk); - uu_list_destroy(clp->cl_list); } if (clp->cl_pool) @@ -418,7 +411,7 @@ } else { ASSERT(!clp->cl_alldependents); verify(uu_list_insert_before(clp->cl_list, - uu_list_first(clp->cl_list), cn) == 0); + uu_list_first(clp->cl_list), cn) == 0); } if (!clp->cl_alldependents) ==== //depot/projects/mips2/src/contrib/opensolaris/lib/libzfs/common/libzfs_config.c#2 (text+ko) ==== @@ -74,22 +74,16 @@ namespace_clear(libzfs_handle_t *hdl) { if (hdl->libzfs_ns_avl) { - uu_avl_walk_t *walk; config_node_t *cn; + void *cookie = NULL; - if ((walk = uu_avl_walk_start(hdl->libzfs_ns_avl, - UU_WALK_ROBUST)) == NULL) - return; - - while ((cn = uu_avl_walk_next(walk)) != NULL) { - uu_avl_remove(hdl->libzfs_ns_avl, cn); + while ((cn = uu_avl_teardown(hdl->libzfs_ns_avl, + &cookie)) != NULL) { nvlist_free(cn->cn_config); free(cn->cn_name); free(cn); } - uu_avl_walk_end(walk); - uu_avl_destroy(hdl->libzfs_ns_avl); hdl->libzfs_ns_avl = NULL; } @@ -110,7 +104,7 @@ config_node_t *cn; nvpair_t *elem; zfs_cmd_t zc = { 0 }; - uu_avl_walk_t *walk; + void *cookie; if (hdl->libzfs_ns_gen == 0) { /* @@ -172,21 +166,13 @@ /* * Clear out any existing configuration information. */ - if ((walk = uu_avl_walk_start(hdl->libzfs_ns_avl, - UU_WALK_ROBUST)) == NULL) { - nvlist_free(config); - return (no_memory(hdl)); - } - - while ((cn = uu_avl_walk_next(walk)) != NULL) { - uu_avl_remove(hdl->libzfs_ns_avl, cn); + cookie = NULL; + while ((cn = uu_avl_teardown(hdl->libzfs_ns_avl, &cookie)) != NULL) { nvlist_free(cn->cn_config); free(cn->cn_name); free(cn); } - uu_avl_walk_end(walk); - elem = NULL; while ((elem = nvlist_next_nvpair(config, elem)) != NULL) { nvlist_t *child; @@ -222,7 +208,7 @@ } /* - * Retrive the configuration for the given pool. The configuration is a nvlist + * Retrieve the configuration for the given pool. The configuration is a nvlist * describing the vdevs, as well as the statistics associated with each one. */ nvlist_t * ==== //depot/projects/mips2/src/contrib/opensolaris/lib/libzfs/common/libzfs_import.c#2 (text+ko) ==== @@ -220,7 +220,7 @@ &state) == 0 && state == POOL_STATE_SPARE && nvlist_lookup_uint64(config, ZPOOL_CONFIG_GUID, &vdev_guid) == 0) { if ((ne = zfs_alloc(hdl, sizeof (name_entry_t))) == NULL) - return (-1); + return (-1); if ((ne->ne_name = zfs_strdup(hdl, path)) == NULL) { free(ne); @@ -748,7 +748,6 @@ zpool_find_import(libzfs_handle_t *hdl, int argc, char **argv) { int i; - DIR *dirp; char path[MAXPATHLEN]; nvlist_t *ret = NULL, *config; int fd; @@ -824,7 +823,6 @@ free(ne); } - return (ret); } ==== //depot/projects/mips2/src/contrib/top/top.c#3 (text+ko) ==== @@ -13,7 +13,7 @@ * Copyright (c) 1994, 1995, William LeFebvre, Argonne National Laboratory * Copyright (c) 1996, William LeFebvre, Group sys Consulting * - * $FreeBSD: src/contrib/top/top.c,v 1.21 2007/04/17 03:12:39 rafan Exp $ + * $FreeBSD: src/contrib/top/top.c,v 1.22 2007/04/19 14:24:54 rafan Exp $ */ /* @@ -410,7 +410,7 @@ default: fprintf(stderr, "Top version %s\n" -"Usage: %s [-bCHIinqStuv] [-d count] [-m io | cpu] [-o field] [-s time]\n" +"Usage: %s [-abCHIijnqStuv] [-d count] [-m io | cpu] [-o field] [-s time]\n" " [-U username] [number]\n", version_string(), myname); exit(1); ==== //depot/projects/mips2/src/lib/libarchive/archive_write_disk_set_standard_lookup.c#2 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_write_disk_set_standard_lookup.c,v 1.1 2007/03/03 07:37:36 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_write_disk_set_standard_lookup.c,v 1.2 2007/04/20 15:32:13 kientzle Exp $"); #ifdef HAVE_SYS_TYPES_H #include <sys/types.h> @@ -72,6 +72,7 @@ id_t id; }; +static const size_t cache_size = 127; static unsigned int hash(const char *); static gid_t lookup_gid(void *, const char *uname, gid_t); static uid_t lookup_uid(void *, const char *uname, uid_t); @@ -99,10 +100,10 @@ int archive_write_disk_set_standard_lookup(struct archive *a) { - struct bucket *ucache = malloc(sizeof(struct bucket[127])); - struct bucket *gcache = malloc(sizeof(struct bucket[127])); - memset(ucache, 0, sizeof(struct bucket[127])); - memset(gcache, 0, sizeof(struct bucket[127])); + struct bucket *ucache = malloc(sizeof(struct bucket[cache_size])); + struct bucket *gcache = malloc(sizeof(struct bucket[cache_size])); + memset(ucache, 0, sizeof(struct bucket[cache_size])); + memset(gcache, 0, sizeof(struct bucket[cache_size])); archive_write_disk_set_group_lookup(a, gcache, lookup_gid, cleanup); archive_write_disk_set_user_lookup(a, ucache, lookup_uid, cleanup); return (ARCHIVE_OK); @@ -113,11 +114,8 @@ { int h; struct bucket *b; - int cache_size; struct bucket *gcache = (struct bucket *)private_data; - cache_size = 127; - /* If no gname, just use the gid provided. */ if (gname == NULL || *gname == '\0') return (gid); @@ -153,11 +151,8 @@ { int h; struct bucket *b; - int cache_size; struct bucket *ucache = (struct bucket *)private_data; - cache_size = 127; - /* If no uname, just use the uid provided. */ if (uname == NULL || *uname == '\0') return (uid); @@ -191,7 +186,12 @@ static void cleanup(void *private) { - free(private); + size_t i; + struct bucket *cache = (struct bucket *)private; + + for (i = 0; i < cache_size; i++) + free(cache[i].name); + free(cache); } ==== //depot/projects/mips2/src/lib/libc/net/rthdr.c#2 (text+ko) ==== @@ -30,7 +30,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/lib/libc/net/rthdr.c,v 1.8 2005/07/19 18:13:58 ume Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/net/rthdr.c,v 1.9 2007/04/19 15:48:16 mtm Exp $"); #include <sys/param.h> #include <sys/types.h> @@ -292,7 +292,9 @@ { switch (type) { case IPV6_RTHDR_TYPE_0: - return (((segments * 2) + 1) << 3); + if ((segments >= 0) && (segments <= 127)) + return (((segments * 2) + 1) << 3); + /* FALLTHROUGH */ default: return (0); /* type not suppported */ } @@ -309,6 +311,9 @@ /* length validation */ if (bp_len < inet6_rth_space(IPV6_RTHDR_TYPE_0, segments)) return (NULL); + /* segment validation */ + if ((segments < 0) || (segments > 127)) + return (NULL); memset(bp, 0, bp_len); rth0 = (struct ip6_rthdr0 *)rth; @@ -334,6 +339,9 @@ switch (rth->ip6r_type) { case IPV6_RTHDR_TYPE_0: rth0 = (struct ip6_rthdr0 *)rth; + /* Don't exceed the number of stated segments */ + if (rth0->ip6r0_segleft == (rth0->ip6r0_len / 2)) + return (-1); nextaddr = (struct in6_addr *)(rth0 + 1) + rth0->ip6r0_segleft; *nextaddr = *addr; rth0->ip6r0_segleft++; ==== //depot/projects/mips2/src/lib/libc/stdio/fputs.3#3 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)fputs.3 8.1 (Berkeley) 6/4/93 -.\" $FreeBSD: src/lib/libc/stdio/fputs.3,v 1.12 2007/01/09 00:28:06 imp Exp $ +.\" $FreeBSD: src/lib/libc/stdio/fputs.3,v 1.14 2007/04/19 14:01:04 phk Exp $ .\" .Dd June 4, 1993 .Dt FPUTS 3 @@ -66,14 +66,11 @@ to the stream .Dv stdout . .Sh RETURN VALUES -The +The functions .Fn fputs -function -returns 0 on success and -.Dv EOF -on error; +and .Fn puts -returns a nonnegative integer on success and +return a nonnegative integer on success and .Dv EOF on error. .Sh ERRORS ==== //depot/projects/mips2/src/libexec/ftpd/ftpd.8#3 (text+ko) ==== @@ -30,9 +30,9 @@ .\" SUCH DAMAGE. .\" .\" @(#)ftpd.8 8.2 (Berkeley) 4/19/94 -.\" $FreeBSD: src/libexec/ftpd/ftpd.8,v 1.72 2007/04/18 22:43:39 yar Exp $ +.\" $FreeBSD: src/libexec/ftpd/ftpd.8,v 1.74 2007/04/20 09:08:20 trhodes Exp $ .\" -.Dd January 21, 2006 +.Dd April 20, 2007 .Dt FTPD 8 .Os .Sh NAME @@ -79,20 +79,19 @@ .Dv AF_INET6 socket. .It Fl 8 -The server is running in transparent UTF-8 mode. -That is, it just encourages RFC\ 2640 compliant clients to send -paths encoded in UTF-8 in their commands. -In particular, the names of files uploaded by such clients will -have UTF-8 encoding. -The clients will also assume that server replies and existing file -names have UTF-8 encoding, too. -The names of files preloaded to the server should meet this expectation -for the clients to present the correct file names to their users. -Own messages of +Enable transparent UTF-8 mode. +RFC\ 2640 compliant clients will be told that the character encoding +used by the server is UTF-8, which is the only effect of the option. +.Pp +This option does not enable any encoding conversion for server file names; +it implies instead that the names of files on the server are encoded +in UTF-8. +As for files uploaded via FTP, it is the duty of the RFC\ 2640 compliant +client to convert their names from the client's local encoding to UTF-8. +FTP command names and own .Nm -are always encoded in ASCII, which in fact is a subset of UTF-8. -.Pp -Note that this option does not make the server do any encoding conversion. +messages are always encoded in ASCII, which is a subset of UTF-8. +Hence no need for server-side conversion at all. .It Fl A Allow only anonymous ftp access. .It Fl a @@ -356,16 +355,15 @@ and not have a null password. In this case a password must be provided by the client before any file operations may be performed. -If the user has an S/Key key, the response from a successful USER -command will include an S/Key challenge. +If the user has an OPIE key, the response from a successful USER +command will include an OPIE challenge. The client may choose to respond with a PASS command giving either -a standard password or an S/Key one-time password. +a standard password or an OPIE one-time password. The server will automatically determine which type of password it has been given and attempt to authenticate accordingly. See -.Xr key 1 -for more information on S/Key authentication. -S/Key is a Trademark of Bellcore. +.Xr opie 4 +for more information on OPIE authentication. .It The login name must not appear in the file .Pa /etc/ftpusers . @@ -559,9 +557,9 @@ .El .Sh SEE ALSO .Xr ftp 1 , -.Xr key 1 , .Xr umask 2 , .Xr getusershell 3 , +.Xr opie 4 , .Xr ftpchroot 5 , .Xr login.conf 5 , .Xr inetd 8 , ==== //depot/projects/mips2/src/release/doc/en_US.ISO8859-1/relnotes/article.sgml#3 (text+ko) ==== @@ -30,7 +30,7 @@ <corpauthor>The &os; Project</corpauthor> - <pubdate>$FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/article.sgml,v 1.1018 2007/04/17 07:01:45 brueffer Exp $</pubdate> + <pubdate>$FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/article.sgml,v 1.1021 2007/04/21 03:45:18 hrs Exp $</pubdate> <copyright> <year>2000</year> @@ -438,14 +438,19 @@ statistics via a binary structure stream.</para> <para>The sysctl variable <varname>hw.pci.do_powerstate</varname> - has been changed from a boolean to a range. + has been split into two sysctl variables + <varname>hw.pci.do_powerstate_nodriver</varname> + and <varname>hw.pci.do_powerstate_resume</varname>. + Also, these variables have been changed from a boolean to a range. <literal>0</literal> means no power management, <literal>1</literal> means conservative power management which any device class that has caused problems is added to the watch list, <literal>2</literal> means aggressive power management where any device class that is not fundamental to the system is added to the list, and <literal>3</literal> means power them all down unconditionally. - The default is <literal>1</literal>.</para> + The default values are <literal>0</literal> for + <varname>hw.pci.do_powerstate_nodriver</varname> and + <literal>1</literal> for <varname>hw.pci.do_powerstate_resume</varname>.</para> <para>[&arch.ia64;] The <filename>GENERIC</filename> kernel now enables SMP support by default.</para> @@ -499,6 +504,9 @@ <para>[&arch.pc98;] A bootable CDROM loader has been implemented for the pc98 platform. &merged;</para> + <para>[&arch.pc98;] The <application>IPLware</application> support + in boot0.5 has been enhanced to support version 3.33.</para> + <para>[&arch.i386;] A bug in the i386 boot loader, which could cause file system corruption if a <filename>nextboot.conf</filename> file was used and landed @@ -978,6 +986,10 @@ IPv6 support, it should be used instead. Please note that some rules might need to be adjusted.</para> + <para>The &man.lagg.4; driver, ported from OpenBSD and NetBSD, + has been added to support a variety of protocols and algorithms + for link aggregation, failover, and fault tolerance.</para> + <para>The &man.natm.4;, Native Mode ATM protocol layer is now MPSAFE.</para> <para>A new &man.ng.deflate.4; Netgraph node type has been @@ -1103,10 +1115,6 @@ devices will marked <literal>up</literal> upon creation. &merged; </para> - <para>The &man.lagg.4; driver, ported from OpenBSD and NetBSD, - has been added to support a variety of protocols and algorithms - for link aggregation, failover, and fault tolerance.</para> - <para>Support for &man.kqueue.2; operations has been added to the &man.tun.4; driver. &merged;</para> @@ -1133,6 +1141,10 @@ <para>The &man.arcmsr.4; driver has been updated to version 1.20.00.13. &merged;</para> + <para>The &man.ahc.4; driver is now MPSAFE.</para> + + <para>The &man.ahd.4; driver is now MPSAFE.</para> + <para>The &man.ata.4; driver now supports a workaround for some controllers whose DMA does not work properly in 48bit mode. For affected controllers, @@ -1158,6 +1170,8 @@ <para>The &man.ataraid.4; driver now supports JMicron ATA RAID metadata. &merged;</para> + <para>The CAM subsystem is now MPSAFE.</para> + <para>The <literal>GEOM_LABEL</literal> class now supports Ext2FS, NTFS, and ReiserFS. &merged;</para> @@ -1295,8 +1309,9 @@ <para>A part of the FreeBSD NFS subsystem (the interface with the protocol stack and callouts, the NFS client side) is now MPSAFE.</para> - <para>Initial (read-only) support for SGI's XFS file system has been - added.</para> + <para>The &man.pseudofs.9; pseudo file system construction kit and + all of its consumers (&man.procfs.5;, &man.linprocfs.5; and + &man.linsysfs.5;), are now MPSAFE.</para> <para>The unionfs file system has been re-implemented. This version solves many crashing and locking issues compared to @@ -1312,6 +1327,8 @@ on the <ulink url="http://www.opensolaris.org/os/community/zfs/">; OpenSolaris ZFS page</ulink>.</para> + <para>Initial (read-only) support for SGI's XFS file system has been + added.</para> </sect3> </sect2> @@ -1424,6 +1441,12 @@ <filename>/var/run/ftpd.pid</filename> even when no <option>-p</option> option is specified. &merged;</para> + <para>The &man.ftpd.8; utility now has support for RFC2389 (FEAT) + and rudimentary support for RFC2640 (UTF8). The RFC2640 support + is optional and can be enabled using the new <option>-8</option> + flag. More information can be found in the &man.ftpd.8; manual + page.</para> + <para>The &man.gbde.8; utility now supports <option>-k</option> and <option>-K</option> options to specify a key file in addition to a passphrase.</para> @@ -1520,6 +1543,9 @@ This allows one to use kgdb on <filename>/dev/mem</filename> and be able to patch memory on a live system.</para> + <para>The &man.lastcomm.1; utility now supports a <option>-X</option> + flag to export accounting data in a text format.</para> + <para>The &man.libarchive.3; library now supports POSIX.1e-style Extended Attributes.</para> @@ -1992,7 +2018,7 @@ 0.9.7e to 0.9.8e.</para> <para><application>ncurses</application> has been updated from - 5.2-20010512 to 5.6-20061217. ncurses now also has wide + 5.2-20020615 to 5.6-20061217. ncurses now also has wide character support. &merged;</para> <para><application>hostapd</application> @@ -2000,7 +2026,9 @@ &merged;</para> <para><application>sendmail</application> has been updated from - 8.13.4 to 8.14.1. &merged;</para> + 8.13.4 to 8.14.1. This upgrade includes a new libmilter + library which requires all dynamically linked milters to be + recompiled. &merged;</para> <para><application>tcpdump</application> has been updated from 3.9.1 to 3.9.4. &merged;</para> @@ -2013,12 +2041,12 @@ snapshot from OpenBSD as of 20060831.</para> <para>TrustedBSD <application>OpenBSM</application>, - version 1.0 alpha 12, an implementation of the documented Sun Basic + version 1.0 alpha 14, an implementation of the documented Sun Basic Security Module (BSM) Audit API and file format, as well as local extensions to support the Mac OS X and &os; operating systems has been added. This also includes command line tools for audit - trail reduction and conversion to text, as well as documentation - of the commands, file format, and APIs. + trail reduction and conversion to text and XML, as well as + documentation of the commands, file format, and APIs. For this functionality, the <literal>AUDIT</literal> kernel option, <filename>/var/audit</filename> directory, and <literal>audit</literal> group have been added. &merged;</para> ==== //depot/projects/mips2/src/sbin/fdisk_pc98/fdisk.8#3 (text+ko) ==== @@ -1,4 +1,4 @@ -.\" $FreeBSD: src/sbin/fdisk_pc98/fdisk.8,v 1.18 2006/09/18 11:55:09 ru Exp $ +.\" $FreeBSD: src/sbin/fdisk_pc98/fdisk.8,v 1.19 2007/04/21 22:47:35 imp Exp $ .\" .Dd February 26, 2006 .Dt FDISK 8 @@ -122,6 +122,7 @@ is given. .It Fl v Be verbose. +Partitions that are unused are suppressed unless this flag is specified. When .Fl f is used, ==== //depot/projects/mips2/src/sbin/fdisk_pc98/fdisk.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sbin/fdisk_pc98/fdisk.c,v 1.20 2006/02/26 07:37:10 imp Exp $"); +__FBSDID("$FreeBSD: src/sbin/fdisk_pc98/fdisk.c,v 1.21 2007/04/21 22:47:35 imp Exp $"); #include <sys/disk.h> #include <sys/disklabel.h> @@ -153,7 +153,7 @@ static void print_part(int i); static void init_sector0(unsigned long start); static void init_boot(void); -static void change_part(int i); +static void change_part(int i, int force); static void print_params(void); static void change_active(int which); static void change_code(void); @@ -254,16 +254,16 @@ err(1, "read_s0"); printf("%s: %d cyl %d hd %d sec\n", disk, dos_cyls, dos_heads, dos_sectors); - printf("Part %11s %11s %4s %4s\n", "Start", "Size", "MID", - "SID"); + printf("Part %11s %11s %4s %4s %-16s\n", "Start", "Size", "MID", + "SID", "Name"); for (i = 0; i < NDOSPART; i++) { partp = ((struct pc98_partition *) &mboot.parts) + i; if (partp->dp_sid == 0) continue; - printf("%4d: %11u %11u 0x%02x 0x%02x\n", i + 1, + printf("%4d: %11u %11u 0x%02x 0x%02x %-16.16s\n", i + 1, partp->dp_scyl * cylsecs, (partp->dp_ecyl - partp->dp_scyl + 1) * cylsecs, - partp->dp_mid, partp->dp_sid); + partp->dp_mid, partp->dp_sid, partp->dp_name); } exit(0); } @@ -276,6 +276,7 @@ partp = (struct pc98_partition *) (&mboot.parts[0]); partp->dp_mid = DOSMID_386BSD; partp->dp_sid = DOSSID_386BSD; + strncpy(partp->dp_name, "FreeBSD", sizeof(partp->dp_name)); /* Start c/h/s. */ partp->dp_scyl = partp->dp_ipl_cyl = 1; partp->dp_shd = partp->dp_ipl_head = 1; @@ -312,9 +313,9 @@ printf("Information from DOS bootblock is:\n"); if (partition == -1) for (i = 1; i <= NDOSPART; i++) - change_part(i); + change_part(i, v_flag); else - change_part(partition); + change_part(partition, 1); if (u_flag || a_flag) change_active(partition); @@ -349,6 +350,17 @@ exit(1); } +static struct pc98_partition mtpart; + +static int +part_unused(int i) +{ + struct pc98_partition *partp; + + partp = ((struct pc98_partition *) &mboot.parts) + i - 1; + return (bcmp(partp, &mtpart, sizeof (struct pc98_partition)) == 0); +} + static void print_s0(int which) { @@ -356,30 +368,31 @@ print_params(); printf("Information from DOS bootblock is:\n"); - if (which == -1) + if (which == -1) { for (i = 1; i <= NDOSPART; i++) - printf("%d: ", i), print_part(i); + if (v_flag || !part_unused(i)) { + printf("%d: ", i); + print_part(i); + } + } else print_part(which); } -static struct pc98_partition mtpart; - static void print_part(int i) { struct pc98_partition *partp; u_int64_t part_sz, part_mb; - partp = ((struct pc98_partition *) &mboot.parts) + i - 1; - - if (!bcmp(partp, &mtpart, sizeof (struct pc98_partition))) { + if (part_unused(i)) { printf("<UNUSED>\n"); return; } /* * Be careful not to overflow. */ + partp = ((struct pc98_partition *) &mboot.parts) + i - 1; part_sz = (partp->dp_ecyl - partp->dp_scyl + 1) * cylsecs; part_mb = part_sz * secsize; part_mb /= (1024 * 1024); @@ -422,66 +435,68 @@ } static void -change_part(int i) +change_part(int i, int force) { struct pc98_partition *partp = ((struct pc98_partition *) &mboot.parts) + i - 1; - printf("The data for partition %d is:\n", i); - print_part(i); + if (!force && part_unused(i)) + return; + + printf("The data for partition %d is:\n", i); + print_part(i); >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200704221453.l3MErdaj043307>