Date: Wed, 4 Oct 2006 19:52:31 GMT From: Kip Macy <kmacy@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 107258 for review Message-ID: <200610041952.k94JqVZ7067637@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=107258 Change 107258 by kmacy@kmacy_storage:sun4v_work_stable on 2006/10/04 19:52:04 IFC Affected files ... .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssh/FREEBSD-upgrade#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssh/config.h#4 integrate .. //depot/projects/kmacy_sun4v_stable/src/crypto/openssh/sshd.c#3 integrate .. //depot/projects/kmacy_sun4v_stable/src/etc/network.subr#4 integrate .. //depot/projects/kmacy_sun4v_stable/src/etc/rc.d/dhclient#4 integrate .. //depot/projects/kmacy_sun4v_stable/src/etc/rc.subr#5 integrate .. //depot/projects/kmacy_sun4v_stable/src/gnu/usr.bin/Makefile#3 integrate .. //depot/projects/kmacy_sun4v_stable/src/lib/libarchive/archive_read_extract.c#3 integrate .. //depot/projects/kmacy_sun4v_stable/src/lib/libc/gen/arc4random.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sbin/ifconfig/ifconfig.8#5 integrate .. //depot/projects/kmacy_sun4v_stable/src/share/man/man4/ddb.4#3 integrate .. //depot/projects/kmacy_sun4v_stable/src/share/man/man9/Makefile#5 integrate .. //depot/projects/kmacy_sun4v_stable/src/share/man/man9/zone.9#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/compat/freebsd32/freebsd32_proto.h#6 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/compat/freebsd32/freebsd32_syscall.h#6 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/compat/freebsd32/freebsd32_syscalls.c#6 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/compat/freebsd32/freebsd32_sysent.c#6 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/compat/freebsd32/syscalls.master#6 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/dev/aic/aic_pccard.c#2 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/dev/bge/if_bge.c#6 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/dev/bge/if_bgereg.h#5 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/dev/usb/ehci.c#4 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/dev/usb/ohci.c#4 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/dev/usb/usb_subr.c#3 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/dev/usb/usbdi.c#4 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/kern/init_sysent.c#6 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/kern/kern_resource.c#4 edit .. //depot/projects/kmacy_sun4v_stable/src/sys/kern/syscalls.c#6 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/kern/syscalls.master#7 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/kern/systrace_args.c#3 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/kern/tty_pty.c#3 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/kern/vfs_mount.c#6 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/netinet/if_ether.c#5 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/security/audit/audit_bsm.c#6 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/sys/_elf_solaris.h#1 branch .. //depot/projects/kmacy_sun4v_stable/src/sys/sys/elf.h#1 branch .. //depot/projects/kmacy_sun4v_stable/src/sys/sys/mount.h#3 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/sys/syscall.h#6 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/sys/syscall.mk#6 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/sys/sysproto.h#6 integrate .. //depot/projects/kmacy_sun4v_stable/src/sys/sys/time.h#3 integrate Differences ... ==== //depot/projects/kmacy_sun4v_stable/src/crypto/openssh/FREEBSD-upgrade#2 (text+ko) ==== @@ -42,20 +42,28 @@ 7) Run configure with the appropriate arguments: $ ./configure --prefix=/usr --sysconfdir=/etc/ssh \ - --with-pam --with-tcp-wrappers --with-libedit + --with-pam --with-tcp-wrappers --with-libedit \ + --with-ssl-engine + + This will regenerate config.h, which must be committed along with + the rest. Note that we don't want to configure OpenSSH for Kerberos using configure since we have to be able to turn it on or off depending on the value of MK_KERBEROS. Our Makefiles take care of this. -8) Commit the resulting config.h. Make sure you don't accidentally - commit any other files created by autoconf, autoheader or - configure; they'll just clutter up the repo and cause trouble at - the next upgrade. +8) If source files have been added or removed, update the appropriate + makefiles to reflect changes in the vendor's Makefile.in. + +9) Build libssh. Follow the instructions in ssh_namespace.h to get a + list of new symbols. Update ssh_namespace.h, build everything, + install and test. -9) Build and test. +A) Build and test the pam_ssh PAM module. It gropes around libssh's + internals and will break if something significant changes or if + ssh_namespace.h is out of whack. -A) Re-commit everything on freefall (you *did* use a test repo for +B) Re-commit everything on repoman (you *did* use a test repo for this, didn't you?) @@ -126,4 +134,4 @@ -- des@FreeBSD.org -$FreeBSD: src/crypto/openssh/FREEBSD-upgrade,v 1.11 2006/03/17 18:54:20 ru Exp $ +$FreeBSD: src/crypto/openssh/FREEBSD-upgrade,v 1.12 2006/10/02 12:39:28 des Exp $ ==== //depot/projects/kmacy_sun4v_stable/src/crypto/openssh/config.h#4 (text+ko) ==== @@ -458,7 +458,7 @@ #define HAVE_INT64_T 1 /* Define to 1 if you have the <inttypes.h> header file. */ -/* #undef HAVE_INTTYPES_H */ +#define HAVE_INTTYPES_H 1 /* define if you have intxx_t data type */ #define HAVE_INTXX_T 1 @@ -548,7 +548,7 @@ #define HAVE_MEMMOVE 1 /* Define to 1 if you have the <memory.h> header file. */ -/* #undef HAVE_MEMORY_H */ +#define HAVE_MEMORY_H 1 /* Define to 1 if you have the `mkdtemp' function. */ #define HAVE_MKDTEMP 1 @@ -780,7 +780,7 @@ #define HAVE_STDINT_H 1 /* Define to 1 if you have the <stdlib.h> header file. */ -/* #undef HAVE_STDLIB_H */ +#define HAVE_STDLIB_H 1 /* Define to 1 if you have the `strdup' function. */ #define HAVE_STRDUP 1 @@ -915,7 +915,7 @@ #define HAVE_SYS_TIME_H 1 /* Define to 1 if you have the <sys/types.h> header file. */ -/* #undef HAVE_SYS_TYPES_H */ +#define HAVE_SYS_TYPES_H 1 /* Define to 1 if you have the <sys/un.h> header file. */ #define HAVE_SYS_UN_H 1 @@ -1243,7 +1243,7 @@ /* #undef SSH_TUN_PREPEND_AF */ /* Define to 1 if you have the ANSI C header files. */ -/* #undef STDC_HEADERS */ +#define STDC_HEADERS 1 /* Define if you want a different $PATH for the superuser */ /* #undef SUPERUSER_PATH */ ==== //depot/projects/kmacy_sun4v_stable/src/crypto/openssh/sshd.c#3 (text+ko) ==== @@ -43,7 +43,7 @@ */ #include "includes.h" -__RCSID("$FreeBSD: src/crypto/openssh/sshd.c,v 1.43 2006/09/30 13:38:05 des Exp $"); +__RCSID("$FreeBSD: src/crypto/openssh/sshd.c,v 1.44 2006/10/03 11:33:25 des Exp $"); #include <sys/types.h> #include <sys/ioctl.h> @@ -83,7 +83,9 @@ #ifdef __FreeBSD__ #include <resolv.h> -#ifdef GSSAPI +#if defined(GSSAPI) && defined(HAVE_GSSAPI_H) +#include <gssapi.h> +#elif defined(GSSAPI) && defined(HAVE_GSSAPI_GSSAPI_H) #include <gssapi/gssapi.h> #endif #endif ==== //depot/projects/kmacy_sun4v_stable/src/etc/network.subr#4 (text+ko) ==== @@ -22,7 +22,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/etc/network.subr,v 1.173 2006/09/21 01:44:52 brooks Exp $ +# $FreeBSD: src/etc/network.subr,v 1.174 2006/10/02 10:13:29 gnn Exp $ # # @@ -41,6 +41,10 @@ { _cfg=1 + if checkyesno ipv6_enable; then + ${SYSCTL_W} net.inet6.ip6.auto_linklocal=1 + fi + ifconfig_args=`ifconfig_getargs $1` if [ -n "${ifconfig_args}" ]; then ifconfig $1 up ==== //depot/projects/kmacy_sun4v_stable/src/etc/rc.d/dhclient#4 (text+ko) ==== @@ -1,7 +1,7 @@ #!/bin/sh # # $NetBSD: dhclient,v 1.8 2002/03/22 04:33:58 thorpej Exp $ -# $FreeBSD: src/etc/rc.d/dhclient,v 1.24 2006/08/17 19:57:10 brian Exp $ +# $FreeBSD: src/etc/rc.d/dhclient,v 1.25 2006/10/02 18:50:58 brooks Exp $ # # PROVIDE: dhclient @@ -53,6 +53,7 @@ ifn="$2" load_rc_config $name +load_rc_config network if ! dhcpif $ifn; then return 1 ==== //depot/projects/kmacy_sun4v_stable/src/etc/rc.subr#5 (text+ko) ==== @@ -1,5 +1,5 @@ # $NetBSD: rc.subr,v 1.66 2006/04/01 10:05:50 he Exp $ -# $FreeBSD: src/etc/rc.subr,v 1.68 2006/08/22 11:17:28 flz Exp $ +# $FreeBSD: src/etc/rc.subr,v 1.69 2006/10/02 08:20:37 yar Exp $ # # Copyright (c) 1997-2004 The NetBSD Foundation, Inc. # All rights reserved. @@ -1008,7 +1008,7 @@ case ${rc_debug} in [Yy][Ee][Ss]|[Tt][Rr][Uu][Ee]|[Oo][Nn]|1) if [ -x /usr/bin/logger ]; then - logger "$0: INFO: $*" + logger "$0: DEBUG: $*" fi echo 1>&2 "$0: DEBUG: $*" ;; ==== //depot/projects/kmacy_sun4v_stable/src/gnu/usr.bin/Makefile#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/gnu/usr.bin/Makefile,v 1.90 2006/08/24 15:46:29 marcel Exp $ +# $FreeBSD: src/gnu/usr.bin/Makefile,v 1.91 2006/10/03 00:03:30 imp Exp $ .include <bsd.own.mk> @@ -24,10 +24,6 @@ sort \ ${_texinfo} -.if ${MACHINE_ARCH} == "arm" -MK_GDB= no # not yet -.endif - .if ${MK_CXX} != "no" _gperf= gperf .if ${MK_GROFF} != "no" ==== //depot/projects/kmacy_sun4v_stable/src/lib/libarchive/archive_read_extract.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_extract.c,v 1.47 2006/09/05 05:59:45 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_extract.c,v 1.48 2006/10/04 02:08:04 kientzle Exp $"); #include <sys/types.h> #ifdef HAVE_SYS_ACL_H @@ -85,7 +85,8 @@ struct extract { mode_t umask; - mode_t default_dir_mode; + mode_t default_dir_mode_initial; + mode_t default_dir_mode_final; struct archive_string create_parent_dir; struct fixup_entry *fixup_list; struct fixup_entry *current_fixup; @@ -108,9 +109,11 @@ * Mode to use for newly-created dirs during extraction; the correct * mode will be set at the end of the extraction. */ -#define SECURE_DIR_MODE 0700 +#define MINIMUM_DIR_MODE 0700 +#define MAXIMUM_DIR_MODE 0775 static int archive_extract_cleanup(struct archive *); +static int create_extract(struct archive *a); static int extract_block_device(struct archive *, struct archive_entry *, int); static int extract_char_device(struct archive *, @@ -169,17 +172,11 @@ char *original_filename; if (a->extract == NULL) { - a->extract = malloc(sizeof(*a->extract)); - if (a->extract == NULL) { - archive_set_error(a, ENOMEM, "Can't extract"); - return (ARCHIVE_FATAL); - } - a->cleanup_archive_extract = archive_extract_cleanup; - memset(a->extract, 0, sizeof(*a->extract)); + ret = create_extract(a); + if (ret) + return (ret); } extract = a->extract; - umask(extract->umask = umask(0)); /* Read the current umask. */ - extract->default_dir_mode = DEFAULT_DIR_MODE & ~extract->umask; extract->pst = NULL; extract->current_fixup = NULL; restore_pwd = -1; @@ -293,6 +290,35 @@ return (ret); } + +static int +create_extract(struct archive *a) +{ + struct extract *extract; + + extract = malloc(sizeof(*extract)); + if (extract == NULL) { + archive_set_error(a, ENOMEM, "Can't extract"); + return (ARCHIVE_FATAL); + } + a->cleanup_archive_extract = archive_extract_cleanup; + memset(extract, 0, sizeof(*extract)); + umask(extract->umask = umask(0)); /* Read the current umask. */ + /* Final permission for default dirs. */ + extract->default_dir_mode_final + = DEFAULT_DIR_MODE & ~extract->umask; + /* Temporary permission for default dirs during extract. */ + extract->default_dir_mode_initial + = extract->default_dir_mode_final; + extract->default_dir_mode_initial |= MINIMUM_DIR_MODE; + extract->default_dir_mode_initial &= MAXIMUM_DIR_MODE; + /* If the two permissions above are different, then + * the "final" permissions will be applied in the + * post-extract fixup pass. */ + a->extract = extract; + return (ARCHIVE_OK); +} + /* * Cleanup function for archive_extract. Mostly, this involves processing * the fixup list, which is used to address a number of problems: @@ -508,6 +534,7 @@ struct extract *extract; struct fixup_entry *fe; char *path, *p; + mode_t restore_mode, final_mode; extract = a->extract; extract->pst = NULL; /* Invalidate cached stat data. */ @@ -554,7 +581,16 @@ break; } - if (mkdir(path, SECURE_DIR_MODE) == 0) + final_mode = archive_entry_mode(entry) & + (S_ISUID | S_ISGID | S_ISVTX | S_IRWXU | S_IRWXG | S_IRWXO); + if ((flags & ARCHIVE_EXTRACT_PERM) == 0) + final_mode &= ~extract->umask; + /* Constrain the permissions in effect during the restore. */ + restore_mode = final_mode; + restore_mode |= MINIMUM_DIR_MODE; + restore_mode &= MAXIMUM_DIR_MODE; + + if (mkdir(path, restore_mode) == 0) goto success; if (extract->pst == NULL && stat(path, &extract->st) == 0) @@ -575,27 +611,26 @@ } /* One final attempt to create the dir. */ - if (mkdir(path, SECURE_DIR_MODE) != 0) { + if (mkdir(path, restore_mode) != 0) { archive_set_error(a, errno, "Can't create directory"); return (ARCHIVE_WARN); } success: /* Add this dir to the fixup list. */ - fe = current_fixup(a, path); - fe->fixup |= FIXUP_MODE; - fe->mode = archive_entry_mode(entry); - if ((flags & ARCHIVE_EXTRACT_PERM) == 0) - fe->mode &= ~extract->umask; + if (final_mode != restore_mode) { + fe = current_fixup(a, path); + fe->fixup |= FIXUP_MODE; + fe->mode = final_mode; + } if (flags & ARCHIVE_EXTRACT_TIME) { + fe = current_fixup(a, path); fe->fixup |= FIXUP_TIMES; fe->mtime = archive_entry_mtime(entry); fe->mtime_nanos = archive_entry_mtime_nsec(entry); fe->atime = archive_entry_atime(entry); fe->atime_nanos = archive_entry_atime_nsec(entry); } - /* For now, set the mode to SECURE_DIR_MODE. */ - archive_entry_set_mode(entry, SECURE_DIR_MODE); return (restore_metadata(a, -1, entry, flags)); } @@ -656,12 +691,9 @@ static int create_dir_mutable(struct archive *a, char *path, int flags) { - mode_t old_umask; int r; - old_umask = umask(~SECURE_DIR_MODE); r = create_dir_recursive(a, path, flags); - umask(old_umask); return (r); } @@ -735,10 +767,13 @@ return (r); } - if (mkdir(path, SECURE_DIR_MODE) == 0) { - le = new_fixup(a, path); - le->fixup |= FIXUP_MODE; - le->mode = extract->default_dir_mode; + if (mkdir(path, extract->default_dir_mode_initial) == 0) { + if (extract->default_dir_mode_initial + != extract->default_dir_mode_final) { + le = new_fixup(a, path); + le->fixup |= FIXUP_MODE; + le->mode = extract->default_dir_mode_final; + } return (ARCHIVE_OK); } @@ -1052,12 +1087,26 @@ mode &= ~ S_ISGID; } - /* - * Ensure we change permissions on the object we extracted, - * and not any incidental symlink that might have gotten in - * the way. - */ - if (!S_ISLNK(archive_entry_mode(entry))) { + if (S_ISLNK(archive_entry_mode(entry))) { +#ifdef HAVE_LCHMOD + /* + * If this is a symlink, use lchmod(). If the + * platform doesn't support lchmod(), just skip it as + * permissions on symlinks are actually ignored on + * most platforms. + */ + if (lchmod(name, mode) != 0) { + archive_set_error(a, errno, "Can't set permissions"); + return (ARCHIVE_WARN); + } +#endif + } else if (!S_ISDIR(archive_entry_mode(entry))) { + /* + * If it's not a symlink and not a dir, then use + * fchmod() or chmod(), depending on whether we have + * an fd. Dirs get their perms set during the + * post-extract fixup, which is handled elsewhere. + */ #ifdef HAVE_FCHMOD if (fd >= 0) { if (fchmod(fd, mode) != 0) { @@ -1067,22 +1116,13 @@ } } else #endif - if (chmod(name, mode) != 0) { - archive_set_error(a, errno, "Can't set permissions"); - return (ARCHIVE_WARN); - } -#ifdef HAVE_LCHMOD - } else { - /* - * If lchmod() isn't supported, it's no big deal. - * Permissions on symlinks are actually ignored on - * most platforms. - */ - if (lchmod(name, mode) != 0) { - archive_set_error(a, errno, "Can't set permissions"); - return (ARCHIVE_WARN); - } -#endif + /* If this platform lacks fchmod(), then + * we'll just use chmod(). */ + if (chmod(name, mode) != 0) { + archive_set_error(a, errno, + "Can't set permissions"); + return (ARCHIVE_WARN); + } } if (flags & ARCHIVE_EXTRACT_ACL) { ==== //depot/projects/kmacy_sun4v_stable/src/lib/libc/gen/arc4random.c#2 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/lib/libc/gen/arc4random.c,v 1.10 2004/03/24 14:44:57 green Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/gen/arc4random.c,v 1.11 2006/10/04 01:17:23 ache Exp $"); #include "namespace.h" #include <sys/types.h> @@ -61,6 +61,7 @@ static struct arc4_stream rs; static int rs_initialized; static int rs_stired; +static int arc4_count; static inline u_int8_t arc4_getbyte(struct arc4_stream *); static void arc4_stir(struct arc4_stream *); @@ -127,7 +128,8 @@ * by Ilya Mironov. */ for (n = 0; n < 1024; n++) - arc4_getbyte(as); + (void) arc4_getbyte(as); + arc4_count = 400000; } static inline u_int8_t @@ -172,7 +174,7 @@ static void arc4_check_stir(void) { - if (!rs_stired) { + if (!rs_stired || --arc4_count == 0) { arc4_stir(&rs); rs_stired = 1; } ==== //depot/projects/kmacy_sun4v_stable/src/sbin/ifconfig/ifconfig.8#5 (text+ko) ==== @@ -26,7 +26,7 @@ .\" SUCH DAMAGE. .\" .\" From: @(#)ifconfig.8 8.3 (Berkeley) 1/5/94 -.\" $FreeBSD: src/sbin/ifconfig/ifconfig.8,v 1.121 2006/09/18 11:55:10 ru Exp $ +.\" $FreeBSD: src/sbin/ifconfig/ifconfig.8,v 1.122 2006/10/02 08:55:54 schweikh Exp $ .\" .Dd September 6, 2006 .Dt IFCONFIG 8 @@ -427,7 +427,7 @@ The routing metric is used by the routing protocol .Pq Xr routed 8 . Higher metrics have the effect of making a route -less favorable; metrics are counted as addition hops +less favorable; metrics are counted as additional hops to the destination network or host. .It Cm mtu Ar n Set the maximum transmission unit of the interface to @@ -615,7 +615,7 @@ or .Cm - for the address. -This option is useful when more than one access points have the same SSID. +This option is useful when more than one access point uses the same SSID. Another name for the .Cm bssid parameter is @@ -1525,5 +1525,5 @@ .Pp If you delete such an address using .Nm , -the kernel may act very oddly. +the kernel may act very odd. Do this at your own risk. ==== //depot/projects/kmacy_sun4v_stable/src/share/man/man4/ddb.4#3 (text+ko) ==== @@ -57,7 +57,7 @@ .\" Created. .\" [90/08/30 dbg] .\" -.\" $FreeBSD: src/share/man/man4/ddb.4,v 1.33 2006/09/18 15:24:18 ru Exp $ +.\" $FreeBSD: src/share/man/man4/ddb.4,v 1.34 2006/10/03 21:06:19 ru Exp $ .Dd September 15, 2006 .Dt DDB 4 .Os @@ -151,7 +151,7 @@ browse through the history buffer, and move the cursor within the current line. .Sh COMMANDS -.Bl -ohang +.Bl -tag -width indent -compact .It Cm examine .It Cm x Display the addressed locations according to the formats in the modifier. @@ -212,15 +212,18 @@ No alternate format. .El .El +.Pp .It Cm xf Examine forward: Execute an examine command with the last specified parameters to it except that the next address displayed by it is used as the start address. +.Pp .It Cm xb Examine backward: Execute an examine command with the last specified parameters to it except that the last start address subtracted by the size displayed by it is used as the start address. +.Pp .It Cm print Ns Op Cm /acdoruxz Print .Ar addr Ns s @@ -249,6 +252,7 @@ eax = xxxxxx ecx = yyyyyy .Ed +.Pp .It Xo .Cm write Ns Op Cm /bhl .Ar addr Ar expr1 Op Ar "expr2 ..." @@ -271,6 +275,7 @@ since there is no delimiter between expressions, strange things may happen. It is best to enclose each expression in parentheses. +.Pp .It Xo .Cm set .Li \&$ Ns Ar variable @@ -280,6 +285,7 @@ Set the named variable or register with the value of .Ar expr . Valid variable names are described below. +.Pp .It Cm break Ns Op Cm /u Set a break point at .Ar addr . @@ -311,6 +317,7 @@ user space break points may not work correctly. Setting a break point at the low-level code paths may also cause strange behavior. +.Pp .It Cm delete Ar addr .It Cm delete Li \&# Ns Ar number Delete the break point. @@ -322,6 +329,7 @@ specified in the original .Cm break command. +.Pp .It Cm step Ns Op Cm /p Single step .Ar count @@ -337,6 +345,7 @@ On machines with software-emulated single-stepping (e.g., pmax), stepping through code executed by interrupt handlers will probably do the wrong thing. +.Pp .It Cm continue Ns Op Cm /c Continue execution until a breakpoint or watchpoint. If the @@ -348,6 +357,7 @@ when counting, the debugger is really silently single-stepping. This means that single-stepping on low-level code may cause strange behavior. +.Pp .It Cm until Ns Op Cm /p Stop at the next call or return instruction. If the @@ -356,6 +366,7 @@ cumulative instruction count at each call or return. Otherwise, only print when the matching return is hit. +.Pp .It Cm next Ns Op Cm /p .It Cm match Ns Op Cm /p Stop at the matching return instruction. @@ -364,6 +375,7 @@ modifier is specified, print the call nesting depth and the cumulative instruction count at each call or return. Otherwise, only print when the matching return is hit. +.Pp .It Xo .Cm trace Ns Op Cm /u .Op Ar frame @@ -385,6 +397,7 @@ .Sy Warning : User space stack trace is valid only if the machine dependent code supports it. +.Pp .It Xo .Cm search Ns Op Cm /bhl .Ar addr @@ -400,6 +413,7 @@ The optional .Ar count argument limits the search. +.Pp .It Cm show all procs Ns Op Cm /m .It Cm ps Ns Op Cm /m Display all process information. @@ -410,6 +424,7 @@ .Li m modifier will alter the display to show VM map addresses for the process and not show other info. +.Pp .It Cm show registers Ns Op Cm /u Display the register set. If the @@ -422,6 +437,7 @@ .Li u modifier depends on the machine. If not supported, incorrect information will be displayed. +.Pp .It Cm show geom Op Ar addr If the .Ar addr @@ -430,6 +446,7 @@ .Ar addr is given, displays details about the given GEOM object (class, geom, provider or consumer). +.Pp .It Xo .Cm show map Ns Op Cm /f .Ar addr @@ -440,6 +457,7 @@ .Li f modifier is specified the complete map is printed. +.Pp .It Xo .Cm show object Ns Op Cm /f .Ar addr @@ -450,12 +468,16 @@ .Li f option is specified the complete object is printed. +.Pp .It Cm show vnode Ar addr Displays details about the given vnode. +.Pp .It Cm "show watches" Displays all watchpoints. +.Pp .It Cm reset Hard reset the system. +.Pp .It Xo .Cm watch .Ar addr Ns Li \&, Ns Ar size @@ -472,6 +494,7 @@ Attempts to watch wired kernel memory may cause unrecoverable error in some systems such as i386. Watchpoints on user addresses work best. +.Pp .It Xo .Cm hwatch .Ar addr Ns Li \&, Ns Ar size @@ -490,11 +513,13 @@ .Cm hwatch for setting watchpoints on kernel address locations only, and avoid its use on user mode address spaces. +.Pp .It Xo .Cm dhwatch .Ar addr Ns Li \&, Ns Ar size .Xc Delete specified hardware watchpoint. +.Pp .It Cm gdb Toggles between remote GDB and DDB mode. In remote GDB mode, another machine is required that runs @@ -504,6 +529,7 @@ Currently only available on the .Em i386 architecture. +.Pp .It Cm help Print a short summary of the available commands and command abbreviations. ==== //depot/projects/kmacy_sun4v_stable/src/share/man/man9/Makefile#5 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/share/man/man9/Makefile,v 1.278 2006/09/25 20:12:13 imp Exp $ +# $FreeBSD: src/share/man/man9/Makefile,v 1.279 2006/10/02 11:51:25 andre Exp $ MAN= accept_filter.9 \ accf_data.9 \ @@ -110,6 +110,7 @@ g_provider_by_name.9 \ groupmember.9 \ g_wither_geom.9 \ + hash.9 \ hashinit.9 \ hexdump.9 \ ieee80211.9 \ @@ -587,6 +588,12 @@ MLINKS+=g_provider.9 g_destroy_provider.9 \ g_provider.9 g_error_provider.9 \ g_provider.9 g_new_providerf.9 +MLINKS+=hash.9 hash32.9 \ + hash.9 hash32_buf.9 \ + hash.9 hash32_str.9 \ + hash.9 hash32_strn.9 \ + hash.9 hash32_stre.9 \ + hash.9 hash32_strne.9 MLINKS+=hashinit.9 hashdestroy.9 \ hashinit.9 phashinit.9 MLINKS+=ieee80211.9 ieee80211_attach.9 \ ==== //depot/projects/kmacy_sun4v_stable/src/share/man/man9/zone.9#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/share/man/man9/zone.9,v 1.26 2004/01/25 11:39:41 des Exp $ +.\" $FreeBSD: src/share/man/man9/zone.9,v 1.27 2006/10/02 07:27:00 kib Exp $ .\" .Dd July 21, 2003 .Dt ZONE 9 @@ -65,27 +65,9 @@ are not, and provides functions for allocating items from the zone and for releasing them back (which makes them available for later use). .Pp -The zone allocator stores state information inside the items proper -while they are not allocated, -so structures that will be managed by the zone allocator -and wish to use the type stable property of zones by leaving some fields -pre-filled between allocations, must reserve -two pointers at the very beginning for internal use by the zone -allocator, as follows: -.Bd -literal -offset indent -struct my_item { - struct my_item *z_rsvd1; - struct my_item *z_rsvd2; - /* rest of structure */ -}; -.Ed -.Pp -Alternatively they should assume those entries corrupted -after each allocation. After the first allocation of an item, it will have been cleared to zeroes, however subsequent allocations -will retain the contents as of the last free, with the exception of the -fields mentioned above. +will retain the contents as of the last free. .Pp The .Fn uma_zcreate ==== //depot/projects/kmacy_sun4v_stable/src/sys/compat/freebsd32/freebsd32_proto.h#6 (text+ko) ==== @@ -2,8 +2,8 @@ * System call prototypes. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/freebsd32/freebsd32_proto.h,v 1.66 2006/09/23 00:27:53 davidxu Exp $ - * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.79 2006/09/23 00:27:11 davidxu Exp + * $FreeBSD: src/sys/compat/freebsd32/freebsd32_proto.h,v 1.67 2006/10/03 20:48:11 rwatson Exp $ + * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.80 2006/10/03 20:48:03 rwatson Exp */ #ifndef _FREEBSD32_SYSPROTO_H_ ==== //depot/projects/kmacy_sun4v_stable/src/sys/compat/freebsd32/freebsd32_syscall.h#6 (text+ko) ==== @@ -2,8 +2,8 @@ * System call numbers. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscall.h,v 1.64 2006/09/23 00:27:53 davidxu Exp $ - * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.79 2006/09/23 00:27:11 davidxu Exp + * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscall.h,v 1.65 2006/10/03 20:48:11 rwatson Exp $ + * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.80 2006/10/03 20:48:03 rwatson Exp */ #define FREEBSD32_SYS_syscall 0 ==== //depot/projects/kmacy_sun4v_stable/src/sys/compat/freebsd32/freebsd32_syscalls.c#6 (text+ko) ==== @@ -2,8 +2,8 @@ * System call names. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscalls.c,v 1.55 2006/09/23 00:27:53 davidxu Exp $ - * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.79 2006/09/23 00:27:11 davidxu Exp + * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscalls.c,v 1.56 2006/10/03 20:48:11 rwatson Exp $ + * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.80 2006/10/03 20:48:03 rwatson Exp */ const char *freebsd32_syscallnames[] = { ==== //depot/projects/kmacy_sun4v_stable/src/sys/compat/freebsd32/freebsd32_sysent.c#6 (text+ko) ==== @@ -2,8 +2,8 @@ * System call switch table. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/freebsd32/freebsd32_sysent.c,v 1.65 2006/09/23 00:27:53 davidxu Exp $ - * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.79 2006/09/23 00:27:11 davidxu Exp + * $FreeBSD: src/sys/compat/freebsd32/freebsd32_sysent.c,v 1.66 2006/10/03 20:48:11 rwatson Exp $ + * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.80 2006/10/03 20:48:03 rwatson Exp */ #include "opt_compat.h" ==== //depot/projects/kmacy_sun4v_stable/src/sys/compat/freebsd32/syscalls.master#6 (text+ko) ==== @@ -1,4 +1,4 @@ - $FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.79 2006/09/23 00:27:11 davidxu Exp $ + $FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.80 2006/10/03 20:48:03 rwatson Exp $ ; from: @(#)syscalls.master 8.2 (Berkeley) 1/13/94 ; from: src/sys/kern/syscalls.master 1.107 ; @@ -141,7 +141,7 @@ 61 AUE_CHROOT NOPROTO { int chroot(char *path); } 62 AUE_FSTAT OBSOL ofstat 63 AUE_NULL OBSOL ogetkerninfo -64 AUE_GETPAGESIZE OBSOL ogetpagesize +64 AUE_NULL OBSOL ogetpagesize ; XXX implement (not OBSOL at all) 65 AUE_MSYNC NOPROTO { int msync(void *addr, size_t len, \ int flags); } ==== //depot/projects/kmacy_sun4v_stable/src/sys/dev/aic/aic_pccard.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/aic/aic_pccard.c,v 1.17 2005/09/20 19:45:08 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/aic/aic_pccard.c,v 1.18 2006/10/03 04:51:18 imp Exp $"); #include <sys/param.h> #include <sys/kernel.h> @@ -54,7 +54,7 @@ static int aic_pccard_probe(device_t); static int aic_pccard_attach(device_t); -const struct pccard_product aic_pccard_products[] = { +static const struct pccard_product aic_pccard_products[] = { PCMCIA_CARD(ADAPTEC, APA1460), PCMCIA_CARD(ADAPTEC, APA1460A), PCMCIA_CARD(NEWMEDIA, BUSTOASTER), ==== //depot/projects/kmacy_sun4v_stable/src/sys/dev/bge/if_bge.c#6 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/bge/if_bge.c,v 1.149 2006/09/23 18:55:49 scottl Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/bge/if_bge.c,v 1.150 2006/10/03 09:31:49 glebius Exp $"); /* * Broadcom BCM570x family gigabit ethernet driver for FreeBSD. @@ -191,7 +191,6 @@ { SK_VENDORID, SK_DEVICEID_ALTIMA }, - { TC_VENDORID, TC_DEVICEID_3C985 }, { TC_VENDORID, TC_DEVICEID_3C996 }, { 0, 0 } ==== //depot/projects/kmacy_sun4v_stable/src/sys/dev/bge/if_bgereg.h#5 (text+ko) ==== @@ -30,7 +30,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF * THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/bge/if_bgereg.h,v 1.55 2006/09/09 03:36:57 ambrisko Exp $ + * $FreeBSD: src/sys/dev/bge/if_bgereg.h,v 1.56 2006/10/03 09:31:49 glebius Exp $ */ /* @@ -2027,10 +2027,9 @@ #define ALTEON_DEVICEID_BCM5701 0x0004 /* - * 3Com 3c985 PCI vendor/device ID. + * 3Com 3c996 PCI vendor/device ID. */ #define TC_VENDORID 0x10B7 -#define TC_DEVICEID_3C985 0x0001 #define TC_DEVICEID_3C996 0x0003 /* ==== //depot/projects/kmacy_sun4v_stable/src/sys/dev/usb/ehci.c#4 (text+ko) ==== @@ -59,7 +59,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/usb/ehci.c,v 1.49 2006/09/07 00:06:41 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/usb/ehci.c,v 1.51 2006/10/03 08:38:08 iedowse Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -2867,7 +2867,6 @@ >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200610041952.k94JqVZ7067637>