From owner-p4-projects@FreeBSD.ORG Sun Apr 25 07:21:45 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C0F9316A4D0; Sun, 25 Apr 2004 07:21:44 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 7F52416A4CE for ; Sun, 25 Apr 2004 07:21:44 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7A2E343D2D for ; Sun, 25 Apr 2004 07:21:44 -0700 (PDT) (envelope-from scottl@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i3PELiGe064482 for ; Sun, 25 Apr 2004 07:21:44 -0700 (PDT) (envelope-from scottl@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i3PELhan064473 for perforce@freebsd.org; Sun, 25 Apr 2004 07:21:43 -0700 (PDT) (envelope-from scottl@freebsd.org) Date: Sun, 25 Apr 2004 07:21:43 -0700 (PDT) Message-Id: <200404251421.i3PELhan064473@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to scottl@freebsd.org using -f From: Scott Long To: Perforce Change Reviews Subject: PERFORCE change 51703 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 25 Apr 2004 14:21:45 -0000 http://perforce.freebsd.org/chv.cgi?CH=51703 Change 51703 by scottl@scottl-junior-camlock on 2004/04/25 07:21:28 Lock the request_ccb list in the probe softc. Affected files ... .. //depot/projects/scottl-camlock/src/sys/cam/cam_probe.c#8 edit Differences ... ==== //depot/projects/scottl-camlock/src/sys/cam/cam_probe.c#8 (text+ko) ==== @@ -112,6 +112,7 @@ typedef struct { TAILQ_HEAD(, ccb_hdr) request_ccbs; + struct mtx ccb_lock; probe_action action; union ccb saved_ccb; probe_flags flags; @@ -237,7 +238,7 @@ return(CAM_REQ_CMP_ERR); } - softc = (probe_softc *)malloc(sizeof(*softc), M_TEMP, M_NOWAIT); + softc = (probe_softc *)malloc(sizeof(*softc), M_TEMP, M_NOWAIT|M_ZERO); if (softc == NULL) { printf("proberegister: Unable to probe new device. " @@ -255,6 +256,7 @@ softc->work = work; TAILQ_INIT(&softc->request_ccbs); + mtx_init(&softc->ccb_lock, "Probe requst CCB lock", NULL, MTX_DEF); TAILQ_INSERT_TAIL(&softc->request_ccbs, &request_ccb->ccb_h, periph_links.tqe); softc->flags = 0; @@ -277,9 +279,10 @@ struct ccb_pathinq cpi; union ccb *ccb; probe_softc *softc; + int need_renegotiate; softc = (probe_softc *)periph->softc; - ccb = (union ccb *)TAILQ_FIRST(&softc->request_ccbs); + need_renegotiate = 0; xpt_setup_ccb(&cpi.ccb_h, periph->path, /*priority*/1); cpi.ccb_h.func_code = XPT_PATH_INQ; @@ -303,12 +306,14 @@ * ensures that the device is not confused by transfer negotiation * settings left over by loader or BIOS action. */ + mtx_lock(&softc->ccb_lock); + ccb = (union ccb *)TAILQ_FIRST(&softc->request_ccbs); if (((ccb->ccb_h.path->device->flags & CAM_DEV_UNCONFIGURED) == 0) && (ccb->ccb_h.target_lun == 0)) { softc->action = PROBE_TUR; } else if ((cpi.hba_inquiry & (PI_WIDE_32|PI_WIDE_16|PI_SDTR_ABLE)) != 0 && (cpi.hba_misc & PIM_NOBUSRESET) != 0) { - proberequestdefaultnegotiation(periph); + need_renegotiate = 1; softc->action = PROBE_INQUIRY; } else { softc->action = PROBE_INQUIRY; @@ -318,8 +323,14 @@ softc->flags |= PROBE_NO_ANNOUNCE; else softc->flags &= ~PROBE_NO_ANNOUNCE; + mtx_unlock(&softc->ccb_lock); + if (need_renegotiate) + proberequestdefaultnegotiation(periph); + + mtx_lock(&Giant); xpt_schedule(periph, ccb->ccb_h.pinfo.priority); + mtx_unlock(&Giant); } static void @@ -758,10 +769,14 @@ xpt_release_ccb(done_ccb); break; } + mtx_lock(&softc->ccb_lock); done_ccb = (union ccb *)TAILQ_FIRST(&softc->request_ccbs); TAILQ_REMOVE(&softc->request_ccbs, &done_ccb->ccb_h, periph_links.tqe); + mtx_unlock(&softc->ccb_lock); done_ccb->ccb_h.status = CAM_REQ_CMP; xpt_done(done_ccb); + + /* XXX How to lock this? */ if (TAILQ_FIRST(&softc->request_ccbs) == NULL) { cam_periph_invalidate(periph); cam_periph_release(periph); @@ -773,8 +788,12 @@ static void probecleanup(struct cam_periph *periph) { - free(((probe_softc *)(periph->softc))->work, M_TEMP); - free(periph->softc, M_TEMP); + probe_softc *softc; + + softc = (probe_softc *)periph->softc; + mtx_destroy(&softc->ccb_lock); + free(softc->work, M_TEMP); + free(softc, M_TEMP); } void @@ -854,8 +873,10 @@ probe_softc *softc; softc = (probe_softc *)old_periph->softc; + mtx_lock(&softc->ccb_lock); TAILQ_INSERT_TAIL(&softc->request_ccbs, &request_ccb->ccb_h, periph_links.tqe); + mtx_unlock(&softc->ccb_lock); } else { status = cam_periph_alloc(proberegister, NULL, probecleanup, probestart, "probe", From owner-p4-projects@FreeBSD.ORG Sun Apr 25 08:24:10 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A42DD16A4D0; Sun, 25 Apr 2004 08:24:09 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 792C116A4CE for ; Sun, 25 Apr 2004 08:24:09 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 712D543D5A for ; Sun, 25 Apr 2004 08:24:09 -0700 (PDT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i3PFO9Ge078280 for ; Sun, 25 Apr 2004 08:24:09 -0700 (PDT) (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i3PFO85N078277 for perforce@freebsd.org; Sun, 25 Apr 2004 08:24:08 -0700 (PDT) (envelope-from imp@freebsd.org) Date: Sun, 25 Apr 2004 08:24:08 -0700 (PDT) Message-Id: <200404251524.i3PFO85N078277@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Subject: PERFORCE change 51709 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 25 Apr 2004 15:24:10 -0000 http://perforce.freebsd.org/chv.cgi?CH=51709 Change 51709 by imp@imp_pacopaco on 2004/04/25 08:23:22 IFC @51706 power tree Affected files ... .. //depot/projects/power/sys/alpha/alpha/pmap.c#6 integrate .. //depot/projects/power/sys/alpha/include/float.h#3 integrate .. //depot/projects/power/sys/amd64/include/float.h#3 integrate .. //depot/projects/power/sys/compat/freebsd32/freebsd32_misc.c#6 integrate .. //depot/projects/power/sys/conf/NOTES#14 integrate .. //depot/projects/power/sys/conf/files#12 integrate .. //depot/projects/power/sys/conf/files.amd64#6 integrate .. //depot/projects/power/sys/conf/files.i386#9 integrate .. //depot/projects/power/sys/conf/kern.pre.mk#6 integrate .. //depot/projects/power/sys/conf/options#14 integrate .. //depot/projects/power/sys/dev/acpica/acpi_timer.c#5 integrate .. //depot/projects/power/sys/dev/acpica/acpivar.h#13 integrate .. //depot/projects/power/sys/dev/ata/ata-chipset.c#11 integrate .. //depot/projects/power/sys/dev/ata/ata-pci.c#9 integrate .. //depot/projects/power/sys/dev/gem/if_gem.c#4 integrate .. //depot/projects/power/sys/dev/if_ndis/if_ndis.c#9 integrate .. //depot/projects/power/sys/dev/pccbb/pccbb.c#11 integrate .. //depot/projects/power/sys/dev/pci/pci.c#14 integrate .. //depot/projects/power/sys/dev/puc/pucdata.c#7 integrate .. //depot/projects/power/sys/dev/uart/uart_dev_sab82532.c#3 integrate .. //depot/projects/power/sys/dev/usb/if_axe.c#5 integrate .. //depot/projects/power/sys/dev/usb/usbdevs#9 integrate .. //depot/projects/power/sys/dev/usb/usbdevs.h#9 integrate .. //depot/projects/power/sys/dev/usb/usbdevs_data.h#9 integrate .. //depot/projects/power/sys/dev/vinum/vinumio.c#4 integrate .. //depot/projects/power/sys/i386/acpica/acpi_asus.c#1 branch .. //depot/projects/power/sys/i386/conf/NOTES#12 integrate .. //depot/projects/power/sys/i386/include/float.h#3 integrate .. //depot/projects/power/sys/ia64/include/float.h#3 integrate .. //depot/projects/power/sys/isa/fd.c#6 integrate .. //depot/projects/power/sys/kern/imgact_elf.c#7 integrate .. //depot/projects/power/sys/kern/kern_exec.c#8 integrate .. //depot/projects/power/sys/kern/kern_timeout.c#8 integrate .. //depot/projects/power/sys/kern/sched_ule.c#9 integrate .. //depot/projects/power/sys/modules/acpi/Makefile#6 integrate .. //depot/projects/power/sys/modules/acpi/acpi_asus/Makefile#1 branch .. //depot/projects/power/sys/modules/netgraph/Makefile#4 integrate .. //depot/projects/power/sys/net/bridge.c#6 integrate .. //depot/projects/power/sys/net/if.c#11 integrate .. //depot/projects/power/sys/net/if_arcsubr.c#5 integrate .. //depot/projects/power/sys/net/if_atmsubr.c#4 integrate .. //depot/projects/power/sys/net/if_ethersubr.c#9 integrate .. //depot/projects/power/sys/net/if_fddisubr.c#7 integrate .. //depot/projects/power/sys/net/if_gre.c#5 integrate .. //depot/projects/power/sys/net/if_iso88025subr.c#7 integrate .. //depot/projects/power/sys/net/if_vlan.c#5 integrate .. //depot/projects/power/sys/net/route.c#11 integrate .. //depot/projects/power/sys/net/route.h#9 integrate .. //depot/projects/power/sys/netatalk/aarp.c#6 integrate .. //depot/projects/power/sys/netatalk/at_extern.h#2 integrate .. //depot/projects/power/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c#4 integrate .. //depot/projects/power/sys/netinet/if_ether.c#9 integrate .. //depot/projects/power/sys/netinet/in_pcb.c#9 integrate .. //depot/projects/power/sys/netinet/ip_fw.h#4 integrate .. //depot/projects/power/sys/netinet/ip_fw2.c#7 integrate .. //depot/projects/power/sys/netinet/tcp_hostcache.c#4 integrate .. //depot/projects/power/sys/netinet/tcp_input.c#10 integrate .. //depot/projects/power/sys/netinet6/nd6.c#9 integrate .. //depot/projects/power/sys/pc98/pc98/fd.c#4 integrate .. //depot/projects/power/sys/pci/agp.c#6 integrate .. //depot/projects/power/sys/pci/agp_i810.c#7 integrate .. //depot/projects/power/sys/powerpc/include/float.h#4 integrate .. //depot/projects/power/sys/powerpc/powermac/ata_kauai.c#3 integrate .. //depot/projects/power/sys/powerpc/powermac/ata_macio.c#5 integrate .. //depot/projects/power/sys/sparc64/include/float.h#3 integrate .. //depot/projects/power/sys/sparc64/pci/psycho.c#3 integrate .. //depot/projects/power/sys/sparc64/pci/psychoreg.h#2 integrate .. //depot/projects/power/sys/sparc64/pci/psychovar.h#2 integrate .. //depot/projects/power/sys/sparc64/sparc64/iommu.c#4 integrate .. //depot/projects/power/sys/sys/imgact.h#3 integrate .. //depot/projects/power/sys/vm/device_pager.c#5 integrate .. //depot/projects/power/sys/vm/phys_pager.c#3 integrate .. //depot/projects/power/sys/vm/vm_kern.c#9 integrate .. //depot/projects/power/sys/vm/vm_map.c#7 integrate .. //depot/projects/power/sys/vm/vm_map.h#6 integrate .. //depot/projects/power/sys/vm/vm_page.c#9 integrate .. //depot/projects/power/sys/vm/vnode_pager.c#7 integrate Differences ... ==== //depot/projects/power/sys/alpha/alpha/pmap.c#6 (text+ko) ==== @@ -148,7 +148,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/alpha/pmap.c,v 1.143 2004/04/11 05:08:26 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/pmap.c,v 1.144 2004/04/24 20:53:54 alc Exp $"); #include #include @@ -1194,8 +1194,6 @@ VM_OBJECT_LOCK(pmap->pm_pteobj); m = vm_page_grab(pmap->pm_pteobj, ptepindex, VM_ALLOC_WIRED | VM_ALLOC_ZERO | VM_ALLOC_RETRY); - if ((m->flags & PG_ZERO) == 0) - pmap_zero_page(m); KASSERT(m->queue == PQ_NONE, ("_pmap_allocpte: %p->queue != PQ_NONE", m)); @@ -1242,7 +1240,6 @@ vm_page_lock_queues(); m->valid = VM_PAGE_BITS_ALL; - vm_page_flag_clear(m, PG_ZERO); vm_page_wakeup(m); vm_page_unlock_queues(); if (!is_object_locked) ==== //depot/projects/power/sys/alpha/include/float.h#3 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/alpha/include/float.h,v 1.5 2004/04/05 21:00:50 imp Exp $ */ +/* $FreeBSD: src/sys/alpha/include/float.h,v 1.6 2004/04/25 02:36:28 das Exp $ */ /* From: NetBSD: float.h,v 1.6 1997/07/17 21:36:03 thorpej Exp */ /* @@ -41,8 +41,10 @@ #define FLT_RADIX 2 /* b */ #define FLT_ROUNDS __flt_rounds() +#if __ISO_C_VISIBLE >= 1999 #define FLT_EVAL_METHOD 0 /* no promotions */ #define DECIMAL_DIG 17 /* max precision in decimal digits */ +#endif #define FLT_MANT_DIG 24 /* p */ #define FLT_EPSILON 1.19209290E-07F /* b**(1-p) */ ==== //depot/projects/power/sys/amd64/include/float.h#3 (text+ko) ==== @@ -27,16 +27,20 @@ * SUCH DAMAGE. * * from: @(#)float.h 7.1 (Berkeley) 5/8/90 - * $FreeBSD: src/sys/amd64/include/float.h,v 1.11 2004/04/05 21:25:51 imp Exp $ + * $FreeBSD: src/sys/amd64/include/float.h,v 1.12 2004/04/25 02:36:28 das Exp $ */ #ifndef _MACHINE_FLOAT_H_ #define _MACHINE_FLOAT_H_ 1 +#include + #define FLT_RADIX 2 /* b */ #define FLT_ROUNDS 1 /* FP addition rounds to nearest */ +#if __ISO_C_VISIBLE >= 1999 #define FLT_EVAL_METHOD (-1) /* i387 semantics are...interesting */ #define DECIMAL_DIG 21 /* max precision in decimal digits */ +#endif #define FLT_MANT_DIG 24 /* p */ #define FLT_EPSILON 1.19209290E-07F /* b**(1-p) */ ==== //depot/projects/power/sys/compat/freebsd32/freebsd32_misc.c#6 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/freebsd32/freebsd32_misc.c,v 1.21 2004/04/14 23:17:37 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/freebsd32/freebsd32_misc.c,v 1.22 2004/04/24 04:31:59 marcel Exp $"); #include "opt_compat.h" @@ -120,6 +120,7 @@ return (error); } +#ifdef COMPAT_FREEBSD4 static void copy_statfs(struct statfs *in, struct statfs32 *out) { @@ -146,7 +147,9 @@ bcopy(in->f_mntfromname, out->f_mntfromname, min(MNAMELEN, FREEBSD4_MNAMELEN)); } +#endif +#ifdef COMPAT_FREEBSD4 int freebsd4_freebsd32_getfsstat(struct thread *td, struct freebsd4_freebsd32_getfsstat_args *uap) { @@ -179,6 +182,7 @@ } return (error); } +#endif struct sigaltstack32 { u_int32_t ss_sp; @@ -869,6 +873,7 @@ return (error); } +#ifdef COMPAT_FREEBSD4 int freebsd4_freebsd32_statfs(struct thread *td, struct freebsd4_freebsd32_statfs_args *uap) { @@ -895,7 +900,9 @@ } return (error); } +#endif +#ifdef COMPAT_FREEBSD4 int freebsd4_freebsd32_fstatfs(struct thread *td, struct freebsd4_freebsd32_fstatfs_args *uap) { @@ -922,7 +929,9 @@ } return (error); } +#endif +#ifdef COMPAT_FREEBSD4 int freebsd4_freebsd32_fhstatfs(struct thread *td, struct freebsd4_freebsd32_fhstatfs_args *uap) { @@ -949,6 +958,7 @@ } return (error); } +#endif int freebsd32_semsys(struct thread *td, struct freebsd32_semsys_args *uap) ==== //depot/projects/power/sys/conf/NOTES#14 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/NOTES,v 1.1219 2004/04/21 20:18:06 scottl Exp $ +# $FreeBSD: src/sys/conf/NOTES,v 1.1221 2004/04/24 22:03:01 rik Exp $ # # NOTES -- Lines that can be cut/pasted into kernel and hints configs. # @@ -434,12 +434,23 @@ options NETGRAPH_RFC1490 options NETGRAPH_SOCKET options NETGRAPH_SPLIT +options NETGRAPH_SPPP options NETGRAPH_TEE options NETGRAPH_TTY options NETGRAPH_UI options NETGRAPH_VJC options NETGRAPH_ATM_ATMPIF +# NgBluetooth - Netgraph Bluetooth +options NETGRAPH_BLUETOOTH # Common parts +options NETGRAPH_BLUETOOTH_BT3C # 3COM Bluetooth PCCARD +options NETGRAPH_BLUETOOTH_H4 # H4 line discipline +options NETGRAPH_BLUETOOTH_UBT # Bluetooth USB dongle +options NETGRAPH_BLUETOOTH_UBTBCMFW # Firmware driver for BCM2033 +options NETGRAPH_BLUETOOTH_HCI # Bluetooth HCI layer +options NETGRAPH_BLUETOOTH_L2CAP # Bluetooth L2CAP layer +options NETGRAPH_BLUETOOTH_SOCKET # Bluetooth sockets layer + # NgATM - Netgraph ATM options NGATM_ATM options NGATM_ATMBASE ==== //depot/projects/power/sys/conf/files#12 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.888 2004/04/20 15:42:16 njl Exp $ +# $FreeBSD: src/sys/conf/files,v 1.890 2004/04/24 22:03:02 rik Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -1353,6 +1353,27 @@ contrib/ngatm/netnatm/sig/sig_uni.c optional ngatm_uni contrib/ngatm/netnatm/sig/sig_unimsgcpy.c optional ngatm_uni contrib/ngatm/netnatm/sig/sig_verify.c optional ngatm_uni +netgraph/bluetooth/common/ng_bluetooth.c optional netgraph_bluetooth +netgraph/bluetooth/drivers/bt3c/ng_bt3c_pccard.c optional netgraph_bluetooth_bt3c +netgraph/bluetooth/drivers/h4/ng_h4.c optional netgraph_bluetooth_h4 +netgraph/bluetooth/drivers/ubt/ng_ubt.c optional netgraph_bluetooth_ubt +netgraph/bluetooth/drivers/ubtbcmfw/ubtbcmfw.c optional netgraph_bluetooth_ubtbcmfw +netgraph/bluetooth/hci/ng_hci_cmds.c optional netgraph_bluetooth_hci +netgraph/bluetooth/hci/ng_hci_evnt.c optional netgraph_bluetooth_hci +netgraph/bluetooth/hci/ng_hci_main.c optional netgraph_bluetooth_hci +netgraph/bluetooth/hci/ng_hci_misc.c optional netgraph_bluetooth_hci +netgraph/bluetooth/hci/ng_hci_ulpi.c optional netgraph_bluetooth_hci +netgraph/bluetooth/l2cap/ng_l2cap_cmds.c optional netgraph_bluetooth_l2cap +netgraph/bluetooth/l2cap/ng_l2cap_evnt.c optional netgraph_bluetooth_l2cap +netgraph/bluetooth/l2cap/ng_l2cap_llpi.c optional netgraph_bluetooth_l2cap +netgraph/bluetooth/l2cap/ng_l2cap_main.c optional netgraph_bluetooth_l2cap +netgraph/bluetooth/l2cap/ng_l2cap_misc.c optional netgraph_bluetooth_l2cap +netgraph/bluetooth/l2cap/ng_l2cap_ulpi.c optional netgraph_bluetooth_l2cap +netgraph/bluetooth/socket/ng_btsocket.c optional netgraph_bluetooth_socket +netgraph/bluetooth/socket/ng_btsocket_hci_raw.c optional netgraph_bluetooth_socket +netgraph/bluetooth/socket/ng_btsocket_l2cap.c optional netgraph_bluetooth_socket +netgraph/bluetooth/socket/ng_btsocket_l2cap_raw.c optional netgraph_bluetooth_socket +netgraph/bluetooth/socket/ng_btsocket_rfcomm.c optional netgraph_bluetooth_socket netgraph/ng_UI.c optional netgraph_UI netgraph/ng_async.c optional netgraph_async netgraph/ng_atmllc.c optional netgraph_atmllc @@ -1386,6 +1407,7 @@ netgraph/ng_rfc1490.c optional netgraph_rfc1490 netgraph/ng_socket.c optional netgraph_socket netgraph/ng_split.c optional netgraph_split +netgraph/ng_sppp.c optional netgraph_sppp netgraph/ng_tee.c optional netgraph_tee netgraph/ng_tty.c optional netgraph_tty netgraph/ng_vjc.c optional netgraph_vjc ==== //depot/projects/power/sys/conf/files.amd64#6 (text+ko) ==== @@ -1,7 +1,7 @@ # This file tells config what files go into building a kernel, # files marked standard are always included. # -# $FreeBSD: src/sys/conf/files.amd64,v 1.30 2004/03/20 19:36:29 alc Exp $ +# $FreeBSD: src/sys/conf/files.amd64,v 1.31 2004/04/23 14:41:23 tjr Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -90,6 +90,9 @@ crypto/des/des_enc.c optional ipsec ipsec_esp crypto/blowfish/bf_enc.c optional crypto crypto/des/des_enc.c optional crypto +crypto/des/des_ecb.c optional netsmbcrypto +crypto/des/des_enc.c optional netsmbcrypto +crypto/des/des_setkey.c optional netsmbcrypto dev/fb/fb.c optional fb dev/fb/fb.c optional vga dev/fb/splash.c optional splash ==== //depot/projects/power/sys/conf/files.i386#9 (text+ko) ==== @@ -1,7 +1,7 @@ # This file tells config what files go into building a kernel, # files marked standard are always included. # -# $FreeBSD: src/sys/conf/files.i386,v 1.484 2004/04/10 19:43:15 marcel Exp $ +# $FreeBSD: src/sys/conf/files.i386,v 1.485 2004/04/22 21:29:01 philip Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -179,6 +179,7 @@ libkern/ffsl.c standard libkern/flsl.c standard i386/acpica/OsdEnvironment.c optional acpi +i386/acpica/acpi_asus.c optional acpi_asus acpi i386/acpica/acpi_machdep.c optional acpi i386/acpica/acpi_toshiba.c optional acpi_toshiba acpi i386/acpica/acpi_wakeup.c optional acpi ==== //depot/projects/power/sys/conf/kern.pre.mk#6 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/kern.pre.mk,v 1.50 2004/03/29 01:15:39 kensmith Exp $ +# $FreeBSD: src/sys/conf/kern.pre.mk,v 1.51 2004/04/23 19:48:43 emax Exp $ # Part of a unified Makefile for building kernels. This part contains all # of the definitions that need to be before %BEFORE_DEPEND. @@ -63,6 +63,15 @@ # ... and the same for the NgATM stuff INCLUDES+= -I$S/contrib/ngatm +# ... and the same for the NgBluetooth stuff +INCLUDES+= -I$S/netgraph/bluetooth/include +INCLUDES+= -I$S/netgraph/bluetooth/drivers/bt3c +INCLUDES+= -I$S/netgraph/bluetooth/drivers/h4 +INCLUDES+= -I$S/netgraph/bluetooth/drivers/ubt +INCLUDES+= -I$S/netgraph/bluetooth/drivers/ubtbcmfw +INCLUDES+= -I$S/netgraph/bluetooth/hci +INCLUDES+= -I$S/netgraph/bluetooth/l2cap + COPTS= ${INCLUDES} -D_KERNEL -include opt_global.h CFLAGS= ${COPTFLAGS} ${CWARNFLAGS} ${DEBUG} ${COPTS} .if ${CC} != "icc" ==== //depot/projects/power/sys/conf/options#14 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/options,v 1.442 2004/04/21 20:18:06 scottl Exp $ +# $FreeBSD: src/sys/conf/options,v 1.444 2004/04/24 22:03:02 rik Exp $ # # On the handling of kernel options # @@ -375,12 +375,23 @@ NETGRAPH_RFC1490 opt_netgraph.h NETGRAPH_SOCKET opt_netgraph.h NETGRAPH_SPLIT opt_netgraph.h +NETGRAPH_SPPP opt_netgraph.h NETGRAPH_TEE opt_netgraph.h NETGRAPH_TTY opt_netgraph.h NETGRAPH_UI opt_netgraph.h NETGRAPH_VJC opt_netgraph.h NETGRAPH_ATM_ATMPIF opt_netgraph.h +# NgBluetooth options +NETGRAPH_BLUETOOTH opt_netgraph.h +NETGRAPH_BLUETOOTH_BT3C opt_netgraph.h +NETGRAPH_BLUETOOTH_H4 opt_netgraph.h +NETGRAPH_BLUETOOTH_UBT opt_netgraph.h +NETGRAPH_BLUETOOTH_UBTBCMFW opt_netgraph.h +NETGRAPH_BLUETOOTH_HCI opt_netgraph.h +NETGRAPH_BLUETOOTH_L2CAP opt_netgraph.h +NETGRAPH_BLUETOOTH_SOCKET opt_netgraph.h + # NgATM options NGATM_ATM opt_netgraph.h NGATM_ATMBASE opt_netgraph.h ==== //depot/projects/power/sys/dev/acpica/acpi_timer.c#5 (text+ko) ==== @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/acpica/acpi_timer.c,v 1.31 2004/04/22 01:50:08 njl Exp $ + * $FreeBSD: src/sys/dev/acpica/acpi_timer.c,v 1.32 2004/04/24 16:25:00 njl Exp $ */ #include "opt_acpi.h" #include @@ -99,12 +99,7 @@ static u_int acpi_timer_read() { - uint32_t tv; - - tv = bus_space_read_4(acpi_timer_bst, acpi_timer_bsh, 0); - bus_space_barrier(acpi_timer_bst, acpi_timer_bsh, 0, 4, - BUS_SPACE_BARRIER_READ); - return (tv); + return (bus_space_read_4(acpi_timer_bst, acpi_timer_bsh, 0)); } /* @@ -277,9 +272,13 @@ { uint32_t last, this; int min, max, n, delta; + register_t s; min = 10000000; max = 0; + + /* Test the timer with interrupts disabled to get accurate results. */ + s = intr_disable(); last = acpi_timer_read(); for (n = 0; n < N; n++) { this = acpi_timer_read(); @@ -290,6 +289,8 @@ min = delta; last = this; } + intr_restore(s); + if (max - min > 2) n = 0; else if (min < 0 || max == 0) ==== //depot/projects/power/sys/dev/acpica/acpivar.h#13 (text+ko) ==== @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/acpica/acpivar.h,v 1.62 2004/04/21 00:36:15 njl Exp $ + * $FreeBSD: src/sys/dev/acpica/acpivar.h,v 1.63 2004/04/22 21:29:01 philip Exp $ */ #include "bus_if.h" @@ -124,6 +124,7 @@ #define ACPI_PROCESSOR 0x00800000 #define ACPI_THERMAL 0x01000000 #define ACPI_TIMER 0x02000000 +#define ACPI_ASUS 0x04000000 /* * Constants for different interrupt models used with acpi_SetIntrModel(). ==== //depot/projects/power/sys/dev/ata/ata-chipset.c#11 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/ata-chipset.c,v 1.69 2004/04/21 20:03:26 sos Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/ata-chipset.c,v 1.70 2004/04/24 15:54:20 sos Exp $"); #include "opt_ata.h" #include @@ -2350,15 +2350,15 @@ break; case SIS66: case SIS100OLD: - pci_write_config(dev, 0x52, pci_read_config(dev, 0x52, 1) | 0x04, 1); + pci_write_config(dev, 0x52, pci_read_config(dev, 0x52, 1) & ~0x04, 1); break; case SIS100NEW: case SIS133OLD: - pci_write_config(dev, 0x49, pci_read_config(dev, 0x49, 1) | 0x01, 1); + pci_write_config(dev, 0x49, pci_read_config(dev, 0x49, 1) & ~0x01, 1); break; case SIS133NEW: - pci_write_config(dev, 0x50, pci_read_config(dev, 0x50, 2) & 0xfff7, 2); - pci_write_config(dev, 0x52, pci_read_config(dev, 0x52, 2) & 0xfff7, 2); + pci_write_config(dev, 0x50, pci_read_config(dev, 0x50, 2) | 0x0008, 2); + pci_write_config(dev, 0x52, pci_read_config(dev, 0x52, 2) | 0x0008, 2); break; case SISSATA: pci_write_config(dev, 0x04, pci_read_config(dev, 0x04, 2) & ~0x0400, 2); ==== //depot/projects/power/sys/dev/ata/ata-pci.c#9 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/ata-pci.c,v 1.80 2004/04/21 20:03:26 sos Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/ata-pci.c,v 1.81 2004/04/24 16:32:06 sos Exp $"); #include "opt_ata.h" #include @@ -177,25 +177,9 @@ ctlr->locking = ata_pci_locknoop; progif = pci_read_config(dev, PCIR_PROGIF, 1); - if ((progif & 0x85) == 0x80) + if ((progif & 0x80)) prisec = 1; - /* if this device supports PCI native addressing use it */ -#if 0 - if ((progif & 0x8a) == 0x8a) { - if (pci_read_config(dev, PCIR_BAR(0), 4) && - pci_read_config(dev, PCIR_BAR(2), 4)) { - device_printf(dev, "setting native PCI addressing mode "); - pci_write_config(dev, PCIR_PROGIF, progif | 0x05, 1); - if ((pci_read_config(dev, PCIR_PROGIF, 1) & 0x05) != 0x05) { - pci_write_config(dev, PCIR_PROGIF, progif & ~0x05, 1); - printf("failed, using compat method\n"); - } - else - printf("succeded\n"); - } - } -#endif /* if needed try to enable busmastering */ cmd = pci_read_config(dev, PCIR_COMMAND, 2); if (!(cmd & PCIM_CMD_BUSMASTEREN)) { ==== //depot/projects/power/sys/dev/gem/if_gem.c#4 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/gem/if_gem.c,v 1.21 2004/03/20 20:12:12 mdodd Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/gem/if_gem.c,v 1.22 2004/04/23 19:43:35 tmm Exp $"); /* * Driver for Sun GEM ethernet controllers. @@ -237,11 +237,11 @@ /* Get RX FIFO size */ sc->sc_rxfifosize = 64 * bus_space_read_4(sc->sc_bustag, sc->sc_h, GEM_RX_FIFO_SIZE); - printf(", %uKB RX fifo", sc->sc_rxfifosize / 1024); /* Get TX FIFO size */ v = bus_space_read_4(sc->sc_bustag, sc->sc_h, GEM_TX_FIFO_SIZE); - printf(", %uKB TX fifo\n", v / 16); + device_printf(sc->sc_dev, "%ukB RX FIFO, %ukB TX FIFO\n", + sc->sc_rxfifosize / 1024, v / 16); /* Initialize ifnet structure. */ ifp->if_softc = sc; ==== //depot/projects/power/sys/dev/if_ndis/if_ndis.c#9 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/if_ndis/if_ndis.c,v 1.55 2004/04/22 07:08:39 wpaul Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/if_ndis/if_ndis.c,v 1.57 2004/04/23 17:15:14 wpaul Exp $"); #include "opt_bdg.h" @@ -378,7 +378,7 @@ * init routine may trigger an interrupt. */ - error = bus_setup_intr(dev, sc->ndis_irq, INTR_TYPE_NET, + error = bus_setup_intr(dev, sc->ndis_irq, INTR_TYPE_NET | INTR_MPSAFE, ndis_intr, sc, &sc->ndis_intrhand); if (error) { @@ -687,9 +687,9 @@ struct ifnet *ifp; sc = device_get_softc(dev); - KASSERT(mtx_initialized(sc->ndis_mtx), + KASSERT(mtx_initialized(&sc->ndis_mtx), ("ndis mutex not initialized")); - KASSERT(mtx_initialized(sc->ndis_intrmtx), + KASSERT(mtx_initialized(&sc->ndis_intrmtx), ("ndis interrupt mutex not initialized")); NDIS_LOCK(sc); ifp = &sc->arpcom.ac_if; @@ -1032,6 +1032,8 @@ ndis_media_state linkstate; int error, len; + mtx_unlock(&Giant); + sc = xsc; hangfunc = sc->ndis_chars.nmc_checkhang_func; @@ -1066,6 +1068,8 @@ NDIS_UNLOCK(sc); + mtx_lock(&Giant); + return; } ==== //depot/projects/power/sys/dev/pccbb/pccbb.c#11 (text+ko) ==== @@ -73,7 +73,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/pccbb/pccbb.c,v 1.108 2004/04/13 14:39:26 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/pccbb/pccbb.c,v 1.109 2004/04/23 05:25:13 imp Exp $"); #include #include @@ -689,8 +689,10 @@ { static int curr_bus_number = 1; /* XXX EVILE BAD (see below) */ struct cbb_softc *sc = (struct cbb_softc *)device_get_softc(brdev); - int rid, bus; + int rid, bus, pribus; + device_t parent; + parent = device_get_parent(brdev); mtx_init(&sc->mtx, device_get_nameunit(brdev), "cbb", MTX_DEF); cv_init(&sc->cv, "cbb cv"); sc->chipset = cbb_chipset(pci_get_devid(brdev), NULL); @@ -732,8 +734,15 @@ * are in an appropriate range. */ bus = pci_read_config(brdev, PCIR_SECBUS_2, 1); + pribus = pcib_get_bus(parent); DEVPRINTF((brdev, "Secondary bus is %d\n", bus)); if (bus == 0) { + if (curr_bus_number < pribus) + curr_bus_number = pribus + 1; + if (pci_read_config(brdev, PCIR_PRIBUS_2, 1) != pribus) { + DEVPRINTF((brdev, "Setting primary bus to %d\n", pribus)); + pci_write_config(brdev, PCIR_PRIBUS_2, pribus, 1); + } bus = curr_bus_number; DEVPRINTF((brdev, "Secondary bus set to %d subbus %d\n", bus, bus + 1)); ==== //depot/projects/power/sys/dev/pci/pci.c#14 (text+ko) ==== @@ -25,7 +25,7 @@ * (INCLUDING 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/sys/dev/pci/pci.c,v 1.247 2004/04/21 20:19:56 imp Exp $ + * $FreeBSD: src/sys/dev/pci/pci.c,v 1.248 2004/04/23 15:48:48 marius Exp $ * */ @@ -825,6 +825,14 @@ if (base == 0) return 1; +#ifdef __sparc64__ + /* Sun EBus bridges contain the ranges for the devices beyond them */ + if ((pci_get_class(dev) == PCIC_BRIDGE) && + (pci_get_vendor(dev) == 0x108e) && + (pci_get_device(dev) == 0x1000 || pci_get_device(dev) == 0x1100)) + return 1; +#endif + start = base; end = base + (1 << ln2size) - 1; count = 1 << ln2size; ==== //depot/projects/power/sys/dev/puc/pucdata.c#7 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/puc/pucdata.c,v 1.43 2004/04/18 14:37:27 bde Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/puc/pucdata.c,v 1.44 2004/04/24 13:04:00 sobomax Exp $"); /* * PCI "universal" communications card driver configuration data (used to @@ -1063,6 +1063,51 @@ }, }, + { "IC Book Labs Gunboat x2 Low Profile", + { 0xb00c, 0x0a1c, 0, 0 }, + { 0xffff, 0xffff, 0, 0 }, + { + { PUC_PORT_TYPE_COM, 0x10, 0x00, COM_FREQ }, + { PUC_PORT_TYPE_COM, 0x10, 0x08, COM_FREQ }, + }, + }, + + { "IC Book Labs Gunboat x4 Lite", + { 0xb00c, 0x021c, 0, 0 }, + { 0xffff, 0xffff, 0, 0 }, + { + { PUC_PORT_TYPE_COM, 0x10, 0x00, COM_FREQ }, + { PUC_PORT_TYPE_COM, 0x10, 0x08, COM_FREQ }, + { PUC_PORT_TYPE_COM, 0x10, 0x10, COM_FREQ }, + { PUC_PORT_TYPE_COM, 0x10, 0x18, COM_FREQ }, + }, + PUC_ILR_TYPE_DIGI, { 0x07 }, + }, + + { "IC Book Labs Gunboat x4 Pro", + { 0xb00c, 0x031c, 0, 0 }, + { 0xffff, 0xffff, 0, 0 }, + { + { PUC_PORT_TYPE_COM, 0x10, 0x00, COM_FREQ }, + { PUC_PORT_TYPE_COM, 0x10, 0x08, COM_FREQ }, + { PUC_PORT_TYPE_COM, 0x10, 0x10, COM_FREQ }, + { PUC_PORT_TYPE_COM, 0x10, 0x18, COM_FREQ }, + }, + PUC_ILR_TYPE_DIGI, { 0x07 }, + }, + + { "IC Book Labs Gunboat x4 Low Profile", + { 0xb00c, 0x0b1c, 0, 0 }, + { 0xffff, 0xffff, 0, 0 }, + { + { PUC_PORT_TYPE_COM, 0x10, 0x00, COM_FREQ }, + { PUC_PORT_TYPE_COM, 0x10, 0x08, COM_FREQ }, + { PUC_PORT_TYPE_COM, 0x10, 0x10, COM_FREQ }, + { PUC_PORT_TYPE_COM, 0x10, 0x18, COM_FREQ }, + }, + PUC_ILR_TYPE_DIGI, { 0x07 }, + }, + { "IC Book Labs Ironclad x8 Lite", { 0xb00c, 0x041c, 0, 0 }, { 0xffff, 0xffff, 0, 0 }, ==== //depot/projects/power/sys/dev/uart/uart_dev_sab82532.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/uart/uart_dev_sab82532.c,v 1.5 2003/09/26 05:14:56 marcel Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/uart/uart_dev_sab82532.c,v 1.6 2004/04/25 04:30:40 marcel Exp $"); #include #include @@ -252,7 +252,7 @@ sab82532_param(bas, baudrate, databits, stopbits, parity); /* Clear interrupts. */ - uart_setreg(bas, SAB_IMR0, 0xff); + uart_setreg(bas, SAB_IMR0, (unsigned char)~SAB_IMR0_TCD); uart_setreg(bas, SAB_IMR1, 0xff); uart_barrier(bas); uart_getreg(bas, SAB_ISR0); ==== //depot/projects/power/sys/dev/usb/if_axe.c#5 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/usb/if_axe.c,v 1.11 2004/03/14 07:12:23 mdodd Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/usb/if_axe.c,v 1.12 2004/04/25 11:21:30 sanpei Exp $"); /* * ASIX Electronics AX88172 USB 2.0 ethernet driver. Used in the @@ -108,6 +108,7 @@ { USB_VENDOR_ASIX, USB_PRODUCT_ASIX_AX88172 }, { USB_VENDOR_DLINK, USB_PRODUCT_DLINK_DUBE100 }, { USB_VENDOR_LINKSYS2, USB_PRODUCT_LINKSYS_USB200M }, + { USB_VENDOR_MELCO, USB_PRODUCT_MELCO_LUAU2KTX }, { USB_VENDOR_NETGEAR, USB_PRODUCT_NETGEAR_FA120 }, { 0, 0 } }; ==== //depot/projects/power/sys/dev/usb/usbdevs#9 (text+ko) ==== @@ -1,4 +1,4 @@ -$FreeBSD: src/sys/dev/usb/usbdevs,v 1.170 2004/04/16 05:24:45 obrien Exp $ +$FreeBSD: src/sys/dev/usb/usbdevs,v 1.171 2004/04/25 11:21:30 sanpei Exp $ /* * Copyright (c) 1998, 1999, 2000 The NetBSD Foundation, Inc. @@ -926,6 +926,7 @@ product MELCO LUA2TX5 0x0009 LUA2-TX Ethernet product MELCO LUAKTX 0x0012 LUA-KTX Ethernet product MELCO DUBPXXG 0x001c USB-IDE Bridge: DUB-PxxG +product MELCO LUAU2KTX 0x003d LUA-U2-KTX Ethernet /* Metricom products */ product METRICOM RICOCHET_GS 0x0001 Ricochet GS ==== //depot/projects/power/sys/dev/usb/usbdevs.h#9 (text+ko) ==== @@ -1,10 +1,10 @@ -/* $FreeBSD: src/sys/dev/usb/usbdevs.h,v 1.177 2004/04/16 05:24:45 obrien Exp $ */ +/* $FreeBSD: src/sys/dev/usb/usbdevs.h,v 1.178 2004/04/25 11:24:40 sanpei Exp $ */ /* * THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT. * * generated from: - * FreeBSD: src/sys/dev/usb/usbdevs,v 1.169 2004/03/18 01:02:46 sobomax Exp + * FreeBSD: src/sys/dev/usb/usbdevs,v 1.171 2004/04/25 11:21:30 sanpei Exp */ /* @@ -933,6 +933,7 @@ #define USB_PRODUCT_MELCO_LUA2TX5 0x0009 /* LUA2-TX Ethernet */ #define USB_PRODUCT_MELCO_LUAKTX 0x0012 /* LUA-KTX Ethernet */ #define USB_PRODUCT_MELCO_DUBPXXG 0x001c /* USB-IDE Bridge: DUB-PxxG */ +#define USB_PRODUCT_MELCO_LUAU2KTX 0x003d /* LUA-U2-KTX Ethernet */ /* Metricom products */ #define USB_PRODUCT_METRICOM_RICOCHET_GS 0x0001 /* Ricochet GS */ ==== //depot/projects/power/sys/dev/usb/usbdevs_data.h#9 (text+ko) ==== @@ -1,10 +1,10 @@ -/* $FreeBSD: src/sys/dev/usb/usbdevs_data.h,v 1.177 2004/04/16 05:24:45 obrien Exp $ */ +/* $FreeBSD: src/sys/dev/usb/usbdevs_data.h,v 1.178 2004/04/25 11:24:40 sanpei Exp $ */ /* * THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT. * * generated from: - * FreeBSD: src/sys/dev/usb/usbdevs,v 1.169 2004/03/18 01:02:46 sobomax Exp + * FreeBSD: src/sys/dev/usb/usbdevs,v 1.171 2004/04/25 11:21:30 sanpei Exp */ /* @@ -2038,6 +2038,12 @@ "USB-IDE Bridge: DUB-PxxG", }, { + USB_VENDOR_MELCO, USB_PRODUCT_MELCO_LUAU2KTX, + 0, + "Melco", + "LUA-U2-KTX Ethernet", + }, + { USB_VENDOR_METRICOM, USB_PRODUCT_METRICOM_RICOCHET_GS, 0, "Metricom", ==== //depot/projects/power/sys/dev/vinum/vinumio.c#4 (text+ko) ==== @@ -34,7 +34,7 @@ * advised of the possibility of such damage. * * $Id: vinumio.c,v 1.39 2003/05/23 00:59:53 grog Exp grog $ - * $FreeBSD: src/sys/dev/vinum/vinumio.c,v 1.97 2004/03/11 14:11:08 le Exp $ + * $FreeBSD: src/sys/dev/vinum/vinumio.c,v 1.98 2004/04/24 23:41:21 le Exp $ */ #include @@ -878,6 +878,7 @@ drive->flags |= VF_CONFIGURED; /* this drive's configuration is complete */ } + Free(config_line); Free(config_text); Free(drivelist); vinum_conf.flags &= ~VF_READING_CONFIG; /* no longer reading from disk */ ==== //depot/projects/power/sys/i386/conf/NOTES#12 (text+ko) ==== @@ -4,7 +4,7 @@ # This file contains machine dependent kernel configuration notes. For # machine independent notes, look in /sys/conf/NOTES. # -# $FreeBSD: src/sys/i386/conf/NOTES,v 1.1156 2004/04/16 09:29:45 eivind Exp $ +# $FreeBSD: src/sys/i386/conf/NOTES,v 1.1157 2004/04/22 21:29:02 philip Exp $ # # @@ -450,6 +450,9 @@ #!options ACPI_NO_SEMAPHORES #!options ACPICA_PEDANTIC +# ACPI Asus Extras (LCD backlight/brightness, video output, etc.) +device acpi_asus + # ACPI Toshiba Extras (LCD backlight/brightness, video output, etc.) device acpi_toshiba ==== //depot/projects/power/sys/i386/include/float.h#3 (text+ko) ==== @@ -27,16 +27,20 @@ * SUCH DAMAGE. * * from: @(#)float.h 7.1 (Berkeley) 5/8/90 - * $FreeBSD: src/sys/i386/include/float.h,v 1.11 2004/04/07 20:46:05 imp Exp $ + * $FreeBSD: src/sys/i386/include/float.h,v 1.12 2004/04/25 02:36:28 das Exp $ */ #ifndef _MACHINE_FLOAT_H_ #define _MACHINE_FLOAT_H_ 1 +#include + #define FLT_RADIX 2 /* b */ #define FLT_ROUNDS 1 /* FP addition rounds to nearest */ +#if __ISO_C_VISIBLE >= 1999 #define FLT_EVAL_METHOD (-1) /* i387 semantics are...interesting */ #define DECIMAL_DIG 21 /* max precision in decimal digits */ +#endif #define FLT_MANT_DIG 24 /* p */ #define FLT_EPSILON 1.19209290E-07F /* b**(1-p) */ ==== //depot/projects/power/sys/ia64/include/float.h#3 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/ia64/include/float.h,v 1.5 2004/04/07 20:46:07 imp Exp $ */ +/* $FreeBSD: src/sys/ia64/include/float.h,v 1.6 2004/04/25 02:36:29 das Exp $ */ /* From: NetBSD: float.h,v 1.6 1997/07/17 21:36:03 thorpej Exp */ /* @@ -37,8 +37,10 @@ #define FLT_RADIX 2 /* b */ #define FLT_ROUNDS 1 /* FP addition rounds to nearest */ +#if __ISO_C_VISIBLE >= 1999 #define FLT_EVAL_METHOD 0 /* no promotions */ #define DECIMAL_DIG 35 /* max precision in decimal digits */ +#endif #define FLT_MANT_DIG 24 /* p */ #define FLT_EPSILON 1.19209290E-07F /* b**(1-p) */ ==== //depot/projects/power/sys/isa/fd.c#6 (text+ko) ==== @@ -49,7 +49,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/isa/fd.c,v 1.269 2004/04/07 20:46:08 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/isa/fd.c,v 1.270 2004/04/25 04:33:56 bde Exp $"); #include "opt_fdc.h" #include "card.h" @@ -2600,9 +2600,16 @@ return (0); case FD_STYPE: /* set drive type */ - if (suser(td) != 0) - return (EPERM); + /* + * Allow setting drive type temporarily iff + * currently unset. Used for fdformat so any + * user can set it, and then start formatting. + */ + if (fd->ft) + return (EINVAL); /* already set */ fd->fts[0] = *(struct fd_type *)addr; + fd->ft = &fd->fts[0]; + fd->flags |= FD_UA; return (0); case FD_GOPTS: /* get drive options */ ==== //depot/projects/power/sys/kern/imgact_elf.c#7 (text+ko) ==== @@ -29,7 +29,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/imgact_elf.c,v 1.147 2004/04/08 06:37:00 marcel Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/imgact_elf.c,v 1.148 2004/04/23 03:01:39 alc Exp $"); #include #include >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Apr 25 11:13:40 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7567916A4D1; Sun, 25 Apr 2004 11:13:40 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4B62D16A4CE for ; Sun, 25 Apr 2004 11:13:40 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 30E6A43D49 for ; Sun, 25 Apr 2004 11:13:40 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i3PIDeGe021143 for ; Sun, 25 Apr 2004 11:13:40 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i3PIDdee021140 for perforce@freebsd.org; Sun, 25 Apr 2004 11:13:39 -0700 (PDT) (envelope-from marcel@freebsd.org) Date: Sun, 25 Apr 2004 11:13:39 -0700 (PDT) Message-Id: <200404251813.i3PIDdee021140@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 51715 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 25 Apr 2004 18:13:41 -0000 http://perforce.freebsd.org/chv.cgi?CH=51715 Change 51715 by marcel@marcel_sledge on 2004/04/25 11:13:32 Get amd64 in sync: MFi386 Affected files ... .. //depot/projects/gdb/sys/amd64/include/kdb.h#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Sun Apr 25 11:22:52 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1491416A4D0; Sun, 25 Apr 2004 11:22:52 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id E41AB16A4CE for ; Sun, 25 Apr 2004 11:22:51 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C74B943D2D for ; Sun, 25 Apr 2004 11:22:51 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i3PIMpGe023072 for ; Sun, 25 Apr 2004 11:22:51 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i3PIMpNu023069 for perforce@freebsd.org; Sun, 25 Apr 2004 11:22:51 -0700 (PDT) (envelope-from marcel@freebsd.org) Date: Sun, 25 Apr 2004 11:22:51 -0700 (PDT) Message-Id: <200404251822.i3PIMpNu023069@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 51716 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 25 Apr 2004 18:22:52 -0000 http://perforce.freebsd.org/chv.cgi?CH=51716 Change 51716 by marcel@marcel_sledge on 2004/04/25 11:22:21 s/tf_eflags/tf_flags/g. Affected files ... .. //depot/projects/gdb/sys/amd64/include/kdb.h#2 edit Differences ... ==== //depot/projects/gdb/sys/amd64/include/kdb.h#2 (text+ko) ==== @@ -35,13 +35,13 @@ static __inline void kdb_cpu_clear_singlestep(void) { - kdb_frame->tf_eflags &= ~PSL_T; + kdb_frame->tf_flags &= ~PSL_T; } static __inline void kdb_cpu_set_singlestep(void) { - kdb_frame->tf_eflags |= PSL_T; + kdb_frame->tf_flags |= PSL_T; } static __inline void From owner-p4-projects@FreeBSD.ORG Sun Apr 25 11:26:57 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8042E16A4D0; Sun, 25 Apr 2004 11:26:57 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 5B11916A4CE for ; Sun, 25 Apr 2004 11:26:57 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5618043D3F for ; Sun, 25 Apr 2004 11:26:57 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i3PIQvGe023197 for ; Sun, 25 Apr 2004 11:26:57 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i3PIQuTa023194 for perforce@freebsd.org; Sun, 25 Apr 2004 11:26:56 -0700 (PDT) (envelope-from marcel@freebsd.org) Date: Sun, 25 Apr 2004 11:26:56 -0700 (PDT) Message-Id: <200404251826.i3PIQuTa023194@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 51717 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 25 Apr 2004 18:26:58 -0000 http://perforce.freebsd.org/chv.cgi?CH=51717 Change 51717 by marcel@marcel_sledge on 2004/04/25 11:26:02 Bring amd64 in sync: MFi386 Affected files ... .. //depot/projects/gdb/sys/amd64/include/gdb_machdep.h#2 edit Differences ... ==== //depot/projects/gdb/sys/amd64/include/gdb_machdep.h#2 (text+ko) ==== @@ -30,9 +30,23 @@ #define _MACHINE_GDB_MACHDEP_H_ #define GDB_BUFSZ 400 +#define GDB_NREGS 14 +#define GDB_REG_PC 8 + +static __inline size_t +gdb_cpu_regsz(int regnum __unused) +{ + return (sizeof(int)); +} + +static __inline int +gdb_cpu_query(void) +{ + return (0); +} -#define GDB_REG_FP 5 -#define GDB_REG_PC 8 -#define GDB_REG_SP 4 +void *gdb_cpu_getreg(int, size_t *); +void gdb_cpu_setreg(int, register_t); +int gdb_cpu_signal(int, int); #endif /* !_MACHINE_GDB_MACHDEP_H_ */ From owner-p4-projects@FreeBSD.ORG Sun Apr 25 11:29:00 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AB90F16A4D0; Sun, 25 Apr 2004 11:29:00 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 87B1C16A4CE for ; Sun, 25 Apr 2004 11:29:00 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6524243D62 for ; Sun, 25 Apr 2004 11:29:00 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i3PIT0Ge023289 for ; Sun, 25 Apr 2004 11:29:00 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i3PIT0bn023282 for perforce@freebsd.org; Sun, 25 Apr 2004 11:29:00 -0700 (PDT) (envelope-from marcel@freebsd.org) Date: Sun, 25 Apr 2004 11:29:00 -0700 (PDT) Message-Id: <200404251829.i3PIT0bn023282@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 51718 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 25 Apr 2004 18:29:01 -0000 http://perforce.freebsd.org/chv.cgi?CH=51718 Change 51718 by marcel@marcel_sledge on 2004/04/25 11:28:24 Pull db_global_jmpbuf into the #if 0. It's not used. Affected files ... .. //depot/projects/gdb/sys/amd64/amd64/db_interface.c#6 edit Differences ... ==== //depot/projects/gdb/sys/amd64/amd64/db_interface.c#6 (text+ko) ==== @@ -55,9 +55,9 @@ int db_active; db_regs_t ddb_regs; +#if 0 static jmp_buf db_global_jmpbuf; -#if 0 /* * ddb_trap - field a TRACE or BPT trap */ From owner-p4-projects@FreeBSD.ORG Sun Apr 25 11:32:05 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D867816A4D0; Sun, 25 Apr 2004 11:32:04 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id B20C616A4CE for ; Sun, 25 Apr 2004 11:32:04 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 96FB943D4C for ; Sun, 25 Apr 2004 11:32:04 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i3PIW4Ge024964 for ; Sun, 25 Apr 2004 11:32:04 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i3PIW4We024958 for perforce@freebsd.org; Sun, 25 Apr 2004 11:32:04 -0700 (PDT) (envelope-from marcel@freebsd.org) Date: Sun, 25 Apr 2004 11:32:04 -0700 (PDT) Message-Id: <200404251832.i3PIW4We024958@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 51719 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 25 Apr 2004 18:32:05 -0000 http://perforce.freebsd.org/chv.cgi?CH=51719 Change 51719 by marcel@marcel_sledge on 2004/04/25 11:31:48 amd64 doesn't have bootinfo. No symbols for now when breaking into the debugger early. Same as sparc64. Affected files ... .. //depot/projects/gdb/sys/amd64/amd64/machdep.c#9 edit Differences ... ==== //depot/projects/gdb/sys/amd64/amd64/machdep.c#9 (text+ko) ==== @@ -1218,11 +1218,6 @@ atpic_startup(); #endif -#ifdef DDB - ksym_start = bootinfo.bi_symtab; - ksym_end = bootinfo.bi_esymtab; -#endif - kdb_init(); #ifdef KDB From owner-p4-projects@FreeBSD.ORG Sun Apr 25 11:45:21 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9B0BF16A4D0; Sun, 25 Apr 2004 11:45:21 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 57F4116A4CE for ; Sun, 25 Apr 2004 11:45:21 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 38A8043D5D for ; Sun, 25 Apr 2004 11:45:21 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i3PIjLGe027192 for ; Sun, 25 Apr 2004 11:45:21 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i3PIjKE3027189 for perforce@freebsd.org; Sun, 25 Apr 2004 11:45:20 -0700 (PDT) (envelope-from marcel@freebsd.org) Date: Sun, 25 Apr 2004 11:45:20 -0700 (PDT) Message-Id: <200404251845.i3PIjKE3027189@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 51720 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 25 Apr 2004 18:45:22 -0000 http://perforce.freebsd.org/chv.cgi?CH=51720 Change 51720 by marcel@marcel_sledge on 2004/04/25 11:44:19 MFi386. Affected files ... .. //depot/projects/gdb/sys/amd64/amd64/trap.c#7 edit Differences ... ==== //depot/projects/gdb/sys/amd64/amd64/trap.c#7 (text+ko) ==== @@ -46,7 +46,6 @@ #include "opt_clock.h" #include "opt_cpu.h" -#include "opt_ddb.h" #include "opt_isa.h" #include "opt_ktrace.h" @@ -56,6 +55,7 @@ #include #include #include +#include #include #include #include @@ -88,8 +88,6 @@ #endif #include -#include - extern void trap(struct trapframe frame); extern void syscall(struct trapframe frame); @@ -130,10 +128,10 @@ "machine check trap", /* 28 T_MCHK */ }; -#ifdef DDB -static int ddb_on_nmi = 1; -SYSCTL_INT(_machdep, OID_AUTO, ddb_on_nmi, CTLFLAG_RW, - &ddb_on_nmi, 0, "Go to DDB on NMI"); +#ifdef KDB +static int kdb_on_nmi = 1; +SYSCTL_INT(_machdep, OID_AUTO, kdb_on_nmi, CTLFLAG_RW, + &kdb_on_nmi, 0, "Go to KDB on NMI"); #endif static int panic_on_nmi = 1; SYSCTL_INT(_machdep, OID_AUTO, panic_on_nmi, CTLFLAG_RW, @@ -167,15 +165,15 @@ atomic_add_int(&cnt.v_trap, 1); type = frame.tf_trapno; -#ifdef DDB - if (db_active) { - vm_offset_t eva; - eva = (type == T_PAGEFLT ? frame.tf_addr : 0); - trap_fatal(&frame, eva); +#ifdef KDB + if (kdb_active && type == T_PAGEFLT) { + kdb_trap(type, 0, &frame); goto out; } #endif + td->td_last_frame = &frame; + if ((frame.tf_rflags & PSL_I) == 0) { /* * Buggy application or kernel code has disabled @@ -288,7 +286,7 @@ * NMI can be hooked up to a pushbutton * for debugging. */ - if (ddb_on_nmi) { + if (kdb_on_nmi) { printf ("NMI ... going to debugger\n"); kdb_trap (type, 0, &frame); } @@ -419,12 +417,12 @@ */ case T_BPTFLT: /* - * If DDB is enabled, let it handle the debugger trap. + * If KDB is enabled, let it handle the debugger trap. * Otherwise, debugger traps "can't happen". */ #ifdef KDB /* XXX Giant */ - if (kdb_trap (type, 0, &frame)) + if (kdb_trap(type, 0, &frame)) goto out; #endif break; @@ -439,9 +437,9 @@ * NMI can be hooked up to a pushbutton * for debugging. */ - if (ddb_on_nmi) { + if (kdb_on_nmi) { printf ("NMI ... going to debugger\n"); - kdb_trap (type, 0, &frame); + kdb_trap(type, 0, &frame); } #endif /* KDB */ goto out; @@ -630,7 +628,7 @@ } #ifdef KDB - if ((debugger_on_panic || db_active) && kdb_trap(type, 0, frame)) + if (kdb_trap(type, 0, frame)) return; #endif printf("trap number = %d\n", type); @@ -699,6 +697,7 @@ regcnt = 6; sticks = td->td_sticks; td->td_frame = &frame; + td->td_last_frame = &frame; if (td->td_ucred != p->p_ucred) cred_update_thread(td); if (p->p_flag & P_SA) From owner-p4-projects@FreeBSD.ORG Sun Apr 25 12:17:01 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B80A816A4D0; Sun, 25 Apr 2004 12:17:00 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 9339116A4CE for ; Sun, 25 Apr 2004 12:17:00 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 76A1943D45 for ; Sun, 25 Apr 2004 12:17:00 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i3PJH0Ge034143 for ; Sun, 25 Apr 2004 12:17:00 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i3PJH0FN034138 for perforce@freebsd.org; Sun, 25 Apr 2004 12:17:00 -0700 (PDT) (envelope-from marcel@freebsd.org) Date: Sun, 25 Apr 2004 12:17:00 -0700 (PDT) Message-Id: <200404251917.i3PJH0FN034138@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 51722 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 25 Apr 2004 19:17:01 -0000 http://perforce.freebsd.org/chv.cgi?CH=51722 Change 51722 by marcel@marcel_nfs on 2004/04/25 12:16:28 MFi386 While here, remove a now stale comment in both the i386 and amd64 versions. Affected files ... .. //depot/projects/gdb/sys/amd64/isa/clock.c#3 edit .. //depot/projects/gdb/sys/i386/isa/clock.c#6 edit Differences ... ==== //depot/projects/gdb/sys/amd64/isa/clock.c#3 (text+ko) ==== @@ -54,6 +54,7 @@ #include #include #include +#include #include #include #include @@ -291,18 +292,8 @@ * takes about 1.5 usec for each of the i/o's in getit(). The loop * takes about 6 usec on a 486/33 and 13 usec on a 386/20. The * multiplications and divisions to scale the count take a while). - * - * However, if ddb is active then use a fake counter since reading - * the i8254 counter involves acquiring a lock. ddb must not go - * locking for many reasons, but it calls here for at least atkbd - * input. */ -#ifdef DDB - if (db_active) - prev_tick = 0; - else -#endif - prev_tick = getit(); + prev_tick = getit(); n -= 0; /* XXX actually guess no initial overhead */ /* * Calculate (n * (timer_freq / 1e6)) without using floating point @@ -329,13 +320,7 @@ / 1000000; while (ticks_left > 0) { -#ifdef DDB - if (db_active) { - inb(0x84); - tick = prev_tick + 1; - } else -#endif - tick = getit(); + tick = getit(); #ifdef DELAYDEBUG ++getit_calls; #endif @@ -380,10 +365,17 @@ splx(x); return (-1); /* XXX Should be EBUSY, but nobody cares anyway. */ } - mtx_lock_spin(&clock_lock); +#ifdef KDB + if (!kdb_active) +#endif + mtx_lock_spin(&clock_lock); outb(TIMER_CNTR2, pitch); outb(TIMER_CNTR2, (pitch>>8)); - mtx_unlock_spin(&clock_lock); +#ifdef KDB + if (!kdb_active) +#endif + mtx_unlock_spin(&clock_lock); + if (!beeping) { /* enable counter2 output to speaker */ outb(IO_PPI, inb(IO_PPI) | 3); ==== //depot/projects/gdb/sys/i386/isa/clock.c#6 (text+ko) ==== @@ -455,11 +455,6 @@ * takes about 1.5 usec for each of the i/o's in getit(). The loop * takes about 6 usec on a 486/33 and 13 usec on a 386/20. The * multiplications and divisions to scale the count take a while). - * - * However, if ddb is active then use a fake counter since reading - * the i8254 counter involves acquiring a lock. ddb must not go - * locking for many reasons, but it calls here for at least atkbd - * input. */ prev_tick = getit(); n -= 0; /* XXX actually guess no initial overhead */ From owner-p4-projects@FreeBSD.ORG Sun Apr 25 12:18:02 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9B51216A4D0; Sun, 25 Apr 2004 12:18:02 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 71B3116A4CE for ; Sun, 25 Apr 2004 12:18:02 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 53C9F43D49 for ; Sun, 25 Apr 2004 12:18:02 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i3PJI2Ge034165 for ; Sun, 25 Apr 2004 12:18:02 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i3PJI1WY034162 for perforce@freebsd.org; Sun, 25 Apr 2004 12:18:01 -0700 (PDT) (envelope-from marcel@freebsd.org) Date: Sun, 25 Apr 2004 12:18:01 -0700 (PDT) Message-Id: <200404251918.i3PJI1WY034162@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 51723 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 25 Apr 2004 19:18:03 -0000 http://perforce.freebsd.org/chv.cgi?CH=51723 Change 51723 by marcel@marcel_sledge on 2004/04/25 12:17:41 Pull db_active and ddb_regs into the #if 0 as well. Affected files ... .. //depot/projects/gdb/sys/amd64/amd64/db_interface.c#7 edit Differences ... ==== //depot/projects/gdb/sys/amd64/amd64/db_interface.c#7 (text+ko) ==== @@ -52,10 +52,9 @@ extern void gdb_handle_exception(db_regs_t *, int, int); +#if 0 int db_active; db_regs_t ddb_regs; - -#if 0 static jmp_buf db_global_jmpbuf; /* From owner-p4-projects@FreeBSD.ORG Sun Apr 25 13:13:10 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AF8FB16A4D0; Sun, 25 Apr 2004 13:13:10 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 73E9516A4CE for ; Sun, 25 Apr 2004 13:13:10 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 54D1743D53 for ; Sun, 25 Apr 2004 13:13:10 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i3PKDAGe053134 for ; Sun, 25 Apr 2004 13:13:10 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i3PKD9mM053131 for perforce@freebsd.org; Sun, 25 Apr 2004 13:13:09 -0700 (PDT) (envelope-from marcel@freebsd.org) Date: Sun, 25 Apr 2004 13:13:09 -0700 (PDT) Message-Id: <200404252013.i3PKD9mM053131@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 51725 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 25 Apr 2004 20:13:11 -0000 http://perforce.freebsd.org/chv.cgi?CH=51725 Change 51725 by marcel@marcel_nfs on 2004/04/25 13:13:01 add gdb_machdep.c Affected files ... .. //depot/projects/gdb/sys/conf/files.amd64#7 edit Differences ... ==== //depot/projects/gdb/sys/conf/files.amd64#7 (text+ko) ==== @@ -54,6 +54,7 @@ amd64/amd64/elf_machdep.c standard amd64/amd64/exception.S standard amd64/amd64/fpu.c standard +amd64/amd64/gdb_machdep.c optional gdb amd64/amd64/identcpu.c standard amd64/amd64/in_cksum.c optional inet amd64/amd64/initcpu.c standard From owner-p4-projects@FreeBSD.ORG Sun Apr 25 14:01:12 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0AFB416A4D0; Sun, 25 Apr 2004 14:01:12 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id D4ADA16A4CE for ; Sun, 25 Apr 2004 14:01:11 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B617F43D58 for ; Sun, 25 Apr 2004 14:01:11 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i3PL1BGe061561 for ; Sun, 25 Apr 2004 14:01:11 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i3PL1BeP061558 for perforce@freebsd.org; Sun, 25 Apr 2004 14:01:11 -0700 (PDT) (envelope-from marcel@freebsd.org) Date: Sun, 25 Apr 2004 14:01:11 -0700 (PDT) Message-Id: <200404252101.i3PL1BeP061558@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 51728 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 25 Apr 2004 21:01:12 -0000 http://perforce.freebsd.org/chv.cgi?CH=51728 Change 51728 by marcel@marcel_sledge on 2004/04/25 14:01:07 s/tf_flags/tf_rflags/g. Affected files ... .. //depot/projects/gdb/sys/amd64/include/kdb.h#3 edit Differences ... ==== //depot/projects/gdb/sys/amd64/include/kdb.h#3 (text+ko) ==== @@ -35,13 +35,13 @@ static __inline void kdb_cpu_clear_singlestep(void) { - kdb_frame->tf_flags &= ~PSL_T; + kdb_frame->tf_rflags &= ~PSL_T; } static __inline void kdb_cpu_set_singlestep(void) { - kdb_frame->tf_flags |= PSL_T; + kdb_frame->tf_rflags |= PSL_T; } static __inline void From owner-p4-projects@FreeBSD.ORG Sun Apr 25 14:05:18 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B2B3516A4D0; Sun, 25 Apr 2004 14:05:17 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 74C1D16A4CE for ; Sun, 25 Apr 2004 14:05:17 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5869543D2F for ; Sun, 25 Apr 2004 14:05:17 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i3PL5HGe064270 for ; Sun, 25 Apr 2004 14:05:17 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i3PL5G0d064267 for perforce@freebsd.org; Sun, 25 Apr 2004 14:05:16 -0700 (PDT) (envelope-from marcel@freebsd.org) Date: Sun, 25 Apr 2004 14:05:16 -0700 (PDT) Message-Id: <200404252105.i3PL5G0d064267@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 51729 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 25 Apr 2004 21:05:18 -0000 http://perforce.freebsd.org/chv.cgi?CH=51729 Change 51729 by marcel@marcel_sledge on 2004/04/25 14:05:13 Implement gdb_cpu_getreg() and gdb_cpu_regsz() accordingly. Don't implement gdb_cpu_signal() the same as on i386. It's a mistake to translate trap types to signal numbers. Affected files ... .. //depot/projects/gdb/sys/amd64/amd64/gdb_machdep.c#2 edit .. //depot/projects/gdb/sys/amd64/include/gdb_machdep.h#3 edit Differences ... ==== //depot/projects/gdb/sys/amd64/amd64/gdb_machdep.c#2 (text+ko) ==== @@ -29,7 +29,9 @@ #include #include +#include #include +#include #include #include @@ -40,73 +42,43 @@ #include -uintmax_t -gdb_cpu_getreg(int regnum, struct trapframe *tf) +void * +gdb_cpu_getreg(int regnum, size_t *regsz) { + struct trapframe *tf = kdb_frame; + + *regsz = gdb_cpu_regsz(regnum); switch (regnum) { - case GDB_REG_FP: return ((unsigned int)tf->tf_ebp); - case GDB_REG_PC: return ((unsigned int)tf->tf_eip); - case GDB_REG_SP: return ((unsigned int)tf->tf_esp); + case 0: return (&tf->tf_rax); + case 1: return (&tf->tf_rbx); + case 2: return (&tf->tf_rcx); + case 3: return (&tf->tf_rdx); + case 4: return (&tf->tf_rsi); + case 5: return (&tf->tf_rdi); + case 6: return (&tf->tf_rbp); + case 7: return (&tf->tf_rsp); + case 8: return (&tf->tf_r8); + case 9: return (&tf->tf_r9); + case 10: return (&tf->tf_r10); + case 11: return (&tf->tf_r11); + case 12: return (&tf->tf_r12); + case 13: return (&tf->tf_r13); + case 14: return (&tf->tf_r14); + case 15: return (&tf->tf_r15); + case 16: return (&tf->tf_rip); + case 17: return (&tf->tf_rflags); + case 18: return (&tf->tf_cs); + case 19: return (&tf->tf_ss); } - return (0); + return (NULL); } -ssize_t -gdb_cpu_getregs(struct trapframe *tf, void *buf, size_t bufsz) +void +gdb_cpu_setreg(int regnum, register_t val) { - struct reg *r = buf; - - if (sizeof(*r) > bufsz) - return (-1); - r->r_cs = tf->tf_cs; - r->r_ds = tf->tf_ds; - r->r_eax = tf->tf_eax; - r->r_ebp = tf->tf_ebp; - r->r_ebx = tf->tf_ebx; - r->r_ecx = tf->tf_ecx; - r->r_edi = tf->tf_edi; - r->r_edx = tf->tf_edx; - r->r_eflags = tf->tf_eflags; - r->r_eip = tf->tf_eip; - r->r_es = tf->tf_es; - r->r_esi = tf->tf_esi; - r->r_esp = tf->tf_esp; - r->r_fs = tf->tf_fs; - r->r_gs = 0; - r->r_ss = tf->tf_ss; - return (sizeof(*r)); -} + struct trapframe *tf = kdb_frame; -int -gdb_cpu_regsz(int regnum) -{ - return (4); /* XXX not really. */ -} - -void -gdb_cpu_setreg(int regnum, struct trapframe *tf, uintmax_t val) -{ switch (regnum) { - case GDB_REG_FP: tf->tf_ebp = val; break; - case GDB_REG_PC: tf->tf_eip = val; break; - case GDB_REG_SP: tf->tf_esp = val; break; + case GDB_REG_PC: tf->tf_rip = val; break; } } - -int -gdb_cpu_signal(int type, int code) -{ - return (type & ~T_USER); -} - -void -gdb_cpu_singlestep(int on, struct trapframe *tf) -{ - tf->tf_eflags &= ~PSL_T; - tf->tf_eflags |= (on) ? PSL_T : 0; -} - -void -gdb_cpu_trap(int type, int code, struct trapframe *tf) -{ -} ==== //depot/projects/gdb/sys/amd64/include/gdb_machdep.h#3 (text+ko) ==== @@ -29,14 +29,20 @@ #ifndef _MACHINE_GDB_MACHDEP_H_ #define _MACHINE_GDB_MACHDEP_H_ -#define GDB_BUFSZ 400 -#define GDB_NREGS 14 -#define GDB_REG_PC 8 +#define GDB_BUFSZ 500 +#define GDB_NREGS 56 +#define GDB_REG_PC 18 static __inline size_t -gdb_cpu_regsz(int regnum __unused) +gdb_cpu_regsz(int regnum) +{ + return ((regnum > 16 && regnum < 24) ? 4 : 8); +} + +static __inline int +gdb_cpu_signal(int type, int code __unused) { - return (sizeof(int)); + return (type); } static __inline int @@ -47,6 +53,5 @@ void *gdb_cpu_getreg(int, size_t *); void gdb_cpu_setreg(int, register_t); -int gdb_cpu_signal(int, int); #endif /* !_MACHINE_GDB_MACHDEP_H_ */ From owner-p4-projects@FreeBSD.ORG Sun Apr 25 14:51:14 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 28E9816A4D0; Sun, 25 Apr 2004 14:51:14 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id F272A16A4CE for ; Sun, 25 Apr 2004 14:51:13 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D530F43D45 for ; Sun, 25 Apr 2004 14:51:13 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i3PLpDGe072398 for ; Sun, 25 Apr 2004 14:51:13 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i3PLpD3d072395 for perforce@freebsd.org; Sun, 25 Apr 2004 14:51:13 -0700 (PDT) (envelope-from marcel@freebsd.org) Date: Sun, 25 Apr 2004 14:51:13 -0700 (PDT) Message-Id: <200404252151.i3PLpD3d072395@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 51730 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 25 Apr 2004 21:51:14 -0000 http://perforce.freebsd.org/chv.cgi?CH=51730 Change 51730 by marcel@marcel_nfs on 2004/04/25 14:50:42 Not used anymore. Affected files ... .. //depot/projects/gdb/sys/amd64/amd64/amd64-gdbstub.c#2 delete Differences ... From owner-p4-projects@FreeBSD.ORG Sun Apr 25 16:10:53 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C77D716A4D0; Sun, 25 Apr 2004 16:10:52 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id A2F8A16A4CE for ; Sun, 25 Apr 2004 16:10:52 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8440F43D31 for ; Sun, 25 Apr 2004 16:10:52 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i3PNAqGe091616 for ; Sun, 25 Apr 2004 16:10:52 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i3PNAqjZ091613 for perforce@freebsd.org; Sun, 25 Apr 2004 16:10:52 -0700 (PDT) (envelope-from marcel@freebsd.org) Date: Sun, 25 Apr 2004 16:10:52 -0700 (PDT) Message-Id: <200404252310.i3PNAqjZ091613@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 51735 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 25 Apr 2004 23:10:53 -0000 http://perforce.freebsd.org/chv.cgi?CH=51735 Change 51735 by marcel@marcel_nfs on 2004/04/25 16:10:47 Remove db_cpu_trap(). Affected files ... .. //depot/projects/gdb/sys/alpha/alpha/db_interface.c#5 edit .. //depot/projects/gdb/sys/ddb/ddb.h#4 edit .. //depot/projects/gdb/sys/i386/i386/db_interface.c#7 edit .. //depot/projects/gdb/sys/ia64/ia64/db_interface.c#5 edit .. //depot/projects/gdb/sys/sparc64/sparc64/db_interface.c#5 edit Differences ... ==== //depot/projects/gdb/sys/alpha/alpha/db_interface.c#5 (text+ko) ==== @@ -117,11 +117,6 @@ }; struct db_variable *db_eregs = db_regs + sizeof(db_regs)/sizeof(db_regs[0]); -void -db_cpu_trap(int entry, int code, struct trapframe *tf) -{ -} - /* * Read bytes from kernel address space for debugger. */ @@ -331,19 +326,6 @@ return (FALSE); } -#if 0 -boolean_t -db_inst_spill(ins, regn) - int ins, regn; -{ - alpha_instruction insn; - - insn.bits = ins; - return ((insn.mem_format.opcode == op_stq) && - (insn.mem_format.rd == regn)); -} -#endif - boolean_t db_inst_load(ins) int ins; ==== //depot/projects/gdb/sys/ddb/ddb.h#4 (text+ko) ==== @@ -85,7 +85,6 @@ void db_check_interrupt(void); void db_clear_watchpoints(void); -void db_cpu_trap(int, int, struct trapframe *); db_addr_t db_disasm(db_addr_t loc, boolean_t altfmt); /* instruction disassembler */ void db_error(const char *s); ==== //depot/projects/gdb/sys/i386/i386/db_interface.c#7 (text+ko) ==== @@ -48,16 +48,6 @@ #include -void -db_cpu_trap(int type, int code, struct trapframe *tf) -{ - /* If in kernel mode, esp and ss are not saved, so dummy them up. */ - if (ISPL(tf->tf_cs) == 0) { - tf->tf_esp = (int)&tf->tf_esp; - tf->tf_ss = rss(); - } -} - /* * Read bytes from kernel address space for debugger. */ ==== //depot/projects/gdb/sys/ia64/ia64/db_interface.c#5 (text+ko) ==== @@ -220,11 +220,6 @@ }; struct db_variable *db_eregs = db_regs + sizeof(db_regs)/sizeof(db_regs[0]); -void -db_cpu_trap(int vector, int dummy, struct trapframe *tf) -{ -} - static int db_get_rse_reg(struct db_variable *vp, db_expr_t *valuep, int op) { ==== //depot/projects/gdb/sys/sparc64/sparc64/db_interface.c#5 (text+ko) ==== @@ -55,12 +55,6 @@ extern jmp_buf db_jmpbuf; void -db_cpu_trap(int type, int dummy, struct trapframe *tf) -{ - flushw(); -} - -void db_read_bytes(vm_offset_t addr, size_t size, char *data) { char *src; From owner-p4-projects@FreeBSD.ORG Sun Apr 25 19:27:53 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 885C816A4D0; Sun, 25 Apr 2004 19:27:53 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 633DA16A4CE for ; Sun, 25 Apr 2004 19:27:53 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 598E243D31 for ; Sun, 25 Apr 2004 19:27:53 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i3Q2RrGe040096 for ; Sun, 25 Apr 2004 19:27:53 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i3Q2RqD6040093 for perforce@freebsd.org; Sun, 25 Apr 2004 19:27:52 -0700 (PDT) (envelope-from marcel@freebsd.org) Date: Sun, 25 Apr 2004 19:27:52 -0700 (PDT) Message-Id: <200404260227.i3Q2RqD6040093@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 51741 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 26 Apr 2004 02:27:54 -0000 http://perforce.freebsd.org/chv.cgi?CH=51741 Change 51741 by marcel@marcel_nfs on 2004/04/25 19:27:15 Implement breakpoints and single stepping in DDB. Affected files ... .. //depot/projects/gdb/sys/ia64/ia64/db_interface.c#6 edit .. //depot/projects/gdb/sys/ia64/include/db_machdep.h#3 edit .. //depot/projects/gdb/sys/ia64/include/kdb.h#3 edit Differences ... ==== //depot/projects/gdb/sys/ia64/ia64/db_interface.c#6 (text+ko) ==== @@ -1,5 +1,3 @@ -/* $FreeBSD: src/sys/ia64/ia64/db_interface.c,v 1.24 2003/10/24 06:42:03 marcel Exp $ */ - /* * Mach Operating System * Copyright (c) 1992,1991,1990 Carnegie Mellon University @@ -28,13 +26,8 @@ * db_interface.c,v 2.4 1991/02/05 17:11:13 mrt (CMU) */ -/* - * Parts of this file are derived from Mach 3: - * - * File: alpha_instruction.c - * Author: Alessandro Forin, Carnegie Mellon University - * Date: 6/92 - */ +#include +__FBSDID("$FreeBSD: src/sys/ia64/ia64/db_interface.c,v 1.24 2003/10/24 06:42:03 marcel Exp $"); /* * Interface to DDB. @@ -61,6 +54,13 @@ #include +#define TMPL_BITS 5 +#define TMPL_MASK ((1 << TMPL_BITS) - 1) +#define SLOT_BITS 41 +#define SLOT_COUNT 3 +#define SLOT_MASK ((1ULL << SLOT_BITS) - 1ULL) +#define SLOT_SHIFT(i) (TMPL_BITS+((i)<<3)+(i)) + static jmp_buf *db_nofault = 0; extern jmp_buf db_jmpbuf; @@ -326,17 +326,45 @@ } void -db_write_breakpoint(vm_offset_t addr, u_int64_t *storage) +db_bkpt_write(db_addr_t addr, BKPT_INST_TYPE *storage) { + BKPT_INST_TYPE tmp; + db_addr_t loc; + int slot; + + slot = addr & 0xfUL; + if (slot >= SLOT_COUNT) + return; + loc = (addr & ~0xfUL) + (slot << 2); + + db_read_bytes(loc, sizeof(BKPT_INST_TYPE), (char *)&tmp); + *storage = (tmp >> SLOT_SHIFT(slot)) & SLOT_MASK; + + tmp &= ~(SLOT_MASK << SLOT_SHIFT(slot)); + tmp |= (0x84000 << 6) << SLOT_SHIFT(slot); + db_write_bytes(loc, sizeof(BKPT_INST_TYPE), (char *)&tmp); } void -db_clear_breakpoint(vm_offset_t addr, u_int64_t *storage) +db_bkpt_clear(db_addr_t addr, BKPT_INST_TYPE *storage) { + BKPT_INST_TYPE tmp; + db_addr_t loc; + int slot; + + slot = addr & 0xfUL; + if (slot >= SLOT_COUNT) + return; + loc = (addr & ~0xfUL) + (slot << 2); + + db_read_bytes(loc, sizeof(BKPT_INST_TYPE), (char *)&tmp); + tmp &= ~(SLOT_MASK << SLOT_SHIFT(slot)); + tmp |= *storage << SLOT_SHIFT(slot); + db_write_bytes(loc, sizeof(BKPT_INST_TYPE), (char *)&tmp); } void -db_skip_breakpoint() +db_bkpt_skip(void) { ddb_regs.tf_special.psr += IA64_PSR_RI_1; ==== //depot/projects/gdb/sys/ia64/include/db_machdep.h#3 (text+ko) ==== @@ -40,27 +40,27 @@ #include #include -#define DB_NO_AOUT - -struct ia64_bundle; - typedef vm_offset_t db_addr_t; /* address - unsigned */ typedef long db_expr_t; /* expression - signed */ typedef struct trapframe db_regs_t; + extern db_regs_t ddb_regs; /* register state */ #define DDB_REGS (&ddb_regs) #define PC_REGS(regs) ((db_addr_t)(regs)->tf_special.iip + \ (((regs)->tf_special.psr >> 41) & 3)) -#define BKPT_WRITE(addr, storage) db_write_breakpoint(addr, storage) -#define BKPT_CLEAR(addr, storage) db_clear_breakpoint(addr, storage) -#define BKPT_INST_TYPE u_int64_t +#define BKPT_WRITE(addr, storage) db_bkpt_write(addr, storage) +#define BKPT_CLEAR(addr, storage) db_bkpt_clear(addr, storage) +#define BKPT_SKIP db_bkpt_skip() +#define BKPT_INST_TYPE uint64_t -#define BKPT_SKIP db_skip_breakpoint() +void db_bkpt_write(db_addr_t, BKPT_INST_TYPE *storage); +void db_bkpt_clear(db_addr_t, uint64_t *storage); +void db_bkpt_skip(void); -#define db_clear_single_step(regs) ddb_regs.tf_special.psr &= ~IA64_PSR_SS -#define db_set_single_step(regs) ddb_regs.tf_special.psr |= IA64_PSR_SS +#define db_set_single_step(regs) regs->tf_special.psr |= IA64_PSR_SS +#define db_clear_single_step(regs) regs->tf_special.psr &= ~IA64_PSR_SS #define IS_BREAKPOINT_TRAP(type, code) (type == IA64_VEC_BREAK) #define IS_WATCHPOINT_TRAP(type, code) 0 @@ -72,27 +72,16 @@ #define inst_load(ins) (ins & 0) #define inst_store(ins) (ins & 0) #define inst_unconditional_flow_transfer(ins) (ins & 0) - + #define branch_taken(ins, pc, regs) pc -/* - * Functions needed for software single-stepping. - */ - -/* No delay slots on Alpha. */ #define next_instr_address(v, b) ((db_addr_t) ((b) ? (v) : ((v) + 4))) u_long db_register_value(db_regs_t *, int); -u_int64_t *db_rse_current_frame(void); -u_int64_t *db_rse_previous_frame(u_int64_t *bsp, int sof); -u_int64_t *db_rse_register_address(u_int64_t *bsp, int regno); - -void db_read_bundle(db_addr_t addr, struct ia64_bundle *bp); -void db_write_bundle(db_addr_t addr, struct ia64_bundle *bp); -void db_write_breakpoint(db_addr_t addr, u_int64_t *storage); -void db_clear_breakpoint(db_addr_t addr, u_int64_t *storage); -void db_skip_breakpoint(void); +uint64_t *db_rse_current_frame(void); +uint64_t *db_rse_previous_frame(uint64_t *bsp, int sof); +uint64_t *db_rse_register_address(uint64_t *bsp, int regno); /* * Pretty arbitrary ==== //depot/projects/gdb/sys/ia64/include/kdb.h#3 (text+ko) ==== @@ -34,11 +34,13 @@ static __inline void kdb_cpu_clear_singlestep(void) { + kdb_frame->tf_special.psr &= ~IA64_PSR_SS; } static __inline void kdb_cpu_set_singlestep(void) { + kdb_frame->tf_special.psr |= IA64_PSR_SS; } static __inline void From owner-p4-projects@FreeBSD.ORG Mon Apr 26 06:53:43 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 86B4E16A4CF; Mon, 26 Apr 2004 06:53:43 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4D5E016A4CE for ; Mon, 26 Apr 2004 06:53:43 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 46C8343D46 for ; Mon, 26 Apr 2004 06:53:43 -0700 (PDT) (envelope-from areisse@nailabs.com) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i3QDrhGe007839 for ; Mon, 26 Apr 2004 06:53:43 -0700 (PDT) (envelope-from areisse@nailabs.com) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i3QDrgwX007836 for perforce@freebsd.org; Mon, 26 Apr 2004 06:53:42 -0700 (PDT) (envelope-from areisse@nailabs.com) Date: Mon, 26 Apr 2004 06:53:42 -0700 (PDT) Message-Id: <200404261353.i3QDrgwX007836@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to areisse@nailabs.com using -f From: Andrew Reisse To: Perforce Change Reviews Subject: PERFORCE change 51750 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 26 Apr 2004 13:53:44 -0000 http://perforce.freebsd.org/chv.cgi?CH=51750 Change 51750 by areisse@areisse_ibook on 2004/04/26 06:52:42 branch policy for sedarwin 7.3 Affected files ... .. //depot/projects/trustedbsd/sedarwin73/policy/Makefile#1 branch .. //depot/projects/trustedbsd/sedarwin73/policy/bininclude.C#1 branch .. //depot/projects/trustedbsd/sedarwin73/policy/devfs#1 branch .. //depot/projects/trustedbsd/sedarwin73/policy/fc#1 branch .. //depot/projects/trustedbsd/sedarwin73/policy/flask/Makefile#1 branch .. //depot/projects/trustedbsd/sedarwin73/policy/flask/access_vectors#1 branch .. //depot/projects/trustedbsd/sedarwin73/policy/flask/initial_sids#1 branch .. //depot/projects/trustedbsd/sedarwin73/policy/flask/mkaccess_vector.sh#1 branch .. //depot/projects/trustedbsd/sedarwin73/policy/flask/mkflask.sh#1 branch .. //depot/projects/trustedbsd/sedarwin73/policy/flask/security_classes#1 branch .. //depot/projects/trustedbsd/sedarwin73/policy/fs_use#1 branch .. //depot/projects/trustedbsd/sedarwin73/policy/initial_sid_contexts#1 branch .. //depot/projects/trustedbsd/sedarwin73/policy/initial_sids#1 branch .. //depot/projects/trustedbsd/sedarwin73/policy/isiddefs#1 branch .. //depot/projects/trustedbsd/sedarwin73/policy/macros/global_macros.te#1 branch .. //depot/projects/trustedbsd/sedarwin73/policy/rules#1 branch .. //depot/projects/trustedbsd/sedarwin73/policy/users#1 branch Differences ... From owner-p4-projects@FreeBSD.ORG Mon Apr 26 07:57:06 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1BEC016A4D0; Mon, 26 Apr 2004 07:57:06 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id AB8CB16A4CE for ; Mon, 26 Apr 2004 07:57:05 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A55FA43D64 for ; Mon, 26 Apr 2004 07:57:05 -0700 (PDT) (envelope-from areisse@nailabs.com) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i3QEv5Ge021118 for ; Mon, 26 Apr 2004 07:57:05 -0700 (PDT) (envelope-from areisse@nailabs.com) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i3QEv4A3021115 for perforce@freebsd.org; Mon, 26 Apr 2004 07:57:04 -0700 (PDT) (envelope-from areisse@nailabs.com) Date: Mon, 26 Apr 2004 07:57:04 -0700 (PDT) Message-Id: <200404261457.i3QEv4A3021115@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to areisse@nailabs.com using -f From: Andrew Reisse To: Perforce Change Reviews Subject: PERFORCE change 51756 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 26 Apr 2004 14:57:06 -0000 http://perforce.freebsd.org/chv.cgi?CH=51756 Change 51756 by areisse@areisse_ibook on 2004/04/26 07:56:57 bring loginwindow extension over to serdarwin 7.3. Affected files ... .. //depot/projects/trustedbsd/sedarwin73/sebsd_system/Makefile#1 branch .. //depot/projects/trustedbsd/sedarwin73/sebsd_system/wslogin/English.lproj/MainMenu.nib/classes.nib#1 branch .. //depot/projects/trustedbsd/sedarwin73/sebsd_system/wslogin/English.lproj/MainMenu.nib/info.nib#1 branch .. //depot/projects/trustedbsd/sedarwin73/sebsd_system/wslogin/English.lproj/MainMenu.nib/objects.nib#1 branch .. //depot/projects/trustedbsd/sedarwin73/sebsd_system/wslogin/LabelChooser.h#1 branch .. //depot/projects/trustedbsd/sedarwin73/sebsd_system/wslogin/LabelChooser.m#1 branch .. //depot/projects/trustedbsd/sedarwin73/sebsd_system/wslogin/Makefile#1 branch .. //depot/projects/trustedbsd/sedarwin73/sebsd_system/wslogin/WindowServer#1 branch .. //depot/projects/trustedbsd/sedarwin73/sebsd_system/wslogin/main.m#1 branch .. //depot/projects/trustedbsd/sedarwin73/sebsd_system/wslogin/wslogin.c#1 branch .. //depot/projects/trustedbsd/sedarwin73/sebsd_system/wslogin/wsloginui.pbproj/project.pbxproj#1 branch Differences ... From owner-p4-projects@FreeBSD.ORG Mon Apr 26 11:04:57 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 781A016A4D0; Mon, 26 Apr 2004 11:04:57 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 5213F16A4CF for ; Mon, 26 Apr 2004 11:04:57 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4B86843D46 for ; Mon, 26 Apr 2004 11:04:57 -0700 (PDT) (envelope-from areisse@nailabs.com) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i3QI4vGe069000 for ; Mon, 26 Apr 2004 11:04:57 -0700 (PDT) (envelope-from areisse@nailabs.com) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i3QI4uc5068997 for perforce@freebsd.org; Mon, 26 Apr 2004 11:04:56 -0700 (PDT) (envelope-from areisse@nailabs.com) Date: Mon, 26 Apr 2004 11:04:56 -0700 (PDT) Message-Id: <200404261804.i3QI4uc5068997@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to areisse@nailabs.com using -f From: Andrew Reisse To: Perforce Change Reviews Subject: PERFORCE change 51764 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 26 Apr 2004 18:04:58 -0000 http://perforce.freebsd.org/chv.cgi?CH=51764 Change 51764 by areisse@areisse_ibook on 2004/04/26 11:04:00 bring sebsd commands over to sedarwin 7.3. Affected files ... .. //depot/projects/trustedbsd/sedarwin73/sebsd_cmds/Makefile#1 branch .. //depot/projects/trustedbsd/sedarwin73/sebsd_cmds/checkpolicy/Makefile#1 branch .. //depot/projects/trustedbsd/sedarwin73/sebsd_cmds/checkpolicy/checkpolicy.c#1 branch .. //depot/projects/trustedbsd/sedarwin73/sebsd_cmds/checkpolicy/checkpolicy.h#1 branch .. //depot/projects/trustedbsd/sedarwin73/sebsd_cmds/checkpolicy/policy_parse.y#1 branch .. //depot/projects/trustedbsd/sedarwin73/sebsd_cmds/checkpolicy/policy_scan.l#1 branch .. //depot/projects/trustedbsd/sedarwin73/sebsd_cmds/checkpolicy/write.c#1 branch .. //depot/projects/trustedbsd/sedarwin73/sebsd_cmds/loadpolicy/Makefile#1 branch .. //depot/projects/trustedbsd/sedarwin73/sebsd_cmds/loadpolicy/sebsd_loadpolicy.8#1 branch .. //depot/projects/trustedbsd/sedarwin73/sebsd_cmds/loadpolicy/sebsd_loadpolicy.c#1 branch .. //depot/projects/trustedbsd/sedarwin73/sebsd_cmds/newrole/Makefile#1 branch .. //depot/projects/trustedbsd/sedarwin73/sebsd_cmds/newrole/sebsd_newrole.1#1 branch .. //depot/projects/trustedbsd/sedarwin73/sebsd_cmds/newrole/sebsd_newrole.c#1 branch .. //depot/projects/trustedbsd/sedarwin73/sebsd_cmds/relabel_gui/LabelDialog.h#1 branch .. //depot/projects/trustedbsd/sedarwin73/sebsd_cmds/relabel_gui/LabelDialog.m#1 branch .. //depot/projects/trustedbsd/sedarwin73/sebsd_cmds/relabel_gui/MainMenu.nib/classes.nib#1 branch .. //depot/projects/trustedbsd/sedarwin73/sebsd_cmds/relabel_gui/MainMenu.nib/info.nib#1 branch .. //depot/projects/trustedbsd/sedarwin73/sebsd_cmds/relabel_gui/MainMenu.nib/objects.nib#1 branch .. //depot/projects/trustedbsd/sedarwin73/sebsd_cmds/relabel_gui/relabel_gui.pbproj/project.pbxproj#1 branch Differences ... From owner-p4-projects@FreeBSD.ORG Tue Apr 27 07:11:28 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 383ED16A4D0; Tue, 27 Apr 2004 07:11:28 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id DF6C016A4CE for ; Tue, 27 Apr 2004 07:11:27 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C03B343D3F for ; Tue, 27 Apr 2004 07:11:27 -0700 (PDT) (envelope-from scottl@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i3REBRGe058500 for ; Tue, 27 Apr 2004 07:11:27 -0700 (PDT) (envelope-from scottl@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i3REBRlV058493 for perforce@freebsd.org; Tue, 27 Apr 2004 07:11:27 -0700 (PDT) (envelope-from scottl@freebsd.org) Date: Tue, 27 Apr 2004 07:11:27 -0700 (PDT) Message-Id: <200404271411.i3REBRlV058493@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to scottl@freebsd.org using -f From: Scott Long To: Perforce Change Reviews Subject: PERFORCE change 51792 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 27 Apr 2004 14:11:29 -0000 http://perforce.freebsd.org/chv.cgi?CH=51792 Change 51792 by scottl@scottl-junior-camlock on 2004/04/27 07:10:26 Rename cam_probe.c to scsi/scsi_probe.c to reflect that it is scsi-specific. Affected files ... .. //depot/projects/scottl-camlock/src/sys/cam/cam_probe.c#9 delete .. //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_probe.c#1 branch Differences ... From owner-p4-projects@FreeBSD.ORG Tue Apr 27 07:22:49 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4183E16A4D0; Tue, 27 Apr 2004 07:22:49 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 17B7D16A4CE for ; Tue, 27 Apr 2004 07:22:49 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id EEBB843D5F for ; Tue, 27 Apr 2004 07:22:48 -0700 (PDT) (envelope-from areisse@nailabs.com) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i3REMmGe061055 for ; Tue, 27 Apr 2004 07:22:48 -0700 (PDT) (envelope-from areisse@nailabs.com) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i3REMmXi061046 for perforce@freebsd.org; Tue, 27 Apr 2004 07:22:48 -0700 (PDT) (envelope-from areisse@nailabs.com) Date: Tue, 27 Apr 2004 07:22:48 -0700 (PDT) Message-Id: <200404271422.i3REMmXi061046@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to areisse@nailabs.com using -f From: Andrew Reisse To: Perforce Change Reviews Subject: PERFORCE change 51793 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 27 Apr 2004 14:22:49 -0000 http://perforce.freebsd.org/chv.cgi?CH=51793 Change 51793 by areisse@areisse_ibook on 2004/04/27 07:21:48 someone renamed pbxbuild Affected files ... .. //depot/projects/trustedbsd/sedarwin73/sebsd_system/wslogin/Makefile#2 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin73/sebsd_system/wslogin/Makefile#2 (text+ko) ==== @@ -9,7 +9,7 @@ gcc -dynamiclib -o $@ $(OBJS) ../../libsebsd/libsebsd.a ../../libmac/*.o build/wsloginui.app: LabelChooser.m LabelChooser.h main.m - pbxbuild + xcodebuild install: install -m 644 -o root -g wheel wslogin.dylib /usr/lib From owner-p4-projects@FreeBSD.ORG Tue Apr 27 07:24:52 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6763716A4D0; Tue, 27 Apr 2004 07:24:52 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 426ED16A4CE for ; Tue, 27 Apr 2004 07:24:52 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3BE4543D5C for ; Tue, 27 Apr 2004 07:24:52 -0700 (PDT) (envelope-from cvance@nailabs.com) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i3REOpGe061391 for ; Tue, 27 Apr 2004 07:24:52 -0700 (PDT) (envelope-from cvance@nailabs.com) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i3REOpvL061388 for perforce@freebsd.org; Tue, 27 Apr 2004 07:24:51 -0700 (PDT) (envelope-from cvance@nailabs.com) Date: Tue, 27 Apr 2004 07:24:51 -0700 (PDT) Message-Id: <200404271424.i3REOpvL061388@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to cvance@nailabs.com using -f From: Chris Vance To: Perforce Change Reviews Subject: PERFORCE change 51794 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 27 Apr 2004 14:24:53 -0000 http://perforce.freebsd.org/chv.cgi?CH=51794 Change 51794 by cvance@cvance_g5 on 2004/04/27 07:24:04 Correct extattr autostart code - fix the computation for when to stop reading dir entries. Affected files ... .. //depot/projects/trustedbsd/sedarwin73/apsl/xnu/bsd/hfs/hfs_extattr.c#3 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin73/apsl/xnu/bsd/hfs/hfs_extattr.c#3 (text+ko) ==== @@ -438,7 +438,7 @@ struct uio auio; struct iovec aiov; char *dirbuf; - int error, eofflag = 0; + int error, eofflag = 0, readcnt; if (dvp->v_type != VDIR) return (ENOTDIR); @@ -469,7 +469,8 @@ return (error); } - edp = (struct dirent *)&dirbuf[DIRBLKSIZ]; + readcnt = DIRBLKSIZ - auio.uio_resid; + edp = (struct dirent *)&dirbuf[readcnt]; for (dp = (struct dirent *)dirbuf; dp < edp; ) { #if (BYTE_ORDER == LITTLE_ENDIAN) dp->d_type = dp->d_namlen; From owner-p4-projects@FreeBSD.ORG Tue Apr 27 12:06:49 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 22F2816A4D0; Tue, 27 Apr 2004 12:06:49 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id EA70B16A4CE for ; Tue, 27 Apr 2004 12:06:48 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id DE75043D31 for ; Tue, 27 Apr 2004 12:06:48 -0700 (PDT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i3RJ6mGe028805 for ; Tue, 27 Apr 2004 12:06:48 -0700 (PDT) (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i3RJ6meU028802 for perforce@freebsd.org; Tue, 27 Apr 2004 12:06:48 -0700 (PDT) (envelope-from imp@freebsd.org) Date: Tue, 27 Apr 2004 12:06:48 -0700 (PDT) Message-Id: <200404271906.i3RJ6meU028802@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Subject: PERFORCE change 51807 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 27 Apr 2004 19:06:49 -0000 http://perforce.freebsd.org/chv.cgi?CH=51807 Change 51807 by imp@imp_pacopaco on 2004/04/27 12:06:24 IFC @51805 Affected files ... .. //depot/projects/power/sys/alpha/alpha/pmap.c#7 integrate .. //depot/projects/power/sys/boot/i386/boot0/Makefile#5 integrate .. //depot/projects/power/sys/boot/i386/btx/btx/Makefile#3 integrate .. //depot/projects/power/sys/boot/i386/btx/btxldr/Makefile#3 integrate .. //depot/projects/power/sys/boot/i386/cdboot/Makefile#3 integrate .. //depot/projects/power/sys/boot/i386/mbr/Makefile#3 integrate .. //depot/projects/power/sys/boot/i386/pxeldr/Makefile#3 integrate .. //depot/projects/power/sys/conf/NOTES#15 integrate .. //depot/projects/power/sys/conf/kern.pre.mk#7 integrate .. //depot/projects/power/sys/conf/options#15 integrate .. //depot/projects/power/sys/dev/acpica/acpi.c#21 integrate .. //depot/projects/power/sys/dev/acpica/acpi_pci.c#14 integrate .. //depot/projects/power/sys/dev/ata/ata-lowlevel.c#9 integrate .. //depot/projects/power/sys/dev/ata/ata-pci.c#10 integrate .. //depot/projects/power/sys/dev/ciss/ciss.c#9 integrate .. //depot/projects/power/sys/dev/cy/cy.c#1 branch .. //depot/projects/power/sys/dev/cy/cy_isa.c#1 branch .. //depot/projects/power/sys/dev/cy/cy_pci.c#1 branch .. //depot/projects/power/sys/dev/cy/cyreg.h#1 branch .. //depot/projects/power/sys/dev/ic/cd1400.h#1 branch .. //depot/projects/power/sys/dev/led/led.c#5 integrate .. //depot/projects/power/sys/dev/pci/pci.c#15 integrate .. //depot/projects/power/sys/dev/usb/usbdevs#10 integrate .. //depot/projects/power/sys/dev/usb/usbdevs.h#10 integrate .. //depot/projects/power/sys/dev/usb/usbdevs_data.h#10 integrate .. //depot/projects/power/sys/i386/conf/GENERIC#9 integrate .. //depot/projects/power/sys/i386/i386/elan-mmcr.c#8 integrate .. //depot/projects/power/sys/kern/kern_jail.c#3 integrate .. //depot/projects/power/sys/kern/vfs_syscalls.c#9 integrate .. //depot/projects/power/sys/modules/Makefile#9 integrate .. //depot/projects/power/sys/net/rtsock.c#8 integrate .. //depot/projects/power/sys/netgraph/bluetooth/common/ng_bluetooth.c#2 integrate .. //depot/projects/power/sys/netgraph/bluetooth/drivers/bt3c/ng_bt3c_pccard.c#3 integrate .. //depot/projects/power/sys/netgraph/bluetooth/drivers/h4/ng_h4.c#3 integrate .. //depot/projects/power/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c#5 integrate .. //depot/projects/power/sys/netgraph/bluetooth/hci/ng_hci_cmds.c#3 integrate .. //depot/projects/power/sys/netgraph/bluetooth/hci/ng_hci_evnt.c#4 integrate .. //depot/projects/power/sys/netgraph/bluetooth/hci/ng_hci_main.c#2 integrate .. //depot/projects/power/sys/netgraph/bluetooth/hci/ng_hci_misc.c#4 integrate .. //depot/projects/power/sys/netgraph/bluetooth/hci/ng_hci_ulpi.c#4 integrate .. //depot/projects/power/sys/netgraph/bluetooth/l2cap/ng_l2cap_cmds.c#3 integrate .. //depot/projects/power/sys/netgraph/bluetooth/l2cap/ng_l2cap_evnt.c#4 integrate .. //depot/projects/power/sys/netgraph/bluetooth/l2cap/ng_l2cap_llpi.c#4 integrate .. //depot/projects/power/sys/netgraph/bluetooth/l2cap/ng_l2cap_main.c#2 integrate .. //depot/projects/power/sys/netgraph/bluetooth/l2cap/ng_l2cap_misc.c#4 integrate .. //depot/projects/power/sys/netgraph/bluetooth/l2cap/ng_l2cap_ulpi.c#3 integrate .. //depot/projects/power/sys/netgraph/bluetooth/socket/ng_btsocket.c#4 integrate .. //depot/projects/power/sys/netgraph/bluetooth/socket/ng_btsocket_hci_raw.c#5 integrate .. //depot/projects/power/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c#5 integrate .. //depot/projects/power/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap_raw.c#5 integrate .. //depot/projects/power/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c#5 integrate .. //depot/projects/power/sys/netgraph/ng_pptpgre.c#3 integrate .. //depot/projects/power/sys/netgraph/ng_pptpgre.h#3 integrate .. //depot/projects/power/sys/netinet/raw_ip.c#7 integrate .. //depot/projects/power/sys/netinet/tcp_input.c#11 integrate .. //depot/projects/power/sys/netinet/tcp_var.h#7 integrate .. //depot/projects/power/sys/netinet6/nd6.c#10 integrate .. //depot/projects/power/sys/sys/jail.h#3 integrate .. //depot/projects/power/sys/sys/mman.h#3 integrate .. //depot/projects/power/sys/ufs/ffs/ffs_vfsops.c#7 integrate Differences ... ==== //depot/projects/power/sys/alpha/alpha/pmap.c#7 (text+ko) ==== @@ -148,7 +148,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/alpha/pmap.c,v 1.144 2004/04/24 20:53:54 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/pmap.c,v 1.146 2004/04/26 17:49:05 gallatin Exp $"); #include #include @@ -1074,7 +1074,7 @@ */ VM_OBJECT_LOCK(pmap->pm_pteobj); lev1pg = vm_page_grab(pmap->pm_pteobj, NUSERLEV3MAPS + NUSERLEV2MAPS, - VM_ALLOC_NORMAL | VM_ALLOC_RETRY | VM_ALLOC_WIRED); + VM_ALLOC_NORMAL | VM_ALLOC_RETRY | VM_ALLOC_WIRED | VM_ALLOC_ZERO); vm_page_lock_queues(); vm_page_flag_clear(lev1pg, PG_BUSY); @@ -1083,9 +1083,6 @@ VM_OBJECT_UNLOCK(pmap->pm_pteobj); pmap->pm_lev1 = (pt_entry_t*) ALPHA_PHYS_TO_K0SEG(VM_PAGE_TO_PHYS(lev1pg)); - if ((lev1pg->flags & PG_ZERO) == 0) - bzero(pmap->pm_lev1, PAGE_SIZE); - /* install self-referential address mapping entry (not PG_ASM) */ pmap->pm_lev1[PTLEV1I] = pmap_phys_to_pte(VM_PAGE_TO_PHYS(lev1pg)) @@ -1903,7 +1900,8 @@ * raise IPL while manipulating pv_table since pmap_enter can be * called at interrupt time. */ - if (pmap_initialized && (m->flags & PG_FICTITIOUS) == 0) { + if (pmap_initialized && + (m->flags & (PG_FICTITIOUS|PG_UNMANAGED)) == 0) { pmap_insert_entry(pmap, va, mpte, m); managed |= PG_MANAGED; } @@ -1963,7 +1961,7 @@ pmap_enter_quick(pmap_t pmap, vm_offset_t va, vm_page_t m, vm_page_t mpte) { register pt_entry_t *pte; - + int managed; /* * In the case that a page table page is not @@ -2028,7 +2026,11 @@ * raise IPL while manipulating pv_table since pmap_enter can be * called at interrupt time. */ - pmap_insert_entry(pmap, va, mpte, m); + managed = 0; + if ((m->flags & (PG_FICTITIOUS|PG_UNMANAGED)) == 0) { + pmap_insert_entry(pmap, va, mpte, m); + managed = PG_MANAGED | PG_FOR | PG_FOW | PG_FOE; + } /* * Increment counters @@ -2038,7 +2040,7 @@ /* * Now validate mapping with RO protection */ - *pte = pmap_phys_to_pte(VM_PAGE_TO_PHYS(m)) | PG_V | PG_KRE | PG_URE | PG_MANAGED | PG_FOR | PG_FOE | PG_FOW; + *pte = pmap_phys_to_pte(VM_PAGE_TO_PHYS(m)) | PG_V | PG_KRE | PG_URE | managed; alpha_pal_imb(); /* XXX overkill? */ return mpte; ==== //depot/projects/power/sys/boot/i386/boot0/Makefile#5 (text+ko) ==== @@ -1,11 +1,10 @@ -# $FreeBSD: src/sys/boot/i386/boot0/Makefile,v 1.23 2004/02/09 14:11:56 ru Exp $ +# $FreeBSD: src/sys/boot/i386/boot0/Makefile,v 1.25 2004/04/25 20:36:43 obrien Exp $ -PROG= ${BOOT}.out +PROG= ${BOOT} INTERNALPROG= FILES= ${BOOT} NOMAN= SRCS= ${BOOT}.s -CLEANFILES= ${BOOT} BOOT?= boot0 @@ -34,9 +33,6 @@ --defsym TICKS=${BOOT_BOOT0_TICKS} \ --defsym COMSPEED=${BOOT_BOOT0_COMCONSOLE_SPEED} -LDFLAGS=-N -e start -Ttext ${BOOT_BOOT0_ORG} - -${BOOT}: ${BOOT}.out - objcopy -S -O binary ${BOOT}.out ${.TARGET} +LDFLAGS=-N -e start -Ttext ${BOOT_BOOT0_ORG} -Wl,-S,--oformat,binary .include ==== //depot/projects/power/sys/boot/i386/btx/btx/Makefile#3 (text+ko) ==== @@ -1,6 +1,6 @@ -# $FreeBSD: src/sys/boot/i386/btx/btx/Makefile,v 1.15 2004/02/11 08:42:37 ru Exp $ +# $FreeBSD: src/sys/boot/i386/btx/btx/Makefile,v 1.17 2004/04/25 20:36:43 obrien Exp $ -PROG= btx.out +PROG= btx INTERNALPROG= NOMAN= SRCS= btx.S @@ -29,11 +29,6 @@ ORG= 0x9000 -all: btx - -LDFLAGS=-N -e start -Ttext ${ORG} - -btx: btx.out - objcopy -S -O binary btx.out ${.TARGET} +LDFLAGS=-N -e start -Ttext ${ORG} -Wl,-S,--oformat,binary .include ==== //depot/projects/power/sys/boot/i386/btx/btxldr/Makefile#3 (text+ko) ==== @@ -1,6 +1,6 @@ -# $FreeBSD: src/sys/boot/i386/btx/btxldr/Makefile,v 1.14 2004/02/11 08:42:37 ru Exp $ +# $FreeBSD: src/sys/boot/i386/btx/btxldr/Makefile,v 1.16 2004/04/25 20:36:44 obrien Exp $ -PROG= btxldr.out +PROG= btxldr INTERNALPROG= NOMAN= SRCS= btxldr.S @@ -12,11 +12,6 @@ CFLAGS+=-DBTXLDR_VERBOSE .endif -all: btxldr - -LDFLAGS=-N -e start -Ttext ${LOADER_ADDRESS} - -btxldr: btxldr.out - objcopy -S -O binary btxldr.out ${.TARGET} +LDFLAGS=-N -e start -Ttext ${LOADER_ADDRESS} -Wl,-S,--oformat,binary .include ==== //depot/projects/power/sys/boot/i386/cdboot/Makefile#3 (text+ko) ==== @@ -1,6 +1,6 @@ -# $FreeBSD: src/sys/boot/i386/cdboot/Makefile,v 1.8 2004/02/09 14:11:57 ru Exp $ +# $FreeBSD: src/sys/boot/i386/cdboot/Makefile,v 1.10 2004/04/25 20:36:44 obrien Exp $ -PROG= ${BOOT}.out +PROG= ${BOOT} INTERNALPROG= FILES= ${BOOT} NOMAN= @@ -10,9 +10,6 @@ BOOT= cdboot ORG= 0x7c00 -${BOOT}: ${BOOT}.out - objcopy -S -O binary ${BOOT}.out ${.TARGET} - -LDFLAGS=-N -e start -Ttext ${ORG} +LDFLAGS=-N -e start -Ttext ${ORG} -Wl,-S,--oformat,binary .include ==== //depot/projects/power/sys/boot/i386/mbr/Makefile#3 (text+ko) ==== @@ -1,6 +1,6 @@ -# $FreeBSD: src/sys/boot/i386/mbr/Makefile,v 1.9 2004/02/09 14:11:57 ru Exp $ +# $FreeBSD: src/sys/boot/i386/mbr/Makefile,v 1.11 2004/04/25 20:36:44 obrien Exp $ -PROG= ${BOOT}.out +PROG= ${BOOT} INTERNALPROG= FILES= ${BOOT} NOMAN= @@ -10,9 +10,6 @@ BOOT= mbr ORG= 0x600 -${BOOT}: ${BOOT}.out - objcopy -S -O binary ${BOOT}.out ${.TARGET} - -LDFLAGS=-N -e start -Ttext ${ORG} +LDFLAGS=-N -e start -Ttext ${ORG} -Wl,-S,--oformat,binary .include ==== //depot/projects/power/sys/boot/i386/pxeldr/Makefile#3 (text+ko) ==== @@ -1,9 +1,9 @@ -# $FreeBSD: src/sys/boot/i386/pxeldr/Makefile,v 1.13 2004/02/11 08:42:38 ru Exp $ +# $FreeBSD: src/sys/boot/i386/pxeldr/Makefile,v 1.15 2004/04/25 20:36:44 obrien Exp $ # Pick up ../Makefile.inc early. .include -PROG= ${LDR}.out +PROG= ${LDR} INTERNALPROG= FILES= ${BOOT} MAN= ${BOOT}.8 @@ -34,10 +34,7 @@ CLEANFILES+= ${LDR} -${LDR}: ${LDR}.out - objcopy -S -O binary ${LDR}.out ${.TARGET} - -LDFLAGS+= -N -e start -Ttext ${ORG} +LDFLAGS+= -N -e start -Ttext ${ORG} -Wl,-S,--oformat,binary CLEANFILES+= ${LOADER} ==== //depot/projects/power/sys/conf/NOTES#15 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/NOTES,v 1.1221 2004/04/24 22:03:01 rik Exp $ +# $FreeBSD: src/sys/conf/NOTES,v 1.1222 2004/04/27 16:38:12 emax Exp $ # # NOTES -- Lines that can be cut/pasted into kernel and hints configs. # @@ -410,6 +410,15 @@ options NETGRAPH #netgraph(4) system options NETGRAPH_ASYNC options NETGRAPH_ATMLLC +options NETGRAPH_ATM_ATMPIF +options NETGRAPH_BLUETOOTH # ng_bluetooth(4) +options NETGRAPH_BLUETOOTH_BT3C # ng_bt3c(4) +options NETGRAPH_BLUETOOTH_H4 # ng_h4(4) +options NETGRAPH_BLUETOOTH_HCI # ng_hci(4) +options NETGRAPH_BLUETOOTH_L2CAP # ng_l2cap(4) +options NETGRAPH_BLUETOOTH_SOCKET # ng_btsocket(4) +options NETGRAPH_BLUETOOTH_UBT # ng_ubt(4) +options NETGRAPH_BLUETOOTH_UBTBCMFW # ubtbcmfw(4) options NETGRAPH_BPF options NETGRAPH_BRIDGE options NETGRAPH_CISCO @@ -439,17 +448,6 @@ options NETGRAPH_TTY options NETGRAPH_UI options NETGRAPH_VJC -options NETGRAPH_ATM_ATMPIF - -# NgBluetooth - Netgraph Bluetooth -options NETGRAPH_BLUETOOTH # Common parts -options NETGRAPH_BLUETOOTH_BT3C # 3COM Bluetooth PCCARD -options NETGRAPH_BLUETOOTH_H4 # H4 line discipline -options NETGRAPH_BLUETOOTH_UBT # Bluetooth USB dongle -options NETGRAPH_BLUETOOTH_UBTBCMFW # Firmware driver for BCM2033 -options NETGRAPH_BLUETOOTH_HCI # Bluetooth HCI layer -options NETGRAPH_BLUETOOTH_L2CAP # Bluetooth L2CAP layer -options NETGRAPH_BLUETOOTH_SOCKET # Bluetooth sockets layer # NgATM - Netgraph ATM options NGATM_ATM ==== //depot/projects/power/sys/conf/kern.pre.mk#7 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/kern.pre.mk,v 1.51 2004/04/23 19:48:43 emax Exp $ +# $FreeBSD: src/sys/conf/kern.pre.mk,v 1.52 2004/04/27 16:38:13 emax Exp $ # Part of a unified Makefile for building kernels. This part contains all # of the definitions that need to be before %BEFORE_DEPEND. @@ -63,15 +63,6 @@ # ... and the same for the NgATM stuff INCLUDES+= -I$S/contrib/ngatm -# ... and the same for the NgBluetooth stuff -INCLUDES+= -I$S/netgraph/bluetooth/include -INCLUDES+= -I$S/netgraph/bluetooth/drivers/bt3c -INCLUDES+= -I$S/netgraph/bluetooth/drivers/h4 -INCLUDES+= -I$S/netgraph/bluetooth/drivers/ubt -INCLUDES+= -I$S/netgraph/bluetooth/drivers/ubtbcmfw -INCLUDES+= -I$S/netgraph/bluetooth/hci -INCLUDES+= -I$S/netgraph/bluetooth/l2cap - COPTS= ${INCLUDES} -D_KERNEL -include opt_global.h CFLAGS= ${COPTFLAGS} ${CWARNFLAGS} ${DEBUG} ${COPTS} .if ${CC} != "icc" ==== //depot/projects/power/sys/conf/options#15 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/options,v 1.444 2004/04/24 22:03:02 rik Exp $ +# $FreeBSD: src/sys/conf/options,v 1.445 2004/04/27 16:38:13 emax Exp $ # # On the handling of kernel options # @@ -351,6 +351,15 @@ NETGRAPH NETGRAPH_ASYNC opt_netgraph.h NETGRAPH_ATMLLC opt_netgraph.h +NETGRAPH_ATM_ATMPIF opt_netgraph.h +NETGRAPH_BLUETOOTH opt_netgraph.h +NETGRAPH_BLUETOOTH_BT3C opt_netgraph.h +NETGRAPH_BLUETOOTH_H4 opt_netgraph.h +NETGRAPH_BLUETOOTH_HCI opt_netgraph.h +NETGRAPH_BLUETOOTH_L2CAP opt_netgraph.h +NETGRAPH_BLUETOOTH_SOCKET opt_netgraph.h +NETGRAPH_BLUETOOTH_UBT opt_netgraph.h +NETGRAPH_BLUETOOTH_UBTBCMFW opt_netgraph.h NETGRAPH_BPF opt_netgraph.h NETGRAPH_BRIDGE opt_netgraph.h NETGRAPH_CISCO opt_netgraph.h @@ -380,17 +389,6 @@ NETGRAPH_TTY opt_netgraph.h NETGRAPH_UI opt_netgraph.h NETGRAPH_VJC opt_netgraph.h -NETGRAPH_ATM_ATMPIF opt_netgraph.h - -# NgBluetooth options -NETGRAPH_BLUETOOTH opt_netgraph.h -NETGRAPH_BLUETOOTH_BT3C opt_netgraph.h -NETGRAPH_BLUETOOTH_H4 opt_netgraph.h -NETGRAPH_BLUETOOTH_UBT opt_netgraph.h -NETGRAPH_BLUETOOTH_UBTBCMFW opt_netgraph.h -NETGRAPH_BLUETOOTH_HCI opt_netgraph.h -NETGRAPH_BLUETOOTH_L2CAP opt_netgraph.h -NETGRAPH_BLUETOOTH_SOCKET opt_netgraph.h # NgATM options NGATM_ATM opt_netgraph.h ==== //depot/projects/power/sys/dev/acpica/acpi.c#21 (text+ko) ==== @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/acpica/acpi.c,v 1.141 2004/04/21 00:38:54 njl Exp $ + * $FreeBSD: src/sys/dev/acpica/acpi.c,v 1.143 2004/04/26 08:49:11 takawata Exp $ */ #include "opt_acpi.h" @@ -1159,7 +1159,7 @@ static void acpi_shutdown_final(void *arg, int howto) { - + ACPI_STATUS status; ACPI_ASSERTLOCK; /* @@ -1168,6 +1168,12 @@ * not power off the system correctly if called from an AP. */ if ((howto & RB_POWEROFF) != 0) { + status = AcpiEnterSleepStatePrep(ACPI_STATE_S5); + if (ACPI_FAILURE(status)) { + printf("AcpiEnterSleepStatePrep failed - %s\n", + AcpiFormatException(status)); + return; + } printf("Powering system off using ACPI\n"); smp_rendezvous(NULL, acpi_shutdown_poweroff, NULL, NULL); } else { @@ -1176,6 +1182,10 @@ } } +/* + * Since this function may be called with locks held or in an unknown + * context, it cannot allocate memory, acquire locks, sleep, etc. + */ static void acpi_shutdown_poweroff(void *arg) { @@ -1187,12 +1197,6 @@ if (PCPU_GET(cpuid) != 0) return; - status = AcpiEnterSleepStatePrep(ACPI_STATE_S5); - if (ACPI_FAILURE(status)) { - printf("AcpiEnterSleepStatePrep failed - %s\n", - AcpiFormatException(status)); - return; - } ACPI_DISABLE_IRQS(); status = AcpiEnterSleepState(ACPI_STATE_S5); if (ACPI_FAILURE(status)) { ==== //depot/projects/power/sys/dev/acpica/acpi_pci.c#14 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_pci.c,v 1.13 2004/04/14 17:46:21 njl Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_pci.c,v 1.14 2004/04/26 02:11:38 imp Exp $"); #include "opt_bus.h" @@ -207,7 +207,7 @@ acpi_state, device_get_nameunit(child), AcpiFormatException(status)); } - if (state > old_state) + if (old_state > state) return (pci_set_powerstate_method(dev, child, state)); else return (0); ==== //depot/projects/power/sys/dev/ata/ata-lowlevel.c#9 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/ata-lowlevel.c,v 1.33 2004/04/19 18:29:43 sos Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/ata-lowlevel.c,v 1.34 2004/04/27 15:52:08 sos Exp $"); #include "opt_ata.h" #include @@ -635,17 +635,17 @@ } } if (mask == 0x01) /* wait for master only */ - if (!(stat0 & ATA_S_BUSY) || (stat0 == 0xff && timeout > 20)) + if (!(stat0 & ATA_S_BUSY) || (stat0 == 0xff && timeout > 5)) break; if (mask == 0x02) /* wait for slave only */ - if (!(stat1 & ATA_S_BUSY) || (stat1 == 0xff && timeout > 20)) + if (!(stat1 & ATA_S_BUSY) || (stat1 == 0xff && timeout > 5)) break; if (mask == 0x03) { /* wait for both master & slave */ if (!(stat0 & ATA_S_BUSY) && !(stat1 & ATA_S_BUSY)) break; - if (stat0 == 0xff && timeout > 20) + if (stat0 == 0xff && timeout > 5) mask &= ~0x01; - if (stat1 == 0xff && timeout > 20) + if (stat1 == 0xff && timeout > 5) mask &= ~0x02; } DELAY(100000); ==== //depot/projects/power/sys/dev/ata/ata-pci.c#10 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/ata-pci.c,v 1.81 2004/04/24 16:32:06 sos Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/ata-pci.c,v 1.82 2004/04/27 12:54:59 sos Exp $"); #include "opt_ata.h" #include @@ -164,8 +164,7 @@ { struct ata_pci_controller *ctlr = device_get_softc(dev); u_int32_t cmd; - u_int8_t progif; - int unit, prisec = 0; + int unit; /* do chipset specific setups only needed once */ if (ata_legacy(dev) || pci_read_config(dev, 0x18, 4) & IOMASK) @@ -176,10 +175,6 @@ ctlr->dmainit = ata_pci_dmainit; ctlr->locking = ata_pci_locknoop; - progif = pci_read_config(dev, PCIR_PROGIF, 1); - if ((progif & 0x80)) - prisec = 1; - /* if needed try to enable busmastering */ cmd = pci_read_config(dev, PCIR_COMMAND, 2); if (!(cmd & PCIM_CMD_BUSMASTEREN)) { @@ -199,7 +194,7 @@ /* attach all channels on this controller */ for (unit = 0; unit < ctlr->channels; unit++) - device_add_child(dev, "ata", prisec ? + device_add_child(dev, "ata", (pci_get_progif(dev) & 0x85) == 0x80 ? unit : devclass_find_free_unit(ata_devclass, 2)); return bus_generic_attach(dev); ==== //depot/projects/power/sys/dev/ciss/ciss.c#9 (text+ko) ==== @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/ciss/ciss.c,v 1.44 2004/04/19 17:16:06 ps Exp $ + * $FreeBSD: src/sys/dev/ciss/ciss.c,v 1.45 2004/04/26 19:28:08 ps Exp $ */ /* @@ -1411,7 +1411,9 @@ struct ciss_request *cr; struct ciss_command *cc; struct ciss_bmic_cdb *cbc; - int error; + int error, ldrive; + + ldrive = CISS_LUN_TO_TARGET(ld->cl_address.logical.lun); debug(0, "bringing logical drive %d back online %ssynchronously", ldrive, async ? "a" : ""); @@ -1425,7 +1427,7 @@ cc = CISS_FIND_COMMAND(cr); cc->header.address = *ld->cl_controller; /* target controller */ cbc = (struct ciss_bmic_cdb *)&(cc->cdb.cdb[0]); - cbc->log_drive = CISS_LUN_TO_TARGET(ld->cl_address.logical.lun); + cbc->log_drive = ldrive; /* * Dispatch the request asynchronously if we can't sleep waiting @@ -3568,7 +3570,7 @@ static void ciss_print_adapter(struct ciss_softc *sc) { - int i; + int i, j; ciss_printf(sc, "ADAPTER:\n"); for (i = 0; i < CISSQ_COUNT; i++) { @@ -3579,14 +3581,14 @@ sc->ciss_qstat[i].q_max); } ciss_printf(sc, "max_requests %d\n", sc->ciss_max_requests); - ciss_printf(sc, "notify_head/tail %d/%d\n", - sc->ciss_notify_head, sc->ciss_notify_tail); ciss_printf(sc, "flags %b\n", sc->ciss_flags, "\20\1notify_ok\2control_open\3aborting\4running\21fake_synch\22bmic_abort\n"); - for (i = 0; i < CISS_MAX_LOGICAL; i++) { - ciss_printf(sc, "LOGICAL DRIVE %d: ", i); - ciss_print_ldrive(sc, sc->ciss_logical + i); + for (i = 0; i < sc->ciss_max_bus_number; i++) { + for (j = 0; j < CISS_MAX_LOGICAL; j++) { + ciss_printf(sc, "LOGICAL DRIVE %d: ", i); + ciss_print_ldrive(sc, &sc->ciss_logical[i][j]); + } } for (i = 1; i < sc->ciss_max_requests; i++) ==== //depot/projects/power/sys/dev/led/led.c#5 (text+ko) ==== @@ -9,7 +9,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/led/led.c,v 1.8 2004/02/21 21:10:43 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/led/led.c,v 1.9 2004/04/27 13:09:21 phk Exp $"); #include #include @@ -52,10 +52,14 @@ sc->count--; continue; } - if (*sc->ptr >= 'a' && *sc->ptr <= 'j') + if (*sc->ptr == '.') { + sc->ptr = NULL; + continue; + } else if (*sc->ptr >= 'a' && *sc->ptr <= 'j') { sc->func(sc->private, 0); - else if (*sc->ptr >= 'A' && *sc->ptr <= 'J') + } else if (*sc->ptr >= 'A' && *sc->ptr <= 'J') { sc->func(sc->private, 1); + } sc->count = *sc->ptr & 0xf; sc->ptr++; if (*sc->ptr == '\0') @@ -153,11 +157,10 @@ */ case 's': for(s++; *s; s++) { - if ((*s & 0x0f) > 10) - continue; - if ((*s & 0xf0) < ' ') - continue; - sbuf_bcat(sb, s, 1); + if ((*s >= 'a' && *s <= 'j') || + (*s >= 'A' && *s <= 'J') || + *s == '.') + sbuf_bcat(sb, s, 1); } break; /* @@ -249,6 +252,7 @@ sbuf_delete(sb); mtx_lock(&led_mtx); LIST_INSERT_HEAD(&led_list, sc, list); + sc->func(sc->private, 0); mtx_unlock(&led_mtx); return (sc->dev); } ==== //depot/projects/power/sys/dev/pci/pci.c#15 (text+ko) ==== @@ -25,7 +25,7 @@ * (INCLUDING 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/sys/dev/pci/pci.c,v 1.248 2004/04/23 15:48:48 marius Exp $ + * $FreeBSD: src/sys/dev/pci/pci.c,v 1.249 2004/04/26 02:11:38 imp Exp $ * */ @@ -495,7 +495,7 @@ /* * Dx -> Dx is a nop always. */ - if (pci_get_powerstate(dev) == state) + if (pci_get_powerstate(child) == state) return (0); if (cfg->pp.pp_cap != 0) { ==== //depot/projects/power/sys/dev/usb/usbdevs#10 (text+ko) ==== @@ -1,4 +1,4 @@ -$FreeBSD: src/sys/dev/usb/usbdevs,v 1.171 2004/04/25 11:21:30 sanpei Exp $ +$FreeBSD: src/sys/dev/usb/usbdevs,v 1.172 2004/04/27 13:55:26 sanpei Exp $ /* * Copyright (c) 1998, 1999, 2000 The NetBSD Foundation, Inc. @@ -374,6 +374,7 @@ vendor DLINK 0x2001 D-Link vendor VIDZMEDIA 0x3275 VidzMedia Pte Ltd vendor DAISY 0x3579 Daisy Technology +vendor DELL 0x413c Dell vendor INTEL 0x8086 Intel vendor HP2 0xf003 Hewlett Packard @@ -591,6 +592,9 @@ /* Dallas Semiconductor products */ product DALLAS J6502 0x4201 J-6502 speakers +/* Dell products */ +product DELL BC02 0x8000 Dell BC02 Bluetooth USB Adapter + /* Diamond products */ product DIAMOND RIO500USB 0x0001 Rio 500 USB ==== //depot/projects/power/sys/dev/usb/usbdevs.h#10 (text+ko) ==== @@ -1,10 +1,10 @@ -/* $FreeBSD: src/sys/dev/usb/usbdevs.h,v 1.178 2004/04/25 11:24:40 sanpei Exp $ */ +/* $FreeBSD: src/sys/dev/usb/usbdevs.h,v 1.179 2004/04/27 13:56:39 sanpei Exp $ */ /* * THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT. * * generated from: - * FreeBSD: src/sys/dev/usb/usbdevs,v 1.171 2004/04/25 11:21:30 sanpei Exp + * FreeBSD: src/sys/dev/usb/usbdevs,v 1.172 2004/04/27 13:55:26 sanpei Exp */ /* @@ -381,6 +381,7 @@ #define USB_VENDOR_DLINK 0x2001 /* D-Link */ #define USB_VENDOR_VIDZMEDIA 0x3275 /* VidzMedia Pte Ltd */ #define USB_VENDOR_DAISY 0x3579 /* Daisy Technology */ +#define USB_VENDOR_DELL 0x413c /* Dell */ #define USB_VENDOR_INTEL 0x8086 /* Intel */ #define USB_VENDOR_HP2 0xf003 /* Hewlett Packard */ @@ -598,6 +599,9 @@ /* Dallas Semiconductor products */ #define USB_PRODUCT_DALLAS_J6502 0x4201 /* J-6502 speakers */ +/* Dell products */ +#define USB_PRODUCT_DELL_BC02 0x8000 /* Dell BC02 Bluetooth USB Adapter */ + /* Diamond products */ #define USB_PRODUCT_DIAMOND_RIO500USB 0x0001 /* Rio 500 USB */ ==== //depot/projects/power/sys/dev/usb/usbdevs_data.h#10 (text+ko) ==== @@ -1,10 +1,10 @@ -/* $FreeBSD: src/sys/dev/usb/usbdevs_data.h,v 1.178 2004/04/25 11:24:40 sanpei Exp $ */ +/* $FreeBSD: src/sys/dev/usb/usbdevs_data.h,v 1.179 2004/04/27 13:56:39 sanpei Exp $ */ /* * THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT. * * generated from: - * FreeBSD: src/sys/dev/usb/usbdevs,v 1.171 2004/04/25 11:21:30 sanpei Exp + * FreeBSD: src/sys/dev/usb/usbdevs,v 1.172 2004/04/27 13:55:26 sanpei Exp */ /* @@ -772,6 +772,12 @@ "J-6502 speakers", }, { + USB_VENDOR_DELL, USB_PRODUCT_DELL_BC02, + 0, + "Dell", + "Dell BC02 Bluetooth USB Adapter", + }, + { USB_VENDOR_DIAMOND, USB_PRODUCT_DIAMOND_RIO500USB, 0, "Diamond", @@ -5218,6 +5224,12 @@ NULL, }, { + USB_VENDOR_DELL, 0, + USB_KNOWNDEV_NOPROD, + "Dell", + NULL, + }, + { USB_VENDOR_INTEL, 0, USB_KNOWNDEV_NOPROD, "Intel", ==== //depot/projects/power/sys/i386/conf/GENERIC#9 (text+ko) ==== @@ -16,7 +16,7 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: src/sys/i386/conf/GENERIC,v 1.401 2004/04/22 15:17:39 imp Exp $ +# $FreeBSD: src/sys/i386/conf/GENERIC,v 1.402 2004/04/26 22:52:09 sobomax Exp $ machine i386 cpu I486_CPU @@ -268,6 +268,7 @@ device axe # ASIX Electronics USB ethernet device cue # CATC USB ethernet device kue # Kawasaki LSI USB ethernet +device rue # RealTek RTL8150 USB ethernet # FireWire support device firewire # FireWire bus code ==== //depot/projects/power/sys/i386/i386/elan-mmcr.c#8 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/i386/i386/elan-mmcr.c,v 1.27 2004/04/03 18:42:52 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/i386/i386/elan-mmcr.c,v 1.28 2004/04/27 13:08:03 phk Exp $"); #include "opt_cpu.h" #include @@ -189,10 +189,10 @@ if (led_dev[i]) break; sprintf(tmp, "gpio%d", i); + mmcrptr[(0xc2a + v) / 2] |= u; + gpio_config[i] = buf[i]; led_dev[i] = led_create(gpio_led, &led_cookie[i], tmp); - mmcrptr[(0xc2a + v) / 2] |= u; - gpio_config[i] = buf[i]; break; case '.': gpio_config[i] = buf[i]; ==== //depot/projects/power/sys/kern/kern_jail.c#3 (text+ko) ==== @@ -8,7 +8,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/kern_jail.c,v 1.41 2004/03/15 12:10:34 pjd Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_jail.c,v 1.42 2004/04/26 19:46:52 bmilekic Exp $"); #include #include @@ -59,6 +59,11 @@ &jail_getfsstatroot_only, 0, "Processes see only their root file system in getfsstat()"); +int jail_allow_raw_sockets = 0; +SYSCTL_INT(_security_jail, OID_AUTO, allow_raw_sockets, CTLFLAG_RW, + &jail_allow_raw_sockets, 0, + "Prison root can create raw sockets"); + /* allprison, lastprid, and prisoncount are protected by allprison_mtx. */ struct prisonlist allprison; struct mtx allprison_mtx; ==== //depot/projects/power/sys/kern/vfs_syscalls.c#9 (text+ko) ==== @@ -35,7 +35,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/vfs_syscalls.c,v 1.344 2004/04/22 15:40:27 pjd Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/vfs_syscalls.c,v 1.345 2004/04/26 15:44:42 pjd Exp $"); #include "opt_compat.h" #include "opt_mac.h" @@ -183,7 +183,7 @@ caddr_t arg; } */ *uap; { - struct mount *mp; + struct mount *mp, *vmp; int error; struct nameidata nd; @@ -193,14 +193,13 @@ if ((error = namei(&nd)) != 0) return (error); NDFREE(&nd, NDF_ONLY_PNBUF); - error = vn_start_write(nd.ni_vp, &mp, V_WAIT | PCATCH); + error = vn_start_write(nd.ni_vp, &vmp, V_WAIT | PCATCH); + mp = nd.ni_vp->v_mount; vrele(nd.ni_vp); if (error) return (error); - if (mp == NULL) - return (EOPNOTSUPP); error = VFS_QUOTACTL(mp, uap->cmd, uap->uid, uap->arg, td); - vn_finished_write(mp); + vn_finished_write(vmp); return (error); } ==== //depot/projects/power/sys/modules/Makefile#9 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/modules/Makefile,v 1.375 2004/03/29 22:41:21 peter Exp $ +# $FreeBSD: src/sys/modules/Makefile,v 1.376 2004/04/27 17:57:45 vkashyap Exp $ # pcic -- currently broken and being worked on out of tree. # oldcard -- specialized use for debugging only. @@ -203,6 +203,7 @@ ti \ tl \ trm \ + ${_twa} \ twe \ tx \ txp \ @@ -350,6 +351,7 @@ _ips= ips _mly= mly _s3= s3 +_twa= twa _vesa= vesa .elif ${MACHINE} == "pc98" _canbepm= canbepm ==== //depot/projects/power/sys/net/rtsock.c#8 (text+ko) ==== @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * @(#)rtsock.c 8.7 (Berkeley) 10/12/95 - * $FreeBSD: src/sys/net/rtsock.c,v 1.107 2004/04/19 07:20:32 ru Exp $ + * $FreeBSD: src/sys/net/rtsock.c,v 1.108 2004/04/26 19:46:52 bmilekic Exp $ */ #include @@ -48,6 +48,8 @@ #include #include +#include + MALLOC_DEFINE(M_RTABLE, "routetbl", "routing tables"); /* NB: these are not modified */ @@ -287,6 +289,7 @@ int len, error = 0; struct ifnet *ifp = NULL; struct ifaddr *ifa = NULL; + struct sockaddr_in jail; #define senderr(e) { error = e; goto flush;} if (m == NULL || ((m->m_len < sizeof(long)) && @@ -400,8 +403,16 @@ if (ifp) { info.rti_info[RTAX_IFP] = ifaddr_byindex(ifp->if_index)->ifa_addr; - info.rti_info[RTAX_IFA] = - rt->rt_ifa->ifa_addr; + if (jailed(so->so_cred)) { + jail.sin_family = PF_INET; + jail.sin_len = sizeof(jail); + jail.sin_addr.s_addr = + htonl(prison_getip(so->so_cred)); + info.rti_info[RTAX_IFA] = + (struct sockaddr *)&jail; + } else + info.rti_info[RTAX_IFA] = + rt->rt_ifa->ifa_addr; if (ifp->if_flags & IFF_POINTOPOINT) info.rti_info[RTAX_BRD] = rt->rt_ifa->ifa_dstaddr; ==== //depot/projects/power/sys/netgraph/bluetooth/common/ng_bluetooth.c#2 (text+ko) ==== @@ -26,7 +26,7 @@ * SUCH DAMAGE. * * $Id: ng_bluetooth.c,v 1.3 2003/04/26 22:37:31 max Exp $ - * $FreeBSD: src/sys/netgraph/bluetooth/common/ng_bluetooth.c,v 1.2 2003/05/10 21:44:39 julian Exp $ + * $FreeBSD: src/sys/netgraph/bluetooth/common/ng_bluetooth.c,v 1.3 2004/04/27 16:38:13 emax Exp $ */ #include @@ -35,7 +35,7 @@ #include #include -#include "ng_bluetooth.h" +#include /* * Bluetooth stack sysctl globals ==== //depot/projects/power/sys/netgraph/bluetooth/drivers/bt3c/ng_bt3c_pccard.c#3 (text+ko) ==== >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Apr 27 12:15:01 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3CE2816A4D0; Tue, 27 Apr 2004 12:15:01 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 1293216A4CE for ; Tue, 27 Apr 2004 12:15:01 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E844343D5C for ; Tue, 27 Apr 2004 12:15:00 -0700 (PDT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i3RJF0Ge030869 for ; Tue, 27 Apr 2004 12:15:00 -0700 (PDT) (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i3RJF0fI030865 for perforce@freebsd.org; Tue, 27 Apr 2004 12:15:00 -0700 (PDT) (envelope-from imp@freebsd.org) Date: Tue, 27 Apr 2004 12:15:00 -0700 (PDT) Message-Id: <200404271915.i3RJF0fI030865@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Subject: PERFORCE change 51810 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 27 Apr 2004 19:15:01 -0000 http://perforce.freebsd.org/chv.cgi?CH=51810 Change 51810 by imp@imp_pacopaco on 2004/04/27 12:14:05 fix ifc not having -i Affected files ... .. //depot/projects/power/sys/pci/cy_pci.c#4 branch Differences ... From owner-p4-projects@FreeBSD.ORG Wed Apr 28 07:07:16 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 40D9216A4D0; Wed, 28 Apr 2004 07:07:16 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 0D41916A4CE for ; Wed, 28 Apr 2004 07:07:16 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 00ECE43D39 for ; Wed, 28 Apr 2004 07:07:16 -0700 (PDT) (envelope-from areisse@nailabs.com) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i3SE7FGe010576 for ; Wed, 28 Apr 2004 07:07:15 -0700 (PDT) (envelope-from areisse@nailabs.com) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i3SE7Eet010573 for perforce@freebsd.org; Wed, 28 Apr 2004 07:07:14 -0700 (PDT) (envelope-from areisse@nailabs.com) Date: Wed, 28 Apr 2004 07:07:14 -0700 (PDT) Message-Id: <200404281407.i3SE7Eet010573@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to areisse@nailabs.com using -f From: Andrew Reisse To: Perforce Change Reviews Subject: PERFORCE change 51847 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 28 Apr 2004 14:07:17 -0000 http://perforce.freebsd.org/chv.cgi?CH=51847 Change 51847 by areisse@areisse_ibook on 2004/04/28 07:07:10 merge sedarwin changes with darwin 7.3 file_cmds. Affected files ... .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/Makefile#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/Makefile.postamble#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/Makefile.preamble#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/PB.project#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/PROJECT#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/chflags/Makefile#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/chflags/Makefile.postamble#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/chflags/Makefile.preamble#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/chflags/PB.project#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/chflags/chflags.1#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/chflags/chflags.c#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/chmod/Makefile#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/chmod/Makefile.postamble#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/chmod/Makefile.preamble#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/chmod/PB.project#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/chmod/chmod.1#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/chmod/chmod.c#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/chown/Makefile#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/chown/Makefile.postamble#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/chown/Makefile.preamble#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/chown/PB.project#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/chown/chgrp.1#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/chown/chown.8#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/chown/chown.c#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/cksum/crc.c#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/compress/Makefile#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/compress/Makefile.postamble#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/compress/Makefile.preamble#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/compress/PB.project#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/compress/compress.1#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/compress/compress.c#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/compress/uncompress.1#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/compress/zopen.3#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/compress/zopen.c#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/cp/Makefile#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/cp/Makefile.postamble#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/cp/Makefile.preamble#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/cp/PB.project#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/cp/cp.1#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/cp/cp.c#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/cp/extern.h#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/cp/utils.c#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/csh/strpct.c#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/dd/Makefile#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/dd/Makefile.postamble#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/dd/Makefile.preamble#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/dd/PB.project#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/dd/args.c#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/dd/conv.c#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/dd/conv_tab.c#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/dd/dd.1#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/dd/dd.c#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/dd/dd.h#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/dd/extern.h#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/dd/misc.c#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/dd/position.c#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/df/Makefile#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/df/Makefile.postamble#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/df/Makefile.preamble#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/df/PB.project#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/df/df.1#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/df/df.c#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/du/Makefile#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/du/Makefile.postamble#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/du/Makefile.preamble#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/du/PB.project#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/du/du.1#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/du/du.c#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/file/LEGAL.NOTICE#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/file/MAINT#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/file/Makefile#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/file/Makefile.postamble#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/file/Makefile.preamble#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/file/PB.project#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/file/PORTING#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/file/README#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/file/apprentice.c#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/file/ascmagic.c#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/file/compress.c#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/file/file.1#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/file/file.c#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/file/file.h#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/file/fsmagic.c#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/file/internat.c#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/file/is_tar.c#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/file/magdir/386bsd#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/file/magdir/Header#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/file/magdir/Localstuff#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/file/magdir/OpenBSD#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/file/magdir/adventure#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/file/magdir/alliant#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/file/magdir/alpha#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/file/magdir/amanda#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/file/magdir/amigaos#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/file/magdir/animation#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/file/magdir/apl#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/file/magdir/apple#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/file/magdir/applix#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/file/magdir/archive#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/file/magdir/asterix#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/file/magdir/att3b#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/file/magdir/audio#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/file/magdir/blit#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/file/magdir/bsdi#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/file/magdir/c-lang#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/file/magdir/chi#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/file/magdir/cisco#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/file/magdir/clipper#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/file/magdir/commands#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/file/magdir/compress#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/file/magdir/convex#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/file/magdir/database#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/file/magdir/diamond#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/file/magdir/diff#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/file/magdir/digital#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/file/magdir/dump#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/file/magdir/elf#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/file/magdir/encore#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/file/magdir/filesystems#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/file/magdir/flash#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/file/magdir/fonts#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/file/magdir/frame#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/file/magdir/freebsd#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/file/magdir/gimp#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/file/magdir/gnu#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/file/magdir/hp#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/file/magdir/ibm370#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/file/magdir/ibm6000#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/file/magdir/iff#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/file/magdir/images#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/file/magdir/intel#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/file/magdir/interleaf#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/file/magdir/island#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/file/magdir/ispell#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/file/magdir/java#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/file/magdir/karma#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/file/magdir/lecter#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/file/magdir/lex#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/file/magdir/lif#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/file/magdir/linux#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/file/magdir/lisp#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/file/magdir/mach#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/file/magdir/macintosh#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/file/magdir/magic#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/file/magdir/mail.news#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/file/magdir/microsoft#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/file/magdir/mime#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/file/magdir/mirage#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/file/magdir/mkid#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/file/magdir/mmdf#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/file/magdir/modem#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/file/magdir/motorola#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/file/magdir/msdos#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/file/magdir/ncr#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/file/magdir/netbsd#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/file/magdir/news#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/file/magdir/octave#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/file/magdir/olf#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/file/magdir/os2#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/file/magdir/os9#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/file/magdir/osf1#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/file/magdir/pbm#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/file/magdir/pdf#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/file/magdir/pdp#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/file/magdir/pgp#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/file/magdir/pkgadd#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/file/magdir/plus5#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/file/magdir/printer#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/file/magdir/psdbms#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/file/magdir/pyramid#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/file/magdir/riff#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/file/magdir/rpm#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/file/magdir/rtf#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/file/magdir/sc#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/file/magdir/sccs#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/file/magdir/sendmail#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/file/magdir/sequent#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/file/magdir/sgi#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/file/magdir/sgml#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/file/magdir/sniffer#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/file/magdir/softquad#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/file/magdir/sun#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/file/magdir/teapot#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/file/magdir/terminfo#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/file/magdir/tex#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/file/magdir/ti-8x#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/file/magdir/timezone#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/file/magdir/troff#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/file/magdir/typeset#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/file/magdir/unknown#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/file/magdir/uuencode#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/file/magdir/varied.out#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/file/magdir/vax#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/file/magdir/vicar#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/file/magdir/visx#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/file/magdir/vms#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/file/magdir/wordperfect#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/file/magdir/xenix#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/file/magdir/zilog#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/file/magdir/zyxel#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/file/magic.5#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/file/names.h#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/file/patchlevel.h#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/file/print.c#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/file/readelf.c#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/file/readelf.h#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/file/readfat.c#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/file/softmagic.c#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/file/tar.h#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/install/Makefile#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/install/Makefile.postamble#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/install/Makefile.preamble#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/install/PB.project#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/install/install.1#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/install/pathnames.h#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/install/xinstall.c#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/ln/Makefile#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/ln/Makefile.postamble#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/ln/Makefile.preamble#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/ln/PB.project#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/ln/ln.1#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/ln/ln.c#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/ln/symlink.7#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/ls/Makefile#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/ls/Makefile.postamble#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/ls/Makefile.preamble#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/ls/PB.project#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/ls/cmp.c#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/ls/extern.h#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/ls/ls.1#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/ls/ls.c#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/ls/ls.h#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/ls/print.c#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/ls/stat_flags.c#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/ls/util.c#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/mkdir/Makefile#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/mkdir/Makefile.postamble#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/mkdir/Makefile.preamble#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/mkdir/PB.project#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/mkdir/mkdir.1#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/mkdir/mkdir.c#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/mkfifo/Makefile#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/mkfifo/Makefile.postamble#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/mkfifo/Makefile.preamble#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/mkfifo/PB.project#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/mkfifo/mkfifo.1#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/mkfifo/mkfifo.c#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/mknod/Makefile#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/mknod/Makefile.postamble#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/mknod/Makefile.preamble#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/mknod/PB.project#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/mknod/mknod.8#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/mknod/mknod.c#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/mtree/Makefile#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/mtree/Makefile.postamble#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/mtree/Makefile.preamble#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/mtree/PB.project#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/mtree/compare.c#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/mtree/create.c#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/mtree/excludes.c#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/mtree/extern.h#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/mtree/misc.c#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/mtree/mtree.8#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/mtree/mtree.c#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/mtree/mtree.h#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/mtree/spec.c#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/mtree/verify.c#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/mv/Makefile#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/mv/Makefile.postamble#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/mv/Makefile.preamble#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/mv/PB.project#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/mv/mv.1#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/mv/mv.c#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/mv/pathnames.h#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/pax/Makefile#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/pax/Makefile.postamble#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/pax/Makefile.preamble#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/pax/PB.project#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/pax/ar_io.c#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/pax/ar_subs.c#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/pax/buf_subs.c#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/pax/cache.c#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/pax/cache.h#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/pax/cpio.1#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/pax/cpio.c#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/pax/cpio.h#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/pax/extern.h#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/pax/file_subs.c#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/pax/ftree.c#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/pax/ftree.h#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/pax/gen_subs.c#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/pax/getoldopt.c#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/pax/options.c#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/pax/options.h#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/pax/pat_rep.c#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/pax/pat_rep.h#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/pax/pax.1#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/pax/pax.c#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/pax/pax.h#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/pax/sel_subs.c#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/pax/sel_subs.h#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/pax/tables.c#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/pax/tables.h#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/pax/tar.1#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/pax/tar.c#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/pax/tar.h#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/pax/tty_subs.c#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/rm/Makefile#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/rm/Makefile.postamble#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/rm/Makefile.preamble#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/rm/PB.project#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/rm/rm.1#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/rm/rm.c#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/rmdir/Makefile#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/rmdir/Makefile.postamble#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/rmdir/Makefile.preamble#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/rmdir/PB.project#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/rmdir/rmdir.1#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/rmdir/rmdir.c#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/rmt/Makefile#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/rmt/Makefile.postamble#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/rmt/Makefile.preamble#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/rmt/PB.project#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/rmt/rmt.8#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/rmt/rmt.c#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/shar/Makefile#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/shar/Makefile.postamble#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/shar/Makefile.preamble#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/shar/PB.project#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/shar/shar.1#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/shar/shar.sh#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/tcopy/Makefile#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/tcopy/Makefile.postamble#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/tcopy/Makefile.preamble#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/tcopy/PB.project#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/tcopy/tcopy.1#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/tcopy/tcopy.c#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/touch/Makefile#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/touch/Makefile.postamble#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/touch/Makefile.preamble#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/touch/PB.project#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/touch/touch.1#2 integrate .. //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/touch/touch.c#2 integrate Differences ... ==== //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/Makefile#2 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/Makefile.postamble#2 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/Makefile.preamble#2 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/PB.project#2 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/PROJECT#2 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/chflags/Makefile#2 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/chflags/Makefile.postamble#2 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/chflags/Makefile.preamble#2 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/chflags/PB.project#2 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/chflags/chflags.1#2 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/chflags/chflags.c#2 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/chmod/Makefile#2 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/chmod/Makefile.postamble#2 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/chmod/Makefile.preamble#2 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/chmod/PB.project#2 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/chmod/chmod.1#2 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/chmod/chmod.c#2 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/chown/Makefile#2 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/chown/Makefile.postamble#2 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/chown/Makefile.preamble#2 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/chown/PB.project#2 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/chown/chgrp.1#2 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/chown/chown.8#2 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/chown/chown.c#2 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/cksum/crc.c#2 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/compress/Makefile#2 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/compress/Makefile.postamble#2 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/compress/Makefile.preamble#2 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/compress/PB.project#2 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/compress/compress.1#2 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/compress/compress.c#2 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/compress/uncompress.1#2 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/compress/zopen.3#2 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/compress/zopen.c#2 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/cp/Makefile#2 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/cp/Makefile.postamble#2 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/cp/Makefile.preamble#2 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/cp/PB.project#2 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/cp/cp.1#2 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/cp/cp.c#2 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/cp/extern.h#2 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/cp/utils.c#2 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/csh/strpct.c#2 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/dd/Makefile#2 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/dd/Makefile.postamble#2 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/dd/Makefile.preamble#2 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/dd/PB.project#2 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/dd/args.c#2 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/dd/conv.c#2 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/dd/conv_tab.c#2 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/dd/dd.1#2 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/dd/dd.c#2 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/dd/dd.h#2 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/dd/extern.h#2 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/dd/misc.c#2 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/dd/position.c#2 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/df/Makefile#2 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/df/Makefile.postamble#2 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/df/Makefile.preamble#2 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/df/PB.project#2 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/df/df.1#2 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/df/df.c#2 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/du/Makefile#2 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/du/Makefile.postamble#2 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/du/Makefile.preamble#2 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/du/PB.project#2 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/du/du.1#2 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/du/du.c#2 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/file/LEGAL.NOTICE#2 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/file/MAINT#2 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/file/Makefile#2 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/file/Makefile.postamble#2 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/file/Makefile.preamble#2 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/file/PB.project#2 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/file/PORTING#2 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/file/README#2 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/file/apprentice.c#2 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/file/ascmagic.c#2 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/file/compress.c#2 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/file/file.1#2 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/file/file.c#2 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/file/file.h#2 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/file/fsmagic.c#2 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/file/internat.c#2 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/file/is_tar.c#2 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/file/magdir/386bsd#2 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/file/magdir/Header#2 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/file/magdir/Localstuff#2 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/file/magdir/OpenBSD#2 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/file/magdir/adventure#2 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/file/magdir/alliant#2 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/file/magdir/alpha#2 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/file/magdir/amanda#2 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/file/magdir/amigaos#2 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/file/magdir/animation#2 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/file/magdir/apl#2 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/file/magdir/apple#2 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/file/magdir/applix#2 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/file/magdir/archive#2 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/file/magdir/asterix#2 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/file/magdir/att3b#2 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/file/magdir/audio#2 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/file/magdir/blit#2 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/file/magdir/bsdi#2 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/file/magdir/c-lang#2 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/file/magdir/chi#2 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/file/magdir/cisco#2 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/file/magdir/clipper#2 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/file/magdir/commands#2 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/file/magdir/compress#2 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/file/magdir/convex#2 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/file/magdir/database#2 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/file/magdir/diamond#2 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/file/magdir/diff#2 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/file/magdir/digital#2 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/file/magdir/dump#2 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/file/magdir/elf#2 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/file/magdir/encore#2 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/file/magdir/filesystems#2 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/file/magdir/flash#2 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/file/magdir/fonts#2 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/file/magdir/frame#2 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/file/magdir/freebsd#2 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/file/magdir/gimp#2 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/file/magdir/gnu#2 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/file/magdir/hp#2 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/file/magdir/ibm370#2 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/file/magdir/ibm6000#2 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/file/magdir/iff#2 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/file/magdir/images#2 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/file/magdir/intel#2 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/file/magdir/interleaf#2 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/file/magdir/island#2 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/file/magdir/ispell#2 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/file/magdir/java#2 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/file/magdir/karma#2 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/file/magdir/lecter#2 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/file/magdir/lex#2 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/file/magdir/lif#2 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/file/magdir/linux#2 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/file/magdir/lisp#2 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/file/magdir/mach#2 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/file/magdir/macintosh#2 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/file/magdir/magic#2 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/file/magdir/mail.news#2 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/file/magdir/microsoft#2 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/file/magdir/mime#2 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/file/magdir/mirage#2 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/file/magdir/mkid#2 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/file/magdir/mmdf#2 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/file/magdir/modem#2 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/file/magdir/motorola#2 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/file/magdir/msdos#2 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/file/magdir/ncr#2 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/file/magdir/netbsd#2 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/file/magdir/news#2 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/file/magdir/octave#2 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/file/magdir/olf#2 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/file/magdir/os2#2 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/file/magdir/os9#2 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/file/magdir/osf1#2 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/file/magdir/pbm#2 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/file/magdir/pdf#2 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/file/magdir/pdp#2 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/file/magdir/pgp#2 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/file/magdir/pkgadd#2 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/file/magdir/plus5#2 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/file/magdir/printer#2 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/file/magdir/psdbms#2 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/file/magdir/pyramid#2 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/file/magdir/riff#2 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/file/magdir/rpm#2 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/file/magdir/rtf#2 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/file/magdir/sc#2 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/file/magdir/sccs#2 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/file/magdir/sendmail#2 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/file/magdir/sequent#2 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/file/magdir/sgi#2 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/file/magdir/sgml#2 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/file/magdir/sniffer#2 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/file/magdir/softquad#2 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/file/magdir/sun#2 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/file/magdir/teapot#2 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/file/magdir/terminfo#2 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/file/magdir/tex#2 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/file/magdir/ti-8x#2 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/file/magdir/timezone#2 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/file/magdir/troff#2 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/file/magdir/typeset#2 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/file/magdir/unknown#2 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/file/magdir/uuencode#2 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/file/magdir/varied.out#2 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/file/magdir/vax#2 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/file/magdir/vicar#2 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/file/magdir/visx#2 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/file/magdir/vms#2 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/file/magdir/wordperfect#2 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/file/magdir/xenix#2 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/file/magdir/zilog#2 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/file/magdir/zyxel#2 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/file/magic.5#2 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/file/names.h#2 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/file/patchlevel.h#2 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/file/print.c#2 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/file/readelf.c#2 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/file/readelf.h#2 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/file/readfat.c#2 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/file/softmagic.c#2 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/file/tar.h#2 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/install/Makefile#2 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/install/Makefile.postamble#2 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/install/Makefile.preamble#2 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/install/PB.project#2 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/install/install.1#2 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/install/pathnames.h#2 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/file_cmds/install/xinstall.c#2 (text+ko) ==== >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Apr 28 10:13:05 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4FC5E16A4D0; Wed, 28 Apr 2004 10:13:05 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 283C916A4CE for ; Wed, 28 Apr 2004 10:13:05 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1EED243D1D for ; Wed, 28 Apr 2004 10:13:05 -0700 (PDT) (envelope-from areisse@nailabs.com) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i3SHD4Ge091888 for ; Wed, 28 Apr 2004 10:13:04 -0700 (PDT) (envelope-from areisse@nailabs.com) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i3SHD4GO091885 for perforce@freebsd.org; Wed, 28 Apr 2004 10:13:04 -0700 (PDT) (envelope-from areisse@nailabs.com) Date: Wed, 28 Apr 2004 10:13:04 -0700 (PDT) Message-Id: <200404281713.i3SHD4GO091885@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to areisse@nailabs.com using -f From: Andrew Reisse To: Perforce Change Reviews Subject: PERFORCE change 51854 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 28 Apr 2004 17:13:06 -0000 http://perforce.freebsd.org/chv.cgi?CH=51854 Change 51854 by areisse@areisse_ibook on 2004/04/28 10:12:33 remove sys/_label.h from bsd side; use mach/_label.h instead. Affected files ... .. //depot/projects/trustedbsd/sedarwin73/apsl/xnu/bsd/net/bpfdesc.h#3 edit .. //depot/projects/trustedbsd/sedarwin73/apsl/xnu/bsd/net/if_var.h#3 edit .. //depot/projects/trustedbsd/sedarwin73/apsl/xnu/bsd/netinet/ip_var.h#3 edit .. //depot/projects/trustedbsd/sedarwin73/apsl/xnu/bsd/sys/Makefile#3 edit .. //depot/projects/trustedbsd/sedarwin73/apsl/xnu/bsd/sys/_label.h#2 delete .. //depot/projects/trustedbsd/sedarwin73/apsl/xnu/bsd/sys/mac.h#2 edit .. //depot/projects/trustedbsd/sedarwin73/apsl/xnu/bsd/sys/mac_policy.h#2 edit .. //depot/projects/trustedbsd/sedarwin73/apsl/xnu/bsd/sys/mbuf.h#3 edit .. //depot/projects/trustedbsd/sedarwin73/apsl/xnu/bsd/sys/mount.h#3 edit .. //depot/projects/trustedbsd/sedarwin73/apsl/xnu/bsd/sys/proc.h#3 edit .. //depot/projects/trustedbsd/sedarwin73/apsl/xnu/bsd/sys/socketvar.h#3 edit .. //depot/projects/trustedbsd/sedarwin73/apsl/xnu/bsd/sys/ucred.h#3 edit .. //depot/projects/trustedbsd/sedarwin73/apsl/xnu/bsd/sys/vnode.h#3 edit .. //depot/projects/trustedbsd/sedarwin73/apsl/xnu/osfmk/mach/Makefile#3 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin73/apsl/xnu/bsd/net/bpfdesc.h#3 (text+ko) ==== @@ -73,7 +73,7 @@ */ #include -#include +#include /* * Descriptor associated with each open bpf file. ==== //depot/projects/trustedbsd/sedarwin73/apsl/xnu/bsd/net/if_var.h#3 (text+ko) ==== @@ -117,7 +117,7 @@ #define IFNAMSIZ 16 -#include /* struct label */ +#include /* struct label */ #include /* get TAILQ macros */ #ifdef __APPLE_API_UNSTABLE ==== //depot/projects/trustedbsd/sedarwin73/apsl/xnu/bsd/netinet/ip_var.h#3 (text+ko) ==== @@ -62,7 +62,7 @@ #include #ifdef KERNEL -#include +#include #endif #ifdef __APPLE_API_PRIVATE ==== //depot/projects/trustedbsd/sedarwin73/apsl/xnu/bsd/sys/Makefile#3 (text+ko) ==== @@ -20,7 +20,7 @@ EXPINC_SUBDIRS_I386 = \ DATAFILES = \ - _label.h condvar.h appleapiopts.h acct.h aio.h attr.h \ + condvar.h appleapiopts.h acct.h aio.h attr.h \ audit.h bsm_kevents.h bsm_token.h bsm_uevents.h \ buf.h callout.h cdefs.h clist.h conf.h \ dir.h dirent.h disk.h disklabel.h disktab.h dkstat.h dmap.h domain.h \ ==== //depot/projects/trustedbsd/sedarwin73/apsl/xnu/bsd/sys/mac.h#2 (text+ko) ==== @@ -42,7 +42,7 @@ #ifndef _SYS_MAC_H #define _SYS_MAC_H -#include +#include #ifndef _POSIX_MAC #define _POSIX_MAC ==== //depot/projects/trustedbsd/sedarwin73/apsl/xnu/bsd/sys/mac_policy.h#2 (text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin73/apsl/xnu/bsd/sys/mbuf.h#3 (text+ko) ==== @@ -77,7 +77,7 @@ #include #include -#include +#include /* * Mbufs are of a single size, MSIZE (machine/param.h), which ==== //depot/projects/trustedbsd/sedarwin73/apsl/xnu/bsd/sys/mount.h#3 (text+ko) ==== @@ -69,7 +69,7 @@ #include #include #include /* XXX for AF_MAX */ -#include +#include typedef struct fsid { int32_t val[2]; } fsid_t; /* file system id type */ ==== //depot/projects/trustedbsd/sedarwin73/apsl/xnu/bsd/sys/proc.h#3 (text+ko) ==== @@ -70,7 +70,7 @@ #include #include /* For struct selinfo. */ #include -#include +#include #include #include #include ==== //depot/projects/trustedbsd/sedarwin73/apsl/xnu/bsd/sys/socketvar.h#3 (text+ko) ==== @@ -64,7 +64,7 @@ #define _SYS_SOCKETVAR_H_ #include -#include /* for struct label */ +#include /* for struct label */ #include /* for TAILQ macros */ #include /* for struct selinfo */ #include ==== //depot/projects/trustedbsd/sedarwin73/apsl/xnu/bsd/sys/ucred.h#3 (text+ko) ==== @@ -63,7 +63,7 @@ #include #include -#include +#include #ifdef __APPLE_API_UNSTABLE /* ==== //depot/projects/trustedbsd/sedarwin73/apsl/xnu/bsd/sys/vnode.h#3 (text+ko) ==== @@ -64,7 +64,7 @@ #include #include #include -#include +#include #include #include ==== //depot/projects/trustedbsd/sedarwin73/apsl/xnu/osfmk/mach/Makefile#3 (text+ko) ==== @@ -91,6 +91,7 @@ MIGINCLUDES = ${MIG_UUHDRS} ${MIG_USHDRS} DATAFILES = \ + _label.h \ boolean.h \ boot_info.h \ bootstrap.h \ From owner-p4-projects@FreeBSD.ORG Thu Apr 29 09:41:21 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A332016A4D0; Thu, 29 Apr 2004 09:41:21 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 7433C16A4CE for ; Thu, 29 Apr 2004 09:41:21 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5343143D5C for ; Thu, 29 Apr 2004 09:41:21 -0700 (PDT) (envelope-from areisse@nailabs.com) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i3TGfKGe038801 for ; Thu, 29 Apr 2004 09:41:20 -0700 (PDT) (envelope-from areisse@nailabs.com) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i3TGfKor038789 for perforce@freebsd.org; Thu, 29 Apr 2004 09:41:20 -0700 (PDT) (envelope-from areisse@nailabs.com) Date: Thu, 29 Apr 2004 09:41:20 -0700 (PDT) Message-Id: <200404291641.i3TGfKor038789@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to areisse@nailabs.com using -f From: Andrew Reisse To: Perforce Change Reviews Subject: PERFORCE change 51912 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 29 Apr 2004 16:41:22 -0000 http://perforce.freebsd.org/chv.cgi?CH=51912 Change 51912 by areisse@areisse_ibook on 2004/04/29 09:40:52 use the correct type for the trailer Affected files ... .. //depot/projects/trustedbsd/sedarwin73/apsl/xnu/osfmk/ipc/mach_msg.c#4 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin73/apsl/xnu/osfmk/ipc/mach_msg.c#4 (text+ko) ==== @@ -260,7 +260,7 @@ goto out; } - trailer = (mach_msg_format_0_trailer_t *) + trailer = (mach_msg_max_trailer_t *) ((vm_offset_t)&kmsg->ikm_header + round_msg(kmsg->ikm_header.msgh_size)); if (option & MACH_RCV_TRAILER_MASK) { From owner-p4-projects@FreeBSD.ORG Thu Apr 29 17:08:45 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id F03C816A4D0; Thu, 29 Apr 2004 17:08:44 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C607716A4CE for ; Thu, 29 Apr 2004 17:08:44 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A820C43D41 for ; Thu, 29 Apr 2004 17:08:44 -0700 (PDT) (envelope-from cvance@nailabs.com) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i3U08iGe049230 for ; Thu, 29 Apr 2004 17:08:44 -0700 (PDT) (envelope-from cvance@nailabs.com) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i3U08i6k049227 for perforce@freebsd.org; Thu, 29 Apr 2004 17:08:44 -0700 (PDT) (envelope-from cvance@nailabs.com) Date: Thu, 29 Apr 2004 17:08:44 -0700 (PDT) Message-Id: <200404300008.i3U08i6k049227@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to cvance@nailabs.com using -f From: Chris Vance To: Perforce Change Reviews Subject: PERFORCE change 51949 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 30 Apr 2004 00:08:45 -0000 http://perforce.freebsd.org/chv.cgi?CH=51949 Change 51949 by cvance@cvance_sony on 2004/04/29 17:08:25 Replace suser and suser_cred checks with appropriate capability checks. The suser and suser_cred calls were introduced with code brought in during the recent integration from the MAC tree. Affected files ... .. //depot/projects/trustedbsd/sebsd/sys/kern/vfs_mount.c#12 edit .. //depot/projects/trustedbsd/sebsd/sys/kern/vfs_syscalls.c#11 edit .. //depot/projects/trustedbsd/sebsd/sys/kern/vfs_vnops.c#9 edit Differences ... ==== //depot/projects/trustedbsd/sebsd/sys/kern/vfs_mount.c#12 (text+ko) ==== @@ -744,7 +744,7 @@ } } } else { - if ((error = suser(td)) != 0) { + if ((error = cap_check(td, CAP_SYS_ADMIN)) != 0) { vput(vp); return (error); } @@ -1051,7 +1051,7 @@ return (EPERM); if (usermount == 0) { - if ((error = suser(td)) != 0) + if ((error = cap_check(td, CAP_SYS_ADMIN)) != 0) return (error); } @@ -1103,7 +1103,7 @@ return (error); } } else { - if ((error = suser(td)) != 0) + if ((error = cap_check(td, CAP_SYS_ADMIN)) != 0) return (error); } ==== //depot/projects/trustedbsd/sebsd/sys/kern/vfs_syscalls.c#11 (text+ko) ==== @@ -378,7 +378,7 @@ vfs_unbusy(mp, td); continue; } - if (suser(td)) { + if (cap_check(td, CAP_SYS_ADMIN)) { bcopy(sp, &sb, sizeof(sb)); sb.f_fsid.val[0] = sb.f_fsid.val[1] = 0; sp = &sb; @@ -602,7 +602,7 @@ /* * Must be super user */ - error = suser(td); + error = cap_check(td, CAP_SYS_ADMIN); if (error) return (error); @@ -659,7 +659,7 @@ MIN(MFSNAMELEN, OMNAMELEN)); bcopy(nsp->f_mntfromname, osp->f_mntfromname, MIN(MFSNAMELEN, OMNAMELEN)); - if (suser(td)) { + if (cap_check(td, CAP_SYS_ADMIN)) { osp->f_fsid.val[0] = osp->f_fsid.val[1] = 0; } else { osp->f_fsid = nsp->f_fsid; @@ -1386,7 +1386,7 @@ struct vattr va; int error; - if (suser_cred(cred, PRISON_ROOT) == 0) + if (cap_check_cred(cred, NULL, CAP_SYS_ADMIN, PRISON_ROOT) == 0) return (0); if (!hardlink_check_uid && !hardlink_check_gid) ==== //depot/projects/trustedbsd/sebsd/sys/kern/vfs_vnops.c#9 (text+ko) ==== @@ -752,7 +752,7 @@ } sb->st_flags = vap->va_flags; - if (suser(td)) + if (cap_check(td, CAP_SYS_ADMIN)) sb->st_gen = 0; else sb->st_gen = vap->va_gen; From owner-p4-projects@FreeBSD.ORG Thu Apr 29 18:38:37 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CBB6416A4D0; Thu, 29 Apr 2004 18:38:36 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 9712316A4CE for ; Thu, 29 Apr 2004 18:38:36 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8C5F043D58 for ; Thu, 29 Apr 2004 18:38:36 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i3U1caGe068128 for ; Thu, 29 Apr 2004 18:38:36 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i3U1cX3Q068125 for perforce@freebsd.org; Thu, 29 Apr 2004 18:38:33 -0700 (PDT) (envelope-from marcel@freebsd.org) Date: Thu, 29 Apr 2004 18:38:33 -0700 (PDT) Message-Id: <200404300138.i3U1cX3Q068125@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 51951 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 30 Apr 2004 01:38:37 -0000 http://perforce.freebsd.org/chv.cgi?CH=51951 Change 51951 by marcel@marcel_nfs on 2004/04/29 18:38:20 IFC @51950 Affected files ... .. //depot/projects/gdb/Makefile.inc1#8 integrate .. //depot/projects/gdb/bin/kenv/kenv.c#2 integrate .. //depot/projects/gdb/contrib/lukemftp/src/fetch.c#2 integrate .. //depot/projects/gdb/contrib/lukemftp/src/ftp.1#2 integrate .. //depot/projects/gdb/contrib/lukemftp/src/ftp.c#2 integrate .. //depot/projects/gdb/contrib/lukemftp/src/progressbar.c#2 integrate .. //depot/projects/gdb/contrib/lukemftp/src/progressbar.h#2 integrate .. //depot/projects/gdb/contrib/lukemftp/src/util.c#2 integrate .. //depot/projects/gdb/contrib/lukemftp/src/version.h#2 integrate .. //depot/projects/gdb/etc/rc.d/initdiskless#7 integrate .. //depot/projects/gdb/etc/rc.d/ipfw#4 integrate .. //depot/projects/gdb/etc/rc.d/netif#4 integrate .. //depot/projects/gdb/etc/rc.d/resolv#2 integrate .. //depot/projects/gdb/etc/rc.d/watchdogd#3 integrate .. //depot/projects/gdb/games/fortune/datfiles/fortunes#5 integrate .. //depot/projects/gdb/games/fortune/datfiles/fortunes-o.real#2 integrate .. //depot/projects/gdb/lib/libarchive/Makefile#6 integrate .. //depot/projects/gdb/lib/libarchive/archive.h#6 integrate .. //depot/projects/gdb/lib/libarchive/archive_entry.3#4 integrate .. //depot/projects/gdb/lib/libarchive/archive_entry.c#10 integrate .. //depot/projects/gdb/lib/libarchive/archive_entry.h#7 integrate .. //depot/projects/gdb/lib/libarchive/archive_private.h#7 integrate .. //depot/projects/gdb/lib/libarchive/archive_read_extract.c#8 integrate .. //depot/projects/gdb/lib/libarchive/archive_read_support_compression_bzip2.c#4 integrate .. //depot/projects/gdb/lib/libarchive/archive_read_support_compression_gzip.c#5 integrate .. //depot/projects/gdb/lib/libarchive/archive_read_support_compression_none.c#5 integrate .. //depot/projects/gdb/lib/libarchive/archive_read_support_format_cpio.c#7 integrate .. //depot/projects/gdb/lib/libarchive/archive_read_support_format_tar.c#10 integrate .. //depot/projects/gdb/lib/libarchive/archive_util.c#6 integrate .. //depot/projects/gdb/lib/libarchive/archive_write_set_compression_bzip2.c#4 integrate .. //depot/projects/gdb/lib/libarchive/archive_write_set_compression_gzip.c#4 integrate .. //depot/projects/gdb/lib/libarchive/archive_write_set_compression_none.c#4 integrate .. //depot/projects/gdb/lib/libarchive/archive_write_set_format_pax.c#10 integrate .. //depot/projects/gdb/lib/libarchive/archive_write_set_format_shar.c#8 integrate .. //depot/projects/gdb/lib/libarchive/libarchive-formats.5#1 branch .. //depot/projects/gdb/lib/libc/gen/signal.3#3 integrate .. //depot/projects/gdb/lib/libc/locale/ldpart.c#2 integrate .. //depot/projects/gdb/lib/libradius/Makefile#3 integrate .. //depot/projects/gdb/lib/libradius/libradius.3#2 integrate .. //depot/projects/gdb/lib/libradius/radlib.c#2 integrate .. //depot/projects/gdb/lib/libradius/radlib.h#2 integrate .. //depot/projects/gdb/lib/libradius/radlib_private.h#2 integrate .. //depot/projects/gdb/lib/libradius/radlib_vs.h#2 integrate .. //depot/projects/gdb/sbin/adjkerntz/adjkerntz.c#2 integrate .. //depot/projects/gdb/sbin/mount/Makefile#3 integrate .. //depot/projects/gdb/sbin/mount/mount.c#4 integrate .. //depot/projects/gdb/share/man/man4/Makefile#9 integrate .. //depot/projects/gdb/share/man/man4/axe.4#2 integrate .. //depot/projects/gdb/share/man/man4/led.4#3 integrate .. //depot/projects/gdb/share/man/man4/mac_none.4#2 integrate .. //depot/projects/gdb/share/man/man4/ng_pptpgre.4#2 integrate .. //depot/projects/gdb/share/man/man4/rue.4#2 integrate .. //depot/projects/gdb/share/man/man4/watchdog.4#3 integrate .. //depot/projects/gdb/share/man/man5/rc.conf.5#10 integrate .. //depot/projects/gdb/share/man/man9/mbuf.9#5 integrate .. //depot/projects/gdb/share/snmp/mibs/FREEBSD-MIB.txt#2 integrate .. //depot/projects/gdb/sys/alpha/alpha/pmap.c#6 integrate .. //depot/projects/gdb/sys/boot/i386/boot0/Makefile#3 integrate .. //depot/projects/gdb/sys/boot/i386/boot0/boot0.S#1 branch .. //depot/projects/gdb/sys/boot/i386/boot0/boot0.s#3 delete .. //depot/projects/gdb/sys/boot/i386/boot0/boot0ext.S#1 branch .. //depot/projects/gdb/sys/boot/i386/boot0/boot0ext.s#4 delete .. //depot/projects/gdb/sys/boot/i386/boot0/boot0sio.s#3 delete .. //depot/projects/gdb/sys/boot/i386/boot0ext/Makefile#2 integrate .. //depot/projects/gdb/sys/boot/i386/boot0sio/Makefile#3 integrate .. //depot/projects/gdb/sys/boot/i386/boot2/boot1.S#2 integrate .. //depot/projects/gdb/sys/boot/i386/boot2/sio.S#2 integrate .. //depot/projects/gdb/sys/boot/i386/btx/btx/Makefile#3 integrate .. //depot/projects/gdb/sys/boot/i386/btx/btx/btx.S#2 integrate .. //depot/projects/gdb/sys/boot/i386/btx/btxldr/Makefile#3 integrate .. //depot/projects/gdb/sys/boot/i386/btx/btxldr/btxldr.S#2 integrate .. //depot/projects/gdb/sys/boot/i386/cdboot/Makefile#3 integrate .. //depot/projects/gdb/sys/boot/i386/libi386/amd64_tramp.S#2 integrate .. //depot/projects/gdb/sys/boot/i386/mbr/Makefile#3 integrate .. //depot/projects/gdb/sys/boot/i386/pxeldr/Makefile#3 integrate .. //depot/projects/gdb/sys/boot/i386/pxeldr/pxeldr.S#2 integrate .. //depot/projects/gdb/sys/boot/pc98/boot2/serial_16550.S#2 integrate .. //depot/projects/gdb/sys/boot/pc98/boot2/serial_8251.S#2 integrate .. //depot/projects/gdb/sys/boot/pc98/btx/btx/Makefile#3 integrate .. //depot/projects/gdb/sys/boot/pc98/btx/btx/btx.S#2 integrate .. //depot/projects/gdb/sys/boot/pc98/btx/btxldr/Makefile#3 integrate .. //depot/projects/gdb/sys/boot/pc98/btx/btxldr/btxldr.S#2 integrate .. //depot/projects/gdb/sys/conf/NOTES#17 integrate .. //depot/projects/gdb/sys/conf/kern.pre.mk#9 integrate .. //depot/projects/gdb/sys/conf/options#16 integrate .. //depot/projects/gdb/sys/dev/acpica/acpi.c#14 integrate .. //depot/projects/gdb/sys/dev/acpica/acpi_pci.c#7 integrate .. //depot/projects/gdb/sys/dev/ata/ata-lowlevel.c#7 integrate .. //depot/projects/gdb/sys/dev/ata/ata-pci.c#7 integrate .. //depot/projects/gdb/sys/dev/ciss/ciss.c#8 integrate .. //depot/projects/gdb/sys/dev/cy/cy.c#1 branch .. //depot/projects/gdb/sys/dev/cy/cy_isa.c#1 branch .. //depot/projects/gdb/sys/dev/cy/cy_pci.c#1 branch .. //depot/projects/gdb/sys/dev/cy/cyreg.h#1 branch .. //depot/projects/gdb/sys/dev/ic/cd1400.h#1 branch .. //depot/projects/gdb/sys/dev/if_ndis/if_ndis.c#13 integrate .. //depot/projects/gdb/sys/dev/led/led.c#4 integrate .. //depot/projects/gdb/sys/dev/pci/pci.c#9 integrate .. //depot/projects/gdb/sys/dev/sound/pcm/buffer.c#3 integrate .. //depot/projects/gdb/sys/dev/usb/if_axe.c#3 integrate .. //depot/projects/gdb/sys/dev/usb/usbdevs#6 integrate .. //depot/projects/gdb/sys/dev/usb/usbdevs.h#6 integrate .. //depot/projects/gdb/sys/dev/usb/usbdevs_data.h#6 integrate .. //depot/projects/gdb/sys/i386/conf/GENERIC#7 integrate .. //depot/projects/gdb/sys/i386/i386/elan-mmcr.c#6 integrate .. //depot/projects/gdb/sys/i386/include/mpapic.h#2 delete .. //depot/projects/gdb/sys/i386/isa/clock.c#7 integrate .. //depot/projects/gdb/sys/kern/kern_environment.c#2 integrate .. //depot/projects/gdb/sys/kern/kern_jail.c#4 integrate .. //depot/projects/gdb/sys/kern/kern_thread.c#9 integrate .. //depot/projects/gdb/sys/kern/subr_sleepqueue.c#3 integrate .. //depot/projects/gdb/sys/kern/vfs_syscalls.c#8 integrate .. //depot/projects/gdb/sys/modules/Makefile#8 integrate .. //depot/projects/gdb/sys/modules/netgraph/Makefile#5 integrate .. //depot/projects/gdb/sys/net/if_arcsubr.c#4 integrate .. //depot/projects/gdb/sys/net/if_atmsubr.c#2 integrate .. //depot/projects/gdb/sys/net/if_ethersubr.c#10 integrate .. //depot/projects/gdb/sys/net/if_fddisubr.c#7 integrate .. //depot/projects/gdb/sys/net/if_iso88025subr.c#6 integrate .. //depot/projects/gdb/sys/net/rtsock.c#7 integrate .. //depot/projects/gdb/sys/netatalk/aarp.c#5 integrate .. //depot/projects/gdb/sys/netatalk/at_extern.h#2 integrate .. //depot/projects/gdb/sys/netgraph/bluetooth/common/ng_bluetooth.c#2 integrate .. //depot/projects/gdb/sys/netgraph/bluetooth/drivers/bt3c/ng_bt3c_pccard.c#3 integrate .. //depot/projects/gdb/sys/netgraph/bluetooth/drivers/h4/ng_h4.c#3 integrate .. //depot/projects/gdb/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c#4 integrate .. //depot/projects/gdb/sys/netgraph/bluetooth/hci/ng_hci_cmds.c#2 integrate .. //depot/projects/gdb/sys/netgraph/bluetooth/hci/ng_hci_evnt.c#3 integrate .. //depot/projects/gdb/sys/netgraph/bluetooth/hci/ng_hci_main.c#2 integrate .. //depot/projects/gdb/sys/netgraph/bluetooth/hci/ng_hci_misc.c#3 integrate .. //depot/projects/gdb/sys/netgraph/bluetooth/hci/ng_hci_ulpi.c#3 integrate .. //depot/projects/gdb/sys/netgraph/bluetooth/l2cap/ng_l2cap_cmds.c#2 integrate .. //depot/projects/gdb/sys/netgraph/bluetooth/l2cap/ng_l2cap_evnt.c#3 integrate .. //depot/projects/gdb/sys/netgraph/bluetooth/l2cap/ng_l2cap_llpi.c#3 integrate .. //depot/projects/gdb/sys/netgraph/bluetooth/l2cap/ng_l2cap_main.c#2 integrate .. //depot/projects/gdb/sys/netgraph/bluetooth/l2cap/ng_l2cap_misc.c#3 integrate .. //depot/projects/gdb/sys/netgraph/bluetooth/l2cap/ng_l2cap_ulpi.c#3 integrate .. //depot/projects/gdb/sys/netgraph/bluetooth/socket/ng_btsocket.c#2 integrate .. //depot/projects/gdb/sys/netgraph/bluetooth/socket/ng_btsocket_hci_raw.c#4 integrate .. //depot/projects/gdb/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c#3 integrate .. //depot/projects/gdb/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap_raw.c#3 integrate .. //depot/projects/gdb/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c#4 integrate .. //depot/projects/gdb/sys/netgraph/ng_parse.c#3 integrate .. //depot/projects/gdb/sys/netgraph/ng_pptpgre.c#2 integrate .. //depot/projects/gdb/sys/netgraph/ng_pptpgre.h#2 integrate .. //depot/projects/gdb/sys/netinet/if_ether.c#7 integrate .. //depot/projects/gdb/sys/netinet/raw_ip.c#5 integrate .. //depot/projects/gdb/sys/netinet/tcp_input.c#6 integrate .. //depot/projects/gdb/sys/netinet/tcp_var.h#6 integrate .. //depot/projects/gdb/sys/netinet6/nd6.c#4 integrate .. //depot/projects/gdb/sys/pc98/conf/GENERIC#6 integrate .. //depot/projects/gdb/sys/pc98/pc98/fd.c#5 integrate .. //depot/projects/gdb/sys/sparc64/ebus/ebus.c#3 integrate .. //depot/projects/gdb/sys/sparc64/isa/ofw_isa.c#2 integrate .. //depot/projects/gdb/sys/sparc64/isa/ofw_isa.h#2 integrate .. //depot/projects/gdb/sys/sparc64/sparc64/ofw_machdep.c#2 integrate .. //depot/projects/gdb/sys/sys/jail.h#3 integrate .. //depot/projects/gdb/sys/sys/mman.h#3 integrate .. //depot/projects/gdb/sys/sys/proc.h#12 integrate .. //depot/projects/gdb/sys/ufs/ffs/ffs_vfsops.c#4 integrate .. //depot/projects/gdb/sys/vm/phys_pager.c#3 integrate .. //depot/projects/gdb/tools/tools/nanobsd/Makefile#2 integrate .. //depot/projects/gdb/tools/tools/nanobsd/i386.diskimage#4 integrate .. //depot/projects/gdb/usr.bin/netstat/inet.c#3 integrate .. //depot/projects/gdb/usr.bin/tar/bsdtar.1#4 integrate .. //depot/projects/gdb/usr.bin/tar/read.c#3 integrate .. //depot/projects/gdb/usr.bin/tar/write.c#7 integrate .. //depot/projects/gdb/usr.sbin/arlcontrol/arlcontrol.8#1 branch .. //depot/projects/gdb/usr.sbin/arlcontrol/arlcontrol.c#1 branch .. //depot/projects/gdb/usr.sbin/kldxref/kldxref.c#3 integrate .. //depot/projects/gdb/usr.sbin/watchdogd/watchdog.8#2 integrate .. //depot/projects/gdb/usr.sbin/watchdogd/watchdogd.8#3 integrate .. //depot/projects/gdb/usr.sbin/watchdogd/watchdogd.c#3 integrate Differences ... ==== //depot/projects/gdb/Makefile.inc1#8 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.423 2004/04/14 16:06:17 harti Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.424 2004/04/27 15:00:29 ru Exp $ # # Make command line options: # -DNO_DYNAMICROOT do not link /bin and /sbin dynamically @@ -901,7 +901,7 @@ lib/libsbuf lib/libtacplus lib/libutil lib/libypclnt \ lib/libz lib/msun -lib/libopie__L lib/libradius__L lib/libtacplus__L: lib/libmd__L +lib/libopie__L lib/libtacplus__L: lib/libmd__L lib/libypclnt__L: lib/librpcsvc__L _generic_libs+= lib @@ -909,6 +909,7 @@ .if !defined(NOCRYPT) .if !defined(NO_OPENSSL) _prebuild_libs+= secure/lib/libcrypto secure/lib/libssl +lib/libradius__L: secure/lib/libssl__L .if !defined(NO_OPENSSH) _prebuild_libs+= secure/lib/libssh secure/lib/libssh__L: secure/lib/libcrypto__L lib/libz__L @@ -917,6 +918,10 @@ _generic_libs+= secure/lib .endif +.if defined(NOCRYPT) || defined(NO_OPENSSL) +lib/libradius__L: lib/libmd__L +.endif + _generic_libs+= usr.bin/lex/lib .if ${MACHINE_ARCH} == "i386" ==== //depot/projects/gdb/bin/kenv/kenv.c#2 (text+ko) ==== @@ -24,16 +24,15 @@ */ #include -__FBSDID("$FreeBSD: src/bin/kenv/kenv.c,v 1.5 2003/01/20 17:56:25 obrien Exp $"); +__FBSDID("$FreeBSD: src/bin/kenv/kenv.c,v 1.6 2004/04/28 01:27:36 das Exp $"); #include #include +#include +#include +#include #include -#include #include -#include -#include -#include #include static void usage(void); @@ -92,9 +91,11 @@ usage(); if ((argc > 0) || (uflag && (env == NULL))) usage(); - if (env == NULL) - kdumpenv(); - else if (val == NULL) { + if (env == NULL) { + error = kdumpenv(); + if (error) + warn("kdumpenv"); + } else if (val == NULL) { if (uflag) { error = kunsetenv(env); if (error) @@ -116,16 +117,28 @@ kdumpenv() { char *buf, *cp; - int len; + int buflen, envlen; - len = kenv(KENV_DUMP, NULL, NULL, 0); - len = len * 120 / 100; - buf = malloc(len); - if (buf == NULL) + envlen = kenv(KENV_DUMP, NULL, NULL, 0); + if (envlen < 0) return (-1); - /* Be defensive */ - memset(buf, 0, len); - kenv(KENV_DUMP, NULL, buf, len); + for (;;) { + buflen = envlen * 120 / 100; + buf = malloc(buflen + 1); + if (buf == NULL) + return (-1); + memset(buf, 0, buflen + 1); /* Be defensive */ + envlen = kenv(KENV_DUMP, NULL, buf, buflen); + if (envlen < 0) { + free(buf); + return (-1); + } + if (envlen > buflen) + free(buf); + else + break; + } + for (; *buf != '\0'; buf += strlen(buf) + 1) { if (hflag) { if (strncmp(buf, "hint.", 5) != 0) ==== //depot/projects/gdb/contrib/lukemftp/src/fetch.c#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $NetBSD: fetch.c,v 1.144 2003/07/31 05:23:59 lukem Exp $ */ +/* $NetBSD: fetch.c,v 1.146 2003/12/10 12:34:28 lukem Exp $ */ /*- * Copyright (c) 1997-2003 The NetBSD Foundation, Inc. @@ -41,7 +41,7 @@ #include #ifndef lint -__RCSID("$NetBSD: fetch.c,v 1.144 2003/07/31 05:23:59 lukem Exp $"); +__RCSID("$NetBSD: fetch.c,v 1.146 2003/12/10 12:34:28 lukem Exp $"); #endif /* not lint */ /* @@ -246,7 +246,7 @@ /* * Parse URL of form: - * ://[[:@]][:][/] + * ://[[:]@][:][/] * Returns -1 if a parse error occurred, otherwise 0. * It's the caller's responsibility to url_decode() the returned * user, pass and path. @@ -1303,7 +1303,6 @@ if ((parse_url(url, "URL", &urltype, &user, &pass, &host, &port, &portnum, &path) == -1) || (user != NULL && *user == '\0') || - (pass != NULL && *pass == '\0') || EMPTYSTRING(host)) { warnx("Invalid URL `%s'", url); goto cleanup_fetch_ftp; ==== //depot/projects/gdb/contrib/lukemftp/src/ftp.1#2 (text+ko) ==== @@ -1,4 +1,4 @@ -.\" $NetBSD: ftp.1,v 1.100 2003/08/07 11:13:54 agc Exp $ +.\" $NetBSD: ftp.1,v 1.101 2003/12/19 03:46:02 lukem Exp $ .\" .\" Copyright (c) 1996-2003 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -64,7 +64,7 @@ .\" .\" @(#)ftp.1 8.3 (Berkeley) 10/9/94 .\" -.Dd July 31, 2003 +.Dd December 19, 2003 .Dt FTP 1 .Os .Sh NAME @@ -224,7 +224,7 @@ .Nm from attempting .Dq auto-login -upon initial connection. +upon initial connection for non auto-fetch transfers. If auto-login is enabled, .Nm will check the @@ -236,6 +236,8 @@ will prompt for the remote machine login name (default is the user identity on the local machine), and, if necessary, prompt for a password and an account with which to login. +To override the auto-login for auto-fetch transfers, specify the +username (and optionally, password) as appropriate. .It Fl N Ar netrc Use .Ar netrc ==== //depot/projects/gdb/contrib/lukemftp/src/ftp.c#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $NetBSD: ftp.c,v 1.122 2003/08/07 11:13:55 agc Exp $ */ +/* $NetBSD: ftp.c,v 1.125 2004/04/10 12:21:39 lukem Exp $ */ /*- * Copyright (c) 1996-2002 The NetBSD Foundation, Inc. @@ -99,7 +99,7 @@ #if 0 static char sccsid[] = "@(#)ftp.c 8.6 (Berkeley) 10/27/94"; #else -__RCSID("$NetBSD: ftp.c,v 1.122 2003/08/07 11:13:55 agc Exp $"); +__RCSID("$NetBSD: ftp.c,v 1.125 2004/04/10 12:21:39 lukem Exp $"); #endif #endif /* not lint */ @@ -230,10 +230,7 @@ cause = "socket"; continue; } - while ((error = xconnect(s, res->ai_addr, res->ai_addrlen)) < 0 - && errno == EINTR) { - ; - } + error = xconnect(s, res->ai_addr, res->ai_addrlen); if (error) { /* this "if" clause is to prevent print warning twice */ if (res->ai_next) { @@ -276,7 +273,8 @@ int tos = IPTOS_LOWDELAY; if (setsockopt(s, IPPROTO_IP, IP_TOS, (char *)&tos, sizeof(int)) < 0) - warn("setsockopt TOS (ignored)"); + if (debug) + warn("setsockopt TOS (ignored)"); } #endif cin = fdopen(s, "r"); @@ -573,13 +571,13 @@ struct pollfd pfd[2]; if (cin) { - pfd[nfd].fd = fileno(cin); - pfd[nfd++].events = POLLIN; + pfd[nfd].fd = fileno(cin); + pfd[nfd++].events = POLLIN; } if (din) { - pfd[nfd].fd = fileno(din); - pfd[nfd++].events = POLLIN; + pfd[nfd].fd = fileno(din); + pfd[nfd++].events = POLLIN; } if ((nr = poll(pfd, nfd, sec * 1000)) <= 0) @@ -1325,7 +1323,8 @@ if ((options & SO_DEBUG) && setsockopt(data, SOL_SOCKET, SO_DEBUG, (char *)&on, sizeof(on)) < 0) - warn("setsockopt (ignored)"); + if (debug) + warn("setsockopt (ignored)"); result = COMPLETE + 1; switch (data_addr.su_family) { case AF_INET: @@ -1544,8 +1543,6 @@ while (xconnect(data, (struct sockaddr *)&data_addr.si_su, data_addr.su_len) < 0) { - if (errno == EINTR) - continue; if (activefallback) { (void)close(data); data = -1; @@ -1563,7 +1560,8 @@ on = IPTOS_THROUGHPUT; if (setsockopt(data, IPPROTO_IP, IP_TOS, (char *)&on, sizeof(int)) < 0) - warn("setsockopt TOS (ignored)"); + if (debug) + warn("setsockopt TOS (ignored)"); } #endif return (0); @@ -1596,7 +1594,8 @@ if (options & SO_DEBUG && setsockopt(data, SOL_SOCKET, SO_DEBUG, (char *)&on, sizeof(on)) < 0) - warn("setsockopt (ignored)"); + if (debug) + warn("setsockopt (ignored)"); len = sizeof(data_addr.si_su); memset((char *)&data_addr, 0, sizeof (data_addr)); if (getsockname(data, (struct sockaddr *)&data_addr.si_su, &len) < 0) { @@ -1696,7 +1695,8 @@ on = IPTOS_THROUGHPUT; if (setsockopt(data, IPPROTO_IP, IP_TOS, (char *)&on, sizeof(int)) < 0) - warn("setsockopt TOS (ignored)"); + if (debug) + warn("setsockopt TOS (ignored)"); } #endif return (0); @@ -1729,7 +1729,8 @@ int tos = IPTOS_THROUGHPUT; if (setsockopt(s, IPPROTO_IP, IP_TOS, (char *)&tos, sizeof(int)) < 0) { - warn("setsockopt TOS (ignored)"); + if (debug) + warn("setsockopt TOS (ignored)"); } } #endif ==== //depot/projects/gdb/contrib/lukemftp/src/progressbar.c#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $NetBSD: progressbar.c,v 1.4 2003/07/17 12:06:18 lukem Exp $ */ +/* $NetBSD: progressbar.c,v 1.5 2004/03/09 17:04:24 hubertf Exp $ */ /*- * Copyright (c) 1997-2003 The NetBSD Foundation, Inc. @@ -38,7 +38,7 @@ #include #ifndef lint -__RCSID("$NetBSD: progressbar.c,v 1.4 2003/07/17 12:06:18 lukem Exp $"); +__RCSID("$NetBSD: progressbar.c,v 1.5 2004/03/09 17:04:24 hubertf Exp $"); #endif /* not lint */ /* @@ -53,6 +53,7 @@ #include #include #include +#include #include #include @@ -203,6 +204,8 @@ return; len += snprintf(buf + len, BUFLEFT, "\r"); + if (prefix) + len += snprintf(buf + len, BUFLEFT, "%s", prefix); if (filesize > 0) { ratio = (int)((double)cursize * 100.0 / (double)filesize); ratio = MAX(ratio, 0); @@ -214,6 +217,8 @@ * the number of stars won't exceed the buffer size */ barlength = MIN(sizeof(buf) - 1, ttywidth) - BAROVERHEAD; + if (prefix) + barlength -= strlen(prefix); if (barlength > 0) { i = barlength * ratio / 100; len += snprintf(buf + len, BUFLEFT, ==== //depot/projects/gdb/contrib/lukemftp/src/progressbar.h#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $NetBSD: progressbar.h,v 1.3 2003/02/28 09:53:49 lukem Exp $ */ +/* $NetBSD: progressbar.h,v 1.4 2004/03/09 17:04:24 hubertf Exp $ */ /*- * Copyright (c) 1996-2003 The NetBSD Foundation, Inc. @@ -58,6 +58,7 @@ GLOBAL off_t bytes; /* current # of bytes read */ GLOBAL off_t filesize; /* size of file being transferred */ GLOBAL off_t restart_point; /* offset to restart transfer */ +GLOBAL char *prefix; /* Text written left of progress bar */ #ifndef STANDALONE_PROGRESS ==== //depot/projects/gdb/contrib/lukemftp/src/util.c#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $NetBSD: util.c,v 1.114 2003/08/07 11:13:57 agc Exp $ */ +/* $NetBSD: util.c,v 1.115 2004/04/10 12:21:39 lukem Exp $ */ /*- * Copyright (c) 1997-2003 The NetBSD Foundation, Inc. @@ -71,7 +71,7 @@ #include #ifndef lint -__RCSID("$NetBSD: util.c,v 1.114 2003/08/07 11:13:57 agc Exp $"); +__RCSID("$NetBSD: util.c,v 1.115 2004/04/10 12:21:39 lukem Exp $"); #endif /* not lint */ /* @@ -1204,14 +1204,29 @@ /* - * Internal version of connect(2); sets socket buffer sizes first. + * Internal version of connect(2); sets socket buffer sizes first and + * handles the syscall being interrupted. + * Returns -1 upon failure (with errno set to the problem), or 0 on success. */ int xconnect(int sock, const struct sockaddr *name, int namelen) { + int rv; setupsockbufsize(sock); - return (connect(sock, name, namelen)); + rv = connect(sock, name, namelen); + if (rv == -1 && errno == EINTR) { + fd_set connfd; + + FD_ZERO(&connfd); + FD_SET(sock, &connfd); + do { + rv = select(sock + 1, NULL, &connfd, NULL, NULL); + } while (rv == -1 && errno == EINTR); + if (rv > 0) + rv = 0; + } + return (rv); } /* ==== //depot/projects/gdb/contrib/lukemftp/src/version.h#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $NetBSD: version.h,v 1.33 2003/07/31 07:13:01 lukem Exp $ */ +/* $NetBSD: version.h,v 1.35 2004/04/10 12:21:39 lukem Exp $ */ /*- * Copyright (c) 1999-2003 The NetBSD Foundation, Inc. * All rights reserved. @@ -40,5 +40,5 @@ #endif #ifndef FTP_VERSION -#define FTP_VERSION "20030731b" +#define FTP_VERSION "20040410" #endif ==== //depot/projects/gdb/etc/rc.d/initdiskless#7 (text+ko) ==== @@ -24,11 +24,12 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/etc/rc.d/initdiskless,v 1.34 2004/04/15 17:52:53 brooks Exp $ +# $FreeBSD: src/etc/rc.d/initdiskless,v 1.37 2004/04/28 13:18:22 phk Exp $ # # REQUIRE: preseedrandom # PROVIDE: initdiskless # KEYWORD: FreeBSD nojail +# BEFORE: ipfw # On entry to this script the entire system consists of a read-only root @@ -178,7 +179,7 @@ if [ ${dlv:=0} -ne 0 ] ; then iflist=`ifconfig -l` for i in ${iflist} ; do - set `ifconfig ${i}` + set -- `ifconfig ${i}` while [ $# -ge 1 ] ; do if [ "${bootp_ifc}" = "" -a "$1" = "inet" ] ; then bootp_ifc=${i} ; bootp_ipa=${2} ; shift @@ -202,7 +203,7 @@ # Figure out our NFS root path # -set `mount -t nfs` +set -- `mount -t nfs` while [ $# -ge 1 ] ; do if [ "$2" = "on" -a "$3" = "/" ]; then nfsroot="$1" ==== //depot/projects/gdb/etc/rc.d/ipfw#4 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/ipfw,v 1.7 2004/04/05 16:29:45 fjoe Exp $ +# $FreeBSD: src/etc/rc.d/ipfw,v 1.8 2004/04/28 13:20:15 phk Exp $ # # PROVIDE: ipfw @@ -37,7 +37,9 @@ if [ -r "${firewall_script}" ]; then . "${firewall_script}" echo -n 'Firewall rules loaded, starting divert daemons:' - /etc/rc.d/natd start + if [ -f /etc/rc.d/natd ] ; then + /etc/rc.d/natd start + fi elif [ "`ipfw l 65535`" = "65535 deny ip from any to any" ]; then echo 'Warning: kernel has firewall functionality, but' \ ' firewall rules are not enabled.' @@ -62,7 +64,9 @@ # Disable the firewall # ${SYSCTL_W} net.inet.ip.fw.enable=0 - /etc/rc.d/natd stop + if [ -f /etc/rc.d/natd ] ; then + /etc/rc.d/natd stop + fi } load_rc_config $name ==== //depot/projects/gdb/etc/rc.d/netif#4 (text+ko) ==== @@ -22,7 +22,7 @@ # (INCLUDING 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/etc/rc.d/netif,v 1.6 2004/03/08 12:25:05 pjd Exp $ +# $FreeBSD: src/etc/rc.d/netif,v 1.7 2004/04/28 13:20:15 phk Exp $ # # PROVIDE: netif @@ -57,8 +57,10 @@ # Configure the interface(s). network_common ifn_start verbose - # Resync ipfilter - /etc/rc.d/ipfilter resync + if [ -f /etc/rc.d/ipfilter ] ; then + # Resync ipfilter + /etc/rc.d/ipfilter resync + fi } network_stop() ==== //depot/projects/gdb/etc/rc.d/resolv#2 (text+ko) ==== @@ -24,7 +24,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/etc/rc.d/resolv,v 1.32 2004/03/23 23:22:34 brooks Exp $ +# $FreeBSD: src/etc/rc.d/resolv,v 1.33 2004/04/28 09:09:27 ru Exp $ # # PROVIDE: resolv @@ -48,7 +48,7 @@ echo domain `/bin/kenv dhcp.domain-name` > /etc/resolv.conf fi - set `/bin/kenv dhcp.domain-name-servers` + set -- `/bin/kenv dhcp.domain-name-servers` for ns in `IFS=','; echo $*`; do echo nameserver $ns >> /etc/resolv.conf; done ==== //depot/projects/gdb/etc/rc.d/watchdogd#3 (text+ko) ==== @@ -24,7 +24,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/etc/rc.d/watchdogd,v 1.2 2004/03/08 12:25:05 pjd Exp $ +# $FreeBSD: src/etc/rc.d/watchdogd,v 1.3 2004/04/26 19:41:37 simon Exp $ # # PROVIDE: watchdogd @@ -36,16 +36,7 @@ name="watchdogd" rcvar="`set_rcvar`" command="/usr/sbin/${name}" -start_precmd="watchdogd_precmd" pidfile="/var/run/${name}.pid" -watchdogd_precmd() -{ - if ! sysctl debug.watchdog >/dev/null 2>&1; then - err 1 "Your kernel doesn't have watchdog support." - fi - return 0 -} - load_rc_config $name run_rc_command "$1" ==== //depot/projects/gdb/games/fortune/datfiles/fortunes#5 (text+ko) ==== @@ -1,5 +1,5 @@ This fortune brought to you by: -$FreeBSD: src/games/fortune/datfiles/fortunes,v 1.129 2004/04/21 22:39:46 grog Exp $ +$FreeBSD: src/games/fortune/datfiles/fortunes,v 1.130 2004/04/29 06:14:00 cperciva Exp $ % -- Gifts for Children -- @@ -381,7 +381,7 @@ William Safire's Rules for Writers: Remember to never split an infinitive. The passive voice should never -be used. Do not put statements in the negative form. Verbs have to +be used. Do not put statements in the negative form. Verbs has to agree with their subjects. Proofread carefully to see if you words out. If you reread your work, you can find on rereading a great deal of repetition can be avoided by rereading and editing. A writer must ==== //depot/projects/gdb/games/fortune/datfiles/fortunes-o.real#2 (text+ko) ==== @@ -1,4 +1,4 @@ -%% $FreeBSD: src/games/fortune/datfiles/fortunes-o.real,v 1.17 2003/09/13 15:46:35 eivind Exp $ +%% $FreeBSD: src/games/fortune/datfiles/fortunes-o.real,v 1.19 2004/04/29 04:36:36 smkelly Exp $ My Favorite Drugs [Sung to My Favorite Things] Reefers and roach clips and papers and rollers Cocaine and procaine for twenty year molars @@ -1055,6 +1055,10 @@ lies." -- Edith Hamilton, "The Greek Way" % +"I've got my ANSI C Reference book right here but it doesn't say anything +about getting raped in the ass as part of the official C language (maybe +I should get a C++ reference manual)" -- Deuce, Jerk City +% "I've had one child. My husband wants to have another. I'd like to watch him have another." % @@ -2262,3 +2266,5 @@ to bullshit you, or I may just be bullshitting you inadvertently." -- J. Wainwright, Mathematics 140b % +UNIX is hard. Let's go shopping! +% ==== //depot/projects/gdb/lib/libarchive/Makefile#6 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/lib/libarchive/Makefile,v 1.6 2004/04/12 01:16:16 kientzle Exp $ +# $FreeBSD: src/lib/libarchive/Makefile,v 1.8 2004/04/28 04:34:07 kientzle Exp $ LIB= archive SHLIB_MAJOR= 1 @@ -47,17 +47,28 @@ archive_util.3 \ archive_write.3 \ libarchive.3 \ + libarchive-formats.5 \ tar.5 MLINKS+= archive_entry.3 archive_entry_clear.3 MLINKS+= archive_entry.3 archive_entry_clone.3 +MLINKS+= archive_entry.3 archive_entry_copy_fflags_text_w.3 +MLINKS+= archive_entry.3 archive_entry_copy_gname_w.3 +MLINKS+= archive_entry.3 archive_entry_copy_hardlink_w.3 +MLINKS+= archive_entry.3 archive_entry_copy_pathname_w.3 MLINKS+= archive_entry.3 archive_entry_copy_stat.3 -MLINKS+= archive_entry.3 archive_entry_dup.3 +MLINKS+= archive_entry.3 archive_entry_copy_symlink_w.3 +MLINKS+= archive_entry.3 archive_entry_copy_uname_w.3 +MLINKS+= archive_entry.3 archive_entry_fflags.3 +MLINKS+= archive_entry.3 archive_entry_fflags_text.3 MLINKS+= archive_entry.3 archive_entry_free.3 MLINKS+= archive_entry.3 archive_entry_gname.3 +MLINKS+= archive_entry.3 archive_entry_gname_w.3 MLINKS+= archive_entry.3 archive_entry_hardlink.3 +MLINKS+= archive_entry.3 archive_entry_hardlink_w.3 MLINKS+= archive_entry.3 archive_entry_new.3 MLINKS+= archive_entry.3 archive_entry_pathname.3 +MLINKS+= archive_entry.3 archive_entry_pathname_w.3 MLINKS+= archive_entry.3 archive_entry_set_devmajor.3 MLINKS+= archive_entry.3 archive_entry_set_devminor.3 MLINKS+= archive_entry.3 archive_entry_set_gid.3 @@ -72,7 +83,9 @@ MLINKS+= archive_entry.3 archive_entry_size.3 MLINKS+= archive_entry.3 archive_entry_stat.3 MLINKS+= archive_entry.3 archive_entry_symlink.3 +MLINKS+= archive_entry.3 archive_entry_symlink_w.3 MLINKS+= archive_entry.3 archive_entry_uname.3 +MLINKS+= archive_entry.3 archive_entry_uname_w.3 MLINKS+= archive_read.3 archive_read_data.3 MLINKS+= archive_read.3 archive_read_data_into_buffer.3 MLINKS+= archive_read.3 archive_read_data_into_file.3 ==== //depot/projects/gdb/lib/libarchive/archive.h#6 (text+ko) ==== @@ -23,7 +23,7 @@ * (INCLUDING 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/libarchive/archive.h,v 1.6 2004/04/05 21:12:29 kientzle Exp $ + * $FreeBSD: src/lib/libarchive/archive.h,v 1.7 2004/04/28 04:41:26 kientzle Exp $ */ #ifndef ARCHIVE_H_INCLUDED @@ -257,6 +257,11 @@ * Accessor functions to read/set various information in * the struct archive object: */ +/* Bytes written after compression or read before decompression. */ +int64_t archive_position_compressed(struct archive *); +/* Bytes written to compressor or read from decompressor. */ +int64_t archive_position_uncompressed(struct archive *); + const char *archive_compression_name(struct archive *); int archive_compression(struct archive *); int archive_errno(struct archive *); ==== //depot/projects/gdb/lib/libarchive/archive_entry.3#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/lib/libarchive/archive_entry.3,v 1.3 2004/04/12 01:16:16 kientzle Exp $ +.\" $FreeBSD: src/lib/libarchive/archive_entry.3,v 1.4 2004/04/26 23:37:54 kientzle Exp $ .\" .Dd December 15, 2003 .Dt archive_entry 3 @@ -30,12 +30,15 @@ .Sh NAME .Nm archive_entry_clear .Nm archive_entry_clone +.Nm archive_entry_copy_fflags_text_w .Nm archive_entry_copy_gname_w .Nm archive_entry_copy_hardlink_w .Nm archive_entry_copy_pathname_w .Nm archive_entry_copy_stat .Nm archive_entry_copy_symlink_w .Nm archive_entry_copy_uname_w +.Nm archive_entry_fflags +.Nm archive_entry_fflags_text .Nm archive_entry_free .Nm archive_entry_gname .Nm archive_entry_gname_w @@ -46,9 +49,11 @@ .Nm archive_entry_pathname_w .Nm archive_entry_set_devmajor .Nm archive_entry_set_devminor +.Nm archive_entry_set_fflags .Nm archive_entry_set_gid .Nm archive_entry_set_gname .Nm archive_entry_set_hardlink +.Nm archive_entry_set_link .Nm archive_entry_set_mode .Nm archive_entry_set_pathname .Nm archive_entry_set_symlink @@ -67,6 +72,8 @@ .Fn archive_entry_clear "struct archive_entry *" .Ft struct archive_entry * .Fn archive_entry_clone "struct archive_entry *" +.Ft const wchar_t * +.Fn archive_entry_copy_fflags_text_w "struct archive_entry *" "const wchar_t *" .Ft void .Fn archive_entry_copy_gname_w "struct archive_entry *" "const wchar_t *" .Ft void @@ -80,6 +87,10 @@ .Ft void .Fn archive_entry_copy_uname_w "struct archive_entry *" "const wchar_t *" .Ft void +.Fn archive_entry_fflags "struct archive_entry *" "unsigned long *set" "unsigned long *clear" +.Ft const char * +.Fn archive_entry_fflags_text "struct archive_entry *" +.Ft void .Fn archive_entry_free "struct archive_entry *" .Ft const char * .Fn archive_entry_gname "struct archive_entry *" @@ -100,6 +111,8 @@ .Ft void .Fn archive_entry_set_devminor "struct archive_entry *" "dev_t" .Ft void +.Fn archive_entry_set_fflags "struct archive_entry *" "unsigned long set" "unsigned long clear" +.Ft void .Fn archive_entry_set_gid "struct archive_entry *" "gid_t" .Ft void .Fn archive_entry_set_gname "struct archive_entry *" "const char *" @@ -141,10 +154,30 @@ .Xr libarchive 3 to represent the metadata associated with a particular entry in an archive. -.Pp -Most of the functions here set or read entries -in an object. Such functions have one of the -following forms: +.Ss Create and Destroy +There are functions to allocate, destroy, clear, and copy +.Va archive_entry +objects: +.Bl -tag -compact -width indent +.It Fn archive_entry_clear +Erases the object, resetting all internal fields to the +same state as a newly-created object. +This is provided to allow you to quickly recycle objects +without thrashing the heap. +.It Fn archive_entry_clone +A deep copy operation; all text fields are duplicated. +.It Fn archive_entry_free +Releases the +.Tn struct archive_entry +object. +.It Fn archive_entry_new +Allocate and return a blank +.Tn struct archive_entry +object. +.El +.Ss Set and Get Functions +Most of the functions here set or read entries in an object. +Such functions have one of the following forms: .Bl -tag -compact -width indent .It Fn archive_entry_set_XXXX Stores the provided data in the object. @@ -158,14 +191,13 @@ In the case of strings, a const-qualified pointer to the string is returned. .El -The string data can be accessed as wide character strings -(which are suffixed with -.Cm _w ) +String data can be set or accessed as wide character strings or normal .Va char strings. -Note that these are different representations of the same -data: +The funtions that use wide character strings are suffixed with +.Cm _w . +Note that these are different representations of the same data: For example, if you store a narrow string and read the corresponding wide string, the object will transparently convert formats using the current locale. @@ -173,27 +205,67 @@ narrow string for the same data, the previously-set wide string will be discarded in favor of the new data. .Pp -The remaining functions allocate, destroy, clear, and copy -.Va archive_entry >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Apr 30 00:07:23 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8D7CC16A4D0; Fri, 30 Apr 2004 00:07:23 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 5B0FB16A4CE for ; Fri, 30 Apr 2004 00:07:23 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3B44743D53 for ; Fri, 30 Apr 2004 00:07:23 -0700 (PDT) (envelope-from scottl@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i3U77NGe046033 for ; Fri, 30 Apr 2004 00:07:23 -0700 (PDT) (envelope-from scottl@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i3U77MEW046030 for perforce@freebsd.org; Fri, 30 Apr 2004 00:07:22 -0700 (PDT) (envelope-from scottl@freebsd.org) Date: Fri, 30 Apr 2004 00:07:22 -0700 (PDT) Message-Id: <200404300707.i3U77MEW046030@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to scottl@freebsd.org using -f From: Scott Long To: Perforce Change Reviews Subject: PERFORCE change 51960 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 30 Apr 2004 07:07:24 -0000 http://perforce.freebsd.org/chv.cgi?CH=51960 Change 51960 by scottl@scottl-junior-camlock on 2004/04/30 00:06:22 Add a TODO list. Affected files ... .. //depot/projects/scottl-camlock/src/sys/cam/TODO#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Fri Apr 30 00:07:24 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 43C7E16A50F; Fri, 30 Apr 2004 00:07:24 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id AF71716A4E5 for ; Fri, 30 Apr 2004 00:07:23 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8B38843D53 for ; Fri, 30 Apr 2004 00:07:23 -0700 (PDT) (envelope-from scottl@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i3U77NGe046039 for ; Fri, 30 Apr 2004 00:07:23 -0700 (PDT) (envelope-from scottl@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i3U77NNq046036 for perforce@freebsd.org; Fri, 30 Apr 2004 00:07:23 -0700 (PDT) (envelope-from scottl@freebsd.org) Date: Fri, 30 Apr 2004 00:07:23 -0700 (PDT) Message-Id: <200404300707.i3U77NNq046036@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to scottl@freebsd.org using -f From: Scott Long To: Perforce Change Reviews Subject: PERFORCE change 51961 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 30 Apr 2004 07:07:25 -0000 http://perforce.freebsd.org/chv.cgi?CH=51961 Change 51961 by scottl@scottl-junior-camlock on 2004/04/30 00:07:11 Note the new name of scsi_probe.c Affected files ... .. //depot/projects/scottl-camlock/src/sys/modules/cam/Makefile#4 edit Differences ... ==== //depot/projects/scottl-camlock/src/sys/modules/cam/Makefile#4 (text+ko) ==== @@ -19,7 +19,7 @@ SRCS+= device_if.h bus_if.h vnode_if.h SRCS+= cam.c cam_periph.c cam_queue.c SRCS+= cam_sim.c cam_xpt.c -SRCS+= cam_probe.c +SRCS+= scsi_probe.c SRCS+= scsi_all.c scsi_cd.c scsi_ch.c SRCS+= scsi_da.c SRCS+= scsi_pass.c From owner-p4-projects@FreeBSD.ORG Fri Apr 30 05:38:07 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B1C1B16A4D0; Fri, 30 Apr 2004 05:38:07 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 880B416A4CE for ; Fri, 30 Apr 2004 05:38:07 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5219343D2D for ; Fri, 30 Apr 2004 05:38:07 -0700 (PDT) (envelope-from areisse@nailabs.com) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i3UCc6Ge022365 for ; Fri, 30 Apr 2004 05:38:06 -0700 (PDT) (envelope-from areisse@nailabs.com) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i3UCc6Gv022362 for perforce@freebsd.org; Fri, 30 Apr 2004 05:38:06 -0700 (PDT) (envelope-from areisse@nailabs.com) Date: Fri, 30 Apr 2004 05:38:06 -0700 (PDT) Message-Id: <200404301238.i3UCc6Gv022362@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to areisse@nailabs.com using -f From: Andrew Reisse To: Perforce Change Reviews Subject: PERFORCE change 51965 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 30 Apr 2004 12:38:08 -0000 http://perforce.freebsd.org/chv.cgi?CH=51965 Change 51965 by areisse@areisse_ibook on 2004/04/30 05:37:22 Move all functionality from kern_mac into several files in security. Affected files ... .. //depot/projects/trustedbsd/sedarwin73/apsl/xnu/bsd/conf/files#3 edit .. //depot/projects/trustedbsd/sedarwin73/apsl/xnu/bsd/kern/kern_mac.c#2 delete .. //depot/projects/trustedbsd/sedarwin73/apsl/xnu/security/Makefile#2 edit .. //depot/projects/trustedbsd/sedarwin73/apsl/xnu/security/conf/files#2 edit .. //depot/projects/trustedbsd/sedarwin73/apsl/xnu/security/mac_base.c#1 add .. //depot/projects/trustedbsd/sedarwin73/apsl/xnu/security/mac_internal.h#1 add .. //depot/projects/trustedbsd/sedarwin73/apsl/xnu/security/mac_network.c#1 add .. //depot/projects/trustedbsd/sedarwin73/apsl/xnu/security/mac_port.c#1 add .. //depot/projects/trustedbsd/sedarwin73/apsl/xnu/security/mac_process.c#1 add .. //depot/projects/trustedbsd/sedarwin73/apsl/xnu/security/mac_socket.c#1 add .. //depot/projects/trustedbsd/sedarwin73/apsl/xnu/security/mac_system.c#1 add .. //depot/projects/trustedbsd/sedarwin73/apsl/xnu/security/mac_task.c#1 add .. //depot/projects/trustedbsd/sedarwin73/apsl/xnu/security/mac_vfs.c#1 add Differences ... ==== //depot/projects/trustedbsd/sedarwin73/apsl/xnu/bsd/conf/files#3 (text+ko) ==== @@ -470,7 +470,6 @@ bsd/kern/kern_fork.c standard bsd/kern/kern_ktrace.c standard bsd/kern/kern_lock.c optional cpus -bsd/kern/kern_mac.c standard bsd/kern/kern_malloc.c standard bsd/kern/kern_mman.c standard bsd/kern/kern_panicinfo.c standard ==== //depot/projects/trustedbsd/sedarwin73/apsl/xnu/security/Makefile#2 (text+ko) ==== @@ -8,14 +8,12 @@ include $(MakeInc_def) INSTINC_SUBDIRS = \ - mac_test \ sebsd INSTINC_SUBDIRS_PPC = ${INSTINC_SUBDIRS} INSTINC_SUBDIRS_I386 = ${INSTINC_SUBDIRS} EXPINC_SUBDIRS = \ - mac_test \ sebsd EXPINC_SUBDIRS_PPC = ${EXPINC_SUBDIRS} ==== //depot/projects/trustedbsd/sedarwin73/apsl/xnu/security/conf/files#2 (text+ko) ==== @@ -4,6 +4,14 @@ # security +security/mac_base.c standard +security/mac_task.c standard +security/mac_port.c standard +security/mac_process.c standard +security/mac_vfs.c standard +security/mac_system.c standard +security/mac_socket.c standard +security/mac_network.c standard security/mac_test/mac_test.c standard security/sebsd/sebsd.c standard security/sebsd/sebsd_syscall.c standard From owner-p4-projects@FreeBSD.ORG Fri Apr 30 06:24:05 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C472516A4D0; Fri, 30 Apr 2004 06:24:04 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 9BD2016A4CE for ; Fri, 30 Apr 2004 06:24:04 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 88FE343D60 for ; Fri, 30 Apr 2004 06:24:04 -0700 (PDT) (envelope-from cvance@nailabs.com) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i3UDO4Ge033482 for ; Fri, 30 Apr 2004 06:24:04 -0700 (PDT) (envelope-from cvance@nailabs.com) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i3UDO4Zq033479 for perforce@freebsd.org; Fri, 30 Apr 2004 06:24:04 -0700 (PDT) (envelope-from cvance@nailabs.com) Date: Fri, 30 Apr 2004 06:24:04 -0700 (PDT) Message-Id: <200404301324.i3UDO4Zq033479@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to cvance@nailabs.com using -f From: Chris Vance To: Perforce Change Reviews Subject: PERFORCE change 51968 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 30 Apr 2004 13:24:05 -0000 http://perforce.freebsd.org/chv.cgi?CH=51968 Change 51968 by cvance@cvance_osx_laptop on 2004/04/30 06:23:43 Allow the libkern header file to be installed (and available to other bits of the kernel) Affected files ... .. //depot/projects/trustedbsd/sedarwin73/apsl/xnu/bsd/sys/Makefile#4 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin73/apsl/xnu/bsd/sys/Makefile#4 (text+ko) ==== @@ -25,7 +25,7 @@ buf.h callout.h cdefs.h clist.h conf.h \ dir.h dirent.h disk.h disklabel.h disktab.h dkstat.h dmap.h domain.h \ errno.h ev.h event.h exec.h extattr.h fcntl.h file.h filedesc.h filio.h gmon.h ioccom.h ioctl.h \ - ioctl_compat.h ipc.h kernel.h kern_event.h ktrace.h loadable_fs.h lock.h lockf.h mach_swapon.h malloc.h \ + ioctl_compat.h ipc.h kernel.h kern_event.h ktrace.h libkern.h loadable_fs.h lock.h lockf.h mach_swapon.h malloc.h \ kdebug.h linker_set.h md5.h kern_control.h \ mac.h mac_policy.h \ mbuf.h mman.h mount.h msgbuf.h mtio.h namei.h netport.h param.h paths.h \ From owner-p4-projects@FreeBSD.ORG Fri Apr 30 06:36:20 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3704816A4D0; Fri, 30 Apr 2004 06:36:20 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 1172016A4CE for ; Fri, 30 Apr 2004 06:36:20 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 07CFE43D49 for ; Fri, 30 Apr 2004 06:36:20 -0700 (PDT) (envelope-from cvance@nailabs.com) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i3UDaJGe035673 for ; Fri, 30 Apr 2004 06:36:19 -0700 (PDT) (envelope-from cvance@nailabs.com) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i3UDaJ65035670 for perforce@freebsd.org; Fri, 30 Apr 2004 06:36:19 -0700 (PDT) (envelope-from cvance@nailabs.com) Date: Fri, 30 Apr 2004 06:36:19 -0700 (PDT) Message-Id: <200404301336.i3UDaJ65035670@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to cvance@nailabs.com using -f From: Chris Vance To: Perforce Change Reviews Subject: PERFORCE change 51969 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 30 Apr 2004 13:36:21 -0000 http://perforce.freebsd.org/chv.cgi?CH=51969 Change 51969 by cvance@cvance_osx_laptop on 2004/04/30 06:35:49 Darwin has no image_params structure, so this entry point isn't implemented. Affected files ... .. //depot/projects/trustedbsd/sedarwin73/apsl/xnu/bsd/sys/mac.h#3 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin73/apsl/xnu/bsd/sys/mac.h#3 (text+ko) ==== @@ -229,7 +229,9 @@ void mac_create_cred(struct ucred *cred_parent, struct ucred *cred_child); int mac_execve_enter(struct mac *mac_p, struct label *execlabel); -void mac_execve_exit(struct image_params *imgp); +#if 0 +void mac_execve_exit(struct image_params *imgp); +#endif /* 0 */ void mac_execve_transition(struct ucred *old, struct ucred *new, struct vnode *vp, struct label *scriptvnodelabel, struct label *execlabel); From owner-p4-projects@FreeBSD.ORG Fri Apr 30 06:42:28 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B4FD416A4D0; Fri, 30 Apr 2004 06:42:28 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 7419B16A4CE for ; Fri, 30 Apr 2004 06:42:28 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4A5AB43D45 for ; Fri, 30 Apr 2004 06:42:28 -0700 (PDT) (envelope-from cvance@nailabs.com) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i3UDgSGe037525 for ; Fri, 30 Apr 2004 06:42:28 -0700 (PDT) (envelope-from cvance@nailabs.com) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i3UDgROb037522 for perforce@freebsd.org; Fri, 30 Apr 2004 06:42:27 -0700 (PDT) (envelope-from cvance@nailabs.com) Date: Fri, 30 Apr 2004 06:42:27 -0700 (PDT) Message-Id: <200404301342.i3UDgROb037522@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to cvance@nailabs.com using -f From: Chris Vance To: Perforce Change Reviews Subject: PERFORCE change 51970 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 30 Apr 2004 13:42:29 -0000 http://perforce.freebsd.org/chv.cgi?CH=51970 Change 51970 by cvance@cvance_osx_laptop on 2004/04/30 06:42:11 Link in a nearly empty mac_mls policy. The module builds, the kernel boots, and the module is initialized. However, the module doesn't yet implement any entry points (other than init and destroy) Affected files ... .. //depot/projects/trustedbsd/sedarwin73/apsl/xnu/security/Makefile#3 edit .. //depot/projects/trustedbsd/sedarwin73/apsl/xnu/security/conf/files#3 edit .. //depot/projects/trustedbsd/sedarwin73/apsl/xnu/security/mac_base.c#2 edit .. //depot/projects/trustedbsd/sedarwin73/apsl/xnu/security/mac_mls/Makefile#1 add .. //depot/projects/trustedbsd/sedarwin73/apsl/xnu/security/mac_mls/mac_mls.c#2 edit .. //depot/projects/trustedbsd/sedarwin73/apsl/xnu/security/mac_mls/mac_mls.h#2 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin73/apsl/xnu/security/Makefile#3 (text+ko) ==== @@ -8,12 +8,16 @@ include $(MakeInc_def) INSTINC_SUBDIRS = \ + mac_mls \ + mac_test \ sebsd INSTINC_SUBDIRS_PPC = ${INSTINC_SUBDIRS} INSTINC_SUBDIRS_I386 = ${INSTINC_SUBDIRS} EXPINC_SUBDIRS = \ + mac_mls \ + mac_test \ sebsd EXPINC_SUBDIRS_PPC = ${EXPINC_SUBDIRS} ==== //depot/projects/trustedbsd/sedarwin73/apsl/xnu/security/conf/files#3 (text+ko) ==== @@ -13,6 +13,7 @@ security/mac_socket.c standard security/mac_network.c standard security/mac_test/mac_test.c standard +security/mac_mls/mac_mls.c standard security/sebsd/sebsd.c standard security/sebsd/sebsd_syscall.c standard security/sebsd/sebsd_sysctl.c standard ==== //depot/projects/trustedbsd/sedarwin73/apsl/xnu/security/mac_base.c#2 (text+ko) ==== @@ -308,6 +308,7 @@ { extern struct mac_policy_conf test_mac_policy_conf; extern struct mac_policy_conf sebsd_mac_policy_conf; + extern struct mac_policy_conf mac_mls_mac_policy_conf; printf("MAC: init mac_test\n"); mac_policy_register(&test_mac_policy_conf); @@ -315,6 +316,9 @@ printf("MAC: init sebsd\n"); mac_policy_register(&sebsd_mac_policy_conf); + printf("MAC: init MAC/MLS\n"); + mac_policy_register(&mac_mls_mac_policy_conf); + mac_late = 1; } ==== //depot/projects/trustedbsd/sedarwin73/apsl/xnu/security/mac_mls/mac_mls.c#2 (text+ko) ==== @@ -41,25 +41,25 @@ #include #include -#include +#include #include -#include #include #include #include +#include #include #include #include #include -#include -#include -#include #include -#include +#include +#include +#include + +#if 0 #include #include #include -#include #include #include #include @@ -76,13 +76,23 @@ #include #include +#endif /* 0 */ -#include +#include +#include +#include +#include #include #include +#ifdef APPLE +#define TUNABLE_INT(x, y) +#define atomic_add_int(P, V) (*(u_int*)(P) += (V)) +#define atomic_subtract_int(P, V) (*(u_int*)(P) -= (V)) +#endif + SYSCTL_DECL(_security_mac); SYSCTL_NODE(_security_mac, OID_AUTO, mls, CTLFLAG_RW, 0, @@ -116,10 +126,9 @@ &max_compartments, 0, "Maximum compartments the policy supports"); static int mac_mls_slot; + #define SLOT(l) ((struct mac_mls *)LABEL_TO_SLOT((l), mac_mls_slot).l_ptr) -MALLOC_DEFINE(M_MACMLS, "mls label", "MAC/MLS labels"); - static __inline int mls_bit_set_empty(u_char *set) { int i; @@ -135,7 +144,8 @@ { struct mac_mls *mac_mls; - mac_mls = malloc(sizeof(struct mac_mls), M_MACMLS, M_ZERO | flag); + mac_mls = (struct mac_mls *)kalloc(sizeof(struct mac_mls)); + bzero(mac_mls, sizeof(struct mac_mls)); return (mac_mls); } @@ -145,7 +155,7 @@ { if (mac_mls != NULL) - free(mac_mls, M_MACMLS); + kfree((vm_offset_t)mac_mls, sizeof(struct mac_mls)); else atomic_add_int(&destroyed_not_inited, 1); } @@ -469,6 +479,7 @@ mac_mls_init(struct mac_policy_conf *conf) { + printf("MAC MLS policy is initialized!\n"); } /* @@ -590,6 +601,8 @@ panic("mac_mls_element_to_string: invalid type (%d)", element->mme_type); } + + return (-1); /* Unreachable */ } /* @@ -821,6 +834,7 @@ *SLOT(dest) = *SLOT(src); } +#if Big_Zero /* * Labeling event operations: file system objects, and things that look * a lot like file system objects. @@ -2358,6 +2372,7 @@ return (0); } +#if 0 static int mac_mls_check_vnode_exec(struct ucred *cred, struct vnode *vp, struct label *label, struct image_params *imgp, @@ -2389,6 +2404,7 @@ return (0); } +#endif /* 0 */ static int mac_mls_check_vnode_getacl(struct ucred *cred, struct vnode *vp, @@ -2877,7 +2893,15 @@ return (0); } +#endif /* Big_Zero */ + +static struct mac_policy_ops mac_mls_ops = +{ + .mpo_destroy = mac_mls_destroy, + .mpo_init = mac_mls_init, +}; +#if 0 static struct mac_policy_ops mac_mls_ops = { .mpo_destroy = mac_mls_destroy, @@ -3049,6 +3073,18 @@ .mpo_check_vnode_stat = mac_mls_check_vnode_stat, .mpo_check_vnode_write = mac_mls_check_vnode_write, }; +#endif /* 0 */ +#if 0 MAC_POLICY_SET(&mac_mls_ops, mac_mls, "TrustedBSD MAC/MLS", MPC_LOADTIME_FLAG_NOTLATE | MPC_LOADTIME_FLAG_LABELMBUFS, &mac_mls_slot); +#endif /* 0 */ + +struct mac_policy_conf mac_mls_mac_policy_conf = { + "mac_mls", /* policy name */ + "TrustedBSD MAC/MLS", /* full name */ + &mac_mls_ops, /* policy operations */ + 0, /* loadtime flags*/ + &mac_mls_slot, /* security field */ + 0 /* runtime flags */ +}; ==== //depot/projects/trustedbsd/sedarwin73/apsl/xnu/security/mac_mls/mac_mls.h#2 (text+ko) ==== From owner-p4-projects@FreeBSD.ORG Fri Apr 30 19:23:51 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7DA0616A4D0; Fri, 30 Apr 2004 19:23:51 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4EA4716A4CE for ; Fri, 30 Apr 2004 19:23:51 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8FA4E43D54 for ; Fri, 30 Apr 2004 19:23:50 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i412NoGe024641 for ; Fri, 30 Apr 2004 19:23:50 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i412NnUq024638 for perforce@freebsd.org; Fri, 30 Apr 2004 19:23:49 -0700 (PDT) (envelope-from marcel@freebsd.org) Date: Fri, 30 Apr 2004 19:23:49 -0700 (PDT) Message-Id: <200405010223.i412NnUq024638@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 52017 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 01 May 2004 02:23:52 -0000 http://perforce.freebsd.org/chv.cgi?CH=52017 Change 52017 by marcel@marcel_nfs on 2004/04/30 19:22:53 IFC @52014 Affected files ... .. //depot/projects/gdb/contrib/patch/COPYING#2 delete .. //depot/projects/gdb/contrib/patch/ChangeLog#2 delete .. //depot/projects/gdb/contrib/patch/FREEBSD-upgrade#2 delete .. //depot/projects/gdb/contrib/patch/INSTALL#2 delete .. //depot/projects/gdb/contrib/patch/Makefile.in#2 delete .. //depot/projects/gdb/contrib/patch/NEWS#2 delete .. //depot/projects/gdb/contrib/patch/README#2 delete .. //depot/projects/gdb/contrib/patch/acconfig.h#2 delete .. //depot/projects/gdb/contrib/patch/addext.c#2 delete .. //depot/projects/gdb/contrib/patch/argmatch.c#2 delete .. //depot/projects/gdb/contrib/patch/argmatch.h#2 delete .. //depot/projects/gdb/contrib/patch/backupfile.c#2 delete .. //depot/projects/gdb/contrib/patch/backupfile.h#2 delete .. //depot/projects/gdb/contrib/patch/basename.c#2 delete .. //depot/projects/gdb/contrib/patch/common.h#2 delete .. //depot/projects/gdb/contrib/patch/config.hin#2 delete .. //depot/projects/gdb/contrib/patch/configure#2 delete .. //depot/projects/gdb/contrib/patch/configure.in#2 delete .. //depot/projects/gdb/contrib/patch/getopt.c#2 delete .. //depot/projects/gdb/contrib/patch/getopt.h#2 delete .. //depot/projects/gdb/contrib/patch/getopt1.c#2 delete .. //depot/projects/gdb/contrib/patch/inp.c#2 delete .. //depot/projects/gdb/contrib/patch/inp.h#2 delete .. //depot/projects/gdb/contrib/patch/install-sh#2 delete .. //depot/projects/gdb/contrib/patch/maketime.c#2 delete .. //depot/projects/gdb/contrib/patch/maketime.h#2 delete .. //depot/projects/gdb/contrib/patch/partime.c#2 delete .. //depot/projects/gdb/contrib/patch/partime.h#2 delete .. //depot/projects/gdb/contrib/patch/patch.1#2 delete .. //depot/projects/gdb/contrib/patch/patch.c#2 delete .. //depot/projects/gdb/contrib/patch/pch.c#2 delete .. //depot/projects/gdb/contrib/patch/pch.h#2 delete .. //depot/projects/gdb/contrib/patch/quotearg.c#2 delete .. //depot/projects/gdb/contrib/patch/quotearg.h#2 delete .. //depot/projects/gdb/contrib/patch/util.c#2 delete .. //depot/projects/gdb/contrib/patch/util.h#2 delete .. //depot/projects/gdb/contrib/patch/version.c#2 delete .. //depot/projects/gdb/contrib/patch/version.h#2 delete .. //depot/projects/gdb/etc/mtree/BSD.include.dist#4 integrate .. //depot/projects/gdb/include/Makefile#4 integrate .. //depot/projects/gdb/lib/libarchive/archive_read_extract.c#9 integrate .. //depot/projects/gdb/release/Makefile#4 integrate .. //depot/projects/gdb/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#14 integrate .. //depot/projects/gdb/sbin/ggate/Makefile#1 branch .. //depot/projects/gdb/sbin/ggate/ggatec/Makefile#1 branch .. //depot/projects/gdb/sbin/ggate/ggatec/ggatec.8#1 branch .. //depot/projects/gdb/sbin/ggate/ggatec/ggatec.c#1 branch .. //depot/projects/gdb/sbin/ggate/ggated/Makefile#1 branch .. //depot/projects/gdb/sbin/ggate/ggated/ggated.8#1 branch .. //depot/projects/gdb/sbin/ggate/ggated/ggated.c#1 branch .. //depot/projects/gdb/sbin/ggate/ggatel/Makefile#1 branch .. //depot/projects/gdb/sbin/ggate/ggatel/ggatel.8#1 branch .. //depot/projects/gdb/sbin/ggate/ggatel/ggatel.c#1 branch .. //depot/projects/gdb/sbin/ggate/shared/ggate.c#1 branch .. //depot/projects/gdb/sbin/ggate/shared/ggate.h#1 branch .. //depot/projects/gdb/sbin/ifconfig/ifconfig.c#10 integrate .. //depot/projects/gdb/sbin/route/route.c#4 integrate .. //depot/projects/gdb/share/man/man4/sio.4#2 integrate .. //depot/projects/gdb/share/man/man7/release.7#3 integrate .. //depot/projects/gdb/sys/compat/ndis/subr_ntoskrnl.c#12 integrate .. //depot/projects/gdb/sys/conf/NOTES#18 integrate .. //depot/projects/gdb/sys/conf/files#20 integrate .. //depot/projects/gdb/sys/conf/files.sparc64#4 integrate .. //depot/projects/gdb/sys/conf/options#17 integrate .. //depot/projects/gdb/sys/conf/options.sparc64#2 integrate .. //depot/projects/gdb/sys/dev/asr/asr.c#5 integrate .. //depot/projects/gdb/sys/dev/ata/ata-all.c#6 integrate .. //depot/projects/gdb/sys/dev/ata/ata-all.h#6 integrate .. //depot/projects/gdb/sys/dev/ata/ata-commands.h#2 integrate .. //depot/projects/gdb/sys/dev/ata/ata-disk.h#3 integrate .. //depot/projects/gdb/sys/dev/ata/ata-isa.c#3 integrate .. //depot/projects/gdb/sys/dev/ata/ata-lowlevel.c#8 integrate .. //depot/projects/gdb/sys/dev/ata/ata-pci.c#8 integrate .. //depot/projects/gdb/sys/dev/ata/ata-pci.h#7 integrate .. //depot/projects/gdb/sys/dev/ata/ata-queue.c#6 integrate .. //depot/projects/gdb/sys/dev/ata/atapi-cd.h#2 integrate .. //depot/projects/gdb/sys/dev/ata/atapi-fd.h#3 integrate .. //depot/projects/gdb/sys/dev/ata/atapi-tape.h#2 integrate .. //depot/projects/gdb/sys/dev/if_ndis/if_ndis.c#14 integrate .. //depot/projects/gdb/sys/dev/sio/sio.c#8 integrate .. //depot/projects/gdb/sys/dev/sio/sio_ebus.c#2 delete .. //depot/projects/gdb/sys/geom/gate/g_gate.c#1 branch .. //depot/projects/gdb/sys/geom/gate/g_gate.h#1 branch .. //depot/projects/gdb/sys/geom/geom_gpt.c#3 integrate .. //depot/projects/gdb/sys/kern/link_elf_obj.c#1 branch .. //depot/projects/gdb/sys/modules/geom/geom_gate/Makefile#1 branch .. //depot/projects/gdb/sys/modules/sio/Makefile#2 integrate .. //depot/projects/gdb/sys/sparc64/conf/GENERIC#3 integrate .. //depot/projects/gdb/sys/sparc64/conf/NOTES#2 integrate .. //depot/projects/gdb/sys/sparc64/ebus/ebus.c#4 integrate .. //depot/projects/gdb/sys/sparc64/include/nexusvar.h#2 integrate .. //depot/projects/gdb/sys/sparc64/sparc64/identcpu.c#2 integrate .. //depot/projects/gdb/sys/sparc64/sparc64/nexus.c#2 integrate .. //depot/projects/gdb/usr.bin/du/du.c#2 integrate Differences ... ==== //depot/projects/gdb/etc/mtree/BSD.include.dist#4 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/mtree/BSD.include.dist,v 1.80 2004/02/25 02:51:37 ache Exp $ +# $FreeBSD: src/etc/mtree/BSD.include.dist,v 1.81 2004/04/30 16:21:39 pjd Exp $ # # Please see the file src/etc/mtree/README before making changes to this file. # @@ -78,6 +78,10 @@ .. .. geom + concat + .. + gate + .. .. gnu posix ==== //depot/projects/gdb/include/Makefile#4 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.2 (Berkeley) 1/4/94 -# $FreeBSD: src/include/Makefile,v 1.211 2004/02/28 21:50:48 mlaier Exp $ +# $FreeBSD: src/include/Makefile,v 1.212 2004/04/30 16:23:08 pjd Exp $ # # Doing a "make install" builds /usr/include. @@ -34,8 +34,9 @@ LSUBDIRS= cam/scsi dev/an dev/bktr dev/firewire dev/ic dev/iicbus \ dev/ofw dev/ppbus dev/smbus dev/usb dev/wi dev/utopia fs/devfs \ fs/fdescfs fs/fifofs fs/msdosfs fs/ntfs fs/nullfs fs/nwfs fs/portalfs \ - fs/procfs fs/smbfs fs/udf fs/umapfs fs/unionfs isofs/cd9660 \ - netatm/ipatm netatm/sigpvc netatm/spans netatm/uni \ + fs/procfs fs/smbfs fs/udf fs/umapfs fs/unionfs \ + geom/concat geom/gate \ + isofs/cd9660 netatm/ipatm netatm/sigpvc netatm/spans netatm/uni \ netgraph/atm security/mac_biba security/mac_bsdextended \ security/mac_lomac security/mac_mls security/mac_partition \ ufs/ffs ufs/ufs ==== //depot/projects/gdb/lib/libarchive/archive_read_extract.c#9 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_extract.c,v 1.10 2004/04/29 05:19:42 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_extract.c,v 1.11 2004/04/30 01:31:20 kientzle Exp $"); #include #include @@ -487,6 +487,13 @@ archive_read_extract_hard_link(struct archive *a, struct archive_entry *entry, int flags) { + int r; + const char *pathname; + const char *linkname; + + pathname = archive_entry_pathname(entry); + linkname = archive_entry_hardlink(entry); + /* * XXX Should we suppress the unlink here unless * ARCHIVE_EXTRACT_UNLINK? That would make the @@ -497,11 +504,20 @@ /* Just remove any pre-existing file with this name. */ if (!(flags & ARCHIVE_EXTRACT_NO_OVERWRITE)) - unlink(archive_entry_pathname(entry)); + unlink(pathname); + + r = link(linkname, pathname); + + if (r != 0) { + /* Might be a non-existent parent dir; try fixing that. */ + mkdirpath(a, pathname); + r = link(linkname, pathname); + } - if (link(archive_entry_hardlink(entry), - archive_entry_pathname(entry))) { - archive_set_error(a, errno, "Can't restore hardlink"); + if (r != 0) { + /* XXX Better error message here XXX */ + archive_set_error(a, errno, + "Can't restore hardlink to '%s'", linkname); return (ARCHIVE_WARN); } @@ -518,6 +534,13 @@ archive_read_extract_symbolic_link(struct archive *a, struct archive_entry *entry, int flags) { + int r; + const char *pathname; + const char *linkname; + + pathname = archive_entry_pathname(entry); + linkname = archive_entry_symlink(entry); + /* * XXX Should we suppress the unlink here unless * ARCHIVE_EXTRACT_UNLINK? That would make the @@ -528,13 +551,20 @@ /* Just remove any pre-existing file with this name. */ if (!(flags & ARCHIVE_EXTRACT_NO_OVERWRITE)) - unlink(archive_entry_pathname(entry)); + unlink(pathname); + + r = symlink(linkname, pathname); + + if (r != 0) { + /* Might be a non-existent parent dir; try fixing that. */ + mkdirpath(a, pathname); + r = symlink(linkname, pathname); + } - if (symlink(archive_entry_symlink(entry), - archive_entry_pathname(entry))) { + if (r != 0) { /* XXX Better error message here XXX */ - archive_set_error(a, errno, "Can't restore symlink to '%s'", - archive_entry_symlink(entry)); + archive_set_error(a, errno, + "Can't restore symlink to '%s'", linkname); return (ARCHIVE_WARN); } ==== //depot/projects/gdb/release/Makefile#4 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/release/Makefile,v 1.842 2004/03/25 20:37:59 jhb Exp $ +# $FreeBSD: src/release/Makefile,v 1.843 2004/04/30 13:52:09 kensmith Exp $ # # make release [BUILDNAME=somename] CHROOTDIR=/some/dir CVSROOT=/cvs/dir \ # [RELEASETAG=tag] @@ -115,6 +115,12 @@ RELEASEPORTSMODULE= ${MINIMALDOCPORTS} .endif +# Make changing names of disc1/disc2 CD's possible. +DISC1_LABEL?= fbsd_miniinst +DISC1_NAME?= miniinst +DISC2_LABEL?= fbsd_livefs +DISC2_NAME?= disc2 + # Helper variable .if defined(NOPORTS) .if !defined(DOMINIMALDOCPORTS) || ${DOMINIMALDOCPORTS} != "YES" @@ -416,6 +422,10 @@ BOOT_CONFIG \ BUILDNAME \ CD_EXTRA_BITS \ + DISC1_LABEL \ + DISC1_NAME \ + DISC2_LABEL \ + DISC2_NAME \ DISTRIBUTIONS \ DOC_LANG \ DOMINIMALDOCPORTS \ @@ -925,11 +935,11 @@ ${CD}/${BUILDNAME}-${TARGET}-bootonly.iso ${CD_BOOT} .endif @sh ${.CURDIR}/${TARGET_ARCH}/mkisoimages.sh ${BOOTABLE} \ - fbsd_miniinst \ - ${CD}/${BUILDNAME}-${TARGET}-miniinst.iso ${CD_DISC1} + ${DISC1_LABEL} \ + ${CD}/${BUILDNAME}-${TARGET}-${DISC1_NAME}.iso ${CD_DISC1} @sh ${.CURDIR}/${TARGET_ARCH}/mkisoimages.sh ${BOOTABLE} \ - fbsd_livefs \ - ${CD}/${BUILDNAME}-${TARGET}-disc2.iso ${CD_DISC2} + ${DISC2_LABEL} \ + ${CD}/${BUILDNAME}-${TARGET}-${DISC2_NAME}.iso ${CD_DISC2} .if defined(CD_EXTRA_BITS) @sh ${.CURDIR}/${TARGET_ARCH}/mkisoimages.sh ${BOOTABLE} \ fbsd_boot \ ==== //depot/projects/gdb/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#14 (text+ko) ==== @@ -3,7 +3,7 @@ The FreeBSD Project - $FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml,v 1.721 2004/04/24 17:30:32 hrs Exp $ + $FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml,v 1.722 2004/04/30 11:52:34 hrs Exp $ 2000 @@ -220,9 +220,16 @@ The &man.getvfsent.3; API has been removed. + &man.jail.8; now supports use of raw sockets from within a jail. + This feature is disabled by default, and controlled using the + security.jail.allow_raw_sockets sysctl. + The loran (Loran-C receiver) driver has been removed due to breakage and lack of maintainership. + A bug in &man.mmap.2; that pages marked as PROT_NONE + may become readable under certain circumstances, has been fixed. &merged; + The raid(4), RAIDframe disk driver from NetBSD has been removed. This is currently non-functional, and would require some amount of work to make it work under the &man.geom.4; API in 5-CURRENT. @@ -467,6 +474,10 @@ support for the TCP-MD5 class of security associations. &merged; + The TCP connection reset handling has been improved to + make several reset attacks as difficult as possible while + maintaining compatibility with the widest range of TCP stacks. + The implementation of RFC 1948 has been improved. The time offset component of an ISN now includes random positive increments between clock ticks so that ISNs will always @@ -720,7 +731,8 @@ accepts an encrypted password on a file descriptor. &merged; A bug in &man.rarpd.8; that prevents it from working properly - when a interface has more than one IP address has been fixed. + when a interface has more than one IP address has been fixed. + &merged; The configuration files used by the &man.resolver.3; now support the timeout: and @@ -828,6 +840,10 @@ libpcap has been updated from version 0.7.1 to version 0.8.3. + lukemftp + has been updated from a snapshot as of + November 3, 2003 to one as of April 26, 2004. + OpenPAM has been updated from the Dogwood release to the Eelgrass release. ==== //depot/projects/gdb/sbin/ifconfig/ifconfig.c#10 (text+ko) ==== @@ -38,7 +38,7 @@ static char sccsid[] = "@(#)ifconfig.c 8.2 (Berkeley) 2/16/94"; #endif static const char rcsid[] = - "$FreeBSD: src/sbin/ifconfig/ifconfig.c,v 1.103 2004/04/13 11:23:12 luigi Exp $"; + "$FreeBSD: src/sbin/ifconfig/ifconfig.c,v 1.104 2004/04/30 22:34:12 ambrisko Exp $"; #endif /* not lint */ #include @@ -417,7 +417,7 @@ { int c; int all, namesonly, downonly, uponly; - int need_nl = 0; + int need_nl = 0, count = 0; const struct afswtch *afp = 0; int addrcount, ifindex; struct if_msghdr *ifm, *nextifm; @@ -543,6 +543,7 @@ afp = NULL; /* not a family, NULL */ } +retry: mib[0] = CTL_NET; mib[1] = PF_ROUTE; mib[2] = 0; @@ -558,8 +559,15 @@ errx(1, "iflist-sysctl-estimate"); if ((buf = malloc(needed)) == NULL) errx(1, "malloc"); - if (sysctl(mib, 6, buf, &needed, NULL, 0) < 0) + if (sysctl(mib, 6, buf, &needed, NULL, 0) < 0) { + if (errno == ENOMEM && count++ < 10) { + warnx("Routing table grew, retrying"); + free(buf); + sleep(1); + goto retry; + } errx(1, "actual retrieval of interface table"); + } lim = buf + needed; next = buf; ==== //depot/projects/gdb/sbin/route/route.c#4 (text+ko) ==== @@ -38,7 +38,7 @@ static char sccsid[] = "@(#)route.c 8.6 (Berkeley) 4/28/95"; #endif static const char rcsid[] = - "$FreeBSD: src/sbin/route/route.c,v 1.72 2004/04/13 11:23:13 luigi Exp $"; + "$FreeBSD: src/sbin/route/route.c,v 1.73 2004/04/30 22:34:12 ambrisko Exp $"; #endif /* not lint */ #include @@ -201,7 +201,7 @@ char *argv[]; { size_t needed; - int mib[6], rlen, seqno; + int mib[6], rlen, seqno, count = 0; char *buf, *next, *lim; struct rt_msghdr *rtm; @@ -232,6 +232,7 @@ } else bad: usage(*argv); } +retry: mib[0] = CTL_NET; mib[1] = PF_ROUTE; mib[2] = 0; /* protocol */ @@ -242,8 +243,15 @@ err(EX_OSERR, "route-sysctl-estimate"); if ((buf = malloc(needed)) == NULL) errx(EX_OSERR, "malloc failed"); - if (sysctl(mib, 6, buf, &needed, NULL, 0) < 0) + if (sysctl(mib, 6, buf, &needed, NULL, 0) < 0) { + if (errno == ENOMEM && count++ < 10) { + warnx("Routing table grew, retrying"); + sleep(1); + free(buf); + goto retry; + } err(EX_OSERR, "route-sysctl-get"); + } lim = buf + needed; if (verbose) (void) printf("Examining routing table from sysctl\n"); @@ -268,6 +276,8 @@ if (rlen < (int)rtm->rtm_msglen) { warn("write to routing socket"); (void) printf("got only %d for rlen\n", rlen); + free(buf); + goto retry; break; } seqno++; @@ -1105,9 +1115,10 @@ { size_t needed; int mib[6]; - char *buf, *lim, *next; + char *buf, *lim, *next, count = 0; struct rt_msghdr *rtm; +retry2: mib[0] = CTL_NET; mib[1] = PF_ROUTE; mib[2] = 0; /* protocol */ @@ -1118,8 +1129,15 @@ err(EX_OSERR, "route-sysctl-estimate"); if ((buf = malloc(needed)) == NULL) errx(EX_OSERR, "malloc failed"); - if (sysctl(mib, 6, buf, &needed, NULL, 0) < 0) + if (sysctl(mib, 6, buf, &needed, NULL, 0) < 0) { + if (errno == ENOMEM && count++ < 10) { + warnx("Routing table grew, retrying"); + sleep(1); + free(buf); + goto retry2; + } err(EX_OSERR, "actual retrieval of interface table"); + } lim = buf + needed; for (next = buf; next < lim; next += rtm->rtm_msglen) { rtm = (struct rt_msghdr *)next; ==== //depot/projects/gdb/share/man/man4/sio.4#2 (text+ko) ==== @@ -34,7 +34,7 @@ .\" .\" from: @(#)dca.4 5.2 (Berkeley) 3/27/91 .\" from: com.4,v 1.1 1993/08/06 11:19:07 cgd Exp -.\" $FreeBSD: src/share/man/man4/sio.4,v 1.50 2003/06/28 23:53:37 ru Exp $ +.\" $FreeBSD: src/share/man/man4/sio.4,v 1.51 2004/04/30 21:16:52 ambrisko Exp $ .\" .Dd July 10, 2002 .Dt SIO 4 @@ -178,6 +178,8 @@ PPS timestamping on CTS instead of DCD .It 0x20000 device is assumed to use a 16650A-type (extended FIFO) chip +.It 0x400000 +If no comconsole found then mark as a comconsole .El .Pp Minor numbering: ==== //depot/projects/gdb/share/man/man7/release.7#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/share/man/man7/release.7,v 1.35 2004/01/28 21:07:36 jhb Exp $ +.\" $FreeBSD: src/share/man/man7/release.7,v 1.36 2004/04/30 13:52:09 kensmith Exp $ .\" .Dd March 12, 2002 .Dt RELEASE 7 @@ -283,6 +283,22 @@ .It Va MAKE_ISOS If defined, bootable ISO CD-ROM images will be created from the contents of the CD-ROM stage directory. +.It Va DISC1_LABEL +The label used for the CD-ROM created from the disc1 contents, the +default label will be +.Dq fbsd_miniinst . +.It Va DISC1_NAME +The name used as part of the ISO file name for the CD-ROM created from +the disc1 contents, the default will be +.Dq miniinst . +.It Va DISC2_LABEL +The label used for the CD-ROM created from the disc2 contents, the +default label will be +.Dq fbsd_livefs . +.It Va DISC2_NAME +The name used as part of the ISO file name for the CD-ROM created from +the disc2 contents, the default will be +.Dq disc2 . .It Va NOCDROM If defined, the CD-ROM stage directories will not be created. .It Va NODOC ==== //depot/projects/gdb/sys/compat/ndis/subr_ntoskrnl.c#12 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/ndis/subr_ntoskrnl.c,v 1.36 2004/04/18 18:38:59 wpaul Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/ndis/subr_ntoskrnl.c,v 1.37 2004/04/30 20:51:55 wpaul Exp $"); #include #include @@ -1641,7 +1641,11 @@ ktimer *timer; struct timeval tv; - timer = arg; + mtx_unlock(&Giant); + + timer = arg; + + timer->k_header.dh_inserted = FALSE; /* * If this is a periodic timer, re-arm it @@ -1655,6 +1659,7 @@ if (timer->k_period) { tv.tv_sec = 0; tv.tv_usec = timer->k_period * 1000; + timer->k_header.dh_inserted = TRUE; timer->k_handle = timeout(ntoskrnl_timercall, timer, tvtohz(&tv)); } @@ -1664,6 +1669,8 @@ ntoskrnl_wakeup(&timer->k_header); + mtx_lock(&Giant); + return; } @@ -1674,11 +1681,7 @@ if (timer == NULL) return; - INIT_LIST_HEAD((&timer->k_header.dh_waitlisthead)); - timer->k_header.dh_sigstate = FALSE; - timer->k_header.dh_type = EVENT_TYPE_NOTIFY; - timer->k_header.dh_size = OTYPE_TIMER; - callout_handle_init(&timer->k_handle); + ntoskrnl_init_timer_ex(timer, EVENT_TYPE_NOTIFY); return; } @@ -1693,6 +1696,7 @@ INIT_LIST_HEAD((&timer->k_header.dh_waitlisthead)); timer->k_header.dh_sigstate = FALSE; + timer->k_header.dh_inserted = FALSE; timer->k_header.dh_type = type; timer->k_header.dh_size = OTYPE_TIMER; callout_handle_init(&timer->k_handle); @@ -1776,9 +1780,9 @@ if (timer == NULL) return(FALSE); - if (timer->k_handle.callout != NULL && - callout_pending(timer->k_handle.callout)) { + if (timer->k_header.dh_inserted == TRUE) { untimeout(ntoskrnl_timercall, timer, timer->k_handle); + timer->k_header.dh_inserted = FALSE; pending = TRUE; } else pending = FALSE; @@ -1803,6 +1807,7 @@ } } + timer->k_header.dh_inserted = TRUE; timer->k_handle = timeout(ntoskrnl_timercall, timer, tvtohz(&tv)); return(pending); @@ -1826,13 +1831,14 @@ if (timer == NULL) return(FALSE); - if (timer->k_handle.callout != NULL && - callout_pending(timer->k_handle.callout)) + if (timer->k_header.dh_inserted == TRUE) { + untimeout(ntoskrnl_timercall, timer, timer->k_handle); + if (timer->k_dpc != NULL) + ntoskrnl_dequeue_dpc(timer->k_dpc); pending = TRUE; - else + } else pending = FALSE; - untimeout(ntoskrnl_timercall, timer, timer->k_handle); return(pending); } @@ -1841,18 +1847,7 @@ ntoskrnl_read_timer(timer) ktimer *timer; { - uint8_t pending; - - if (timer == NULL) - return(FALSE); - - if (timer->k_handle.callout != NULL && - callout_pending(timer->k_handle.callout)) - pending = TRUE; - else - pending = FALSE; - - return(pending); + return(timer->k_header.dh_sigstate); } __stdcall static void ==== //depot/projects/gdb/sys/conf/NOTES#18 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/NOTES,v 1.1222 2004/04/27 16:38:12 emax Exp $ +# $FreeBSD: src/sys/conf/NOTES,v 1.1223 2004/04/30 21:16:51 ambrisko Exp $ # # NOTES -- Lines that can be cut/pasted into kernel and hints configs. # @@ -1459,6 +1459,8 @@ options COM_MULTIPORT # Code for some cards with shared IRQs. options CONSPEED=115200 # Speed for serial console # (default 9600). +options FORCECONSPEED # no matter what use CONSPEED for + # console. # `flags' specific to sio(4). See below for flags used by both sio(4) and # uart(4). ==== //depot/projects/gdb/sys/conf/files#20 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.890 2004/04/24 22:03:02 rik Exp $ +# $FreeBSD: src/sys/conf/files,v 1.891 2004/04/30 17:25:47 tmm Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -630,7 +630,6 @@ dev/si/si_eisa.c optional si eisa dev/si/si_isa.c optional si isa dev/si/si_pci.c optional si pci -dev/sio/sio_ebus.c optional sio ebus dev/sio/sio_pccard.c optional sio card dev/sio/sio_pccard.c optional sio pccard dev/sio/sio_pci.c optional sio pci ==== //depot/projects/gdb/sys/conf/files.sparc64#4 (text+ko) ==== @@ -1,7 +1,7 @@ # This file tells config what files go into building a kernel, # files marked standard are always included. # -# $FreeBSD: src/sys/conf/files.sparc64,v 1.51 2004/03/22 08:08:25 alc Exp $ +# $FreeBSD: src/sys/conf/files.sparc64,v 1.52 2004/04/30 15:00:40 marius Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -52,7 +52,7 @@ sparc64/isa/isa.c optional isa sparc64/isa/ofw_isa.c optional ebus sparc64/isa/ofw_isa.c optional isa -sparc64/pci/apb.c optional apb +sparc64/pci/apb.c optional pci sparc64/pci/ofw_pci.c optional pci sparc64/pci/ofw_pcib.c optional pci ofw_newpci sparc64/pci/ofw_pcib_subr.c optional pci ofw_newpci ==== //depot/projects/gdb/sys/conf/options#17 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/options,v 1.445 2004/04/27 16:38:13 emax Exp $ +# $FreeBSD: src/sys/conf/options,v 1.446 2004/04/30 21:16:51 ambrisko Exp $ # # On the handling of kernel options # @@ -521,6 +521,7 @@ # options for serial support COM_ESP opt_sio.h COM_MULTIPORT opt_sio.h +FORCECONSPEED opt_sio.h BREAK_TO_DEBUGGER opt_comconsole.h ALT_BREAK_TO_DEBUGGER opt_comconsole.h ==== //depot/projects/gdb/sys/conf/options.sparc64#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/options.sparc64,v 1.8 2003/08/24 01:54:06 jake Exp $ +# $FreeBSD: src/sys/conf/options.sparc64,v 1.9 2004/04/30 15:21:25 tmm Exp $ SUN4U opt_global.h @@ -6,13 +6,10 @@ GFB_NO_FONT_LOADING opt_gfb.h GFB_NO_MODE_CHANGE opt_gfb.h -EBUS_DEBUG opt_ebus.h PSYCHO_DEBUG opt_psycho.h DEBUGGER_ON_POWERFAIL opt_psycho.h OFW_PCI_DEBUG opt_ofw_pci.h OFW_NEWPCI opt_ofw_pci.h -# Normal IOMMU debugging -IOMMU_DEBUG opt_iommu.h # Debug IOMMU inserts/removes using diagnostic accesses. Very loud. IOMMU_DIAG opt_iommu.h PMAP_STATS opt_pmap.h ==== //depot/projects/gdb/sys/dev/asr/asr.c#5 (text+ko) ==== @@ -105,7 +105,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/asr/asr.c,v 1.47 2004/04/22 02:22:18 njl Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/asr/asr.c,v 1.48 2004/05/01 01:25:05 scottl Exp $"); #define ASR_VERSION 1 #define ASR_REVISION '0' @@ -247,19 +247,6 @@ #include #include -#define STATIC static -#define INLINE - -#if (defined(DEBUG_ASR) && (DEBUG_ASR > 0)) -#undef STATIC -#define STATIC -#undef INLINE -#define INLINE -#endif -#define IN -#define OUT -#define INOUT - #define osdSwap4(x) ((u_long)ntohl((u_long)(x))) #define KVTOPHYS(x) vtophys(x) #include "dev/asr/dptalign.h" @@ -377,114 +364,95 @@ struct Asr_softc * ha_next; /* HBA list */ } Asr_softc_t; -STATIC Asr_softc_t * Asr_softc; +static Asr_softc_t * Asr_softc; /* * Prototypes of the routines we have in this object. */ /* Externally callable routines */ -#define PROBE_ARGS IN device_t tag +#define PROBE_ARGS device_t tag #define PROBE_RET int #define PROBE_SET() u_int32_t id = (pci_get_device(tag)<<16)|pci_get_vendor(tag) #define PROBE_RETURN(retval) if(retval){device_set_desc(tag,retval);return(0);}else{return(ENXIO);} -#define ATTACH_ARGS IN device_t tag +#define ATTACH_ARGS device_t tag #define ATTACH_RET int #define ATTACH_SET() int unit = device_get_unit(tag) #define ATTACH_RETURN(retval) return(retval) /* I2O HDM interface */ -STATIC PROBE_RET asr_probe(PROBE_ARGS); -STATIC ATTACH_RET asr_attach(ATTACH_ARGS); +static PROBE_RET asr_probe(PROBE_ARGS); +static ATTACH_RET asr_attach(ATTACH_ARGS); /* DOMINO placeholder */ -STATIC PROBE_RET domino_probe(PROBE_ARGS); -STATIC ATTACH_RET domino_attach(ATTACH_ARGS); +static PROBE_RET domino_probe(PROBE_ARGS); +static ATTACH_RET domino_attach(ATTACH_ARGS); /* MODE0 adapter placeholder */ -STATIC PROBE_RET mode0_probe(PROBE_ARGS); -STATIC ATTACH_RET mode0_attach(ATTACH_ARGS); +static PROBE_RET mode0_probe(PROBE_ARGS); +static ATTACH_RET mode0_attach(ATTACH_ARGS); -STATIC Asr_softc_t * ASR_get_sc( - IN dev_t dev); -STATIC int asr_ioctl( - IN dev_t dev, - IN u_long cmd, - INOUT caddr_t data, - int flag, - struct thread * td); -STATIC int asr_open( - IN dev_t dev, - int32_t flags, - int32_t ifmt, - IN struct thread * td); -STATIC int asr_close( - dev_t dev, - int flags, - int ifmt, - struct thread * td); -STATIC int asr_intr( - IN Asr_softc_t * sc); -STATIC void asr_timeout( - INOUT void * arg); -STATIC int ASR_init( - IN Asr_softc_t * sc); -STATIC INLINE int ASR_acquireLct( - INOUT Asr_softc_t * sc); -STATIC INLINE int ASR_acquireHrt( - INOUT Asr_softc_t * sc); -STATIC void asr_action( - IN struct cam_sim * sim, - IN union ccb * ccb); -STATIC void asr_poll( - IN struct cam_sim * sim); +static Asr_softc_t *ASR_get_sc(dev_t dev); +static int asr_ioctl(dev_t dev, u_long cmd, caddr_t data, int flag, + struct thread *td); +static int asr_open(dev_t dev, int32_t flags, int32_t ifmt, + struct thread *td); +static int asr_close(dev_t dev, int flags, int ifmt, struct thread *td); +static int asr_intr(Asr_softc_t *sc); +static void asr_timeout(void *arg); +static int ASR_init(Asr_softc_t *sc); +static int ASR_acquireLct(Asr_softc_t *sc); +static int ASR_acquireHrt(Asr_softc_t *sc); +static void asr_action(struct cam_sim *sim, union ccb *ccb); +static void asr_poll(struct cam_sim *sim); +static int ASR_queue(Asr_softc_t *sc, PI2O_MESSAGE_FRAME Message); /* * Here is the auto-probe structure used to nest our tests appropriately * during the startup phase of the operating system. */ -STATIC device_method_t asr_methods[] = { +static device_method_t asr_methods[] = { DEVMETHOD(device_probe, asr_probe), DEVMETHOD(device_attach, asr_attach), { 0, 0 } }; -STATIC driver_t asr_driver = { +static driver_t asr_driver = { "asr", asr_methods, sizeof(Asr_softc_t) }; -STATIC devclass_t asr_devclass; +static devclass_t asr_devclass; DRIVER_MODULE(asr, pci, asr_driver, asr_devclass, 0, 0); -STATIC device_method_t domino_methods[] = { +static device_method_t domino_methods[] = { DEVMETHOD(device_probe, domino_probe), DEVMETHOD(device_attach, domino_attach), { 0, 0 } }; -STATIC driver_t domino_driver = { +static driver_t domino_driver = { "domino", domino_methods, 0 }; -STATIC devclass_t domino_devclass; +static devclass_t domino_devclass; DRIVER_MODULE(domino, pci, domino_driver, domino_devclass, 0, 0); -STATIC device_method_t mode0_methods[] = { +static device_method_t mode0_methods[] = { DEVMETHOD(device_probe, mode0_probe), DEVMETHOD(device_attach, mode0_attach), { 0, 0 } }; -STATIC driver_t mode0_driver = { +static driver_t mode0_driver = { "mode0", mode0_methods, 0 }; -STATIC devclass_t mode0_devclass; +static devclass_t mode0_devclass; DRIVER_MODULE(mode0, pci, mode0_driver, mode0_devclass, 0, 0); @@ -494,7 +462,7 @@ * only ioctl is used. the sd driver provides all other access. */ #define CDEV_MAJOR 154 /* preferred default character major */ -STATIC struct cdevsw asr_cdevsw = { +static struct cdevsw asr_cdevsw = { .d_version = D_VERSION, .d_flags = D_NEEDGIANT, .d_open = asr_open, @@ -511,12 +479,10 @@ /* * Fill message with default. */ -STATIC PI2O_MESSAGE_FRAME -ASR_fillMessage ( - IN char * Message, - IN u_int16_t size) +static PI2O_MESSAGE_FRAME +ASR_fillMessage(char *Message, u_int16_t size) { - OUT PI2O_MESSAGE_FRAME Message_Ptr; + PI2O_MESSAGE_FRAME Message_Ptr; Message_Ptr = getAlignLong(I2O_MESSAGE_FRAME, Message); bzero ((void *)Message_Ptr, size); @@ -529,11 +495,10 @@ #define EMPTY_QUEUE ((U32)-1L) -STATIC INLINE U32 -ASR_getMessage( - IN i2oRegs_t * virt) +static __inline U32 +ASR_getMessage(i2oRegs_t *virt) { - OUT U32 MessageOffset; + U32 MessageOffset; if ((MessageOffset = virt->ToFIFO) == EMPTY_QUEUE) { MessageOffset = virt->ToFIFO; @@ -542,15 +507,12 @@ } /* ASR_getMessage */ /* Issue a polled command */ -STATIC U32 -ASR_initiateCp ( - INOUT i2oRegs_t * virt, - INOUT U8 * fvirt, - IN PI2O_MESSAGE_FRAME Message) +static U32 +ASR_initiateCp(i2oRegs_t *virt, U8 *fvirt, PI2O_MESSAGE_FRAME Message) { - OUT U32 Mask = -1L; - U32 MessageOffset; - u_int Delay = 1500; + U32 Mask = -1L; + U32 MessageOffset; + u_int Delay = 1500; /* * ASR_initiateCp is only used for synchronous commands and will @@ -576,10 +538,8 @@ /* * Reset the adapter. */ -STATIC U32 -ASR_resetIOP ( - INOUT i2oRegs_t * virt, - INOUT U8 * fvirt) +static U32 +ASR_resetIOP(i2oRegs_t *virt, U8 *fvirt) { >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Apr 30 20:13:35 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9B13E16A4D0; Fri, 30 Apr 2004 20:13:34 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 568C916A4CE for ; Fri, 30 Apr 2004 20:13:34 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 234D043D1F for ; Fri, 30 Apr 2004 20:13:33 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i413DWGe036409 for ; Fri, 30 Apr 2004 20:13:32 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i413CqmN035640 for perforce@freebsd.org; Fri, 30 Apr 2004 20:12:52 -0700 (PDT) (envelope-from marcel@freebsd.org) Date: Fri, 30 Apr 2004 20:12:52 -0700 (PDT) Message-Id: <200405010312.i413CqmN035640@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 52021 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 01 May 2004 03:13:35 -0000 http://perforce.freebsd.org/chv.cgi?CH=52021 Change 52021 by marcel@marcel_nfs on 2004/04/30 20:11:58 IFC @52014 Affected files ... .. //depot/projects/ia64/MAINTAINERS#39 integrate .. //depot/projects/ia64/Makefile#38 integrate .. //depot/projects/ia64/Makefile.inc1#90 integrate .. //depot/projects/ia64/UPDATING#63 integrate .. //depot/projects/ia64/bin/cat/cat.1#2 integrate .. //depot/projects/ia64/bin/cat/cat.c#9 integrate .. //depot/projects/ia64/bin/chflags/chflags.1#4 integrate .. //depot/projects/ia64/bin/chflags/chflags.c#4 integrate .. //depot/projects/ia64/bin/chmod/chmod.1#8 integrate .. //depot/projects/ia64/bin/chmod/chmod.c#9 integrate .. //depot/projects/ia64/bin/cp/cp.1#7 integrate .. //depot/projects/ia64/bin/cp/cp.c#15 integrate .. //depot/projects/ia64/bin/cp/extern.h#6 integrate .. //depot/projects/ia64/bin/cp/utils.c#11 integrate .. //depot/projects/ia64/bin/csh/USD.doc/csh.1#3 integrate .. //depot/projects/ia64/bin/csh/USD.doc/csh.2#2 integrate .. //depot/projects/ia64/bin/csh/USD.doc/csh.3#2 integrate .. //depot/projects/ia64/bin/csh/USD.doc/csh.4#2 integrate .. //depot/projects/ia64/bin/csh/USD.doc/csh.a#2 integrate .. //depot/projects/ia64/bin/csh/USD.doc/csh.g#4 integrate .. //depot/projects/ia64/bin/csh/USD.doc/tabs#2 integrate .. //depot/projects/ia64/bin/csh/host.defs#2 integrate .. //depot/projects/ia64/bin/date/date.1#6 integrate .. //depot/projects/ia64/bin/date/date.c#8 integrate .. //depot/projects/ia64/bin/date/extern.h#3 integrate .. //depot/projects/ia64/bin/date/netdate.c#6 integrate .. //depot/projects/ia64/bin/dd/Makefile#7 integrate .. //depot/projects/ia64/bin/dd/args.c#8 integrate .. //depot/projects/ia64/bin/dd/conv.c#5 integrate .. //depot/projects/ia64/bin/dd/conv_tab.c#3 integrate .. //depot/projects/ia64/bin/dd/dd.1#6 integrate .. //depot/projects/ia64/bin/dd/dd.c#8 integrate .. //depot/projects/ia64/bin/dd/dd.h#5 integrate .. //depot/projects/ia64/bin/dd/extern.h#4 integrate .. //depot/projects/ia64/bin/dd/misc.c#6 integrate .. //depot/projects/ia64/bin/dd/position.c#5 integrate .. //depot/projects/ia64/bin/df/Makefile#5 integrate .. //depot/projects/ia64/bin/df/df.1#7 integrate .. //depot/projects/ia64/bin/df/df.c#20 integrate .. //depot/projects/ia64/bin/domainname/domainname.1#3 integrate .. //depot/projects/ia64/bin/domainname/domainname.c#5 integrate .. //depot/projects/ia64/bin/echo/echo.1#4 integrate .. //depot/projects/ia64/bin/echo/echo.c#7 integrate .. //depot/projects/ia64/bin/ed/cbc.c#6 integrate .. //depot/projects/ia64/bin/hostname/hostname.1#3 integrate .. //depot/projects/ia64/bin/hostname/hostname.c#5 integrate .. //depot/projects/ia64/bin/kenv/kenv.c#3 integrate .. //depot/projects/ia64/bin/kill/kill.1#4 integrate .. //depot/projects/ia64/bin/kill/kill.c#8 integrate .. //depot/projects/ia64/bin/ln/ln.1#6 integrate .. //depot/projects/ia64/bin/ln/ln.c#9 integrate .. //depot/projects/ia64/bin/ln/symlink.7#6 integrate .. //depot/projects/ia64/bin/ls/cmp.c#5 integrate .. //depot/projects/ia64/bin/ls/extern.h#7 integrate .. //depot/projects/ia64/bin/ls/ls.1#20 integrate .. //depot/projects/ia64/bin/ls/ls.c#19 integrate .. //depot/projects/ia64/bin/ls/ls.h#7 integrate .. //depot/projects/ia64/bin/ls/print.c#16 integrate .. //depot/projects/ia64/bin/ls/util.c#8 integrate .. //depot/projects/ia64/bin/mkdir/mkdir.1#4 integrate .. //depot/projects/ia64/bin/mkdir/mkdir.c#5 integrate .. //depot/projects/ia64/bin/mv/mv.1#8 integrate .. //depot/projects/ia64/bin/mv/mv.c#9 integrate .. //depot/projects/ia64/bin/pax/ar_io.c#7 integrate .. //depot/projects/ia64/bin/pax/ar_subs.c#7 integrate .. //depot/projects/ia64/bin/pax/buf_subs.c#7 integrate .. //depot/projects/ia64/bin/pax/cache.c#7 integrate .. //depot/projects/ia64/bin/pax/cache.h#4 integrate .. //depot/projects/ia64/bin/pax/cpio.c#7 integrate .. //depot/projects/ia64/bin/pax/cpio.h#2 integrate .. //depot/projects/ia64/bin/pax/extern.h#4 integrate .. //depot/projects/ia64/bin/pax/file_subs.c#6 integrate .. //depot/projects/ia64/bin/pax/ftree.c#7 integrate .. //depot/projects/ia64/bin/pax/ftree.h#2 integrate .. //depot/projects/ia64/bin/pax/gen_subs.c#6 integrate .. //depot/projects/ia64/bin/pax/options.c#10 integrate .. //depot/projects/ia64/bin/pax/options.h#2 integrate .. //depot/projects/ia64/bin/pax/pat_rep.c#8 integrate .. //depot/projects/ia64/bin/pax/pat_rep.h#2 integrate .. //depot/projects/ia64/bin/pax/pax.1#7 integrate .. //depot/projects/ia64/bin/pax/pax.c#7 integrate .. //depot/projects/ia64/bin/pax/pax.h#6 integrate .. //depot/projects/ia64/bin/pax/sel_subs.c#6 integrate .. //depot/projects/ia64/bin/pax/sel_subs.h#2 integrate .. //depot/projects/ia64/bin/pax/tables.c#5 integrate .. //depot/projects/ia64/bin/pax/tables.h#4 integrate .. //depot/projects/ia64/bin/pax/tar.c#7 integrate .. //depot/projects/ia64/bin/pax/tar.h#2 integrate .. //depot/projects/ia64/bin/pax/tty_subs.c#5 integrate .. //depot/projects/ia64/bin/ps/extern.h#11 integrate .. //depot/projects/ia64/bin/ps/fmt.c#9 integrate .. //depot/projects/ia64/bin/ps/keyword.c#15 integrate .. //depot/projects/ia64/bin/ps/nlist.c#7 integrate .. //depot/projects/ia64/bin/ps/print.c#14 integrate .. //depot/projects/ia64/bin/ps/ps.1#21 integrate .. //depot/projects/ia64/bin/ps/ps.c#15 integrate .. //depot/projects/ia64/bin/ps/ps.h#7 integrate .. //depot/projects/ia64/bin/pwd/pwd.1#8 integrate .. //depot/projects/ia64/bin/pwd/pwd.c#7 integrate .. //depot/projects/ia64/bin/rcp/extern.h#4 integrate .. //depot/projects/ia64/bin/rcp/rcp.1#4 integrate .. //depot/projects/ia64/bin/rcp/util.c#6 integrate .. //depot/projects/ia64/bin/realpath/realpath.1#3 integrate .. //depot/projects/ia64/bin/realpath/realpath.c#5 integrate .. //depot/projects/ia64/bin/rm/rm.1#6 integrate .. //depot/projects/ia64/bin/rm/rm.c#11 integrate .. //depot/projects/ia64/bin/rmail/Makefile#6 integrate .. //depot/projects/ia64/bin/rmdir/rmdir.1#2 integrate .. //depot/projects/ia64/bin/rmdir/rmdir.c#5 integrate .. //depot/projects/ia64/bin/sh/alias.c#6 integrate .. //depot/projects/ia64/bin/sh/alias.h#3 integrate .. //depot/projects/ia64/bin/sh/arith.h#5 integrate .. //depot/projects/ia64/bin/sh/arith.y#7 integrate .. //depot/projects/ia64/bin/sh/arith_lex.l#7 integrate .. //depot/projects/ia64/bin/sh/bltin/bltin.h#3 integrate .. //depot/projects/ia64/bin/sh/bltin/echo.1#4 integrate .. //depot/projects/ia64/bin/sh/bltin/echo.c#5 integrate .. //depot/projects/ia64/bin/sh/builtins.def#6 integrate .. //depot/projects/ia64/bin/sh/cd.c#9 integrate .. //depot/projects/ia64/bin/sh/cd.h#3 integrate .. //depot/projects/ia64/bin/sh/error.c#9 integrate .. //depot/projects/ia64/bin/sh/error.h#5 integrate .. //depot/projects/ia64/bin/sh/eval.c#10 integrate .. //depot/projects/ia64/bin/sh/eval.h#4 integrate .. //depot/projects/ia64/bin/sh/exec.c#9 integrate .. //depot/projects/ia64/bin/sh/exec.h#4 integrate .. //depot/projects/ia64/bin/sh/expand.c#13 integrate .. //depot/projects/ia64/bin/sh/expand.h#4 integrate .. //depot/projects/ia64/bin/sh/funcs/cmv#2 integrate .. //depot/projects/ia64/bin/sh/funcs/dirs#2 integrate .. //depot/projects/ia64/bin/sh/funcs/kill#2 integrate .. //depot/projects/ia64/bin/sh/funcs/login#2 integrate .. //depot/projects/ia64/bin/sh/funcs/newgrp#2 integrate .. //depot/projects/ia64/bin/sh/funcs/popd#2 integrate .. //depot/projects/ia64/bin/sh/funcs/pushd#2 integrate .. //depot/projects/ia64/bin/sh/funcs/suspend#2 integrate .. //depot/projects/ia64/bin/sh/histedit.c#7 integrate .. //depot/projects/ia64/bin/sh/init.h#3 integrate .. //depot/projects/ia64/bin/sh/input.c#7 integrate .. //depot/projects/ia64/bin/sh/input.h#3 integrate .. //depot/projects/ia64/bin/sh/jobs.c#20 integrate .. //depot/projects/ia64/bin/sh/jobs.h#5 integrate .. //depot/projects/ia64/bin/sh/mail.c#4 integrate .. //depot/projects/ia64/bin/sh/mail.h#3 integrate .. //depot/projects/ia64/bin/sh/main.c#6 integrate .. //depot/projects/ia64/bin/sh/main.h#3 integrate .. //depot/projects/ia64/bin/sh/memalloc.c#7 integrate .. //depot/projects/ia64/bin/sh/memalloc.h#3 integrate .. //depot/projects/ia64/bin/sh/miscbltin.c#6 integrate .. //depot/projects/ia64/bin/sh/mkbuiltins#5 integrate .. //depot/projects/ia64/bin/sh/mkinit.c#4 integrate .. //depot/projects/ia64/bin/sh/mknodes.c#5 integrate .. //depot/projects/ia64/bin/sh/mksyntax.c#6 integrate .. //depot/projects/ia64/bin/sh/mktokens#3 integrate .. //depot/projects/ia64/bin/sh/myhistedit.h#4 integrate .. //depot/projects/ia64/bin/sh/mystring.c#4 integrate .. //depot/projects/ia64/bin/sh/mystring.h#3 integrate .. //depot/projects/ia64/bin/sh/nodes.c.pat#6 integrate .. //depot/projects/ia64/bin/sh/nodetypes#3 integrate .. //depot/projects/ia64/bin/sh/options.c#6 integrate .. //depot/projects/ia64/bin/sh/options.h#4 integrate .. //depot/projects/ia64/bin/sh/output.c#7 integrate .. //depot/projects/ia64/bin/sh/output.h#4 integrate .. //depot/projects/ia64/bin/sh/parser.c#13 integrate .. //depot/projects/ia64/bin/sh/parser.h#3 integrate .. //depot/projects/ia64/bin/sh/redir.c#9 integrate .. //depot/projects/ia64/bin/sh/redir.h#4 integrate .. //depot/projects/ia64/bin/sh/sh.1#24 integrate .. //depot/projects/ia64/bin/sh/shell.h#6 integrate .. //depot/projects/ia64/bin/sh/show.c#7 integrate .. //depot/projects/ia64/bin/sh/show.h#3 integrate .. //depot/projects/ia64/bin/sh/trap.c#7 integrate .. //depot/projects/ia64/bin/sh/trap.h#4 integrate .. //depot/projects/ia64/bin/sh/var.c#10 integrate .. //depot/projects/ia64/bin/sh/var.h#5 integrate .. //depot/projects/ia64/bin/sleep/sleep.1#3 integrate .. //depot/projects/ia64/bin/sleep/sleep.c#7 integrate .. //depot/projects/ia64/bin/stty/cchar.c#4 integrate .. //depot/projects/ia64/bin/stty/extern.h#3 integrate .. //depot/projects/ia64/bin/stty/gfmt.c#5 integrate .. //depot/projects/ia64/bin/stty/key.c#4 integrate .. //depot/projects/ia64/bin/stty/modes.c#4 integrate .. //depot/projects/ia64/bin/stty/print.c#4 integrate .. //depot/projects/ia64/bin/stty/stty.1#3 integrate .. //depot/projects/ia64/bin/stty/stty.c#5 integrate .. //depot/projects/ia64/bin/stty/stty.h#2 integrate .. //depot/projects/ia64/bin/stty/util.c#4 integrate .. //depot/projects/ia64/bin/sync/sync.8#4 integrate .. //depot/projects/ia64/bin/sync/sync.c#5 integrate .. //depot/projects/ia64/bin/test/test.1#3 integrate .. //depot/projects/ia64/contrib/amd/scripts/amd.conf.5#4 integrate .. //depot/projects/ia64/contrib/bsnmp/NEWS#3 integrate .. //depot/projects/ia64/contrib/bsnmp/VERSION#3 integrate .. //depot/projects/ia64/contrib/bsnmp/gensnmpdef/gensnmpdef.1#1 branch .. //depot/projects/ia64/contrib/bsnmp/gensnmpdef/gensnmpdef.c#1 branch .. //depot/projects/ia64/contrib/bsnmp/gensnmptree/gensnmptree.c#3 integrate .. //depot/projects/ia64/contrib/bsnmp/lib/asn1.3#3 integrate .. //depot/projects/ia64/contrib/bsnmp/lib/bsnmpagent.3#3 integrate .. //depot/projects/ia64/contrib/bsnmp/lib/bsnmpclient.3#3 integrate .. //depot/projects/ia64/contrib/bsnmp/lib/bsnmplib.3#3 integrate .. //depot/projects/ia64/contrib/bsnmp/lib/snmpagent.c#3 integrate .. //depot/projects/ia64/contrib/bsnmp/lib/snmpagent.h#3 integrate .. //depot/projects/ia64/contrib/bsnmp/snmp_mibII/mibII.c#3 integrate .. //depot/projects/ia64/contrib/bsnmp/snmp_mibII/mibII_interfaces.c#3 integrate .. //depot/projects/ia64/contrib/bsnmp/snmp_mibII/mibII_ipaddr.c#3 integrate .. //depot/projects/ia64/contrib/bsnmp/snmp_mibII/snmp_mibII.3#3 integrate .. //depot/projects/ia64/contrib/bsnmp/snmpd/BEGEMOT-SNMPD.txt#3 integrate .. //depot/projects/ia64/contrib/bsnmp/snmpd/action.c#3 integrate .. //depot/projects/ia64/contrib/bsnmp/snmpd/bsnmpd.1#3 integrate .. //depot/projects/ia64/contrib/bsnmp/snmpd/config.c#3 integrate .. //depot/projects/ia64/contrib/bsnmp/snmpd/main.c#3 integrate .. //depot/projects/ia64/contrib/bsnmp/snmpd/snmpd.config#3 integrate .. //depot/projects/ia64/contrib/bsnmp/snmpd/snmpmod.3#3 integrate .. //depot/projects/ia64/contrib/bsnmp/snmpd/trans_lsock.c#2 integrate .. //depot/projects/ia64/contrib/bsnmp/snmpd/trap.c#3 integrate .. //depot/projects/ia64/contrib/com_err/ChangeLog#2 integrate .. //depot/projects/ia64/contrib/com_err/Makefile.am#2 integrate .. //depot/projects/ia64/contrib/com_err/Makefile.in#2 integrate .. //depot/projects/ia64/contrib/com_err/com_err.c#2 integrate .. //depot/projects/ia64/contrib/com_err/com_err.h#2 integrate .. //depot/projects/ia64/contrib/com_err/com_right.h#2 integrate .. //depot/projects/ia64/contrib/com_err/compile_et.c#2 integrate .. //depot/projects/ia64/contrib/com_err/compile_et.h#2 integrate .. //depot/projects/ia64/contrib/com_err/error.c#2 integrate .. //depot/projects/ia64/contrib/com_err/lex.h#1 branch .. //depot/projects/ia64/contrib/com_err/lex.l#2 integrate .. //depot/projects/ia64/contrib/com_err/parse.y#2 integrate .. //depot/projects/ia64/contrib/com_err/roken_rename.h#2 integrate .. //depot/projects/ia64/contrib/cvs/AUTHORS#2 integrate .. //depot/projects/ia64/contrib/cvs/BUGS#2 integrate .. //depot/projects/ia64/contrib/cvs/ChangeLog#5 integrate .. //depot/projects/ia64/contrib/cvs/FAQ#3 integrate .. //depot/projects/ia64/contrib/cvs/INSTALL#5 integrate .. //depot/projects/ia64/contrib/cvs/Makefile.am#4 integrate .. //depot/projects/ia64/contrib/cvs/Makefile.in#4 integrate .. //depot/projects/ia64/contrib/cvs/NEWS#5 integrate .. //depot/projects/ia64/contrib/cvs/README#3 integrate .. //depot/projects/ia64/contrib/cvs/TESTS#3 integrate .. //depot/projects/ia64/contrib/cvs/TODO#4 integrate .. //depot/projects/ia64/contrib/cvs/acinclude.m4#4 integrate .. //depot/projects/ia64/contrib/cvs/aclocal.m4#4 integrate .. //depot/projects/ia64/contrib/cvs/config.h.in#5 integrate .. //depot/projects/ia64/contrib/cvs/configure#5 integrate .. //depot/projects/ia64/contrib/cvs/configure.in#5 integrate .. //depot/projects/ia64/contrib/cvs/contrib/ChangeLog#5 integrate .. //depot/projects/ia64/contrib/cvs/contrib/Makefile.am#5 integrate .. //depot/projects/ia64/contrib/cvs/contrib/Makefile.in#5 integrate .. //depot/projects/ia64/contrib/cvs/contrib/check_cvs.in#2 integrate .. //depot/projects/ia64/contrib/cvs/contrib/commit_prep.in#2 integrate .. //depot/projects/ia64/contrib/cvs/contrib/cvs2vendor.sh#2 integrate .. //depot/projects/ia64/contrib/cvs/contrib/log_accum.in#2 integrate .. //depot/projects/ia64/contrib/cvs/contrib/rcs2log.sh#3 integrate .. //depot/projects/ia64/contrib/cvs/contrib/rcs2sccs.sh#3 integrate .. //depot/projects/ia64/contrib/cvs/contrib/sccs2rcs.in#3 integrate .. //depot/projects/ia64/contrib/cvs/depcomp#3 integrate .. //depot/projects/ia64/contrib/cvs/diff/ChangeLog#4 integrate .. //depot/projects/ia64/contrib/cvs/diff/Makefile.in#4 integrate .. //depot/projects/ia64/contrib/cvs/diff/diff.c#3 integrate .. //depot/projects/ia64/contrib/cvs/diff/diff3.c#3 integrate .. //depot/projects/ia64/contrib/cvs/diff/diffrun.h#2 integrate .. //depot/projects/ia64/contrib/cvs/diff/io.c#3 integrate .. //depot/projects/ia64/contrib/cvs/diff/system.h#4 integrate .. //depot/projects/ia64/contrib/cvs/diff/util.c#2 integrate .. //depot/projects/ia64/contrib/cvs/doc/ChangeLog#5 integrate .. //depot/projects/ia64/contrib/cvs/doc/Makefile.am#3 integrate .. //depot/projects/ia64/contrib/cvs/doc/Makefile.in#4 integrate .. //depot/projects/ia64/contrib/cvs/doc/cvs.texinfo#4 integrate .. //depot/projects/ia64/contrib/cvs/doc/cvsclient.texi#3 integrate .. //depot/projects/ia64/contrib/cvs/doc/stamp-1#4 integrate .. //depot/projects/ia64/contrib/cvs/doc/stamp-vti#4 integrate .. //depot/projects/ia64/contrib/cvs/doc/version-client.texi#4 integrate .. //depot/projects/ia64/contrib/cvs/doc/version.texi#4 integrate .. //depot/projects/ia64/contrib/cvs/lib/ChangeLog#5 integrate .. //depot/projects/ia64/contrib/cvs/lib/Makefile.am#3 integrate .. //depot/projects/ia64/contrib/cvs/lib/Makefile.in#4 integrate .. //depot/projects/ia64/contrib/cvs/lib/fncase.c#2 integrate .. //depot/projects/ia64/contrib/cvs/lib/getdate.y#4 integrate .. //depot/projects/ia64/contrib/cvs/lib/getpass.c#1 branch .. //depot/projects/ia64/contrib/cvs/lib/mkdir.c#2 integrate .. //depot/projects/ia64/contrib/cvs/lib/regex.c#3 integrate .. //depot/projects/ia64/contrib/cvs/lib/system.h#3 integrate .. //depot/projects/ia64/contrib/cvs/lib/wait.h#2 integrate .. //depot/projects/ia64/contrib/cvs/man/ChangeLog#4 integrate .. //depot/projects/ia64/contrib/cvs/man/Makefile.am#2 integrate .. //depot/projects/ia64/contrib/cvs/man/Makefile.in#4 integrate .. //depot/projects/ia64/contrib/cvs/man/cvs.1#5 integrate .. //depot/projects/ia64/contrib/cvs/man/cvs.5#3 integrate .. //depot/projects/ia64/contrib/cvs/mktemp.sh#1 branch .. //depot/projects/ia64/contrib/cvs/noautomake.sh#3 delete .. //depot/projects/ia64/contrib/cvs/src/ChangeLog#5 integrate .. //depot/projects/ia64/contrib/cvs/src/Makefile.am#5 integrate .. //depot/projects/ia64/contrib/cvs/src/Makefile.in#5 integrate .. //depot/projects/ia64/contrib/cvs/src/add.c#3 integrate .. //depot/projects/ia64/contrib/cvs/src/admin.c#5 integrate .. //depot/projects/ia64/contrib/cvs/src/annotate.c#5 integrate .. //depot/projects/ia64/contrib/cvs/src/buffer.c#5 integrate .. //depot/projects/ia64/contrib/cvs/src/buffer.h#4 integrate .. //depot/projects/ia64/contrib/cvs/src/checkin.c#2 integrate .. //depot/projects/ia64/contrib/cvs/src/checkout.c#4 integrate .. //depot/projects/ia64/contrib/cvs/src/classify.c#3 integrate .. //depot/projects/ia64/contrib/cvs/src/client.c#6 integrate .. //depot/projects/ia64/contrib/cvs/src/client.h#3 integrate .. //depot/projects/ia64/contrib/cvs/src/commit.c#5 integrate .. //depot/projects/ia64/contrib/cvs/src/create_adm.c#3 integrate .. //depot/projects/ia64/contrib/cvs/src/cvs.h#5 integrate .. //depot/projects/ia64/contrib/cvs/src/cvsbug.in#3 integrate .. //depot/projects/ia64/contrib/cvs/src/cvsrc.c#3 integrate .. //depot/projects/ia64/contrib/cvs/src/diff.c#5 integrate .. //depot/projects/ia64/contrib/cvs/src/edit.c#4 integrate .. //depot/projects/ia64/contrib/cvs/src/edit.h#2 integrate .. //depot/projects/ia64/contrib/cvs/src/entries.c#2 integrate .. //depot/projects/ia64/contrib/cvs/src/error.c#2 integrate .. //depot/projects/ia64/contrib/cvs/src/expand_path.c#2 integrate .. //depot/projects/ia64/contrib/cvs/src/fileattr.c#2 integrate .. //depot/projects/ia64/contrib/cvs/src/fileattr.h#2 integrate .. //depot/projects/ia64/contrib/cvs/src/filesubr.c#4 integrate .. //depot/projects/ia64/contrib/cvs/src/find_names.c#3 integrate .. //depot/projects/ia64/contrib/cvs/src/hardlink.c#2 integrate .. //depot/projects/ia64/contrib/cvs/src/hash.c#2 integrate .. //depot/projects/ia64/contrib/cvs/src/hash.h#2 integrate .. //depot/projects/ia64/contrib/cvs/src/history.c#4 integrate .. //depot/projects/ia64/contrib/cvs/src/history.h#1 branch .. //depot/projects/ia64/contrib/cvs/src/ignore.c#3 integrate .. //depot/projects/ia64/contrib/cvs/src/import.c#4 integrate .. //depot/projects/ia64/contrib/cvs/src/lock.c#5 integrate .. //depot/projects/ia64/contrib/cvs/src/log.c#5 integrate .. //depot/projects/ia64/contrib/cvs/src/login.c#4 integrate .. //depot/projects/ia64/contrib/cvs/src/logmsg.c#4 integrate .. //depot/projects/ia64/contrib/cvs/src/main.c#5 integrate .. //depot/projects/ia64/contrib/cvs/src/mkmodules.c#3 integrate .. //depot/projects/ia64/contrib/cvs/src/modules.c#4 integrate .. //depot/projects/ia64/contrib/cvs/src/myndbm.c#5 integrate .. //depot/projects/ia64/contrib/cvs/src/no_diff.c#2 integrate .. //depot/projects/ia64/contrib/cvs/src/parseinfo.c#5 integrate .. //depot/projects/ia64/contrib/cvs/src/patch.c#5 integrate .. //depot/projects/ia64/contrib/cvs/src/rcs.c#5 integrate .. //depot/projects/ia64/contrib/cvs/src/rcs.h#2 integrate .. //depot/projects/ia64/contrib/cvs/src/rcscmds.c#3 integrate .. //depot/projects/ia64/contrib/cvs/src/recurse.c#5 integrate .. //depot/projects/ia64/contrib/cvs/src/release.c#2 integrate .. //depot/projects/ia64/contrib/cvs/src/remove.c#5 integrate .. //depot/projects/ia64/contrib/cvs/src/repos.c#2 integrate .. //depot/projects/ia64/contrib/cvs/src/root.c#5 integrate .. //depot/projects/ia64/contrib/cvs/src/root.h#2 integrate .. //depot/projects/ia64/contrib/cvs/src/run.c#2 integrate .. //depot/projects/ia64/contrib/cvs/src/sanity.sh#5 integrate .. //depot/projects/ia64/contrib/cvs/src/server.c#6 integrate .. //depot/projects/ia64/contrib/cvs/src/server.h#3 integrate .. //depot/projects/ia64/contrib/cvs/src/stack.c#1 branch .. //depot/projects/ia64/contrib/cvs/src/stack.h#1 branch .. //depot/projects/ia64/contrib/cvs/src/status.c#4 integrate .. //depot/projects/ia64/contrib/cvs/src/subr.c#4 integrate .. //depot/projects/ia64/contrib/cvs/src/tag.c#5 integrate .. //depot/projects/ia64/contrib/cvs/src/update.c#5 integrate .. //depot/projects/ia64/contrib/cvs/src/update.h#2 integrate .. //depot/projects/ia64/contrib/cvs/src/vers_ts.c#4 integrate .. //depot/projects/ia64/contrib/cvs/src/watch.c#4 integrate .. //depot/projects/ia64/contrib/cvs/src/watch.h#2 integrate .. //depot/projects/ia64/contrib/cvs/src/wrapper.c#4 integrate .. //depot/projects/ia64/contrib/cvs/src/zlib.c#4 integrate .. //depot/projects/ia64/contrib/cvs/tools/ChangeLog#4 integrate .. //depot/projects/ia64/contrib/cvs/tools/Makefile.am#2 integrate .. //depot/projects/ia64/contrib/cvs/tools/Makefile.in#4 integrate .. //depot/projects/ia64/contrib/groff/tmac/doc-common#13 integrate .. //depot/projects/ia64/contrib/groff/tmac/doc-syms#6 integrate .. //depot/projects/ia64/contrib/less/LICENSE#2 integrate .. //depot/projects/ia64/contrib/less/Makefile.aut#3 integrate .. //depot/projects/ia64/contrib/less/Makefile.dsg#2 integrate .. //depot/projects/ia64/contrib/less/Makefile.in#3 integrate .. //depot/projects/ia64/contrib/less/NEWS#3 integrate .. //depot/projects/ia64/contrib/less/README#3 integrate .. //depot/projects/ia64/contrib/less/acconfig.h#2 delete .. //depot/projects/ia64/contrib/less/brac.c#2 integrate .. //depot/projects/ia64/contrib/less/ch.c#3 integrate .. //depot/projects/ia64/contrib/less/charset.c#3 integrate .. //depot/projects/ia64/contrib/less/cmd.h#3 integrate .. //depot/projects/ia64/contrib/less/cmdbuf.c#3 integrate .. //depot/projects/ia64/contrib/less/command.c#3 integrate .. //depot/projects/ia64/contrib/less/configure#3 integrate .. //depot/projects/ia64/contrib/less/configure.ac#1 branch .. //depot/projects/ia64/contrib/less/configure.in#3 delete .. //depot/projects/ia64/contrib/less/decode.c#3 integrate .. //depot/projects/ia64/contrib/less/defines.ds#3 integrate .. //depot/projects/ia64/contrib/less/defines.h.in#3 integrate .. //depot/projects/ia64/contrib/less/defines.h.top#3 delete .. //depot/projects/ia64/contrib/less/defines.o2#3 integrate .. //depot/projects/ia64/contrib/less/defines.wn#3 integrate .. //depot/projects/ia64/contrib/less/edit.c#2 integrate .. //depot/projects/ia64/contrib/less/filename.c#3 integrate .. //depot/projects/ia64/contrib/less/forwback.c#2 integrate .. //depot/projects/ia64/contrib/less/funcs.h#3 integrate .. //depot/projects/ia64/contrib/less/help.c#3 integrate .. //depot/projects/ia64/contrib/less/ifile.c#2 integrate .. //depot/projects/ia64/contrib/less/input.c#2 integrate .. //depot/projects/ia64/contrib/less/jump.c#2 integrate .. //depot/projects/ia64/contrib/less/less.h#3 integrate .. //depot/projects/ia64/contrib/less/less.hlp#3 integrate .. //depot/projects/ia64/contrib/less/less.man#3 integrate .. //depot/projects/ia64/contrib/less/less.nro#3 integrate .. //depot/projects/ia64/contrib/less/lessecho.c#2 integrate .. //depot/projects/ia64/contrib/less/lesskey.c#3 integrate .. //depot/projects/ia64/contrib/less/lesskey.h#2 integrate .. //depot/projects/ia64/contrib/less/lesskey.man#3 integrate .. //depot/projects/ia64/contrib/less/lesskey.nro#3 integrate .. //depot/projects/ia64/contrib/less/lglob.h#2 integrate .. //depot/projects/ia64/contrib/less/line.c#3 integrate .. //depot/projects/ia64/contrib/less/linenum.c#3 integrate .. //depot/projects/ia64/contrib/less/lsystem.c#3 integrate .. //depot/projects/ia64/contrib/less/main.c#3 integrate .. //depot/projects/ia64/contrib/less/mark.c#2 integrate .. //depot/projects/ia64/contrib/less/mkhelp.c#2 integrate .. //depot/projects/ia64/contrib/less/optfunc.c#3 integrate .. //depot/projects/ia64/contrib/less/option.c#3 integrate .. //depot/projects/ia64/contrib/less/option.h#2 integrate .. //depot/projects/ia64/contrib/less/opttbl.c#3 integrate .. //depot/projects/ia64/contrib/less/os.c#3 integrate .. //depot/projects/ia64/contrib/less/output.c#3 integrate .. //depot/projects/ia64/contrib/less/pckeys.h#2 integrate .. //depot/projects/ia64/contrib/less/position.c#2 integrate .. //depot/projects/ia64/contrib/less/position.h#2 integrate .. //depot/projects/ia64/contrib/less/prompt.c#3 integrate .. //depot/projects/ia64/contrib/less/screen.c#3 integrate .. //depot/projects/ia64/contrib/less/scrsize.c#2 integrate .. //depot/projects/ia64/contrib/less/search.c#3 integrate .. //depot/projects/ia64/contrib/less/signal.c#2 integrate .. //depot/projects/ia64/contrib/less/tags.c#3 integrate .. //depot/projects/ia64/contrib/less/ttyin.c#3 integrate .. //depot/projects/ia64/contrib/less/version.c#3 integrate .. //depot/projects/ia64/contrib/libpcap/.cvsignore#3 integrate .. //depot/projects/ia64/contrib/libpcap/CHANGES#3 integrate .. //depot/projects/ia64/contrib/libpcap/CREDITS#3 integrate .. //depot/projects/ia64/contrib/libpcap/FILES#3 integrate .. //depot/projects/ia64/contrib/libpcap/INSTALL.txt#2 integrate .. //depot/projects/ia64/contrib/libpcap/Makefile.in#3 integrate .. //depot/projects/ia64/contrib/libpcap/README#3 integrate .. //depot/projects/ia64/contrib/libpcap/README.Win32#1 branch .. //depot/projects/ia64/contrib/libpcap/README.aix#3 integrate .. //depot/projects/ia64/contrib/libpcap/README.dag#1 branch .. //depot/projects/ia64/contrib/libpcap/README.hpux#1 branch .. //depot/projects/ia64/contrib/libpcap/VERSION#4 integrate .. //depot/projects/ia64/contrib/libpcap/atmuni31.h#1 branch .. //depot/projects/ia64/contrib/libpcap/bpf/net/bpf.h#3 delete .. //depot/projects/ia64/contrib/libpcap/bpf/net/bpf_filter.c#2 integrate .. //depot/projects/ia64/contrib/libpcap/bpf_dump.c#2 integrate .. //depot/projects/ia64/contrib/libpcap/bpf_image.c#2 integrate .. //depot/projects/ia64/contrib/libpcap/config.guess#3 integrate .. //depot/projects/ia64/contrib/libpcap/config.h.in#3 integrate .. //depot/projects/ia64/contrib/libpcap/config.sub#3 integrate .. //depot/projects/ia64/contrib/libpcap/configure#3 integrate .. //depot/projects/ia64/contrib/libpcap/configure.in#3 integrate .. //depot/projects/ia64/contrib/libpcap/etherent.c#2 integrate .. //depot/projects/ia64/contrib/libpcap/fad-getad.c#1 branch .. //depot/projects/ia64/contrib/libpcap/fad-gifc.c#1 branch .. //depot/projects/ia64/contrib/libpcap/fad-glifc.c#1 branch .. //depot/projects/ia64/contrib/libpcap/fad-null.c#1 branch .. //depot/projects/ia64/contrib/libpcap/fad-win32.c#1 branch .. //depot/projects/ia64/contrib/libpcap/gencode.c#5 integrate .. //depot/projects/ia64/contrib/libpcap/gencode.h#3 integrate .. //depot/projects/ia64/contrib/libpcap/grammar.y#3 integrate .. //depot/projects/ia64/contrib/libpcap/inet.c#3 integrate .. //depot/projects/ia64/contrib/libpcap/lbl/os-aix4.h#1 branch .. //depot/projects/ia64/contrib/libpcap/lbl/os-hpux11.h#1 branch .. //depot/projects/ia64/contrib/libpcap/lbl/os-osf5.h#1 branch .. //depot/projects/ia64/contrib/libpcap/nametoaddr.c#3 integrate .. //depot/projects/ia64/contrib/libpcap/nlpid.h#2 integrate .. //depot/projects/ia64/contrib/libpcap/optimize.c#3 integrate .. //depot/projects/ia64/contrib/libpcap/pcap-bpf.c#4 integrate .. //depot/projects/ia64/contrib/libpcap/pcap-bpf.h#1 branch .. //depot/projects/ia64/contrib/libpcap/pcap-dag.c#1 branch .. //depot/projects/ia64/contrib/libpcap/pcap-dag.h#1 branch .. //depot/projects/ia64/contrib/libpcap/pcap-dlpi.c#3 integrate .. //depot/projects/ia64/contrib/libpcap/pcap-enet.c#2 integrate .. //depot/projects/ia64/contrib/libpcap/pcap-int.h#4 integrate .. //depot/projects/ia64/contrib/libpcap/pcap-linux.c#3 integrate .. //depot/projects/ia64/contrib/libpcap/pcap-nit.c#3 integrate .. //depot/projects/ia64/contrib/libpcap/pcap-null.c#2 integrate .. //depot/projects/ia64/contrib/libpcap/pcap-pf.c#3 integrate .. //depot/projects/ia64/contrib/libpcap/pcap-snit.c#3 integrate .. //depot/projects/ia64/contrib/libpcap/pcap-snoop.c#3 integrate .. //depot/projects/ia64/contrib/libpcap/pcap-stdinc.h#1 branch .. //depot/projects/ia64/contrib/libpcap/pcap-win32.c#1 branch .. //depot/projects/ia64/contrib/libpcap/pcap.3#5 integrate .. //depot/projects/ia64/contrib/libpcap/pcap.c#4 integrate .. //depot/projects/ia64/contrib/libpcap/pcap.h#4 integrate .. //depot/projects/ia64/contrib/libpcap/pf.h#1 branch .. //depot/projects/ia64/contrib/libpcap/rawss7.h#1 branch .. //depot/projects/ia64/contrib/libpcap/savefile.c#3 integrate .. //depot/projects/ia64/contrib/libpcap/scanner.l#4 integrate .. //depot/projects/ia64/contrib/libpcap/sll.h#2 integrate .. //depot/projects/ia64/contrib/libpcap/snprintf.c#1 branch .. //depot/projects/ia64/contrib/libpcap/sunatmpos.h#1 branch .. //depot/projects/ia64/contrib/lukemftp/src/fetch.c#6 integrate .. //depot/projects/ia64/contrib/lukemftp/src/ftp.1#7 integrate .. //depot/projects/ia64/contrib/lukemftp/src/ftp.c#6 integrate .. //depot/projects/ia64/contrib/lukemftp/src/progressbar.c#4 integrate .. //depot/projects/ia64/contrib/lukemftp/src/progressbar.h#2 integrate .. //depot/projects/ia64/contrib/lukemftp/src/util.c#5 integrate .. //depot/projects/ia64/contrib/lukemftp/src/version.h#5 integrate .. //depot/projects/ia64/contrib/patch/COPYING#2 delete .. //depot/projects/ia64/contrib/patch/ChangeLog#2 delete .. //depot/projects/ia64/contrib/patch/FREEBSD-upgrade#2 delete .. //depot/projects/ia64/contrib/patch/INSTALL#2 delete .. //depot/projects/ia64/contrib/patch/Makefile.in#2 delete .. //depot/projects/ia64/contrib/patch/NEWS#2 delete .. //depot/projects/ia64/contrib/patch/README#2 delete .. //depot/projects/ia64/contrib/patch/acconfig.h#2 delete .. //depot/projects/ia64/contrib/patch/addext.c#2 delete .. //depot/projects/ia64/contrib/patch/argmatch.c#2 delete .. //depot/projects/ia64/contrib/patch/argmatch.h#2 delete .. //depot/projects/ia64/contrib/patch/backupfile.c#2 delete .. //depot/projects/ia64/contrib/patch/backupfile.h#2 delete .. //depot/projects/ia64/contrib/patch/basename.c#2 delete .. //depot/projects/ia64/contrib/patch/common.h#2 delete .. //depot/projects/ia64/contrib/patch/config.hin#2 delete .. //depot/projects/ia64/contrib/patch/configure#2 delete .. //depot/projects/ia64/contrib/patch/configure.in#2 delete .. //depot/projects/ia64/contrib/patch/getopt.c#2 delete .. //depot/projects/ia64/contrib/patch/getopt.h#2 delete .. //depot/projects/ia64/contrib/patch/getopt1.c#2 delete .. //depot/projects/ia64/contrib/patch/inp.c#2 delete .. //depot/projects/ia64/contrib/patch/inp.h#2 delete .. //depot/projects/ia64/contrib/patch/install-sh#2 delete .. //depot/projects/ia64/contrib/patch/maketime.c#2 delete .. //depot/projects/ia64/contrib/patch/maketime.h#2 delete .. //depot/projects/ia64/contrib/patch/partime.c#2 delete .. //depot/projects/ia64/contrib/patch/partime.h#2 delete .. //depot/projects/ia64/contrib/patch/patch.1#2 delete .. //depot/projects/ia64/contrib/patch/patch.c#2 delete .. //depot/projects/ia64/contrib/patch/pch.c#2 delete .. //depot/projects/ia64/contrib/patch/pch.h#2 delete .. //depot/projects/ia64/contrib/patch/quotearg.c#2 delete .. //depot/projects/ia64/contrib/patch/quotearg.h#2 delete .. //depot/projects/ia64/contrib/patch/util.c#2 delete .. //depot/projects/ia64/contrib/patch/util.h#2 delete .. //depot/projects/ia64/contrib/patch/version.c#2 delete .. //depot/projects/ia64/contrib/patch/version.h#2 delete .. //depot/projects/ia64/contrib/pf/man/pf.4#2 integrate .. //depot/projects/ia64/contrib/pf/man/pflog.4#2 integrate .. //depot/projects/ia64/contrib/pf/man/pfsync.4#2 integrate .. //depot/projects/ia64/contrib/sendmail/FREEBSD-upgrade#17 integrate .. //depot/projects/ia64/contrib/smbfs/mount_smbfs/mount_smbfs.c#5 integrate .. //depot/projects/ia64/contrib/tcpdump/CHANGES#4 integrate .. //depot/projects/ia64/contrib/tcpdump/CREDITS#4 integrate .. //depot/projects/ia64/contrib/tcpdump/FILES#4 integrate .. //depot/projects/ia64/contrib/tcpdump/INSTALL#3 integrate .. //depot/projects/ia64/contrib/tcpdump/Makefile.in#3 integrate .. //depot/projects/ia64/contrib/tcpdump/README#4 integrate .. //depot/projects/ia64/contrib/tcpdump/Readme.Win32#1 branch .. //depot/projects/ia64/contrib/tcpdump/VERSION#5 integrate .. //depot/projects/ia64/contrib/tcpdump/acconfig.h#3 integrate .. //depot/projects/ia64/contrib/tcpdump/addrtoname.c#4 integrate .. //depot/projects/ia64/contrib/tcpdump/aodv.h#1 branch .. //depot/projects/ia64/contrib/tcpdump/appletalk.h#2 integrate .. //depot/projects/ia64/contrib/tcpdump/arcnet.h#2 integrate .. //depot/projects/ia64/contrib/tcpdump/atm.h#1 branch .. //depot/projects/ia64/contrib/tcpdump/atmuni31.h#1 branch .. //depot/projects/ia64/contrib/tcpdump/bootp.h#3 integrate .. //depot/projects/ia64/contrib/tcpdump/bpf_dump.c#2 integrate .. //depot/projects/ia64/contrib/tcpdump/config.guess#3 integrate .. //depot/projects/ia64/contrib/tcpdump/config.h.in#4 integrate .. //depot/projects/ia64/contrib/tcpdump/config.sub#3 integrate .. //depot/projects/ia64/contrib/tcpdump/configure#4 integrate .. //depot/projects/ia64/contrib/tcpdump/configure.in#4 integrate .. //depot/projects/ia64/contrib/tcpdump/decnet.h#2 integrate .. //depot/projects/ia64/contrib/tcpdump/enc.h#1 branch .. //depot/projects/ia64/contrib/tcpdump/ether.h#2 integrate .. //depot/projects/ia64/contrib/tcpdump/ethertype.h#3 integrate .. //depot/projects/ia64/contrib/tcpdump/extract.h#3 integrate .. //depot/projects/ia64/contrib/tcpdump/fddi.h#2 integrate .. //depot/projects/ia64/contrib/tcpdump/gmpls.c#1 branch .. //depot/projects/ia64/contrib/tcpdump/gmpls.h#1 branch .. //depot/projects/ia64/contrib/tcpdump/gmt2local.c#3 integrate .. //depot/projects/ia64/contrib/tcpdump/icmp6.h#3 integrate .. //depot/projects/ia64/contrib/tcpdump/ieee802_11.h#2 integrate .. //depot/projects/ia64/contrib/tcpdump/igrp.h#2 integrate .. //depot/projects/ia64/contrib/tcpdump/interface.h#5 integrate .. //depot/projects/ia64/contrib/tcpdump/ip.h#2 integrate .. //depot/projects/ia64/contrib/tcpdump/ip6.h#2 integrate .. //depot/projects/ia64/contrib/tcpdump/ipfc.h#1 branch .. //depot/projects/ia64/contrib/tcpdump/ipproto.h#1 branch .. //depot/projects/ia64/contrib/tcpdump/ipsec_doi.h#2 integrate .. //depot/projects/ia64/contrib/tcpdump/ipx.h#3 integrate .. //depot/projects/ia64/contrib/tcpdump/isakmp.h#2 integrate .. //depot/projects/ia64/contrib/tcpdump/lane.h#2 integrate .. //depot/projects/ia64/contrib/tcpdump/lbl/os-osf4.h#1 branch .. //depot/projects/ia64/contrib/tcpdump/llc.h#3 integrate .. //depot/projects/ia64/contrib/tcpdump/machdep.c#3 integrate .. //depot/projects/ia64/contrib/tcpdump/missing/addrinfo.h#2 integrate .. //depot/projects/ia64/contrib/tcpdump/missing/addrsize.h#2 integrate .. //depot/projects/ia64/contrib/tcpdump/missing/bittypes.h#2 integrate .. //depot/projects/ia64/contrib/tcpdump/missing/datalinks.c#1 branch .. //depot/projects/ia64/contrib/tcpdump/missing/dlnames.c#1 branch .. //depot/projects/ia64/contrib/tcpdump/missing/getaddrinfo.c#2 integrate .. //depot/projects/ia64/contrib/tcpdump/missing/getnameinfo.c#2 integrate .. //depot/projects/ia64/contrib/tcpdump/missing/inet_aton.c#2 integrate .. //depot/projects/ia64/contrib/tcpdump/missing/inet_ntop.c#2 integrate .. //depot/projects/ia64/contrib/tcpdump/missing/inet_pton.c#2 integrate .. //depot/projects/ia64/contrib/tcpdump/missing/resolv6.h#2 integrate .. //depot/projects/ia64/contrib/tcpdump/missing/resolv_ext.h#2 integrate .. //depot/projects/ia64/contrib/tcpdump/missing/snprintf.c#3 integrate .. //depot/projects/ia64/contrib/tcpdump/missing/sockstorage.h#2 integrate .. //depot/projects/ia64/contrib/tcpdump/missing/strlcat.c#2 integrate .. //depot/projects/ia64/contrib/tcpdump/missing/strlcpy.c#2 integrate .. //depot/projects/ia64/contrib/tcpdump/missing/strsep.c#1 branch .. //depot/projects/ia64/contrib/tcpdump/nameser.h#3 integrate .. //depot/projects/ia64/contrib/tcpdump/netbios.h#2 integrate .. //depot/projects/ia64/contrib/tcpdump/nfs.h#2 integrate .. //depot/projects/ia64/contrib/tcpdump/nfsfh.h#3 integrate .. //depot/projects/ia64/contrib/tcpdump/ntp.h#2 integrate .. //depot/projects/ia64/contrib/tcpdump/oakley.h#2 integrate .. //depot/projects/ia64/contrib/tcpdump/ospf.h#2 integrate .. //depot/projects/ia64/contrib/tcpdump/ospf6.h#2 integrate .. //depot/projects/ia64/contrib/tcpdump/oui.c#1 branch .. //depot/projects/ia64/contrib/tcpdump/oui.h#1 branch .. //depot/projects/ia64/contrib/tcpdump/parsenfsfh.c#3 integrate .. //depot/projects/ia64/contrib/tcpdump/pcap-missing.h#1 branch .. //depot/projects/ia64/contrib/tcpdump/pf.h#1 branch .. //depot/projects/ia64/contrib/tcpdump/ppp.h#3 integrate .. //depot/projects/ia64/contrib/tcpdump/print-802_11.c#3 integrate .. //depot/projects/ia64/contrib/tcpdump/print-ah.c#3 integrate .. //depot/projects/ia64/contrib/tcpdump/print-aodv.c#1 branch .. //depot/projects/ia64/contrib/tcpdump/print-ap1394.c#1 branch .. //depot/projects/ia64/contrib/tcpdump/print-arcnet.c#3 integrate .. //depot/projects/ia64/contrib/tcpdump/print-arp.c#4 integrate .. //depot/projects/ia64/contrib/tcpdump/print-ascii.c#2 integrate .. //depot/projects/ia64/contrib/tcpdump/print-atalk.c#4 integrate .. //depot/projects/ia64/contrib/tcpdump/print-atm.c#3 integrate .. //depot/projects/ia64/contrib/tcpdump/print-beep.c#3 integrate .. //depot/projects/ia64/contrib/tcpdump/print-bfd.c#1 branch .. //depot/projects/ia64/contrib/tcpdump/print-bgp.c#4 integrate .. //depot/projects/ia64/contrib/tcpdump/print-bootp.c#4 integrate .. //depot/projects/ia64/contrib/tcpdump/print-cdp.c#3 integrate .. //depot/projects/ia64/contrib/tcpdump/print-chdlc.c#3 integrate .. //depot/projects/ia64/contrib/tcpdump/print-cip.c#3 integrate .. //depot/projects/ia64/contrib/tcpdump/print-cnfp.c#3 integrate .. //depot/projects/ia64/contrib/tcpdump/print-decnet.c#3 integrate .. //depot/projects/ia64/contrib/tcpdump/print-dhcp6.c#4 integrate .. //depot/projects/ia64/contrib/tcpdump/print-domain.c#3 integrate .. //depot/projects/ia64/contrib/tcpdump/print-dvmrp.c#3 integrate .. //depot/projects/ia64/contrib/tcpdump/print-egp.c#4 integrate .. //depot/projects/ia64/contrib/tcpdump/print-enc.c#1 branch .. //depot/projects/ia64/contrib/tcpdump/print-esp.c#6 integrate .. //depot/projects/ia64/contrib/tcpdump/print-ether.c#4 integrate .. //depot/projects/ia64/contrib/tcpdump/print-fddi.c#4 integrate .. //depot/projects/ia64/contrib/tcpdump/print-fr.c#2 integrate .. //depot/projects/ia64/contrib/tcpdump/print-frag6.c#3 integrate .. //depot/projects/ia64/contrib/tcpdump/print-gre.c#4 integrate .. //depot/projects/ia64/contrib/tcpdump/print-hsrp.c#2 integrate .. //depot/projects/ia64/contrib/tcpdump/print-icmp.c#4 integrate .. //depot/projects/ia64/contrib/tcpdump/print-icmp6.c#4 integrate .. //depot/projects/ia64/contrib/tcpdump/print-igmp.c#4 integrate .. //depot/projects/ia64/contrib/tcpdump/print-igrp.c#3 integrate .. //depot/projects/ia64/contrib/tcpdump/print-ip.c#4 integrate .. //depot/projects/ia64/contrib/tcpdump/print-ip6.c#3 integrate .. //depot/projects/ia64/contrib/tcpdump/print-ip6opts.c#3 integrate .. //depot/projects/ia64/contrib/tcpdump/print-ipcomp.c#2 integrate .. //depot/projects/ia64/contrib/tcpdump/print-ipfc.c#1 branch .. //depot/projects/ia64/contrib/tcpdump/print-ipx.c#3 integrate .. //depot/projects/ia64/contrib/tcpdump/print-isakmp.c#5 integrate .. //depot/projects/ia64/contrib/tcpdump/print-isoclns.c#4 integrate .. //depot/projects/ia64/contrib/tcpdump/print-krb.c#2 integrate .. //depot/projects/ia64/contrib/tcpdump/print-l2tp.c#5 integrate .. //depot/projects/ia64/contrib/tcpdump/print-lane.c#3 integrate .. //depot/projects/ia64/contrib/tcpdump/print-lcp.c#2 delete .. //depot/projects/ia64/contrib/tcpdump/print-ldp.c#1 branch .. //depot/projects/ia64/contrib/tcpdump/print-llc.c#3 integrate .. //depot/projects/ia64/contrib/tcpdump/print-lwres.c#2 integrate .. //depot/projects/ia64/contrib/tcpdump/print-mobile.c#4 integrate .. //depot/projects/ia64/contrib/tcpdump/print-mobility.c#1 branch .. //depot/projects/ia64/contrib/tcpdump/print-mpls.c#3 integrate .. //depot/projects/ia64/contrib/tcpdump/print-msdp.c#2 integrate .. //depot/projects/ia64/contrib/tcpdump/print-netbios.c#2 integrate .. //depot/projects/ia64/contrib/tcpdump/print-nfs.c#4 integrate .. //depot/projects/ia64/contrib/tcpdump/print-ntp.c#4 integrate .. //depot/projects/ia64/contrib/tcpdump/print-null.c#4 integrate .. //depot/projects/ia64/contrib/tcpdump/print-ospf.c#3 integrate .. //depot/projects/ia64/contrib/tcpdump/print-ospf6.c#3 integrate .. //depot/projects/ia64/contrib/tcpdump/print-pflog.c#1 branch .. //depot/projects/ia64/contrib/tcpdump/print-pim.c#4 integrate .. //depot/projects/ia64/contrib/tcpdump/print-ppp.c#3 integrate .. //depot/projects/ia64/contrib/tcpdump/print-pppoe.c#3 integrate .. //depot/projects/ia64/contrib/tcpdump/print-pptp.c#2 integrate .. //depot/projects/ia64/contrib/tcpdump/print-radius.c#5 integrate .. //depot/projects/ia64/contrib/tcpdump/print-raw.c#4 integrate .. //depot/projects/ia64/contrib/tcpdump/print-rip.c#3 integrate .. //depot/projects/ia64/contrib/tcpdump/print-ripng.c#3 integrate .. //depot/projects/ia64/contrib/tcpdump/print-rsvp.c#1 branch .. //depot/projects/ia64/contrib/tcpdump/print-rt6.c#3 integrate .. //depot/projects/ia64/contrib/tcpdump/print-rx.c#4 integrate .. //depot/projects/ia64/contrib/tcpdump/print-sctp.c#3 integrate .. //depot/projects/ia64/contrib/tcpdump/print-sl.c#3 integrate .. //depot/projects/ia64/contrib/tcpdump/print-sll.c#4 integrate .. //depot/projects/ia64/contrib/tcpdump/print-smb.c#4 integrate .. //depot/projects/ia64/contrib/tcpdump/print-snmp.c#4 integrate .. //depot/projects/ia64/contrib/tcpdump/print-stp.c#3 integrate .. //depot/projects/ia64/contrib/tcpdump/print-sunatm.c#1 branch .. //depot/projects/ia64/contrib/tcpdump/print-sunrpc.c#3 integrate .. //depot/projects/ia64/contrib/tcpdump/print-tcp.c#3 integrate .. //depot/projects/ia64/contrib/tcpdump/print-telnet.c#3 integrate .. //depot/projects/ia64/contrib/tcpdump/print-tftp.c#2 integrate .. //depot/projects/ia64/contrib/tcpdump/print-timed.c#3 integrate .. //depot/projects/ia64/contrib/tcpdump/print-token.c#3 integrate .. //depot/projects/ia64/contrib/tcpdump/print-udp.c#3 integrate .. //depot/projects/ia64/contrib/tcpdump/print-vjc.c#2 integrate .. //depot/projects/ia64/contrib/tcpdump/print-vrrp.c#3 integrate .. //depot/projects/ia64/contrib/tcpdump/print-wb.c#3 integrate .. //depot/projects/ia64/contrib/tcpdump/print-zephyr.c#3 integrate .. //depot/projects/ia64/contrib/tcpdump/route6d.h#3 integrate .. //depot/projects/ia64/contrib/tcpdump/rx.h#3 integrate .. //depot/projects/ia64/contrib/tcpdump/sctpConstants.h#2 integrate .. //depot/projects/ia64/contrib/tcpdump/sctpHeader.h#2 integrate .. //depot/projects/ia64/contrib/tcpdump/setsignal.c#2 integrate .. //depot/projects/ia64/contrib/tcpdump/sll.h#2 integrate .. //depot/projects/ia64/contrib/tcpdump/smb.h#3 integrate .. //depot/projects/ia64/contrib/tcpdump/smbutil.c#4 integrate .. //depot/projects/ia64/contrib/tcpdump/strcasecmp.c#2 integrate .. //depot/projects/ia64/contrib/tcpdump/tcp.h#3 integrate .. //depot/projects/ia64/contrib/tcpdump/tcpdump-stdinc.h#1 branch .. //depot/projects/ia64/contrib/tcpdump/tcpdump.1#4 integrate .. //depot/projects/ia64/contrib/tcpdump/tcpdump.c#4 integrate .. //depot/projects/ia64/contrib/tcpdump/telnet.h#2 integrate .. //depot/projects/ia64/contrib/tcpdump/timed.h#2 integrate .. //depot/projects/ia64/contrib/tcpdump/token.h#3 integrate .. //depot/projects/ia64/contrib/tcpdump/udp.h#2 integrate .. //depot/projects/ia64/contrib/tcpdump/util.c#4 integrate .. //depot/projects/ia64/contrib/tcpdump/vfprintf.c#2 integrate .. //depot/projects/ia64/contrib/traceroute/traceroute.c#5 integrate .. //depot/projects/ia64/crypto/heimdal/ChangeLog#7 integrate .. //depot/projects/ia64/crypto/heimdal/Makefile.in#6 integrate .. //depot/projects/ia64/crypto/heimdal/NEWS#6 integrate .. //depot/projects/ia64/crypto/heimdal/TODO#3 delete .. //depot/projects/ia64/crypto/heimdal/acinclude.m4#2 delete .. //depot/projects/ia64/crypto/heimdal/aclocal.m4#7 integrate .. //depot/projects/ia64/crypto/heimdal/admin/Makefile.in#6 integrate .. //depot/projects/ia64/crypto/heimdal/admin/ktutil.cat8#4 delete .. //depot/projects/ia64/crypto/heimdal/appl/Makefile.in#6 integrate .. //depot/projects/ia64/crypto/heimdal/appl/afsutil/ChangeLog#4 integrate .. //depot/projects/ia64/crypto/heimdal/appl/afsutil/Makefile.in#6 integrate .. //depot/projects/ia64/crypto/heimdal/appl/afsutil/afslog.c#3 integrate .. //depot/projects/ia64/crypto/heimdal/appl/ftp/ChangeLog#7 integrate .. //depot/projects/ia64/crypto/heimdal/appl/ftp/Makefile.in#6 integrate .. //depot/projects/ia64/crypto/heimdal/appl/ftp/common/Makefile.in#6 integrate .. //depot/projects/ia64/crypto/heimdal/appl/ftp/ftp/Makefile.in#6 integrate .. //depot/projects/ia64/crypto/heimdal/appl/ftp/ftp/ftp.1#5 integrate .. //depot/projects/ia64/crypto/heimdal/appl/ftp/ftp/ftp.cat1#4 delete .. //depot/projects/ia64/crypto/heimdal/appl/ftp/ftp/gssapi.c#6 integrate .. //depot/projects/ia64/crypto/heimdal/appl/ftp/ftp/main.c#4 integrate .. //depot/projects/ia64/crypto/heimdal/appl/ftp/ftp/security.h#2 integrate .. //depot/projects/ia64/crypto/heimdal/appl/ftp/ftpd/Makefile.in#6 integrate .. //depot/projects/ia64/crypto/heimdal/appl/ftp/ftpd/ftpd.8#5 integrate .. //depot/projects/ia64/crypto/heimdal/appl/ftp/ftpd/ftpd.c#5 integrate .. //depot/projects/ia64/crypto/heimdal/appl/ftp/ftpd/ftpd.cat8#4 delete .. //depot/projects/ia64/crypto/heimdal/appl/ftp/ftpd/ftpusers.cat5#4 delete .. //depot/projects/ia64/crypto/heimdal/appl/kf/Makefile.in#6 integrate .. //depot/projects/ia64/crypto/heimdal/appl/kf/kf.cat1#4 delete .. //depot/projects/ia64/crypto/heimdal/appl/kf/kfd.cat8#4 delete .. //depot/projects/ia64/crypto/heimdal/appl/login/Makefile.in#6 integrate .. //depot/projects/ia64/crypto/heimdal/appl/push/Makefile.in#6 integrate .. //depot/projects/ia64/crypto/heimdal/appl/push/pfrom.cat1#4 delete .. //depot/projects/ia64/crypto/heimdal/appl/push/push.cat8#4 delete .. //depot/projects/ia64/crypto/heimdal/appl/rcp/Makefile.in#6 integrate .. //depot/projects/ia64/crypto/heimdal/appl/rsh/Makefile.in#6 integrate .. //depot/projects/ia64/crypto/heimdal/appl/rsh/rshd.c#6 integrate .. //depot/projects/ia64/crypto/heimdal/appl/su/Makefile.in#6 integrate .. //depot/projects/ia64/crypto/heimdal/appl/telnet/ChangeLog#7 integrate .. //depot/projects/ia64/crypto/heimdal/appl/telnet/Makefile.in#6 integrate .. //depot/projects/ia64/crypto/heimdal/appl/telnet/libtelnet/Makefile.in#6 integrate .. //depot/projects/ia64/crypto/heimdal/appl/telnet/telnet/Makefile.in#6 integrate .. //depot/projects/ia64/crypto/heimdal/appl/telnet/telnet/main.c#4 integrate .. //depot/projects/ia64/crypto/heimdal/appl/telnet/telnet/telnet.cat1#4 delete .. //depot/projects/ia64/crypto/heimdal/appl/telnet/telnetd/Makefile.in#6 integrate .. //depot/projects/ia64/crypto/heimdal/appl/telnet/telnetd/telnetd.c#4 integrate .. //depot/projects/ia64/crypto/heimdal/appl/telnet/telnetd/telnetd.cat8#4 delete .. //depot/projects/ia64/crypto/heimdal/appl/test/Makefile.in#6 integrate .. //depot/projects/ia64/crypto/heimdal/cf/ChangeLog#6 integrate .. //depot/projects/ia64/crypto/heimdal/cf/Makefile.am.common#5 integrate .. //depot/projects/ia64/crypto/heimdal/cf/aix.m4#3 integrate .. //depot/projects/ia64/crypto/heimdal/cf/auth-modules.m4#5 integrate .. //depot/projects/ia64/crypto/heimdal/cf/broken-getaddrinfo.m4#3 integrate .. //depot/projects/ia64/crypto/heimdal/cf/broken-getnameinfo.m4#2 integrate .. //depot/projects/ia64/crypto/heimdal/cf/broken-glob.m4#3 integrate .. //depot/projects/ia64/crypto/heimdal/cf/broken-realloc.m4#2 integrate .. //depot/projects/ia64/crypto/heimdal/cf/broken-snprintf.m4#3 integrate .. //depot/projects/ia64/crypto/heimdal/cf/c-attribute.m4#2 integrate .. //depot/projects/ia64/crypto/heimdal/cf/c-function.m4#2 integrate .. //depot/projects/ia64/crypto/heimdal/cf/capabilities.m4#2 integrate .. //depot/projects/ia64/crypto/heimdal/cf/check-compile-et.m4#3 integrate .. //depot/projects/ia64/crypto/heimdal/cf/check-declaration.m4#2 integrate .. //depot/projects/ia64/crypto/heimdal/cf/check-getpwnam_r-posix.m4#2 integrate .. //depot/projects/ia64/crypto/heimdal/cf/check-man.m4#2 integrate .. //depot/projects/ia64/crypto/heimdal/cf/check-netinet-ip-and-tcp.m4#2 integrate .. //depot/projects/ia64/crypto/heimdal/cf/check-type-extra.m4#2 integrate .. //depot/projects/ia64/crypto/heimdal/cf/check-x.m4#2 integrate .. //depot/projects/ia64/crypto/heimdal/cf/check-xau.m4#2 integrate .. //depot/projects/ia64/crypto/heimdal/cf/find-func-no-libs.m4#2 integrate .. //depot/projects/ia64/crypto/heimdal/cf/find-func-no-libs2.m4#3 integrate .. //depot/projects/ia64/crypto/heimdal/cf/find-func.m4#2 integrate .. //depot/projects/ia64/crypto/heimdal/cf/find-if-not-broken.m4#3 integrate .. //depot/projects/ia64/crypto/heimdal/cf/have-pragma-weak.m4#2 integrate .. //depot/projects/ia64/crypto/heimdal/cf/have-struct-field.m4#2 integrate .. //depot/projects/ia64/crypto/heimdal/cf/have-type.m4#2 integrate .. //depot/projects/ia64/crypto/heimdal/cf/have-types.m4#2 integrate .. //depot/projects/ia64/crypto/heimdal/cf/krb-bigendian.m4#3 integrate .. //depot/projects/ia64/crypto/heimdal/cf/krb-func-getcwd-broken.m4#3 integrate .. //depot/projects/ia64/crypto/heimdal/cf/krb-func-getlogin.m4#2 integrate .. //depot/projects/ia64/crypto/heimdal/cf/krb-ipv6.m4#4 integrate .. //depot/projects/ia64/crypto/heimdal/cf/krb-prog-ln-s.m4#2 integrate .. //depot/projects/ia64/crypto/heimdal/cf/krb-prog-ranlib.m4#2 integrate .. //depot/projects/ia64/crypto/heimdal/cf/krb-prog-yacc.m4#2 integrate .. //depot/projects/ia64/crypto/heimdal/cf/krb-readline.m4#3 integrate .. //depot/projects/ia64/crypto/heimdal/cf/krb-struct-spwd.m4#2 integrate .. //depot/projects/ia64/crypto/heimdal/cf/krb-struct-winsize.m4#3 integrate .. //depot/projects/ia64/crypto/heimdal/cf/krb-sys-aix.m4#2 integrate .. //depot/projects/ia64/crypto/heimdal/cf/krb-sys-nextstep.m4#3 integrate .. //depot/projects/ia64/crypto/heimdal/cf/krb-version.m4#3 integrate .. //depot/projects/ia64/crypto/heimdal/cf/mips-abi.m4#3 integrate .. //depot/projects/ia64/crypto/heimdal/cf/need-proto.m4#3 integrate .. //depot/projects/ia64/crypto/heimdal/cf/osfc2.m4#3 integrate .. //depot/projects/ia64/crypto/heimdal/cf/proto-compat.m4#2 integrate .. //depot/projects/ia64/crypto/heimdal/cf/retsigtype.m4#2 integrate .. //depot/projects/ia64/crypto/heimdal/cf/roken-frag.m4#6 integrate .. //depot/projects/ia64/crypto/heimdal/cf/roken.m4#3 integrate .. //depot/projects/ia64/crypto/heimdal/cf/test-package.m4#4 integrate .. //depot/projects/ia64/crypto/heimdal/cf/wflags.m4#2 integrate .. //depot/projects/ia64/crypto/heimdal/config.guess#5 integrate .. //depot/projects/ia64/crypto/heimdal/config.sub#5 integrate .. //depot/projects/ia64/crypto/heimdal/configure#7 integrate .. //depot/projects/ia64/crypto/heimdal/configure.in#7 integrate .. //depot/projects/ia64/crypto/heimdal/doc/Makefile.am#2 integrate .. //depot/projects/ia64/crypto/heimdal/doc/Makefile.in#6 integrate .. //depot/projects/ia64/crypto/heimdal/doc/ack.texi#4 integrate .. //depot/projects/ia64/crypto/heimdal/doc/setup.texi#4 integrate .. //depot/projects/ia64/crypto/heimdal/include/Makefile.in#7 integrate .. //depot/projects/ia64/crypto/heimdal/include/config.h.in#5 integrate .. //depot/projects/ia64/crypto/heimdal/include/kadm5/Makefile.in#6 integrate .. //depot/projects/ia64/crypto/heimdal/install-sh#4 integrate .. //depot/projects/ia64/crypto/heimdal/kadmin/Makefile.in#6 integrate .. //depot/projects/ia64/crypto/heimdal/kadmin/kadmin.cat8#4 delete .. //depot/projects/ia64/crypto/heimdal/kadmin/kadmind.cat8#4 delete .. //depot/projects/ia64/crypto/heimdal/kdc/Makefile.in#6 integrate .. //depot/projects/ia64/crypto/heimdal/kdc/config.c#5 integrate .. //depot/projects/ia64/crypto/heimdal/kdc/connect.c#6 integrate .. //depot/projects/ia64/crypto/heimdal/kdc/hprop.cat8#4 delete .. //depot/projects/ia64/crypto/heimdal/kdc/hpropd.cat8#4 delete .. //depot/projects/ia64/crypto/heimdal/kdc/kaserver.c#7 integrate .. //depot/projects/ia64/crypto/heimdal/kdc/kdc.8#4 integrate .. //depot/projects/ia64/crypto/heimdal/kdc/kdc.cat8#4 delete .. //depot/projects/ia64/crypto/heimdal/kdc/kdc_locl.h#5 integrate .. //depot/projects/ia64/crypto/heimdal/kdc/kerberos4.c#5 integrate .. //depot/projects/ia64/crypto/heimdal/kdc/kerberos5.c#6 integrate .. //depot/projects/ia64/crypto/heimdal/kdc/kstash.cat8#4 delete .. //depot/projects/ia64/crypto/heimdal/kdc/string2key.cat8#4 delete .. //depot/projects/ia64/crypto/heimdal/kpasswd/Makefile.in#6 integrate .. //depot/projects/ia64/crypto/heimdal/kpasswd/kpasswd.cat1#4 delete .. //depot/projects/ia64/crypto/heimdal/kpasswd/kpasswdd.cat8#4 delete .. //depot/projects/ia64/crypto/heimdal/kuser/Makefile.in#6 integrate .. //depot/projects/ia64/crypto/heimdal/kuser/kdestroy.cat1#4 delete .. //depot/projects/ia64/crypto/heimdal/kuser/kgetcred.cat1#4 delete .. //depot/projects/ia64/crypto/heimdal/kuser/kinit.c#6 integrate .. //depot/projects/ia64/crypto/heimdal/kuser/kinit.cat1#4 delete .. //depot/projects/ia64/crypto/heimdal/kuser/klist.c#5 integrate .. //depot/projects/ia64/crypto/heimdal/kuser/klist.cat1#4 delete .. //depot/projects/ia64/crypto/heimdal/lib/45/Makefile.in#6 integrate .. //depot/projects/ia64/crypto/heimdal/lib/Makefile.in#6 integrate .. //depot/projects/ia64/crypto/heimdal/lib/asn1/Makefile.am#5 integrate .. //depot/projects/ia64/crypto/heimdal/lib/asn1/Makefile.in#6 integrate .. //depot/projects/ia64/crypto/heimdal/lib/asn1/der_free.c#3 integrate .. //depot/projects/ia64/crypto/heimdal/lib/asn1/der_length.c#3 integrate .. //depot/projects/ia64/crypto/heimdal/lib/asn1/der_locl.h#3 integrate .. //depot/projects/ia64/crypto/heimdal/lib/asn1/gen_free.c#3 integrate .. //depot/projects/ia64/crypto/heimdal/lib/asn1/gen_length.c#3 integrate .. //depot/projects/ia64/crypto/heimdal/lib/auth/Makefile.in#6 integrate .. //depot/projects/ia64/crypto/heimdal/lib/auth/afskauthlib/Makefile.in#6 integrate .. //depot/projects/ia64/crypto/heimdal/lib/auth/pam/Makefile.in#6 integrate .. //depot/projects/ia64/crypto/heimdal/lib/auth/sia/Makefile.in#6 integrate .. //depot/projects/ia64/crypto/heimdal/lib/com_err/Makefile.in#6 integrate .. //depot/projects/ia64/crypto/heimdal/lib/gssapi/8003.c#5 integrate .. //depot/projects/ia64/crypto/heimdal/lib/gssapi/ChangeLog#6 integrate .. //depot/projects/ia64/crypto/heimdal/lib/gssapi/Makefile.am#5 integrate .. //depot/projects/ia64/crypto/heimdal/lib/gssapi/Makefile.in#6 integrate .. //depot/projects/ia64/crypto/heimdal/lib/gssapi/accept_sec_context.c#4 integrate .. //depot/projects/ia64/crypto/heimdal/lib/gssapi/acquire_cred.c#5 integrate .. //depot/projects/ia64/crypto/heimdal/lib/gssapi/add_cred.c#2 integrate .. //depot/projects/ia64/crypto/heimdal/lib/gssapi/arcfour.c#1 branch .. //depot/projects/ia64/crypto/heimdal/lib/gssapi/arcfour.h#1 branch .. //depot/projects/ia64/crypto/heimdal/lib/gssapi/context_time.c#3 integrate .. //depot/projects/ia64/crypto/heimdal/lib/gssapi/decapsulate.c#3 integrate .. //depot/projects/ia64/crypto/heimdal/lib/gssapi/encapsulate.c#3 integrate .. //depot/projects/ia64/crypto/heimdal/lib/gssapi/get_mic.c#4 integrate .. //depot/projects/ia64/crypto/heimdal/lib/gssapi/gssapi_locl.h#4 integrate .. //depot/projects/ia64/crypto/heimdal/lib/gssapi/init_sec_context.c#5 integrate .. //depot/projects/ia64/crypto/heimdal/lib/gssapi/release_cred.c#4 integrate .. //depot/projects/ia64/crypto/heimdal/lib/gssapi/unwrap.c#6 integrate .. //depot/projects/ia64/crypto/heimdal/lib/gssapi/verify_mic.c#5 integrate .. //depot/projects/ia64/crypto/heimdal/lib/gssapi/wrap.c#5 integrate .. //depot/projects/ia64/crypto/heimdal/lib/hdb/Makefile.am#5 integrate .. //depot/projects/ia64/crypto/heimdal/lib/hdb/Makefile.in#6 integrate .. //depot/projects/ia64/crypto/heimdal/lib/hdb/db3.c#3 integrate .. //depot/projects/ia64/crypto/heimdal/lib/hdb/hdb-ldap.c#4 integrate .. //depot/projects/ia64/crypto/heimdal/lib/hdb/hdb_locl.h#4 integrate .. //depot/projects/ia64/crypto/heimdal/lib/kadm5/ChangeLog#6 integrate .. //depot/projects/ia64/crypto/heimdal/lib/kadm5/Makefile.in#6 integrate .. //depot/projects/ia64/crypto/heimdal/lib/kadm5/chpass_s.c#2 integrate .. //depot/projects/ia64/crypto/heimdal/lib/kadm5/init_c.c#5 integrate .. //depot/projects/ia64/crypto/heimdal/lib/kadm5/ipropd_slave.c#6 integrate .. //depot/projects/ia64/crypto/heimdal/lib/kadm5/truncate_log.c#2 integrate .. //depot/projects/ia64/crypto/heimdal/lib/kafs/Makefile.in#6 integrate .. //depot/projects/ia64/crypto/heimdal/lib/kafs/kafs.cat3#4 delete .. //depot/projects/ia64/crypto/heimdal/lib/krb5/Makefile.am#7 integrate .. //depot/projects/ia64/crypto/heimdal/lib/krb5/Makefile.in#7 integrate .. //depot/projects/ia64/crypto/heimdal/lib/krb5/config_file.c#4 integrate .. //depot/projects/ia64/crypto/heimdal/lib/krb5/crypto.c#6 integrate .. //depot/projects/ia64/crypto/heimdal/lib/krb5/eai_to_heim_errno.c#2 integrate .. //depot/projects/ia64/crypto/heimdal/lib/krb5/fcache.c#3 integrate .. //depot/projects/ia64/crypto/heimdal/lib/krb5/get_cred.c#5 integrate .. //depot/projects/ia64/crypto/heimdal/lib/krb5/get_for_creds.c#5 integrate .. //depot/projects/ia64/crypto/heimdal/lib/krb5/get_in_tkt.c#6 integrate .. //depot/projects/ia64/crypto/heimdal/lib/krb5/krb5-private.h#4 integrate .. //depot/projects/ia64/crypto/heimdal/lib/krb5/krb5-protos.h#6 integrate .. //depot/projects/ia64/crypto/heimdal/lib/krb5/krb5.conf.5#5 integrate .. //depot/projects/ia64/crypto/heimdal/lib/krb5/krb5.h#6 integrate .. //depot/projects/ia64/crypto/heimdal/lib/krb5/mcache.c#4 integrate .. //depot/projects/ia64/crypto/heimdal/lib/krb5/mk_req_ext.c#3 integrate .. //depot/projects/ia64/crypto/heimdal/lib/krb5/mk_safe.c#4 integrate .. //depot/projects/ia64/crypto/heimdal/lib/krb5/parse-name-test.c#2 integrate .. //depot/projects/ia64/crypto/heimdal/lib/krb5/principal.c#6 integrate .. //depot/projects/ia64/crypto/heimdal/lib/krb5/rd_req.c#3 integrate .. //depot/projects/ia64/crypto/heimdal/lib/krb5/store.c#3 integrate .. //depot/projects/ia64/crypto/heimdal/lib/krb5/ticket.c#2 integrate .. //depot/projects/ia64/crypto/heimdal/lib/krb5/transited.c#4 integrate .. //depot/projects/ia64/crypto/heimdal/lib/krb5/verify_krb5_conf.c#5 integrate .. //depot/projects/ia64/crypto/heimdal/lib/roken/ChangeLog#7 integrate .. //depot/projects/ia64/crypto/heimdal/lib/roken/Makefile.am#7 integrate .. //depot/projects/ia64/crypto/heimdal/lib/roken/Makefile.in#7 integrate .. //depot/projects/ia64/crypto/heimdal/lib/roken/config.h.in#2 delete .. //depot/projects/ia64/crypto/heimdal/lib/roken/gai_strerror.c#2 integrate .. //depot/projects/ia64/crypto/heimdal/lib/roken/ndbm_wrap.c#2 integrate .. //depot/projects/ia64/crypto/heimdal/lib/roken/roken-common.h#5 integrate .. //depot/projects/ia64/crypto/heimdal/lib/sl/Makefile.in#6 integrate .. //depot/projects/ia64/crypto/heimdal/lib/vers/Makefile.in#6 integrate .. //depot/projects/ia64/crypto/heimdal/lib/vers/print_version.c#4 integrate .. //depot/projects/ia64/crypto/heimdal/ltconfig#3 integrate .. //depot/projects/ia64/crypto/heimdal/ltmain.sh#4 integrate .. //depot/projects/ia64/crypto/heimdal/missing#4 integrate .. //depot/projects/ia64/crypto/heimdal/mkinstalldirs#4 integrate .. //depot/projects/ia64/crypto/heimdal/tools/Makefile.in#7 integrate .. //depot/projects/ia64/crypto/heimdal/tools/krb5-config.cat1#4 delete .. //depot/projects/ia64/crypto/openssh/.cvsignore#1 branch .. //depot/projects/ia64/crypto/openssh/ChangeLog#7 integrate .. //depot/projects/ia64/crypto/openssh/README#6 integrate .. //depot/projects/ia64/crypto/openssh/acconfig.h#8 integrate .. //depot/projects/ia64/crypto/openssh/auth-krb5.c#9 integrate .. //depot/projects/ia64/crypto/openssh/auth-pam.c#10 integrate .. //depot/projects/ia64/crypto/openssh/auth-pam.h#7 integrate .. //depot/projects/ia64/crypto/openssh/auth-passwd.c#9 integrate .. //depot/projects/ia64/crypto/openssh/auth-sia.c#5 integrate .. //depot/projects/ia64/crypto/openssh/auth-sia.h#4 integrate .. //depot/projects/ia64/crypto/openssh/auth-skey.c#6 integrate .. //depot/projects/ia64/crypto/openssh/auth.h#9 integrate .. //depot/projects/ia64/crypto/openssh/auth1.c#11 integrate .. //depot/projects/ia64/crypto/openssh/auth2.c#11 integrate .. //depot/projects/ia64/crypto/openssh/canohost.c#9 integrate .. //depot/projects/ia64/crypto/openssh/config.h#6 integrate .. //depot/projects/ia64/crypto/openssh/configure.ac#7 integrate .. //depot/projects/ia64/crypto/openssh/contrib/Makefile#1 branch .. //depot/projects/ia64/crypto/openssh/contrib/README#1 branch .. //depot/projects/ia64/crypto/openssh/contrib/aix/README#1 branch .. //depot/projects/ia64/crypto/openssh/contrib/aix/buildbff.sh#1 branch .. //depot/projects/ia64/crypto/openssh/contrib/aix/inventory.sh#1 branch .. //depot/projects/ia64/crypto/openssh/contrib/aix/pam.conf#1 branch .. //depot/projects/ia64/crypto/openssh/contrib/caldera/openssh.spec#1 branch .. //depot/projects/ia64/crypto/openssh/contrib/caldera/ssh-host-keygen#1 branch .. //depot/projects/ia64/crypto/openssh/contrib/caldera/sshd.init#1 branch .. //depot/projects/ia64/crypto/openssh/contrib/caldera/sshd.pam#1 branch .. //depot/projects/ia64/crypto/openssh/contrib/cygwin/Makefile#1 branch .. //depot/projects/ia64/crypto/openssh/contrib/cygwin/README#1 branch .. //depot/projects/ia64/crypto/openssh/contrib/cygwin/ssh-host-config#1 branch .. //depot/projects/ia64/crypto/openssh/contrib/cygwin/ssh-user-config#1 branch .. //depot/projects/ia64/crypto/openssh/contrib/findssl.sh#1 branch .. //depot/projects/ia64/crypto/openssh/contrib/gnome-ssh-askpass1.c#1 branch .. //depot/projects/ia64/crypto/openssh/contrib/gnome-ssh-askpass2.c#1 branch .. //depot/projects/ia64/crypto/openssh/contrib/hpux/README#1 branch .. //depot/projects/ia64/crypto/openssh/contrib/hpux/egd#1 branch .. //depot/projects/ia64/crypto/openssh/contrib/hpux/egd.rc#1 branch .. //depot/projects/ia64/crypto/openssh/contrib/hpux/sshd#1 branch .. //depot/projects/ia64/crypto/openssh/contrib/hpux/sshd.rc#1 branch .. //depot/projects/ia64/crypto/openssh/contrib/redhat/gnome-ssh-askpass.csh#1 branch .. //depot/projects/ia64/crypto/openssh/contrib/redhat/gnome-ssh-askpass.sh#1 branch .. //depot/projects/ia64/crypto/openssh/contrib/redhat/openssh.spec#1 branch .. //depot/projects/ia64/crypto/openssh/contrib/redhat/sshd.init#1 branch .. //depot/projects/ia64/crypto/openssh/contrib/redhat/sshd.pam#1 branch .. //depot/projects/ia64/crypto/openssh/contrib/solaris/README#1 branch .. //depot/projects/ia64/crypto/openssh/contrib/solaris/buildpkg.sh#1 branch .. //depot/projects/ia64/crypto/openssh/contrib/solaris/opensshd.in#1 branch >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Apr 30 20:28:53 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9DB2516A4D0; Fri, 30 Apr 2004 20:28:53 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 726A216A4CE for ; Fri, 30 Apr 2004 20:28:53 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4556743D48 for ; Fri, 30 Apr 2004 20:28:53 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i413SrGe050900 for ; Fri, 30 Apr 2004 20:28:53 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i413Spko050880 for perforce@freebsd.org; Fri, 30 Apr 2004 20:28:51 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Fri, 30 Apr 2004 20:28:51 -0700 (PDT) Message-Id: <200405010328.i413Spko050880@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Subject: PERFORCE change 52022 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 01 May 2004 03:28:54 -0000 http://perforce.freebsd.org/chv.cgi?CH=52022 Change 52022 by rwatson@rwatson_tislabs on 2004/04/30 20:28:16 Apply changes from changeset 51880 to the TrustedBSD MAC branch for testing prior to merge to the base FreeBSD tree: In IP divert sockets, annotate that it would be preferable to use the inpcb label to the socket label when sending an outgoing packet, but don't change it for now because the inpcb isn't always used when transmitting. In raw sockets, assert the inpcb lock when sending with a raw socket (it's always true, and also necessary). Re-code the MAC Framework interaction here to use the inpcb rather than the socket label to avoid interactions between inpcb and socket locking while holding the inpcb lock. In tcp_input(), assert the inpcb lock before checking with MAC that the inpcb can receive the mbuf. This is redundant with a locking assertion in the MAC Framework. In tcp_output(), use the TCP inpcb rather than the socket to set the label for a new mbuf. This avoids acquiring the socket lock when we already hold the inpcb lock, which is sufficient. In tcp_respond() and tcp_twrespond(), perform initial assertions and setup of the inp pointer before starting to handle the packet. Affected files ... .. //depot/projects/trustedbsd/mac/sys/netinet/ip_divert.c#21 edit .. //depot/projects/trustedbsd/mac/sys/netinet/raw_ip.c#31 edit .. //depot/projects/trustedbsd/mac/sys/netinet/tcp_input.c#50 edit .. //depot/projects/trustedbsd/mac/sys/netinet/tcp_output.c#22 edit .. //depot/projects/trustedbsd/mac/sys/netinet/tcp_subr.c#43 edit .. //depot/projects/trustedbsd/mac/sys/netinet/tcp_syncache.c#26 edit .. //depot/projects/trustedbsd/mac/sys/netinet/udp_usrreq.c#30 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/netinet/ip_divert.c#21 (text+ko) ==== @@ -282,6 +282,9 @@ KASSERT(m->m_pkthdr.rcvif == NULL, ("rcvif not null")); #ifdef MAC + /* + * XXXRW: perhaps should be mac_create_mbuf_from_inpcb()? + */ mac_create_mbuf_from_socket(so, m); #endif ==== //depot/projects/trustedbsd/mac/sys/netinet/raw_ip.c#31 (text+ko) ==== @@ -145,6 +145,8 @@ { int policyfail = 0; + INP_LOCK_ASSERT(last); + #if defined(IPSEC) || defined(FAST_IPSEC) /* check AH/ESP integrity. */ if (ipsec4_in_reject(n, last)) { @@ -244,9 +246,22 @@ struct inpcb *inp = sotoinpcb(so); int flags = (so->so_options & SO_DONTROUTE) | IP_ALLOWBROADCAST; + /* + * XXXRW: Due to use of inp fields later in this function, the + * inp lock almost certainly needs to be held for the duration + * of the function, not just the MAC entry point. + */ #ifdef MAC + INP_LOCK(inp); + mac_create_mbuf_from_inpcb(inp, m); + INP_UNLOCK(inp); +#if 0 + /* + * XXXRW: Use inpcb instead. + */ mac_create_mbuf_from_socket(so, m); #endif +#endif /* * If the user handed us a complete IP packet, use it. ==== //depot/projects/trustedbsd/mac/sys/netinet/tcp_input.c#50 (text+ko) ==== @@ -751,6 +751,7 @@ tiwin = th->th_win; #ifdef MAC + INP_LOCK_ASSERT(inp); if (mac_check_inpcb_deliver(inp, m)) goto drop; #endif ==== //depot/projects/trustedbsd/mac/sys/netinet/tcp_output.c#22 (text+ko) ==== @@ -696,8 +696,14 @@ } m->m_pkthdr.rcvif = (struct ifnet *)0; #ifdef MAC + /* + * XXX: use mac_create_mbuf_from_inpcb(inp, m) instead of socket. + */ + mac_create_mbuf_from_inpcb(tp->t_inpcb, m); +#if 0 mac_create_mbuf_from_socket(so, m); #endif +#endif #ifdef INET6 if (isipv6) { ip6 = mtod(m, struct ip6_hdr *); ==== //depot/projects/trustedbsd/mac/sys/netinet/tcp_subr.c#43 (text+ko) ==== @@ -402,7 +402,7 @@ int isipv6; #endif /* INET6 */ int ipflags = 0; - struct inpcb *inp = NULL; + struct inpcb *inp; KASSERT(tp != NULL || m != NULL, ("tcp_respond: tp and m both NULL")); @@ -417,6 +417,10 @@ KASSERT(inp != NULL, ("tcp control block w/o inpcb")); INP_INFO_WLOCK_ASSERT(&tcbinfo); INP_LOCK_ASSERT(inp); + } else + inp = NULL; + + if (tp != NULL) { if (!(flags & TH_RST)) { win = sbspace(&inp->inp_socket->so_rcv); if (win > (long)TCP_MAXWIN << tp->rcv_scale) @@ -499,7 +503,14 @@ * Packet is associated with a socket, so allow the * label of the response to reflect the socket label. */ + INP_LOCK_ASSERT(inp); + mac_create_mbuf_from_inpcb(inp, m); +#if 0 + /* + * XXXRW: Use inpcb instead of socket here. + */ mac_create_mbuf_from_socket(inp->inp_socket, m); +#endif } else { /* * Packet is not associated with a socket, so possibly ==== //depot/projects/trustedbsd/mac/sys/netinet/tcp_syncache.c#26 (text+ko) ==== @@ -1129,8 +1129,15 @@ inp = sc->sc_tp->t_inpcb; INP_LOCK(inp); #ifdef MAC + /* + * XXXRW: Should be mac_create_mbuf_from_inpcb(inp, m) rather than + * from socket for locking reasons. + */ + mac_create_mbuf_from_inpcb(inp, m); +#if 0 mac_create_mbuf_from_socket(inp->inp_socket, m); #endif +#endif #ifdef INET6 if (sc->sc_inc.inc_isipv6) { ==== //depot/projects/trustedbsd/mac/sys/netinet/udp_usrreq.c#30 (text+ko) ==== @@ -457,6 +457,8 @@ struct sockaddr *append_sa; struct mbuf *opts = 0; + INP_LOCK_ASSERT(inp); + #if defined(IPSEC) || defined(FAST_IPSEC) /* check AH/ESP integrity. */ if (ipsec4_in_reject(n, last)) { @@ -734,8 +736,14 @@ INP_LOCK_ASSERT(inp); #ifdef MAC + /* + * XXXRW: Use inpcb instead of socket. + */ + mac_create_mbuf_from_inpcb(inp, m); +#if 0 mac_create_mbuf_from_socket(inp->inp_socket, m); #endif +#endif if (len + sizeof(struct udpiphdr) > IP_MAXPACKET) { error = EMSGSIZE; From owner-p4-projects@FreeBSD.ORG Fri Apr 30 20:38:06 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C82B916A4D0; Fri, 30 Apr 2004 20:38:05 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 99E7F16A4CE for ; Fri, 30 Apr 2004 20:38:05 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 748FC43D2D for ; Fri, 30 Apr 2004 20:38:05 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i413c5Ge058885 for ; Fri, 30 Apr 2004 20:38:05 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i413c4Ts058882 for perforce@freebsd.org; Fri, 30 Apr 2004 20:38:04 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Fri, 30 Apr 2004 20:38:04 -0700 (PDT) Message-Id: <200405010338.i413c4Ts058882@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Subject: PERFORCE change 52023 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 01 May 2004 03:38:06 -0000 http://perforce.freebsd.org/chv.cgi?CH=52023 Change 52023 by rwatson@rwatson_tislabs on 2004/04/30 20:37:54 Manually integrate changes from GENERIC to MAC from recent integrations of the MAC branch from the FreeBSD CVS repository. Affected files ... .. //depot/projects/trustedbsd/mac/sys/i386/conf/MAC#52 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/i386/conf/MAC#52 (text+ko) ==== @@ -12,11 +12,11 @@ # latest information. # # An exhaustive list of options and more detailed explanations of the -# device lines is also present in the ../../conf/NOTES and NOTES files. -# If you are in doubt as to the purpose or necessity of a line, check first +# device lines is also present in the ../../conf/NOTES and NOTES files. +# If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: src/sys/i386/conf/GENERIC,v 1.386 2003/06/08 02:03:01 jmallett Exp $ +# $FreeBSD: src/sys/i386/conf/GENERIC,v 1.398 2004/03/15 00:49:40 obrien Exp $ machine i386 cpu I486_CPU @@ -26,9 +26,9 @@ maxusers 0 #To statically compile in device wiring instead of /boot/device.hints -#hints "MAC.hints" #Default places to look for devices. +#hints "MAC.hints" # Default places to look for devices. -makeoptions DEBUG=-g #Build kernel with gdb(1) debug symbols +makeoptions DEBUG=-g # Build kernel with gdb(1) debug symbols options MAC #options MAC_ALWAYS_LABEL_MBUF @@ -39,47 +39,47 @@ options UFS_EXTATTR options UFS_EXTATTR_AUTOSTART -options SCHED_4BSD #4BSD scheduler -options INET #InterNETworking -options INET6 #IPv6 communications protocols -options FFS #Berkeley Fast Filesystem -options SOFTUPDATES #Enable FFS soft updates support -options UFS_ACL #Support for access control lists -options UFS_DIRHASH #Improve performance on big directories -options MD_ROOT #MD is a potential root device -options NFSCLIENT #Network Filesystem Client -options NFS_ROOT #NFS usable as /, requires NFSCLIENT -options MSDOSFS #MSDOS Filesystem -options CD9660 #ISO 9660 Filesystem -options PROCFS #Process filesystem (requires PSEUDOFS) -options PSEUDOFS #Pseudo-filesystem framework -options COMPAT_43 #Compatible with BSD 4.3 [KEEP THIS!] -options COMPAT_FREEBSD4 #Compatible with FreeBSD4 -options SCSI_DELAY=15000 #Delay (in ms) before probing SCSI -options KTRACE #ktrace(1) support -options SYSVSHM #SYSV-style shared memory -options SYSVMSG #SYSV-style message queues -options SYSVSEM #SYSV-style semaphores -options _KPOSIX_PRIORITY_SCHEDULING #Posix P1003_1B real-time extensions -#options P1003_1B_SEMAPHORES #POSIX P1003_1B semaphores +options SCHED_ULE # ULE scheduler +options INET # InterNETworking +options INET6 # IPv6 communications protocols +options FFS # Berkeley Fast Filesystem +options SOFTUPDATES # Enable FFS soft updates support +options UFS_ACL # Support for access control lists +options UFS_DIRHASH # Improve performance on big directories +options MD_ROOT # MD is a potential root device +options NFSCLIENT # Network Filesystem Client +options NFS_ROOT # NFS usable as /, requires NFSCLIENT +options MSDOSFS # MSDOS Filesystem +options CD9660 # ISO 9660 Filesystem +options PROCFS # Process filesystem (requires PSEUDOFS) +options PSEUDOFS # Pseudo-filesystem framework +options COMPAT_43 # Compatible with BSD 4.3 [KEEP THIS!] +options COMPAT_FREEBSD4 # Compatible with FreeBSD4 +options SCSI_DELAY=15000 # Delay (in ms) before probing SCSI +options KTRACE # ktrace(1) support +options SYSVSHM # SYSV-style shared memory +options SYSVMSG # SYSV-style message queues +options SYSVSEM # SYSV-style semaphores +options _KPOSIX_PRIORITY_SCHEDULING # POSIX P1003_1B real-time extensions options KBD_INSTALL_CDEV # install a CDEV entry in /dev options AHC_REG_PRETTY_PRINT # Print register bitfields in debug # output. Adds ~128k to driver. options AHD_REG_PRETTY_PRINT # Print register bitfields in debug # output. Adds ~215k to driver. +options PFIL_HOOKS # pfil(9) framework # Debugging for use in -current options ALT_BREAK_TO_DEBUGGER options BREAK_TO_DEBUGGER -options DDB #Enable the kernel debugger -options INVARIANTS #Enable calls of extra sanity checking -options INVARIANT_SUPPORT #Extra sanity checks of internal structures, required by INVARIANTS -options WITNESS #Enable checks to detect deadlocks and cycles -options WITNESS_SKIPSPIN #Don't run witness on spinlocks for speed +options DDB # Enable the kernel debugger +options INVARIANTS # Enable calls of extra sanity checking +options INVARIANT_SUPPORT # Extra sanity checks of internal structures, required by INVARIANTS +options WITNESS # Enable checks to detect deadlocks and cycles +options WITNESS_SKIPSPIN # Don't run witness on spinlocks for speed # To make an SMP kernel, the next two are needed -#options SMP # Symmetric MultiProcessor Kernel -#options APIC_IO # Symmetric (APIC) I/O +options SMP # Symmetric MultiProcessor Kernel +device apic # I/O APIC device isa device eisa @@ -90,11 +90,12 @@ # ATA and ATAPI devices device ata -device atadisk # ATA disk drives -device atapicd # ATAPI CDROM drives -device atapifd # ATAPI floppy drives -device atapist # ATAPI tape drives -options ATA_STATIC_ID #Static device numbering +device atadisk # ATA disk drives +device ataraid # ATA RAID drives +device atapicd # ATAPI CDROM drives +device atapifd # ATAPI floppy drives +device atapist # ATAPI tape drives +options ATA_STATIC_ID # Static device numbering # SCSI Controllers device ahb # EISA AHA1742 family @@ -117,13 +118,6 @@ device nsp # Workbit Ninja SCSI-3 device stg # TMC 18C30/18C50 -# RAID controllers interfaced to the SCSI subsystem -device asr # DPT SmartRAID V, VI and Adaptec SCSI RAID -device ciss # Compaq Smart RAID 5* -device dpt # DPT Smartcache III, IV - See NOTES for options! -device iir # Intel Integrated RAID -device mly # Mylex AcceleRAID/eXtremeRAID - # SCSI peripherals device scbus # SCSI bus (required for SCSI) device ch # SCSI media changers @@ -133,12 +127,19 @@ device pass # Passthrough device (direct SCSI access) device ses # SCSI Environmental Services (and SAF-TE) +# RAID controllers interfaced to the SCSI subsystem +device amr # AMI MegaRAID +device asr # DPT SmartRAID V, VI and Adaptec SCSI RAID +device ciss # Compaq Smart RAID 5* +device dpt # DPT Smartcache III, IV - See NOTES for options +device iir # Intel Integrated RAID +device ips # IBM (Adaptec) ServeRAID +device mly # Mylex AcceleRAID/eXtremeRAID + # RAID controllers device aac # Adaptec FSA RAID device aacp # SCSI passthrough for aac (requires CAM) -device amr # AMI MegaRAID device ida # Compaq Smart RAID -device ips # IBM (Adaptec) ServeRAID device mlx # Mylex DAC960 family device pst # Promise Supertrak SX6000 device twe # 3ware ATA RAID @@ -157,8 +158,8 @@ # Enable this for the pcvt (VT220 compatible) console driver #device vt -#options XSERVER # support for X server on a vt console -#options FAT_CURSOR # start with block cursor +#options XSERVER # support for X server on a vt console +#options FAT_CURSOR # start with block cursor device agp # support several AGP chipsets @@ -171,11 +172,11 @@ device pmtimer # PCCARD (PCMCIA) support -# Pcmcia and cardbus bridge support -device cbb # cardbus (yenta) bridge -#device pcic # ExCA ISA and PCI bridges -device pccard # PC Card (16-bit) bus -device cardbus # CardBus (32-bit) bus +# PCMCIA and cardbus bridge support +device cbb # cardbus (yenta) bridge +#device pcic # ExCA ISA and PCI bridges +device pccard # PC Card (16-bit) bus +device cardbus # CardBus (32-bit) bus # Serial (COM) ports device sio # 8250, 16[45]50 based serial ports @@ -188,6 +189,10 @@ device ppi # Parallel port interface device #device vpo # Requires scbus and da +# If you've got a "dumb" serial or parallel PCI card that is +# supported by the puc(4) glue driver, uncomment the following +# line to enable it (connects to the sio and/or ppc drivers): +#device puc # PCI Ethernet NICs. device de # DEC/Intel DC21x4x (``Tulip'') @@ -198,6 +203,8 @@ # PCI Ethernet NICs that use the common MII bus controller code. # NOTE: Be sure to keep the 'device miibus' line in order to use these NICs! device miibus # MII bus support +device bfe # Broadcom BCM440x 10/100 ethernet +device bge # Broadcom BCM570xx Gigabit Ethernet device dc # DEC/Intel 21143 and various workalikes device fxp # Intel EtherExpress PRO/100B (82557, 82558) device pcn # AMD Am79C97x PCI 10/100 (precedence over 'lnc') From owner-p4-projects@FreeBSD.ORG Sat May 1 12:17:28 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 73F1C16A4D0; Sat, 1 May 2004 12:17:28 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3F4A916A4CE for ; Sat, 1 May 2004 12:17:28 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D420C43D41 for ; Sat, 1 May 2004 12:17:26 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i41JHQGe090622 for ; Sat, 1 May 2004 12:17:26 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i41JGp4a090600 for perforce@freebsd.org; Sat, 1 May 2004 12:16:51 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 1 May 2004 12:16:51 -0700 (PDT) Message-Id: <200405011916.i41JGp4a090600@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Subject: PERFORCE change 52044 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 01 May 2004 19:17:29 -0000 http://perforce.freebsd.org/chv.cgi?CH=52044 Change 52044 by rwatson@rwatson_tislabs on 2004/05/01 12:16:04 Integrate TrustedBSD base branch from FreeBSD vendor branch. Affected files ... .. //depot/projects/trustedbsd/base/MAINTAINERS#23 integrate .. //depot/projects/trustedbsd/base/Makefile#32 integrate .. //depot/projects/trustedbsd/base/Makefile.inc1#50 integrate .. //depot/projects/trustedbsd/base/UPDATING#44 integrate .. //depot/projects/trustedbsd/base/bin/cat/cat.1#3 integrate .. //depot/projects/trustedbsd/base/bin/cat/cat.c#10 integrate .. //depot/projects/trustedbsd/base/bin/chflags/chflags.1#4 integrate .. //depot/projects/trustedbsd/base/bin/chflags/chflags.c#4 integrate .. //depot/projects/trustedbsd/base/bin/chmod/chmod.1#10 integrate .. //depot/projects/trustedbsd/base/bin/chmod/chmod.c#10 integrate .. //depot/projects/trustedbsd/base/bin/cp/cp.1#7 integrate .. //depot/projects/trustedbsd/base/bin/cp/cp.c#13 integrate .. //depot/projects/trustedbsd/base/bin/cp/extern.h#7 integrate .. //depot/projects/trustedbsd/base/bin/cp/utils.c#11 integrate .. //depot/projects/trustedbsd/base/bin/csh/USD.doc/csh.1#3 integrate .. //depot/projects/trustedbsd/base/bin/csh/USD.doc/csh.2#2 integrate .. //depot/projects/trustedbsd/base/bin/csh/USD.doc/csh.3#2 integrate .. //depot/projects/trustedbsd/base/bin/csh/USD.doc/csh.4#2 integrate .. //depot/projects/trustedbsd/base/bin/csh/USD.doc/csh.a#2 integrate .. //depot/projects/trustedbsd/base/bin/csh/USD.doc/csh.g#4 integrate .. //depot/projects/trustedbsd/base/bin/csh/USD.doc/tabs#2 integrate .. //depot/projects/trustedbsd/base/bin/csh/host.defs#2 integrate .. //depot/projects/trustedbsd/base/bin/date/date.1#8 integrate .. //depot/projects/trustedbsd/base/bin/date/date.c#9 integrate .. //depot/projects/trustedbsd/base/bin/date/extern.h#3 integrate .. //depot/projects/trustedbsd/base/bin/date/netdate.c#7 integrate .. //depot/projects/trustedbsd/base/bin/dd/Makefile#7 integrate .. //depot/projects/trustedbsd/base/bin/dd/args.c#11 integrate .. //depot/projects/trustedbsd/base/bin/dd/conv.c#5 integrate .. //depot/projects/trustedbsd/base/bin/dd/conv_tab.c#3 integrate .. //depot/projects/trustedbsd/base/bin/dd/dd.1#6 integrate .. //depot/projects/trustedbsd/base/bin/dd/dd.c#11 integrate .. //depot/projects/trustedbsd/base/bin/dd/dd.h#5 integrate .. //depot/projects/trustedbsd/base/bin/dd/extern.h#5 integrate .. //depot/projects/trustedbsd/base/bin/dd/misc.c#6 integrate .. //depot/projects/trustedbsd/base/bin/dd/position.c#5 integrate .. //depot/projects/trustedbsd/base/bin/df/Makefile#5 integrate .. //depot/projects/trustedbsd/base/bin/df/df.1#6 integrate .. //depot/projects/trustedbsd/base/bin/df/df.c#19 integrate .. //depot/projects/trustedbsd/base/bin/domainname/domainname.1#3 integrate .. //depot/projects/trustedbsd/base/bin/domainname/domainname.c#6 integrate .. //depot/projects/trustedbsd/base/bin/echo/echo.1#4 integrate .. //depot/projects/trustedbsd/base/bin/echo/echo.c#8 integrate .. //depot/projects/trustedbsd/base/bin/ed/cbc.c#6 integrate .. //depot/projects/trustedbsd/base/bin/hostname/hostname.1#3 integrate .. //depot/projects/trustedbsd/base/bin/hostname/hostname.c#6 integrate .. //depot/projects/trustedbsd/base/bin/kenv/kenv.c#3 integrate .. //depot/projects/trustedbsd/base/bin/kill/kill.1#3 integrate .. //depot/projects/trustedbsd/base/bin/kill/kill.c#7 integrate .. //depot/projects/trustedbsd/base/bin/ln/ln.1#6 integrate .. //depot/projects/trustedbsd/base/bin/ln/ln.c#9 integrate .. //depot/projects/trustedbsd/base/bin/ln/symlink.7#4 integrate .. //depot/projects/trustedbsd/base/bin/ls/cmp.c#5 integrate .. //depot/projects/trustedbsd/base/bin/ls/extern.h#8 integrate .. //depot/projects/trustedbsd/base/bin/ls/ls.1#22 integrate .. //depot/projects/trustedbsd/base/bin/ls/ls.c#21 integrate .. //depot/projects/trustedbsd/base/bin/ls/ls.h#8 integrate .. //depot/projects/trustedbsd/base/bin/ls/print.c#19 integrate .. //depot/projects/trustedbsd/base/bin/ls/util.c#10 integrate .. //depot/projects/trustedbsd/base/bin/mkdir/mkdir.1#4 integrate .. //depot/projects/trustedbsd/base/bin/mkdir/mkdir.c#6 integrate .. //depot/projects/trustedbsd/base/bin/mv/mv.1#7 integrate .. //depot/projects/trustedbsd/base/bin/mv/mv.c#11 integrate .. //depot/projects/trustedbsd/base/bin/pax/ar_io.c#7 integrate .. //depot/projects/trustedbsd/base/bin/pax/ar_subs.c#7 integrate .. //depot/projects/trustedbsd/base/bin/pax/buf_subs.c#7 integrate .. //depot/projects/trustedbsd/base/bin/pax/cache.c#7 integrate .. //depot/projects/trustedbsd/base/bin/pax/cache.h#4 integrate .. //depot/projects/trustedbsd/base/bin/pax/cpio.c#8 integrate .. //depot/projects/trustedbsd/base/bin/pax/cpio.h#2 integrate .. //depot/projects/trustedbsd/base/bin/pax/extern.h#4 integrate .. //depot/projects/trustedbsd/base/bin/pax/file_subs.c#6 integrate .. //depot/projects/trustedbsd/base/bin/pax/ftree.c#7 integrate .. //depot/projects/trustedbsd/base/bin/pax/ftree.h#2 integrate .. //depot/projects/trustedbsd/base/bin/pax/gen_subs.c#6 integrate .. //depot/projects/trustedbsd/base/bin/pax/options.c#11 integrate .. //depot/projects/trustedbsd/base/bin/pax/options.h#2 integrate .. //depot/projects/trustedbsd/base/bin/pax/pat_rep.c#8 integrate .. //depot/projects/trustedbsd/base/bin/pax/pat_rep.h#2 integrate .. //depot/projects/trustedbsd/base/bin/pax/pax.1#7 integrate .. //depot/projects/trustedbsd/base/bin/pax/pax.c#8 integrate .. //depot/projects/trustedbsd/base/bin/pax/pax.h#6 integrate .. //depot/projects/trustedbsd/base/bin/pax/sel_subs.c#6 integrate .. //depot/projects/trustedbsd/base/bin/pax/sel_subs.h#2 integrate .. //depot/projects/trustedbsd/base/bin/pax/tables.c#5 integrate .. //depot/projects/trustedbsd/base/bin/pax/tables.h#4 integrate .. //depot/projects/trustedbsd/base/bin/pax/tar.c#7 integrate .. //depot/projects/trustedbsd/base/bin/pax/tar.h#2 integrate .. //depot/projects/trustedbsd/base/bin/pax/tty_subs.c#5 integrate .. //depot/projects/trustedbsd/base/bin/ps/extern.h#12 integrate .. //depot/projects/trustedbsd/base/bin/ps/fmt.c#9 integrate .. //depot/projects/trustedbsd/base/bin/ps/keyword.c#17 integrate .. //depot/projects/trustedbsd/base/bin/ps/nlist.c#7 integrate .. //depot/projects/trustedbsd/base/bin/ps/print.c#16 integrate .. //depot/projects/trustedbsd/base/bin/ps/ps.1#18 integrate .. //depot/projects/trustedbsd/base/bin/ps/ps.c#17 integrate .. //depot/projects/trustedbsd/base/bin/ps/ps.h#7 integrate .. //depot/projects/trustedbsd/base/bin/pwd/pwd.1#8 integrate .. //depot/projects/trustedbsd/base/bin/pwd/pwd.c#9 integrate .. //depot/projects/trustedbsd/base/bin/rcp/extern.h#4 integrate .. //depot/projects/trustedbsd/base/bin/rcp/rcp.1#4 integrate .. //depot/projects/trustedbsd/base/bin/rcp/util.c#6 integrate .. //depot/projects/trustedbsd/base/bin/realpath/realpath.1#3 integrate .. //depot/projects/trustedbsd/base/bin/realpath/realpath.c#5 integrate .. //depot/projects/trustedbsd/base/bin/rm/rm.1#6 integrate .. //depot/projects/trustedbsd/base/bin/rm/rm.c#11 integrate .. //depot/projects/trustedbsd/base/bin/rmdir/rmdir.1#3 integrate .. //depot/projects/trustedbsd/base/bin/rmdir/rmdir.c#6 integrate .. //depot/projects/trustedbsd/base/bin/sh/alias.c#6 integrate .. //depot/projects/trustedbsd/base/bin/sh/alias.h#3 integrate .. //depot/projects/trustedbsd/base/bin/sh/arith.h#4 integrate .. //depot/projects/trustedbsd/base/bin/sh/arith.y#5 integrate .. //depot/projects/trustedbsd/base/bin/sh/arith_lex.l#5 integrate .. //depot/projects/trustedbsd/base/bin/sh/bltin/bltin.h#3 integrate .. //depot/projects/trustedbsd/base/bin/sh/bltin/echo.1#4 integrate .. //depot/projects/trustedbsd/base/bin/sh/bltin/echo.c#5 integrate .. //depot/projects/trustedbsd/base/bin/sh/builtins.def#5 integrate .. //depot/projects/trustedbsd/base/bin/sh/cd.c#7 integrate .. //depot/projects/trustedbsd/base/bin/sh/cd.h#3 integrate .. //depot/projects/trustedbsd/base/bin/sh/error.c#7 integrate .. //depot/projects/trustedbsd/base/bin/sh/error.h#5 integrate .. //depot/projects/trustedbsd/base/bin/sh/eval.c#9 integrate .. //depot/projects/trustedbsd/base/bin/sh/eval.h#4 integrate .. //depot/projects/trustedbsd/base/bin/sh/exec.c#9 integrate .. //depot/projects/trustedbsd/base/bin/sh/exec.h#4 integrate .. //depot/projects/trustedbsd/base/bin/sh/expand.c#13 integrate .. //depot/projects/trustedbsd/base/bin/sh/expand.h#4 integrate .. //depot/projects/trustedbsd/base/bin/sh/funcs/cmv#2 integrate .. //depot/projects/trustedbsd/base/bin/sh/funcs/dirs#2 integrate .. //depot/projects/trustedbsd/base/bin/sh/funcs/kill#2 integrate .. //depot/projects/trustedbsd/base/bin/sh/funcs/login#2 integrate .. //depot/projects/trustedbsd/base/bin/sh/funcs/newgrp#2 integrate .. //depot/projects/trustedbsd/base/bin/sh/funcs/popd#2 integrate .. //depot/projects/trustedbsd/base/bin/sh/funcs/pushd#2 integrate .. //depot/projects/trustedbsd/base/bin/sh/funcs/suspend#2 integrate .. //depot/projects/trustedbsd/base/bin/sh/histedit.c#6 integrate .. //depot/projects/trustedbsd/base/bin/sh/init.h#3 integrate .. //depot/projects/trustedbsd/base/bin/sh/input.c#6 integrate .. //depot/projects/trustedbsd/base/bin/sh/input.h#3 integrate .. //depot/projects/trustedbsd/base/bin/sh/jobs.c#15 integrate .. //depot/projects/trustedbsd/base/bin/sh/jobs.h#5 integrate .. //depot/projects/trustedbsd/base/bin/sh/mail.c#4 integrate .. //depot/projects/trustedbsd/base/bin/sh/mail.h#3 integrate .. //depot/projects/trustedbsd/base/bin/sh/main.c#6 integrate .. //depot/projects/trustedbsd/base/bin/sh/main.h#3 integrate .. //depot/projects/trustedbsd/base/bin/sh/memalloc.c#7 integrate .. //depot/projects/trustedbsd/base/bin/sh/memalloc.h#3 integrate .. //depot/projects/trustedbsd/base/bin/sh/miscbltin.c#6 integrate .. //depot/projects/trustedbsd/base/bin/sh/mkbuiltins#5 integrate .. //depot/projects/trustedbsd/base/bin/sh/mkinit.c#4 integrate .. //depot/projects/trustedbsd/base/bin/sh/mknodes.c#5 integrate .. //depot/projects/trustedbsd/base/bin/sh/mksyntax.c#6 integrate .. //depot/projects/trustedbsd/base/bin/sh/mktokens#3 integrate .. //depot/projects/trustedbsd/base/bin/sh/myhistedit.h#4 integrate .. //depot/projects/trustedbsd/base/bin/sh/mystring.c#4 integrate .. //depot/projects/trustedbsd/base/bin/sh/mystring.h#3 integrate .. //depot/projects/trustedbsd/base/bin/sh/nodes.c.pat#6 integrate .. //depot/projects/trustedbsd/base/bin/sh/nodetypes#3 integrate .. //depot/projects/trustedbsd/base/bin/sh/options.c#6 integrate .. //depot/projects/trustedbsd/base/bin/sh/options.h#4 integrate .. //depot/projects/trustedbsd/base/bin/sh/output.c#7 integrate .. //depot/projects/trustedbsd/base/bin/sh/output.h#5 integrate .. //depot/projects/trustedbsd/base/bin/sh/parser.c#12 integrate .. //depot/projects/trustedbsd/base/bin/sh/parser.h#3 integrate .. //depot/projects/trustedbsd/base/bin/sh/redir.c#10 integrate .. //depot/projects/trustedbsd/base/bin/sh/redir.h#4 integrate .. //depot/projects/trustedbsd/base/bin/sh/sh.1#14 integrate .. //depot/projects/trustedbsd/base/bin/sh/shell.h#5 integrate .. //depot/projects/trustedbsd/base/bin/sh/show.c#7 integrate .. //depot/projects/trustedbsd/base/bin/sh/show.h#3 integrate .. //depot/projects/trustedbsd/base/bin/sh/trap.c#5 integrate .. //depot/projects/trustedbsd/base/bin/sh/trap.h#4 integrate .. //depot/projects/trustedbsd/base/bin/sh/var.c#8 integrate .. //depot/projects/trustedbsd/base/bin/sh/var.h#5 integrate .. //depot/projects/trustedbsd/base/bin/sleep/sleep.1#3 integrate .. //depot/projects/trustedbsd/base/bin/sleep/sleep.c#7 integrate .. //depot/projects/trustedbsd/base/bin/stty/cchar.c#4 integrate .. //depot/projects/trustedbsd/base/bin/stty/extern.h#3 integrate .. //depot/projects/trustedbsd/base/bin/stty/gfmt.c#5 integrate .. //depot/projects/trustedbsd/base/bin/stty/key.c#4 integrate .. //depot/projects/trustedbsd/base/bin/stty/modes.c#4 integrate .. //depot/projects/trustedbsd/base/bin/stty/print.c#4 integrate .. //depot/projects/trustedbsd/base/bin/stty/stty.1#3 integrate .. //depot/projects/trustedbsd/base/bin/stty/stty.c#5 integrate .. //depot/projects/trustedbsd/base/bin/stty/stty.h#2 integrate .. //depot/projects/trustedbsd/base/bin/stty/util.c#4 integrate .. //depot/projects/trustedbsd/base/bin/sync/sync.8#4 integrate .. //depot/projects/trustedbsd/base/bin/sync/sync.c#5 integrate .. //depot/projects/trustedbsd/base/bin/test/test.1#3 integrate .. //depot/projects/trustedbsd/base/contrib/bsnmp/NEWS#3 integrate .. //depot/projects/trustedbsd/base/contrib/bsnmp/VERSION#3 integrate .. //depot/projects/trustedbsd/base/contrib/bsnmp/gensnmpdef/gensnmpdef.1#1 branch .. //depot/projects/trustedbsd/base/contrib/bsnmp/gensnmpdef/gensnmpdef.c#1 branch .. //depot/projects/trustedbsd/base/contrib/bsnmp/gensnmptree/gensnmptree.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/bsnmp/lib/asn1.3#3 integrate .. //depot/projects/trustedbsd/base/contrib/bsnmp/lib/bsnmpagent.3#3 integrate .. //depot/projects/trustedbsd/base/contrib/bsnmp/lib/bsnmpclient.3#3 integrate .. //depot/projects/trustedbsd/base/contrib/bsnmp/lib/bsnmplib.3#3 integrate .. //depot/projects/trustedbsd/base/contrib/bsnmp/lib/snmpagent.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/bsnmp/lib/snmpagent.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/bsnmp/snmp_mibII/mibII.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/bsnmp/snmp_mibII/mibII_interfaces.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/bsnmp/snmp_mibII/mibII_ipaddr.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/bsnmp/snmp_mibII/snmp_mibII.3#3 integrate .. //depot/projects/trustedbsd/base/contrib/bsnmp/snmpd/BEGEMOT-SNMPD.txt#3 integrate .. //depot/projects/trustedbsd/base/contrib/bsnmp/snmpd/action.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/bsnmp/snmpd/bsnmpd.1#3 integrate .. //depot/projects/trustedbsd/base/contrib/bsnmp/snmpd/config.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/bsnmp/snmpd/main.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/bsnmp/snmpd/snmpd.config#3 integrate .. //depot/projects/trustedbsd/base/contrib/bsnmp/snmpd/snmpmod.3#3 integrate .. //depot/projects/trustedbsd/base/contrib/bsnmp/snmpd/trans_lsock.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/bsnmp/snmpd/trap.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/com_err/ChangeLog#2 integrate .. //depot/projects/trustedbsd/base/contrib/com_err/Makefile.am#2 integrate .. //depot/projects/trustedbsd/base/contrib/com_err/Makefile.in#2 integrate .. //depot/projects/trustedbsd/base/contrib/com_err/com_err.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/com_err/com_err.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/com_err/com_right.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/com_err/compile_et.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/com_err/compile_et.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/com_err/error.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/com_err/lex.h#1 branch .. //depot/projects/trustedbsd/base/contrib/com_err/lex.l#2 integrate .. //depot/projects/trustedbsd/base/contrib/com_err/parse.y#2 integrate .. //depot/projects/trustedbsd/base/contrib/com_err/roken_rename.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/AUTHORS#2 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/BUGS#2 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/ChangeLog#5 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/FAQ#3 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/INSTALL#5 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/Makefile.am#4 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/Makefile.in#4 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/NEWS#5 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/README#3 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/TESTS#3 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/TODO#4 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/acinclude.m4#4 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/aclocal.m4#4 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/config.h.in#5 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/configure#5 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/configure.in#5 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/contrib/ChangeLog#5 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/contrib/Makefile.am#5 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/contrib/Makefile.in#5 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/contrib/check_cvs.in#2 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/contrib/commit_prep.in#2 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/contrib/cvs2vendor.sh#2 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/contrib/log_accum.in#2 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/contrib/rcs2log.sh#3 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/contrib/rcs2sccs.sh#3 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/contrib/sccs2rcs.in#3 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/depcomp#3 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/diff/ChangeLog#4 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/diff/Makefile.in#4 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/diff/diff.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/diff/diff3.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/diff/diffrun.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/diff/io.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/diff/system.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/diff/util.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/doc/ChangeLog#5 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/doc/Makefile.am#3 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/doc/Makefile.in#4 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/doc/cvs.texinfo#4 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/doc/cvsclient.texi#3 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/doc/stamp-1#4 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/doc/stamp-vti#4 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/doc/version-client.texi#4 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/doc/version.texi#4 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/lib/ChangeLog#5 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/lib/Makefile.am#3 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/lib/Makefile.in#4 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/lib/fncase.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/lib/getdate.y#4 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/lib/getpass.c#1 branch .. //depot/projects/trustedbsd/base/contrib/cvs/lib/mkdir.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/lib/regex.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/lib/system.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/lib/wait.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/man/ChangeLog#4 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/man/Makefile.am#2 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/man/Makefile.in#4 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/man/cvs.1#5 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/man/cvs.5#3 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/mktemp.sh#1 branch .. //depot/projects/trustedbsd/base/contrib/cvs/noautomake.sh#3 delete .. //depot/projects/trustedbsd/base/contrib/cvs/src/ChangeLog#5 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/src/Makefile.am#5 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/src/Makefile.in#5 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/src/add.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/src/admin.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/src/annotate.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/src/buffer.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/src/buffer.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/src/checkin.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/src/checkout.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/src/classify.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/src/client.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/src/client.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/src/commit.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/src/create_adm.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/src/cvs.h#5 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/src/cvsbug.in#3 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/src/cvsrc.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/src/diff.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/src/edit.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/src/edit.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/src/entries.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/src/error.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/src/expand_path.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/src/fileattr.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/src/fileattr.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/src/filesubr.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/src/find_names.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/src/hardlink.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/src/hash.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/src/hash.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/src/history.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/src/history.h#1 branch .. //depot/projects/trustedbsd/base/contrib/cvs/src/ignore.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/src/import.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/src/lock.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/src/log.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/src/login.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/src/logmsg.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/src/main.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/src/mkmodules.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/src/modules.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/src/myndbm.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/src/no_diff.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/src/parseinfo.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/src/patch.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/src/rcs.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/src/rcs.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/src/rcscmds.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/src/recurse.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/src/release.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/src/remove.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/src/repos.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/src/root.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/src/root.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/src/run.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/src/sanity.sh#5 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/src/server.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/src/server.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/src/stack.c#1 branch .. //depot/projects/trustedbsd/base/contrib/cvs/src/stack.h#1 branch .. //depot/projects/trustedbsd/base/contrib/cvs/src/status.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/src/subr.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/src/tag.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/src/update.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/src/update.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/src/vers_ts.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/src/watch.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/src/watch.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/src/wrapper.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/src/zlib.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/tools/ChangeLog#4 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/tools/Makefile.am#2 integrate .. //depot/projects/trustedbsd/base/contrib/cvs/tools/Makefile.in#4 integrate .. //depot/projects/trustedbsd/base/contrib/groff/tmac/doc-common#14 integrate .. //depot/projects/trustedbsd/base/contrib/groff/tmac/doc-syms#6 integrate .. //depot/projects/trustedbsd/base/contrib/less/LICENSE#2 integrate .. //depot/projects/trustedbsd/base/contrib/less/Makefile.aut#3 integrate .. //depot/projects/trustedbsd/base/contrib/less/Makefile.dsg#2 integrate .. //depot/projects/trustedbsd/base/contrib/less/Makefile.in#3 integrate .. //depot/projects/trustedbsd/base/contrib/less/NEWS#3 integrate .. //depot/projects/trustedbsd/base/contrib/less/README#3 integrate .. //depot/projects/trustedbsd/base/contrib/less/acconfig.h#2 delete .. //depot/projects/trustedbsd/base/contrib/less/brac.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/less/ch.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/less/charset.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/less/cmd.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/less/cmdbuf.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/less/command.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/less/configure#3 integrate .. //depot/projects/trustedbsd/base/contrib/less/configure.ac#1 branch .. //depot/projects/trustedbsd/base/contrib/less/configure.in#3 delete .. //depot/projects/trustedbsd/base/contrib/less/decode.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/less/defines.ds#3 integrate .. //depot/projects/trustedbsd/base/contrib/less/defines.h.in#3 integrate .. //depot/projects/trustedbsd/base/contrib/less/defines.h.top#3 delete .. //depot/projects/trustedbsd/base/contrib/less/defines.o2#3 integrate .. //depot/projects/trustedbsd/base/contrib/less/defines.wn#3 integrate .. //depot/projects/trustedbsd/base/contrib/less/edit.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/less/filename.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/less/forwback.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/less/funcs.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/less/help.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/less/ifile.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/less/input.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/less/jump.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/less/less.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/less/less.hlp#3 integrate .. //depot/projects/trustedbsd/base/contrib/less/less.man#3 integrate .. //depot/projects/trustedbsd/base/contrib/less/less.nro#3 integrate .. //depot/projects/trustedbsd/base/contrib/less/lessecho.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/less/lesskey.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/less/lesskey.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/less/lesskey.man#3 integrate .. //depot/projects/trustedbsd/base/contrib/less/lesskey.nro#3 integrate .. //depot/projects/trustedbsd/base/contrib/less/lglob.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/less/line.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/less/linenum.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/less/lsystem.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/less/main.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/less/mark.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/less/mkhelp.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/less/optfunc.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/less/option.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/less/option.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/less/opttbl.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/less/os.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/less/output.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/less/pckeys.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/less/position.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/less/position.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/less/prompt.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/less/screen.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/less/scrsize.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/less/search.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/less/signal.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/less/tags.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/less/ttyin.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/less/version.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/libpcap/.cvsignore#3 integrate .. //depot/projects/trustedbsd/base/contrib/libpcap/CHANGES#3 integrate .. //depot/projects/trustedbsd/base/contrib/libpcap/CREDITS#3 integrate .. //depot/projects/trustedbsd/base/contrib/libpcap/FILES#3 integrate .. //depot/projects/trustedbsd/base/contrib/libpcap/INSTALL.txt#2 integrate .. //depot/projects/trustedbsd/base/contrib/libpcap/Makefile.in#3 integrate .. //depot/projects/trustedbsd/base/contrib/libpcap/README#3 integrate .. //depot/projects/trustedbsd/base/contrib/libpcap/README.Win32#1 branch .. //depot/projects/trustedbsd/base/contrib/libpcap/README.aix#3 integrate .. //depot/projects/trustedbsd/base/contrib/libpcap/README.dag#1 branch .. //depot/projects/trustedbsd/base/contrib/libpcap/README.hpux#1 branch .. //depot/projects/trustedbsd/base/contrib/libpcap/VERSION#4 integrate .. //depot/projects/trustedbsd/base/contrib/libpcap/atmuni31.h#1 branch .. //depot/projects/trustedbsd/base/contrib/libpcap/bpf/net/bpf.h#3 delete .. //depot/projects/trustedbsd/base/contrib/libpcap/bpf/net/bpf_filter.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/libpcap/bpf_dump.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/libpcap/bpf_image.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/libpcap/config.guess#3 integrate .. //depot/projects/trustedbsd/base/contrib/libpcap/config.h.in#3 integrate .. //depot/projects/trustedbsd/base/contrib/libpcap/config.sub#3 integrate .. //depot/projects/trustedbsd/base/contrib/libpcap/configure#3 integrate .. //depot/projects/trustedbsd/base/contrib/libpcap/configure.in#3 integrate .. //depot/projects/trustedbsd/base/contrib/libpcap/etherent.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/libpcap/fad-getad.c#1 branch .. //depot/projects/trustedbsd/base/contrib/libpcap/fad-gifc.c#1 branch .. //depot/projects/trustedbsd/base/contrib/libpcap/fad-glifc.c#1 branch .. //depot/projects/trustedbsd/base/contrib/libpcap/fad-null.c#1 branch .. //depot/projects/trustedbsd/base/contrib/libpcap/fad-win32.c#1 branch .. //depot/projects/trustedbsd/base/contrib/libpcap/gencode.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/libpcap/gencode.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/libpcap/grammar.y#3 integrate .. //depot/projects/trustedbsd/base/contrib/libpcap/inet.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/libpcap/lbl/os-aix4.h#1 branch .. //depot/projects/trustedbsd/base/contrib/libpcap/lbl/os-hpux11.h#1 branch .. //depot/projects/trustedbsd/base/contrib/libpcap/lbl/os-osf5.h#1 branch .. //depot/projects/trustedbsd/base/contrib/libpcap/nametoaddr.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/libpcap/nlpid.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/libpcap/optimize.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/libpcap/pcap-bpf.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/libpcap/pcap-bpf.h#1 branch .. //depot/projects/trustedbsd/base/contrib/libpcap/pcap-dag.c#1 branch .. //depot/projects/trustedbsd/base/contrib/libpcap/pcap-dag.h#1 branch .. //depot/projects/trustedbsd/base/contrib/libpcap/pcap-dlpi.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/libpcap/pcap-enet.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/libpcap/pcap-int.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/libpcap/pcap-linux.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/libpcap/pcap-nit.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/libpcap/pcap-null.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/libpcap/pcap-pf.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/libpcap/pcap-snit.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/libpcap/pcap-snoop.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/libpcap/pcap-stdinc.h#1 branch .. //depot/projects/trustedbsd/base/contrib/libpcap/pcap-win32.c#1 branch .. //depot/projects/trustedbsd/base/contrib/libpcap/pcap.3#5 integrate .. //depot/projects/trustedbsd/base/contrib/libpcap/pcap.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/libpcap/pcap.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/libpcap/pf.h#1 branch .. //depot/projects/trustedbsd/base/contrib/libpcap/rawss7.h#1 branch .. //depot/projects/trustedbsd/base/contrib/libpcap/savefile.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/libpcap/scanner.l#4 integrate .. //depot/projects/trustedbsd/base/contrib/libpcap/sll.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/libpcap/snprintf.c#1 branch .. //depot/projects/trustedbsd/base/contrib/libpcap/sunatmpos.h#1 branch .. //depot/projects/trustedbsd/base/contrib/lukemftp/src/fetch.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/lukemftp/src/ftp.1#7 integrate .. //depot/projects/trustedbsd/base/contrib/lukemftp/src/ftp.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/lukemftp/src/progressbar.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/lukemftp/src/progressbar.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/lukemftp/src/util.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/lukemftp/src/version.h#5 integrate .. //depot/projects/trustedbsd/base/contrib/patch/COPYING#2 delete .. //depot/projects/trustedbsd/base/contrib/patch/ChangeLog#2 delete .. //depot/projects/trustedbsd/base/contrib/patch/FREEBSD-upgrade#2 delete .. //depot/projects/trustedbsd/base/contrib/patch/INSTALL#2 delete .. //depot/projects/trustedbsd/base/contrib/patch/Makefile.in#2 delete .. //depot/projects/trustedbsd/base/contrib/patch/NEWS#2 delete .. //depot/projects/trustedbsd/base/contrib/patch/README#2 delete .. //depot/projects/trustedbsd/base/contrib/patch/acconfig.h#2 delete .. //depot/projects/trustedbsd/base/contrib/patch/addext.c#2 delete .. //depot/projects/trustedbsd/base/contrib/patch/argmatch.c#2 delete .. //depot/projects/trustedbsd/base/contrib/patch/argmatch.h#2 delete .. //depot/projects/trustedbsd/base/contrib/patch/backupfile.c#2 delete .. //depot/projects/trustedbsd/base/contrib/patch/backupfile.h#2 delete .. //depot/projects/trustedbsd/base/contrib/patch/basename.c#2 delete .. //depot/projects/trustedbsd/base/contrib/patch/common.h#2 delete .. //depot/projects/trustedbsd/base/contrib/patch/config.hin#2 delete .. //depot/projects/trustedbsd/base/contrib/patch/configure#2 delete .. //depot/projects/trustedbsd/base/contrib/patch/configure.in#2 delete .. //depot/projects/trustedbsd/base/contrib/patch/getopt.c#2 delete .. //depot/projects/trustedbsd/base/contrib/patch/getopt.h#2 delete .. //depot/projects/trustedbsd/base/contrib/patch/getopt1.c#2 delete .. //depot/projects/trustedbsd/base/contrib/patch/inp.c#2 delete .. //depot/projects/trustedbsd/base/contrib/patch/inp.h#2 delete .. //depot/projects/trustedbsd/base/contrib/patch/install-sh#2 delete .. //depot/projects/trustedbsd/base/contrib/patch/maketime.c#2 delete .. //depot/projects/trustedbsd/base/contrib/patch/maketime.h#2 delete .. //depot/projects/trustedbsd/base/contrib/patch/partime.c#2 delete .. //depot/projects/trustedbsd/base/contrib/patch/partime.h#2 delete .. //depot/projects/trustedbsd/base/contrib/patch/patch.1#2 delete .. //depot/projects/trustedbsd/base/contrib/patch/patch.c#2 delete .. //depot/projects/trustedbsd/base/contrib/patch/pch.c#2 delete .. //depot/projects/trustedbsd/base/contrib/patch/pch.h#2 delete .. //depot/projects/trustedbsd/base/contrib/patch/quotearg.c#2 delete .. //depot/projects/trustedbsd/base/contrib/patch/quotearg.h#2 delete .. //depot/projects/trustedbsd/base/contrib/patch/util.c#2 delete .. //depot/projects/trustedbsd/base/contrib/patch/util.h#2 delete .. //depot/projects/trustedbsd/base/contrib/patch/version.c#2 delete .. //depot/projects/trustedbsd/base/contrib/patch/version.h#2 delete .. //depot/projects/trustedbsd/base/contrib/pf/man/pf.4#2 integrate .. //depot/projects/trustedbsd/base/contrib/pf/man/pflog.4#2 integrate .. //depot/projects/trustedbsd/base/contrib/pf/man/pfsync.4#2 integrate .. //depot/projects/trustedbsd/base/contrib/sendmail/FREEBSD-upgrade#14 integrate .. //depot/projects/trustedbsd/base/contrib/smbfs/mount_smbfs/mount_smbfs.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/CHANGES#4 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/CREDITS#4 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/FILES#4 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/INSTALL#3 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/Makefile.in#3 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/README#4 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/Readme.Win32#1 branch .. //depot/projects/trustedbsd/base/contrib/tcpdump/VERSION#5 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/acconfig.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/addrtoname.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/aodv.h#1 branch .. //depot/projects/trustedbsd/base/contrib/tcpdump/appletalk.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/arcnet.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/atm.h#1 branch .. //depot/projects/trustedbsd/base/contrib/tcpdump/atmuni31.h#1 branch .. //depot/projects/trustedbsd/base/contrib/tcpdump/bootp.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/bpf_dump.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/config.guess#3 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/config.h.in#4 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/config.sub#3 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/configure#4 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/configure.in#4 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/decnet.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/enc.h#1 branch .. //depot/projects/trustedbsd/base/contrib/tcpdump/ether.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/ethertype.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/extract.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/fddi.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/gmpls.c#1 branch .. //depot/projects/trustedbsd/base/contrib/tcpdump/gmpls.h#1 branch .. //depot/projects/trustedbsd/base/contrib/tcpdump/gmt2local.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/icmp6.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/ieee802_11.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/igrp.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/interface.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/ip.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/ip6.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/ipfc.h#1 branch .. //depot/projects/trustedbsd/base/contrib/tcpdump/ipproto.h#1 branch .. //depot/projects/trustedbsd/base/contrib/tcpdump/ipsec_doi.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/ipx.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/isakmp.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/lane.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/lbl/os-osf4.h#1 branch .. //depot/projects/trustedbsd/base/contrib/tcpdump/llc.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/machdep.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/missing/addrinfo.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/missing/addrsize.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/missing/bittypes.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/missing/datalinks.c#1 branch .. //depot/projects/trustedbsd/base/contrib/tcpdump/missing/dlnames.c#1 branch .. //depot/projects/trustedbsd/base/contrib/tcpdump/missing/getaddrinfo.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/missing/getnameinfo.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/missing/inet_aton.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/missing/inet_ntop.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/missing/inet_pton.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/missing/resolv6.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/missing/resolv_ext.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/missing/snprintf.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/missing/sockstorage.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/missing/strlcat.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/missing/strlcpy.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/missing/strsep.c#1 branch .. //depot/projects/trustedbsd/base/contrib/tcpdump/nameser.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/netbios.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/nfs.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/nfsfh.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/ntp.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/oakley.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/ospf.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/ospf6.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/oui.c#1 branch .. //depot/projects/trustedbsd/base/contrib/tcpdump/oui.h#1 branch .. //depot/projects/trustedbsd/base/contrib/tcpdump/parsenfsfh.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/pcap-missing.h#1 branch .. //depot/projects/trustedbsd/base/contrib/tcpdump/pf.h#1 branch .. //depot/projects/trustedbsd/base/contrib/tcpdump/ppp.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-802_11.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-ah.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-aodv.c#1 branch .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-ap1394.c#1 branch .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-arcnet.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-arp.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-ascii.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-atalk.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-atm.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-beep.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-bfd.c#1 branch .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-bgp.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-bootp.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-cdp.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-chdlc.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-cip.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-cnfp.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-decnet.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-dhcp6.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-domain.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-dvmrp.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-egp.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-enc.c#1 branch .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-esp.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-ether.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-fddi.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-fr.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-frag6.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-gre.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-hsrp.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-icmp.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-icmp6.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-igmp.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-igrp.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-ip.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-ip6.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-ip6opts.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-ipcomp.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-ipfc.c#1 branch .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-ipx.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-isakmp.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-isoclns.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-krb.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-l2tp.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-lane.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-lcp.c#2 delete .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-ldp.c#1 branch .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-llc.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-lwres.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-mobile.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-mobility.c#1 branch .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-mpls.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-msdp.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-netbios.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-nfs.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-ntp.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-null.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-ospf.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-ospf6.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-pflog.c#1 branch .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-pim.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-ppp.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-pppoe.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-pptp.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-radius.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-raw.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-rip.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-ripng.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-rsvp.c#1 branch .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-rt6.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-rx.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-sctp.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-sl.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-sll.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-smb.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-snmp.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-stp.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-sunatm.c#1 branch .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-sunrpc.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-tcp.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-telnet.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-tftp.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-timed.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-token.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-udp.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-vjc.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-vrrp.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-wb.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-zephyr.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/route6d.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/rx.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/sctpConstants.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/sctpHeader.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/setsignal.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/sll.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/smb.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/smbutil.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/strcasecmp.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/tcp.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/tcpdump-stdinc.h#1 branch .. //depot/projects/trustedbsd/base/contrib/tcpdump/tcpdump.1#4 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/tcpdump.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/telnet.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/timed.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/token.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/udp.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/util.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/tcpdump/vfprintf.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/traceroute/traceroute.c#6 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/ChangeLog#7 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/Makefile.in#6 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/NEWS#6 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/TODO#3 delete .. //depot/projects/trustedbsd/base/crypto/heimdal/acinclude.m4#2 delete .. //depot/projects/trustedbsd/base/crypto/heimdal/aclocal.m4#7 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/admin/Makefile.in#6 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/admin/ktutil.cat8#4 delete .. //depot/projects/trustedbsd/base/crypto/heimdal/appl/Makefile.in#6 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/appl/afsutil/ChangeLog#4 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/appl/afsutil/Makefile.in#6 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/appl/afsutil/afslog.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/appl/ftp/ChangeLog#7 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/appl/ftp/Makefile.in#6 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/appl/ftp/common/Makefile.in#6 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/appl/ftp/ftp/Makefile.in#6 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/appl/ftp/ftp/ftp.1#5 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/appl/ftp/ftp/ftp.cat1#4 delete .. //depot/projects/trustedbsd/base/crypto/heimdal/appl/ftp/ftp/gssapi.c#6 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/appl/ftp/ftp/main.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/appl/ftp/ftp/security.h#2 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/appl/ftp/ftpd/Makefile.in#6 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/appl/ftp/ftpd/ftpd.8#5 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/appl/ftp/ftpd/ftpd.c#5 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/appl/ftp/ftpd/ftpd.cat8#4 delete .. //depot/projects/trustedbsd/base/crypto/heimdal/appl/ftp/ftpd/ftpusers.cat5#4 delete .. //depot/projects/trustedbsd/base/crypto/heimdal/appl/kf/Makefile.in#6 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/appl/kf/kf.cat1#4 delete .. //depot/projects/trustedbsd/base/crypto/heimdal/appl/kf/kfd.cat8#4 delete .. //depot/projects/trustedbsd/base/crypto/heimdal/appl/login/Makefile.in#6 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/appl/push/Makefile.in#6 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/appl/push/pfrom.cat1#4 delete .. //depot/projects/trustedbsd/base/crypto/heimdal/appl/push/push.cat8#4 delete .. //depot/projects/trustedbsd/base/crypto/heimdal/appl/rcp/Makefile.in#6 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/appl/rsh/Makefile.in#6 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/appl/rsh/rshd.c#6 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/appl/su/Makefile.in#6 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/appl/telnet/ChangeLog#7 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/appl/telnet/Makefile.in#6 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/appl/telnet/libtelnet/Makefile.in#6 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/appl/telnet/telnet/Makefile.in#6 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/appl/telnet/telnet/main.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/appl/telnet/telnet/telnet.cat1#4 delete .. //depot/projects/trustedbsd/base/crypto/heimdal/appl/telnet/telnetd/Makefile.in#6 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/appl/telnet/telnetd/telnetd.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/appl/telnet/telnetd/telnetd.cat8#4 delete .. //depot/projects/trustedbsd/base/crypto/heimdal/appl/test/Makefile.in#6 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/cf/ChangeLog#6 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/cf/Makefile.am.common#5 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/cf/aix.m4#3 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/cf/auth-modules.m4#5 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/cf/broken-getaddrinfo.m4#3 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/cf/broken-getnameinfo.m4#2 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/cf/broken-glob.m4#3 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/cf/broken-realloc.m4#2 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/cf/broken-snprintf.m4#3 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/cf/c-attribute.m4#2 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/cf/c-function.m4#2 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/cf/capabilities.m4#2 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/cf/check-compile-et.m4#3 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/cf/check-declaration.m4#2 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/cf/check-getpwnam_r-posix.m4#2 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/cf/check-man.m4#2 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/cf/check-netinet-ip-and-tcp.m4#2 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/cf/check-type-extra.m4#2 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/cf/check-x.m4#2 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/cf/check-xau.m4#2 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/cf/find-func-no-libs.m4#2 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/cf/find-func-no-libs2.m4#3 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/cf/find-func.m4#2 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/cf/find-if-not-broken.m4#3 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/cf/have-pragma-weak.m4#2 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/cf/have-struct-field.m4#2 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/cf/have-type.m4#2 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/cf/have-types.m4#2 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/cf/krb-bigendian.m4#3 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/cf/krb-func-getcwd-broken.m4#3 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/cf/krb-func-getlogin.m4#2 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/cf/krb-ipv6.m4#4 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/cf/krb-prog-ln-s.m4#2 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/cf/krb-prog-ranlib.m4#2 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/cf/krb-prog-yacc.m4#2 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/cf/krb-readline.m4#3 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/cf/krb-struct-spwd.m4#2 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/cf/krb-struct-winsize.m4#3 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/cf/krb-sys-aix.m4#2 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/cf/krb-sys-nextstep.m4#3 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/cf/krb-version.m4#3 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/cf/mips-abi.m4#3 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/cf/need-proto.m4#3 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/cf/osfc2.m4#3 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/cf/proto-compat.m4#2 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/cf/retsigtype.m4#2 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/cf/roken-frag.m4#6 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/cf/roken.m4#3 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/cf/test-package.m4#4 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/cf/wflags.m4#2 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/config.guess#5 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/config.sub#5 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/configure#7 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/configure.in#7 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/doc/Makefile.am#2 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/doc/Makefile.in#6 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/doc/ack.texi#4 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/doc/setup.texi#4 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/include/Makefile.in#7 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/include/config.h.in#5 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/include/kadm5/Makefile.in#6 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/install-sh#4 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/kadmin/Makefile.in#6 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/kadmin/kadmin.cat8#4 delete .. //depot/projects/trustedbsd/base/crypto/heimdal/kadmin/kadmind.cat8#4 delete .. //depot/projects/trustedbsd/base/crypto/heimdal/kdc/Makefile.in#6 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/kdc/config.c#5 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/kdc/connect.c#6 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/kdc/hprop.cat8#4 delete .. //depot/projects/trustedbsd/base/crypto/heimdal/kdc/hpropd.cat8#4 delete .. //depot/projects/trustedbsd/base/crypto/heimdal/kdc/kaserver.c#7 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/kdc/kdc.8#4 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/kdc/kdc.cat8#4 delete .. //depot/projects/trustedbsd/base/crypto/heimdal/kdc/kdc_locl.h#5 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/kdc/kerberos4.c#5 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/kdc/kerberos5.c#6 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/kdc/kstash.cat8#4 delete .. //depot/projects/trustedbsd/base/crypto/heimdal/kdc/string2key.cat8#4 delete .. //depot/projects/trustedbsd/base/crypto/heimdal/kpasswd/Makefile.in#6 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/kpasswd/kpasswd.cat1#4 delete .. //depot/projects/trustedbsd/base/crypto/heimdal/kpasswd/kpasswdd.cat8#4 delete .. //depot/projects/trustedbsd/base/crypto/heimdal/kuser/Makefile.in#6 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/kuser/kdestroy.cat1#4 delete .. //depot/projects/trustedbsd/base/crypto/heimdal/kuser/kgetcred.cat1#4 delete .. //depot/projects/trustedbsd/base/crypto/heimdal/kuser/kinit.c#6 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/kuser/kinit.cat1#4 delete .. //depot/projects/trustedbsd/base/crypto/heimdal/kuser/klist.c#5 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/kuser/klist.cat1#4 delete .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/45/Makefile.in#6 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/Makefile.in#6 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/asn1/Makefile.am#5 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/asn1/Makefile.in#6 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/asn1/der_free.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/asn1/der_length.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/asn1/der_locl.h#3 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/asn1/gen_free.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/asn1/gen_length.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/auth/Makefile.in#6 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/auth/afskauthlib/Makefile.in#6 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/auth/pam/Makefile.in#6 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/auth/sia/Makefile.in#6 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/com_err/Makefile.in#6 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/gssapi/8003.c#5 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/gssapi/ChangeLog#6 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/gssapi/Makefile.am#5 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/gssapi/Makefile.in#6 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/gssapi/accept_sec_context.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/gssapi/acquire_cred.c#5 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/gssapi/add_cred.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/gssapi/arcfour.c#1 branch .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/gssapi/arcfour.h#1 branch .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/gssapi/context_time.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/gssapi/decapsulate.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/gssapi/encapsulate.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/gssapi/get_mic.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/gssapi/gssapi_locl.h#4 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/gssapi/init_sec_context.c#5 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/gssapi/release_cred.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/gssapi/unwrap.c#6 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/gssapi/verify_mic.c#5 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/gssapi/wrap.c#5 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/hdb/Makefile.am#5 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/hdb/Makefile.in#6 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/hdb/db3.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/hdb/hdb-ldap.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/hdb/hdb_locl.h#4 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/kadm5/ChangeLog#6 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/kadm5/Makefile.in#6 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/kadm5/chpass_s.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/kadm5/init_c.c#5 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/kadm5/ipropd_slave.c#6 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/kadm5/truncate_log.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/kafs/Makefile.in#6 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/kafs/kafs.cat3#4 delete .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/krb5/Makefile.am#7 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/krb5/Makefile.in#7 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/krb5/config_file.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/krb5/crypto.c#6 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/krb5/eai_to_heim_errno.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/krb5/fcache.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/krb5/get_cred.c#5 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/krb5/get_for_creds.c#5 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/krb5/get_in_tkt.c#6 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/krb5/krb5-private.h#4 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/krb5/krb5-protos.h#6 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/krb5/krb5.conf.5#5 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/krb5/krb5.h#6 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/krb5/mcache.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/krb5/mk_req_ext.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/krb5/mk_safe.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/krb5/parse-name-test.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/krb5/principal.c#6 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/krb5/rd_req.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/krb5/store.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/krb5/ticket.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/krb5/transited.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/krb5/verify_krb5_conf.c#5 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/roken/ChangeLog#7 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/roken/Makefile.am#7 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/roken/Makefile.in#7 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/roken/config.h.in#2 delete .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/roken/gai_strerror.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/roken/ndbm_wrap.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/roken/roken-common.h#5 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/sl/Makefile.in#6 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/vers/Makefile.in#6 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/vers/print_version.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/ltconfig#3 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/ltmain.sh#4 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/missing#4 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/mkinstalldirs#4 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/tools/Makefile.in#7 integrate .. //depot/projects/trustedbsd/base/crypto/heimdal/tools/krb5-config.cat1#4 delete .. //depot/projects/trustedbsd/base/crypto/openssh/.cvsignore#1 branch .. //depot/projects/trustedbsd/base/crypto/openssh/ChangeLog#7 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/README#6 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/acconfig.h#8 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/auth-krb5.c#9 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/auth-pam.c#8 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/auth-pam.h#7 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/auth-passwd.c#9 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/auth-sia.c#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/auth-sia.h#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/auth-skey.c#5 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/auth.h#9 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/auth1.c#9 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/auth2.c#11 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/canohost.c#8 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/config.h#6 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/configure.ac#7 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/contrib/Makefile#1 branch .. //depot/projects/trustedbsd/base/crypto/openssh/contrib/README#1 branch .. //depot/projects/trustedbsd/base/crypto/openssh/contrib/aix/README#1 branch .. //depot/projects/trustedbsd/base/crypto/openssh/contrib/aix/buildbff.sh#1 branch .. //depot/projects/trustedbsd/base/crypto/openssh/contrib/aix/inventory.sh#1 branch .. //depot/projects/trustedbsd/base/crypto/openssh/contrib/aix/pam.conf#1 branch .. //depot/projects/trustedbsd/base/crypto/openssh/contrib/caldera/openssh.spec#1 branch .. //depot/projects/trustedbsd/base/crypto/openssh/contrib/caldera/ssh-host-keygen#1 branch .. //depot/projects/trustedbsd/base/crypto/openssh/contrib/caldera/sshd.init#1 branch .. //depot/projects/trustedbsd/base/crypto/openssh/contrib/caldera/sshd.pam#1 branch .. //depot/projects/trustedbsd/base/crypto/openssh/contrib/cygwin/Makefile#1 branch .. //depot/projects/trustedbsd/base/crypto/openssh/contrib/cygwin/README#1 branch .. //depot/projects/trustedbsd/base/crypto/openssh/contrib/cygwin/ssh-host-config#1 branch .. //depot/projects/trustedbsd/base/crypto/openssh/contrib/cygwin/ssh-user-config#1 branch .. //depot/projects/trustedbsd/base/crypto/openssh/contrib/findssl.sh#1 branch .. //depot/projects/trustedbsd/base/crypto/openssh/contrib/gnome-ssh-askpass1.c#1 branch .. //depot/projects/trustedbsd/base/crypto/openssh/contrib/gnome-ssh-askpass2.c#1 branch .. //depot/projects/trustedbsd/base/crypto/openssh/contrib/hpux/README#1 branch .. //depot/projects/trustedbsd/base/crypto/openssh/contrib/hpux/egd#1 branch .. //depot/projects/trustedbsd/base/crypto/openssh/contrib/hpux/egd.rc#1 branch .. //depot/projects/trustedbsd/base/crypto/openssh/contrib/hpux/sshd#1 branch .. //depot/projects/trustedbsd/base/crypto/openssh/contrib/hpux/sshd.rc#1 branch .. //depot/projects/trustedbsd/base/crypto/openssh/contrib/redhat/gnome-ssh-askpass.csh#1 branch .. //depot/projects/trustedbsd/base/crypto/openssh/contrib/redhat/gnome-ssh-askpass.sh#1 branch .. //depot/projects/trustedbsd/base/crypto/openssh/contrib/redhat/openssh.spec#1 branch .. //depot/projects/trustedbsd/base/crypto/openssh/contrib/redhat/sshd.init#1 branch .. //depot/projects/trustedbsd/base/crypto/openssh/contrib/redhat/sshd.pam#1 branch .. //depot/projects/trustedbsd/base/crypto/openssh/contrib/solaris/README#1 branch .. //depot/projects/trustedbsd/base/crypto/openssh/contrib/solaris/buildpkg.sh#1 branch .. //depot/projects/trustedbsd/base/crypto/openssh/contrib/solaris/opensshd.in#1 branch .. //depot/projects/trustedbsd/base/crypto/openssh/contrib/ssh-copy-id#1 branch .. //depot/projects/trustedbsd/base/crypto/openssh/contrib/ssh-copy-id.1#1 branch >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sat May 1 14:54:39 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6110A16A4D0; Sat, 1 May 2004 14:54:39 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 1F08716A4CE for ; Sat, 1 May 2004 14:54:39 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 057C843D1F for ; Sat, 1 May 2004 14:54:39 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i41LscGe031175 for ; Sat, 1 May 2004 14:54:38 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i41Lscd6031172 for perforce@freebsd.org; Sat, 1 May 2004 14:54:38 -0700 (PDT) (envelope-from marcel@freebsd.org) Date: Sat, 1 May 2004 14:54:38 -0700 (PDT) Message-Id: <200405012154.i41Lscd6031172@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 52048 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 01 May 2004 21:54:40 -0000 http://perforce.freebsd.org/chv.cgi?CH=52048 Change 52048 by marcel@marcel_nfs on 2004/05/01 14:54:36 Add 3 sysctls: debug.kdb.available - this lists the availably KDB backends (RO). debug.kdb.current - the current backend (RW). debug.kdb.enter - enter KDB when written to. These sysctls replace debug.enter_debugger. Affected files ... .. //depot/projects/gdb/sys/kern/subr_kdb.c#11 edit Differences ... ==== //depot/projects/gdb/sys/kern/subr_kdb.c#11 (text+ko) ==== @@ -31,9 +31,11 @@ #include #include #include +#include #include #include #include +#include #include @@ -46,6 +48,94 @@ KDB_BACKEND(null, NULL, NULL, NULL); SET_DECLARE(kdb_dbbe_set, struct kdb_dbbe); +static int kdb_sysctl_available(SYSCTL_HANDLER_ARGS); +static int kdb_sysctl_current(SYSCTL_HANDLER_ARGS); +static int kdb_sysctl_enter(SYSCTL_HANDLER_ARGS); + +SYSCTL_NODE(_debug, OID_AUTO, kdb, CTLFLAG_RW, NULL, "KDB nodes"); + +SYSCTL_PROC(_debug_kdb, OID_AUTO, available, CTLTYPE_STRING | CTLFLAG_RD, 0, 0, + kdb_sysctl_available, "A", "list of available KDB backends"); + +SYSCTL_PROC(_debug_kdb, OID_AUTO, current, CTLTYPE_STRING | CTLFLAG_RW, 0, 0, + kdb_sysctl_current, "A", "currently selected KDB backend"); + +SYSCTL_PROC(_debug_kdb, OID_AUTO, enter, CTLTYPE_INT | CTLFLAG_RW, 0, 0, + kdb_sysctl_enter, "I", "set to enter the debugger"); + +static int +kdb_sysctl_available(SYSCTL_HANDLER_ARGS) +{ + struct kdb_dbbe *be, **iter; + char *avail, *p; + ssize_t len, sz; + int error; + + sz = 0; + SET_FOREACH(iter, kdb_dbbe_set) { + be = *iter; + if (be->dbbe_active == 0) + sz += strlen(be->dbbe_name) + 1; + } + sz++; + avail = malloc(sz, M_TEMP, M_WAITOK); + p = avail; + SET_FOREACH(iter, kdb_dbbe_set) { + be = *iter; + if (be->dbbe_active == 0) { + len = snprintf(p, sz, "%s ", be->dbbe_name); + p += len; + sz -= len; + } + } + KASSERT(sz >= 0, ("%s", __func__)); + error = sysctl_handle_string(oidp, avail, 0, req); + free(avail, M_TEMP); + return (error); +} + +static int +kdb_sysctl_current(SYSCTL_HANDLER_ARGS) +{ + char buf[16]; + struct kdb_dbbe *be, **iter; + int error; + + strncpy(buf, kdb_dbbe->dbbe_name, sizeof(buf)); + buf[sizeof(buf) - 1] = '\0'; + error = sysctl_handle_string(oidp, buf, sizeof(buf), req); + if (error != 0 || req->newptr == NULL) + return (error); + if (kdb_active) + return (EBUSY); + SET_FOREACH(iter, kdb_dbbe_set) { + be = *iter; + if (be->dbbe_active == 0 && strcmp(be->dbbe_name, buf) == 0) { + kdb_dbbe = be; + return (0); + } + } + return (EINVAL); +} + +static int +kdb_sysctl_enter(SYSCTL_HANDLER_ARGS) +{ + int error, i; + + error = sysctl_wire_old_buffer(req, sizeof(int)); + if (error == 0) { + i = 0; + error = sysctl_handle_int(oidp, &i, 0, req); + } + if (error != 0 || req->newptr == NULL) + return (error); + if (kdb_active) + return (EBUSY); + kdb_enter("sysctl debug.kdb.enter"); + return (0); +} + /* * Solaris implements a new BREAK which is initiated by a character sequence * CR ~ ^b which is similar to a familiar pattern used on Sun servers by the From owner-p4-projects@FreeBSD.ORG Sat May 1 17:21:41 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 879C516A4D0; Sat, 1 May 2004 17:21:41 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 5D09116A4CE for ; Sat, 1 May 2004 17:21:41 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3C99043D48 for ; Sat, 1 May 2004 17:21:41 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i420LfGe069905 for ; Sat, 1 May 2004 17:21:41 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i420LedR069896 for perforce@freebsd.org; Sat, 1 May 2004 17:21:40 -0700 (PDT) (envelope-from marcel@freebsd.org) Date: Sat, 1 May 2004 17:21:40 -0700 (PDT) Message-Id: <200405020021.i420LedR069896@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 52050 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 02 May 2004 00:21:42 -0000 http://perforce.freebsd.org/chv.cgi?CH=52050 Change 52050 by marcel@marcel_nfs on 2004/05/01 17:21:21 Remove the now unused db_sysctl.c Affected files ... .. //depot/projects/gdb/sys/ddb/db_sysctl.c#2 delete Differences ... From owner-p4-projects@FreeBSD.ORG Sat May 1 18:30:25 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 16EE416A4D4; Sat, 1 May 2004 18:30:25 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id D0AD116A4D2 for ; Sat, 1 May 2004 18:30:24 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D5F6943D4C for ; Sat, 1 May 2004 18:30:04 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i421U4Ge083890 for ; Sat, 1 May 2004 18:30:04 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i421U4QZ083887 for perforce@freebsd.org; Sat, 1 May 2004 18:30:04 -0700 (PDT) (envelope-from marcel@freebsd.org) Date: Sat, 1 May 2004 18:30:04 -0700 (PDT) Message-Id: <200405020130.i421U4QZ083887@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 52052 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 02 May 2004 01:30:25 -0000 http://perforce.freebsd.org/chv.cgi?CH=52052 Change 52052 by marcel@marcel_nfs on 2004/05/01 18:29:05 Add commands to set and show threads. Needs fleshing out. While here, cleanup a lot of unused code. Affected files ... .. //depot/projects/gdb/sys/conf/files#21 edit .. //depot/projects/gdb/sys/ddb/db_command.c#3 edit .. //depot/projects/gdb/sys/ddb/db_ps.c#4 edit .. //depot/projects/gdb/sys/ddb/db_thread.c#1 add .. //depot/projects/gdb/sys/ddb/ddb.h#5 edit Differences ... ==== //depot/projects/gdb/sys/conf/files#21 (text+ko) ==== @@ -237,6 +237,7 @@ ddb/db_ps.c optional ddb ddb/db_run.c optional ddb ddb/db_sym.c optional ddb +ddb/db_thread.c optional ddb ddb/db_variables.c optional ddb ddb/db_watch.c optional ddb ddb/db_write_cmd.c optional ddb ==== //depot/projects/gdb/sys/ddb/db_command.c#3 (text+ko) ==== @@ -67,7 +67,6 @@ SET_DECLARE(db_show_cmd_set, struct command); static db_cmdfcn_t db_fncall; -static db_cmdfcn_t db_gdb; static db_cmdfcn_t db_kill; static db_cmdfcn_t db_reset; static db_cmdfcn_t db_watchdog; @@ -375,9 +374,6 @@ */ static struct command db_show_all_cmds[] = { -#if 0 - { "threads", db_show_all_threads, 0, 0 }, -#endif { "procs", db_ps, 0, 0 }, { (char *)0 } }; @@ -386,10 +382,7 @@ { "all", 0, 0, db_show_all_cmds }, { "registers", db_show_regs, 0, 0 }, { "breaks", db_listbreak_cmd, 0, 0 }, - { "thread", db_show_one_thread, 0, 0 }, -#if 0 - { "port", ipc_port_print, 0, 0 }, -#endif + { "threads", db_show_threads, 0, 0 }, { (char *)0, } }; @@ -421,29 +414,15 @@ { "call", db_fncall, CS_OWN, 0 }, { "show", 0, 0, db_show_cmds }, { "ps", db_ps, 0, 0 }, - { "gdb", db_gdb, 0, 0 }, { "reset", db_reset, 0, 0 }, { "kill", db_kill, CS_OWN, 0 }, { "watchdog", db_watchdog, 0, 0 }, + { "thread", db_set_thread, 0, 0 }, { (char *)0, } }; static struct command *db_last_command = 0; -#if 0 -void -db_help_cmd() -{ - struct command *cmd = db_command_table; - - while (cmd->name != 0) { - db_printf("%-12s", cmd->name); - db_end_line(); - cmd++; - } -} -#endif - /* * At least one non-optional command must be implemented using * DB_COMMAND() so that db_cmd_set gets created. Here is one. @@ -553,32 +532,6 @@ db_printf("%#lr\n", (long)retval); } -/* Enter GDB remote protocol debugger on the next trap. */ - -void *gdb_arg = NULL; -cn_getc_t *gdb_getc; -cn_putc_t *gdb_putc; - -static void -db_gdb (dummy1, dummy2, dummy3, dummy4) - db_expr_t dummy1; - boolean_t dummy2; - db_expr_t dummy3; - char * dummy4; -{ - - if (gdb_arg == NULL) { - db_printf("No gdb port enabled. Set flag 0x80 on desired port\n"); - db_printf("in your configuration file (currently sio only).\n"); - return; - } - boothowto ^= RB_GDB; - - db_printf("Next trap will enter %s\n", - boothowto & RB_GDB ? "GDB remote protocol mode" - : "DDB debugger"); -} - static void db_kill(dummy1, dummy2, dummy3, dummy4) db_expr_t dummy1; ==== //depot/projects/gdb/sys/ddb/db_ps.c#4 (text+ko) ==== @@ -166,29 +166,3 @@ } else db_printf(" %s\n", p->p_comm); } - - -#define INKERNEL(va) (((vm_offset_t)(va)) >= USRSTACK) -void -db_show_one_thread(db_expr_t addr, boolean_t have_addr, - db_expr_t count, char *modif) -{ - struct proc *p; - struct thread *td; - - if (!have_addr) - td = curthread; - else if (!INKERNEL(addr)) { - printf("bad thread address"); - return; - } else - td = (struct thread *)addr; - /* quick sanity check */ - if ((p = td->td_proc) != td->td_ksegrp->kg_proc) - return; - printf("Proc %p ",p); - dumpthread(p, td); -#ifdef __i386__ - db_stack_thread((db_expr_t)td, 1, count, modif); -#endif -} ==== //depot/projects/gdb/sys/ddb/ddb.h#5 (text+ko) ==== @@ -69,9 +69,7 @@ db_expr_t count; \ char *modif; -extern char *esym; extern db_expr_t db_maxoff; -extern int db_active; extern int db_indent; extern int db_inst_count; extern int db_load_count; @@ -112,8 +110,6 @@ void db_stack_thread(db_expr_t addr, boolean_t have_addr, db_expr_t count, char *modif); -void _db_init(void); - db_cmdfcn_t db_breakpoint_cmd; db_cmdfcn_t db_continue_cmd; db_cmdfcn_t db_delete_cmd; @@ -126,21 +122,15 @@ db_cmdfcn_t db_ps; db_cmdfcn_t db_search_cmd; db_cmdfcn_t db_set_cmd; +db_cmdfcn_t db_set_thread; db_cmdfcn_t db_show_regs; +db_cmdfcn_t db_show_threads; db_cmdfcn_t db_single_step_cmd; db_cmdfcn_t db_stack_trace_cmd; db_cmdfcn_t db_trace_until_call_cmd; db_cmdfcn_t db_trace_until_matching_cmd; db_cmdfcn_t db_watchpoint_cmd; db_cmdfcn_t db_write_cmd; -db_cmdfcn_t db_show_one_thread; - -#if 0 -db_cmdfcn_t db_help_cmd; -db_cmdfcn_t db_show_all_threads; -db_cmdfcn_t ipc_port_print; -db_cmdfcn_t vm_page_print; -#endif db_page_calloutfcn_t db_simple_pager; @@ -161,14 +151,4 @@ struct command *more; /* another level of command */ }; -/* XXX: UGLY hack */ -#ifdef CN_DEAD -/* - * Routines to support GDB on an sio port. - */ -extern void *gdb_arg; -extern cn_getc_t *gdb_getc; -extern cn_putc_t *gdb_putc; -#endif - #endif /* !_DDB_DDB_H_ */ From owner-p4-projects@FreeBSD.ORG Sat May 1 20:01:36 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B421216A4D0; Sat, 1 May 2004 20:01:35 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6F16116A4CF for ; Sat, 1 May 2004 20:01:35 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 590E943D48 for ; Sat, 1 May 2004 20:01:34 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i4231YGe004197 for ; Sat, 1 May 2004 20:01:34 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i42314UR003336 for perforce@freebsd.org; Sat, 1 May 2004 20:01:04 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 1 May 2004 20:01:04 -0700 (PDT) Message-Id: <200405020301.i42314UR003336@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Subject: PERFORCE change 52060 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 02 May 2004 03:01:36 -0000 http://perforce.freebsd.org/chv.cgi?CH=52060 Change 52060 by rwatson@rwatson_paprika on 2004/05/01 20:01:02 Revised submission message for change 52044 with full details. Integrate TrustedBSD base branch from FreeBSD vendor branch: Addition of twa driver for new 3Ware controllers; interfaces with CAM unlike twe driver. RAIDFrame GC'd. Additional of a kernel-toolchain target in system makefiles. "versrcreach" added to ipfw, which permits BGP routing tables to be used for ingress filtering. Trimming of many clause three's on Berkeley licenses. df(1) grows -c to show cumulative stats. ACL optimization in ls(1) print output. ps(1) moves a lot closer to Single-Unix-Spec. bsnmpd(1) update. com_err(3) update. cvs(1) update and security fixes. groff OS version number updates, library updates. less(1) update. libpcap(3) update. tcpdump(1) update. heimdal kerberos5 update. openssh(1) update. openssl(3) update. The usual assortment of pccard.conf entries. nologin moved to usr/sbin. locales come, locales go. Mostly come. diskless scrips redone. Continued evolution of libarchive, including ACL support. getvfsent() and friends go away. More and more wide/multi-byte character support. Thread-safe getaddrinfo(). PPC support for libdisk. The usual plethora of 0/NULL cleanups, type cleanups, cast cleanups, and other detrious of the C language. libradius grows crypto support. libthr and libpthread both become more mature in ways I don't entirely follow. Using internal wakeups instead of signals in libthr, constant changes in libpthread, etc, etc. dump can now pipe to another command with a popen(); restore does similar things. dump learns that snapshotting a read-only file system is a bad idea. Per-interface polling settings, rather than global configuration. 802.11 power management ioctls, protection management ioctls. Cleanups to the kernel and userspace routing code. The usual contless bug fixes, style fixes, spelling fixes, etc, etc. rc.conf support for pf, ntpdate_hosts, watchdig driver, md backed file systems. In VM, pmap_init() no longer takes physical start and stop addresses. We now have pmap_kenter_temporary(). On systems supporting it, direct virtual-to-physical addressing is used to support sf_bufs. Optimized pagecopy() available on various platforms. Linux emulation supports madvise(). Various parts of 32-bit freebsd emulation for 64-bit platforms finished (statfs and variations, signal context handling, etc). Information leak in handling of ps_args, ps_argsopen, and p_cansee fixed. More NDIS evil than you can shake a stick at. ACPI(4) update. PCI power state support. aac gets timeouts. if_arl uses 802.11 framework. Drastic asr cleanup. ciss(4) enhancements. Gratuitous and arguably incorrect use if ifp->if_addrhead to see if the link layer has initialized yet in various drivers removed. Various /dev/random enhancements to support hardware entropy sources. Most sound drivers become un-INTR_MPSAFE for now. syscons pieces fixed on Alpha, et al, such that system console output can be used before syscons has done a formal attach and/or make_dev(9) is usable, avoid NULL pointer dereferences, etc. twe(4) overhaul. Do not drop Giant via cdevsw entry points from VFS even if driver can run without Giant, due to risks of re-acquiring Giant at that point. callout(9) now supports callout_drain() to drain concurrent callouts before unregistering. Earlier interrupt re-enable encouraging coallescing; interrupt storm detection and mitigation. Raw sockets can be used in jail subject to a sysctl. Giant no longer needed in various process debugging activities. Giant now grabbed conditional to debug.mpsafenet for the entire network stack, not just the forwarding plane. Lots more fine-grained locking of pseudo-interfaces. if_gif loop detection is now real. AARP locked down in netatalk. Cred references now passed into inpcb calls, but not threads. "Size-changed" big fux in NFS client. NFS code now conditionally launches a high rate timeout based on whether or not there are pending RPCs/events, rather than always. Addition of lgetfh() system call. Various bogus vop locking functions, such as vop_nolock(), removed since they were a bad idea. Substantial performance optimizations in du's hard link handling. find(1) can search for files with extended ACLs. Affected files ... .. //depot/projects/trustedbsd/base/MAINTAINERS#24 edit .. //depot/projects/trustedbsd/base/Makefile#33 edit .. //depot/projects/trustedbsd/base/Makefile.inc1#51 edit .. //depot/projects/trustedbsd/base/UPDATING#45 edit .. //depot/projects/trustedbsd/base/bin/cat/cat.1#4 edit .. //depot/projects/trustedbsd/base/bin/cat/cat.c#11 edit .. //depot/projects/trustedbsd/base/bin/chflags/chflags.1#5 edit .. //depot/projects/trustedbsd/base/bin/chflags/chflags.c#5 edit .. //depot/projects/trustedbsd/base/bin/chmod/chmod.1#11 edit .. //depot/projects/trustedbsd/base/bin/chmod/chmod.c#11 edit .. //depot/projects/trustedbsd/base/bin/cp/cp.1#8 edit .. //depot/projects/trustedbsd/base/bin/cp/cp.c#14 edit .. //depot/projects/trustedbsd/base/bin/cp/extern.h#8 edit .. //depot/projects/trustedbsd/base/bin/cp/utils.c#12 edit .. //depot/projects/trustedbsd/base/bin/csh/USD.doc/csh.1#4 edit .. //depot/projects/trustedbsd/base/bin/csh/USD.doc/csh.2#3 edit .. //depot/projects/trustedbsd/base/bin/csh/USD.doc/csh.3#3 edit .. //depot/projects/trustedbsd/base/bin/csh/USD.doc/csh.4#3 edit .. //depot/projects/trustedbsd/base/bin/csh/USD.doc/csh.a#3 edit .. //depot/projects/trustedbsd/base/bin/csh/USD.doc/csh.g#5 edit .. //depot/projects/trustedbsd/base/bin/csh/USD.doc/tabs#3 edit .. //depot/projects/trustedbsd/base/bin/csh/host.defs#3 edit .. //depot/projects/trustedbsd/base/bin/date/date.1#9 edit .. //depot/projects/trustedbsd/base/bin/date/date.c#10 edit .. //depot/projects/trustedbsd/base/bin/date/extern.h#4 edit .. //depot/projects/trustedbsd/base/bin/date/netdate.c#8 edit .. //depot/projects/trustedbsd/base/bin/dd/Makefile#8 edit .. //depot/projects/trustedbsd/base/bin/dd/args.c#12 edit .. //depot/projects/trustedbsd/base/bin/dd/conv.c#6 edit .. //depot/projects/trustedbsd/base/bin/dd/conv_tab.c#4 edit .. //depot/projects/trustedbsd/base/bin/dd/dd.1#7 edit .. //depot/projects/trustedbsd/base/bin/dd/dd.c#12 edit .. //depot/projects/trustedbsd/base/bin/dd/dd.h#6 edit .. //depot/projects/trustedbsd/base/bin/dd/extern.h#6 edit .. //depot/projects/trustedbsd/base/bin/dd/misc.c#7 edit .. //depot/projects/trustedbsd/base/bin/dd/position.c#6 edit .. //depot/projects/trustedbsd/base/bin/df/Makefile#6 edit .. //depot/projects/trustedbsd/base/bin/df/df.1#7 edit .. //depot/projects/trustedbsd/base/bin/df/df.c#20 edit .. //depot/projects/trustedbsd/base/bin/domainname/domainname.1#4 edit .. //depot/projects/trustedbsd/base/bin/domainname/domainname.c#7 edit .. //depot/projects/trustedbsd/base/bin/echo/echo.1#5 edit .. //depot/projects/trustedbsd/base/bin/echo/echo.c#9 edit .. //depot/projects/trustedbsd/base/bin/ed/cbc.c#7 edit .. //depot/projects/trustedbsd/base/bin/hostname/hostname.1#4 edit .. //depot/projects/trustedbsd/base/bin/hostname/hostname.c#7 edit .. //depot/projects/trustedbsd/base/bin/kenv/kenv.c#4 edit .. //depot/projects/trustedbsd/base/bin/kill/kill.1#4 edit .. //depot/projects/trustedbsd/base/bin/kill/kill.c#8 edit .. //depot/projects/trustedbsd/base/bin/ln/ln.1#7 edit .. //depot/projects/trustedbsd/base/bin/ln/ln.c#10 edit .. //depot/projects/trustedbsd/base/bin/ln/symlink.7#5 edit .. //depot/projects/trustedbsd/base/bin/ls/cmp.c#6 edit .. //depot/projects/trustedbsd/base/bin/ls/extern.h#9 edit .. //depot/projects/trustedbsd/base/bin/ls/ls.1#23 edit .. //depot/projects/trustedbsd/base/bin/ls/ls.c#22 edit .. //depot/projects/trustedbsd/base/bin/ls/ls.h#9 edit .. //depot/projects/trustedbsd/base/bin/ls/print.c#20 edit .. //depot/projects/trustedbsd/base/bin/ls/util.c#11 edit .. //depot/projects/trustedbsd/base/bin/mkdir/mkdir.1#5 edit .. //depot/projects/trustedbsd/base/bin/mkdir/mkdir.c#7 edit .. //depot/projects/trustedbsd/base/bin/mv/mv.1#8 edit .. //depot/projects/trustedbsd/base/bin/mv/mv.c#12 edit .. //depot/projects/trustedbsd/base/bin/pax/ar_io.c#8 edit .. //depot/projects/trustedbsd/base/bin/pax/ar_subs.c#8 edit .. //depot/projects/trustedbsd/base/bin/pax/buf_subs.c#8 edit .. //depot/projects/trustedbsd/base/bin/pax/cache.c#8 edit .. //depot/projects/trustedbsd/base/bin/pax/cache.h#5 edit .. //depot/projects/trustedbsd/base/bin/pax/cpio.c#9 edit .. //depot/projects/trustedbsd/base/bin/pax/cpio.h#3 edit .. //depot/projects/trustedbsd/base/bin/pax/extern.h#5 edit .. //depot/projects/trustedbsd/base/bin/pax/file_subs.c#7 edit .. //depot/projects/trustedbsd/base/bin/pax/ftree.c#8 edit .. //depot/projects/trustedbsd/base/bin/pax/ftree.h#3 edit .. //depot/projects/trustedbsd/base/bin/pax/gen_subs.c#7 edit .. //depot/projects/trustedbsd/base/bin/pax/options.c#12 edit .. //depot/projects/trustedbsd/base/bin/pax/options.h#3 edit .. //depot/projects/trustedbsd/base/bin/pax/pat_rep.c#9 edit .. //depot/projects/trustedbsd/base/bin/pax/pat_rep.h#3 edit .. //depot/projects/trustedbsd/base/bin/pax/pax.1#8 edit .. //depot/projects/trustedbsd/base/bin/pax/pax.c#9 edit .. //depot/projects/trustedbsd/base/bin/pax/pax.h#7 edit .. //depot/projects/trustedbsd/base/bin/pax/sel_subs.c#7 edit .. //depot/projects/trustedbsd/base/bin/pax/sel_subs.h#3 edit .. //depot/projects/trustedbsd/base/bin/pax/tables.c#6 edit .. //depot/projects/trustedbsd/base/bin/pax/tables.h#5 edit .. //depot/projects/trustedbsd/base/bin/pax/tar.c#8 edit .. //depot/projects/trustedbsd/base/bin/pax/tar.h#3 edit .. //depot/projects/trustedbsd/base/bin/pax/tty_subs.c#6 edit .. //depot/projects/trustedbsd/base/bin/ps/extern.h#13 edit .. //depot/projects/trustedbsd/base/bin/ps/fmt.c#10 edit .. //depot/projects/trustedbsd/base/bin/ps/keyword.c#18 edit .. //depot/projects/trustedbsd/base/bin/ps/nlist.c#8 edit .. //depot/projects/trustedbsd/base/bin/ps/print.c#17 edit .. //depot/projects/trustedbsd/base/bin/ps/ps.1#19 edit .. //depot/projects/trustedbsd/base/bin/ps/ps.c#18 edit .. //depot/projects/trustedbsd/base/bin/ps/ps.h#8 edit .. //depot/projects/trustedbsd/base/bin/pwd/pwd.1#9 edit .. //depot/projects/trustedbsd/base/bin/pwd/pwd.c#10 edit .. //depot/projects/trustedbsd/base/bin/rcp/extern.h#5 edit .. //depot/projects/trustedbsd/base/bin/rcp/rcp.1#5 edit .. //depot/projects/trustedbsd/base/bin/rcp/util.c#7 edit .. //depot/projects/trustedbsd/base/bin/realpath/realpath.1#4 edit .. //depot/projects/trustedbsd/base/bin/realpath/realpath.c#6 edit .. //depot/projects/trustedbsd/base/bin/rm/rm.1#7 edit .. //depot/projects/trustedbsd/base/bin/rm/rm.c#12 edit .. //depot/projects/trustedbsd/base/bin/rmdir/rmdir.1#4 edit .. //depot/projects/trustedbsd/base/bin/rmdir/rmdir.c#7 edit .. //depot/projects/trustedbsd/base/bin/sh/alias.c#7 edit .. //depot/projects/trustedbsd/base/bin/sh/alias.h#4 edit .. //depot/projects/trustedbsd/base/bin/sh/arith.h#5 edit .. //depot/projects/trustedbsd/base/bin/sh/arith.y#6 edit .. //depot/projects/trustedbsd/base/bin/sh/arith_lex.l#6 edit .. //depot/projects/trustedbsd/base/bin/sh/bltin/bltin.h#4 edit .. //depot/projects/trustedbsd/base/bin/sh/bltin/echo.1#5 edit .. //depot/projects/trustedbsd/base/bin/sh/bltin/echo.c#6 edit .. //depot/projects/trustedbsd/base/bin/sh/builtins.def#6 edit .. //depot/projects/trustedbsd/base/bin/sh/cd.c#8 edit .. //depot/projects/trustedbsd/base/bin/sh/cd.h#4 edit .. //depot/projects/trustedbsd/base/bin/sh/error.c#8 edit .. //depot/projects/trustedbsd/base/bin/sh/error.h#6 edit .. //depot/projects/trustedbsd/base/bin/sh/eval.c#10 edit .. //depot/projects/trustedbsd/base/bin/sh/eval.h#5 edit .. //depot/projects/trustedbsd/base/bin/sh/exec.c#10 edit .. //depot/projects/trustedbsd/base/bin/sh/exec.h#5 edit .. //depot/projects/trustedbsd/base/bin/sh/expand.c#14 edit .. //depot/projects/trustedbsd/base/bin/sh/expand.h#5 edit .. //depot/projects/trustedbsd/base/bin/sh/funcs/cmv#3 edit .. //depot/projects/trustedbsd/base/bin/sh/funcs/dirs#3 edit .. //depot/projects/trustedbsd/base/bin/sh/funcs/kill#3 edit .. //depot/projects/trustedbsd/base/bin/sh/funcs/login#3 edit .. //depot/projects/trustedbsd/base/bin/sh/funcs/newgrp#3 edit .. //depot/projects/trustedbsd/base/bin/sh/funcs/popd#3 edit .. //depot/projects/trustedbsd/base/bin/sh/funcs/pushd#3 edit .. //depot/projects/trustedbsd/base/bin/sh/funcs/suspend#3 edit .. //depot/projects/trustedbsd/base/bin/sh/histedit.c#7 edit .. //depot/projects/trustedbsd/base/bin/sh/init.h#4 edit .. //depot/projects/trustedbsd/base/bin/sh/input.c#7 edit .. //depot/projects/trustedbsd/base/bin/sh/input.h#4 edit .. //depot/projects/trustedbsd/base/bin/sh/jobs.c#16 edit .. //depot/projects/trustedbsd/base/bin/sh/jobs.h#6 edit .. //depot/projects/trustedbsd/base/bin/sh/mail.c#5 edit .. //depot/projects/trustedbsd/base/bin/sh/mail.h#4 edit .. //depot/projects/trustedbsd/base/bin/sh/main.c#7 edit .. //depot/projects/trustedbsd/base/bin/sh/main.h#4 edit .. //depot/projects/trustedbsd/base/bin/sh/memalloc.c#8 edit .. //depot/projects/trustedbsd/base/bin/sh/memalloc.h#4 edit .. //depot/projects/trustedbsd/base/bin/sh/miscbltin.c#7 edit .. //depot/projects/trustedbsd/base/bin/sh/mkbuiltins#6 edit .. //depot/projects/trustedbsd/base/bin/sh/mkinit.c#5 edit .. //depot/projects/trustedbsd/base/bin/sh/mknodes.c#6 edit .. //depot/projects/trustedbsd/base/bin/sh/mksyntax.c#7 edit .. //depot/projects/trustedbsd/base/bin/sh/mktokens#4 edit .. //depot/projects/trustedbsd/base/bin/sh/myhistedit.h#5 edit .. //depot/projects/trustedbsd/base/bin/sh/mystring.c#5 edit .. //depot/projects/trustedbsd/base/bin/sh/mystring.h#4 edit .. //depot/projects/trustedbsd/base/bin/sh/nodes.c.pat#7 edit .. //depot/projects/trustedbsd/base/bin/sh/nodetypes#4 edit .. //depot/projects/trustedbsd/base/bin/sh/options.c#7 edit .. //depot/projects/trustedbsd/base/bin/sh/options.h#5 edit .. //depot/projects/trustedbsd/base/bin/sh/output.c#8 edit .. //depot/projects/trustedbsd/base/bin/sh/output.h#6 edit .. //depot/projects/trustedbsd/base/bin/sh/parser.c#13 edit .. //depot/projects/trustedbsd/base/bin/sh/parser.h#4 edit .. //depot/projects/trustedbsd/base/bin/sh/redir.c#11 edit .. //depot/projects/trustedbsd/base/bin/sh/redir.h#5 edit .. //depot/projects/trustedbsd/base/bin/sh/sh.1#15 edit .. //depot/projects/trustedbsd/base/bin/sh/shell.h#6 edit .. //depot/projects/trustedbsd/base/bin/sh/show.c#8 edit .. //depot/projects/trustedbsd/base/bin/sh/show.h#4 edit .. //depot/projects/trustedbsd/base/bin/sh/trap.c#6 edit .. //depot/projects/trustedbsd/base/bin/sh/trap.h#5 edit .. //depot/projects/trustedbsd/base/bin/sh/var.c#9 edit .. //depot/projects/trustedbsd/base/bin/sh/var.h#6 edit .. //depot/projects/trustedbsd/base/bin/sleep/sleep.1#4 edit .. //depot/projects/trustedbsd/base/bin/sleep/sleep.c#8 edit .. //depot/projects/trustedbsd/base/bin/stty/cchar.c#5 edit .. //depot/projects/trustedbsd/base/bin/stty/extern.h#4 edit .. //depot/projects/trustedbsd/base/bin/stty/gfmt.c#6 edit .. //depot/projects/trustedbsd/base/bin/stty/key.c#5 edit .. //depot/projects/trustedbsd/base/bin/stty/modes.c#5 edit .. //depot/projects/trustedbsd/base/bin/stty/print.c#5 edit .. //depot/projects/trustedbsd/base/bin/stty/stty.1#4 edit .. //depot/projects/trustedbsd/base/bin/stty/stty.c#6 edit .. //depot/projects/trustedbsd/base/bin/stty/stty.h#3 edit .. //depot/projects/trustedbsd/base/bin/stty/util.c#5 edit .. //depot/projects/trustedbsd/base/bin/sync/sync.8#5 edit .. //depot/projects/trustedbsd/base/bin/sync/sync.c#6 edit .. //depot/projects/trustedbsd/base/bin/test/test.1#4 edit .. //depot/projects/trustedbsd/base/contrib/bsnmp/NEWS#4 edit .. //depot/projects/trustedbsd/base/contrib/bsnmp/VERSION#4 edit .. //depot/projects/trustedbsd/base/contrib/bsnmp/gensnmpdef/gensnmpdef.1#2 edit .. //depot/projects/trustedbsd/base/contrib/bsnmp/gensnmpdef/gensnmpdef.c#2 edit .. //depot/projects/trustedbsd/base/contrib/bsnmp/gensnmptree/gensnmptree.c#4 edit .. //depot/projects/trustedbsd/base/contrib/bsnmp/lib/asn1.3#4 edit .. //depot/projects/trustedbsd/base/contrib/bsnmp/lib/bsnmpagent.3#4 edit .. //depot/projects/trustedbsd/base/contrib/bsnmp/lib/bsnmpclient.3#4 edit .. //depot/projects/trustedbsd/base/contrib/bsnmp/lib/bsnmplib.3#4 edit .. //depot/projects/trustedbsd/base/contrib/bsnmp/lib/snmpagent.c#4 edit .. //depot/projects/trustedbsd/base/contrib/bsnmp/lib/snmpagent.h#4 edit .. //depot/projects/trustedbsd/base/contrib/bsnmp/snmp_mibII/mibII.c#4 edit .. //depot/projects/trustedbsd/base/contrib/bsnmp/snmp_mibII/mibII_interfaces.c#4 edit .. //depot/projects/trustedbsd/base/contrib/bsnmp/snmp_mibII/mibII_ipaddr.c#4 edit .. //depot/projects/trustedbsd/base/contrib/bsnmp/snmp_mibII/snmp_mibII.3#4 edit .. //depot/projects/trustedbsd/base/contrib/bsnmp/snmpd/BEGEMOT-SNMPD.txt#4 edit .. //depot/projects/trustedbsd/base/contrib/bsnmp/snmpd/action.c#4 edit .. //depot/projects/trustedbsd/base/contrib/bsnmp/snmpd/bsnmpd.1#4 edit .. //depot/projects/trustedbsd/base/contrib/bsnmp/snmpd/config.c#4 edit .. //depot/projects/trustedbsd/base/contrib/bsnmp/snmpd/main.c#4 edit .. //depot/projects/trustedbsd/base/contrib/bsnmp/snmpd/snmpd.config#4 edit .. //depot/projects/trustedbsd/base/contrib/bsnmp/snmpd/snmpmod.3#4 edit .. //depot/projects/trustedbsd/base/contrib/bsnmp/snmpd/trans_lsock.c#3 edit .. //depot/projects/trustedbsd/base/contrib/bsnmp/snmpd/trap.c#4 edit .. //depot/projects/trustedbsd/base/contrib/com_err/ChangeLog#3 edit .. //depot/projects/trustedbsd/base/contrib/com_err/Makefile.am#3 edit .. //depot/projects/trustedbsd/base/contrib/com_err/Makefile.in#3 edit .. //depot/projects/trustedbsd/base/contrib/com_err/com_err.c#3 edit .. //depot/projects/trustedbsd/base/contrib/com_err/com_err.h#3 edit .. //depot/projects/trustedbsd/base/contrib/com_err/com_right.h#3 edit .. //depot/projects/trustedbsd/base/contrib/com_err/compile_et.c#3 edit .. //depot/projects/trustedbsd/base/contrib/com_err/compile_et.h#3 edit .. //depot/projects/trustedbsd/base/contrib/com_err/error.c#3 edit .. //depot/projects/trustedbsd/base/contrib/com_err/lex.h#2 edit .. //depot/projects/trustedbsd/base/contrib/com_err/lex.l#3 edit .. //depot/projects/trustedbsd/base/contrib/com_err/parse.y#3 edit .. //depot/projects/trustedbsd/base/contrib/com_err/roken_rename.h#3 edit .. //depot/projects/trustedbsd/base/contrib/cvs/AUTHORS#3 edit .. //depot/projects/trustedbsd/base/contrib/cvs/BUGS#3 edit .. //depot/projects/trustedbsd/base/contrib/cvs/ChangeLog#6 edit .. //depot/projects/trustedbsd/base/contrib/cvs/FAQ#4 edit .. //depot/projects/trustedbsd/base/contrib/cvs/INSTALL#6 edit .. //depot/projects/trustedbsd/base/contrib/cvs/Makefile.am#5 edit .. //depot/projects/trustedbsd/base/contrib/cvs/Makefile.in#5 edit .. //depot/projects/trustedbsd/base/contrib/cvs/NEWS#6 edit .. //depot/projects/trustedbsd/base/contrib/cvs/README#4 edit .. //depot/projects/trustedbsd/base/contrib/cvs/TESTS#4 edit .. //depot/projects/trustedbsd/base/contrib/cvs/TODO#5 edit .. //depot/projects/trustedbsd/base/contrib/cvs/acinclude.m4#5 edit .. //depot/projects/trustedbsd/base/contrib/cvs/aclocal.m4#5 edit .. //depot/projects/trustedbsd/base/contrib/cvs/config.h.in#6 edit .. //depot/projects/trustedbsd/base/contrib/cvs/configure#6 edit .. //depot/projects/trustedbsd/base/contrib/cvs/configure.in#6 edit .. //depot/projects/trustedbsd/base/contrib/cvs/contrib/ChangeLog#6 edit .. //depot/projects/trustedbsd/base/contrib/cvs/contrib/Makefile.am#6 edit .. //depot/projects/trustedbsd/base/contrib/cvs/contrib/Makefile.in#6 edit .. //depot/projects/trustedbsd/base/contrib/cvs/contrib/check_cvs.in#3 edit .. //depot/projects/trustedbsd/base/contrib/cvs/contrib/commit_prep.in#3 edit .. //depot/projects/trustedbsd/base/contrib/cvs/contrib/cvs2vendor.sh#3 edit .. //depot/projects/trustedbsd/base/contrib/cvs/contrib/log_accum.in#3 edit .. //depot/projects/trustedbsd/base/contrib/cvs/contrib/rcs2log.sh#4 edit .. //depot/projects/trustedbsd/base/contrib/cvs/contrib/rcs2sccs.sh#4 edit .. //depot/projects/trustedbsd/base/contrib/cvs/contrib/sccs2rcs.in#4 edit .. //depot/projects/trustedbsd/base/contrib/cvs/depcomp#4 edit .. //depot/projects/trustedbsd/base/contrib/cvs/diff/ChangeLog#5 edit .. //depot/projects/trustedbsd/base/contrib/cvs/diff/Makefile.in#5 edit .. //depot/projects/trustedbsd/base/contrib/cvs/diff/diff.c#4 edit .. //depot/projects/trustedbsd/base/contrib/cvs/diff/diff3.c#4 edit .. //depot/projects/trustedbsd/base/contrib/cvs/diff/diffrun.h#3 edit .. //depot/projects/trustedbsd/base/contrib/cvs/diff/io.c#4 edit .. //depot/projects/trustedbsd/base/contrib/cvs/diff/system.h#5 edit .. //depot/projects/trustedbsd/base/contrib/cvs/diff/util.c#3 edit .. //depot/projects/trustedbsd/base/contrib/cvs/doc/ChangeLog#6 edit .. //depot/projects/trustedbsd/base/contrib/cvs/doc/Makefile.am#4 edit .. //depot/projects/trustedbsd/base/contrib/cvs/doc/Makefile.in#5 edit .. //depot/projects/trustedbsd/base/contrib/cvs/doc/cvs.texinfo#5 edit .. //depot/projects/trustedbsd/base/contrib/cvs/doc/cvsclient.texi#4 edit .. //depot/projects/trustedbsd/base/contrib/cvs/doc/stamp-1#5 edit .. //depot/projects/trustedbsd/base/contrib/cvs/doc/stamp-vti#5 edit .. //depot/projects/trustedbsd/base/contrib/cvs/doc/version-client.texi#5 edit .. //depot/projects/trustedbsd/base/contrib/cvs/doc/version.texi#5 edit .. //depot/projects/trustedbsd/base/contrib/cvs/lib/ChangeLog#6 edit .. //depot/projects/trustedbsd/base/contrib/cvs/lib/Makefile.am#4 edit .. //depot/projects/trustedbsd/base/contrib/cvs/lib/Makefile.in#5 edit .. //depot/projects/trustedbsd/base/contrib/cvs/lib/fncase.c#3 edit .. //depot/projects/trustedbsd/base/contrib/cvs/lib/getdate.y#5 edit .. //depot/projects/trustedbsd/base/contrib/cvs/lib/getpass.c#2 edit .. //depot/projects/trustedbsd/base/contrib/cvs/lib/mkdir.c#3 edit .. //depot/projects/trustedbsd/base/contrib/cvs/lib/regex.c#4 edit .. //depot/projects/trustedbsd/base/contrib/cvs/lib/system.h#4 edit .. //depot/projects/trustedbsd/base/contrib/cvs/lib/wait.h#3 edit .. //depot/projects/trustedbsd/base/contrib/cvs/man/ChangeLog#5 edit .. //depot/projects/trustedbsd/base/contrib/cvs/man/Makefile.am#3 edit .. //depot/projects/trustedbsd/base/contrib/cvs/man/Makefile.in#5 edit .. //depot/projects/trustedbsd/base/contrib/cvs/man/cvs.1#6 edit .. //depot/projects/trustedbsd/base/contrib/cvs/man/cvs.5#4 edit .. //depot/projects/trustedbsd/base/contrib/cvs/mktemp.sh#2 edit .. //depot/projects/trustedbsd/base/contrib/cvs/src/ChangeLog#6 edit .. //depot/projects/trustedbsd/base/contrib/cvs/src/Makefile.am#6 edit .. //depot/projects/trustedbsd/base/contrib/cvs/src/Makefile.in#6 edit .. //depot/projects/trustedbsd/base/contrib/cvs/src/add.c#4 edit .. //depot/projects/trustedbsd/base/contrib/cvs/src/admin.c#6 edit .. //depot/projects/trustedbsd/base/contrib/cvs/src/annotate.c#6 edit .. //depot/projects/trustedbsd/base/contrib/cvs/src/buffer.c#6 edit .. //depot/projects/trustedbsd/base/contrib/cvs/src/buffer.h#5 edit .. //depot/projects/trustedbsd/base/contrib/cvs/src/checkin.c#3 edit .. //depot/projects/trustedbsd/base/contrib/cvs/src/checkout.c#5 edit .. //depot/projects/trustedbsd/base/contrib/cvs/src/classify.c#4 edit .. //depot/projects/trustedbsd/base/contrib/cvs/src/client.c#7 edit .. //depot/projects/trustedbsd/base/contrib/cvs/src/client.h#4 edit .. //depot/projects/trustedbsd/base/contrib/cvs/src/commit.c#6 edit .. //depot/projects/trustedbsd/base/contrib/cvs/src/create_adm.c#4 edit .. //depot/projects/trustedbsd/base/contrib/cvs/src/cvs.h#6 edit .. //depot/projects/trustedbsd/base/contrib/cvs/src/cvsbug.in#4 edit .. //depot/projects/trustedbsd/base/contrib/cvs/src/cvsrc.c#4 edit .. //depot/projects/trustedbsd/base/contrib/cvs/src/diff.c#6 edit .. //depot/projects/trustedbsd/base/contrib/cvs/src/edit.c#5 edit .. //depot/projects/trustedbsd/base/contrib/cvs/src/edit.h#3 edit .. //depot/projects/trustedbsd/base/contrib/cvs/src/entries.c#3 edit .. //depot/projects/trustedbsd/base/contrib/cvs/src/error.c#3 edit .. //depot/projects/trustedbsd/base/contrib/cvs/src/expand_path.c#3 edit .. //depot/projects/trustedbsd/base/contrib/cvs/src/fileattr.c#3 edit .. //depot/projects/trustedbsd/base/contrib/cvs/src/fileattr.h#3 edit .. //depot/projects/trustedbsd/base/contrib/cvs/src/filesubr.c#5 edit .. //depot/projects/trustedbsd/base/contrib/cvs/src/find_names.c#4 edit .. //depot/projects/trustedbsd/base/contrib/cvs/src/hardlink.c#3 edit .. //depot/projects/trustedbsd/base/contrib/cvs/src/hash.c#3 edit .. //depot/projects/trustedbsd/base/contrib/cvs/src/hash.h#3 edit .. //depot/projects/trustedbsd/base/contrib/cvs/src/history.c#5 edit .. //depot/projects/trustedbsd/base/contrib/cvs/src/history.h#2 edit .. //depot/projects/trustedbsd/base/contrib/cvs/src/ignore.c#4 edit .. //depot/projects/trustedbsd/base/contrib/cvs/src/import.c#5 edit .. //depot/projects/trustedbsd/base/contrib/cvs/src/lock.c#6 edit .. //depot/projects/trustedbsd/base/contrib/cvs/src/log.c#6 edit .. //depot/projects/trustedbsd/base/contrib/cvs/src/login.c#5 edit .. //depot/projects/trustedbsd/base/contrib/cvs/src/logmsg.c#5 edit .. //depot/projects/trustedbsd/base/contrib/cvs/src/main.c#6 edit .. //depot/projects/trustedbsd/base/contrib/cvs/src/mkmodules.c#4 edit .. //depot/projects/trustedbsd/base/contrib/cvs/src/modules.c#5 edit .. //depot/projects/trustedbsd/base/contrib/cvs/src/myndbm.c#6 edit .. //depot/projects/trustedbsd/base/contrib/cvs/src/no_diff.c#3 edit .. //depot/projects/trustedbsd/base/contrib/cvs/src/parseinfo.c#6 edit .. //depot/projects/trustedbsd/base/contrib/cvs/src/patch.c#6 edit .. //depot/projects/trustedbsd/base/contrib/cvs/src/rcs.c#6 edit .. //depot/projects/trustedbsd/base/contrib/cvs/src/rcs.h#3 edit .. //depot/projects/trustedbsd/base/contrib/cvs/src/rcscmds.c#4 edit .. //depot/projects/trustedbsd/base/contrib/cvs/src/recurse.c#6 edit .. //depot/projects/trustedbsd/base/contrib/cvs/src/release.c#3 edit .. //depot/projects/trustedbsd/base/contrib/cvs/src/remove.c#6 edit .. //depot/projects/trustedbsd/base/contrib/cvs/src/repos.c#3 edit .. //depot/projects/trustedbsd/base/contrib/cvs/src/root.c#6 edit .. //depot/projects/trustedbsd/base/contrib/cvs/src/root.h#3 edit .. //depot/projects/trustedbsd/base/contrib/cvs/src/run.c#3 edit .. //depot/projects/trustedbsd/base/contrib/cvs/src/sanity.sh#6 edit .. //depot/projects/trustedbsd/base/contrib/cvs/src/server.c#7 edit .. //depot/projects/trustedbsd/base/contrib/cvs/src/server.h#4 edit .. //depot/projects/trustedbsd/base/contrib/cvs/src/stack.c#2 edit .. //depot/projects/trustedbsd/base/contrib/cvs/src/stack.h#2 edit .. //depot/projects/trustedbsd/base/contrib/cvs/src/status.c#5 edit .. //depot/projects/trustedbsd/base/contrib/cvs/src/subr.c#5 edit .. //depot/projects/trustedbsd/base/contrib/cvs/src/tag.c#6 edit .. //depot/projects/trustedbsd/base/contrib/cvs/src/update.c#6 edit .. //depot/projects/trustedbsd/base/contrib/cvs/src/update.h#3 edit .. //depot/projects/trustedbsd/base/contrib/cvs/src/vers_ts.c#5 edit .. //depot/projects/trustedbsd/base/contrib/cvs/src/watch.c#5 edit .. //depot/projects/trustedbsd/base/contrib/cvs/src/watch.h#3 edit .. //depot/projects/trustedbsd/base/contrib/cvs/src/wrapper.c#5 edit .. //depot/projects/trustedbsd/base/contrib/cvs/src/zlib.c#5 edit .. //depot/projects/trustedbsd/base/contrib/cvs/tools/ChangeLog#5 edit .. //depot/projects/trustedbsd/base/contrib/cvs/tools/Makefile.am#3 edit .. //depot/projects/trustedbsd/base/contrib/cvs/tools/Makefile.in#5 edit .. //depot/projects/trustedbsd/base/contrib/groff/tmac/doc-common#15 edit .. //depot/projects/trustedbsd/base/contrib/groff/tmac/doc-syms#7 edit .. //depot/projects/trustedbsd/base/contrib/less/LICENSE#3 edit .. //depot/projects/trustedbsd/base/contrib/less/Makefile.aut#4 edit .. //depot/projects/trustedbsd/base/contrib/less/Makefile.dsg#3 edit .. //depot/projects/trustedbsd/base/contrib/less/Makefile.in#4 edit .. //depot/projects/trustedbsd/base/contrib/less/NEWS#4 edit .. //depot/projects/trustedbsd/base/contrib/less/README#4 edit .. //depot/projects/trustedbsd/base/contrib/less/brac.c#3 edit .. //depot/projects/trustedbsd/base/contrib/less/ch.c#4 edit .. //depot/projects/trustedbsd/base/contrib/less/charset.c#4 edit .. //depot/projects/trustedbsd/base/contrib/less/cmd.h#4 edit .. //depot/projects/trustedbsd/base/contrib/less/cmdbuf.c#4 edit .. //depot/projects/trustedbsd/base/contrib/less/command.c#4 edit .. //depot/projects/trustedbsd/base/contrib/less/configure#4 edit .. //depot/projects/trustedbsd/base/contrib/less/configure.ac#2 edit .. //depot/projects/trustedbsd/base/contrib/less/decode.c#4 edit .. //depot/projects/trustedbsd/base/contrib/less/defines.ds#4 edit .. //depot/projects/trustedbsd/base/contrib/less/defines.h.in#4 edit .. //depot/projects/trustedbsd/base/contrib/less/defines.o2#4 edit .. //depot/projects/trustedbsd/base/contrib/less/defines.wn#4 edit .. //depot/projects/trustedbsd/base/contrib/less/edit.c#3 edit .. //depot/projects/trustedbsd/base/contrib/less/filename.c#4 edit .. //depot/projects/trustedbsd/base/contrib/less/forwback.c#3 edit .. //depot/projects/trustedbsd/base/contrib/less/funcs.h#4 edit .. //depot/projects/trustedbsd/base/contrib/less/help.c#4 edit .. //depot/projects/trustedbsd/base/contrib/less/ifile.c#3 edit .. //depot/projects/trustedbsd/base/contrib/less/input.c#3 edit .. //depot/projects/trustedbsd/base/contrib/less/jump.c#3 edit .. //depot/projects/trustedbsd/base/contrib/less/less.h#4 edit .. //depot/projects/trustedbsd/base/contrib/less/less.hlp#4 edit .. //depot/projects/trustedbsd/base/contrib/less/less.man#4 edit .. //depot/projects/trustedbsd/base/contrib/less/less.nro#4 edit .. //depot/projects/trustedbsd/base/contrib/less/lessecho.c#3 edit .. //depot/projects/trustedbsd/base/contrib/less/lesskey.c#4 edit .. //depot/projects/trustedbsd/base/contrib/less/lesskey.h#3 edit .. //depot/projects/trustedbsd/base/contrib/less/lesskey.man#4 edit .. //depot/projects/trustedbsd/base/contrib/less/lesskey.nro#4 edit .. //depot/projects/trustedbsd/base/contrib/less/lglob.h#3 edit .. //depot/projects/trustedbsd/base/contrib/less/line.c#4 edit .. //depot/projects/trustedbsd/base/contrib/less/linenum.c#4 edit .. //depot/projects/trustedbsd/base/contrib/less/lsystem.c#4 edit .. //depot/projects/trustedbsd/base/contrib/less/main.c#4 edit .. //depot/projects/trustedbsd/base/contrib/less/mark.c#3 edit .. //depot/projects/trustedbsd/base/contrib/less/mkhelp.c#3 edit .. //depot/projects/trustedbsd/base/contrib/less/optfunc.c#4 edit .. //depot/projects/trustedbsd/base/contrib/less/option.c#4 edit .. //depot/projects/trustedbsd/base/contrib/less/option.h#3 edit .. //depot/projects/trustedbsd/base/contrib/less/opttbl.c#4 edit .. //depot/projects/trustedbsd/base/contrib/less/os.c#4 edit .. //depot/projects/trustedbsd/base/contrib/less/output.c#4 edit .. //depot/projects/trustedbsd/base/contrib/less/pckeys.h#3 edit .. //depot/projects/trustedbsd/base/contrib/less/position.c#3 edit .. //depot/projects/trustedbsd/base/contrib/less/position.h#3 edit .. //depot/projects/trustedbsd/base/contrib/less/prompt.c#4 edit .. //depot/projects/trustedbsd/base/contrib/less/screen.c#4 edit .. //depot/projects/trustedbsd/base/contrib/less/scrsize.c#3 edit .. //depot/projects/trustedbsd/base/contrib/less/search.c#4 edit .. //depot/projects/trustedbsd/base/contrib/less/signal.c#3 edit .. //depot/projects/trustedbsd/base/contrib/less/tags.c#4 edit .. //depot/projects/trustedbsd/base/contrib/less/ttyin.c#4 edit .. //depot/projects/trustedbsd/base/contrib/less/version.c#4 edit .. //depot/projects/trustedbsd/base/contrib/libpcap/.cvsignore#4 edit .. //depot/projects/trustedbsd/base/contrib/libpcap/CHANGES#4 edit .. //depot/projects/trustedbsd/base/contrib/libpcap/CREDITS#4 edit .. //depot/projects/trustedbsd/base/contrib/libpcap/FILES#4 edit .. //depot/projects/trustedbsd/base/contrib/libpcap/INSTALL.txt#3 edit .. //depot/projects/trustedbsd/base/contrib/libpcap/Makefile.in#4 edit .. //depot/projects/trustedbsd/base/contrib/libpcap/README#4 edit .. //depot/projects/trustedbsd/base/contrib/libpcap/README.Win32#2 edit .. //depot/projects/trustedbsd/base/contrib/libpcap/README.aix#4 edit .. //depot/projects/trustedbsd/base/contrib/libpcap/README.dag#2 edit .. //depot/projects/trustedbsd/base/contrib/libpcap/README.hpux#2 edit .. //depot/projects/trustedbsd/base/contrib/libpcap/VERSION#5 edit .. //depot/projects/trustedbsd/base/contrib/libpcap/atmuni31.h#2 edit .. //depot/projects/trustedbsd/base/contrib/libpcap/bpf/net/bpf_filter.c#3 edit .. //depot/projects/trustedbsd/base/contrib/libpcap/bpf_dump.c#3 edit .. //depot/projects/trustedbsd/base/contrib/libpcap/bpf_image.c#3 edit .. //depot/projects/trustedbsd/base/contrib/libpcap/config.guess#4 edit .. //depot/projects/trustedbsd/base/contrib/libpcap/config.h.in#4 edit .. //depot/projects/trustedbsd/base/contrib/libpcap/config.sub#4 edit .. //depot/projects/trustedbsd/base/contrib/libpcap/configure#4 edit .. //depot/projects/trustedbsd/base/contrib/libpcap/configure.in#4 edit .. //depot/projects/trustedbsd/base/contrib/libpcap/etherent.c#3 edit .. //depot/projects/trustedbsd/base/contrib/libpcap/fad-getad.c#2 edit .. //depot/projects/trustedbsd/base/contrib/libpcap/fad-gifc.c#2 edit .. //depot/projects/trustedbsd/base/contrib/libpcap/fad-glifc.c#2 edit .. //depot/projects/trustedbsd/base/contrib/libpcap/fad-null.c#2 edit .. //depot/projects/trustedbsd/base/contrib/libpcap/fad-win32.c#2 edit .. //depot/projects/trustedbsd/base/contrib/libpcap/gencode.c#6 edit .. //depot/projects/trustedbsd/base/contrib/libpcap/gencode.h#4 edit .. //depot/projects/trustedbsd/base/contrib/libpcap/grammar.y#4 edit .. //depot/projects/trustedbsd/base/contrib/libpcap/inet.c#4 edit .. //depot/projects/trustedbsd/base/contrib/libpcap/lbl/os-aix4.h#2 edit .. //depot/projects/trustedbsd/base/contrib/libpcap/lbl/os-hpux11.h#2 edit .. //depot/projects/trustedbsd/base/contrib/libpcap/lbl/os-osf5.h#2 edit .. //depot/projects/trustedbsd/base/contrib/libpcap/nametoaddr.c#4 edit .. //depot/projects/trustedbsd/base/contrib/libpcap/nlpid.h#3 edit .. //depot/projects/trustedbsd/base/contrib/libpcap/optimize.c#4 edit .. //depot/projects/trustedbsd/base/contrib/libpcap/pcap-bpf.c#5 edit .. //depot/projects/trustedbsd/base/contrib/libpcap/pcap-bpf.h#2 edit .. //depot/projects/trustedbsd/base/contrib/libpcap/pcap-dag.c#2 edit .. //depot/projects/trustedbsd/base/contrib/libpcap/pcap-dag.h#2 edit .. //depot/projects/trustedbsd/base/contrib/libpcap/pcap-dlpi.c#4 edit .. //depot/projects/trustedbsd/base/contrib/libpcap/pcap-enet.c#3 edit .. //depot/projects/trustedbsd/base/contrib/libpcap/pcap-int.h#5 edit .. //depot/projects/trustedbsd/base/contrib/libpcap/pcap-linux.c#4 edit .. //depot/projects/trustedbsd/base/contrib/libpcap/pcap-nit.c#4 edit .. //depot/projects/trustedbsd/base/contrib/libpcap/pcap-null.c#3 edit .. //depot/projects/trustedbsd/base/contrib/libpcap/pcap-pf.c#4 edit .. //depot/projects/trustedbsd/base/contrib/libpcap/pcap-snit.c#4 edit .. //depot/projects/trustedbsd/base/contrib/libpcap/pcap-snoop.c#4 edit .. //depot/projects/trustedbsd/base/contrib/libpcap/pcap-stdinc.h#2 edit .. //depot/projects/trustedbsd/base/contrib/libpcap/pcap-win32.c#2 edit .. //depot/projects/trustedbsd/base/contrib/libpcap/pcap.3#6 edit .. //depot/projects/trustedbsd/base/contrib/libpcap/pcap.c#5 edit .. //depot/projects/trustedbsd/base/contrib/libpcap/pcap.h#5 edit .. //depot/projects/trustedbsd/base/contrib/libpcap/pf.h#2 edit .. //depot/projects/trustedbsd/base/contrib/libpcap/rawss7.h#2 edit .. //depot/projects/trustedbsd/base/contrib/libpcap/savefile.c#4 edit .. //depot/projects/trustedbsd/base/contrib/libpcap/scanner.l#5 edit .. //depot/projects/trustedbsd/base/contrib/libpcap/sll.h#3 edit .. //depot/projects/trustedbsd/base/contrib/libpcap/snprintf.c#2 edit .. //depot/projects/trustedbsd/base/contrib/libpcap/sunatmpos.h#2 edit .. //depot/projects/trustedbsd/base/contrib/lukemftp/src/fetch.c#7 edit .. //depot/projects/trustedbsd/base/contrib/lukemftp/src/ftp.1#8 edit .. //depot/projects/trustedbsd/base/contrib/lukemftp/src/ftp.c#7 edit .. //depot/projects/trustedbsd/base/contrib/lukemftp/src/progressbar.c#5 edit .. //depot/projects/trustedbsd/base/contrib/lukemftp/src/progressbar.h#3 edit .. //depot/projects/trustedbsd/base/contrib/lukemftp/src/util.c#6 edit .. //depot/projects/trustedbsd/base/contrib/lukemftp/src/version.h#6 edit .. //depot/projects/trustedbsd/base/contrib/pf/man/pf.4#3 edit .. //depot/projects/trustedbsd/base/contrib/pf/man/pflog.4#3 edit .. //depot/projects/trustedbsd/base/contrib/pf/man/pfsync.4#3 edit .. //depot/projects/trustedbsd/base/contrib/sendmail/FREEBSD-upgrade#15 edit .. //depot/projects/trustedbsd/base/contrib/smbfs/mount_smbfs/mount_smbfs.c#7 edit .. //depot/projects/trustedbsd/base/contrib/tcpdump/CHANGES#5 edit .. //depot/projects/trustedbsd/base/contrib/tcpdump/CREDITS#5 edit .. //depot/projects/trustedbsd/base/contrib/tcpdump/FILES#5 edit .. //depot/projects/trustedbsd/base/contrib/tcpdump/INSTALL#4 edit .. //depot/projects/trustedbsd/base/contrib/tcpdump/Makefile.in#4 edit .. //depot/projects/trustedbsd/base/contrib/tcpdump/README#5 edit .. //depot/projects/trustedbsd/base/contrib/tcpdump/Readme.Win32#2 edit .. //depot/projects/trustedbsd/base/contrib/tcpdump/VERSION#6 edit .. //depot/projects/trustedbsd/base/contrib/tcpdump/acconfig.h#4 edit .. //depot/projects/trustedbsd/base/contrib/tcpdump/addrtoname.c#5 edit .. //depot/projects/trustedbsd/base/contrib/tcpdump/aodv.h#2 edit .. //depot/projects/trustedbsd/base/contrib/tcpdump/appletalk.h#3 edit .. //depot/projects/trustedbsd/base/contrib/tcpdump/arcnet.h#3 edit .. //depot/projects/trustedbsd/base/contrib/tcpdump/atm.h#2 edit .. //depot/projects/trustedbsd/base/contrib/tcpdump/atmuni31.h#2 edit .. //depot/projects/trustedbsd/base/contrib/tcpdump/bootp.h#4 edit .. //depot/projects/trustedbsd/base/contrib/tcpdump/bpf_dump.c#3 edit .. //depot/projects/trustedbsd/base/contrib/tcpdump/config.guess#4 edit .. //depot/projects/trustedbsd/base/contrib/tcpdump/config.h.in#5 edit .. //depot/projects/trustedbsd/base/contrib/tcpdump/config.sub#4 edit .. //depot/projects/trustedbsd/base/contrib/tcpdump/configure#5 edit .. //depot/projects/trustedbsd/base/contrib/tcpdump/configure.in#5 edit .. //depot/projects/trustedbsd/base/contrib/tcpdump/decnet.h#3 edit .. //depot/projects/trustedbsd/base/contrib/tcpdump/enc.h#2 edit .. //depot/projects/trustedbsd/base/contrib/tcpdump/ether.h#3 edit .. //depot/projects/trustedbsd/base/contrib/tcpdump/ethertype.h#4 edit .. //depot/projects/trustedbsd/base/contrib/tcpdump/extract.h#4 edit .. //depot/projects/trustedbsd/base/contrib/tcpdump/fddi.h#3 edit .. //depot/projects/trustedbsd/base/contrib/tcpdump/gmpls.c#2 edit .. //depot/projects/trustedbsd/base/contrib/tcpdump/gmpls.h#2 edit .. //depot/projects/trustedbsd/base/contrib/tcpdump/gmt2local.c#4 edit .. //depot/projects/trustedbsd/base/contrib/tcpdump/icmp6.h#4 edit .. //depot/projects/trustedbsd/base/contrib/tcpdump/ieee802_11.h#3 edit .. //depot/projects/trustedbsd/base/contrib/tcpdump/igrp.h#3 edit .. //depot/projects/trustedbsd/base/contrib/tcpdump/interface.h#5 edit .. //depot/projects/trustedbsd/base/contrib/tcpdump/ip.h#3 edit .. //depot/projects/trustedbsd/base/contrib/tcpdump/ip6.h#3 edit .. //depot/projects/trustedbsd/base/contrib/tcpdump/ipfc.h#2 edit .. //depot/projects/trustedbsd/base/contrib/tcpdump/ipproto.h#2 edit .. //depot/projects/trustedbsd/base/contrib/tcpdump/ipsec_doi.h#3 edit .. //depot/projects/trustedbsd/base/contrib/tcpdump/ipx.h#4 edit .. //depot/projects/trustedbsd/base/contrib/tcpdump/isakmp.h#3 edit .. //depot/projects/trustedbsd/base/contrib/tcpdump/lane.h#3 edit .. //depot/projects/trustedbsd/base/contrib/tcpdump/lbl/os-osf4.h#2 edit .. //depot/projects/trustedbsd/base/contrib/tcpdump/llc.h#4 edit .. //depot/projects/trustedbsd/base/contrib/tcpdump/machdep.c#4 edit .. //depot/projects/trustedbsd/base/contrib/tcpdump/missing/addrinfo.h#3 edit .. //depot/projects/trustedbsd/base/contrib/tcpdump/missing/addrsize.h#3 edit .. //depot/projects/trustedbsd/base/contrib/tcpdump/missing/bittypes.h#3 edit .. //depot/projects/trustedbsd/base/contrib/tcpdump/missing/datalinks.c#2 edit .. //depot/projects/trustedbsd/base/contrib/tcpdump/missing/dlnames.c#2 edit .. //depot/projects/trustedbsd/base/contrib/tcpdump/missing/getaddrinfo.c#3 edit .. //depot/projects/trustedbsd/base/contrib/tcpdump/missing/getnameinfo.c#3 edit .. //depot/projects/trustedbsd/base/contrib/tcpdump/missing/inet_aton.c#3 edit .. //depot/projects/trustedbsd/base/contrib/tcpdump/missing/inet_ntop.c#3 edit .. //depot/projects/trustedbsd/base/contrib/tcpdump/missing/inet_pton.c#3 edit .. //depot/projects/trustedbsd/base/contrib/tcpdump/missing/resolv6.h#3 edit .. //depot/projects/trustedbsd/base/contrib/tcpdump/missing/resolv_ext.h#3 edit .. //depot/projects/trustedbsd/base/contrib/tcpdump/missing/snprintf.c#4 edit .. //depot/projects/trustedbsd/base/contrib/tcpdump/missing/sockstorage.h#3 edit .. //depot/projects/trustedbsd/base/contrib/tcpdump/missing/strlcat.c#3 edit .. //depot/projects/trustedbsd/base/contrib/tcpdump/missing/strlcpy.c#3 edit .. //depot/projects/trustedbsd/base/contrib/tcpdump/missing/strsep.c#2 edit .. //depot/projects/trustedbsd/base/contrib/tcpdump/nameser.h#4 edit .. //depot/projects/trustedbsd/base/contrib/tcpdump/netbios.h#3 edit .. //depot/projects/trustedbsd/base/contrib/tcpdump/nfs.h#3 edit .. //depot/projects/trustedbsd/base/contrib/tcpdump/nfsfh.h#4 edit .. //depot/projects/trustedbsd/base/contrib/tcpdump/ntp.h#3 edit .. //depot/projects/trustedbsd/base/contrib/tcpdump/oakley.h#3 edit .. //depot/projects/trustedbsd/base/contrib/tcpdump/ospf.h#3 edit .. //depot/projects/trustedbsd/base/contrib/tcpdump/ospf6.h#3 edit .. //depot/projects/trustedbsd/base/contrib/tcpdump/oui.c#2 edit .. //depot/projects/trustedbsd/base/contrib/tcpdump/oui.h#2 edit .. //depot/projects/trustedbsd/base/contrib/tcpdump/parsenfsfh.c#4 edit .. //depot/projects/trustedbsd/base/contrib/tcpdump/pcap-missing.h#2 edit .. //depot/projects/trustedbsd/base/contrib/tcpdump/pf.h#2 edit .. //depot/projects/trustedbsd/base/contrib/tcpdump/ppp.h#4 edit .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-802_11.c#4 edit .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-ah.c#4 edit .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-aodv.c#2 edit .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-ap1394.c#2 edit .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-arcnet.c#4 edit .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-arp.c#5 edit .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-ascii.c#3 edit .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-atalk.c#5 edit .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-atm.c#4 edit .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-beep.c#4 edit .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-bfd.c#2 edit .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-bgp.c#5 edit .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-bootp.c#5 edit .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-cdp.c#4 edit .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-chdlc.c#4 edit .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-cip.c#4 edit .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-cnfp.c#4 edit .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-decnet.c#4 edit .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-dhcp6.c#5 edit .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-domain.c#4 edit .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-dvmrp.c#4 edit .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-egp.c#5 edit .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-enc.c#2 edit .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-esp.c#6 edit .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-ether.c#5 edit .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-fddi.c#5 edit .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-fr.c#3 edit .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-frag6.c#4 edit .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-gre.c#5 edit .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-hsrp.c#3 edit .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-icmp.c#5 edit .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-icmp6.c#5 edit .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-igmp.c#5 edit .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-igrp.c#4 edit .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-ip.c#5 edit .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-ip6.c#4 edit .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-ip6opts.c#4 edit .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-ipcomp.c#3 edit .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-ipfc.c#2 edit .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-ipx.c#4 edit .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-isakmp.c#6 edit .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-isoclns.c#5 edit .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-krb.c#3 edit .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-l2tp.c#6 edit .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-lane.c#4 edit .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-ldp.c#2 edit .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-llc.c#4 edit .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-lwres.c#3 edit .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-mobile.c#5 edit .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-mobility.c#2 edit .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-mpls.c#4 edit .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-msdp.c#3 edit .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-netbios.c#3 edit .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-nfs.c#5 edit .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-ntp.c#5 edit .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-null.c#5 edit .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-ospf.c#4 edit .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-ospf6.c#4 edit .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-pflog.c#2 edit .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-pim.c#5 edit .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-ppp.c#4 edit .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-pppoe.c#4 edit .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-pptp.c#3 edit .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-radius.c#6 edit .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-raw.c#5 edit .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-rip.c#4 edit .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-ripng.c#4 edit .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-rsvp.c#2 edit .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-rt6.c#4 edit .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-rx.c#5 edit .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-sctp.c#4 edit .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-sl.c#4 edit .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-sll.c#5 edit .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-smb.c#5 edit .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-snmp.c#5 edit .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-stp.c#4 edit .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-sunatm.c#2 edit .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-sunrpc.c#4 edit .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-tcp.c#4 edit .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-telnet.c#4 edit .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-tftp.c#3 edit .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-timed.c#4 edit .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-token.c#4 edit .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-udp.c#4 edit .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-vjc.c#3 edit .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-vrrp.c#4 edit .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-wb.c#4 edit .. //depot/projects/trustedbsd/base/contrib/tcpdump/print-zephyr.c#4 edit .. //depot/projects/trustedbsd/base/contrib/tcpdump/route6d.h#4 edit .. //depot/projects/trustedbsd/base/contrib/tcpdump/rx.h#4 edit .. //depot/projects/trustedbsd/base/contrib/tcpdump/sctpConstants.h#3 edit .. //depot/projects/trustedbsd/base/contrib/tcpdump/sctpHeader.h#3 edit .. //depot/projects/trustedbsd/base/contrib/tcpdump/setsignal.c#3 edit .. //depot/projects/trustedbsd/base/contrib/tcpdump/sll.h#3 edit .. //depot/projects/trustedbsd/base/contrib/tcpdump/smb.h#4 edit .. //depot/projects/trustedbsd/base/contrib/tcpdump/smbutil.c#5 edit .. //depot/projects/trustedbsd/base/contrib/tcpdump/strcasecmp.c#3 edit .. //depot/projects/trustedbsd/base/contrib/tcpdump/tcp.h#4 edit .. //depot/projects/trustedbsd/base/contrib/tcpdump/tcpdump-stdinc.h#2 edit .. //depot/projects/trustedbsd/base/contrib/tcpdump/tcpdump.1#5 edit .. //depot/projects/trustedbsd/base/contrib/tcpdump/tcpdump.c#5 edit .. //depot/projects/trustedbsd/base/contrib/tcpdump/telnet.h#3 edit .. //depot/projects/trustedbsd/base/contrib/tcpdump/timed.h#3 edit .. //depot/projects/trustedbsd/base/contrib/tcpdump/token.h#4 edit .. //depot/projects/trustedbsd/base/contrib/tcpdump/udp.h#3 edit .. //depot/projects/trustedbsd/base/contrib/tcpdump/util.c#5 edit .. //depot/projects/trustedbsd/base/contrib/tcpdump/vfprintf.c#3 edit .. //depot/projects/trustedbsd/base/contrib/traceroute/traceroute.c#7 edit .. //depot/projects/trustedbsd/base/crypto/heimdal/ChangeLog#8 edit .. //depot/projects/trustedbsd/base/crypto/heimdal/Makefile.in#7 edit .. //depot/projects/trustedbsd/base/crypto/heimdal/NEWS#7 edit .. //depot/projects/trustedbsd/base/crypto/heimdal/aclocal.m4#8 edit .. //depot/projects/trustedbsd/base/crypto/heimdal/admin/Makefile.in#7 edit .. //depot/projects/trustedbsd/base/crypto/heimdal/appl/Makefile.in#7 edit .. //depot/projects/trustedbsd/base/crypto/heimdal/appl/afsutil/ChangeLog#5 edit .. //depot/projects/trustedbsd/base/crypto/heimdal/appl/afsutil/Makefile.in#7 edit .. //depot/projects/trustedbsd/base/crypto/heimdal/appl/afsutil/afslog.c#4 edit .. //depot/projects/trustedbsd/base/crypto/heimdal/appl/ftp/ChangeLog#8 edit .. //depot/projects/trustedbsd/base/crypto/heimdal/appl/ftp/Makefile.in#7 edit .. //depot/projects/trustedbsd/base/crypto/heimdal/appl/ftp/common/Makefile.in#7 edit .. //depot/projects/trustedbsd/base/crypto/heimdal/appl/ftp/ftp/Makefile.in#7 edit .. //depot/projects/trustedbsd/base/crypto/heimdal/appl/ftp/ftp/ftp.1#6 edit .. //depot/projects/trustedbsd/base/crypto/heimdal/appl/ftp/ftp/gssapi.c#7 edit .. //depot/projects/trustedbsd/base/crypto/heimdal/appl/ftp/ftp/main.c#5 edit .. //depot/projects/trustedbsd/base/crypto/heimdal/appl/ftp/ftp/security.h#3 edit .. //depot/projects/trustedbsd/base/crypto/heimdal/appl/ftp/ftpd/Makefile.in#7 edit .. //depot/projects/trustedbsd/base/crypto/heimdal/appl/ftp/ftpd/ftpd.8#6 edit .. //depot/projects/trustedbsd/base/crypto/heimdal/appl/ftp/ftpd/ftpd.c#6 edit .. //depot/projects/trustedbsd/base/crypto/heimdal/appl/kf/Makefile.in#7 edit .. //depot/projects/trustedbsd/base/crypto/heimdal/appl/login/Makefile.in#7 edit .. //depot/projects/trustedbsd/base/crypto/heimdal/appl/push/Makefile.in#7 edit .. //depot/projects/trustedbsd/base/crypto/heimdal/appl/rcp/Makefile.in#7 edit .. //depot/projects/trustedbsd/base/crypto/heimdal/appl/rsh/Makefile.in#7 edit .. //depot/projects/trustedbsd/base/crypto/heimdal/appl/rsh/rshd.c#7 edit .. //depot/projects/trustedbsd/base/crypto/heimdal/appl/su/Makefile.in#7 edit .. //depot/projects/trustedbsd/base/crypto/heimdal/appl/telnet/ChangeLog#8 edit .. //depot/projects/trustedbsd/base/crypto/heimdal/appl/telnet/Makefile.in#7 edit .. //depot/projects/trustedbsd/base/crypto/heimdal/appl/telnet/libtelnet/Makefile.in#7 edit .. //depot/projects/trustedbsd/base/crypto/heimdal/appl/telnet/telnet/Makefile.in#7 edit .. //depot/projects/trustedbsd/base/crypto/heimdal/appl/telnet/telnet/main.c#5 edit .. //depot/projects/trustedbsd/base/crypto/heimdal/appl/telnet/telnetd/Makefile.in#7 edit .. //depot/projects/trustedbsd/base/crypto/heimdal/appl/telnet/telnetd/telnetd.c#5 edit .. //depot/projects/trustedbsd/base/crypto/heimdal/appl/test/Makefile.in#7 edit .. //depot/projects/trustedbsd/base/crypto/heimdal/cf/ChangeLog#7 edit .. //depot/projects/trustedbsd/base/crypto/heimdal/cf/Makefile.am.common#6 edit .. //depot/projects/trustedbsd/base/crypto/heimdal/cf/aix.m4#4 edit .. //depot/projects/trustedbsd/base/crypto/heimdal/cf/auth-modules.m4#6 edit .. //depot/projects/trustedbsd/base/crypto/heimdal/cf/broken-getaddrinfo.m4#4 edit .. //depot/projects/trustedbsd/base/crypto/heimdal/cf/broken-getnameinfo.m4#3 edit .. //depot/projects/trustedbsd/base/crypto/heimdal/cf/broken-glob.m4#4 edit .. //depot/projects/trustedbsd/base/crypto/heimdal/cf/broken-realloc.m4#3 edit .. //depot/projects/trustedbsd/base/crypto/heimdal/cf/broken-snprintf.m4#4 edit .. //depot/projects/trustedbsd/base/crypto/heimdal/cf/c-attribute.m4#3 edit .. //depot/projects/trustedbsd/base/crypto/heimdal/cf/c-function.m4#3 edit .. //depot/projects/trustedbsd/base/crypto/heimdal/cf/capabilities.m4#3 edit .. //depot/projects/trustedbsd/base/crypto/heimdal/cf/check-compile-et.m4#4 edit .. //depot/projects/trustedbsd/base/crypto/heimdal/cf/check-declaration.m4#3 edit .. //depot/projects/trustedbsd/base/crypto/heimdal/cf/check-getpwnam_r-posix.m4#3 edit .. //depot/projects/trustedbsd/base/crypto/heimdal/cf/check-man.m4#3 edit .. //depot/projects/trustedbsd/base/crypto/heimdal/cf/check-netinet-ip-and-tcp.m4#3 edit .. //depot/projects/trustedbsd/base/crypto/heimdal/cf/check-type-extra.m4#3 edit .. //depot/projects/trustedbsd/base/crypto/heimdal/cf/check-x.m4#3 edit .. //depot/projects/trustedbsd/base/crypto/heimdal/cf/check-xau.m4#3 edit .. //depot/projects/trustedbsd/base/crypto/heimdal/cf/find-func-no-libs.m4#3 edit .. //depot/projects/trustedbsd/base/crypto/heimdal/cf/find-func-no-libs2.m4#4 edit .. //depot/projects/trustedbsd/base/crypto/heimdal/cf/find-func.m4#3 edit .. //depot/projects/trustedbsd/base/crypto/heimdal/cf/find-if-not-broken.m4#4 edit .. //depot/projects/trustedbsd/base/crypto/heimdal/cf/have-pragma-weak.m4#3 edit .. //depot/projects/trustedbsd/base/crypto/heimdal/cf/have-struct-field.m4#3 edit .. //depot/projects/trustedbsd/base/crypto/heimdal/cf/have-type.m4#3 edit .. //depot/projects/trustedbsd/base/crypto/heimdal/cf/have-types.m4#3 edit .. //depot/projects/trustedbsd/base/crypto/heimdal/cf/krb-bigendian.m4#4 edit .. //depot/projects/trustedbsd/base/crypto/heimdal/cf/krb-func-getcwd-broken.m4#4 edit .. //depot/projects/trustedbsd/base/crypto/heimdal/cf/krb-func-getlogin.m4#3 edit .. //depot/projects/trustedbsd/base/crypto/heimdal/cf/krb-ipv6.m4#5 edit .. //depot/projects/trustedbsd/base/crypto/heimdal/cf/krb-prog-ln-s.m4#3 edit .. //depot/projects/trustedbsd/base/crypto/heimdal/cf/krb-prog-ranlib.m4#3 edit .. //depot/projects/trustedbsd/base/crypto/heimdal/cf/krb-prog-yacc.m4#3 edit .. //depot/projects/trustedbsd/base/crypto/heimdal/cf/krb-readline.m4#4 edit .. //depot/projects/trustedbsd/base/crypto/heimdal/cf/krb-struct-spwd.m4#3 edit .. //depot/projects/trustedbsd/base/crypto/heimdal/cf/krb-struct-winsize.m4#4 edit .. //depot/projects/trustedbsd/base/crypto/heimdal/cf/krb-sys-aix.m4#3 edit .. //depot/projects/trustedbsd/base/crypto/heimdal/cf/krb-sys-nextstep.m4#4 edit .. //depot/projects/trustedbsd/base/crypto/heimdal/cf/krb-version.m4#4 edit .. //depot/projects/trustedbsd/base/crypto/heimdal/cf/mips-abi.m4#4 edit .. //depot/projects/trustedbsd/base/crypto/heimdal/cf/need-proto.m4#4 edit .. //depot/projects/trustedbsd/base/crypto/heimdal/cf/osfc2.m4#4 edit .. //depot/projects/trustedbsd/base/crypto/heimdal/cf/proto-compat.m4#3 edit .. //depot/projects/trustedbsd/base/crypto/heimdal/cf/retsigtype.m4#3 edit .. //depot/projects/trustedbsd/base/crypto/heimdal/cf/roken-frag.m4#7 edit .. //depot/projects/trustedbsd/base/crypto/heimdal/cf/roken.m4#4 edit .. //depot/projects/trustedbsd/base/crypto/heimdal/cf/test-package.m4#5 edit .. //depot/projects/trustedbsd/base/crypto/heimdal/cf/wflags.m4#3 edit .. //depot/projects/trustedbsd/base/crypto/heimdal/config.guess#6 edit .. //depot/projects/trustedbsd/base/crypto/heimdal/config.sub#6 edit .. //depot/projects/trustedbsd/base/crypto/heimdal/configure#8 edit .. //depot/projects/trustedbsd/base/crypto/heimdal/configure.in#8 edit .. //depot/projects/trustedbsd/base/crypto/heimdal/doc/Makefile.am#3 edit .. //depot/projects/trustedbsd/base/crypto/heimdal/doc/Makefile.in#7 edit .. //depot/projects/trustedbsd/base/crypto/heimdal/doc/ack.texi#5 edit .. //depot/projects/trustedbsd/base/crypto/heimdal/doc/setup.texi#5 edit .. //depot/projects/trustedbsd/base/crypto/heimdal/include/Makefile.in#8 edit .. //depot/projects/trustedbsd/base/crypto/heimdal/include/config.h.in#6 edit .. //depot/projects/trustedbsd/base/crypto/heimdal/include/kadm5/Makefile.in#7 edit .. //depot/projects/trustedbsd/base/crypto/heimdal/install-sh#5 edit .. //depot/projects/trustedbsd/base/crypto/heimdal/kadmin/Makefile.in#7 edit .. //depot/projects/trustedbsd/base/crypto/heimdal/kdc/Makefile.in#7 edit .. //depot/projects/trustedbsd/base/crypto/heimdal/kdc/config.c#6 edit .. //depot/projects/trustedbsd/base/crypto/heimdal/kdc/connect.c#7 edit .. //depot/projects/trustedbsd/base/crypto/heimdal/kdc/kaserver.c#8 edit .. //depot/projects/trustedbsd/base/crypto/heimdal/kdc/kdc.8#5 edit .. //depot/projects/trustedbsd/base/crypto/heimdal/kdc/kdc_locl.h#6 edit .. //depot/projects/trustedbsd/base/crypto/heimdal/kdc/kerberos4.c#6 edit .. //depot/projects/trustedbsd/base/crypto/heimdal/kdc/kerberos5.c#7 edit .. //depot/projects/trustedbsd/base/crypto/heimdal/kpasswd/Makefile.in#7 edit .. //depot/projects/trustedbsd/base/crypto/heimdal/kuser/Makefile.in#7 edit .. //depot/projects/trustedbsd/base/crypto/heimdal/kuser/kinit.c#7 edit .. //depot/projects/trustedbsd/base/crypto/heimdal/kuser/klist.c#6 edit .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/45/Makefile.in#7 edit .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/Makefile.in#7 edit .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/asn1/Makefile.am#6 edit .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/asn1/Makefile.in#7 edit .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/asn1/der_free.c#4 edit .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/asn1/der_length.c#4 edit .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/asn1/der_locl.h#4 edit .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/asn1/gen_free.c#4 edit .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/asn1/gen_length.c#4 edit .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/auth/Makefile.in#7 edit .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/auth/afskauthlib/Makefile.in#7 edit .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/auth/pam/Makefile.in#7 edit .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/auth/sia/Makefile.in#7 edit .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/com_err/Makefile.in#7 edit .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/gssapi/8003.c#6 edit .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/gssapi/ChangeLog#7 edit .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/gssapi/Makefile.am#6 edit .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/gssapi/Makefile.in#7 edit .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/gssapi/accept_sec_context.c#5 edit .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/gssapi/acquire_cred.c#6 edit .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/gssapi/add_cred.c#3 edit .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/gssapi/arcfour.c#2 edit .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/gssapi/arcfour.h#2 edit .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/gssapi/context_time.c#4 edit .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/gssapi/decapsulate.c#4 edit .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/gssapi/encapsulate.c#4 edit .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/gssapi/get_mic.c#5 edit .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/gssapi/gssapi_locl.h#5 edit .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/gssapi/init_sec_context.c#6 edit .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/gssapi/release_cred.c#5 edit .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/gssapi/unwrap.c#7 edit .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/gssapi/verify_mic.c#6 edit .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/gssapi/wrap.c#6 edit .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/hdb/Makefile.am#6 edit .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/hdb/Makefile.in#7 edit .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/hdb/db3.c#4 edit .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/hdb/hdb-ldap.c#5 edit .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/hdb/hdb_locl.h#5 edit .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/kadm5/ChangeLog#7 edit .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/kadm5/Makefile.in#7 edit .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/kadm5/chpass_s.c#3 edit .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/kadm5/init_c.c#6 edit .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/kadm5/ipropd_slave.c#7 edit .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/kadm5/truncate_log.c#3 edit .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/kafs/Makefile.in#7 edit .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/krb5/Makefile.am#8 edit .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/krb5/Makefile.in#8 edit .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/krb5/config_file.c#5 edit .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/krb5/crypto.c#7 edit .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/krb5/eai_to_heim_errno.c#3 edit .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/krb5/fcache.c#4 edit .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/krb5/get_cred.c#6 edit .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/krb5/get_for_creds.c#6 edit .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/krb5/get_in_tkt.c#7 edit .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/krb5/krb5-private.h#5 edit .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/krb5/krb5-protos.h#7 edit .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/krb5/krb5.conf.5#6 edit .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/krb5/krb5.h#7 edit .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/krb5/mcache.c#5 edit .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/krb5/mk_req_ext.c#4 edit .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/krb5/mk_safe.c#5 edit .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/krb5/parse-name-test.c#3 edit .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/krb5/principal.c#7 edit .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/krb5/rd_req.c#4 edit .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/krb5/store.c#4 edit .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/krb5/ticket.c#3 edit .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/krb5/transited.c#5 edit .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/krb5/verify_krb5_conf.c#6 edit .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/roken/ChangeLog#8 edit .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/roken/Makefile.am#8 edit .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/roken/Makefile.in#8 edit .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/roken/gai_strerror.c#3 edit .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/roken/ndbm_wrap.c#3 edit .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/roken/roken-common.h#6 edit .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/sl/Makefile.in#7 edit .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/vers/Makefile.in#7 edit .. //depot/projects/trustedbsd/base/crypto/heimdal/lib/vers/print_version.c#5 edit .. //depot/projects/trustedbsd/base/crypto/heimdal/ltconfig#4 edit .. //depot/projects/trustedbsd/base/crypto/heimdal/ltmain.sh#5 edit .. //depot/projects/trustedbsd/base/crypto/heimdal/missing#5 edit .. //depot/projects/trustedbsd/base/crypto/heimdal/mkinstalldirs#5 edit .. //depot/projects/trustedbsd/base/crypto/heimdal/tools/Makefile.in#8 edit .. //depot/projects/trustedbsd/base/crypto/openssh/.cvsignore#2 edit .. //depot/projects/trustedbsd/base/crypto/openssh/ChangeLog#8 edit .. //depot/projects/trustedbsd/base/crypto/openssh/README#7 edit .. //depot/projects/trustedbsd/base/crypto/openssh/acconfig.h#9 edit .. //depot/projects/trustedbsd/base/crypto/openssh/auth-krb5.c#10 edit .. //depot/projects/trustedbsd/base/crypto/openssh/auth-pam.c#9 edit .. //depot/projects/trustedbsd/base/crypto/openssh/auth-pam.h#8 edit .. //depot/projects/trustedbsd/base/crypto/openssh/auth-passwd.c#10 edit .. //depot/projects/trustedbsd/base/crypto/openssh/auth-sia.c#6 edit .. //depot/projects/trustedbsd/base/crypto/openssh/auth-sia.h#5 edit .. //depot/projects/trustedbsd/base/crypto/openssh/auth-skey.c#6 edit .. //depot/projects/trustedbsd/base/crypto/openssh/auth.h#10 edit .. //depot/projects/trustedbsd/base/crypto/openssh/auth1.c#10 edit .. //depot/projects/trustedbsd/base/crypto/openssh/auth2.c#12 edit .. //depot/projects/trustedbsd/base/crypto/openssh/canohost.c#9 edit .. //depot/projects/trustedbsd/base/crypto/openssh/config.h#7 edit .. //depot/projects/trustedbsd/base/crypto/openssh/configure.ac#8 edit .. //depot/projects/trustedbsd/base/crypto/openssh/contrib/Makefile#2 edit .. //depot/projects/trustedbsd/base/crypto/openssh/contrib/README#2 edit .. //depot/projects/trustedbsd/base/crypto/openssh/contrib/aix/README#2 edit >>> TRUNCATED FOR MAIL (1000 lines) <<<