From owner-p4-projects Sun Dec 29 12:33:20 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 828A337B405; Sun, 29 Dec 2002 12:32:56 -0800 (PST) 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 1738337B401 for ; Sun, 29 Dec 2002 12:32:56 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E7EF643EA9 for ; Sun, 29 Dec 2002 12:32:54 -0800 (PST) (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.6/8.12.6) with ESMTP id gBTKWsfh028912 for ; Sun, 29 Dec 2002 12:32:54 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id gBTKWhrN028909 for perforce@freebsd.org; Sun, 29 Dec 2002 12:32:43 -0800 (PST) Date: Sun, 29 Dec 2002 12:32:43 -0800 (PST) Message-Id: <200212292032.gBTKWhrN028909@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 Subject: PERFORCE change 22889 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=22889 Change 22889 by rwatson@rwatson_paprika on 2002/12/29 12:31:44 Integ TrustedBSD ACL tree from TrustedBSD base. Affected files ... .. //depot/projects/trustedbsd/acl/sys/alpha/alpha/pmap.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/alpha/include/limits.h#2 integrate .. //depot/projects/trustedbsd/acl/sys/arm/include/limits.h#2 integrate .. //depot/projects/trustedbsd/acl/sys/boot/alpha/common/conf.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/boot/arc/loader/conf.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/boot/efi/loader/conf.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/boot/efi/loader/main.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/boot/i386/boot2/Makefile#2 integrate .. //depot/projects/trustedbsd/acl/sys/boot/i386/boot2/boot2.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/boot/i386/loader/conf.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/boot/ia64/skiload/conf.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/boot/powerpc/loader/conf.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/boot/sparc64/loader/Makefile#2 integrate .. //depot/projects/trustedbsd/acl/sys/boot/sparc64/loader/main.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/cam/scsi/scsi_da.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/compat/linprocfs/linprocfs.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/compat/linux/linux_ioctl.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/compat/svr4/svr4_sockio.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/contrib/ipfilter/netinet/fil.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/ddb/db_command.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/ddb/db_ps.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/ddb/ddb.h#2 integrate .. //depot/projects/trustedbsd/acl/sys/dev/aac/aac.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/dev/acpica/acpi.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/dev/acpica/acpi_resource.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/dev/an/if_an.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/dev/asr/asr.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/dev/em/README#2 integrate .. //depot/projects/trustedbsd/acl/sys/dev/em/if_em.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/dev/em/if_em.h#2 integrate .. //depot/projects/trustedbsd/acl/sys/dev/em/if_em_hw.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/dev/em/if_em_hw.h#2 integrate .. //depot/projects/trustedbsd/acl/sys/dev/em/if_em_osdep.h#2 integrate .. //depot/projects/trustedbsd/acl/sys/dev/exca/excavar.h#2 integrate .. //depot/projects/trustedbsd/acl/sys/dev/firewire/firewire.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/dev/firewire/firewire.h#2 integrate .. //depot/projects/trustedbsd/acl/sys/dev/firewire/fwmem.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/dev/firewire/fwohci.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/dev/firewire/fwohci_pci.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/dev/firewire/fwohcireg.h#2 integrate .. //depot/projects/trustedbsd/acl/sys/dev/firewire/fwohcivar.h#2 integrate .. //depot/projects/trustedbsd/acl/sys/dev/firewire/if_fwe.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/dev/firewire/sbp.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/dev/iir/iir_ctrl.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/dev/ppbus/pcfclock.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/dev/ppbus/pps.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/dev/pst/pst-pci.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/dev/puc/pucdata.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/dev/puc/pucvar.h#2 integrate .. //depot/projects/trustedbsd/acl/sys/dev/sio/sio_pccard.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/dev/sound/isa/ad1816.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/dev/sound/isa/ess.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/dev/sound/isa/mss.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/dev/sound/isa/sb16.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/dev/sound/isa/sb8.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/dev/sound/isa/sbc.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/dev/sound/isa/uartsio.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/dev/sound/pci/fm801.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/dev/streams/streams.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/dev/tdfx/tdfx_pci.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/dev/tga/tga_pci.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/dev/usb/ohci.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/dev/usb/uhci.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/dev/usb/umass.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/dev/wi/if_wi.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/fs/devfs/devfs_vnops.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/fs/msdosfs/msdosfs_vnops.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/geom/bde/g_bde_crypt.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/geom/bde/g_bde_lock.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/geom/bde/g_bde_work.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/geom/geom_dev.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/geom/geom_io.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/geom/geom_kern.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/geom/geom_mbr.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/geom/geom_subr.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/i386/acpica/OsdEnvironment.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/i386/conf/GENERIC#2 integrate .. //depot/projects/trustedbsd/acl/sys/i386/i386/db_trace.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/i386/i386/pmap.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/i386/include/limits.h#2 integrate .. //depot/projects/trustedbsd/acl/sys/i386/isa/vesa.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/i386/pci/pci_bus.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/ia64/acpica/OsdEnvironment.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/ia64/include/dig64.h#1 branch .. //depot/projects/trustedbsd/acl/sys/ia64/include/limits.h#2 integrate .. //depot/projects/trustedbsd/acl/sys/isa/fd.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/kern/imgact_elf.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/kern/init_main.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/kern/kern_condvar.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/kern/kern_conf.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/kern/kern_descrip.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/kern/kern_event.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/kern/kern_exec.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/kern/kern_fork.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/kern/kern_intr.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/kern/kern_jail.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/kern/kern_sig.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/kern/kern_subr.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/kern/kern_switch.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/kern/kern_synch.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/kern/kern_thread.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/kern/kern_time.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/kern/kern_uuid.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/kern/sched_4bsd.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/kern/subr_smp.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/kern/subr_trap.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/kern/subr_witness.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/kern/sys_pipe.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/kern/sys_socket.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/kern/tty_pty.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/kern/uipc_socket.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/kern/uipc_syscalls.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/kern/uipc_usrreq.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/kern/vfs_aio.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/kern/vfs_bio.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/kern/vfs_export.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/kern/vfs_subr.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/kern/vfs_vnops.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/kern/vnode_if.src#2 integrate .. //depot/projects/trustedbsd/acl/sys/modules/netgraph/fec/Makefile#2 integrate .. //depot/projects/trustedbsd/acl/sys/net/bpf.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/net/bpf_compat.h#2 integrate .. //depot/projects/trustedbsd/acl/sys/net/bridge.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/net/if.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/net/if_ef.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/net/if_ethersubr.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/net/if_loop.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/net/if_var.h#2 integrate .. //depot/projects/trustedbsd/acl/sys/net/net_osdep.h#2 integrate .. //depot/projects/trustedbsd/acl/sys/net/radix.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/net/radix.h#2 integrate .. //depot/projects/trustedbsd/acl/sys/net/raw_cb.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/net/raw_usrreq.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/net/route.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/net/rtsock.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/netatalk/at_control.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/netatm/atm_if.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/netatm/atm_usrreq.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/netgraph/bluetooth/socket/ng_btsocket_hci_raw.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/netgraph/ng_bridge.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/netgraph/ng_ether.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/netgraph/ng_fec.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/netgraph/ng_gif.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/netgraph/ng_l2tp.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/netgraph/ng_one2many.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/netgraph/ng_ppp.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/netgraph/ng_pptpgre.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/netgraph/ng_source.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/netgraph/ng_tee.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/netinet/in.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/netinet/in_rmx.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/netinet/ip_dummynet.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/netinet/ip_encap.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/netinet/ip_fw.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/netinet/ip_fw2.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/netinet/ip_icmp.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/netinet/tcp_input.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/netinet/tcp_subr.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/netinet/tcp_syncache.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/netinet/tcp_timer.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/netinet6/esp_core.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/netinet6/icmp6.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/netinet6/in6.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/netinet6/in6_ifattach.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/netinet6/in6_rmx.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/netinet6/ip6_fw.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/netinet6/ip6_input.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/netinet6/ipcomp_output.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/netinet6/nd6_rtr.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/netipsec/keysock.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/netipsec/xform_ipip.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/netkey/keysock.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/netsmb/smb_trantcp.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/nfsclient/bootp_subr.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/nfsclient/nfs_bio.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/nfsclient/nfs_diskless.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/nfsclient/nfs_vfsops.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/nfsclient/nfs_vnops.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/nfsserver/nfs_serv.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/pci/agp.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/pci/if_dcreg.h#2 integrate .. //depot/projects/trustedbsd/acl/sys/pci/if_ste.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/pci/if_stereg.h#2 integrate .. //depot/projects/trustedbsd/acl/sys/pci/if_xl.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/powerpc/include/limits.h#2 integrate .. //depot/projects/trustedbsd/acl/sys/security/mac_bsdextended/mac_bsdextended.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/sparc64/include/atomic.h#2 integrate .. //depot/projects/trustedbsd/acl/sys/sparc64/include/limits.h#2 integrate .. //depot/projects/trustedbsd/acl/sys/sparc64/include/pmap.h#2 integrate .. //depot/projects/trustedbsd/acl/sys/sparc64/include/smp.h#2 integrate .. //depot/projects/trustedbsd/acl/sys/sparc64/include/tlb.h#2 integrate .. //depot/projects/trustedbsd/acl/sys/sparc64/include/tte.h#2 integrate .. //depot/projects/trustedbsd/acl/sys/sparc64/include/vmparam.h#2 integrate .. //depot/projects/trustedbsd/acl/sys/sparc64/sparc64/cache.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/sparc64/sparc64/dump_machdep.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/sparc64/sparc64/exception.S#2 integrate .. //depot/projects/trustedbsd/acl/sys/sparc64/sparc64/genassym.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/sparc64/sparc64/machdep.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/sparc64/sparc64/mem.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/sparc64/sparc64/mp_machdep.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/sparc64/sparc64/pmap.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/sparc64/sparc64/tlb.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/sparc64/sparc64/tsb.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/sparc64/sparc64/vm_machdep.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/sys/_iovec.h#1 branch .. //depot/projects/trustedbsd/acl/sys/sys/_types.h#2 integrate .. //depot/projects/trustedbsd/acl/sys/sys/file.h#2 integrate .. //depot/projects/trustedbsd/acl/sys/sys/ipc.h#2 integrate .. //depot/projects/trustedbsd/acl/sys/sys/mount.h#3 integrate .. //depot/projects/trustedbsd/acl/sys/sys/msg.h#2 integrate .. //depot/projects/trustedbsd/acl/sys/sys/mutex.h#2 integrate .. //depot/projects/trustedbsd/acl/sys/sys/proc.h#2 integrate .. //depot/projects/trustedbsd/acl/sys/sys/socket.h#2 integrate .. //depot/projects/trustedbsd/acl/sys/sys/socketvar.h#2 integrate .. //depot/projects/trustedbsd/acl/sys/sys/time.h#2 integrate .. //depot/projects/trustedbsd/acl/sys/sys/types.h#2 integrate .. //depot/projects/trustedbsd/acl/sys/sys/uio.h#2 integrate .. //depot/projects/trustedbsd/acl/sys/sys/vnode.h#2 integrate .. //depot/projects/trustedbsd/acl/sys/ufs/ffs/ffs_extern.h#2 integrate .. //depot/projects/trustedbsd/acl/sys/ufs/ffs/ffs_snapshot.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/ufs/ffs/ffs_subr.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/ufs/ffs/ffs_vfsops.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/ufs/ufs/ufs_inode.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/ufs/ufs/ufsmount.h#2 integrate .. //depot/projects/trustedbsd/acl/sys/vm/phys_pager.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/vm/swap_pager.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/vm/vm_contig.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/vm/vm_fault.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/vm/vm_glue.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/vm/vm_kern.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/vm/vm_meter.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/vm/vm_object.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/vm/vm_object.h#2 integrate .. //depot/projects/trustedbsd/acl/sys/vm/vm_page.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/vm/vm_page.h#2 integrate .. //depot/projects/trustedbsd/acl/sys/vm/vm_pageout.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/vm/vm_pager.h#2 integrate .. //depot/projects/trustedbsd/acl/sys/vm/vnode_pager.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/x86_64/include/limits.h#2 integrate Differences ... ==== //depot/projects/trustedbsd/acl/sys/alpha/alpha/pmap.c#2 (text+ko) ==== @@ -43,7 +43,7 @@ * from: @(#)pmap.c 7.7 (Berkeley) 5/12/91 * from: i386 Id: pmap.c,v 1.193 1998/04/19 15:22:48 bde Exp * with some ideas from NetBSD's alpha pmap - * $FreeBSD: src/sys/alpha/alpha/pmap.c,v 1.115 2002/12/14 22:25:35 alc Exp $ + * $FreeBSD: src/sys/alpha/alpha/pmap.c,v 1.117 2002/12/28 22:47:45 alc Exp $ */ /* @@ -1011,9 +1011,11 @@ if (oldpte) pmap_invalidate_page(kernel_pmap, ks + i * PAGE_SIZE); + vm_page_lock_queues(); vm_page_wakeup(m); vm_page_flag_clear(m, PG_ZERO); m->valid = VM_PAGE_BITS_ALL; + vm_page_unlock_queues(); } } @@ -1309,13 +1311,12 @@ * allocate the page directory page */ lev1pg = vm_page_grab(pmap->pm_pteobj, NUSERLEV3MAPS + NUSERLEV2MAPS, - VM_ALLOC_NORMAL | VM_ALLOC_RETRY); + VM_ALLOC_NORMAL | VM_ALLOC_RETRY | VM_ALLOC_WIRED); - lev1pg->wire_count = 1; - ++cnt.v_wire_count; - + vm_page_lock_queues(); vm_page_flag_clear(lev1pg, PG_BUSY); lev1pg->valid = VM_PAGE_BITS_ALL; + vm_page_unlock_queues(); pmap->pm_lev1 = (pt_entry_t*) ALPHA_PHYS_TO_K0SEG(VM_PAGE_TO_PHYS(lev1pg)); if ((lev1pg->flags & PG_ZERO) == 0) @@ -1437,15 +1438,11 @@ * Find or fabricate a new pagetable page */ m = vm_page_grab(pmap->pm_pteobj, ptepindex, - VM_ALLOC_ZERO | VM_ALLOC_RETRY); + VM_ALLOC_WIRED | VM_ALLOC_ZERO | VM_ALLOC_RETRY); KASSERT(m->queue == PQ_NONE, ("_pmap_allocpte: %p->queue != PQ_NONE", m)); - if (m->wire_count == 0) - cnt.v_wire_count++; - m->wire_count++; - /* * Increment the hold count for the page table page * (denoting a new mapping.) @@ -1489,9 +1486,11 @@ if ((m->flags & PG_ZERO) == 0) bzero((caddr_t) ALPHA_PHYS_TO_K0SEG(ptepa), PAGE_SIZE); + 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(); return m; } ==== //depot/projects/trustedbsd/acl/sys/alpha/include/limits.h#2 (text+ko) ==== @@ -32,14 +32,13 @@ * * @(#)limits.h 8.3 (Berkeley) 1/4/94 * From: NetBSD: limits.h,v 1.3 1997/04/06 08:47:31 cgd Exp - * $FreeBSD: src/sys/alpha/include/limits.h,v 1.9 2002/07/29 17:41:06 mike Exp $ + * $FreeBSD: src/sys/alpha/include/limits.h,v 1.10 2002/12/22 06:38:44 tjr Exp $ */ #ifndef _MACHINE_LIMITS_H_ #define _MACHINE_LIMITS_H_ #define CHAR_BIT 8 /* number of bits in a char */ -#define MB_LEN_MAX 6 /* Allow 31 bit UTF2 */ /* * According to ANSI (section 2.2.4.2), the values below must be usable by ==== //depot/projects/trustedbsd/acl/sys/arm/include/limits.h#2 (text+ko) ==== @@ -31,14 +31,13 @@ * SUCH DAMAGE. * * @(#)limits.h 8.3 (Berkeley) 1/4/94 - * $FreeBSD: src/sys/arm/include/limits.h,v 1.2 2002/07/29 17:41:07 mike Exp $ + * $FreeBSD: src/sys/arm/include/limits.h,v 1.3 2002/12/22 06:38:44 tjr Exp $ */ #ifndef _MACHINE_LIMITS_H_ #define _MACHINE_LIMITS_H_ #define CHAR_BIT 8 /* number of bits in a char */ -#define MB_LEN_MAX 6 /* Allow 31 bit UTF2 */ /* * According to ANSI (section 2.2.4.2), the values below must be usable by ==== //depot/projects/trustedbsd/acl/sys/boot/alpha/common/conf.c#2 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/boot/alpha/common/conf.c,v 1.3 2000/05/01 17:41:17 bp Exp $ + * $FreeBSD: src/sys/boot/alpha/common/conf.c,v 1.4 2002/12/19 19:34:58 jake Exp $ */ #include @@ -65,7 +65,7 @@ #ifdef LOADER_NET_SUPPORT &nfs_fsops, #endif - &zipfs_fsops, + &gzipfs_fsops, NULL }; ==== //depot/projects/trustedbsd/acl/sys/boot/arc/loader/conf.c#2 (text+ko) ==== @@ -1,5 +1,5 @@ /* - * $FreeBSD: src/sys/boot/arc/loader/conf.c,v 1.3 2000/05/01 17:41:21 bp Exp $ + * $FreeBSD: src/sys/boot/arc/loader/conf.c,v 1.4 2002/12/19 19:34:58 jake Exp $ * From $NetBSD: conf.c,v 1.2 1997/03/22 09:03:29 thorpej Exp $ */ @@ -55,7 +55,7 @@ struct fs_ops *file_system[] = { &ufs_fsops, - &zipfs_fsops, + &gzipfs_fsops, NULL }; ==== //depot/projects/trustedbsd/acl/sys/boot/efi/loader/conf.c#2 (text+ko) ==== @@ -33,7 +33,7 @@ #ifndef lint static const char rcsid[] = - "$FreeBSD: src/sys/boot/efi/loader/conf.c,v 1.7 2002/07/20 03:46:43 peter Exp $"; + "$FreeBSD: src/sys/boot/efi/loader/conf.c,v 1.8 2002/12/19 19:34:58 jake Exp $"; #endif /* not lint */ #include @@ -62,7 +62,7 @@ &efi_fsops, /* &ufs_fsops, */ &nfs_fsops, - &zipfs_fsops, + &gzipfs_fsops, NULL }; ==== //depot/projects/trustedbsd/acl/sys/boot/efi/loader/main.c#2 (text+ko) ==== @@ -27,7 +27,7 @@ #ifndef lint static const char rcsid[] = - "$FreeBSD: src/sys/boot/efi/loader/main.c,v 1.16 2002/12/10 20:11:20 marcel Exp $"; + "$FreeBSD: src/sys/boot/efi/loader/main.c,v 1.17 2002/12/18 08:13:03 marcel Exp $"; #endif /* not lint */ #include @@ -36,6 +36,7 @@ #include #include #include +#include #include #include @@ -495,3 +496,77 @@ return print_trs(1); } +COMMAND_SET(hcdp, "hcdp", "Dump HCDP info", command_hcdp); + +static char * +hcdp_string(char *s, u_int len) +{ + static char buffer[256]; + + memcpy(buffer, s, len); + buffer[len] = 0; + return (buffer); +} + +static int +command_hcdp(int argc, char *argv[]) +{ + struct dig64_hcdp_table *tbl; + struct dig64_hcdp_entry *ent; + struct dig64_gas *gas; + int i; + + tbl = efi_get_table(&hcdp); + if (tbl == NULL) { + printf("No HCDP table present\n"); + return (CMD_OK); + } + if (memcmp(tbl->signature, HCDP_SIGNATURE, sizeof(tbl->signature))) { + printf("HCDP table has invalid signature\n"); + return (CMD_OK); + } + if (tbl->length < sizeof(*tbl) - sizeof(*tbl->entry)) { + printf("HCDP table too short\n"); + return (CMD_OK); + } + printf("HCDP table at 0x%016lx\n", (u_long)tbl); + printf("Signature = %s\n", hcdp_string(tbl->signature, 4)); + printf("Length = %u\n", tbl->length); + printf("Revision = %u\n", tbl->revision); + printf("Checksum = %u\n", tbl->checksum); + printf("OEM Id = %s\n", hcdp_string(tbl->oem_id, 6)); + printf("Table Id = %s\n", hcdp_string(tbl->oem_tbl_id, 8)); + printf("OEM rev = %u\n", tbl->oem_rev); + printf("Creator Id = %s\n", hcdp_string(tbl->creator_id, 4)); + printf("Creator rev= %u\n", tbl->creator_rev); + printf("Entries = %u\n", tbl->entries); + for (i = 0; i < tbl->entries; i++) { + ent = tbl->entry + i; + printf("Entry #%d:\n", i + 1); + printf(" Type = %u\n", ent->type); + printf(" Databits = %u\n", ent->databits); + printf(" Parity = %u\n", ent->parity); + printf(" Stopbits = %u\n", ent->stopbits); + printf(" PCI seg = %u\n", ent->pci_segment); + printf(" PCI bus = %u\n", ent->pci_bus); + printf(" PCI dev = %u\n", ent->pci_device); + printf(" PCI func = %u\n", ent->pci_function); + printf(" Interrupt = %u\n", ent->interrupt); + printf(" PCI flag = %u\n", ent->pci_flag); + printf(" Baudrate = %lu\n", + ((u_long)ent->baud_high << 32) + (u_long)ent->baud_low); + gas = &ent->address; + printf(" Addr space= %u\n", gas->addr_space); + printf(" Bit width = %u\n", gas->bit_width); + printf(" Bit offset= %u\n", gas->bit_offset); + printf(" Address = 0x%016lx\n", + ((u_long)gas->addr_high << 32) + (u_long)gas->addr_low); + printf(" PCI type = %u\n", ent->pci_devid); + printf(" PCI vndr = %u\n", ent->pci_vendor); + printf(" IRQ = %u\n", ent->irq); + printf(" PClock = %u\n", ent->pclock); + printf(" PCI iface = %u\n", ent->pci_interface); + } + printf("\n"); + return (CMD_OK); +} ==== //depot/projects/trustedbsd/acl/sys/boot/i386/boot2/Makefile#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/boot/i386/boot2/Makefile,v 1.42 2002/12/17 21:10:34 imp Exp $ +# $FreeBSD: src/sys/boot/i386/boot2/Makefile,v 1.44 2002/12/21 02:03:31 obrien Exp $ PROG= boot2 NOMAN= @@ -36,6 +36,7 @@ CFLAGS= -elf -ffreestanding -Os -fno-builtin \ -fno-guess-branch-probability -fomit-frame-pointer\ + -mno-align-long-strings \ -mrtd \ -D${BOOT2_UFS} \ -I${.CURDIR}/../../common \ @@ -61,6 +62,7 @@ boot2.o: boot2.c ${.CURDIR}/../../common/ufsread.c ${CC} ${CFLAGS} -S -o boot2.s.tmp ${.IMPSRC} sed -e '/align/d' -e '/nop/d' < boot2.s.tmp > boot2.s + rm -f boot2.s.tmp ${AS} ${AFLAGS} -o boot2.o boot2.s boot2.h: boot1.out ==== //depot/projects/trustedbsd/acl/sys/boot/i386/boot2/boot2.c#2 (text+ko) ==== @@ -14,7 +14,7 @@ */ /* - * $FreeBSD: src/sys/boot/i386/boot2/boot2.c,v 1.59 2002/12/17 22:00:06 imp Exp $ + * $FreeBSD: src/sys/boot/i386/boot2/boot2.c,v 1.60 2002/12/20 05:49:40 imp Exp $ */ #include @@ -133,7 +133,7 @@ strcmp(const char *s1, const char *s2) { for (; *s1 == *s2 && *s1; s1++, s2++); - return *s1 - *s2; + return (unsigned char)*s1 - (unsigned char)*s2; } #include "ufsread.c" ==== //depot/projects/trustedbsd/acl/sys/boot/i386/loader/conf.c#2 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/boot/i386/loader/conf.c,v 1.21 2002/08/29 02:02:28 peter Exp $ + * $FreeBSD: src/sys/boot/i386/loader/conf.c,v 1.22 2002/12/19 19:34:59 jake Exp $ */ #include @@ -62,7 +62,7 @@ &cd9660_fsops, &splitfs_fsops, #ifdef LOADER_GZIP_SUPPORT - &zipfs_fsops, + &gzipfs_fsops, #endif #ifdef LOADER_BZIP2_SUPPORT &bzipfs_fsops, ==== //depot/projects/trustedbsd/acl/sys/boot/ia64/skiload/conf.c#2 (text+ko) ==== @@ -33,7 +33,7 @@ #ifndef lint static const char rcsid[] = - "$FreeBSD: src/sys/boot/ia64/skiload/conf.c,v 1.1 2001/09/12 08:34:27 dfr Exp $"; + "$FreeBSD: src/sys/boot/ia64/skiload/conf.c,v 1.2 2002/12/19 19:34:59 jake Exp $"; #endif /* not lint */ #include @@ -58,7 +58,7 @@ struct fs_ops *file_system[] = { &ski_fsops, &ufs_fsops, - &zipfs_fsops, + &gzipfs_fsops, NULL }; ==== //depot/projects/trustedbsd/acl/sys/boot/powerpc/loader/conf.c#2 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/boot/powerpc/loader/conf.c,v 1.7 2001/10/07 13:22:25 benno Exp $ + * $FreeBSD: src/sys/boot/powerpc/loader/conf.c,v 1.8 2002/12/19 19:34:59 jake Exp $ */ #include @@ -68,7 +68,7 @@ #ifdef LOADER_NET_SUPPORT &nfs_fsops, #endif - &zipfs_fsops, + &gzipfs_fsops, NULL }; ==== //depot/projects/trustedbsd/acl/sys/boot/sparc64/loader/Makefile#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/boot/sparc64/loader/Makefile,v 1.14 2002/11/10 19:17:36 jake Exp $ +# $FreeBSD: src/sys/boot/sparc64/loader/Makefile,v 1.15 2002/12/20 04:32:10 jake Exp $ BASE= loader PROG= ${BASE} @@ -16,7 +16,6 @@ LOADER_NET_SUPPORT?= yes LOADER_NFS_SUPPORT?= yes LOADER_TFTP_SUPPORT?= yes -LOADER_ZIP_SUPPORT?= yes LOADER_GZIP_SUPPORT?= yes LOADER_BZIP2_SUPPORT?= no @@ -29,9 +28,6 @@ .if ${LOADER_CD9660_SUPPORT} == "yes" CFLAGS+= -DLOADER_CD9660_SUPPORT .endif -.if ${LOADER_ZIP_SUPPORT} == "yes" -CFLAGS+= -DLOADER_ZIP_SUPPORT -.endif .if ${LOADER_GZIP_SUPPORT} == "yes" CFLAGS+= -DLOADER_GZIP_SUPPORT .endif ==== //depot/projects/trustedbsd/acl/sys/boot/sparc64/loader/main.c#2 (text+ko) ==== @@ -6,7 +6,7 @@ * As long as the above copyright statement and this notice remain * unchanged, you can do what ever you want with this file. * - * $FreeBSD: src/sys/boot/sparc64/loader/main.c,v 1.17 2002/11/10 19:17:36 jake Exp $ + * $FreeBSD: src/sys/boot/sparc64/loader/main.c,v 1.18 2002/12/19 19:34:59 jake Exp $ */ /* * FreeBSD/sparc64 kernel loader - machine dependent part @@ -106,8 +106,11 @@ #ifdef LOADER_CD9660_SUPPORT &cd9660_fsops, #endif +#ifdef LOADER_ZIP_SUPPORT + &zipfs_fsops, +#endif #ifdef LOADER_GZIP_SUPPORT - &zipfs_fsops, + &gzipfs_fsops, #endif #ifdef LOADER_BZIP2_SUPPORT &bzipfs_fsops, ==== //depot/projects/trustedbsd/acl/sys/cam/scsi/scsi_da.c#2 (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/cam/scsi/scsi_da.c,v 1.117 2002/12/12 18:09:35 yar Exp $ + * $FreeBSD: src/sys/cam/scsi/scsi_da.c,v 1.118 2002/12/18 21:47:52 njl Exp $ */ #ifdef _KERNEL @@ -420,6 +420,14 @@ */ {T_DIRECT, SIP_MEDIA_REMOVABLE, "HP", "USB CAMERA", "*"}, /*quirks*/ DA_Q_NO_6_BYTE + }, + { + /* + * Fujitsu-Siemens Memorybird pen drive + * PR: kern/34712 + */ + {T_DIRECT, SIP_MEDIA_REMOVABLE, "Fujitsu", "Memorybird", "*"}, + /*quirks*/ DA_Q_NO_6_BYTE } }; ==== //depot/projects/trustedbsd/acl/sys/compat/linprocfs/linprocfs.c#2 (text+ko) ==== @@ -38,7 +38,7 @@ * * @(#)procfs_status.c 8.4 (Berkeley) 6/15/94 * - * $FreeBSD: src/sys/compat/linprocfs/linprocfs.c,v 1.59 2002/10/21 22:27:36 julian Exp $ + * $FreeBSD: src/sys/compat/linprocfs/linprocfs.c,v 1.60 2002/12/22 05:35:01 hsu Exp $ */ #include @@ -725,6 +725,7 @@ "bytes packets errs drop fifo frame compressed", "bytes packets errs drop fifo frame compressed"); + IFNET_RLOCK(); TAILQ_FOREACH(ifp, &ifnet, if_link) { linux_ifname(ifp, ifname, sizeof ifname); sbuf_printf(sb, "%6.6s:", ifname); @@ -733,6 +734,7 @@ sbuf_printf(sb, "%8lu %7lu %4lu %4lu %4lu %5lu %7lu %10lu\n", 0UL, 0UL, 0UL, 0UL, 0UL, 0UL, 0UL, 0UL); } + IFNET_RUNLOCK(); return (0); } ==== //depot/projects/trustedbsd/acl/sys/compat/linux/linux_ioctl.c#2 (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/compat/linux/linux_ioctl.c,v 1.95 2002/10/19 21:11:43 marcel Exp $ + * $FreeBSD: src/sys/compat/linux/linux_ioctl.c,v 1.96 2002/12/22 05:35:01 hsu Exp $ */ #include @@ -1907,12 +1907,16 @@ /* Determine the (relative) unit number for ethernet interfaces */ ethno = 0; + IFNET_RLOCK(); TAILQ_FOREACH(ifscan, &ifnet, if_link) { - if (ifscan == ifp) + if (ifscan == ifp) { + IFNET_RUNLOCK(); return (snprintf(buffer, buflen, "eth%d", ethno)); + } if (IFP_IS_ETH(ifscan)) ethno++; } + IFNET_RUNLOCK(); return (0); } @@ -1942,6 +1946,7 @@ return (NULL); index = 0; is_eth = (len == 3 && !strncmp(lxname, "eth", len)) ? 1 : 0; + IFNET_RLOCK(); TAILQ_FOREACH(ifp, &ifnet, if_link) { /* * Allow Linux programs to use FreeBSD names. Don't presume @@ -1954,6 +1959,7 @@ if (is_eth && IFP_IS_ETH(ifp) && unit == index++) break; } + IFNET_RUNLOCK(); if (ifp != NULL) snprintf(bsdname, IFNAMSIZ, "%s%d", ifp->if_name, ifp->if_unit); return (ifp); @@ -1993,6 +1999,7 @@ ethno = 0; /* Return all AF_INET addresses of all interfaces */ + IFNET_RLOCK(); /* could sleep XXX */ TAILQ_FOREACH(ifp, &ifnet, if_link) { if (uio.uio_resid <= 0) break; @@ -2019,11 +2026,14 @@ error = uiomove((caddr_t)&ifr, sizeof ifr, &uio); - if (error != 0) + if (error != 0) { + IFNET_RUNLOCK(); return (error); + } } } } + IFNET_RUNLOCK(); ifc.ifc_len -= uio.uio_resid; error = copyout(&ifc, uifc, sizeof ifc); ==== //depot/projects/trustedbsd/acl/sys/compat/svr4/svr4_sockio.c#2 (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/compat/svr4/svr4_sockio.c,v 1.13 2002/10/17 22:27:21 robert Exp $ + * $FreeBSD: src/sys/compat/svr4/svr4_sockio.c,v 1.14 2002/12/22 05:35:01 hsu Exp $ */ #include @@ -100,7 +100,7 @@ * fix is to make SVR4_SIOCGIFCONF return only one * entry per physical interface? */ - + IFNET_RLOCK(); TAILQ_FOREACH(ifp, &ifnet, if_link) if (TAILQ_FIRST(&ifp->if_addrhead) == NULL) ifnum++; @@ -108,8 +108,7 @@ TAILQ_FOREACH(ifa, &ifp->if_addrhead, ifa_link) ifnum++; - - + IFNET_RUNLOCK(); DPRINTF(("SIOCGIFNUM %d\n", ifnum)); return copyout(&ifnum, data, sizeof(ifnum)); } ==== //depot/projects/trustedbsd/acl/sys/contrib/ipfilter/netinet/fil.c#2 (text+ko) ==== @@ -99,7 +99,7 @@ #if !defined(lint) static const char sccsid[] = "@(#)fil.c 1.36 6/5/96 (C) 1993-2000 Darren Reed"; -static const char rcsid[] = "@(#)$FreeBSD: src/sys/contrib/ipfilter/netinet/fil.c,v 1.32 2002/08/28 13:41:35 darrenr Exp $"; +static const char rcsid[] = "@(#)$FreeBSD: src/sys/contrib/ipfilter/netinet/fil.c,v 1.33 2002/12/22 05:35:01 hsu Exp $"; #endif #ifndef _KERNEL @@ -1963,6 +1963,9 @@ (defined(__FreeBSD_version) && (__FreeBSD_version >= 300000)) # if (NetBSD >= 199905) || defined(__OpenBSD__) for (ifp = ifnet.tqh_first; ifp; ifp = ifp->if_list.tqe_next) +# elif defined(__FreeBSD_version) && (__FreeBSD_version >= 500043) + IFNET_RLOCK(); + TAILQ_FOREACH(ifp, &ifnet, if_link) # else for (ifp = ifnet.tqh_first; ifp; ifp = ifp->if_link.tqe_next) # endif @@ -1973,6 +1976,9 @@ ip_natsync(ifp); ip_statesync(ifp); } +# if defined(__FreeBSD_version) && (__FreeBSD_version >= 500043) + IFNET_RUNLOCK(); +# endif ip_natsync((struct ifnet *)-1); # endif /* !SOLARIS */ ==== //depot/projects/trustedbsd/acl/sys/ddb/db_command.c#2 (text+ko) ==== @@ -23,7 +23,7 @@ * any improvements or extensions that they make and grant Carnegie the * rights to redistribute these changes. * - * $FreeBSD: src/sys/ddb/db_command.c,v 1.46 2002/10/01 21:59:46 phk Exp $ + * $FreeBSD: src/sys/ddb/db_command.c,v 1.47 2002/12/28 01:23:06 julian Exp $ */ /* @@ -383,9 +383,7 @@ { "all", 0, 0, db_show_all_cmds }, { "registers", db_show_regs, 0, 0 }, { "breaks", db_listbreak_cmd, 0, 0 }, -#if 0 { "thread", db_show_one_thread, 0, 0 }, -#endif #if 0 { "port", ipc_port_print, 0, 0 }, #endif ==== //depot/projects/trustedbsd/acl/sys/ddb/db_ps.c#2 (text+ko) ==== @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/ddb/db_ps.c,v 1.35 2002/10/21 22:27:36 julian Exp $ + * $FreeBSD: src/sys/ddb/db_ps.c,v 1.36 2002/12/28 01:23:06 julian Exp $ */ #include #include @@ -38,8 +38,13 @@ #include #include #include +#include +#include +#include #include +static void +dumpthread(volatile struct proc *p, volatile struct thread *td); void db_ps(dummy1, dummy2, dummy3, dummy4) @@ -123,58 +128,7 @@ if (p->p_flag & P_KSES) db_printf("(threaded) %s\n", p->p_comm); FOREACH_THREAD_IN_PROC(p, td) { - if (p->p_flag & P_KSES) - db_printf( " thread %p ksegrp %p ", td, td->td_ksegrp); - if (TD_ON_SLEEPQ(td)) { - if (td->td_flags & TDF_CVWAITQ) - db_printf("[CVQ "); - else - db_printf("[SLPQ "); - db_printf(" %6s %8p]", td->td_wmesg, - (void *)td->td_wchan); - } - switch (td->td_state) { - case TDS_INHIBITED: - if (TD_ON_LOCK(td)) { - db_printf("[LOCK %6s %8p]", - td->td_lockname, - (void *)td->td_blocked); - } - if (TD_IS_SLEEPING(td)) { - db_printf("[SLP]"); - } - if (TD_IS_SWAPPED(td)) { - db_printf("[SWAP]"); - } - if (TD_IS_SUSPENDED(td)) { - db_printf("[SUSP]"); - } - if (TD_AWAITING_INTR(td)) { - db_printf("[IWAIT]"); - } - if (TD_LENT(td)) { - db_printf("[LOAN]"); - } - break; - case TDS_CAN_RUN: - db_printf("[Can run]"); - break; - case TDS_RUNQ: - db_printf("[RUNQ]"); - break; - case TDS_RUNNING: - db_printf("[CPU %d]", td->td_kse->ke_oncpu); - break; - default: - panic("unknown thread state"); - } - if (p->p_flag & P_KSES) { - if (td->td_kse) - db_printf("[kse %p]", td->td_kse); - db_printf("\n"); - } else - db_printf(" %s\n", p->p_comm); - + dumpthread(p, td); } /* PROC_UNLOCK(p); */ @@ -184,3 +138,90 @@ } /* sx_sunlock(&allproc_lock); */ } +static void +dumpthread(volatile struct proc *p, volatile struct thread *td) +{ + if (p->p_flag & P_KSES) + db_printf( " thread %p ksegrp %p ", td, td->td_ksegrp); + if (TD_ON_SLEEPQ(td)) { + if (td->td_flags & TDF_CVWAITQ) + db_printf("[CVQ "); + else + db_printf("[SLPQ "); + db_printf(" %6s %8p]", td->td_wmesg, + (void *)td->td_wchan); + } + switch (td->td_state) { + case TDS_INHIBITED: + if (TD_ON_LOCK(td)) { + db_printf("[LOCK %6s %8p]", + td->td_lockname, + (void *)td->td_blocked); + } + if (TD_IS_SLEEPING(td)) { + db_printf("[SLP]"); + } + if (TD_IS_SWAPPED(td)) { >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sun Dec 29 12:37:17 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5E2C937B405; Sun, 29 Dec 2002 12:37:04 -0800 (PST) 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 E75B637B401 for ; Sun, 29 Dec 2002 12:37:03 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A25C543ED8 for ; Sun, 29 Dec 2002 12:37:02 -0800 (PST) (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.6/8.12.6) with ESMTP id gBTKb2fh029115 for ; Sun, 29 Dec 2002 12:37:02 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id gBTKb05g029111 for perforce@freebsd.org; Sun, 29 Dec 2002 12:37:00 -0800 (PST) Date: Sun, 29 Dec 2002 12:37:00 -0800 (PST) Message-Id: <200212292037.gBTKb05g029111@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 Subject: PERFORCE change 22891 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=22891 Change 22891 by rwatson@rwatson_paprika on 2002/12/29 12:36:52 Integ libc-posix1e code from TrustedBSD base to TrustedBSD ACL branch. Affected files ... .. //depot/projects/trustedbsd/acl/lib/libc/posix1e/acl.3#3 integrate .. //depot/projects/trustedbsd/acl/lib/libc/posix1e/acl_add_perm.3#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/posix1e/acl_calc_mask.3#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/posix1e/acl_clear_perms.3#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/posix1e/acl_copy_entry.3#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/posix1e/acl_create_entry.3#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/posix1e/acl_delete.3#3 integrate .. //depot/projects/trustedbsd/acl/lib/libc/posix1e/acl_delete_entry.3#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/posix1e/acl_delete_perm.3#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/posix1e/acl_from_text.3#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/posix1e/acl_get.3#3 integrate .. //depot/projects/trustedbsd/acl/lib/libc/posix1e/acl_get_entry.3#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/posix1e/acl_get_perm_np.3#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/posix1e/acl_get_permset.3#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/posix1e/acl_get_qualifier.3#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/posix1e/acl_get_tag_type.3#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/posix1e/acl_set_permset.3#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/posix1e/acl_set_qualifier.3#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/posix1e/acl_set_tag_type.3#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/posix1e/acl_to_text.3#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/posix1e/mac_set.3#2 integrate Differences ... ==== //depot/projects/trustedbsd/acl/lib/libc/posix1e/acl.3#3 (text+ko) ==== @@ -25,7 +25,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libc/posix1e/acl.3,v 1.19 2002/11/08 15:01:28 rwatson Exp $ +.\" $FreeBSD: src/lib/libc/posix1e/acl.3,v 1.20 2002/12/27 12:15:28 schweikh Exp $ .\" .Dd December 18, 2002 .Dt ACL 3 @@ -43,7 +43,7 @@ permits file systems to export Access Control Lists via the VFS, and provides a library for userland access to and manipulation of these ACLs. Not all file systems provide support for ACLs, and some may require that -ACL support be explicitely enabled by the administrator. +ACL support be explicitly enabled by the administrator. The library calls include routines to allocate, duplicate, retrieve, set, and validate ACLs associated with file objects. As well as the POSIX.1e routines, there are a number of non-portable ==== //depot/projects/trustedbsd/acl/lib/libc/posix1e/acl_add_perm.3#2 (text+ko) ==== @@ -23,7 +23,7 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libc/posix1e/acl_add_perm.3,v 1.5 2001/10/01 16:08:56 ru Exp $ +.\" $FreeBSD: src/lib/libc/posix1e/acl_add_perm.3,v 1.6 2002/12/18 12:45:09 ru Exp $ .\" .Dd March 10, 2001 .Dt ACL_ADD_PERM 3 @@ -39,7 +39,9 @@ .Ft int .Fn acl_add_perm "acl_permset_t permset_d" "acl_perm_t perm" .Sh DESCRIPTION +The .Fn acl_add_perm +function is a POSIX.1e call that adds the permission contained in .Fa perm to the permission set ==== //depot/projects/trustedbsd/acl/lib/libc/posix1e/acl_calc_mask.3#2 (text+ko) ==== @@ -23,7 +23,7 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libc/posix1e/acl_calc_mask.3,v 1.4 2001/10/01 16:08:56 ru Exp $ +.\" $FreeBSD: src/lib/libc/posix1e/acl_calc_mask.3,v 1.5 2002/12/18 12:45:09 ru Exp $ .\" .Dd March 10, 2001 .Dt ACL_CALC_MASK 3 @@ -39,7 +39,9 @@ .Ft int .Fn acl_calc_mask "acl_t *acl_p" .Sh DESCRIPTION +The .Fn acl_calc_mask +function is a POSIX.1e call that calculates and set the permissions associated with the .Dv ACL_MASK ==== //depot/projects/trustedbsd/acl/lib/libc/posix1e/acl_clear_perms.3#2 (text+ko) ==== @@ -23,7 +23,7 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libc/posix1e/acl_clear_perms.3,v 1.4 2001/10/01 16:08:56 ru Exp $ +.\" $FreeBSD: src/lib/libc/posix1e/acl_clear_perms.3,v 1.5 2002/12/18 12:45:09 ru Exp $ .\" .Dd March 10, 2001 .Dt ACL_CLEAR_PERMS 3 @@ -39,7 +39,9 @@ .Ft int .Fn acl_clear_perms "acl_permset_t permset_d" .Sh DESCRIPTION +The .Fn acl_clear_perms +function is a POSIX.1e call that clears all permissions from permissions set .Fa permset_d . .Sh RETURN VALUES ==== //depot/projects/trustedbsd/acl/lib/libc/posix1e/acl_copy_entry.3#2 (text+ko) ==== @@ -23,7 +23,7 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libc/posix1e/acl_copy_entry.3,v 1.4 2001/10/01 16:08:56 ru Exp $ +.\" $FreeBSD: src/lib/libc/posix1e/acl_copy_entry.3,v 1.5 2002/12/18 12:45:09 ru Exp $ .\" .Dd March 10, 2001 .Dt ACL_COPY_ENTRY 3 @@ -39,7 +39,9 @@ .Ft int .Fn acl_copy_entry "acl_entry_t dest_d" "acl_entry_t src_d" .Sh DESCRIPTION +The .Fn acl_copy_entry +function is a POSIX.1e call that copies the contents of ACL entry .Fa src_d to ACL entry ==== //depot/projects/trustedbsd/acl/lib/libc/posix1e/acl_create_entry.3#2 (text+ko) ==== @@ -23,7 +23,7 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libc/posix1e/acl_create_entry.3,v 1.4 2001/10/01 16:08:56 ru Exp $ +.\" $FreeBSD: src/lib/libc/posix1e/acl_create_entry.3,v 1.5 2002/12/18 12:45:09 ru Exp $ .\" .Dd March 16, 2001 .Dt ACL_CREATE_ENTRY 3 @@ -39,7 +39,9 @@ .Ft int .Fn acl_create_entry "acl_t *acl_p" "acl_entry_t *entry_p" .Sh DESCRIPTION +The .Fn acl_create_entry +function is a POSIX.1e call that creates a new ACL entry in the ACL pointed to by .Fa acl_p . ==== //depot/projects/trustedbsd/acl/lib/libc/posix1e/acl_delete.3#3 (text+ko) ==== @@ -25,7 +25,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libc/posix1e/acl_delete.3,v 1.13 2001/10/01 16:08:56 ru Exp $ +.\" $FreeBSD: src/lib/libc/posix1e/acl_delete.3,v 1.14 2002/12/18 12:45:09 ru Exp $ .\" .Dd January 28, 2000 .Dt ACL_DELETE 3 @@ -61,7 +61,9 @@ and .Fn acl_delete_link_np each allow the deletion of an ACL from a file. +The .Fn acl_delete_def_file +function is a POSIX.1e call that deletes the default ACL from a file (normally a directory) by name; the remainder of the calls are non-portable extensions that permit the deletion of arbitrary ACL types from a file/directory ==== //depot/projects/trustedbsd/acl/lib/libc/posix1e/acl_delete_entry.3#2 (text+ko) ==== @@ -23,7 +23,7 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libc/posix1e/acl_delete_entry.3,v 1.4 2001/10/01 16:08:56 ru Exp $ +.\" $FreeBSD: src/lib/libc/posix1e/acl_delete_entry.3,v 1.5 2002/12/18 12:45:09 ru Exp $ .\" .Dd March 10, 2001 .Dt ACL_DELETE_ENTRY 3 @@ -39,7 +39,9 @@ .Ft int .Fn acl_delete_entry "acl_t acl" "acl_entry_t entry_d" .Sh DESCRIPTION +The .Fn acl_delete_entry +function is a POSIX.1e call that removes the ACL entry .Fa entry_d from ACL ==== //depot/projects/trustedbsd/acl/lib/libc/posix1e/acl_delete_perm.3#2 (text+ko) ==== @@ -23,7 +23,7 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libc/posix1e/acl_delete_perm.3,v 1.4 2001/10/01 16:08:56 ru Exp $ +.\" $FreeBSD: src/lib/libc/posix1e/acl_delete_perm.3,v 1.5 2002/12/18 12:45:09 ru Exp $ .\" .Dd March 10, 2001 .Dt ACL_DELETE_PERM 3 @@ -39,7 +39,9 @@ .Ft int .Fn acl_delete_perm "acl_permset_t permset_d" "acl_perm_t perm" .Sh DESCRIPTION +The .Fn acl_delete_perm +function is a POSIX.1e call that removes specific permissions from permissions set .Fa perm . .Sh RETURN VALUES ==== //depot/projects/trustedbsd/acl/lib/libc/posix1e/acl_from_text.3#2 (text+ko) ==== @@ -23,7 +23,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libc/posix1e/acl_from_text.3,v 1.13 2001/10/01 16:08:56 ru Exp $ +.\" $FreeBSD: src/lib/libc/posix1e/acl_from_text.3,v 1.14 2002/12/18 12:45:09 ru Exp $ .\" .Dd January 28, 2000 .Dt ACL_FROM_TEXT 3 @@ -103,9 +103,11 @@ .Sh BUGS These features are not yet fully implemented. .Pp +The .Fn acl_from_text and .Fn acl_to_text +functions rely on the .Xr getpwent 3 library calls to manage username and uid mapping, as well as the ==== //depot/projects/trustedbsd/acl/lib/libc/posix1e/acl_get.3#3 (text+ko) ==== @@ -25,7 +25,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libc/posix1e/acl_get.3,v 1.13 2001/10/01 16:08:56 ru Exp $ +.\" $FreeBSD: src/lib/libc/posix1e/acl_get.3,v 1.14 2002/12/18 12:45:09 ru Exp $ .\" .Dd January 28, 2000 .Dt ACL_GET 3 @@ -56,11 +56,14 @@ .Fn acl_get_link_np , .Fn acl_get_fd_np each allow the retrieval of an ACL from a file. +The .Fn acl_get_fd is a POSIX.1e call that allows the retrieval of an ACL of type ACL_TYPE_ACCESS from a file descriptor. +The .Fn acl_get_fd_np +function is a non-portable form of .Fn acl_get_fd that allows the retrieval of any type of ACL from a file descriptor. ==== //depot/projects/trustedbsd/acl/lib/libc/posix1e/acl_get_entry.3#2 (text+ko) ==== @@ -23,7 +23,7 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libc/posix1e/acl_get_entry.3,v 1.5 2001/10/03 16:25:08 bde Exp $ +.\" $FreeBSD: src/lib/libc/posix1e/acl_get_entry.3,v 1.6 2002/12/18 12:45:09 ru Exp $ .\" .Dd April 13, 2001 .Dt ACL_GET_ENTRY 3 @@ -39,7 +39,9 @@ .Ft int .Fn acl_get_entry "acl_t acl" "int entry_id" "acl_entry_t *entry_p" .Sh DESCRIPTION +The .Fn acl_get_entry +function is a POSIX.1e call that retrieves a descriptor for an ACL entry specified by the argument .Fa entry_d ==== //depot/projects/trustedbsd/acl/lib/libc/posix1e/acl_get_perm_np.3#2 (text+ko) ==== @@ -23,7 +23,7 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libc/posix1e/acl_get_perm_np.3,v 1.3 2001/10/01 16:08:56 ru Exp $ +.\" $FreeBSD: src/lib/libc/posix1e/acl_get_perm_np.3,v 1.4 2002/12/18 12:45:09 ru Exp $ .\" .Dd April 10, 2001 .Dt ACL_GET_PERM_NP 3 @@ -39,7 +39,9 @@ .Ft int .Fn acl_get_perm_np "acl_permset_t permset_d" "acl_perm_t perm" .Sh DESCRIPTION +The .Fn acl_get_perm_np +function is a non-portable function that checks if a permission is set in a permission set. .Sh RETURN VALUES ==== //depot/projects/trustedbsd/acl/lib/libc/posix1e/acl_get_permset.3#2 (text+ko) ==== @@ -23,7 +23,7 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libc/posix1e/acl_get_permset.3,v 1.4 2001/10/01 16:08:56 ru Exp $ +.\" $FreeBSD: src/lib/libc/posix1e/acl_get_permset.3,v 1.5 2002/12/18 12:45:09 ru Exp $ .\" .Dd March 10, 2001 .Dt ACL_GET_PERMSET 3 @@ -39,7 +39,9 @@ .Ft int .Fn acl_get_permset "acl_entry_t entry_d" "acl_permset_t *permset_p" .Sh DESCRIPTION +The .Fn acl_get_permset +function is a POSIX.1e call that returns via .Fa permset_p a descriptor to the permission set in the ACL entry ==== //depot/projects/trustedbsd/acl/lib/libc/posix1e/acl_get_qualifier.3#2 (text+ko) ==== @@ -23,7 +23,7 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libc/posix1e/acl_get_qualifier.3,v 1.4 2001/10/01 16:08:57 ru Exp $ +.\" $FreeBSD: src/lib/libc/posix1e/acl_get_qualifier.3,v 1.6 2002/12/27 12:15:28 schweikh Exp $ .\" .Dd March 13, 2001 .Dt ACL_GET_QUALIFIER 3 @@ -39,7 +39,9 @@ .Ft void * .Fn acl_get_qualifier "acl_entry_t entry_d" .Sh DESCRIPTION +The .Fn acl_get_qualifier +function is a POSIX.1e call that retrieves the qualifier of the tag for the ACL entry indicated by the argument .Fa entry_d @@ -64,7 +66,7 @@ will be a pointer to type .Vt gid_t . .Pp -If the value of the tag type in the ACL enty referred to by +If the value of the tag type in the ACL entry referred to by .Fa entry_d is .Dv ACL_UNDEFINED_TAG , ACL_USER_OBJ , ACL_GROUP_OBJ , ==== //depot/projects/trustedbsd/acl/lib/libc/posix1e/acl_get_tag_type.3#2 (text+ko) ==== @@ -23,7 +23,7 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libc/posix1e/acl_get_tag_type.3,v 1.5 2002/01/29 12:18:45 jedgar Exp $ +.\" $FreeBSD: src/lib/libc/posix1e/acl_get_tag_type.3,v 1.7 2002/12/27 12:15:28 schweikh Exp $ .\" .Dd March 10, 2001 .Dt ACL_GET_TAG_TYPE 3 @@ -39,8 +39,10 @@ .Ft int .Fn acl_get_tag_type "acl_entry_t entry_d" "acl_tag_t *tag_type_p" .Sh DESCRIPTION +The .Fn acl_get_tag_type -is a POSIX.1e call that returs the tag type for the ACL entry +function +is a POSIX.1e call that returns the tag type for the ACL entry .Fa entry_d . Upon successful completion, the location referred to by the argument .Fa tag_type_p ==== //depot/projects/trustedbsd/acl/lib/libc/posix1e/acl_set_permset.3#2 (text+ko) ==== @@ -23,7 +23,7 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libc/posix1e/acl_set_permset.3,v 1.5 2001/10/01 16:08:57 ru Exp $ +.\" $FreeBSD: src/lib/libc/posix1e/acl_set_permset.3,v 1.6 2002/12/18 12:45:09 ru Exp $ .\" .Dd March 10, 2001 .Dt ACL_SET_PERMSET 3 @@ -39,7 +39,9 @@ .Ft int .Fn acl_set_permset "acl_entry_t entry_d" "acl_permset_t permset_d" .Sh DESCRIPTION +The .Fn acl_set_permset +function is a POSIX.1e call that sets the permissions of ACL entry .Fa entry_d with the permissions contained in ==== //depot/projects/trustedbsd/acl/lib/libc/posix1e/acl_set_qualifier.3#2 (text+ko) ==== @@ -23,7 +23,7 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libc/posix1e/acl_set_qualifier.3,v 1.4 2001/10/01 16:08:57 ru Exp $ +.\" $FreeBSD: src/lib/libc/posix1e/acl_set_qualifier.3,v 1.5 2002/12/18 12:45:09 ru Exp $ .\" .Dd March 10, 2001 .Dt ACL_SET_QUALIFIER 3 @@ -39,7 +39,9 @@ .Ft int .Fn acl_set_qualifier "acl_entry_t entry_d" "const void *tag_qualifier_p" .Sh DESCRIPTION +The .Fn acl_set_qualifier +function is a POSIX.1e call that sets the qualifier of the tag for the ACl entry .Fa entry_d to the value referred to by ==== //depot/projects/trustedbsd/acl/lib/libc/posix1e/acl_set_tag_type.3#2 (text+ko) ==== @@ -23,7 +23,7 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libc/posix1e/acl_set_tag_type.3,v 1.5 2001/10/01 16:08:57 ru Exp $ +.\" $FreeBSD: src/lib/libc/posix1e/acl_set_tag_type.3,v 1.6 2002/12/18 12:45:09 ru Exp $ .\" .Dd March 10, 2001 .Dt ACL_SET_TAG_TYPE 3 @@ -39,7 +39,9 @@ .Ft int .Fn acl_set_tag_type "acl_entry_t entry_d" "acl_tag_t tag_type" .Sh DESCRIPTION +The .Fn acl_set_tag_type +function is a POSIX.1e call that sets the ACL tag type of ACL entry .Fa entry_d to the value of ==== //depot/projects/trustedbsd/acl/lib/libc/posix1e/acl_to_text.3#2 (text+ko) ==== @@ -23,7 +23,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libc/posix1e/acl_to_text.3,v 1.13 2001/10/01 16:08:57 ru Exp $ +.\" $FreeBSD: src/lib/libc/posix1e/acl_to_text.3,v 1.14 2002/12/18 12:45:09 ru Exp $ .\" .Dd January 28, 2000 .Dt ACL_TO_TEXT 3 @@ -113,9 +113,11 @@ .Sh BUGS These features are not yet fully implemented. .Pp +The .Fn acl_from_text and .Fn acl_to_text +functions rely on the .Xr getpwent 3 library calls to manage username and uid mapping, as well as the ==== //depot/projects/trustedbsd/acl/lib/libc/posix1e/mac_set.3#2 (text+ko) ==== @@ -31,7 +31,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libc/posix1e/mac_set.3,v 1.3 2002/12/11 15:55:29 ru Exp $ +.\" $FreeBSD: src/lib/libc/posix1e/mac_set.3,v 1.5 2002/12/27 12:15:28 schweikh Exp $ .\" .Dd December 21, 2001 .Dt MAC_SET 3 @@ -87,17 +87,21 @@ .It Bq Er EACCES MAC write access to the file is denied. .It Bq Er EBADF +The .Fa fd +argument is not a valid file descriptor. .It Bq Er EINVAL +The .Fa label +argument is not a valid MAC label. .It Bq Er EOPNOTSUPP Setting MAC labels is not supported by the file referenced by .Fa fd . .It Bq Er EPERM -The calling process had insufficient privelege +The calling process had insufficient privilege to change the MAC label. .It Bq Er EROFS File system for the object being modified To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sun Dec 29 12:42:15 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D936B37B405; Sun, 29 Dec 2002 12:42:10 -0800 (PST) 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 7019737B401 for ; Sun, 29 Dec 2002 12:42:10 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id F2E6243EC5 for ; Sun, 29 Dec 2002 12:42:09 -0800 (PST) (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.6/8.12.6) with ESMTP id gBTKg9fh032569 for ; Sun, 29 Dec 2002 12:42:09 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id gBTKg9t8032559 for perforce@freebsd.org; Sun, 29 Dec 2002 12:42:09 -0800 (PST) Date: Sun, 29 Dec 2002 12:42:09 -0800 (PST) Message-Id: <200212292042.gBTKg9t8032559@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 Subject: PERFORCE change 22892 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=22892 Change 22892 by rwatson@rwatson_paprika on 2002/12/29 12:42:05 Update dates where appropriate. Remove BUGS entry indicating these features aren't fully implemented -- they mostly are. Affected files ... .. //depot/projects/trustedbsd/acl/lib/libc/posix1e/acl_delete.3#4 edit .. //depot/projects/trustedbsd/acl/lib/libc/posix1e/acl_dup.3#2 edit .. //depot/projects/trustedbsd/acl/lib/libc/posix1e/acl_free.3#2 edit .. //depot/projects/trustedbsd/acl/lib/libc/posix1e/acl_from_text.3#3 edit .. //depot/projects/trustedbsd/acl/lib/libc/posix1e/acl_get.3#4 edit .. //depot/projects/trustedbsd/acl/lib/libc/posix1e/acl_init.3#2 edit .. //depot/projects/trustedbsd/acl/lib/libc/posix1e/acl_set.3#3 edit .. //depot/projects/trustedbsd/acl/lib/libc/posix1e/acl_to_text.3#3 edit .. //depot/projects/trustedbsd/acl/lib/libc/posix1e/acl_valid.3#3 edit Differences ... ==== //depot/projects/trustedbsd/acl/lib/libc/posix1e/acl_delete.3#4 (text+ko) ==== @@ -27,7 +27,7 @@ .\" .\" $FreeBSD: src/lib/libc/posix1e/acl_delete.3,v 1.14 2002/12/18 12:45:09 ru Exp $ .\" -.Dd January 28, 2000 +.Dd December 29, 2002 .Dt ACL_DELETE 3 .Os .Sh NAME ==== //depot/projects/trustedbsd/acl/lib/libc/posix1e/acl_dup.3#2 (text+ko) ==== @@ -102,5 +102,3 @@ and development continues. .Sh AUTHORS .An Robert N M Watson -.Sh BUGS -These features are not yet fully implemented. ==== //depot/projects/trustedbsd/acl/lib/libc/posix1e/acl_free.3#2 (text+ko) ==== @@ -83,5 +83,3 @@ and development continues. .Sh AUTHORS .An Robert N M Watson -.Sh BUGS -These features are not yet fully implemented. ==== //depot/projects/trustedbsd/acl/lib/libc/posix1e/acl_from_text.3#3 (text+ko) ==== @@ -101,8 +101,6 @@ .Sh AUTHORS .An Robert N M Watson .Sh BUGS -These features are not yet fully implemented. -.Pp The .Fn acl_from_text and ==== //depot/projects/trustedbsd/acl/lib/libc/posix1e/acl_get.3#4 (text+ko) ==== @@ -27,7 +27,7 @@ .\" .\" $FreeBSD: src/lib/libc/posix1e/acl_get.3,v 1.14 2002/12/18 12:45:09 ru Exp $ .\" -.Dd January 28, 2000 +.Dd December 29, 2002 .Dt ACL_GET 3 .Os .Sh NAME ==== //depot/projects/trustedbsd/acl/lib/libc/posix1e/acl_init.3#2 (text+ko) ==== @@ -101,5 +101,3 @@ and development continues. .Sh AUTHORS .An Robert N M Watson -.Sh BUGS -These features are not yet fully implemented. ==== //depot/projects/trustedbsd/acl/lib/libc/posix1e/acl_set.3#3 (text+ko) ==== @@ -27,7 +27,7 @@ .\" .\" $FreeBSD: src/lib/libc/posix1e/acl_set.3,v 1.13 2002/01/07 22:46:14 jedgar Exp $ .\" -.Dd January 28, 2000 +.Dd December 29, 2002 .Dt ACL_SET 3 .Os .Sh NAME ==== //depot/projects/trustedbsd/acl/lib/libc/posix1e/acl_to_text.3#3 (text+ko) ==== @@ -111,8 +111,6 @@ .Sh AUTHORS .An Robert N M Watson .Sh BUGS -These features are not yet fully implemented. -.Pp The .Fn acl_from_text and ==== //depot/projects/trustedbsd/acl/lib/libc/posix1e/acl_valid.3#3 (text+ko) ==== @@ -27,7 +27,7 @@ .\" .\" $FreeBSD: src/lib/libc/posix1e/acl_valid.3,v 1.13 2001/10/01 16:08:57 ru Exp $ .\" -.Dd January 28, 2000 +.Dd December 29, 2002 .Dt ACL_VALID 3 .Os .Sh NAME To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sun Dec 29 13:50: 5 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AE5FD37B405; Sun, 29 Dec 2002 13:49:40 -0800 (PST) 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 5B3B437B401 for ; Sun, 29 Dec 2002 13:49:40 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5E7B143EC2 for ; Sun, 29 Dec 2002 13:49:39 -0800 (PST) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id gBTLncfh054430 for ; Sun, 29 Dec 2002 13:49:38 -0800 (PST) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id gBTLnbCC054427 for perforce@freebsd.org; Sun, 29 Dec 2002 13:49:37 -0800 (PST) Date: Sun, 29 Dec 2002 13:49:37 -0800 (PST) Message-Id: <200212292149.gBTLnbCC054427@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar Subject: PERFORCE change 22896 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=22896 Change 22896 by marcel@marcel_vaio on 2002/12/29 13:49:14 IFC @22895 Affected files ... .. //depot/projects/ia64/etc/rc.diskless1#6 integrate .. //depot/projects/ia64/etc/rc.diskless2#6 integrate .. //depot/projects/ia64/include/unistd.h#16 integrate .. //depot/projects/ia64/lib/libc/gen/ualarm.3#3 integrate .. //depot/projects/ia64/lib/libc/gen/ualarm.c#3 integrate .. //depot/projects/ia64/lib/libc/gen/usleep.3#2 integrate .. //depot/projects/ia64/lib/libc/gen/usleep.c#3 integrate .. //depot/projects/ia64/lib/libc/posix1e/acl.3#4 integrate .. //depot/projects/ia64/lib/libc/posix1e/acl_delete.3#3 integrate .. //depot/projects/ia64/lib/libc/posix1e/acl_delete.c#3 integrate .. //depot/projects/ia64/lib/libc/posix1e/acl_dup.3#2 integrate .. //depot/projects/ia64/lib/libc/posix1e/acl_free.3#2 integrate .. //depot/projects/ia64/lib/libc/posix1e/acl_from_text.3#3 integrate .. //depot/projects/ia64/lib/libc/posix1e/acl_get.3#3 integrate .. //depot/projects/ia64/lib/libc/posix1e/acl_get.c#4 integrate .. //depot/projects/ia64/lib/libc/posix1e/acl_init.3#2 integrate .. //depot/projects/ia64/lib/libc/posix1e/acl_set.3#3 integrate .. //depot/projects/ia64/lib/libc/posix1e/acl_set.c#4 integrate .. //depot/projects/ia64/lib/libc/posix1e/acl_to_text.3#3 integrate .. //depot/projects/ia64/lib/libc/posix1e/acl_valid.3#2 integrate .. //depot/projects/ia64/lib/libc/posix1e/acl_valid.c#4 integrate .. //depot/projects/ia64/lib/libc_r/uthread/uthread_info.c#3 integrate .. //depot/projects/ia64/release/Makefile#32 integrate .. //depot/projects/ia64/release/i386/drivers.conf#11 integrate .. //depot/projects/ia64/sbin/fdisk/fdisk.c#13 integrate .. //depot/projects/ia64/sbin/swapon/Makefile#4 integrate .. //depot/projects/ia64/sbin/swapon/swapon.8#5 integrate .. //depot/projects/ia64/sbin/swapon/swapon.c#5 integrate .. //depot/projects/ia64/share/man/man5/Makefile#7 integrate .. //depot/projects/ia64/share/man/man5/msdos.5#2 delete .. //depot/projects/ia64/share/man/man5/msdosfs.5#1 branch .. //depot/projects/ia64/share/man/man7/development.7#2 integrate .. //depot/projects/ia64/sys/alpha/alpha/pmap.c#24 integrate .. //depot/projects/ia64/sys/dev/acpica/acpi.c#26 integrate .. //depot/projects/ia64/sys/dev/an/if_aironet_ieee.h#4 integrate .. //depot/projects/ia64/sys/dev/an/if_an.c#14 integrate .. //depot/projects/ia64/sys/dev/an/if_an_pccard.c#4 integrate .. //depot/projects/ia64/sys/dev/an/if_an_pci.c#4 integrate .. //depot/projects/ia64/sys/dev/an/if_anreg.h#5 integrate .. //depot/projects/ia64/sys/dev/puc/pucdata.c#8 integrate .. //depot/projects/ia64/sys/dev/puc/pucvar.h#8 integrate .. //depot/projects/ia64/sys/fs/devfs/devfs_vnops.c#19 integrate .. //depot/projects/ia64/sys/fs/fifofs/fifo_vnops.c#15 integrate .. //depot/projects/ia64/sys/fs/msdosfs/msdosfs_vnops.c#10 integrate .. //depot/projects/ia64/sys/geom/geom_mbr.c#20 integrate .. //depot/projects/ia64/sys/i386/conf/GENERIC#27 integrate .. //depot/projects/ia64/sys/ia64/ia32/syscalls.master#13 integrate .. //depot/projects/ia64/sys/isa/fd.c#10 integrate .. //depot/projects/ia64/sys/kern/init_sysent.c#22 integrate .. //depot/projects/ia64/sys/kern/kern_acl.c#13 integrate .. //depot/projects/ia64/sys/kern/kern_conf.c#11 integrate .. //depot/projects/ia64/sys/kern/kern_intr.c#16 integrate .. //depot/projects/ia64/sys/kern/kern_subr.c#14 integrate .. //depot/projects/ia64/sys/kern/subr_smp.c#10 integrate .. //depot/projects/ia64/sys/kern/syscalls.c#23 integrate .. //depot/projects/ia64/sys/kern/syscalls.master#23 integrate .. //depot/projects/ia64/sys/kern/tty_pty.c#6 integrate .. //depot/projects/ia64/sys/kern/vfs_subr.c#31 integrate .. //depot/projects/ia64/sys/kern/vfs_vnops.c#23 integrate .. //depot/projects/ia64/sys/net/bpf.c#15 integrate .. //depot/projects/ia64/sys/netatm/atm_if.c#8 integrate .. //depot/projects/ia64/sys/nfsclient/nfs_bio.c#10 integrate .. //depot/projects/ia64/sys/nfsserver/nfs_serv.c#14 integrate .. //depot/projects/ia64/sys/security/mac_bsdextended/mac_bsdextended.c#6 integrate .. //depot/projects/ia64/sys/sparc64/include/tte.h#8 integrate .. //depot/projects/ia64/sys/sparc64/sparc64/exception.S#9 integrate .. //depot/projects/ia64/sys/sparc64/sparc64/genassym.c#17 integrate .. //depot/projects/ia64/sys/sparc64/sparc64/interrupt.S#2 integrate .. //depot/projects/ia64/sys/sparc64/sparc64/mp_exception.S#2 integrate .. //depot/projects/ia64/sys/sparc64/sparc64/pmap.c#29 integrate .. //depot/projects/ia64/sys/sys/_iovec.h#1 branch .. //depot/projects/ia64/sys/sys/_mutex.h#6 integrate .. //depot/projects/ia64/sys/sys/acl.h#5 integrate .. //depot/projects/ia64/sys/sys/diskmbr.h#2 integrate .. //depot/projects/ia64/sys/sys/msg.h#5 integrate .. //depot/projects/ia64/sys/sys/mutex.h#10 integrate .. //depot/projects/ia64/sys/sys/signal.h#10 integrate .. //depot/projects/ia64/sys/sys/socket.h#12 integrate .. //depot/projects/ia64/sys/sys/syscall.h#22 integrate .. //depot/projects/ia64/sys/sys/syscall.mk#22 integrate .. //depot/projects/ia64/sys/sys/sysproto.h#24 integrate .. //depot/projects/ia64/sys/sys/uio.h#7 integrate .. //depot/projects/ia64/sys/sys/vnode.h#25 integrate .. //depot/projects/ia64/sys/vm/vm_fault.c#24 integrate .. //depot/projects/ia64/sys/vm/vm_kern.c#18 integrate .. //depot/projects/ia64/sys/vm/vm_map.c#37 integrate .. //depot/projects/ia64/sys/vm/vm_object.c#34 integrate .. //depot/projects/ia64/sys/vm/vm_object.h#13 integrate .. //depot/projects/ia64/sys/vm/vm_page.c#30 integrate .. //depot/projects/ia64/sys/vm/vm_pageout.c#25 integrate .. //depot/projects/ia64/sys/vm/vm_pager.h#5 integrate .. //depot/projects/ia64/sys/vm/vnode_pager.c#23 integrate .. //depot/projects/ia64/usr.bin/telnet/telnet.c#5 integrate .. //depot/projects/ia64/usr.sbin/ancontrol/ancontrol.8#7 integrate .. //depot/projects/ia64/usr.sbin/ancontrol/ancontrol.c#4 integrate .. //depot/projects/ia64/usr.sbin/boot0cfg/boot0cfg.c#4 integrate .. //depot/projects/ia64/usr.sbin/sysinstall/label.c#14 integrate Differences ... ==== //depot/projects/ia64/etc/rc.diskless1#6 (text+ko) ==== @@ -1,7 +1,7 @@ # Copyright (c) 1999-2002 Matt Dillion. Terms and conditions based on # the FreeBSD copyright as found at the base of the source distribution. # -# $FreeBSD: src/etc/rc.diskless1,v 1.18 2002/12/21 00:30:08 dillon Exp $ +# $FreeBSD: src/etc/rc.diskless1,v 1.19 2002/12/28 18:47:53 dillon Exp $ # # /etc/rc.diskless1 - general BOOTP startup # @@ -152,8 +152,9 @@ # NFS remount # if [ -d $j -a -f $j/diskless_remount ]; then - mount_nfs `/bin/cat $j/diskless_remount` $j - chkerr $? "mount_nfs `/bin/cat $j/diskless_remount` $j" + nfspt=`/bin/cat $j/diskless_remount` + mount_nfs $nfspt $j + chkerr $? "mount_nfs $nfspt $j" fi done done ==== //depot/projects/ia64/etc/rc.diskless2#6 (text+ko) ==== @@ -22,7 +22,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/etc/rc.diskless2,v 1.20 2002/10/01 13:29:45 ru Exp $ +# $FreeBSD: src/etc/rc.diskless2,v 1.21 2002/12/28 18:47:53 dillon Exp $ # # @@ -55,16 +55,36 @@ . /etc/rc.conf fi -echo "+++ mount_md of /var" -mount_md ${varsize:=32m} /var 1 +# If we do not have a writable /var, create a memory +# filesystem for /var. We don't have /usr yet so +# use mkdir instead of touch to test. We want mount +# to record its mounts so we have to make sure /var/db +# exists before doing the mount -a. +# +if (/bin/mkdir /var/.diskless 2> /dev/null); then + rmdir /var/.diskless +else + echo "+++ mount_md of /var" + mount_md ${varsize:=32m} /var 1 +fi + +if [ ! -d /var/db ]; then + mkdir /var/db +fi + +# Now we need the rest of our mounts, particularly /usr +# +mount -a # chown and chgrp are in /usr +# Populate /var +# echo "+++ populate /var using /etc/mtree/BSD.var.dist" -/usr/sbin/mtree -deU -f /etc/mtree/BSD.var.dist -p /var +/usr/sbin/mtree -deU -f /etc/mtree/BSD.var.dist -p /var > /dev/null case ${sendmail_enable} in [Nn][Oo][Nn][Ee]) ;; *) - /usr/sbin/mtree -deU -f /etc/mtree/BSD.sendmail.dist -p / + /usr/sbin/mtree -deU -f /etc/mtree/BSD.sendmail.dist -p / > /dev/null ;; esac @@ -77,34 +97,42 @@ echo "+++ create lastlog" /usr/bin/touch /var/log/lastlog -mount -a # chown and chgrp are in /usr - -# Since we are starting with a very fresh /etc on an MFS: -if [ -d /conf/default/etc ]; then - newaliases -fi +# Make sure our aliases database is uptodate, the aliases may have +# been overriden in /conf. +# +/usr/bin/newaliases -# # XXX make sure to create one dir for each printer as requested by lpd # - -# If /tmp is a symlink, assume it points to somewhere writable, like -# /var/tmp, otherwise, use a small memory filesystem for /tmp. +# If we do not have a writable /tmp, create a memory +# filesystem for /tmp. If /tmp is a symlink (e.g. to /var/tmp, +# then it should already be writable). # -# XXX: mtree runs too early to create any directories needed in /tmp, -# so if /var/tmp == /tmp, then you don't get a vi.recover. -# -if [ ! -L /tmp ]; then - mount_md ${tmpsize:=64m} /tmp 2 - chmod 01777 /tmp +if (/bin/mkdir /tmp/.diskless 2> /dev/null); then + rmdir /tmp/.diskless +else + if [ -h /tmp ]; then + echo "*** /tmp is a symlink to a non-writable area!" + echo "dropping into shell, ^D to continue anyway." + /bin/sh + else + mount_md ${tmpsize:=20480} /tmp 2 + chmod 01777 /tmp + fi fi if sysctl vfs.devfs.generation > /dev/null 2>&1 ; then # we have DEVFS, no worries... true +elif (/bin/mkdir /dev/.diskless 2> /dev/null); then + # if /dev is writable assume it has already been populated + # via rc.diskless1 + # + rmdir /dev/.diskless else - # extract a list of device entries, then copy them to a writable fs (cd /; find -x dev | cpio -o -H newc) > /tmp/dev.tmp mount_md 4096 /dev 3 512 (cd /; cpio -i -H newc -d < /tmp/dev.tmp) + rm -f /tmp/dev.tmp fi + ==== //depot/projects/ia64/include/unistd.h#16 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)unistd.h 8.12 (Berkeley) 4/27/95 - * $FreeBSD: src/include/unistd.h,v 1.65 2002/12/15 19:17:56 dillon Exp $ + * $FreeBSD: src/include/unistd.h,v 1.66 2002/12/29 01:07:55 mike Exp $ */ #ifndef _UNISTD_H_ @@ -47,6 +47,16 @@ #define _GID_T_DECLARED #endif +#ifndef _OFF_T_DECLARED +typedef __off_t off_t; +#define _OFF_T_DECLARED +#endif + +#ifndef _PID_T_DECLARED +typedef __pid_t pid_t; +#define _PID_T_DECLARED +#endif + #ifndef _SIZE_T_DECLARED typedef __size_t size_t; #define _SIZE_T_DECLARED @@ -58,13 +68,14 @@ #endif #ifndef _UID_T_DECLARED -typedef __uid_t_ uid_t; +typedef __uid_t uid_t; #define _UID_T_DECLARED #endif -/* - * XXX missing type definitions for off_t, pid_t and useconds_t. - */ +#ifndef _USECONDS_T_DECLARED +typedef __useconds_t useconds_t; +#define _USECONDS_T_DECLARED +#endif #define STDIN_FILENO 0 /* standard input file descriptor */ #define STDOUT_FILENO 1 /* standard output file descriptor */ @@ -427,8 +438,8 @@ int setreuid(uid_t, uid_t); /* void swab(const void * __restrict, void * __restrict, ssize_t); */ void sync(void); -unsigned int ualarm(unsigned int, unsigned int); -int usleep(unsigned int); +useconds_t ualarm(useconds_t, useconds_t); +int usleep(useconds_t); pid_t vfork(void); /* See comment at ftruncate() above. */ ==== //depot/projects/ia64/lib/libc/gen/ualarm.3#3 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" From: @(#)ualarm.3 8.2 (Berkeley) 4/19/94 -.\" $FreeBSD: src/lib/libc/gen/ualarm.3,v 1.16 2002/12/18 13:33:02 ru Exp $ +.\" $FreeBSD: src/lib/libc/gen/ualarm.3,v 1.17 2002/12/29 00:59:09 mike Exp $ .\" .Dd April 19, 1994 .Dt UALARM 3 @@ -42,8 +42,8 @@ .Lb libc .Sh SYNOPSIS .In unistd.h -.Ft u_int -.Fn ualarm "u_int microseconds" "u_int interval" +.Ft useconds_t +.Fn ualarm "useconds_t microseconds" "useconds_t interval" .Sh DESCRIPTION .Bf -symbolic This is a simplified interface to ==== //depot/projects/ia64/lib/libc/gen/ualarm.c#3 (text+ko) ==== @@ -35,7 +35,7 @@ static char sccsid[] = "@(#)ualarm.c 8.1 (Berkeley) 6/4/93"; #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/gen/ualarm.c,v 1.3 2002/02/01 01:08:48 obrien Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/gen/ualarm.c,v 1.4 2002/12/29 00:59:09 mike Exp $"); #include #include @@ -47,10 +47,10 @@ * If ``reload'' is non-zero, keep generating SIGALRM * every ``reload'' microseconds after the first signal. */ -unsigned +useconds_t ualarm(usecs, reload) - unsigned usecs; - unsigned reload; + useconds_t usecs; + useconds_t reload; { struct itimerval new, old; ==== //depot/projects/ia64/lib/libc/gen/usleep.3#2 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)usleep.3 8.1 (Berkeley) 6/4/93 -.\" $FreeBSD: src/lib/libc/gen/usleep.3,v 1.17 2001/10/01 16:08:51 ru Exp $ +.\" $FreeBSD: src/lib/libc/gen/usleep.3,v 1.18 2002/12/29 00:59:09 mike Exp $ .\" .Dd February 13, 1998 .Dt USLEEP 3 @@ -43,7 +43,7 @@ .Sh SYNOPSIS .In unistd.h .Ft int -.Fn usleep "unsigned int microseconds" +.Fn usleep "useconds_t microseconds" .Sh DESCRIPTION The .Fn usleep ==== //depot/projects/ia64/lib/libc/gen/usleep.c#3 (text+ko) ==== @@ -35,7 +35,7 @@ static char sccsid[] = "@(#)usleep.c 8.1 (Berkeley) 6/4/93"; #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/gen/usleep.c,v 1.27 2002/02/01 00:57:29 obrien Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/gen/usleep.c,v 1.28 2002/12/29 00:59:09 mike Exp $"); #include "namespace.h" #include @@ -44,7 +44,7 @@ int usleep(useconds) - unsigned int useconds; + useconds_t useconds; { struct timespec time_to_sleep; ==== //depot/projects/ia64/lib/libc/posix1e/acl.3#4 (text+ko) ==== @@ -2,6 +2,8 @@ .\" Copyright (c) 2000, 2001, 2002 Robert N. M. Watson .\" All rights reserved. .\" +.\" This software was developed by Robert Watson for the TrustedBSD Project. +.\" .\" Redistribution and use in source and binary forms, with or without .\" modification, are permitted provided that the following conditions .\" are met: @@ -23,9 +25,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libc/posix1e/acl.3,v 1.20 2002/12/27 12:15:28 schweikh Exp $ +.\" $FreeBSD: src/lib/libc/posix1e/acl.3,v 1.21 2002/12/29 20:47:05 rwatson Exp $ .\" -.Dd January 28, 2000 +.Dd December 18, 2002 .Dt ACL 3 .Os .Sh NAME @@ -82,8 +84,10 @@ and may be used to create an empty entry in an ACL. .It Xo .Fn acl_delete_def_file , +.Fn acl_delete_def_link_np , +.Fn acl_delete_fd_np , .Fn acl_delete_file_np , -.Fn acl_delete_fd_np +.Fn acl_delete_link_np .Xc These functions are described in .Xr acl_delete 3 , @@ -114,9 +118,10 @@ .Xr acl_get_entry 3 , and may be used to retrieve a designated ACL entry from an ACL. .It Xo +.Fn acl_get_fd , +.Fn acl_get_fd_np , .Fn acl_get_file , -.Fn acl_get_fd , -.Fn acl_get_fd_np +.Fn acl_get_link_np .Xc These functions are described in .Xr acl_get 3 , @@ -138,9 +143,10 @@ .Xr acl_init 3 , and may be used to allocate a fresh (empty) ACL structure. .It Xo +.Fn acl_set_fd , +.Fn acl_set_fd_np , .Fn acl_set_file , -.Fn acl_set_fd , -.Fn acl_set_fd_np +.Fn acl_set_link_np .Xc These functions are described in .Xr acl_set 3 , @@ -163,8 +169,9 @@ and may be used to generate a text-form of a POSIX.1e semantics ACL. .It Xo .Fn acl_valid , +.Fn acl_valid_fd_np , .Fn acl_valid_file_np , -.Fn acl_valid_fd_np +.Fn acl_valid_link_np .Xc These functions are described in .Xr acl_valid 3 , ==== //depot/projects/ia64/lib/libc/posix1e/acl_delete.3#3 (text+ko) ==== @@ -1,7 +1,9 @@ .\"- -.\" Copyright (c) 2000 Robert N. M. Watson +.\" Copyright (c) 2000, 2002 Robert N. M. Watson .\" All rights reserved. .\" +.\" This software was developed by Robert Watson for the TrustedBSD Project. +.\" .\" Redistribution and use in source and binary forms, with or without .\" modification, are permitted provided that the following conditions .\" are met: @@ -23,15 +25,17 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libc/posix1e/acl_delete.3,v 1.14 2002/12/18 12:45:09 ru Exp $ +.\" $FreeBSD: src/lib/libc/posix1e/acl_delete.3,v 1.15 2002/12/29 20:47:05 rwatson Exp $ .\" -.Dd January 28, 2000 +.Dd December 29, 2002 .Dt ACL_DELETE 3 .Os .Sh NAME .Nm acl_delete_def_file , +.Nm acl_delete_def_link_np , .Nm acl_delete_fd_np , .Nm acl_delete_file_np +.Nm acl_delete_link_np .Nd delete an ACL from a file .Sh LIBRARY .Lb libc @@ -41,23 +45,35 @@ .Ft int .Fn acl_delete_def_file "const char *path_p" .Ft int +.Fn acl_delete_def_link_np "const char *path_p" +.Ft int +.Fn acl_delete_fd_np "int filedes" "acl_type_t type" +.Ft int .Fn acl_delete_file_np "const char *path_p" "acl_type_t type" .Ft int -.Fn acl_delete_fd_np "int filedes" "acl_type_t type" +.Fn acl_delete_link_np "const char *path_p" "acl_type_t type" .Sh DESCRIPTION The .Fn acl_delete_def_file , +.Fn acl_delete_def_link_np , +.Fn acl_delete_fd_np , .Fn acl_delete_file_np , and -.Fn acl_delete_fd_np +.Fn acl_delete_link_np each allow the deletion of an ACL from a file. The .Fn acl_delete_def_file function is a POSIX.1e call that deletes the default ACL from a file (normally a -directory) by name; the other two calls are non-portable extensions that -allow deleting of arbitrary ACL types from a file/directory by either path -name, or by file descriptor. +directory) by name; the remainder of the calls are non-portable extensions +that permit the deletion of arbitrary ACL types from a file/directory +either by path name or file descriptor. +The +.Fn _file +variations follow a symlink if it occurs in the last segment of the +path name; the +.Fn _linke +variations operate on the symlink itself. .Sh IMPLEMENTATION NOTES .Fx Ns 's support for POSIX.1e interfaces and features is still under @@ -120,5 +136,3 @@ and development continues. .Sh AUTHORS .An Robert N M Watson -.Sh BUGS -These features are not yet fully implemented. ==== //depot/projects/ia64/lib/libc/posix1e/acl_delete.c#3 (text+ko) ==== @@ -1,7 +1,9 @@ /*- - * Copyright (c) 1999, 2000, 2001 Robert N. M. Watson + * Copyright (c) 1999, 2000, 2001, 2002 Robert N. M. Watson * All rights reserved. * + * This software was developed by Robert Watson for the TrustedBSD Project. + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: @@ -28,7 +30,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/posix1e/acl_delete.c,v 1.7 2002/03/22 21:52:38 obrien Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/posix1e/acl_delete.c,v 1.8 2002/12/29 20:47:05 rwatson Exp $"); #include #include "namespace.h" @@ -43,7 +45,13 @@ return (__acl_delete_file(path_p, ACL_TYPE_DEFAULT)); } +int +acl_delete_def_link_np(const char *path_p) +{ + return (__acl_delete_link(path_p, ACL_TYPE_DEFAULT)); +} + int acl_delete_file_np(const char *path_p, acl_type_t type) { @@ -51,6 +59,13 @@ return (__acl_delete_file(path_p, type)); } +int +acl_delete_link_np(const char *path_p, acl_type_t type) +{ + + return (__acl_delete_link(path_p, type)); +} + int acl_delete_fd_np(int filedes, acl_type_t type) ==== //depot/projects/ia64/lib/libc/posix1e/acl_dup.3#2 (text+ko) ==== @@ -1,7 +1,9 @@ .\"- -.\" Copyright (c) 2000 Robert N. M. Watson +.\" Copyright (c) 2000, 2002 Robert N. M. Watson .\" All rights reserved. .\" +.\" This software was developed by Robert Watson for the TrustedBSD Project. +.\" .\" Redistribution and use in source and binary forms, with or without .\" modification, are permitted provided that the following conditions .\" are met: @@ -23,7 +25,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libc/posix1e/acl_dup.3,v 1.11 2001/10/01 16:08:56 ru Exp $ +.\" $FreeBSD: src/lib/libc/posix1e/acl_dup.3,v 1.12 2002/12/29 20:52:42 rwatson Exp $ .\" .Dd January 28, 2000 .Dt ACL_DUP 3 @@ -102,5 +104,3 @@ and development continues. .Sh AUTHORS .An Robert N M Watson -.Sh BUGS -These features are not yet fully implemented. ==== //depot/projects/ia64/lib/libc/posix1e/acl_free.3#2 (text+ko) ==== @@ -1,7 +1,9 @@ .\"- -.\" Copyright (c) 2000 Robert N. M. Watson +.\" Copyright (c) 2000, 2002 Robert N. M. Watson .\" All rights reserved. .\" +.\" This software was developed by Robert Watson for the TrustedBSD Project. +.\" .\" Redistribution and use in source and binary forms, with or without .\" modification, are permitted provided that the following conditions .\" are met: @@ -23,7 +25,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libc/posix1e/acl_free.3,v 1.11 2001/10/01 16:08:56 ru Exp $ +.\" $FreeBSD: src/lib/libc/posix1e/acl_free.3,v 1.12 2002/12/29 20:52:42 rwatson Exp $ .\" .Dd January 28, 2000 .Dt ACL_FREE 3 @@ -83,5 +85,3 @@ and development continues. .Sh AUTHORS .An Robert N M Watson -.Sh BUGS -These features are not yet fully implemented. ==== //depot/projects/ia64/lib/libc/posix1e/acl_from_text.3#3 (text+ko) ==== @@ -1,7 +1,9 @@ .\"- -.\" Copyright (c) 2000 Robert N. M. Watson +.\" Copyright (c) 2000, 2002 Robert N. M. Watson .\" All rights reserved. .\" +.\" This software was developed by Robert Watson for the TrustedBSD Project. +.\" .\" Redistribution and use in source and binary forms, with or without .\" modification, are permitted provided that the following conditions .\" are met: @@ -23,7 +25,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libc/posix1e/acl_from_text.3,v 1.14 2002/12/18 12:45:09 ru Exp $ +.\" $FreeBSD: src/lib/libc/posix1e/acl_from_text.3,v 1.15 2002/12/29 20:52:42 rwatson Exp $ .\" .Dd January 28, 2000 .Dt ACL_FROM_TEXT 3 @@ -101,8 +103,6 @@ .Sh AUTHORS .An Robert N M Watson .Sh BUGS -These features are not yet fully implemented. -.Pp The .Fn acl_from_text and ==== //depot/projects/ia64/lib/libc/posix1e/acl_get.3#3 (text+ko) ==== @@ -1,7 +1,9 @@ .\"- -.\" Copyright (c) 2000 Robert N. M. Watson +.\" Copyright (c) 2000, 2002 Robert N. M. Watson .\" All rights reserved. .\" +.\" This software was developed by Robert Watson for the TrustedBSD Project. +.\" .\" Redistribution and use in source and binary forms, with or without .\" modification, are permitted provided that the following conditions .\" are met: @@ -23,15 +25,16 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libc/posix1e/acl_get.3,v 1.14 2002/12/18 12:45:09 ru Exp $ +.\" $FreeBSD: src/lib/libc/posix1e/acl_get.3,v 1.15 2002/12/29 20:47:05 rwatson Exp $ .\" -.Dd January 28, 2000 +.Dd December 29, 2002 .Dt ACL_GET 3 .Os .Sh NAME .Nm acl_get_fd , .Nm acl_get_fd_np , -.Nm acl_get_file +.Nm acl_get_file , +.Nm acl_get_link_np .Nd get an ACL for a file .Sh LIBRARY .Lb libc @@ -39,23 +42,21 @@ .In sys/types.h .In sys/acl.h .Ft acl_t -.Fn acl_get_file "const char *path_p" "acl_type_t type" -.Ft acl_t .Fn acl_get_fd "int fd" .Ft acl_t .Fn acl_get_fd_np "int fd" "acl_type_t type" +.Ft acl_t +.Fn acl_get_file "const char *path_p" "acl_type_t type" +.Ft acl_t +.Fn acl_get_link_np "const char *path_p" "acl_type_t type" .Sh DESCRIPTION The +.Fn acl_get_fd , .Fn acl_get_file , -.Fn acl_get_fd , -and +.Fn acl_get_link_np , .Fn acl_get_fd_np each allow the retrieval of an ACL from a file. The -.Fn acl_get_file -function -is a POSIX.1e call that allows the retrieval of a -specified type of ACL from a file by name; .Fn acl_get_fd is a POSIX.1e call that allows the retrieval of an ACL of type ACL_TYPE_ACCESS @@ -66,8 +67,16 @@ is a non-portable form of .Fn acl_get_fd that allows the retrieval of any type of ACL from a file descriptor. +.Fn acl_get_file +is a POSIX.1e call that allows the retrieval of a +specified type of ACL from a file by name; +.Fn acl_get_link_np +is a non-portable variation on +.Fn acl_get_file +which does not follow a symlink if the target of the call is a +symlink. .Pp -This function may cause memory to be allocated. The caller should free +These functions may cause memory to be allocated. The caller should free any releasable memory, when the new ACL is no longer required, by calling .Xr acl_free 3 with the @@ -139,5 +148,3 @@ and development continues. .Sh AUTHORS .An Robert N M Watson -.Sh BUGS -These features are not yet fully implemented. ==== //depot/projects/ia64/lib/libc/posix1e/acl_get.c#4 (text+ko) ==== @@ -1,7 +1,9 @@ /*- - * Copyright (c) 1999, 2000, 2001 Robert N. M. Watson + * Copyright (c) 1999, 2000, 2001, 2002 Robert N. M. Watson * All rights reserved. * + * This software was developed by Robert Watson for the TrustedBSD Project. + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: @@ -24,9 +26,11 @@ * SUCH DAMAGE. */ /* - * acl_get_file - syscall wrapper for retrieving ACL by filename * acl_get_fd - syscall wrapper for retrieving access ACL by fd * acl_get_fd_np - syscall wrapper for retrieving ACL by fd (non-POSIX) + * acl_get_file - syscall wrapper for retrieving ACL by filename + * acl_get_link_np - syscall wrapper for retrieving ACL by filename (NOFOLLOW) + * (non-POSIX) * acl_get_perm_np() checks if a permission is in the specified * permset (non-POSIX) * acl_get_permset() returns the permission set in the ACL entry @@ -35,7 +39,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/posix1e/acl_get.c,v 1.11 2002/03/22 21:52:38 obrien Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/posix1e/acl_get.c,v 1.12 2002/12/29 20:47:05 rwatson Exp $"); #include #include "namespace.h" @@ -66,6 +70,25 @@ } acl_t +acl_get_link_np(const char *path_p, acl_type_t type) +{ + acl_t aclp; + int error; + + aclp = acl_init(ACL_MAX_ENTRIES); + if (aclp == NULL) + return (NULL); + + error = __acl_get_link(path_p, type, &aclp->ats_acl); + if (error) { + acl_free(aclp); + return (NULL); + } + + return (aclp); +} + +acl_t acl_get_fd(int fd) { acl_t aclp; ==== //depot/projects/ia64/lib/libc/posix1e/acl_init.3#2 (text+ko) ==== @@ -1,7 +1,9 @@ .\"- -.\" Copyright (c) 2000 Robert N. M. Watson +.\" Copyright (c) 2000, 2002 Robert N. M. Watson .\" All rights reserved. .\" +.\" This software was developed by Robert Watson for the TrustedBSD Project. +.\" .\" Redistribution and use in source and binary forms, with or without .\" modification, are permitted provided that the following conditions .\" are met: @@ -23,7 +25,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libc/posix1e/acl_init.3,v 1.12 2001/10/01 16:08:57 ru Exp $ +.\" $FreeBSD: src/lib/libc/posix1e/acl_init.3,v 1.13 2002/12/29 20:52:42 rwatson Exp $ .\" .Dd January 28, 2000 .Dt ACL_INIT 3 @@ -101,5 +103,3 @@ and development continues. .Sh AUTHORS .An Robert N M Watson -.Sh BUGS -These features are not yet fully implemented. ==== //depot/projects/ia64/lib/libc/posix1e/acl_set.3#3 (text+ko) ==== @@ -1,7 +1,9 @@ .\"- -.\" Copyright (c) 2000 Robert N. M. Watson +.\" Copyright (c) 2000, 2002 Robert N. M. Watson .\" All rights reserved. .\" +.\" This software was developed by Robert Watson for the TrustedBSD Project. +.\" .\" Redistribution and use in source and binary forms, with or without .\" modification, are permitted provided that the following conditions .\" are met: @@ -23,15 +25,16 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libc/posix1e/acl_set.3,v 1.13 2002/01/07 22:46:14 jedgar Exp $ +.\" $FreeBSD: src/lib/libc/posix1e/acl_set.3,v 1.14 2002/12/29 20:50:30 rwatson Exp $ .\" -.Dd January 28, 2000 +.Dd December 29, 2002 .Dt ACL_SET 3 .Os .Sh NAME .Nm acl_set_fd , .Nm acl_set_fd_np , -.Nm acl_set_file +.Nm acl_set_file , +.Nm acl_set_link_np .Nd set an ACL for a file .Sh LIBRARY .Lb libc @@ -39,29 +42,36 @@ .In sys/types.h .In sys/acl.h .Ft int -.Fn acl_set_file "const char *path_p" "acl_type_t type" "acl_t acl" -.Ft int .Fn acl_set_fd "int fd" "acl_t acl" .Ft int .Fn acl_set_fd_np "int fd" "acl_t acl" "acl_type_t type" +.Ft int +.Fn acl_set_file "const char *path_p" "acl_type_t type" "acl_t acl" +.Ft int +.Fn acl_set_link_np "const char *path_p" "acl_type_t type" "acl_t acl" .Sh DESCRIPTION The +.Fn acl_set_fd , +.Fn acl_set_fd_np , .Fn acl_set_file , -.Fn acl_set_fd , and -.Fn acl_set_fd_np +.Fn acl_set_link_np , each associate an ACL with an object referred to by .Va fd or .Va path_p . -All except .Fn acl_set_fd_np -are POSIX.1e calls-- +and +.Fn acl_set_link_np +are not POSIX.1e calls. .Fn acl_set_fd allows only the setting of ACLs of type ACL_TYPE_ACCESS where as .Fn acl_set_fd_np allows the setting of ACLs of any type. +.Fn acl_set_link_np +acts on a symlink rather than its target, if the target of the +path is a symlink. .Sh IMPLEMENTATION NOTES .Fx Ns 's support for POSIX.1e interfaces and features is still under @@ -125,5 +135,3 @@ and development continues. .Sh AUTHORS .An Robert N M Watson -.Sh BUGS -These features are not yet fully implemented. ==== //depot/projects/ia64/lib/libc/posix1e/acl_set.c#4 (text+ko) ==== @@ -1,7 +1,9 @@ /*- - * Copyright (c) 1999, 2000, 2001 Robert N. M. Watson + * Copyright (c) 1999, 2000, 2001, 2002 Robert N. M. Watson * All rights reserved. * + * This software was developed by Robert Watson for the TrustedBSD Project. + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: @@ -28,7 +30,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/posix1e/acl_set.c,v 1.11 2002/03/22 21:52:38 obrien Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/posix1e/acl_set.c,v 1.12 2002/12/29 20:47:05 rwatson Exp $"); #include #include "namespace.h" @@ -70,6 +72,28 @@ } int +acl_set_link_np(const char *path_p, acl_type_t type, acl_t acl) +{ + int error; + + if (acl == NULL || path_p == NULL) { + errno = EINVAL; + return (-1); + } + if (_posix1e_acl(acl, type)) { + error = _posix1e_acl_sort(acl); + if (error) { + errno = error; + return (-1); + } + } + + acl->ats_cur_entry = 0; + + return (__acl_set_link(path_p, type, &acl->ats_acl)); +} + +int acl_set_fd(int fd, acl_t acl) { >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sun Dec 29 14: 3: 3 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A960437B405; Sun, 29 Dec 2002 14:03:00 -0800 (PST) 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 3993037B401 for ; Sun, 29 Dec 2002 14:03:00 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E203243EA9 for ; Sun, 29 Dec 2002 14:02:59 -0800 (PST) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id gBTM2xfh060792 for ; Sun, 29 Dec 2002 14:02:59 -0800 (PST) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id gBTM2wuN060773 for perforce@freebsd.org; Sun, 29 Dec 2002 14:02:58 -0800 (PST) Date: Sun, 29 Dec 2002 14:02:58 -0800 (PST) Message-Id: <200212292202.gBTM2wuN060773@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar Subject: PERFORCE change 22897 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=22897 Change 22897 by marcel@marcel_nfs on 2002/12/29 14:02:13 Don't hardcode 255 for the clock interrupt vector in multiple files. Hardcode it as 254 in a single header for now. 255 can be (and is) used for the AP wakeup vector. This is another thing we really need to make dynamic. Affected files ... .. //depot/projects/ia64/sys/ia64/ia64/clock.c#12 edit .. //depot/projects/ia64/sys/ia64/ia64/interrupt.c#19 edit .. //depot/projects/ia64/sys/ia64/ia64/mp_machdep.c#25 edit .. //depot/projects/ia64/sys/ia64/include/clock.h#5 edit Differences ... ==== //depot/projects/ia64/sys/ia64/ia64/clock.c#12 (text+ko) ==== @@ -193,7 +193,7 @@ itm_reload = (itc_frequency + hz/2) / hz; ia64_set_itm(ia64_get_itc() + itm_reload); - ia64_set_itv(255); /* highest priority class */ + ia64_set_itv(CLOCK_VECTOR); /* highest priority class */ stathz = 128; } ==== //depot/projects/ia64/sys/ia64/ia64/interrupt.c#19 (text+ko) ==== @@ -113,7 +113,7 @@ printf("ExtINT interrupt: vector=%ld\n", vector); } - if (vector == 255) {/* clock interrupt */ + if (vector == CLOCK_VECTOR) {/* clock interrupt */ /* CTR0(KTR_INTR, "clock interrupt"); */ cnt.v_intr++; ==== //depot/projects/ia64/sys/ia64/ia64/mp_machdep.c#25 (text+ko) ==== @@ -120,7 +120,7 @@ /* kick off the clock on this AP */ ia64_set_itm(ia64_get_itc() + itm_reload); - ia64_set_itv(255); + ia64_set_itv(CLOCK_VECTOR); ia64_set_tpr(0); cpu_throw(); panic("ia64_ap_startup: cpu_throw() returned"); ==== //depot/projects/ia64/sys/ia64/include/clock.h#5 (text+ko) ==== @@ -11,6 +11,8 @@ #ifdef _KERNEL +#define CLOCK_VECTOR 254 + extern int disable_rtc_set; extern int wall_cmos_clock; extern int adjkerntz; To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sun Dec 29 20:33: 7 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B1A6C37B405; Sun, 29 Dec 2002 20:32:57 -0800 (PST) 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 32E0937B401 for ; Sun, 29 Dec 2002 20:32:57 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id AAC1043EC5 for ; Sun, 29 Dec 2002 20:32:56 -0800 (PST) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id gBU4Wufh099705 for ; Sun, 29 Dec 2002 20:32:56 -0800 (PST) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id gBU4WtZt099702 for perforce@freebsd.org; Sun, 29 Dec 2002 20:32:55 -0800 (PST) Date: Sun, 29 Dec 2002 20:32:55 -0800 (PST) Message-Id: <200212300432.gBU4WtZt099702@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar Subject: PERFORCE change 22905 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=22905 Change 22905 by marcel@marcel_vaio on 2002/12/29 20:32:51 IFC @22904 Affected files ... .. //depot/projects/ia64/lib/libc/gen/basename.c#4 integrate .. //depot/projects/ia64/lib/libc/gen/dirname.c#4 integrate .. //depot/projects/ia64/sys/netipsec/ipsec_mbuf.c#2 integrate .. //depot/projects/ia64/sys/vm/vm_map.c#38 integrate .. //depot/projects/ia64/usr.sbin/burncd/Makefile#3 integrate .. //depot/projects/ia64/usr.sbin/burncd/burncd.c#11 integrate Differences ... ==== //depot/projects/ia64/lib/libc/gen/basename.c#4 (text+ko) ==== @@ -31,10 +31,11 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/lib/libc/gen/basename.c,v 1.6 2002/12/21 07:12:35 bbraun Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/gen/basename.c,v 1.7 2002/12/30 01:41:14 marcel Exp $"); #include #include +#include #include #include ==== //depot/projects/ia64/lib/libc/gen/dirname.c#4 (text+ko) ==== @@ -31,10 +31,11 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/lib/libc/gen/dirname.c,v 1.6 2002/12/21 07:12:35 bbraun Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/gen/dirname.c,v 1.7 2002/12/30 01:41:14 marcel Exp $"); #include #include +#include #include #include ==== //depot/projects/ia64/sys/netipsec/ipsec_mbuf.c#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/netipsec/ipsec_mbuf.c,v 1.1 2002/10/16 02:10:07 sam Exp $ */ +/* $FreeBSD: src/sys/netipsec/ipsec_mbuf.c,v 1.2 2002/12/30 02:15:18 sam Exp $ */ /* * IPsec-specific mbuf routines. @@ -88,13 +88,33 @@ * Allocate a new page, copy the data to the front * and release the reference to the old page. */ - n = m_getcl(M_DONTWAIT, m->m_type, m->m_flags); - if (n == NULL) { - m_freem(m0); - return (NULL); + if (mprev == NULL && (m->m_flags & M_PKTHDR)) { + /* + * NB: if a packet header is present we + * must allocate the mbuf separately from + * the cluster 'cuz M_COPY_PKTHDR will + * smash the data pointer and drop the + * M_EXT marker. + */ + MGETHDR(n, M_DONTWAIT, m->m_type); + if (n == NULL) { + m_freem(m0); + return (NULL); + } + M_COPY_PKTHDR(n, m); + MCLGET(n, M_DONTWAIT); + if ((n->m_flags & M_EXT) == 0) { + m_free(n); + m_freem(m0); + return (NULL); + } + } else { + n = m_getcl(M_DONTWAIT, m->m_type, m->m_flags); + if (n == NULL) { + m_freem(m0); + return (NULL); + } } - if (mprev == NULL && (m->m_flags & M_PKTHDR)) - M_COPY_PKTHDR(n, m); memcpy(mtod(n, caddr_t), mtod(m, caddr_t), m->m_len); n->m_len = m->m_len; n->m_next = m->m_next; @@ -148,11 +168,12 @@ * the contents of m as needed. */ remain = m->m_len - skip; /* data to move */ - /* XXX code doesn't handle clusters XXX */ - KASSERT(remain < MLEN, ("m_makespace: remainder too big: %u", remain)); if (hlen > M_TRAILINGSPACE(m)) { struct mbuf *n; + /* XXX code doesn't handle clusters XXX */ + KASSERT(remain < MLEN, + ("m_makespace: remainder too big: %u", remain)); /* * Not enough space in m, split the contents * of m, inserting new mbufs as required. ==== //depot/projects/ia64/sys/vm/vm_map.c#38 (text+ko) ==== @@ -61,7 +61,7 @@ * any improvements or extensions that they make and grant Carnegie the * rights to redistribute these changes. * - * $FreeBSD: src/sys/vm/vm_map.c,v 1.276 2002/12/29 21:01:14 alc Exp $ + * $FreeBSD: src/sys/vm/vm_map.c,v 1.277 2002/12/30 00:41:33 alc Exp $ */ /* @@ -133,6 +133,7 @@ * maps and requires map entries. */ +static struct mtx map_sleep_mtx; static uma_zone_t mapentzone; static uma_zone_t kmapentzone; static uma_zone_t mapzone; @@ -152,6 +153,7 @@ void vm_map_startup(void) { + mtx_init(&map_sleep_mtx, "vm map sleep mutex", NULL, MTX_DEF); mapzone = uma_zcreate("MAP", sizeof(struct vm_map), NULL, #ifdef INVARIANTS vm_map_zdtor, @@ -412,6 +414,8 @@ if (map->system_map) GIANT_REQUIRED; error = lockmgr(&map->lock, LK_EXCLUSIVE | LK_NOWAIT, NULL, curthread); + if (error == 0) + map->timestamp++; return (error == 0); } @@ -439,13 +443,10 @@ int vm_map_unlock_and_wait(vm_map_t map, boolean_t user_wait) { - int retval; - mtx_lock(&Giant); + mtx_lock(&map_sleep_mtx); vm_map_unlock(map); - retval = tsleep(&map->root, PVM, "vmmapw", 0); - mtx_unlock(&Giant); - return (retval); + return (msleep(&map->root, &map_sleep_mtx, PDROP | PVM, "vmmaps", 0)); } /* @@ -456,12 +457,12 @@ { /* - * Acquire and release Giant to prevent a wakeup() from being - * performed (and lost) between the vm_map_unlock() and the - * tsleep() in vm_map_unlock_and_wait(). + * Acquire and release map_sleep_mtx to prevent a wakeup() + * from being performed (and lost) between the vm_map_unlock() + * and the msleep() in vm_map_unlock_and_wait(). */ - mtx_lock(&Giant); - mtx_unlock(&Giant); + mtx_lock(&map_sleep_mtx); + mtx_unlock(&map_sleep_mtx); wakeup(&map->root); } ==== //depot/projects/ia64/usr.sbin/burncd/Makefile#3 (text+ko) ==== @@ -1,7 +1,7 @@ -# $FreeBSD: src/usr.sbin/burncd/Makefile,v 1.6 2001/12/24 03:24:28 mikeh Exp $ +# $FreeBSD: src/usr.sbin/burncd/Makefile,v 1.7 2002/12/29 22:28:51 wollman Exp $ PROG= burncd -WARNS?= 2 +WARNS?= 5 NO_WERROR= yes MAN= burncd.8 ==== //depot/projects/ia64/usr.sbin/burncd/burncd.c#11 (text+ko) ==== @@ -25,10 +25,11 @@ * (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/usr.sbin/burncd/burncd.c,v 1.31 2002/12/18 07:43:42 sos Exp $ + * $FreeBSD: src/usr.sbin/burncd/burncd.c,v 1.32 2002/12/29 22:28:51 wollman Exp $ */ #include +#include #include #include #include @@ -56,13 +57,13 @@ int addr; }; static struct track_info tracks[100]; -static int fd, quiet, verbose, saved_block_size, notracks; +static int global_fd_for_cleanup, quiet, verbose, saved_block_size, notracks; void add_track(char *, int, int, int); -void do_DAO(int, int); -void do_TAO(int, int, int); +void do_DAO(int fd, int, int); +void do_TAO(int fd, int, int, int); void do_format(int, int, char *); -int write_file(struct track_info *); +int write_file(int fd, struct track_info *); int roundup_blocks(struct track_info *); void cue_ent(struct cdr_cue_entry *, int, int, int, int, int, int, int); void cleanup(int); @@ -71,7 +72,7 @@ int main(int argc, char **argv) { - int ch, arg, addr; + int arg, addr, ch, fd; int dao = 0, eject = 0, fixate = 0, list = 0, multi = 0, preemp = 0; int nogap = 0, speed = 4 * 177, test_write = 0, force = 0; int block_size = 0, block_type = 0, cdopen = 0, dvdrw = 0; @@ -151,6 +152,7 @@ if (ioctl(fd, CDRIOCWRITESPEED, &speed) < 0) err(EX_IOERR, "ioctl(CDRIOCWRITESPEED)"); + global_fd_for_cleanup = fd; err_set_exit(cleanup); for (arg = 0; arg < argc; arg++) { @@ -291,9 +293,9 @@ cdopen = 1; } if (dao) - do_DAO(test_write, multi); + do_DAO(fd, test_write, multi); else - do_TAO(test_write, preemp, dvdrw); + do_TAO(fd, test_write, preemp, dvdrw); } if (fixate && !dao) { if (!quiet) @@ -367,7 +369,7 @@ } void -do_DAO(int test_write, int multi) +do_DAO(int fd, int test_write, int multi) { struct cdr_cuesheet sheet; struct cdr_cue_entry cue[100]; @@ -459,7 +461,7 @@ err(EX_IOERR, "ioctl(CDRIOCSENDCUE)"); for (i = 0; i < notracks; i++) { - if (write_file(&tracks[i])) + if (write_file(fd, &tracks[i])) err(EX_IOERR, "write_file"); } @@ -467,7 +469,7 @@ } void -do_TAO(int test_write, int preemp, int dvdrw) +do_TAO(int fd, int test_write, int preemp, int dvdrw) { struct cdr_track track; int i; @@ -489,7 +491,7 @@ if (!quiet) fprintf(stderr, "next writeable LBA %d\n", tracks[i].addr); - if (write_file(&tracks[i])) + if (write_file(fd, &tracks[i])) err(EX_IOERR, "write_file"); if (ioctl(fd, CDRIOCFLUSH) < 0) err(EX_IOERR, "ioctl(CDRIOCFLUSH)"); @@ -509,7 +511,7 @@ err(EX_IOERR, "ioctl(CDRIOCREADFORMATCAPS)"); if (verbose) { - fprintf(stderr, "format list entries=%d\n", + fprintf(stderr, "format list entries=%zd\n", capacities.length / sizeof(struct cdr_format_capacity)); fprintf(stderr, "current format: blocks=%u type=0x%x block_size=%u\n", ntohl(capacities.blocks), capacities.type, @@ -576,7 +578,7 @@ } int -write_file(struct track_info *track_info) +write_file(int fd, struct track_info *track_info) { off_t size, count, filesize; char buf[2352*BLOCKS]; @@ -591,8 +593,8 @@ lseek(fd, track_info->addr * track_info->block_size, SEEK_SET); if (verbose) - fprintf(stderr, "addr = %d size = %qd blocks = %d\n", - track_info->addr, track_info->file_size, + fprintf(stderr, "addr = %d size = %jd blocks = %d\n", + track_info->addr, (intmax_t)track_info->file_size, roundup_blocks(track_info)); if (!quiet) { @@ -600,8 +602,8 @@ fprintf(stderr, "writing from stdin\n"); else fprintf(stderr, - "writing from file %s size %qd KB\n", - track_info->file_name, filesize); + "writing from file %s size %jd KB\n", + track_info->file_name, (intmax_t)filesize); } size = 0; @@ -618,8 +620,8 @@ track_info->block_size; } if ((res = write(fd, buf, count)) != count) { - fprintf(stderr, "\nonly wrote %d of %qd bytes err=%d\n", - res, count, errno); + fprintf(stderr, "\nonly wrote %d of %jd bytes: %s\n", + res, (intmax_t)count, strerror(errno)); break; } size += count; @@ -627,12 +629,14 @@ if (!quiet) { int pct; - fprintf(stderr, "written this track %qd KB", size/1024); + fprintf(stderr, "written this track %jd KB", + (intmax_t)size/1024); if (track_info->file != STDIN_FILENO && filesize) { pct = (size / 1024) * 100 / filesize; fprintf(stderr, " (%d%%)", pct); } - fprintf(stderr, " total %qd KB\r", tot_size/1024); + fprintf(stderr, " total %jd KB\r", + (intmax_t)tot_size / 1024); } if (size >= track_info->file_size) break; @@ -669,7 +673,8 @@ void cleanup(int dummy __unused) { - if (ioctl(fd, CDRIOCSETBLOCKSIZE, &saved_block_size) < 0) + if (ioctl(global_fd_for_cleanup, CDRIOCSETBLOCKSIZE, + &saved_block_size) < 0) err(EX_IOERR, "ioctl(CDRIOCSETBLOCKSIZE)"); } To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sun Dec 29 21:19:57 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D06DC37B405; Sun, 29 Dec 2002 21:19:55 -0800 (PST) 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 6905A37B401 for ; Sun, 29 Dec 2002 21:19:55 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0C87E43EB2 for ; Sun, 29 Dec 2002 21:19:55 -0800 (PST) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id gBU5Jsfh014332 for ; Sun, 29 Dec 2002 21:19:54 -0800 (PST) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id gBU5JsAs014329 for perforce@freebsd.org; Sun, 29 Dec 2002 21:19:54 -0800 (PST) Date: Sun, 29 Dec 2002 21:19:54 -0800 (PST) Message-Id: <200212300519.gBU5JsAs014329@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar Subject: PERFORCE change 22907 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=22907 Change 22907 by marcel@marcel_nfs on 2002/12/29 21:19:07 Respect hint.sio.#.baud, just like i386. Affected files ... .. //depot/projects/ia64/sys/ia64/ia64/sio_machdep.c#6 edit Differences ... ==== //depot/projects/ia64/sys/ia64/ia64/sio_machdep.c#6 (text+ko) ==== @@ -138,7 +138,9 @@ continue; cd->bsh = ivar; cd->bst = IA64_BUS_SPACE_IO; - cd->baud = 0; /* Keep current baud. */ + if (resource_int_value("sio", i, "baud", &ivar) != 0) + ivar = 0; + cd->baud = ivar; cd->databits = 8; cd->stopbits = 1; cd->parity = 0; To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sun Dec 29 21:27:18 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DB8E837B406; Sun, 29 Dec 2002 21:27:16 -0800 (PST) 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 87D7937B401 for ; Sun, 29 Dec 2002 21:27:16 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2C95D43ED8 for ; Sun, 29 Dec 2002 21:27:16 -0800 (PST) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id gBU5RFfh017820 for ; Sun, 29 Dec 2002 21:27:15 -0800 (PST) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id gBU5RFkP017817 for perforce@freebsd.org; Sun, 29 Dec 2002 21:27:15 -0800 (PST) Date: Sun, 29 Dec 2002 21:27:15 -0800 (PST) Message-Id: <200212300527.gBU5RFkP017817@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar Subject: PERFORCE change 22908 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=22908 Change 22908 by marcel@marcel_nfs on 2002/12/29 21:26:39 Use CONSPEED as the baudrate if it's zero. Setting CONSPEED to zero means that we'll use the current setting of the UART. Affected files ... .. //depot/projects/ia64/sys/dev/sio/sio_cons.c#10 edit Differences ... ==== //depot/projects/ia64/sys/dev/sio/sio_cons.c#10 (text+ko) ==== @@ -134,6 +134,9 @@ sio_console.rclk = (cd.rclk != 0) ? cd.rclk : DEFAULT_RCLK; + if (cd.baud == 0) + cd.baud = CONSPEED; + /* Set DL and LCR. */ lcr = siocnlcr(&cd); sio_setreg(&sio_console, com_lcr, lcr | LCR_DLAB); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sun Dec 29 23:11:32 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0AD0937B405; Sun, 29 Dec 2002 23:11:27 -0800 (PST) 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 ABF9237B401 for ; Sun, 29 Dec 2002 23:11:26 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4C66E43EA9 for ; Sun, 29 Dec 2002 23:11:26 -0800 (PST) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id gBU7BQfh056715 for ; Sun, 29 Dec 2002 23:11:26 -0800 (PST) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id gBU7BP4o056703 for perforce@freebsd.org; Sun, 29 Dec 2002 23:11:25 -0800 (PST) Date: Sun, 29 Dec 2002 23:11:25 -0800 (PST) Message-Id: <200212300711.gBU7BP4o056703@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar Subject: PERFORCE change 22913 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=22913 Change 22913 by marcel@marcel_nfs on 2002/12/29 23:11:16 Extract the logic to flush both the transmitter and receiver from sioinitfifo() and put it in sioflush(). We call sioflush() from sioopen() as well. This replaces the compiled-out fiddling with the FIFOs. Although it's probably more efficient to reset the FIFOs as a way to clear them, I don't think it's generally a good idea. Flushing the transmitter and receiver also applies to non-FIFO UARTs. Slightly change the logic to flush the receiver. UARTs that are integrated in baseboard management controllers (BMCs) can be pretty chattyi when first probed (8KB of data has been observed). We take our time to flush the receiver to make sure we can reliably determine the FIFO size. The previous logic failed too often... Affected files ... .. //depot/projects/ia64/sys/dev/sio/sio.c#32 edit Differences ... ==== //depot/projects/ia64/sys/dev/sio/sio.c#32 (text+ko) ==== @@ -35,6 +35,7 @@ * from: i386/isa sio.c,v 1.234 */ +#include "opt_comconsole.h" #include "opt_ddb.h" #include "opt_sio.h" @@ -264,6 +265,52 @@ /* TUNABLE_INT("machdep.conspeed", &comdefaultrate); */ /* + * Flush the UART. Flush the transmitter FIFO and shift register first, then + * flush the receiver FIFO. In this order flushing works correctly even when + * the UART is in loopback mode. Bad timing may cause at most one character + * to remain in the receiver FIFO/buffer after we're done flushing. This + * would be the character that is (partly) in the receiver shift register. + */ +static int +sioflush(struct com_s *com) +{ + int delay, limit; + + /* 1/10th the time to transmit 1 character (estimate). */ + delay = 16000000 * com->reg_dl / com->rclk; + + /* Flush the transmitter. */ + limit = (com->fifosize) ? com->fifosize : 1; + limit = (limit + 2) * 10; + while ((sio_getreg(com, com_lsr) & LSR_TEMT) == 0 && --limit) + DELAY(delay); + if (limit == 0) { + printf("transmitter appears stuck... "); + return (EIO); + } + + DELAY(10*delay); + + /* + * Flush the receiver. Pick an arbitrary high limit to avoid + * getting stuck in an infinite loop when the hardware is + * broken. + */ + limit=32768; + while ((sio_getreg(com, com_lsr) & LSR_RXRDY) && --limit) { + (void)sio_getreg(com, com_data); + /* XXX barrier */ + DELAY(5*delay); + } + if (limit == 0) { + printf("receiver appears broken... "); + return (EIO); + } + + return (0); +} + +/* * Initialize the FIFOs and determine the size of the receiver FIFO. We * assume that the transmitter FIFO has the same size. First we set DMA * mode (mode 1) with the highest trigger level. In combination with @@ -326,36 +373,10 @@ return (0); } - /* - * We have FIFOs. Flush the transmitter FIFO and shift register. - * This could fill up the receiver FIFO, so we flush that too. - * Bad timing may cause at most one character to remain in the - * receiver FIFO after we're done flushing. This cannot do any - * harm, so we don't worry about it. - */ - limit = 30; - while ((sio_getreg(com, com_lsr) & LSR_TEMT) == 0 && --limit) { - if (delay) - DELAY(delay); - } - if (limit == 0) { - sio_setreg(com, com_mcr, com->reg_mcr); - /* XXX barrier */ - printf("transmitter appears stuck... "); - goto fallback; - } - - limit = 10300; - while ((sio_getreg(com, com_lsr) & LSR_RXRDY) && --limit) { - (void)sio_getreg(com, com_data); - /* XXX barrier */ - if (delay) - DELAY(delay); - } - if (limit == 0) { + /* We have FIFOs. Flush the transmitter and receiver. */ + if (sioflush(com)) { sio_setreg(com, com_mcr, com->reg_mcr); /* XXX barrier */ - printf("receiver appears broken... "); goto fallback; } @@ -635,6 +656,8 @@ if (com->rclk == 0) com->rclk = DEFAULT_RCLK; + sio_setreg(com, com_fcr, 0); + /* XXX barrier */ sio_setreg(com, com_lcr, LCR_8BITS | LCR_DLAB); /* XXX barrier */ com->reg_dl = siodivisor(com->rclk, comdefaultrate); @@ -897,51 +920,10 @@ --com->wopeners; if (error != 0) goto out; -#if 0 - /* - * XXX we should goto open_top if comparam() slept. - */ - if (com->hasfifo) { - int i; - /* - * (Re)enable and drain fifos. - * - * Certain SMC chips cause problems if the fifos - * are enabled while input is ready. Turn off the - * fifo if necessary to clear the input. We test - * the input ready bit after enabling the fifos - * since we've already enabled them in comparam() - * and to handle races between enabling and fresh - * input. - */ - for (i = 0; i < 500; i++) { - sio_setreg(com, com_fcr, - FCR_RCV_RST | FCR_XMT_RST - | com->reg_fcr); - /* - * XXX the delays are for superstitious - * historical reasons. It must be less than - * the character time at the maximum - * supported speed (87 usec at 115200 bps - * 8N1). Otherwise we might loop endlessly - * if data is streaming in. We used to use - * delays of 100. That usually worked - * because DELAY(100) used to usually delay - * for about 85 usec instead of 100. - */ - DELAY(50); - if (!(sio_getreg(com, com_lsr) & LSR_RXRDY)) - break; - sio_setreg(com, com_fcr, 0); - DELAY(50); - (void) sio_getreg(com, com_data); - } - if (i == 500) { - error = EIO; - goto out; - } - } -#endif + + error = sioflush(com); + if (error) + goto out; mtx_lock_spin(&sio_lock); (void) sio_getreg(com, com_lsr); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Sun Dec 29 23:15:36 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E9A8937B405; Sun, 29 Dec 2002 23:15:32 -0800 (PST) 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 697FB37B401 for ; Sun, 29 Dec 2002 23:15:32 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 135B843EB2 for ; Sun, 29 Dec 2002 23:15:32 -0800 (PST) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id gBU7FVfh057017 for ; Sun, 29 Dec 2002 23:15:31 -0800 (PST) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id gBU7FV1n057014 for perforce@freebsd.org; Sun, 29 Dec 2002 23:15:31 -0800 (PST) Date: Sun, 29 Dec 2002 23:15:31 -0800 (PST) Message-Id: <200212300715.gBU7FV1n057014@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar Subject: PERFORCE change 22914 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=22914 Change 22914 by marcel@marcel_vaio on 2002/12/29 23:14:41 IFC @22912 Affected files ... .. //depot/projects/ia64/sbin/swapon/swapon.c#6 integrate .. //depot/projects/ia64/share/man/man5/msdosfs.5#2 integrate .. //depot/projects/ia64/sys/vm/vm_kern.c#19 integrate .. //depot/projects/ia64/usr.sbin/mixer/mixer.c#2 integrate Differences ... ==== //depot/projects/ia64/sbin/swapon/swapon.c#6 (text+ko) ==== @@ -42,7 +42,7 @@ static char sccsid[] = "@(#)swapon.c 8.1 (Berkeley) 6/5/93"; #endif static const char rcsid[] = - "$FreeBSD: src/sbin/swapon/swapon.c,v 1.14 2002/12/28 23:39:47 dillon Exp $"; + "$FreeBSD: src/sbin/swapon/swapon.c,v 1.15 2002/12/30 05:35:06 mike Exp $"; #endif /* not lint */ #include @@ -210,8 +210,8 @@ { size_t mibsize, size; struct xswdev xsw; - int mib[16], n, pagesize; - size_t hlen; + int hlen, mib[16], n, pagesize; + size_t hsize; long blocksize; long long total = 0; long long used = 0; @@ -229,7 +229,8 @@ hlen = 10; break; default: - getbsize(&hlen, &blocksize); + getbsize(&hsize, &blocksize); + hlen = hsize; break; } ==== //depot/projects/ia64/share/man/man5/msdosfs.5#2 (text+ko) ==== @@ -1,4 +1,4 @@ -.\" $FreeBSD: src/share/man/man5/msdosfs.5,v 1.1 2002/12/29 21:32:41 trhodes Exp $ +.\" $FreeBSD: src/share/man/man5/msdosfs.5,v 1.2 2002/12/30 04:32:10 trhodes Exp $ .\" Written by Tom Rhodes .\" This file is in the public domain. .\" @@ -10,7 +10,7 @@ .Nd msdos file system .Sh SYNOPSIS .Bd -literal -/dev/ad0sN /dos msdos rw 0 0 +/dev/ad0sN /dos msdosfs rw 0 0 .Ed .Pp To link into the kernel: @@ -46,7 +46,7 @@ .Pa /etc/fstab that looks similar to: .Bd -literal -/dev/ad0sN /dos msdos rw 0 0 +/dev/ad0sN /dos msdosfs rw 0 0 .Ed .Pp This will mount an ==== //depot/projects/ia64/sys/vm/vm_kern.c#19 (text+ko) ==== @@ -61,7 +61,7 @@ * any improvements or extensions that they make and grant Carnegie the * rights to redistribute these changes. * - * $FreeBSD: src/sys/vm/vm_kern.c,v 1.93 2002/12/28 19:03:54 alc Exp $ + * $FreeBSD: src/sys/vm/vm_kern.c,v 1.94 2002/12/30 05:55:41 alc Exp $ */ /* @@ -524,11 +524,11 @@ vm_map_t m; m = vm_map_create(kernel_pmap, VM_MIN_KERNEL_ADDRESS, end); + m->system_map = 1; vm_map_lock(m); /* N.B.: cannot use kgdb to debug, starting with this assignment ... */ kernel_map = m; - kernel_map->system_map = 1; - (void) vm_map_insert(m, NULL, (vm_offset_t) 0, + (void) vm_map_insert(m, NULL, (vm_ooffset_t) 0, VM_MIN_KERNEL_ADDRESS, start, VM_PROT_ALL, VM_PROT_ALL, 0); /* ... and ending with the completion of the above `insert' */ vm_map_unlock(m); ==== //depot/projects/ia64/usr.sbin/mixer/mixer.c#2 (text+ko) ==== @@ -13,7 +13,7 @@ #ifndef lint static const char rcsid[] = - "$FreeBSD: src/usr.sbin/mixer/mixer.c,v 1.16 2001/06/25 21:06:15 dd Exp $"; + "$FreeBSD: src/usr.sbin/mixer/mixer.c,v 1.17 2002/12/30 04:23:08 jmallett Exp $"; #endif /* not lint */ #include @@ -217,8 +217,14 @@ else if (r > 100) r = 100; - printf("Setting the mixer %s to %d:%d.\n", names[dev], - l, r); + if (ioctl(baz, MIXER_READ(dev),&bar)== -1) { + warn("MIXER_READ"); + argc--; argv++; + continue; + } + + printf("Setting the mixer %s from %d:%d to %d:%d.\n", + names[dev], bar & 0x7f, (bar >> 8) & 0x7f, l, r); l |= r << 8; if (ioctl(baz, MIXER_WRITE(dev), &l) == -1) To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Dec 30 8:17:34 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2777837B405; Mon, 30 Dec 2002 08:17:32 -0800 (PST) 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 BD6D337B401 for ; Mon, 30 Dec 2002 08:17:31 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 711C443EC5 for ; Mon, 30 Dec 2002 08:17:31 -0800 (PST) (envelope-from green@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id gBUGHVfh049926 for ; Mon, 30 Dec 2002 08:17:31 -0800 (PST) (envelope-from green@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id gBUGHUNb049923 for perforce@freebsd.org; Mon, 30 Dec 2002 08:17:30 -0800 (PST) Date: Mon, 30 Dec 2002 08:17:30 -0800 (PST) Message-Id: <200212301617.gBUGHUNb049923@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to green@freebsd.org using -f From: Brian Feldman Subject: PERFORCE change 22922 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=22922 Change 22922 by green@green_laptop_2 on 2002/12/30 08:16:29 * Correct what save-entropy calls itself. * Add usbd(8) policy. * Add myself to the users file. Affected files ... .. //depot/projects/trustedbsd/mac/contrib/sebsd/policy/domains/program/save-entropy.te#2 edit .. //depot/projects/trustedbsd/mac/contrib/sebsd/policy/domains/program/usbd.te#1 add .. //depot/projects/trustedbsd/mac/contrib/sebsd/policy/file_contexts/program/usbd.fc#1 add .. //depot/projects/trustedbsd/mac/contrib/sebsd/policy/files.lst#6 edit .. //depot/projects/trustedbsd/mac/contrib/sebsd/policy/users#2 edit Differences ... ==== //depot/projects/trustedbsd/mac/contrib/sebsd/policy/domains/program/save-entropy.te#2 (text+ko) ==== @@ -6,7 +6,7 @@ # # Rules for the save_entropy_t domain. # -# save_entropy_t is the domain for the logrotate program. +# save_entropy_t is the domain for the save-entropy program. # save_entropy_exec_t is the type of the corresponding program. # type save_entropy_exec_t, file_type, sysadmfile, exec_type; ==== //depot/projects/trustedbsd/mac/contrib/sebsd/policy/files.lst#6 (text+ko) ==== @@ -117,6 +117,7 @@ file_contexts/program/tcpd.fc file_contexts/program/tftpd.fc file_contexts/program/traceroute.fc +file_contexts/program/usbd.fc file_contexts/program/usbmodules.fc file_contexts/program/utempter.fc file_contexts/program/vmware.fc @@ -218,6 +219,7 @@ domains/program/tcpd.te domains/program/tftpd.te domains/program/traceroute.te +domains/program/usbd.te domains/program/usbmodules.te domains/program/utempter.te domains/program/vmware.te ==== //depot/projects/trustedbsd/mac/contrib/sebsd/policy/users#2 (text+ko) ==== @@ -67,3 +67,7 @@ user cvance roles { user_r sysadm_r }; user wsalamon roles { user_r sysadm_r }; + +user bfeldman roles { user_r sysadm_r }; + +user green roles { user_r sysadm_r }; To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Dec 30 9: 1:29 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CC30837B405; Mon, 30 Dec 2002 09:01:26 -0800 (PST) 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 5C4B337B401 for ; Mon, 30 Dec 2002 09:01:26 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 10DA943EC2 for ; Mon, 30 Dec 2002 09:01:26 -0800 (PST) (envelope-from green@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id gBUH1Pfh066527 for ; Mon, 30 Dec 2002 09:01:25 -0800 (PST) (envelope-from green@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id gBUH1PtL066511 for perforce@freebsd.org; Mon, 30 Dec 2002 09:01:25 -0800 (PST) Date: Mon, 30 Dec 2002 09:01:25 -0800 (PST) Message-Id: <200212301701.gBUH1PtL066511@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to green@freebsd.org using -f From: Brian Feldman Subject: PERFORCE change 22924 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=22924 Change 22924 by green@green_laptop_2 on 2002/12/30 09:00:46 Devfs did not have refreshlabel removed at the same time. Affected files ... .. //depot/projects/trustedbsd/mac/sys/fs/devfs/devfs_vnops.c#41 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/fs/devfs/devfs_vnops.c#41 (text+ko) ==== @@ -72,9 +72,6 @@ static int devfs_readdir(struct vop_readdir_args *ap); static int devfs_readlink(struct vop_readlink_args *ap); static int devfs_reclaim(struct vop_reclaim_args *ap); -#ifdef MAC -static int devfs_refreshlabel(struct vop_refreshlabel_args *ap); -#endif static int devfs_remove(struct vop_remove_args *ap); static int devfs_revoke(struct vop_revoke_args *ap); static int devfs_setattr(struct vop_setattr_args *ap); @@ -656,21 +653,7 @@ return (0); } -#ifdef MAC static int -devfs_refreshlabel(ap) - struct vop_refreshlabel_args /* { - struct vnode *a_vp; - struct ucred *a_cred; - } */ *ap; -{ - - /* Labels are always in sync. */ - return (0); -} -#endif - -static int devfs_remove(ap) struct vop_remove_args /* { struct vnode *a_dvp; @@ -901,9 +884,6 @@ { &vop_readlink_desc, (vop_t *) devfs_readlink }, { &vop_reclaim_desc, (vop_t *) devfs_reclaim }, { &vop_remove_desc, (vop_t *) devfs_remove }, -#ifdef MAC - { &vop_refreshlabel_desc, (vop_t *) devfs_refreshlabel }, -#endif { &vop_revoke_desc, (vop_t *) devfs_revoke }, { &vop_setattr_desc, (vop_t *) devfs_setattr }, #ifdef MAC @@ -927,9 +907,6 @@ { &vop_pathconf_desc, (vop_t *) devfs_pathconf }, { &vop_print_desc, (vop_t *) vop_null }, { &vop_reclaim_desc, (vop_t *) devfs_reclaim }, -#ifdef MAC - { &vop_refreshlabel_desc, (vop_t *) devfs_refreshlabel }, -#endif { &vop_remove_desc, (vop_t *) devfs_remove }, { &vop_revoke_desc, (vop_t *) devfs_revoke }, { &vop_setattr_desc, (vop_t *) devfs_setattr }, To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Dec 30 10:46:39 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A42B137B405; Mon, 30 Dec 2002 10:46:37 -0800 (PST) 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 5147937B401 for ; Mon, 30 Dec 2002 10:46:37 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E6D3443EC2 for ; Mon, 30 Dec 2002 10:46:36 -0800 (PST) (envelope-from cvance@tislabs.com) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id gBUIkafh003685 for ; Mon, 30 Dec 2002 10:46:36 -0800 (PST) (envelope-from cvance@tislabs.com) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id gBUIkaSi003682 for perforce@freebsd.org; Mon, 30 Dec 2002 10:46:36 -0800 (PST) Date: Mon, 30 Dec 2002 10:46:36 -0800 (PST) Message-Id: <200212301846.gBUIkaSi003682@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to cvance@tislabs.com using -f From: Chris Vance Subject: PERFORCE change 22929 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=22929 Change 22929 by cvance@cvance_laptop on 2002/12/30 10:46:27 Release Giant on error case Affected files ... .. //depot/projects/trustedbsd/mac/sys/security/sebsd/ss/fileutils.c#4 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/security/sebsd/ss/fileutils.c#4 (text+ko) ==== @@ -76,8 +76,11 @@ mtx_lock(&Giant); NDINIT(&nd, LOOKUP, LOCKLEAF, pathseg, path, td); error = vn_open(&nd, &fp->FILE_saved_open_flags, 0); - if (error) + if (error) { + mtx_unlock(&Giant); return (NULL); + } + NDFREE(&nd, NDF_ONLY_PNBUF); VOP_UNLOCK(nd.ni_vp, 0, td); mtx_unlock(&Giant); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Dec 30 11:41:57 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 44D3837B401; Mon, 30 Dec 2002 11:41:55 -0800 (PST) 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 CB52B37B40A for ; Mon, 30 Dec 2002 11:41:54 -0800 (PST) Received: from mail.speakeasy.net (mail12.speakeasy.net [216.254.0.212]) by mx1.FreeBSD.org (Postfix) with ESMTP id E254C43EB2 for ; Mon, 30 Dec 2002 11:41:53 -0800 (PST) (envelope-from jhb@FreeBSD.org) Received: (qmail 26354 invoked from network); 30 Dec 2002 19:41:59 -0000 Received: from unknown (HELO server.baldwin.cx) ([216.27.160.63]) (envelope-sender ) by mail12.speakeasy.net (qmail-ldap-1.03) with DES-CBC3-SHA encrypted SMTP for ; 30 Dec 2002 19:41:59 -0000 Received: from laptop.baldwin.cx (gw1.twc.weather.com [216.133.140.1]) by server.baldwin.cx (8.12.6/8.12.6) with ESMTP id gBUJfpUT051544; Mon, 30 Dec 2002 14:41:52 -0500 (EST) (envelope-from jhb@FreeBSD.org) Message-ID: X-Mailer: XFMail 1.5.2 on FreeBSD X-Priority: 3 (Normal) Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 8bit MIME-Version: 1.0 In-Reply-To: <200212280132.gBS1WakY007301@repoman.freebsd.org> Date: Mon, 30 Dec 2002 14:41:58 -0500 (EST) From: John Baldwin To: Marcel Moolenaar Subject: RE: PERFORCE change 22825 for review Cc: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG On 28-Dec-2002 Marcel Moolenaar wrote: > http://perforce.freebsd.org/chv.cgi?CH=22825 > > Change 22825 by marcel@marcel_nfs on 2002/12/27 17:31:54 > > o Move ia64_sapics and ia64_sapic_count from interrupt.c to > sapic.c. > o Remove ia64_add_sapic(). Adding a sapic to the array is > done in sapic_create directly now. > o Update the interrupt counter as early as possible to > help diagnose interrupt problems. > o Create a new sysctl "hw.apic" that shows the RTEs for > all (x)APICs in the system. This may be combined with > interrupt counters as an alternative interface for > vmstat -i. It may also go away... > > In ia64_enable(), we have a serious problem. We use the > IRQ to determine the trigger mode and polarity. We assume > that the first 16 IRQs are identity mapped onto the the > dual-PIC IRQs used by legacy systems to support 8259 > compatibility mode. Those interrupts are hardcoded to be > edge sensitive and active high. All other (higher) IRQs > are assumed (and hardcode) to be level sensitive active > low. The latter is not true. On the HP rx2600 the ACPI > based sio(4) devices are edge triggered active high and > have vectors 66 and 67. > > DANGER, WILL ROBINSON: this change hardcodes the trigger > mode and polarity for 3 interrupt vectors to be edge > sensitive active high. Do not use this code unless you > know it cannot harm. The kludge committed to get a serial > console on the HP box in the cluster until we have figured > where and how we can get information about interrupts and > specificly about trigger mode and polarity. How about reading the default value of the vector in the IO APIC vector entry? Or better yet, leave the polarity and trigger mode of those entries alone and only ever change the vector. However, try looking at the madt. Check out the diffs in jhb_madt to print out the contents of the MADT. The MADT can describe when certain pins are not normal. -- John Baldwin <>< http://www.FreeBSD.org/~jhb/ "Power Users Use the Power to Serve!" - http://www.FreeBSD.org/ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Dec 30 12:12:56 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E98D537B405; Mon, 30 Dec 2002 12:12:53 -0800 (PST) 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 7F7B437B401; Mon, 30 Dec 2002 12:12:53 -0800 (PST) Received: from kayak.xcllnt.net (209-128-86-226.BAYAREA.NET [209.128.86.226]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2746C43E4A; Mon, 30 Dec 2002 12:12:52 -0800 (PST) (envelope-from marcel@xcllnt.net) Received: from dhcp01.pn.xcllnt.net (dhcp01.pn.xcllnt.net [192.168.4.201]) by kayak.xcllnt.net (8.12.6/8.12.6) with ESMTP id gBUKCkrT020555; Mon, 30 Dec 2002 12:12:46 -0800 (PST) (envelope-from marcel@kayak.pn.xcllnt.net) Received: from dhcp01.pn.xcllnt.net (localhost [127.0.0.1]) by dhcp01.pn.xcllnt.net (8.12.6/8.12.6) with ESMTP id gBUKDtcc000746; Mon, 30 Dec 2002 12:13:55 -0800 (PST) (envelope-from marcel@dhcp01.pn.xcllnt.net) Received: (from marcel@localhost) by dhcp01.pn.xcllnt.net (8.12.6/8.12.6/Submit) id gBUKDpa1000745; Mon, 30 Dec 2002 12:13:51 -0800 (PST) Date: Mon, 30 Dec 2002 12:13:50 -0800 From: Marcel Moolenaar To: John Baldwin Cc: Perforce Change Reviews Subject: Re: PERFORCE change 22825 for review Message-ID: <20021230201350.GA696@dhcp01.pn.xcllnt.net> References: <200212280132.gBS1WakY007301@repoman.freebsd.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.5.1i Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG On Mon, Dec 30, 2002 at 02:41:58PM -0500, John Baldwin wrote: > > > DANGER, WILL ROBINSON: this change hardcodes the trigger > > mode and polarity for 3 interrupt vectors to be edge > > sensitive active high. Do not use this code unless you > > know it cannot harm. The kludge committed to get a serial > > console on the HP box in the cluster until we have figured > > where and how we can get information about interrupts and > > specificly about trigger mode and polarity. > > How about reading the default value of the vector in the IO APIC > vector entry? Or better yet, leave the polarity and trigger mode > of those entries alone and only ever change the vector. Hmmm... Not a bad idea. But a bit scary. If the default settings are level sensitive active low, then I'm willing to give it a shot. Another idea I'm playing with is to look at the bus on which the device is attached. PCI is (AFAICT) always level sensitive active low. No need to guess if the device is attached to a PCI bus. The hardcoding I did is typically for devices attached to the ACPI bus. If ACPI defaults to edge sensitive active high (= compatible with ISA), then this should work. > However, try looking at the madt. Check out the diffs in jhb_madt > to print out the contents of the MADT. The MADT can describe when > certain pins are not normal. You mean the redirection/override entries? We don't have those. I haven't found anything in the MADT that tells us what the polarity and trigger mode should be. The override entries only apply to PIC IRQs 0-15 and this box does not have any PICs. It does not support non-APIC interrupt schemes. Hence, no need for overrides. Apparently everything is perceived to be normal from ACPI's point of view, so there's nothing there... -- Marcel Moolenaar USPA: A-39004 marcel@xcllnt.net To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Dec 30 13: 3:59 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 68CDF37B405; Mon, 30 Dec 2002 13:03:35 -0800 (PST) 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 F165D37B401 for ; Mon, 30 Dec 2002 13:03:34 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id EED3C43EC2 for ; Mon, 30 Dec 2002 13:03:33 -0800 (PST) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id gBUL3Xfh055643 for ; Mon, 30 Dec 2002 13:03:33 -0800 (PST) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id gBUL3WDM055640 for perforce@freebsd.org; Mon, 30 Dec 2002 13:03:32 -0800 (PST) Date: Mon, 30 Dec 2002 13:03:32 -0800 (PST) Message-Id: <200212302103.gBUL3WDM055640@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar Subject: PERFORCE change 22943 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=22943 Change 22943 by marcel@marcel_vaio on 2002/12/30 13:02:39 IFC @22939 Affected files ... .. //depot/projects/ia64/Makefile#20 integrate .. //depot/projects/ia64/Makefile.inc1#43 integrate .. //depot/projects/ia64/bin/df/df.c#12 integrate .. //depot/projects/ia64/bin/getfacl/getfacl.1#4 integrate .. //depot/projects/ia64/bin/getfacl/getfacl.c#6 integrate .. //depot/projects/ia64/bin/setfacl/setfacl.1#3 integrate .. //depot/projects/ia64/bin/setfacl/setfacl.c#4 integrate .. //depot/projects/ia64/bin/setfacl/setfacl.h#3 integrate .. //depot/projects/ia64/etc/mtree/BSD.include.dist#11 integrate .. //depot/projects/ia64/etc/mtree/BSD.local.dist#10 integrate .. //depot/projects/ia64/etc/mtree/BSD.usr.dist#16 integrate .. //depot/projects/ia64/include/Makefile#22 integrate .. //depot/projects/ia64/include/stdlib.h#15 integrate .. //depot/projects/ia64/lib/libc/gen/getbsize.3#3 integrate .. //depot/projects/ia64/lib/libc/gen/getbsize.c#4 integrate .. //depot/projects/ia64/lib/libmp/Makefile#3 integrate .. //depot/projects/ia64/sbin/mount_smbfs/Makefile#2 integrate .. //depot/projects/ia64/sbin/swapon/swapon.c#7 integrate .. //depot/projects/ia64/share/colldef/Makefile#10 integrate .. //depot/projects/ia64/share/colldef/ca_ES.ISO8859-1.src#1 branch .. //depot/projects/ia64/share/colldef/ca_ES.ISO8859-15.src#1 branch .. //depot/projects/ia64/share/mklocale/Makefile#8 integrate .. //depot/projects/ia64/share/monetdef/Makefile#8 integrate .. //depot/projects/ia64/share/monetdef/ca_ES.ISO8859-1.src#1 branch .. //depot/projects/ia64/share/msgdef/Makefile#8 integrate .. //depot/projects/ia64/share/msgdef/ca_ES.ISO8859-1.src#1 branch .. //depot/projects/ia64/share/numericdef/Makefile#8 integrate .. //depot/projects/ia64/share/numericdef/ca_ES.ISO8859-1.src#1 branch .. //depot/projects/ia64/share/timedef/Makefile#8 integrate .. //depot/projects/ia64/share/timedef/ca_ES.ISO8859-1.src#1 branch .. //depot/projects/ia64/sys/dev/awi/awi.c#9 integrate .. //depot/projects/ia64/sys/dev/awi/awi_wep.c#6 integrate .. //depot/projects/ia64/sys/dev/en/midway.c#6 integrate .. //depot/projects/ia64/sys/dev/firewire/iec13213.h#2 integrate .. //depot/projects/ia64/sys/dev/hifn/hifn7751.c#4 integrate .. //depot/projects/ia64/sys/dev/puc/pucdata.c#9 integrate .. //depot/projects/ia64/sys/dev/sab/sab.c#4 integrate .. //depot/projects/ia64/sys/dev/ubsec/ubsec.c#5 integrate .. //depot/projects/ia64/sys/i386/conf/OLDCARD#9 integrate .. //depot/projects/ia64/sys/i386/conf/SMP#1 branch .. //depot/projects/ia64/sys/kern/uipc_mbuf.c#11 integrate .. //depot/projects/ia64/sys/kern/uipc_mbuf2.c#7 integrate .. //depot/projects/ia64/sys/net/if_loop.c#10 integrate .. //depot/projects/ia64/sys/netatm/port.h#6 integrate .. //depot/projects/ia64/sys/netinet/ip_icmp.c#10 integrate .. //depot/projects/ia64/sys/netinet/ip_input.c#20 integrate .. //depot/projects/ia64/sys/netinet/tcp_input.c#30 integrate .. //depot/projects/ia64/sys/netinet6/esp_input.c#7 integrate .. //depot/projects/ia64/sys/netinet6/icmp6.c#11 integrate .. //depot/projects/ia64/sys/netinet6/ip6_input.c#11 integrate .. //depot/projects/ia64/sys/netinet6/ip6_output.c#10 integrate .. //depot/projects/ia64/sys/netinet6/ipsec.c#5 integrate .. //depot/projects/ia64/sys/netipsec/ipsec_mbuf.c#3 integrate .. //depot/projects/ia64/sys/netipsec/ipsec_output.c#2 integrate .. //depot/projects/ia64/sys/pci/if_xl.c#14 integrate .. //depot/projects/ia64/sys/sys/mbuf.h#13 integrate .. //depot/projects/ia64/usr.bin/Makefile#36 integrate .. //depot/projects/ia64/usr.bin/calendar/Makefile#10 integrate .. //depot/projects/ia64/usr.bin/chpass/Makefile#4 integrate .. //depot/projects/ia64/usr.bin/chpass/chpass.c#8 integrate .. //depot/projects/ia64/usr.bin/du/du.c#8 integrate .. //depot/projects/ia64/usr.bin/elf2aout/Makefile#4 integrate .. //depot/projects/ia64/usr.bin/elf2aout/elf2aout.c#7 integrate .. //depot/projects/ia64/usr.bin/systat/swap.c#5 integrate .. //depot/projects/ia64/usr.bin/whereis/Makefile#3 integrate .. //depot/projects/ia64/usr.sbin/Makefile#27 integrate .. //depot/projects/ia64/usr.sbin/burncd/Makefile#4 integrate .. //depot/projects/ia64/usr.sbin/burncd/burncd.c#12 integrate .. //depot/projects/ia64/usr.sbin/chown/chown.c#7 integrate .. //depot/projects/ia64/usr.sbin/crunch/crunchide/endian.h#2 delete .. //depot/projects/ia64/usr.sbin/crunch/crunchide/exec_elf32.c#5 integrate .. //depot/projects/ia64/usr.sbin/elf2aout/Makefile#3 delete .. //depot/projects/ia64/usr.sbin/elf2aout/elf2aout.c#2 delete .. //depot/projects/ia64/usr.sbin/fwcontrol/Makefile#1 branch .. //depot/projects/ia64/usr.sbin/fwcontrol/fwcontrol.8#1 branch .. //depot/projects/ia64/usr.sbin/fwcontrol/fwcontrol.c#1 branch .. //depot/projects/ia64/usr.sbin/fwcontrol/fwcrom.c#1 branch .. //depot/projects/ia64/usr.sbin/pkg_install/info/show.c#9 integrate .. //depot/projects/ia64/usr.sbin/pstat/pstat.c#7 integrate .. //depot/projects/ia64/usr.sbin/quot/quot.c#6 integrate Differences ... ==== //depot/projects/ia64/Makefile#20 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile,v 1.272 2002/12/14 22:36:56 imp Exp $ +# $FreeBSD: src/Makefile,v 1.273 2002/12/30 16:48:35 schweikh Exp $ # # The user-driven targets are: # @@ -17,7 +17,7 @@ # upgrade - Upgrade a.out (2.2.x/3.0) system to the new ELF way # most - Build user commands, no libraries or include files. # installmost - Install user commands, no libraries or include files. -# aout-to-elf - Upgrade an system from a.out to elf format (see below). +# aout-to-elf - Upgrade a system from a.out to elf format (see below). # aout-to-elf-build - Build everything required to upgrade a system from # a.out to elf format (see below). # aout-to-elf-install - Install everything built by aout-to-elf-build (see @@ -26,7 +26,7 @@ # of each elf library sub-directory. # # This makefile is simple by design. The FreeBSD make automatically reads -# the /usr/share/mk/sys.mk unless the -m argument is specified on the +# the /usr/share/mk/sys.mk unless the -m argument is specified on the # command line. By keeping this makefile simple, it doesn't matter too # much how different the installed mk files are from those in the source # tree. This makefile executes a child make process, forcing it to use @@ -71,7 +71,7 @@ # The aout->elf transition build is performed by doing a `make upgrade' (or # `make aout-to-elf') or in two steps by a `make aout-to-elf-build' followed # by a `make aout-to-elf-install', depending on user preference. -# You need to have at least 320 Mb of free space for the object tree. +# You need to have at least 320 MB of free space for the object tree. # # The upgrade process checks the installed release. If this is 3.0-CURRENT, # it is assumed that your kernel contains all the syscalls required by the @@ -253,4 +253,3 @@ > _.${TARGET_ARCH}.${kernel} 2>&1 .endif .endfor - ==== //depot/projects/ia64/Makefile.inc1#43 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.313 2002/12/02 14:03:40 ru Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.314 2002/12/30 10:01:25 obrien Exp $ # # Make command line options: # -DMAKE_KERBEROS4 to build KerberosIV @@ -663,7 +663,7 @@ .endif .if ${TARGET_ARCH} == "sparc64" -_elf2aout= usr.sbin/elf2aout +_elf2aout= usr.bin/elf2aout .endif _xlint= usr.bin/xlint/lint1 usr.bin/xlint/lint2 usr.bin/xlint/xlint ==== //depot/projects/ia64/bin/df/df.c#12 (text+ko) ==== @@ -48,7 +48,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/df/df.c,v 1.44 2002/10/23 22:09:05 markm Exp $"); +__FBSDID("$FreeBSD: src/bin/df/df.c,v 1.45 2002/12/30 18:10:37 mike Exp $"); #include #include @@ -381,8 +381,7 @@ prtstat(struct statfs *sfsp, struct maxwidths *mwp) { static long blocksize; - static int timesthrough; - static size_t headerlen; + static int headerlen, timesthrough; static const char *header; long used, availblks, inodes; @@ -393,7 +392,7 @@ mwp->total = mwp->used = mwp->avail = strlen(header); } else { header = getbsize(&headerlen, &blocksize); - mwp->total = imax(mwp->total, (int)headerlen); + mwp->total = imax(mwp->total, headerlen); } mwp->used = imax(mwp->used, strlen("Used")); mwp->avail = imax(mwp->avail, strlen("Avail")); @@ -442,7 +441,7 @@ update_maxwidths(struct maxwidths *mwp, struct statfs *sfsp) { static long blocksize; - size_t dummy; + int dummy; if (blocksize == 0) getbsize(&dummy, &blocksize); ==== //depot/projects/ia64/bin/getfacl/getfacl.1#4 (text+ko) ==== @@ -1,5 +1,5 @@ .\"- -.\" Copyright (c) 2000-2001 Robert N. M. Watson +.\" Copyright (c) 2000, 2001, 2002 Robert N. M. Watson .\" All rights reserved. .\" .\" This software was developed by Robert Watson for the TrustedBSD Project. @@ -25,12 +25,12 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/bin/getfacl/getfacl.1,v 1.5 2002/11/03 23:22:34 tjr Exp $ +.\" $FreeBSD: src/bin/getfacl/getfacl.1,v 1.6 2002/12/30 15:36:29 rwatson Exp $ .\" .\" Developed by the TrustedBSD Project. .\" Support for POSIX.1e access control lists. .\" -.Dd March 30, 2000 +.Dd Decemer 30, 2002 .Dt GETFACL 1 .Os .Sh NAME @@ -38,7 +38,7 @@ .Nd get ACL information .Sh SYNOPSIS .Nm -.Op Fl d +.Op Fl dh .Op Ar .Sh DESCRIPTION The @@ -61,6 +61,9 @@ access ACL. An error is generated if a default ACL cannot be associated with .Ar file . +.It Fl h +If the target of the operation is a symbolic link, return the ACL from +the symbol link itself rather than following the link. .El .Pp The following operand is available: ==== //depot/projects/ia64/bin/getfacl/getfacl.c#6 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 1999-2001 Robert N M Watson + * Copyright (c) 1999, 2001, 2002 Robert N M Watson * All rights reserved. * * This software was developed by Robert Watson for the TrustedBSD Project. @@ -32,7 +32,7 @@ #include -__FBSDID("$FreeBSD: src/bin/getfacl/getfacl.c,v 1.8 2002/11/03 23:22:34 tjr Exp $"); +__FBSDID("$FreeBSD: src/bin/getfacl/getfacl.c,v 1.9 2002/12/30 15:36:29 rwatson Exp $"); #include #include @@ -52,7 +52,7 @@ usage(void) { - fprintf(stderr, "getfacl [-d] [files ...]\n"); + fprintf(stderr, "getfacl [-dh] [files ...]\n"); } /* @@ -147,14 +147,17 @@ } static int -print_acl(char *path, acl_type_t type) +print_acl(char *path, acl_type_t type, int hflag) { struct stat sb; acl_t acl; char *acl_text; int error; - error = stat(path, &sb); + if (hflag) + error = lstat(path, &sb); + else + error = stat(path, &sb); if (error == -1) { warn("%s", path); return(-1); @@ -167,7 +170,10 @@ printf("#file:%s\n#owner:%d\n#group:%d\n", path, sb.st_uid, sb.st_gid); - acl = acl_get_file(path, type); + if (hflag) + acl = acl_get_link_np(path, type); + else + acl = acl_get_file(path, type); if (!acl) { if (errno != EOPNOTSUPP) { warn("%s", path); @@ -198,7 +204,7 @@ } static int -print_acl_from_stdin(acl_type_t type) +print_acl_from_stdin(acl_type_t type, int hflag) { char *p, pathname[PATH_MAX]; int carried_error = 0; @@ -206,7 +212,7 @@ while (fgets(pathname, (int)sizeof(pathname), stdin)) { if ((p = strchr(pathname, '\n')) != NULL) *p = '\0'; - if (print_acl(pathname, type) == -1) { + if (print_acl(pathname, type, hflag) == -1) { carried_error = -1; } } @@ -220,12 +226,17 @@ acl_type_t type = ACL_TYPE_ACCESS; int carried_error = 0; int ch, error, i; + int hflag; - while ((ch = getopt(argc, argv, "d")) != -1) + hflag = 0; + while ((ch = getopt(argc, argv, "dh")) != -1) switch(ch) { case 'd': type = ACL_TYPE_DEFAULT; break; + case 'h': + hflag = 1; + break; default: usage(); return(-1); @@ -234,17 +245,17 @@ argv += optind; if (argc == 0) { - error = print_acl_from_stdin(type); + error = print_acl_from_stdin(type, hflag); return(error ? 1 : 0); } for (i = 0; i < argc; i++) { if (!strcmp(argv[i], "-")) { - error = print_acl_from_stdin(type); + error = print_acl_from_stdin(type, hflag); if (error == -1) carried_error = -1; } else { - error = print_acl(argv[i], type); + error = print_acl(argv[i], type, hflag); if (error == -1) carried_error = -1; } ==== //depot/projects/ia64/bin/setfacl/setfacl.1#3 (text+ko) ==== @@ -23,7 +23,7 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: src/bin/setfacl/setfacl.1,v 1.7 2001/12/04 14:20:46 ru Exp $ +.\" $FreeBSD: src/bin/setfacl/setfacl.1,v 1.8 2002/12/30 15:36:29 rwatson Exp $ .\" .Dd January 7, 2001 .Dt SETFACL 1 @@ -33,7 +33,7 @@ .Nd set ACL information .Sh SYNOPSIS .Nm -.Op Fl bdkn +.Op Fl bdhkn .Op Fl m Ar entries .Op Fl M Ar file1 .Op Fl x Ar entries @@ -63,6 +63,9 @@ The operations apply to the default ACL entries instead of access ACL entries. Currently only directories may have default ACL's. +.It Fl h +If the target of the operation is a symbolic link, perform the operation +on the symbolic link itself, rather than following the link. .It Fl k Delete any default ACL entries on the specified files. It is not considered an error if the specified files do not have ==== //depot/projects/ia64/bin/setfacl/setfacl.c#4 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/bin/setfacl/setfacl.c,v 1.6 2002/06/30 05:15:03 obrien Exp $"); +__FBSDID("$FreeBSD: src/bin/setfacl/setfacl.c,v 1.7 2002/12/30 15:36:29 rwatson Exp $"); #include #include @@ -71,11 +71,19 @@ } acl = zmalloc(sizeof(acl_t) * 2); - acl[ACCESS_ACL] = acl_get_file(filename, ACL_TYPE_ACCESS); + if (h_flag) + acl[ACCESS_ACL] = acl_get_link_np(filename, ACL_TYPE_ACCESS); + else + acl[ACCESS_ACL] = acl_get_file(filename, ACL_TYPE_ACCESS); if (acl[ACCESS_ACL] == NULL) err(1, "acl_get_file() failed"); if (S_ISDIR(sb.st_mode)) { - acl[DEFAULT_ACL] = acl_get_file(filename, ACL_TYPE_DEFAULT); + if (h_flag) + acl[DEFAULT_ACL] = acl_get_link_np(filename, + ACL_TYPE_DEFAULT); + else + acl[DEFAULT_ACL] = acl_get_file(filename, + ACL_TYPE_DEFAULT); if (acl[DEFAULT_ACL] == NULL) err(1, "acl_get_file() failed"); } else @@ -88,7 +96,7 @@ usage(void) { - fprintf(stderr, "usage: setfacl [-bdknv] [-m entries] [-M file1] " + fprintf(stderr, "usage: setfacl [-bdhknv] [-m entries] [-M file1] " "[-x entries] [-X file2] [file ...]\n"); exit(1); } @@ -104,12 +112,12 @@ acl_type = ACL_TYPE_ACCESS; carried_error = local_error = 0; - have_mask = have_stdin = n_flag = need_mask = 0; + h_flag = have_mask = have_stdin = n_flag = need_mask = 0; TAILQ_INIT(&entrylist); TAILQ_INIT(&filelist); - while ((ch = getopt(argc, argv, "M:X:bdkm:nx:")) != -1) + while ((ch = getopt(argc, argv, "M:X:bdhkm:nx:")) != -1) switch(ch) { case 'M': entry = zmalloc(sizeof(struct sf_entry)); @@ -133,6 +141,9 @@ case 'd': acl_type = ACL_TYPE_DEFAULT; break; + case 'h': + h_flag = 1; + break; case 'k': entry = zmalloc(sizeof(struct sf_entry)); entry->op = OP_REMOVE_DEF; ==== //depot/projects/ia64/bin/setfacl/setfacl.h#3 (text+ko) ==== @@ -23,7 +23,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/bin/setfacl/setfacl.h,v 1.3 2001/12/03 01:20:52 jedgar Exp $ + * $FreeBSD: src/bin/setfacl/setfacl.h,v 1.4 2002/12/30 15:36:29 rwatson Exp $ */ #ifndef _SETFACL_H @@ -75,6 +75,7 @@ uint have_mask; uint need_mask; uint have_stdin; +uint h_flag; uint n_flag; #endif /* _SETFACL_H */ ==== //depot/projects/ia64/etc/mtree/BSD.include.dist#11 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/mtree/BSD.include.dist,v 1.63 2002/12/03 15:05:32 rwatson Exp $ +# $FreeBSD: src/etc/mtree/BSD.include.dist,v 1.64 2002/12/30 09:45:03 simokawa Exp $ # # Please see the file src/etc/mtree/README before making changes to this file. # @@ -20,6 +20,8 @@ .. iicbus .. + firewire + .. ofw .. ppbus ==== //depot/projects/ia64/etc/mtree/BSD.local.dist#10 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/mtree/BSD.local.dist,v 1.93 2002/10/29 16:48:03 tobez Exp $ +# $FreeBSD: src/etc/mtree/BSD.local.dist,v 1.94 2002/12/30 08:52:05 ache Exp $ # # Please see the file src/etc/mtree/README before making changes to this file. # @@ -231,6 +231,10 @@ .. bg_BG.CP1251 .. + ca_ES.ISO8859-1 + .. + ca_ES.ISO8859-15 + .. cs_CZ.ISO8859-2 .. da_DK.ISO8859-1 ==== //depot/projects/ia64/etc/mtree/BSD.usr.dist#16 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/mtree/BSD.usr.dist,v 1.269 2002/11/15 18:44:09 ru Exp $ +# $FreeBSD: src/etc/mtree/BSD.usr.dist,v 1.270 2002/12/30 08:52:05 ache Exp $ # # Please see the file src/etc/mtree/README before making changes to this file. # @@ -341,6 +341,10 @@ .. bg_BG.CP1251 .. + ca_ES.ISO8859-1 + .. + ca_ES.ISO8859-15 + .. cs_CZ.ISO8859-2 .. da_DK.ISO8859-1 @@ -669,6 +673,10 @@ .. bg_BG.CP1251 .. + ca_ES.ISO8859-1 + .. + ca_ES.ISO8859-15 + .. cs_CZ.ISO8859-2 .. da_DK.ISO8859-1 ==== //depot/projects/ia64/include/Makefile#22 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.2 (Berkeley) 1/4/94 -# $FreeBSD: src/include/Makefile,v 1.192 2002/12/26 14:30:55 tjr Exp $ +# $FreeBSD: src/include/Makefile,v 1.193 2002/12/30 09:45:03 simokawa Exp $ # # Doing a make install builds /usr/include # @@ -33,8 +33,8 @@ netipx netkey netnatm netncp netns netsmb nfs nfsclient nfsserver \ pccard posix4 sys vm -LSUBDIRS= cam/scsi dev/an dev/ic dev/iicbus dev/ofw dev/ppbus dev/smbus \ - dev/usb dev/wi fs/devfs \ +LSUBDIRS= cam/scsi dev/an dev/ic dev/iicbus dev/firewire dev/ofw \ + dev/ppbus dev/smbus dev/usb dev/wi fs/devfs \ fs/fdescfs fs/fifofs fs/msdosfs fs/ntfs fs/nullfs fs/nwfs fs/portalfs \ fs/procfs fs/smbfs fs/umapfs fs/unionfs isofs/cd9660 \ netatm/ipatm netatm/sigpvc netatm/spans netatm/uni \ ==== //depot/projects/ia64/include/stdlib.h#15 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)stdlib.h 8.5 (Berkeley) 5/19/95 - * $FreeBSD: src/include/stdlib.h,v 1.45 2002/10/23 14:18:07 markm Exp $ + * $FreeBSD: src/include/stdlib.h,v 1.46 2002/12/30 11:12:16 obrien Exp $ */ #ifndef _STDLIB_H_ @@ -227,7 +227,7 @@ arc4random(void); void arc4random_addrandom(unsigned char *dat, int datlen); void arc4random_stir(void); -char *getbsize(size_t *, long *); +char *getbsize(int *, long *); /* getcap(3) functions */ char *cgetcap(char *, const char *, int); int cgetclose(void); ==== //depot/projects/ia64/lib/libc/gen/getbsize.3#3 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)getbsize.3 8.1 (Berkeley) 6/4/93 -.\" $FreeBSD: src/lib/libc/gen/getbsize.3,v 1.9 2002/10/23 14:18:07 markm Exp $ +.\" $FreeBSD: src/lib/libc/gen/getbsize.3,v 1.10 2002/12/30 11:12:16 obrien Exp $ .\" .Dd June 4, 1993 .Dt GETBSIZE 3 @@ -43,7 +43,7 @@ .Sh SYNOPSIS .In stdlib.h .Ft char * -.Fn getbsize "size_t *headerlenp" "long *blocksizep" +.Fn getbsize "int *headerlenp" "long *blocksizep" .Sh DESCRIPTION The .Fn getbsize ==== //depot/projects/ia64/lib/libc/gen/getbsize.c#4 (text+ko) ==== @@ -35,7 +35,7 @@ static char sccsid[] = "@(#)getbsize.c 8.1 (Berkeley) 6/4/93"; #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/gen/getbsize.c,v 1.5 2002/10/23 14:18:07 markm Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/gen/getbsize.c,v 1.7 2002/12/30 19:04:06 obrien Exp $"); #include #include @@ -44,7 +44,7 @@ char * getbsize(headerlenp, blocksizep) - size_t *headerlenp; + int *headerlenp; long *blocksizep; { static char header[20]; ==== //depot/projects/ia64/lib/libmp/Makefile#3 (text+ko) ==== @@ -1,13 +1,12 @@ -# $FreeBSD: src/lib/libmp/Makefile,v 1.6 2002/05/13 12:11:54 ru Exp $ +# $FreeBSD: src/lib/libmp/Makefile,v 1.7 2002/12/30 09:25:30 obrien Exp $ LIB= mp SHLIB_MAJOR= 4 +MAN= libmp.3 +INCS= mp.h +SRCS= mpasbn.c + +WARNS?= 2 CFLAGS+= -ansi -pedantic -WARNS?= 2 -# openssl/bn.h isn't WARNS-safe, but I still want the warings. -NO_WERROR= yes -SRCS= mpasbn.c -INCS= mp.h -MAN= libmp.3 .include ==== //depot/projects/ia64/sbin/mount_smbfs/Makefile#2 (text+ko) ==== @@ -1,9 +1,8 @@ -# $FreeBSD: src/sbin/mount_smbfs/Makefile,v 1.1 2001/12/14 11:41:22 sheldonh Exp $ +# $FreeBSD: src/sbin/mount_smbfs/Makefile,v 1.2 2002/12/30 09:38:46 obrien Exp $ PROG= mount_smbfs SRCS= mount_smbfs.c getmntopts.c -WARNS?= 2 -NO_WERROR= yes +WARNS?= 0 MAN= mount_smbfs.8 MOUNTDIR= ${.CURDIR}/../mount ==== //depot/projects/ia64/sbin/swapon/swapon.c#7 (text+ko) ==== @@ -42,7 +42,7 @@ static char sccsid[] = "@(#)swapon.c 8.1 (Berkeley) 6/5/93"; #endif static const char rcsid[] = - "$FreeBSD: src/sbin/swapon/swapon.c,v 1.15 2002/12/30 05:35:06 mike Exp $"; + "$FreeBSD: src/sbin/swapon/swapon.c,v 1.16 2002/12/30 18:24:14 mike Exp $"; #endif /* not lint */ #include @@ -211,7 +211,6 @@ size_t mibsize, size; struct xswdev xsw; int hlen, mib[16], n, pagesize; - size_t hsize; long blocksize; long long total = 0; long long used = 0; @@ -229,8 +228,7 @@ hlen = 10; break; default: - getbsize(&hsize, &blocksize); - hlen = hsize; + getbsize(&hlen, &blocksize); break; } ==== //depot/projects/ia64/share/colldef/Makefile#10 (text+ko) ==== @@ -1,10 +1,12 @@ -# $FreeBSD: src/share/colldef/Makefile,v 1.52 2002/10/25 22:02:09 ache Exp $ +# $FreeBSD: src/share/colldef/Makefile,v 1.53 2002/12/30 09:09:57 ache Exp $ # NOMAN=YES CLEANFILES+= ${LOCALES:S/$/.out/g} LOCALES= bg_BG.CP1251 \ + ca_ES.ISO8859-1 \ + ca_ES.ISO8859-15 \ cs_CZ.ISO8859-2 \ de_DE.ISO8859-1 \ de_DE.ISO8859-15 \ @@ -54,6 +56,8 @@ all: ${LOCALES:S/$/.out/g} bg_BG.CP1251.out: map.CP1251 +ca_ES.ISO8859-15.out: map.ISO8859-15 +ca_ES.ISO8859-1.out: map.ISO8859-1 cs_CZ.ISO8859-2.out: map.ISO8859-2 de_DE.ISO8859-15.out: map.ISO8859-15 de_DE.ISO8859-1.out: map.ISO8859-1 ==== //depot/projects/ia64/share/mklocale/Makefile#8 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/share/mklocale/Makefile,v 1.47 2002/10/25 22:02:09 ache Exp $ +# $FreeBSD: src/share/mklocale/Makefile,v 1.48 2002/12/30 09:09:57 ache Exp $ NOMAN=YES CLEANFILES+= ${LOCALES:S/$/.out/g} @@ -25,9 +25,9 @@ LOCALEDIR= ${DESTDIR}/usr/share/locale ASCIILINKS= en_AU en_CA en_GB en_NZ en_US -LATIN1XLINKS= af_ZA da_DK de_AT de_CH de_DE en_AU en_CA en_GB en_NZ en_US \ - es_ES fi_FI fr_BE fr_CA fr_CH fr_FR is_IS it_CH it_IT nl_BE \ - nl_NL no_NO pt_PT sv_SE +LATIN1XLINKS= af_ZA ca_ES da_DK de_AT de_CH de_DE en_AU en_CA en_GB en_NZ \ + en_US es_ES fi_FI fr_BE fr_CA fr_CH fr_FR is_IS it_CH it_IT \ + nl_BE nl_NL no_NO pt_PT sv_SE LATIN1LINKS= ${LATIN1XLINKS} pt_BR LATIN15LINKS= ${LATIN1XLINKS} et_EE LATIN2LINKS= cs_CZ hr_HR hu_HU pl_PL sl_SI sr_YU ro_RO sk_SK ==== //depot/projects/ia64/share/monetdef/Makefile#8 (text+ko) ==== @@ -1,10 +1,11 @@ -# $FreeBSD: src/share/monetdef/Makefile,v 1.42 2002/10/25 22:02:09 ache Exp $ +# $FreeBSD: src/share/monetdef/Makefile,v 1.43 2002/12/30 09:09:57 ache Exp $ NOMAN=YES CLEANFILES+= ${LOCALES:S/$/.out/g} LOCALES= af_ZA.ISO8859-1 \ bg_BG.CP1251 \ + ca_ES.ISO8859-1 \ cs_CZ.ISO8859-2 \ da_DK.ISO8859-1 \ de_AT.ISO8859-1 \ @@ -54,9 +55,9 @@ LOCALEDIR= ${DESTDIR}/usr/share/locale ASCIILINKS= en_AU en_CA en_GB en_NZ en_US -LATIN15LINKS= af_ZA da_DK de_AT de_CH de_DE en_AU en_CA en_GB en_NZ en_US \ - es_ES fi_FI fr_BE fr_CA fr_CH fr_FR is_IS is_IS it_IT it_CH \ - nl_BE nl_NL no_NO pt_PT sv_SE +LATIN15LINKS= af_ZA ca_ES da_DK de_AT de_CH de_DE en_AU en_CA en_GB en_NZ \ + en_US es_ES fi_FI fr_BE fr_CA fr_CH fr_FR is_IS is_IS it_IT \ + it_CH nl_BE nl_NL no_NO pt_PT sv_SE CH_SRC= de_CH CH_LINKS= fr_CH it_CH ==== //depot/projects/ia64/share/msgdef/Makefile#8 (text+ko) ==== @@ -1,10 +1,11 @@ -# $FreeBSD: src/share/msgdef/Makefile,v 1.43 2002/10/25 22:02:09 ache Exp $ +# $FreeBSD: src/share/msgdef/Makefile,v 1.44 2002/12/30 09:09:58 ache Exp $ NOMAN=YES CLEANFILES+= ${LOCALES:S/$/.out/g} LOCALES= af_ZA.ISO8859-1 \ bg_BG.CP1251 \ + ca_ES.ISO8859-1 \ cs_CZ.ISO8859-2 \ da_DK.ISO8859-1 \ de_DE.ISO8859-1 \ @@ -48,8 +49,8 @@ LOCALEDIR= ${DESTDIR}/usr/share/locale ASCIILINKS= en_CA en_GB en_US -LATIN15LINKS= af_ZA da_DK de_DE en_CA en_GB en_US es_ES fi_FI fr_BE fr_CH \ - fr_FR is_IS it_IT nl_NL no_NO pt_PT sv_SE +LATIN15LINKS= af_ZA ca_ES da_DK de_DE en_CA en_GB en_US es_ES fi_FI fr_BE \ + fr_CH fr_FR is_IS it_IT nl_NL no_NO pt_PT sv_SE GB_LINKS= en_AU en_NZ FR_LINKS= fr_CA ==== //depot/projects/ia64/share/numericdef/Makefile#8 (text+ko) ==== @@ -1,10 +1,11 @@ -# $FreeBSD: src/share/numericdef/Makefile,v 1.41 2002/10/25 22:02:10 ache Exp $ +# $FreeBSD: src/share/numericdef/Makefile,v 1.42 2002/12/30 09:09:58 ache Exp $ NOMAN=YES CLEANFILES+= ${LOCALES:S/$/.out/g} LOCALES= af_ZA.ISO8859-1 \ bg_BG.CP1251 \ + ca_ES.ISO8859-1 \ cs_CZ.ISO8859-2 \ da_DK.ISO8859-1 \ de_DE.ISO8859-1 \ @@ -46,7 +47,7 @@ LOCALEDIR= ${DESTDIR}/usr/share/locale ASCIILINKS= en_US -LATIN15LINKS= af_ZA da_DK de_DE en_US es_ES fi_FI fr_BE fr_FR is_IS \ +LATIN15LINKS= af_ZA ca_ES da_DK de_DE en_US es_ES fi_FI fr_BE fr_FR is_IS \ it_CH it_IT nl_NL no_NO pt_PT sv_SE US_LINKS= en_CA en_GB ==== //depot/projects/ia64/share/timedef/Makefile#8 (text+ko) ==== @@ -1,9 +1,10 @@ -# $FreeBSD: src/share/timedef/Makefile,v 1.30 2002/10/25 22:02:10 ache Exp $ +# $FreeBSD: src/share/timedef/Makefile,v 1.31 2002/12/30 09:09:58 ache Exp $ NOMAN=YES CLEANFILES+= ${LOCALES:S/$/.out/g} LOCALES= bg_BG.CP1251 \ + ca_ES.ISO8859-1 \ cs_CZ.ISO8859-2 \ da_DK.ISO8859-1 \ de_AT.ISO8859-1 \ @@ -48,7 +49,7 @@ LOCALEDIR= ${DESTDIR}/usr/share/locale -LATIN15LINKS= da_DK de_AT de_DE en_GB en_US es_ES fi_FI fr_FR is_IS \ +LATIN15LINKS= ca_ES da_DK de_AT de_DE en_GB en_US es_ES fi_FI fr_FR is_IS \ it_IT la_LN nl_NL no_NO pt_PT sv_SE DE_LINKS= de_CH FR_LINKS= fr_BE fr_CA fr_CH ==== //depot/projects/ia64/sys/dev/awi/awi.c#9 (text+ko) ==== @@ -1,5 +1,5 @@ /* $NetBSD: awi.c,v 1.26 2000/07/21 04:48:55 onoe Exp $ */ -/* $FreeBSD: src/sys/dev/awi/awi.c,v 1.23 2002/11/14 23:54:49 sam Exp $ */ +/* $FreeBSD: src/sys/dev/awi/awi.c,v 1.24 2002/12/30 20:22:38 sam Exp $ */ /*- * Copyright (c) 1999 The NetBSD Foundation, Inc. @@ -1326,7 +1326,7 @@ m_freem(m0); return NULL; } - M_COPY_PKTHDR(n, m0); + M_MOVE_PKTHDR(n, m0); n->m_len = MHLEN; } else { MGET(n, M_DONTWAIT, MT_DATA); ==== //depot/projects/ia64/sys/dev/awi/awi_wep.c#6 (text+ko) ==== @@ -1,5 +1,5 @@ /* $NetBSD: awi_wep.c,v 1.4 2000/08/14 11:28:03 onoe Exp $ */ -/* $FreeBSD: src/sys/dev/awi/awi_wep.c,v 1.9 2002/09/21 08:44:48 phk Exp $ */ +/* $FreeBSD: src/sys/dev/awi/awi_wep.c,v 1.10 2002/12/30 20:22:38 sam Exp $ */ /* * Copyright (c) 2000 The NetBSD Foundation, Inc. @@ -323,7 +323,7 @@ n0 = n; if (n == NULL) goto fail; - M_COPY_PKTHDR(n, m); + M_MOVE_PKTHDR(n, m); len = IEEE80211_WEP_IVLEN + IEEE80211_WEP_KIDLEN + IEEE80211_WEP_CRCLEN; if (txflag) { n->m_pkthdr.len += len; ==== //depot/projects/ia64/sys/dev/en/midway.c#6 (text+ko) ==== @@ -32,7 +32,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/en/midway.c,v 1.31 2002/11/14 23:54:51 sam Exp $ + * $FreeBSD: src/sys/dev/en/midway.c,v 1.32 2002/12/30 20:22:38 sam Exp $ */ /* @@ -1843,7 +1843,7 @@ return(0); } if (m->m_flags & M_PKTHDR) - M_COPY_PKTHDR(new, m); + M_MOVE_PKTHDR(new, m); MCLGET(new, M_DONTWAIT); if ((new->m_flags & M_EXT) == 0) { m_free(new); ==== //depot/projects/ia64/sys/dev/firewire/iec13213.h#2 (text+ko) ==== @@ -30,17 +30,53 @@ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/firewire/iec13213.h,v 1.1 2002/09/13 12:31:56 ikob Exp $ + * $FreeBSD: src/sys/dev/firewire/iec13213.h,v 1.2 2002/12/30 09:41:32 simokawa Exp $ * */ + +#define CSRTYPE_SHIFT 6 +#define CSRTYPE_MASK (3 << CSRTYPE_SHIFT) +#define CSRTYPE_I (0 << CSRTYPE_SHIFT) /* Immediate */ +#define CSRTYPE_C (1 << CSRTYPE_SHIFT) /* CSR offset */ +#define CSRTYPE_L (2 << CSRTYPE_SHIFT) /* Leaf */ +#define CSRTYPE_D (3 << CSRTYPE_SHIFT) /* Directory */ + +#define CSRKEY_MASK 0x3f +#define CSRKEY_DESC 0x01 /* Descriptor */ +#define CSRKEY_BDINFO 0x02 /* Bus_Dependent_Info */ +#define CSRKEY_VENDOR 0x03 /* Vendor */ +#define CSRKEY_HW 0x04 /* Hardware_Version */ +#define CSRKEY_MODULE 0x07 /* Module */ +#define CSRKEY_NCAP 0x0c /* Node_Capabilities */ +#define CSRKEY_EUI64 0x0d /* EUI_64 */ +#define CSRKEY_UNIT 0x11 /* Unit */ +#define CSRKEY_SPEC 0x12 /* Specifier_ID */ +#define CSRKEY_VER 0x13 /* Version */ +#define CSRKEY_DINFO 0x14 /* Dependent_Info */ +#define CSRKEY_ULOC 0x15 /* Unit_Location */ +#define CSRKEY_MODEL 0x17 /* Model */ +#define CSRKEY_INST 0x18 /* Instance */ +#define CSRKEY_KEYW 0x19 /* Keyword */ +#define CSRKEY_FEAT 0x1a /* Feature */ +#define CSRKEY_EROM 0x1b /* Extended_ROM */ +#define CSRKEY_EKSID 0x1c /* Extended_Key_Specifier_ID */ +#define CSRKEY_EKEY 0x1d /* Extended_Key */ +#define CSRKEY_EDATA 0x1e /* Extended_Data */ +#define CSRKEY_MDESC 0x1f /* Modifiable_Descriptor */ +#define CSRKEY_DID 0x20 /* Directory_ID */ +#define CSRKEY_REV 0x21 /* Revision */ + +#define CROM_TEXTLEAF (CSRTYPE_L | CSRKEY_DESC) /* 0x81 */ +#define CROM_LUN (CSRTYPE_I | CSRKEY_DINFO) /* 0x14 */ + +/* ??? #define CSRKEY_MVID 0x3 -#define CSRKEY_NCAP 0xc #define CSRKEY_NUNQ 0x8d #define CSRKEY_NPWR 0x30 -#define CSRKEY_SPEC 0x12 +*/ + #define CSRVAL_1394TA 0x00a02d #define CSRVAL_ANSIT10 0x00609e -#define CSRKEY_VER 0x13 #define CSR_PROTAVC 0x010001 #define CSR_PROTCAL 0x010002 #define CSR_PROTEHS 0x010004 @@ -70,8 +106,8 @@ struct csrtext { u_int32_t crc:16, crc_len:16; - u_int32_t spec_id:16, - spec_type:16; + u_int32_t spec_id:24, + spec_type:8; u_int32_t lang_id; u_int32_t text[0]; }; @@ -90,3 +126,24 @@ v_id:24; u_int32_t c_id_lo; }; + +#define CROM_MAX_DEPTH 10 +struct crom_ptr { + struct csrdirectory *dir; + int index; +}; + +struct crom_context { + int depth; + struct crom_ptr stack[CROM_MAX_DEPTH]; +}; + +void crom_init_context(struct crom_context *, u_int32_t *); +struct csrreg *crom_get(struct crom_context *); +void crom_next(struct crom_context *); +void crom_parse_text(struct crom_context *, char *, int); +u_int16_t crom_crc(u_int32_t *r, int); +struct csrreg *crom_search_key(struct crom_context *, u_int8_t); +#ifndef _KERNEL +char *crom_desc(struct crom_context *, char *, int); +#endif >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Dec 30 13:37:45 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C98F537B405; Mon, 30 Dec 2002 13:37:21 -0800 (PST) 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 4DE7B37B401 for ; Mon, 30 Dec 2002 13:37:20 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id AF0E743E4A for ; Mon, 30 Dec 2002 13:37:19 -0800 (PST) (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.6/8.12.6) with ESMTP id gBULbJfh068037 for ; Mon, 30 Dec 2002 13:37:19 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id gBULbIkb068034 for perforce@freebsd.org; Mon, 30 Dec 2002 13:37:18 -0800 (PST) Date: Mon, 30 Dec 2002 13:37:18 -0800 (PST) Message-Id: <200212302137.gBULbIkb068034@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 Subject: PERFORCE change 22946 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=22946 Change 22946 by rwatson@rwatson_paprika on 2002/12/30 13:37:00 Integ TrustedBSD base. Loop back a number of ACL changes, including ACL link calls, changes to ACL tools and libraries to support these calls. Also, Sam Leffler's revisions to my m_tag patch, which gets m_tag sufficiently into shape that we can experiment with storing MAC labels in m_tag's without extensive local changes. Affected files ... .. //depot/projects/trustedbsd/base/Makefile#19 integrate .. //depot/projects/trustedbsd/base/Makefile.inc1#31 integrate .. //depot/projects/trustedbsd/base/bin/df/df.c#12 integrate .. //depot/projects/trustedbsd/base/bin/getfacl/getfacl.1#4 integrate .. //depot/projects/trustedbsd/base/bin/getfacl/getfacl.c#6 integrate .. //depot/projects/trustedbsd/base/bin/setfacl/setfacl.1#3 integrate .. //depot/projects/trustedbsd/base/bin/setfacl/setfacl.c#4 integrate .. //depot/projects/trustedbsd/base/bin/setfacl/setfacl.h#3 integrate .. //depot/projects/trustedbsd/base/etc/mtree/BSD.include.dist#14 integrate .. //depot/projects/trustedbsd/base/etc/mtree/BSD.local.dist#12 integrate .. //depot/projects/trustedbsd/base/etc/mtree/BSD.usr.dist#21 integrate .. //depot/projects/trustedbsd/base/include/Makefile#24 integrate .. //depot/projects/trustedbsd/base/include/stdlib.h#14 integrate .. //depot/projects/trustedbsd/base/include/unistd.h#16 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/basename.c#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/dirname.c#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/getbsize.3#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/getbsize.c#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/ualarm.3#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/ualarm.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/usleep.3#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/usleep.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/posix1e/acl.3#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/posix1e/acl_delete.3#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/posix1e/acl_delete.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/posix1e/acl_dup.3#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/posix1e/acl_free.3#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/posix1e/acl_from_text.3#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/posix1e/acl_get.3#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/posix1e/acl_get.c#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/posix1e/acl_init.3#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/posix1e/acl_set.3#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/posix1e/acl_set.c#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/posix1e/acl_to_text.3#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/posix1e/acl_valid.3#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/posix1e/acl_valid.c#4 integrate .. //depot/projects/trustedbsd/base/lib/libmp/Makefile#3 integrate .. //depot/projects/trustedbsd/base/sbin/fdisk/fdisk.c#13 integrate .. //depot/projects/trustedbsd/base/sbin/mount_smbfs/Makefile#2 integrate .. //depot/projects/trustedbsd/base/sbin/swapon/Makefile#4 integrate .. //depot/projects/trustedbsd/base/sbin/swapon/swapon.8#5 integrate .. //depot/projects/trustedbsd/base/sbin/swapon/swapon.c#4 integrate .. //depot/projects/trustedbsd/base/share/colldef/Makefile#10 integrate .. //depot/projects/trustedbsd/base/share/colldef/ca_ES.ISO8859-1.src#1 branch .. //depot/projects/trustedbsd/base/share/colldef/ca_ES.ISO8859-15.src#1 branch .. //depot/projects/trustedbsd/base/share/man/man5/Makefile#5 integrate .. //depot/projects/trustedbsd/base/share/man/man5/msdos.5#2 delete .. //depot/projects/trustedbsd/base/share/man/man5/msdosfs.5#1 branch .. //depot/projects/trustedbsd/base/share/mklocale/Makefile#9 integrate .. //depot/projects/trustedbsd/base/share/monetdef/Makefile#10 integrate .. //depot/projects/trustedbsd/base/share/monetdef/ca_ES.ISO8859-1.src#1 branch .. //depot/projects/trustedbsd/base/share/msgdef/Makefile#10 integrate .. //depot/projects/trustedbsd/base/share/msgdef/ca_ES.ISO8859-1.src#1 branch .. //depot/projects/trustedbsd/base/share/numericdef/Makefile#10 integrate .. //depot/projects/trustedbsd/base/share/numericdef/ca_ES.ISO8859-1.src#1 branch .. //depot/projects/trustedbsd/base/share/timedef/Makefile#9 integrate .. //depot/projects/trustedbsd/base/share/timedef/ca_ES.ISO8859-1.src#1 branch .. //depot/projects/trustedbsd/base/sys/boot/ficl/words.c#4 integrate .. //depot/projects/trustedbsd/base/sys/cam/cam_queue.c#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/amr/amr.c#8 integrate .. //depot/projects/trustedbsd/base/sys/dev/an/if_aironet_ieee.h#4 integrate .. //depot/projects/trustedbsd/base/sys/dev/an/if_an.c#14 integrate .. //depot/projects/trustedbsd/base/sys/dev/an/if_an_pccard.c#4 integrate .. //depot/projects/trustedbsd/base/sys/dev/an/if_an_pci.c#4 integrate .. //depot/projects/trustedbsd/base/sys/dev/an/if_anreg.h#5 integrate .. //depot/projects/trustedbsd/base/sys/dev/awi/awi.c#9 integrate .. //depot/projects/trustedbsd/base/sys/dev/awi/awi_wep.c#6 integrate .. //depot/projects/trustedbsd/base/sys/dev/ccd/ccd.c#10 integrate .. //depot/projects/trustedbsd/base/sys/dev/cm/smc90cx6.c#5 integrate .. //depot/projects/trustedbsd/base/sys/dev/en/midway.c#6 integrate .. //depot/projects/trustedbsd/base/sys/dev/firewire/iec13213.h#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/hifn/hifn7751.c#4 integrate .. //depot/projects/trustedbsd/base/sys/dev/isp/isp.c#17 integrate .. //depot/projects/trustedbsd/base/sys/dev/isp/isp_target.c#6 integrate .. //depot/projects/trustedbsd/base/sys/dev/isp/isp_tpublic.h#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/nge/if_nge.c#14 integrate .. //depot/projects/trustedbsd/base/sys/dev/ppbus/if_plip.c#4 integrate .. //depot/projects/trustedbsd/base/sys/dev/ppbus/ppi.c#4 integrate .. //depot/projects/trustedbsd/base/sys/dev/puc/puc.c#8 integrate .. //depot/projects/trustedbsd/base/sys/dev/puc/pucdata.c#9 integrate .. //depot/projects/trustedbsd/base/sys/dev/sab/sab.c#4 integrate .. //depot/projects/trustedbsd/base/sys/dev/sym/sym_fw1.h#3 integrate .. //depot/projects/trustedbsd/base/sys/dev/sym/sym_fw2.h#3 integrate .. //depot/projects/trustedbsd/base/sys/dev/sym/sym_hipd.c#8 integrate .. //depot/projects/trustedbsd/base/sys/dev/ubsec/ubsec.c#5 integrate .. //depot/projects/trustedbsd/base/sys/dev/wl/if_wl.c#6 integrate .. //depot/projects/trustedbsd/base/sys/fs/fifofs/fifo_vnops.c#19 integrate .. //depot/projects/trustedbsd/base/sys/fs/hpfs/hpfs_vnops.c#13 integrate .. //depot/projects/trustedbsd/base/sys/fs/nullfs/null_vnops.c#8 integrate .. //depot/projects/trustedbsd/base/sys/fs/smbfs/smbfs_smb.c#7 integrate .. //depot/projects/trustedbsd/base/sys/geom/geom_mbr.c#13 integrate .. //depot/projects/trustedbsd/base/sys/gnu/ext2fs/ext2_linux_balloc.c#3 integrate .. //depot/projects/trustedbsd/base/sys/i386/conf/OLDCARD#8 integrate .. //depot/projects/trustedbsd/base/sys/i386/conf/SMP#1 branch .. //depot/projects/trustedbsd/base/sys/i386/isa/istallion.c#3 integrate .. //depot/projects/trustedbsd/base/sys/ia64/ia32/syscalls.master#10 integrate .. //depot/projects/trustedbsd/base/sys/kern/init_sysent.c#27 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_acl.c#12 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_proc.c#27 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_subr.c#12 integrate .. //depot/projects/trustedbsd/base/sys/kern/syscalls.c#28 integrate .. //depot/projects/trustedbsd/base/sys/kern/syscalls.master#27 integrate .. //depot/projects/trustedbsd/base/sys/kern/uipc_mbuf.c#12 integrate .. //depot/projects/trustedbsd/base/sys/kern/uipc_mbuf2.c#7 integrate .. //depot/projects/trustedbsd/base/sys/kern/vfs_subr.c#34 integrate .. //depot/projects/trustedbsd/base/sys/net/if_loop.c#11 integrate .. //depot/projects/trustedbsd/base/sys/net/if_var.h#13 integrate .. //depot/projects/trustedbsd/base/sys/netatm/port.h#6 integrate .. //depot/projects/trustedbsd/base/sys/netatm/spans/spans_msg.c#6 integrate .. //depot/projects/trustedbsd/base/sys/netatm/spans/spans_util.c#3 integrate .. //depot/projects/trustedbsd/base/sys/netatm/uni/sscop_lower.c#5 integrate .. //depot/projects/trustedbsd/base/sys/netinet/ip_icmp.c#12 integrate .. //depot/projects/trustedbsd/base/sys/netinet/ip_input.c#20 integrate .. //depot/projects/trustedbsd/base/sys/netinet/tcp_input.c#30 integrate .. //depot/projects/trustedbsd/base/sys/netinet6/esp_input.c#7 integrate .. //depot/projects/trustedbsd/base/sys/netinet6/icmp6.c#8 integrate .. //depot/projects/trustedbsd/base/sys/netinet6/ip6_input.c#9 integrate .. //depot/projects/trustedbsd/base/sys/netinet6/ip6_output.c#10 integrate .. //depot/projects/trustedbsd/base/sys/netinet6/ip6_var.h#4 integrate .. //depot/projects/trustedbsd/base/sys/netinet6/ipsec.c#5 integrate .. //depot/projects/trustedbsd/base/sys/netinet6/nd6_nbr.c#5 integrate .. //depot/projects/trustedbsd/base/sys/netipsec/ipsec_mbuf.c#2 integrate .. //depot/projects/trustedbsd/base/sys/netipsec/ipsec_output.c#2 integrate .. //depot/projects/trustedbsd/base/sys/netsmb/smb.h#7 integrate .. //depot/projects/trustedbsd/base/sys/nfsclient/bootp_subr.c#9 integrate .. //depot/projects/trustedbsd/base/sys/pc98/pc98/olpt.c#2 integrate .. //depot/projects/trustedbsd/base/sys/pci/if_xl.c#14 integrate .. //depot/projects/trustedbsd/base/sys/pci/ncr.c#4 integrate .. //depot/projects/trustedbsd/base/sys/sparc64/include/tte.h#9 integrate .. //depot/projects/trustedbsd/base/sys/sparc64/pci/psycho.c#15 integrate .. //depot/projects/trustedbsd/base/sys/sparc64/sparc64/cache.c#10 integrate .. //depot/projects/trustedbsd/base/sys/sparc64/sparc64/exception.S#13 integrate .. //depot/projects/trustedbsd/base/sys/sparc64/sparc64/genassym.c#20 integrate .. //depot/projects/trustedbsd/base/sys/sparc64/sparc64/interrupt.S#2 integrate .. //depot/projects/trustedbsd/base/sys/sparc64/sparc64/mp_exception.S#2 integrate .. //depot/projects/trustedbsd/base/sys/sys/_mutex.h#6 integrate .. //depot/projects/trustedbsd/base/sys/sys/acl.h#5 integrate .. //depot/projects/trustedbsd/base/sys/sys/diskmbr.h#2 integrate .. //depot/projects/trustedbsd/base/sys/sys/mbuf.h#16 integrate .. //depot/projects/trustedbsd/base/sys/sys/msg.h#5 integrate .. //depot/projects/trustedbsd/base/sys/sys/namei.h#6 integrate .. //depot/projects/trustedbsd/base/sys/sys/signal.h#10 integrate .. //depot/projects/trustedbsd/base/sys/sys/syscall.h#28 integrate .. //depot/projects/trustedbsd/base/sys/sys/syscall.mk#28 integrate .. //depot/projects/trustedbsd/base/sys/sys/sysproto.h#29 integrate .. //depot/projects/trustedbsd/base/sys/sys/unpcb.h#3 integrate .. //depot/projects/trustedbsd/base/sys/sys/vnode.h#32 integrate .. //depot/projects/trustedbsd/base/sys/vm/vm_fault.c#19 integrate .. //depot/projects/trustedbsd/base/sys/vm/vm_kern.c#13 integrate .. //depot/projects/trustedbsd/base/sys/vm/vm_map.c#20 integrate .. //depot/projects/trustedbsd/base/sys/vm/vm_object.c#24 integrate .. //depot/projects/trustedbsd/base/sys/vm/vm_object.h#10 integrate .. //depot/projects/trustedbsd/base/sys/vm/vm_page.c#28 integrate .. //depot/projects/trustedbsd/base/usr.bin/Makefile#20 integrate .. //depot/projects/trustedbsd/base/usr.bin/calendar/Makefile#8 integrate .. //depot/projects/trustedbsd/base/usr.bin/chpass/Makefile#4 integrate .. //depot/projects/trustedbsd/base/usr.bin/chpass/chpass.c#6 integrate .. //depot/projects/trustedbsd/base/usr.bin/du/du.c#8 integrate .. //depot/projects/trustedbsd/base/usr.bin/elf2aout/Makefile#4 integrate .. //depot/projects/trustedbsd/base/usr.bin/elf2aout/elf2aout.c#5 integrate .. //depot/projects/trustedbsd/base/usr.bin/systat/swap.c#5 integrate .. //depot/projects/trustedbsd/base/usr.bin/telnet/telnet.c#5 integrate .. //depot/projects/trustedbsd/base/usr.bin/whereis/Makefile#3 integrate .. //depot/projects/trustedbsd/base/usr.sbin/Makefile#17 integrate .. //depot/projects/trustedbsd/base/usr.sbin/ancontrol/ancontrol.8#9 integrate .. //depot/projects/trustedbsd/base/usr.sbin/ancontrol/ancontrol.c#7 integrate .. //depot/projects/trustedbsd/base/usr.sbin/boot0cfg/boot0cfg.c#4 integrate .. //depot/projects/trustedbsd/base/usr.sbin/burncd/Makefile#3 integrate .. //depot/projects/trustedbsd/base/usr.sbin/burncd/burncd.c#13 integrate .. //depot/projects/trustedbsd/base/usr.sbin/chown/chown.c#6 integrate .. //depot/projects/trustedbsd/base/usr.sbin/crunch/crunchide/endian.h#2 delete .. //depot/projects/trustedbsd/base/usr.sbin/crunch/crunchide/exec_elf32.c#5 integrate .. //depot/projects/trustedbsd/base/usr.sbin/elf2aout/Makefile#3 delete .. //depot/projects/trustedbsd/base/usr.sbin/elf2aout/elf2aout.c#2 delete .. //depot/projects/trustedbsd/base/usr.sbin/fwcontrol/Makefile#1 branch .. //depot/projects/trustedbsd/base/usr.sbin/fwcontrol/fwcontrol.8#1 branch .. //depot/projects/trustedbsd/base/usr.sbin/fwcontrol/fwcontrol.c#1 branch .. //depot/projects/trustedbsd/base/usr.sbin/fwcontrol/fwcrom.c#1 branch .. //depot/projects/trustedbsd/base/usr.sbin/mixer/mixer.c#2 integrate .. //depot/projects/trustedbsd/base/usr.sbin/pkg_install/info/show.c#6 integrate .. //depot/projects/trustedbsd/base/usr.sbin/pstat/pstat.c#6 integrate .. //depot/projects/trustedbsd/base/usr.sbin/quot/quot.c#6 integrate Differences ... ==== //depot/projects/trustedbsd/base/Makefile#19 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile,v 1.272 2002/12/14 22:36:56 imp Exp $ +# $FreeBSD: src/Makefile,v 1.273 2002/12/30 16:48:35 schweikh Exp $ # # The user-driven targets are: # @@ -17,7 +17,7 @@ # upgrade - Upgrade a.out (2.2.x/3.0) system to the new ELF way # most - Build user commands, no libraries or include files. # installmost - Install user commands, no libraries or include files. -# aout-to-elf - Upgrade an system from a.out to elf format (see below). +# aout-to-elf - Upgrade a system from a.out to elf format (see below). # aout-to-elf-build - Build everything required to upgrade a system from # a.out to elf format (see below). # aout-to-elf-install - Install everything built by aout-to-elf-build (see @@ -26,7 +26,7 @@ # of each elf library sub-directory. # # This makefile is simple by design. The FreeBSD make automatically reads -# the /usr/share/mk/sys.mk unless the -m argument is specified on the +# the /usr/share/mk/sys.mk unless the -m argument is specified on the # command line. By keeping this makefile simple, it doesn't matter too # much how different the installed mk files are from those in the source # tree. This makefile executes a child make process, forcing it to use @@ -71,7 +71,7 @@ # The aout->elf transition build is performed by doing a `make upgrade' (or # `make aout-to-elf') or in two steps by a `make aout-to-elf-build' followed # by a `make aout-to-elf-install', depending on user preference. -# You need to have at least 320 Mb of free space for the object tree. +# You need to have at least 320 MB of free space for the object tree. # # The upgrade process checks the installed release. If this is 3.0-CURRENT, # it is assumed that your kernel contains all the syscalls required by the @@ -251,4 +251,3 @@ > _.${TARGET_ARCH}.${kernel} 2>&1 .endif .endfor - ==== //depot/projects/trustedbsd/base/Makefile.inc1#31 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.313 2002/12/02 14:03:40 ru Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.314 2002/12/30 10:01:25 obrien Exp $ # # Make command line options: # -DMAKE_KERBEROS4 to build KerberosIV @@ -663,7 +663,7 @@ .endif .if ${TARGET_ARCH} == "sparc64" -_elf2aout= usr.sbin/elf2aout +_elf2aout= usr.bin/elf2aout .endif _xlint= usr.bin/xlint/lint1 usr.bin/xlint/lint2 usr.bin/xlint/xlint ==== //depot/projects/trustedbsd/base/bin/df/df.c#12 (text+ko) ==== @@ -48,7 +48,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/df/df.c,v 1.44 2002/10/23 22:09:05 markm Exp $"); +__FBSDID("$FreeBSD: src/bin/df/df.c,v 1.45 2002/12/30 18:10:37 mike Exp $"); #include #include @@ -381,8 +381,7 @@ prtstat(struct statfs *sfsp, struct maxwidths *mwp) { static long blocksize; - static int timesthrough; - static size_t headerlen; + static int headerlen, timesthrough; static const char *header; long used, availblks, inodes; @@ -393,7 +392,7 @@ mwp->total = mwp->used = mwp->avail = strlen(header); } else { header = getbsize(&headerlen, &blocksize); - mwp->total = imax(mwp->total, (int)headerlen); + mwp->total = imax(mwp->total, headerlen); } mwp->used = imax(mwp->used, strlen("Used")); mwp->avail = imax(mwp->avail, strlen("Avail")); @@ -442,7 +441,7 @@ update_maxwidths(struct maxwidths *mwp, struct statfs *sfsp) { static long blocksize; - size_t dummy; + int dummy; if (blocksize == 0) getbsize(&dummy, &blocksize); ==== //depot/projects/trustedbsd/base/bin/getfacl/getfacl.1#4 (text+ko) ==== @@ -1,5 +1,5 @@ .\"- -.\" Copyright (c) 2000-2001 Robert N. M. Watson +.\" Copyright (c) 2000, 2001, 2002 Robert N. M. Watson .\" All rights reserved. .\" .\" This software was developed by Robert Watson for the TrustedBSD Project. @@ -25,12 +25,12 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/bin/getfacl/getfacl.1,v 1.5 2002/11/03 23:22:34 tjr Exp $ +.\" $FreeBSD: src/bin/getfacl/getfacl.1,v 1.6 2002/12/30 15:36:29 rwatson Exp $ .\" .\" Developed by the TrustedBSD Project. .\" Support for POSIX.1e access control lists. .\" -.Dd March 30, 2000 +.Dd Decemer 30, 2002 .Dt GETFACL 1 .Os .Sh NAME @@ -38,7 +38,7 @@ .Nd get ACL information .Sh SYNOPSIS .Nm -.Op Fl d +.Op Fl dh .Op Ar .Sh DESCRIPTION The @@ -61,6 +61,9 @@ access ACL. An error is generated if a default ACL cannot be associated with .Ar file . +.It Fl h +If the target of the operation is a symbolic link, return the ACL from +the symbol link itself rather than following the link. .El .Pp The following operand is available: ==== //depot/projects/trustedbsd/base/bin/getfacl/getfacl.c#6 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 1999-2001 Robert N M Watson + * Copyright (c) 1999, 2001, 2002 Robert N M Watson * All rights reserved. * * This software was developed by Robert Watson for the TrustedBSD Project. @@ -32,7 +32,7 @@ #include -__FBSDID("$FreeBSD: src/bin/getfacl/getfacl.c,v 1.8 2002/11/03 23:22:34 tjr Exp $"); +__FBSDID("$FreeBSD: src/bin/getfacl/getfacl.c,v 1.9 2002/12/30 15:36:29 rwatson Exp $"); #include #include @@ -52,7 +52,7 @@ usage(void) { - fprintf(stderr, "getfacl [-d] [files ...]\n"); + fprintf(stderr, "getfacl [-dh] [files ...]\n"); } /* @@ -147,14 +147,17 @@ } static int -print_acl(char *path, acl_type_t type) +print_acl(char *path, acl_type_t type, int hflag) { struct stat sb; acl_t acl; char *acl_text; int error; - error = stat(path, &sb); + if (hflag) + error = lstat(path, &sb); + else + error = stat(path, &sb); if (error == -1) { warn("%s", path); return(-1); @@ -167,7 +170,10 @@ printf("#file:%s\n#owner:%d\n#group:%d\n", path, sb.st_uid, sb.st_gid); - acl = acl_get_file(path, type); + if (hflag) + acl = acl_get_link_np(path, type); + else + acl = acl_get_file(path, type); if (!acl) { if (errno != EOPNOTSUPP) { warn("%s", path); @@ -198,7 +204,7 @@ } static int -print_acl_from_stdin(acl_type_t type) +print_acl_from_stdin(acl_type_t type, int hflag) { char *p, pathname[PATH_MAX]; int carried_error = 0; @@ -206,7 +212,7 @@ while (fgets(pathname, (int)sizeof(pathname), stdin)) { if ((p = strchr(pathname, '\n')) != NULL) *p = '\0'; - if (print_acl(pathname, type) == -1) { + if (print_acl(pathname, type, hflag) == -1) { carried_error = -1; } } @@ -220,12 +226,17 @@ acl_type_t type = ACL_TYPE_ACCESS; int carried_error = 0; int ch, error, i; + int hflag; - while ((ch = getopt(argc, argv, "d")) != -1) + hflag = 0; + while ((ch = getopt(argc, argv, "dh")) != -1) switch(ch) { case 'd': type = ACL_TYPE_DEFAULT; break; + case 'h': + hflag = 1; + break; default: usage(); return(-1); @@ -234,17 +245,17 @@ argv += optind; if (argc == 0) { - error = print_acl_from_stdin(type); + error = print_acl_from_stdin(type, hflag); return(error ? 1 : 0); } for (i = 0; i < argc; i++) { if (!strcmp(argv[i], "-")) { - error = print_acl_from_stdin(type); + error = print_acl_from_stdin(type, hflag); if (error == -1) carried_error = -1; } else { - error = print_acl(argv[i], type); + error = print_acl(argv[i], type, hflag); if (error == -1) carried_error = -1; } ==== //depot/projects/trustedbsd/base/bin/setfacl/setfacl.1#3 (text+ko) ==== @@ -23,7 +23,7 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: src/bin/setfacl/setfacl.1,v 1.7 2001/12/04 14:20:46 ru Exp $ +.\" $FreeBSD: src/bin/setfacl/setfacl.1,v 1.8 2002/12/30 15:36:29 rwatson Exp $ .\" .Dd January 7, 2001 .Dt SETFACL 1 @@ -33,7 +33,7 @@ .Nd set ACL information .Sh SYNOPSIS .Nm -.Op Fl bdkn +.Op Fl bdhkn .Op Fl m Ar entries .Op Fl M Ar file1 .Op Fl x Ar entries @@ -63,6 +63,9 @@ The operations apply to the default ACL entries instead of access ACL entries. Currently only directories may have default ACL's. +.It Fl h +If the target of the operation is a symbolic link, perform the operation +on the symbolic link itself, rather than following the link. .It Fl k Delete any default ACL entries on the specified files. It is not considered an error if the specified files do not have ==== //depot/projects/trustedbsd/base/bin/setfacl/setfacl.c#4 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/bin/setfacl/setfacl.c,v 1.6 2002/06/30 05:15:03 obrien Exp $"); +__FBSDID("$FreeBSD: src/bin/setfacl/setfacl.c,v 1.7 2002/12/30 15:36:29 rwatson Exp $"); #include #include @@ -71,11 +71,19 @@ } acl = zmalloc(sizeof(acl_t) * 2); - acl[ACCESS_ACL] = acl_get_file(filename, ACL_TYPE_ACCESS); + if (h_flag) + acl[ACCESS_ACL] = acl_get_link_np(filename, ACL_TYPE_ACCESS); + else + acl[ACCESS_ACL] = acl_get_file(filename, ACL_TYPE_ACCESS); if (acl[ACCESS_ACL] == NULL) err(1, "acl_get_file() failed"); if (S_ISDIR(sb.st_mode)) { - acl[DEFAULT_ACL] = acl_get_file(filename, ACL_TYPE_DEFAULT); + if (h_flag) + acl[DEFAULT_ACL] = acl_get_link_np(filename, + ACL_TYPE_DEFAULT); + else + acl[DEFAULT_ACL] = acl_get_file(filename, + ACL_TYPE_DEFAULT); if (acl[DEFAULT_ACL] == NULL) err(1, "acl_get_file() failed"); } else @@ -88,7 +96,7 @@ usage(void) { - fprintf(stderr, "usage: setfacl [-bdknv] [-m entries] [-M file1] " + fprintf(stderr, "usage: setfacl [-bdhknv] [-m entries] [-M file1] " "[-x entries] [-X file2] [file ...]\n"); exit(1); } @@ -104,12 +112,12 @@ acl_type = ACL_TYPE_ACCESS; carried_error = local_error = 0; - have_mask = have_stdin = n_flag = need_mask = 0; + h_flag = have_mask = have_stdin = n_flag = need_mask = 0; TAILQ_INIT(&entrylist); TAILQ_INIT(&filelist); - while ((ch = getopt(argc, argv, "M:X:bdkm:nx:")) != -1) + while ((ch = getopt(argc, argv, "M:X:bdhkm:nx:")) != -1) switch(ch) { case 'M': entry = zmalloc(sizeof(struct sf_entry)); @@ -133,6 +141,9 @@ case 'd': acl_type = ACL_TYPE_DEFAULT; break; + case 'h': + h_flag = 1; + break; case 'k': entry = zmalloc(sizeof(struct sf_entry)); entry->op = OP_REMOVE_DEF; ==== //depot/projects/trustedbsd/base/bin/setfacl/setfacl.h#3 (text+ko) ==== @@ -23,7 +23,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/bin/setfacl/setfacl.h,v 1.3 2001/12/03 01:20:52 jedgar Exp $ + * $FreeBSD: src/bin/setfacl/setfacl.h,v 1.4 2002/12/30 15:36:29 rwatson Exp $ */ #ifndef _SETFACL_H @@ -75,6 +75,7 @@ uint have_mask; uint need_mask; uint have_stdin; +uint h_flag; uint n_flag; #endif /* _SETFACL_H */ ==== //depot/projects/trustedbsd/base/etc/mtree/BSD.include.dist#14 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/mtree/BSD.include.dist,v 1.63 2002/12/03 15:05:32 rwatson Exp $ +# $FreeBSD: src/etc/mtree/BSD.include.dist,v 1.64 2002/12/30 09:45:03 simokawa Exp $ # # Please see the file src/etc/mtree/README before making changes to this file. # @@ -20,6 +20,8 @@ .. iicbus .. + firewire + .. ofw .. ppbus ==== //depot/projects/trustedbsd/base/etc/mtree/BSD.local.dist#12 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/mtree/BSD.local.dist,v 1.93 2002/10/29 16:48:03 tobez Exp $ +# $FreeBSD: src/etc/mtree/BSD.local.dist,v 1.94 2002/12/30 08:52:05 ache Exp $ # # Please see the file src/etc/mtree/README before making changes to this file. # @@ -231,6 +231,10 @@ .. bg_BG.CP1251 .. + ca_ES.ISO8859-1 + .. + ca_ES.ISO8859-15 + .. cs_CZ.ISO8859-2 .. da_DK.ISO8859-1 ==== //depot/projects/trustedbsd/base/etc/mtree/BSD.usr.dist#21 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/mtree/BSD.usr.dist,v 1.269 2002/11/15 18:44:09 ru Exp $ +# $FreeBSD: src/etc/mtree/BSD.usr.dist,v 1.270 2002/12/30 08:52:05 ache Exp $ # # Please see the file src/etc/mtree/README before making changes to this file. # @@ -341,6 +341,10 @@ .. bg_BG.CP1251 .. + ca_ES.ISO8859-1 + .. + ca_ES.ISO8859-15 + .. cs_CZ.ISO8859-2 .. da_DK.ISO8859-1 @@ -669,6 +673,10 @@ .. bg_BG.CP1251 .. + ca_ES.ISO8859-1 + .. + ca_ES.ISO8859-15 + .. cs_CZ.ISO8859-2 .. da_DK.ISO8859-1 ==== //depot/projects/trustedbsd/base/include/Makefile#24 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.2 (Berkeley) 1/4/94 -# $FreeBSD: src/include/Makefile,v 1.192 2002/12/26 14:30:55 tjr Exp $ +# $FreeBSD: src/include/Makefile,v 1.193 2002/12/30 09:45:03 simokawa Exp $ # # Doing a make install builds /usr/include # @@ -33,8 +33,8 @@ netipx netkey netnatm netncp netns netsmb nfs nfsclient nfsserver \ pccard posix4 sys vm -LSUBDIRS= cam/scsi dev/an dev/ic dev/iicbus dev/ofw dev/ppbus dev/smbus \ - dev/usb dev/wi fs/devfs \ +LSUBDIRS= cam/scsi dev/an dev/ic dev/iicbus dev/firewire dev/ofw \ + dev/ppbus dev/smbus dev/usb dev/wi fs/devfs \ fs/fdescfs fs/fifofs fs/msdosfs fs/ntfs fs/nullfs fs/nwfs fs/portalfs \ fs/procfs fs/smbfs fs/umapfs fs/unionfs isofs/cd9660 \ netatm/ipatm netatm/sigpvc netatm/spans netatm/uni \ ==== //depot/projects/trustedbsd/base/include/stdlib.h#14 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)stdlib.h 8.5 (Berkeley) 5/19/95 - * $FreeBSD: src/include/stdlib.h,v 1.45 2002/10/23 14:18:07 markm Exp $ + * $FreeBSD: src/include/stdlib.h,v 1.46 2002/12/30 11:12:16 obrien Exp $ */ #ifndef _STDLIB_H_ @@ -227,7 +227,7 @@ arc4random(void); void arc4random_addrandom(unsigned char *dat, int datlen); void arc4random_stir(void); -char *getbsize(size_t *, long *); +char *getbsize(int *, long *); /* getcap(3) functions */ char *cgetcap(char *, const char *, int); int cgetclose(void); ==== //depot/projects/trustedbsd/base/include/unistd.h#16 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)unistd.h 8.12 (Berkeley) 4/27/95 - * $FreeBSD: src/include/unistd.h,v 1.65 2002/12/15 19:17:56 dillon Exp $ + * $FreeBSD: src/include/unistd.h,v 1.66 2002/12/29 01:07:55 mike Exp $ */ #ifndef _UNISTD_H_ @@ -47,6 +47,16 @@ #define _GID_T_DECLARED #endif +#ifndef _OFF_T_DECLARED +typedef __off_t off_t; +#define _OFF_T_DECLARED +#endif + +#ifndef _PID_T_DECLARED +typedef __pid_t pid_t; +#define _PID_T_DECLARED +#endif + #ifndef _SIZE_T_DECLARED typedef __size_t size_t; #define _SIZE_T_DECLARED @@ -58,13 +68,14 @@ #endif #ifndef _UID_T_DECLARED -typedef __uid_t_ uid_t; +typedef __uid_t uid_t; #define _UID_T_DECLARED #endif -/* - * XXX missing type definitions for off_t, pid_t and useconds_t. - */ +#ifndef _USECONDS_T_DECLARED +typedef __useconds_t useconds_t; +#define _USECONDS_T_DECLARED +#endif #define STDIN_FILENO 0 /* standard input file descriptor */ #define STDOUT_FILENO 1 /* standard output file descriptor */ @@ -427,8 +438,8 @@ int setreuid(uid_t, uid_t); /* void swab(const void * __restrict, void * __restrict, ssize_t); */ void sync(void); -unsigned int ualarm(unsigned int, unsigned int); -int usleep(unsigned int); +useconds_t ualarm(useconds_t, useconds_t); +int usleep(useconds_t); pid_t vfork(void); /* See comment at ftruncate() above. */ ==== //depot/projects/trustedbsd/base/lib/libc/gen/basename.c#4 (text+ko) ==== @@ -31,10 +31,11 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/lib/libc/gen/basename.c,v 1.6 2002/12/21 07:12:35 bbraun Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/gen/basename.c,v 1.7 2002/12/30 01:41:14 marcel Exp $"); #include #include +#include #include #include ==== //depot/projects/trustedbsd/base/lib/libc/gen/dirname.c#4 (text+ko) ==== @@ -31,10 +31,11 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/lib/libc/gen/dirname.c,v 1.6 2002/12/21 07:12:35 bbraun Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/gen/dirname.c,v 1.7 2002/12/30 01:41:14 marcel Exp $"); #include #include +#include #include #include ==== //depot/projects/trustedbsd/base/lib/libc/gen/getbsize.3#3 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)getbsize.3 8.1 (Berkeley) 6/4/93 -.\" $FreeBSD: src/lib/libc/gen/getbsize.3,v 1.9 2002/10/23 14:18:07 markm Exp $ +.\" $FreeBSD: src/lib/libc/gen/getbsize.3,v 1.10 2002/12/30 11:12:16 obrien Exp $ .\" .Dd June 4, 1993 .Dt GETBSIZE 3 @@ -43,7 +43,7 @@ .Sh SYNOPSIS .In stdlib.h .Ft char * -.Fn getbsize "size_t *headerlenp" "long *blocksizep" +.Fn getbsize "int *headerlenp" "long *blocksizep" .Sh DESCRIPTION The .Fn getbsize ==== //depot/projects/trustedbsd/base/lib/libc/gen/getbsize.c#4 (text+ko) ==== @@ -35,7 +35,7 @@ static char sccsid[] = "@(#)getbsize.c 8.1 (Berkeley) 6/4/93"; #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/gen/getbsize.c,v 1.5 2002/10/23 14:18:07 markm Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/gen/getbsize.c,v 1.7 2002/12/30 19:04:06 obrien Exp $"); #include #include @@ -44,7 +44,7 @@ char * getbsize(headerlenp, blocksizep) - size_t *headerlenp; + int *headerlenp; long *blocksizep; { static char header[20]; ==== //depot/projects/trustedbsd/base/lib/libc/gen/ualarm.3#3 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" From: @(#)ualarm.3 8.2 (Berkeley) 4/19/94 -.\" $FreeBSD: src/lib/libc/gen/ualarm.3,v 1.16 2002/12/18 13:33:02 ru Exp $ +.\" $FreeBSD: src/lib/libc/gen/ualarm.3,v 1.17 2002/12/29 00:59:09 mike Exp $ .\" .Dd April 19, 1994 .Dt UALARM 3 @@ -42,8 +42,8 @@ .Lb libc .Sh SYNOPSIS .In unistd.h -.Ft u_int -.Fn ualarm "u_int microseconds" "u_int interval" +.Ft useconds_t +.Fn ualarm "useconds_t microseconds" "useconds_t interval" .Sh DESCRIPTION .Bf -symbolic This is a simplified interface to ==== //depot/projects/trustedbsd/base/lib/libc/gen/ualarm.c#3 (text+ko) ==== @@ -35,7 +35,7 @@ static char sccsid[] = "@(#)ualarm.c 8.1 (Berkeley) 6/4/93"; #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/gen/ualarm.c,v 1.3 2002/02/01 01:08:48 obrien Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/gen/ualarm.c,v 1.4 2002/12/29 00:59:09 mike Exp $"); #include #include @@ -47,10 +47,10 @@ * If ``reload'' is non-zero, keep generating SIGALRM * every ``reload'' microseconds after the first signal. */ -unsigned +useconds_t ualarm(usecs, reload) - unsigned usecs; - unsigned reload; + useconds_t usecs; + useconds_t reload; { struct itimerval new, old; ==== //depot/projects/trustedbsd/base/lib/libc/gen/usleep.3#2 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)usleep.3 8.1 (Berkeley) 6/4/93 -.\" $FreeBSD: src/lib/libc/gen/usleep.3,v 1.17 2001/10/01 16:08:51 ru Exp $ +.\" $FreeBSD: src/lib/libc/gen/usleep.3,v 1.18 2002/12/29 00:59:09 mike Exp $ .\" .Dd February 13, 1998 .Dt USLEEP 3 @@ -43,7 +43,7 @@ .Sh SYNOPSIS .In unistd.h .Ft int -.Fn usleep "unsigned int microseconds" +.Fn usleep "useconds_t microseconds" .Sh DESCRIPTION The .Fn usleep ==== //depot/projects/trustedbsd/base/lib/libc/gen/usleep.c#3 (text+ko) ==== @@ -35,7 +35,7 @@ static char sccsid[] = "@(#)usleep.c 8.1 (Berkeley) 6/4/93"; #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/gen/usleep.c,v 1.27 2002/02/01 00:57:29 obrien Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/gen/usleep.c,v 1.28 2002/12/29 00:59:09 mike Exp $"); #include "namespace.h" #include @@ -44,7 +44,7 @@ int usleep(useconds) - unsigned int useconds; + useconds_t useconds; { struct timespec time_to_sleep; ==== //depot/projects/trustedbsd/base/lib/libc/posix1e/acl.3#4 (text+ko) ==== @@ -2,6 +2,8 @@ .\" Copyright (c) 2000, 2001, 2002 Robert N. M. Watson .\" All rights reserved. .\" +.\" This software was developed by Robert Watson for the TrustedBSD Project. +.\" .\" Redistribution and use in source and binary forms, with or without .\" modification, are permitted provided that the following conditions .\" are met: @@ -23,9 +25,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libc/posix1e/acl.3,v 1.20 2002/12/27 12:15:28 schweikh Exp $ +.\" $FreeBSD: src/lib/libc/posix1e/acl.3,v 1.21 2002/12/29 20:47:05 rwatson Exp $ .\" -.Dd January 28, 2000 +.Dd December 18, 2002 .Dt ACL 3 .Os .Sh NAME @@ -82,8 +84,10 @@ and may be used to create an empty entry in an ACL. .It Xo .Fn acl_delete_def_file , +.Fn acl_delete_def_link_np , +.Fn acl_delete_fd_np , .Fn acl_delete_file_np , -.Fn acl_delete_fd_np +.Fn acl_delete_link_np .Xc These functions are described in .Xr acl_delete 3 , @@ -114,9 +118,10 @@ .Xr acl_get_entry 3 , and may be used to retrieve a designated ACL entry from an ACL. .It Xo +.Fn acl_get_fd , +.Fn acl_get_fd_np , .Fn acl_get_file , -.Fn acl_get_fd , -.Fn acl_get_fd_np +.Fn acl_get_link_np .Xc These functions are described in .Xr acl_get 3 , @@ -138,9 +143,10 @@ .Xr acl_init 3 , and may be used to allocate a fresh (empty) ACL structure. .It Xo +.Fn acl_set_fd , +.Fn acl_set_fd_np , .Fn acl_set_file , -.Fn acl_set_fd , -.Fn acl_set_fd_np +.Fn acl_set_link_np .Xc These functions are described in .Xr acl_set 3 , @@ -163,8 +169,9 @@ and may be used to generate a text-form of a POSIX.1e semantics ACL. .It Xo .Fn acl_valid , +.Fn acl_valid_fd_np , .Fn acl_valid_file_np , -.Fn acl_valid_fd_np +.Fn acl_valid_link_np .Xc These functions are described in .Xr acl_valid 3 , ==== //depot/projects/trustedbsd/base/lib/libc/posix1e/acl_delete.3#3 (text+ko) ==== @@ -1,7 +1,9 @@ .\"- -.\" Copyright (c) 2000 Robert N. M. Watson +.\" Copyright (c) 2000, 2002 Robert N. M. Watson .\" All rights reserved. .\" +.\" This software was developed by Robert Watson for the TrustedBSD Project. +.\" .\" Redistribution and use in source and binary forms, with or without .\" modification, are permitted provided that the following conditions .\" are met: @@ -23,15 +25,17 @@ >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Dec 30 13:41:29 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3E22937B405; Mon, 30 Dec 2002 13:41:26 -0800 (PST) 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 CBAED37B401 for ; Mon, 30 Dec 2002 13:41:25 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7756343ED4 for ; Mon, 30 Dec 2002 13:41:25 -0800 (PST) (envelope-from green@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id gBULfPfh071266 for ; Mon, 30 Dec 2002 13:41:25 -0800 (PST) (envelope-from green@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id gBULfOkS071257 for perforce@freebsd.org; Mon, 30 Dec 2002 13:41:24 -0800 (PST) Date: Mon, 30 Dec 2002 13:41:24 -0800 (PST) Message-Id: <200212302141.gBULfOkS071257@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to green@freebsd.org using -f From: Brian Feldman Subject: PERFORCE change 22947 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=22947 Change 22947 by green@green_laptop_2 on 2002/12/30 13:40:47 * Add SEBSD policy for moused(4). Affected files ... .. //depot/projects/trustedbsd/mac/contrib/sebsd/policy/file_contexts/program/moused.fc#1 add .. //depot/projects/trustedbsd/mac/contrib/sebsd/policy/files.lst#7 edit .. //depot/projects/trustedbsd/mac/contrib/sebsd/policy/genfs_contexts#4 edit .. //depot/projects/trustedbsd/mac/contrib/sebsd/policy/types/device.te#3 edit Differences ... ==== //depot/projects/trustedbsd/mac/contrib/sebsd/policy/files.lst#7 (text+ko) ==== @@ -73,6 +73,7 @@ file_contexts/program/mail.fc file_contexts/program/modutil.fc file_contexts/program/mount.fc +file_contexts/program/moused.fc file_contexts/program/named.fc file_contexts/program/netscape.fc file_contexts/program/netutils.fc @@ -177,6 +178,7 @@ domains/program/mail.te domains/program/modutil.te domains/program/mount.te +domains/program/moused.te domains/program/named.te domains/program/netscape.te domains/program/netutils.te ==== //depot/projects/trustedbsd/mac/contrib/sebsd/policy/genfs_contexts#4 (text+ko) ==== @@ -45,6 +45,18 @@ genfscon devfs /urandom system_u:object_r:random_device_t genfscon devfs /tty system_u:object_r:devtty_t genfscon devfs /pty system_u:object_r:devpts_t +genfscon devfs /ttyp system_u:object_r:devpts_t +genfscon devfs /ttyq system_u:object_r:devpts_t +genfscon devfs /ttyr system_u:object_r:devpts_t +genfscon devfs /ttys system_u:object_r:devpts_t +genfscon devfs /ttyP system_u:object_r:devpts_t +genfscon devfs /ttyQ system_u:object_r:devpts_t +genfscon devfs /ttyR system_u:object_r:devpts_t +genfscon devfs /ttyS system_u:object_r:devpts_t +genfscon devfs /cua system_u:object_r:serial_device_t +genfscon devfs /ttyd system_u:object_r:serial_device_t +genfscon devfs /ttyid system_u:object_r:serial_device_t +genfscon devfs /ttyld system_u:object_r:serial_device_t genfscon devfs /ad -c system_u:object_r:fixed_disk_device_t genfscon devfs /acd -c system_u:object_r:fixed_disk_device_t genfscon devfs /fd -c system_u:object_r:removable_device_t @@ -53,6 +65,11 @@ genfscon devfs /log system_u:object_r:devlog_t genfscon devfs /misc/psaux system_u:object_r:mouse_device_t genfscon devfs /input/mouse system_u:object_r:mouse_device_t +genfscon devfs /mse system_u:object_r:mouse_device_t +genfscon devfs /psm system_u:object_r:mouse_device_t +genfscon devfs /ums system_u:object_r:mouse_device_t +genfscon devfs /sysmouse system_u:object_r:sysmouse_device_t +genfscon devfs /consolectl system_u:object_r:consolectl_t genfscon devfs /gpmctl system_u:object_r:gpmctl_t genfscon devfs /ptmx system_u:object_r:ptmx_t genfscon devfs /acpi system_u:object_r:apm_bios_t ==== //depot/projects/trustedbsd/mac/contrib/sebsd/policy/types/device.te#3 (text+ko) ==== @@ -50,6 +50,11 @@ type tty_device_t, file_type; # +# serial_device_t is the type of sio(4) devices. +# +type serial_device_t, file_type; + +# # fixed_disk_device_t is the type of # /dev/hd* and /dev/sd*. # @@ -85,6 +90,11 @@ type mouse_device_t, file_type; # +# Type for the syscons-based mouse multiplexer. +# +type sysmouse_device_t, file_type; + +# # Not sure what these devices are for, but X wants access to them. # type agp_device_t, file_type; To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Dec 30 13:42:29 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4D85037B405; Mon, 30 Dec 2002 13:42:28 -0800 (PST) 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 E0B8137B401 for ; Mon, 30 Dec 2002 13:42:27 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5F14243EA9 for ; Mon, 30 Dec 2002 13:42:27 -0800 (PST) (envelope-from green@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id gBULgRfh071515 for ; Mon, 30 Dec 2002 13:42:27 -0800 (PST) (envelope-from green@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id gBULgQdT071512 for perforce@freebsd.org; Mon, 30 Dec 2002 13:42:26 -0800 (PST) Date: Mon, 30 Dec 2002 13:42:26 -0800 (PST) Message-Id: <200212302142.gBULgQdT071512@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to green@freebsd.org using -f From: Brian Feldman Subject: PERFORCE change 22948 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=22948 Change 22948 by green@green_laptop_2 on 2002/12/30 13:41:46 Add the rest of the moused policy. Affected files ... .. //depot/projects/trustedbsd/mac/contrib/sebsd/policy/domains/program/moused.te#1 add Differences ... To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Dec 30 14:11: 5 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 77A6637B405; Mon, 30 Dec 2002 14:11:03 -0800 (PST) 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 0F3C737B401 for ; Mon, 30 Dec 2002 14:11:02 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A607A43EE6 for ; Mon, 30 Dec 2002 14:11:02 -0800 (PST) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id gBUMB2fh081114 for ; Mon, 30 Dec 2002 14:11:02 -0800 (PST) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id gBUMB1E4081098 for perforce@freebsd.org; Mon, 30 Dec 2002 14:11:01 -0800 (PST) Date: Mon, 30 Dec 2002 14:11:01 -0800 (PST) Message-Id: <200212302211.gBUMB1E4081098@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar Subject: PERFORCE change 22949 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=22949 Change 22949 by marcel@marcel_nfs on 2002/12/30 14:10:21 o Don't set the device description for the puc-hosted devices. The sio(4) driver sets a description. o Don't quiet the puc-hosted devices for the non bootverbose case. We like to see the sio(4) descr. Affected files ... .. //depot/projects/ia64/sys/dev/puc/puc.c#11 edit Differences ... ==== //depot/projects/ia64/sys/dev/puc/puc.c#11 (text+ko) ==== @@ -278,11 +278,6 @@ continue; } device_set_ivars(sc->sc_ports[i].dev, pdev); -#if 0 - device_set_desc(sc->sc_ports[i].dev, sc->sc_desc->name); -#endif - if (!bootverbose) - device_quiet(sc->sc_ports[i].dev); #ifdef PUC_DEBUG printf("puc: type %d, bar %x, offset %x\n", sc->sc_desc->ports[i].type, To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Dec 30 14:12: 6 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 46E2137B405; Mon, 30 Dec 2002 14:12:05 -0800 (PST) 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 EA1C637B401 for ; Mon, 30 Dec 2002 14:12:04 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A314643EE6 for ; Mon, 30 Dec 2002 14:12:04 -0800 (PST) (envelope-from green@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id gBUMC4fh082177 for ; Mon, 30 Dec 2002 14:12:04 -0800 (PST) (envelope-from green@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id gBUMC4eG082174 for perforce@freebsd.org; Mon, 30 Dec 2002 14:12:04 -0800 (PST) Date: Mon, 30 Dec 2002 14:12:04 -0800 (PST) Message-Id: <200212302212.gBUMC4eG082174@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to green@freebsd.org using -f From: Brian Feldman Subject: PERFORCE change 22950 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=22950 Change 22950 by green@green_laptop_2 on 2002/12/30 14:11:24 Allow swapon on chr_file as well as blk_file. Affected files ... .. //depot/projects/trustedbsd/mac/contrib/sebsd/policy/domains/program/fsadm.te#2 edit Differences ... ==== //depot/projects/trustedbsd/mac/contrib/sebsd/policy/domains/program/fsadm.te#2 (text+ko) ==== @@ -51,7 +51,7 @@ # Enable swapping to devices and files allow fsadm_t swapfile_t:file { getattr swapon }; -allow fsadm_t fixed_disk_device_t:blk_file { getattr swapon }; +allow fsadm_t fixed_disk_device_t:{ blk_file chr_file } { getattr swapon }; # XXX Why does updfstab run insmod? domain_auto_trans(fsadm_t, insmod_exec_t, insmod_t) To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Dec 30 14:17:39 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 33A6E37B405; Mon, 30 Dec 2002 14:17:15 -0800 (PST) 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 BB66737B401 for ; Mon, 30 Dec 2002 14:17:14 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7B5E043ED4 for ; Mon, 30 Dec 2002 14:17:13 -0800 (PST) (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.6/8.12.6) with ESMTP id gBUMHDfh082402 for ; Mon, 30 Dec 2002 14:17:13 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id gBUMHBqD082399 for perforce@freebsd.org; Mon, 30 Dec 2002 14:17:11 -0800 (PST) Date: Mon, 30 Dec 2002 14:17:11 -0800 (PST) Message-Id: <200212302217.gBUMHBqD082399@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 Subject: PERFORCE change 22951 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=22951 Change 22951 by rwatson@rwatson_paprika on 2002/12/30 14:17:10 Integ TrustedBSD ACL from TrustedBSD base: loop back symbolic link system calls, library updates, and getfacl/setfacl changes to take into account symbolic links. Also pick up m_tag changes. Affected files ... .. //depot/projects/trustedbsd/acl/lib/libc/compat-43/creat.2#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/compat-43/gethostid.3#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/compat-43/killpg.2#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/compat-43/sigpause.2#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/compat-43/sigsetmask.2#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/compat-43/sigvec.2#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/db/man/btree.3#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/db/man/dbm.3#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/db/man/dbopen.3#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/db/man/hash.3#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/db/man/mpool.3#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/gen/Makefile.inc#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/gen/alarm.3#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/gen/basename.3#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/gen/basename.c#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/gen/ctermid.3#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/gen/devname.3#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/gen/directory.3#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/gen/dirname.3#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/gen/dirname.c#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/gen/dladdr.3#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/gen/dllockinit.3#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/gen/dlopen.3#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/gen/exec.3#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/gen/fmtcheck.3#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/gen/fnmatch.3#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/gen/frexp.3#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/gen/fts.3#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/gen/getbootfile.3#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/gen/getbsize.3#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/gen/getbsize.c#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/gen/getcap.3#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/gen/getcap.c#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/gen/getdomainname.3#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/gen/getgrent.3#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/gen/gethostname.3#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/gen/getmntinfo.3#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/gen/getnetgrent.3#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/gen/getobjformat.3#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/gen/getpagesize.3#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/gen/getpeereid.3#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/gen/getpwent.3#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/gen/getttyent.3#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/gen/getvfsbyname.3#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/gen/getvfsent.3#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/gen/glob.3#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/gen/lockf.3#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/gen/makecontext.3#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/gen/modf.3#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/gen/msgctl.3#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/gen/msgget.3#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/gen/msgrcv.3#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/gen/msgsnd.3#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/gen/pselect.3#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/gen/rand48.3#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/gen/readpassphrase.3#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/gen/rfork_thread.3#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/gen/scandir.3#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/gen/setjmp.3#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/gen/setproctitle.3#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/gen/setproctitle.c#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/gen/siginterrupt.3#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/gen/signal.3#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/gen/sigsetops.3#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/gen/stringlist.3#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/gen/sysctl.3#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/gen/syslog.3#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/gen/tcsendbreak.3#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/gen/tcsetattr.3#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/gen/timezone.3#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/gen/ttyname.3#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/gen/ualarm.3#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/gen/ualarm.c#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/gen/ulimit.3#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/gen/unvis.3#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/gen/usleep.3#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/gen/usleep.c#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/gen/valloc.3#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/gen/vis.3#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/gen/wordexp.3#1 branch .. //depot/projects/trustedbsd/acl/lib/libc/gen/wordexp.c#1 branch .. //depot/projects/trustedbsd/acl/lib/libc/gmon/moncontrol.3#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/i386/stdlib/div.S#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/i386/stdlib/ldiv.S#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/i386/sys/i386_get_ioperm.2#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/i386/sys/i386_get_ldt.2#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/i386/sys/i386_set_watch.3#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/i386/sys/i386_vm86.2#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/locale/ctype.3#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/locale/isblank.3#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/locale/mbrune.3#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/locale/rune.3#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/net/addr2ascii.3#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/net/ethers.3#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/net/getaddrinfo.3#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/net/gethostbyname.3#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/net/getipnodebyname.3#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/net/getnameinfo.3#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/net/getnetent.3#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/net/hesiod.3#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/net/inet6_option_space.3#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/net/inet6_rthdr_space.3#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/net/inet_net.3#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/net/iso_addr.3#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/net/linkaddr.3#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/net/nsdispatch.3#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/net/rcmd.3#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/net/rcmdsh.3#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/net/resolver.3#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/net/sockatmark.3#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/posix1e/acl.3#4 integrate .. //depot/projects/trustedbsd/acl/lib/libc/posix1e/acl_delete.3#5 integrate .. //depot/projects/trustedbsd/acl/lib/libc/posix1e/acl_delete.c#3 integrate .. //depot/projects/trustedbsd/acl/lib/libc/posix1e/acl_dup.3#3 integrate .. //depot/projects/trustedbsd/acl/lib/libc/posix1e/acl_free.3#3 integrate .. //depot/projects/trustedbsd/acl/lib/libc/posix1e/acl_from_text.3#4 integrate .. //depot/projects/trustedbsd/acl/lib/libc/posix1e/acl_get.3#5 integrate .. //depot/projects/trustedbsd/acl/lib/libc/posix1e/acl_get.c#3 integrate .. //depot/projects/trustedbsd/acl/lib/libc/posix1e/acl_init.3#3 integrate .. //depot/projects/trustedbsd/acl/lib/libc/posix1e/acl_set.3#4 integrate .. //depot/projects/trustedbsd/acl/lib/libc/posix1e/acl_set.c#3 integrate .. //depot/projects/trustedbsd/acl/lib/libc/posix1e/acl_to_text.3#4 integrate .. //depot/projects/trustedbsd/acl/lib/libc/posix1e/acl_valid.3#4 integrate .. //depot/projects/trustedbsd/acl/lib/libc/posix1e/acl_valid.c#3 integrate .. //depot/projects/trustedbsd/acl/lib/libc/regex/regex.3#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/rpc/bindresvport.3#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/rpc/des_crypt.3#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/rpc/getnetconfig.3#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/rpc/getnetpath.3#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/rpc/getrpcent.3#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/rpc/getrpcport.3#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/rpc/publickey.3#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/rpc/rpc.3#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/rpc/rpc_clnt_auth.3#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/rpc/rpc_clnt_calls.3#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/rpc/rpc_clnt_create.3#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/rpc/rpc_secure.3#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/rpc/rpc_soc.3#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/rpc/rpc_svc_calls.3#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/rpc/rpc_svc_create.3#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/rpc/rpc_svc_err.3#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/rpc/rpc_svc_reg.3#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/rpc/rpcbind.3#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/rpc/rtime.3#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/stdio/fclose.3#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/stdio/fflush.3#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/stdio/fopen.3#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/stdio/fputs.3#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/stdio/fseek.3#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/stdio/fwide.3#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/stdio/mktemp.3#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/stdio/perror.c#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/stdio/printf.3#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/stdio/putc.3#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/stdio/scanf.3#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/stdio/setbuf.3#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/stdio/tmpnam.3#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/stdlib/abs.3#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/stdlib/atexit.3#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/stdlib/atof.3#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/stdlib/atoi.3#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/stdlib/div.3#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/stdlib/getenv.3#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/stdlib/getopt_long.3#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/stdlib/labs.3#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/stdlib/ldiv.3#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/stdlib/lsearch.3#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/stdlib/malloc.3#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/stdlib/qsort.3#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/stdlib/rand.3#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/stdlib/realpath.3#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/stdlib/strtod.3#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/stdlib/tsearch.3#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/stdtime/ctime.3#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/stdtime/strptime.3#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/string/index.3#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/string/rindex.3#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/string/strchr.3#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/string/strcpy.3#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/string/strerror.3#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/string/strerror.c#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/string/strlcpy.3#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/string/strtok.3#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/sys/_exit.2#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/sys/accept.2#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/sys/access.2#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/sys/acct.2#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/sys/adjtime.2#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/sys/aio_cancel.2#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/sys/aio_error.2#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/sys/aio_read.2#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/sys/aio_return.2#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/sys/aio_suspend.2#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/sys/aio_waitcomplete.2#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/sys/aio_write.2#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/sys/bind.2#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/sys/brk.2#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/sys/chdir.2#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/sys/chflags.2#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/sys/chmod.2#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/sys/chown.2#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/sys/chroot.2#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/sys/clock_gettime.2#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/sys/close.2#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/sys/connect.2#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/sys/dup.2#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/sys/execve.2#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/sys/extattr_get_file.2#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/sys/fcntl.2#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/sys/fhopen.2#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/sys/flock.2#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/sys/fork.2#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/sys/fsync.2#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/sys/getdirentries.2#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/sys/getdtablesize.2#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/sys/getfh.2#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/sys/getfsstat.2#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/sys/getgid.2#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/sys/getgroups.2#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/sys/getitimer.2#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/sys/getlogin.2#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/sys/getpeername.2#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/sys/getpgrp.2#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/sys/getpid.2#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/sys/getpriority.2#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/sys/getrlimit.2#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/sys/getrusage.2#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/sys/getsid.2#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/sys/getsockname.2#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/sys/getsockopt.2#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/sys/gettimeofday.2#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/sys/getuid.2#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/sys/intro.2#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/sys/ioctl.2#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/sys/issetugid.2#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/sys/jail.2#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/sys/kenv.2#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/sys/kill.2#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/sys/kldfind.2#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/sys/kldfirstmod.2#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/sys/kldload.2#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/sys/kldnext.2#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/sys/kldstat.2#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/sys/kldsym.2#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/sys/kldunload.2#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/sys/kqueue.2#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/sys/kse.2#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/sys/ktrace.2#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/sys/link.2#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/sys/listen.2#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/sys/lseek.2#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/sys/madvise.2#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/sys/mincore.2#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/sys/minherit.2#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/sys/mkdir.2#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/sys/mkfifo.2#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/sys/mknod.2#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/sys/mlock.2#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/sys/mmap.2#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/sys/mmap.c#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/sys/modfind.2#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/sys/modnext.2#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/sys/modstat.2#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/sys/mount.2#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/sys/mprotect.2#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/sys/msync.2#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/sys/munmap.2#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/sys/nanosleep.2#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/sys/nfssvc.2#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/sys/open.2#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/sys/pathconf.2#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/sys/pipe.2#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/sys/poll.2#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/sys/profil.2#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/sys/ptrace.2#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/sys/quotactl.2#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/sys/read.2#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/sys/readlink.2#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/sys/reboot.2#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/sys/recv.2#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/sys/rename.2#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/sys/revoke.2#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/sys/rfork.2#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/sys/rmdir.2#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/sys/rtprio.2#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/sys/sched_get_priority_max.2#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/sys/sched_setparam.2#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/sys/sched_setscheduler.2#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/sys/sched_yield.2#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/sys/select.2#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/sys/semctl.2#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/sys/semget.2#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/sys/semop.2#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/sys/send.2#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/sys/sendfile.2#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/sys/setgroups.2#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/sys/setpgid.2#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/sys/setregid.2#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/sys/setresuid.2#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/sys/setreuid.2#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/sys/setsid.2#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/sys/setuid.2#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/sys/shmat.2#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/sys/shmctl.2#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/sys/shmget.2#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/sys/shutdown.2#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/sys/sigaction.2#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/sys/sigaltstack.2#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/sys/sigpending.2#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/sys/sigprocmask.2#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/sys/sigreturn.2#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/sys/sigstack.2#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/sys/sigsuspend.2#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/sys/socket.2#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/sys/socketpair.2#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/sys/stat.2#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/sys/statfs.2#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/sys/swapon.2#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/sys/symlink.2#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/sys/sync.2#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/sys/sysarch.2#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/sys/syscall.2#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/sys/truncate.2#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/sys/umask.2#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/sys/undelete.2#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/sys/unlink.2#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/sys/utimes.2#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/sys/uuidgen.2#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/sys/vfork.2#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/sys/wait.2#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/sys/write.2#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/uuid/uuid.3#2 integrate .. //depot/projects/trustedbsd/acl/lib/libc/xdr/xdr.3#2 integrate .. //depot/projects/trustedbsd/acl/sys/boot/ficl/words.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/cam/cam_queue.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/dev/amr/amr.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/dev/an/if_aironet_ieee.h#2 integrate .. //depot/projects/trustedbsd/acl/sys/dev/an/if_an.c#3 integrate .. //depot/projects/trustedbsd/acl/sys/dev/an/if_an_pccard.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/dev/an/if_an_pci.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/dev/an/if_anreg.h#2 integrate .. //depot/projects/trustedbsd/acl/sys/dev/awi/awi.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/dev/awi/awi_wep.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/dev/ccd/ccd.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/dev/cm/smc90cx6.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/dev/en/midway.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/dev/firewire/iec13213.h#2 integrate .. //depot/projects/trustedbsd/acl/sys/dev/hifn/hifn7751.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/dev/isp/isp.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/dev/isp/isp_target.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/dev/isp/isp_tpublic.h#2 integrate .. //depot/projects/trustedbsd/acl/sys/dev/nge/if_nge.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/dev/ppbus/if_plip.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/dev/ppbus/ppi.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/dev/puc/puc.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/dev/puc/pucdata.c#3 integrate .. //depot/projects/trustedbsd/acl/sys/dev/sab/sab.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/dev/sym/sym_fw1.h#2 integrate .. //depot/projects/trustedbsd/acl/sys/dev/sym/sym_fw2.h#2 integrate .. //depot/projects/trustedbsd/acl/sys/dev/sym/sym_hipd.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/dev/ubsec/ubsec.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/dev/wl/if_wl.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/fs/fifofs/fifo_vnops.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/fs/hpfs/hpfs_vnops.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/fs/nullfs/null_vnops.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/fs/smbfs/smbfs_smb.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/geom/geom_mbr.c#3 integrate .. //depot/projects/trustedbsd/acl/sys/gnu/ext2fs/ext2_linux_balloc.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/i386/conf/OLDCARD#2 integrate .. //depot/projects/trustedbsd/acl/sys/i386/conf/SMP#1 branch .. //depot/projects/trustedbsd/acl/sys/i386/isa/istallion.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/ia64/ia32/syscalls.master#2 integrate .. //depot/projects/trustedbsd/acl/sys/kern/init_sysent.c#3 integrate .. //depot/projects/trustedbsd/acl/sys/kern/kern_acl.c#4 integrate .. //depot/projects/trustedbsd/acl/sys/kern/kern_proc.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/kern/kern_subr.c#3 integrate .. //depot/projects/trustedbsd/acl/sys/kern/syscalls.c#3 integrate .. //depot/projects/trustedbsd/acl/sys/kern/syscalls.master#3 integrate .. //depot/projects/trustedbsd/acl/sys/kern/uipc_mbuf.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/kern/uipc_mbuf2.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/kern/vfs_subr.c#3 integrate .. //depot/projects/trustedbsd/acl/sys/net/if_loop.c#3 integrate .. //depot/projects/trustedbsd/acl/sys/net/if_var.h#3 integrate .. //depot/projects/trustedbsd/acl/sys/netatm/port.h#2 integrate .. //depot/projects/trustedbsd/acl/sys/netatm/spans/spans_msg.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/netatm/spans/spans_util.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/netatm/uni/sscop_lower.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/netinet/ip_icmp.c#3 integrate .. //depot/projects/trustedbsd/acl/sys/netinet/ip_input.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/netinet/tcp_input.c#3 integrate .. //depot/projects/trustedbsd/acl/sys/netinet6/esp_input.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/netinet6/icmp6.c#3 integrate .. //depot/projects/trustedbsd/acl/sys/netinet6/ip6_input.c#3 integrate .. //depot/projects/trustedbsd/acl/sys/netinet6/ip6_output.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/netinet6/ip6_var.h#2 integrate .. //depot/projects/trustedbsd/acl/sys/netinet6/ipsec.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/netinet6/nd6_nbr.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/netipsec/ipsec_mbuf.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/netipsec/ipsec_output.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/netsmb/smb.h#2 integrate .. //depot/projects/trustedbsd/acl/sys/nfsclient/bootp_subr.c#3 integrate .. //depot/projects/trustedbsd/acl/sys/pc98/pc98/olpt.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/pci/if_xl.c#3 integrate .. //depot/projects/trustedbsd/acl/sys/pci/ncr.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/sparc64/include/tte.h#3 integrate .. //depot/projects/trustedbsd/acl/sys/sparc64/pci/psycho.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/sparc64/sparc64/cache.c#3 integrate .. //depot/projects/trustedbsd/acl/sys/sparc64/sparc64/exception.S#3 integrate .. //depot/projects/trustedbsd/acl/sys/sparc64/sparc64/genassym.c#3 integrate .. //depot/projects/trustedbsd/acl/sys/sparc64/sparc64/interrupt.S#2 integrate .. //depot/projects/trustedbsd/acl/sys/sparc64/sparc64/mp_exception.S#2 integrate .. //depot/projects/trustedbsd/acl/sys/sys/_mutex.h#2 integrate .. //depot/projects/trustedbsd/acl/sys/sys/acl.h#3 integrate .. //depot/projects/trustedbsd/acl/sys/sys/diskmbr.h#2 integrate .. //depot/projects/trustedbsd/acl/sys/sys/mbuf.h#2 integrate .. //depot/projects/trustedbsd/acl/sys/sys/msg.h#3 integrate .. //depot/projects/trustedbsd/acl/sys/sys/namei.h#2 integrate .. //depot/projects/trustedbsd/acl/sys/sys/signal.h#2 integrate .. //depot/projects/trustedbsd/acl/sys/sys/syscall.h#3 integrate .. //depot/projects/trustedbsd/acl/sys/sys/syscall.mk#3 integrate .. //depot/projects/trustedbsd/acl/sys/sys/sysproto.h#3 integrate .. //depot/projects/trustedbsd/acl/sys/sys/unpcb.h#2 integrate .. //depot/projects/trustedbsd/acl/sys/sys/vnode.h#3 integrate .. //depot/projects/trustedbsd/acl/sys/vm/vm_fault.c#3 integrate .. //depot/projects/trustedbsd/acl/sys/vm/vm_kern.c#3 integrate .. //depot/projects/trustedbsd/acl/sys/vm/vm_map.c#2 integrate .. //depot/projects/trustedbsd/acl/sys/vm/vm_object.c#3 integrate .. //depot/projects/trustedbsd/acl/sys/vm/vm_object.h#3 integrate .. //depot/projects/trustedbsd/acl/sys/vm/vm_page.c#3 integrate Differences ... ==== //depot/projects/trustedbsd/acl/lib/libc/compat-43/creat.2#2 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)creat.2 8.1 (Berkeley) 6/2/93 -.\" $FreeBSD: src/lib/libc/compat-43/creat.2,v 1.9 2001/10/01 16:08:50 ru Exp $ +.\" $FreeBSD: src/lib/libc/compat-43/creat.2,v 1.10 2002/12/18 12:45:08 ru Exp $ .\" .Dd June 2, 1993 .Dt CREAT 2 @@ -50,7 +50,9 @@ .Ef .Xr open 2 . .Pp -.Fn Creat +The +.Fn creat +function is the same as: .Bd -literal -offset indent open(path, O_CREAT | O_TRUNC | O_WRONLY, mode); @@ -60,5 +62,5 @@ .Sh HISTORY The .Fn creat -function call appeared in +function appeared in .At v6 . ==== //depot/projects/trustedbsd/acl/lib/libc/compat-43/gethostid.3#2 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)gethostid.3 8.1 (Berkeley) 6/2/93 -.\" $FreeBSD: src/lib/libc/compat-43/gethostid.3,v 1.10 2001/10/01 16:08:50 ru Exp $ +.\" $FreeBSD: src/lib/libc/compat-43/gethostid.3,v 1.11 2002/12/18 12:45:08 ru Exp $ .\" .Dd June 2, 1993 .Dt GETHOSTID 3 @@ -48,14 +48,18 @@ .Ft void .Fn sethostid "long hostid" .Sh DESCRIPTION -.Fn Sethostid +The +.Fn sethostid +function establishes a 32-bit identifier for the current processor that is intended to be unique among all UNIX systems in existence. This is normally a DARPA Internet address for the local machine. This call is allowed only to the super-user and is normally performed at boot time. .Pp -.Fn Gethostid +The +.Fn gethostid +function returns the 32-bit identifier for the current processor. .Pp This function has been deprecated. ==== //depot/projects/trustedbsd/acl/lib/libc/compat-43/killpg.2#2 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)killpg.2 8.1 (Berkeley) 6/2/93 -.\" $FreeBSD: src/lib/libc/compat-43/killpg.2,v 1.10 2001/10/01 16:08:50 ru Exp $ +.\" $FreeBSD: src/lib/libc/compat-43/killpg.2,v 1.12 2002/12/19 09:40:21 ru Exp $ .\" .Dd June 2, 1993 .Dt KILLPG 2 @@ -46,7 +46,9 @@ .Ft int .Fn killpg "pid_t pgrp" "int sig" .Sh DESCRIPTION -.Fn Killpg +The +.Fn killpg +function sends the signal .Fa sig to the process group @@ -68,11 +70,15 @@ .Sh RETURN VALUES .Rv -std killpg .Sh ERRORS -.Fn Killpg +The +.Fn killpg +function will fail and no signal will be sent if: .Bl -tag -width Er .It Bq Er EINVAL -.Fa Sig +The +.Fa sig +argument is not a valid signal number. .It Bq Er ESRCH No process can be found in the process group specified by @@ -92,5 +98,5 @@ .Sh HISTORY The .Fn killpg -function call appeared in +function appeared in .Bx 4.0 . ==== //depot/projects/trustedbsd/acl/lib/libc/compat-43/sigpause.2#2 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)sigpause.2 8.1 (Berkeley) 6/2/93 -.\" $FreeBSD: src/lib/libc/compat-43/sigpause.2,v 1.10 2001/10/01 16:08:50 ru Exp $ +.\" $FreeBSD: src/lib/libc/compat-43/sigpause.2,v 1.12 2002/12/19 09:40:21 ru Exp $ .\" .Dd June 2, 1993 .Dt SIGPAUSE 2 @@ -48,16 +48,22 @@ .Sy This interface is made obsolete by .Xr sigsuspend 2 . .Pp -.Fn Sigpause +The +.Fn sigpause +function assigns .Fa sigmask to the set of masked signals and then waits for a signal to arrive; on return the set of masked signals is restored. -.Fa Sigmask +The +.Fa sigmask +argument is usually 0 to indicate that no signals are to be blocked. -.Fn Sigpause +The +.Fn sigpause +function always terminates by being interrupted, returning -1 with .Va errno set to @@ -72,6 +78,6 @@ .Sh HISTORY The .Fn sigpause -function call appeared in +function appeared in .Bx 4.2 and has been deprecated. ==== //depot/projects/trustedbsd/acl/lib/libc/compat-43/sigsetmask.2#2 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)sigsetmask.2 8.1 (Berkeley) 6/2/93 -.\" $FreeBSD: src/lib/libc/compat-43/sigsetmask.2,v 1.12 2001/10/01 16:08:50 ru Exp $ +.\" $FreeBSD: src/lib/libc/compat-43/sigsetmask.2,v 1.13 2002/12/18 12:45:08 ru Exp $ .\" .Dd June 2, 1993 .Dt SIGSETMASK 2 @@ -55,13 +55,17 @@ .Ef .Xr sigprocmask 2 . .Pp -.Fn Sigsetmask +The +.Fn sigsetmask +function sets the current signal mask to the specified .Fa mask . Signals are blocked from delivery if the corresponding bit in .Fa mask is a 1. -.Fn Sigblock +The +.Fn sigblock +function adds the signals in the specified .Fa mask to the current signal mask, @@ -80,9 +84,11 @@ .Dv SIGSTOP to be blocked. .Sh RETURN VALUES -.Fn Sigblock +The +.Fn sigblock and .Fn sigsetmask +functions return the previous set of masked signals. .Sh SEE ALSO .Xr kill 2 , @@ -96,6 +102,6 @@ .Fn sigsetmask and .Fn sigblock -function calls first appeared in +functions first appeared in .Bx 4.2 and have been deprecated. ==== //depot/projects/trustedbsd/acl/lib/libc/compat-43/sigvec.2#2 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)sigvec.2 8.2 (Berkeley) 4/19/94 -.\" $FreeBSD: src/lib/libc/compat-43/sigvec.2,v 1.19 2001/10/01 16:08:50 ru Exp $ +.\" $FreeBSD: src/lib/libc/compat-43/sigvec.2,v 1.21 2002/12/19 09:40:21 ru Exp $ .\" .Dd April 19, 1994 .Dt SIGVEC 2 @@ -116,7 +116,9 @@ .Em or Ns 'ing in the signal mask associated with the handler to be invoked. .Pp -.Fn Sigvec +The +.Fn sigvec +function assigns a handler for a specific signal. If .Fa vec is non-zero, it @@ -258,7 +260,9 @@ .Sh RETURN VALUES .Rv -std sigvec .Sh ERRORS -.Fn Sigvec +The +.Fn sigvec +function will fail and no new signal handler will be installed if one of the following occurs: .Bl -tag -width Er @@ -270,7 +274,9 @@ points to memory that is not a valid part of the process address space. .It Bq Er EINVAL -.Fa Sig +The +.Fa sig +argument is not a valid signal number. .It Bq Er EINVAL An attempt is made to ignore or supply a handler for @@ -308,8 +314,10 @@ .Fa sig is the signal number, into which the hardware faults and traps are mapped as defined below. -.Fa Code -is a parameter that is either a constant +The +.Fa code +argument +is either a constant as given below or, for compatibility mode faults, the code provided by the hardware (Compatibility mode faults are distinguished from the other @@ -317,7 +325,9 @@ traps by having .Dv PSL_CM set in the psl). -.Fa Scp +The +.Fa scp +argument is a pointer to the .Fa sigcontext structure (defined in ==== //depot/projects/trustedbsd/acl/lib/libc/db/man/btree.3#2 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)btree.3 8.4 (Berkeley) 8/18/94 -.\" $FreeBSD: src/lib/libc/db/man/btree.3,v 1.5 2001/10/01 16:08:50 ru Exp $ +.\" $FreeBSD: src/lib/libc/db/man/btree.3,v 1.6 2002/12/19 09:40:21 ru Exp $ .\" .Dd August 18, 1994 .Dt BTREE 3 @@ -172,7 +172,9 @@ (no comparison function is specified), the keys are compared lexically, with shorter keys considered less than longer keys. .It Va prefix -.Va Prefix +The +.Va prefix +element is the prefix comparison function. If specified, this routine must return the number of bytes of the second key argument which are necessary to determine that it is greater than the first @@ -206,10 +208,11 @@ If the file already exists (and the .Dv O_TRUNC flag is not specified), the -values specified for the parameters +values specified for the .Va flags , lorder and .Va psize +arguments are ignored in favor of the values used when the tree was created. .Pp ==== //depot/projects/trustedbsd/acl/lib/libc/db/man/dbm.3#2 (text+ko) ==== @@ -13,7 +13,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libc/db/man/dbm.3,v 1.5 2001/10/01 16:08:50 ru Exp $ +.\" $FreeBSD: src/lib/libc/db/man/dbm.3,v 1.7 2002/12/19 09:40:21 ru Exp $ .\" .\" Note: The date here should be updated whenever a non-trivial .\" change is made to the manual page. @@ -73,9 +73,13 @@ } datum; .Ed .Pp +The .Fn dbm_open base flags mode +function opens or creates a database. +The .Fa base +argument is the basename of the file containing the database; the actual database has a .Pa .db @@ -86,9 +90,11 @@ .Qq Li /home/me/mystuff then the actual database is in the file .Pa /home/me/mystuff.db . +The .Fa flags and .Fa mode +arguments are passed to .Xr open 2 . .Pq Dv O_RDWR | O_CREAT @@ -105,21 +111,31 @@ identifies the database and is the .Fa db argument to the other functions. +The .Fn dbm_open +function returns .Dv NULL and sets .Va errno if there were any errors. .Pp +The .Fn dbm_close db +function closes the database. +The .Fn dbm_close +function normally returns zero. .Pp +The .Fn dbm_store db key data flags +function inserts or replaces an entry in the database. +The .Fa flags +argument is either .Dv DBM_INSERT or @@ -132,7 +148,9 @@ .Fa key , that entry is not replaced. Otherwise the entry is replaced or inserted. +The .Fn dbm_store +function normally returns zero but returns 1 if the entry could not be inserted (because .Fa flags @@ -144,7 +162,9 @@ .Va errno if there were any errors. .Pp +The .Fn dbm_fetch db key +function returns .Dv NULL or the @@ -152,38 +172,56 @@ corresponding to .Fa key . .Pp +The .Fn dbm_delete db key +function deletes the entry for .Fa key . +The .Fn dbm_delete +function normally returns zero but returns 1 if there was no entry with .Fa key in the database or returns -1 and sets .Va errno if there were any errors. .Pp +The .Fn dbm_firstkey db +function returns the first key in the database. +The .Fn dbm_nextkey db +function returns subsequent keys. +The .Fn db_firstkey +function must be called before .Fn dbm_nextkey . The order in which keys are returned is unspecified and may appear random. +The .Fn dbm_nextkey +function returns .Dv NULL after all keys have been returned. .Pp +The .Fn dbm_error db +function returns the .Va errno value of the most recent error. +The .Fn dbm_clearerr db +function resets this value to 0 and returns 0. .Pp +The .Fn dbm_dirfno db +function returns the file descriptor to the database. .Sh SEE ALSO .Xr open 2 , ==== //depot/projects/trustedbsd/acl/lib/libc/db/man/dbopen.3#2 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)dbopen.3 8.5 (Berkeley) 1/2/94 -.\" $FreeBSD: src/lib/libc/db/man/dbopen.3,v 1.6 2002/10/18 16:20:08 markm Exp $ +.\" $FreeBSD: src/lib/libc/db/man/dbopen.3,v 1.8 2002/12/19 09:40:21 ru Exp $ .\" .Dd January 2, 1994 .Dt DBOPEN 3 @@ -46,7 +46,9 @@ .Ft DB * .Fn dbopen "const char *file" "int flags" "int mode" "DBTYPE type" "const void *openinfo" .Sh DESCRIPTION -.Fn Dbopen +The +.Fn dbopen +function is the library interface to database files. The supported file formats are btree, hashed and UNIX file oriented. The btree format is a representation of a sorted, balanced tree structure. @@ -60,12 +62,16 @@ and .Xr recno 3 . .Pp -.Fn Dbopen +The +.Fn dbopen +function opens .Fa file for reading and/or writing. Files never intended to be preserved on disk may be created by setting -the file parameter to +the +.Fa file +argument to .Dv NULL . .Pp The @@ -131,7 +137,9 @@ each access method will use defaults appropriate for the system and the access method. .Pp -.Fn Dbopen +The +.Fn dbopen +function returns a pointer to a .Ft DB structure on success and @@ -174,15 +182,16 @@ or .Va sync function may result in inconsistent or lost information. -.Va Close +.Va close routines return -1 on error (setting .Va errno ) and 0 on success. .It Va del A pointer to a routine to remove key/data pairs from the database. .Pp -The parameter +The .Fa flags +argument may be set to the following value: .Bl -tag -width indent .It Dv R_CURSOR @@ -190,7 +199,7 @@ The cursor must have previously been initialized. .El .Pp -.Va Delete +.Va delete routines return -1 on error (setting .Va errno ) , 0 on success, and 1 if the specified @@ -224,7 +233,7 @@ .Fa key are returned in the structure referenced by .Fa data . -.Va Get +.Va get routines return -1 on error (setting .Va errno ) , 0 on success, and 1 if the @@ -233,8 +242,9 @@ .It Va put A pointer to a routine to store key/data pairs in the database. .Pp -The parameter +The .Fa flags +argument may be set to one of the following values: >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Dec 30 14:20:21 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 60AF137B405; Mon, 30 Dec 2002 14:20:19 -0800 (PST) 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 C9BD737B401 for ; Mon, 30 Dec 2002 14:20:18 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 64EDC43E4A for ; Mon, 30 Dec 2002 14:20:18 -0800 (PST) (envelope-from green@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id gBUMKIfh083069 for ; Mon, 30 Dec 2002 14:20:18 -0800 (PST) (envelope-from green@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id gBUMKHnb083040 for perforce@freebsd.org; Mon, 30 Dec 2002 14:20:17 -0800 (PST) Date: Mon, 30 Dec 2002 14:20:17 -0800 (PST) Message-Id: <200212302220.gBUMKHnb083040@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to green@freebsd.org using -f From: Brian Feldman Subject: PERFORCE change 22952 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=22952 Change 22952 by green@green_laptop_2 on 2002/12/30 14:19:58 Since FreeBSD does not use block files, utilize character files in some of the policies as well. Affected files ... .. //depot/projects/trustedbsd/mac/contrib/sebsd/policy/domains/program/initrc.te#3 edit .. //depot/projects/trustedbsd/mac/contrib/sebsd/policy/domains/program/login.te#2 edit .. //depot/projects/trustedbsd/mac/contrib/sebsd/policy/domains/program/quota.te#2 edit Differences ... ==== //depot/projects/trustedbsd/mac/contrib/sebsd/policy/domains/program/initrc.te#3 (text+ko) ==== @@ -188,7 +188,7 @@ allow initrc_t apm_bios_t:chr_file { setattr getattr };') # Access /dev/fd0 (for kudzu). Need a separate domain for kudzu? -allow initrc_t removable_device_t:blk_file rw_file_perms; +allow initrc_t removable_device_t:{ blk_file chr_file } rw_file_perms; ifdef(`lpd.te', `# Read printconf files. ==== //depot/projects/trustedbsd/mac/contrib/sebsd/policy/domains/program/login.te#2 (text+ko) ==== @@ -42,8 +42,8 @@ allow local_login_t sysadm_home_t:file r_file_perms; # Do not audit denied attempts to access devices. -dontaudit local_login_t fixed_disk_device_t:blk_file { getattr setattr }; -dontaudit local_login_t removable_device_t:blk_file { getattr setattr }; +dontaudit local_login_t fixed_disk_device_t:{ chr_file blk_file } { getattr setattr }; +dontaudit local_login_t removable_device_t:{ chr_file blk_file } { getattr setattr }; dontaudit local_login_t device_t:{ chr_file blk_file lnk_file } { getattr setattr }; dontaudit local_login_t misc_device_t:{ chr_file blk_file lnk_file } { getattr setattr }; dontaudit local_login_t framebuf_device_t:{ chr_file blk_file lnk_file } { getattr setattr read }; ==== //depot/projects/trustedbsd/mac/contrib/sebsd/policy/domains/program/quota.te#2 (text+ko) ==== @@ -16,7 +16,7 @@ allow quota_t etc_runtime_t:file r_file_perms; allow quota_t device_t:dir r_dir_perms; -allow quota_t fixed_disk_device_t:blk_file getattr; +allow quota_t fixed_disk_device_t:{ blk_file chr_file } getattr; allow quota_t boot_t:dir r_dir_perms; To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Dec 30 15:14:28 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id F332F37B405; Mon, 30 Dec 2002 15:14:26 -0800 (PST) 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 8B9F437B401 for ; Mon, 30 Dec 2002 15:14:26 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D314743ED4 for ; Mon, 30 Dec 2002 15:14:25 -0800 (PST) (envelope-from green@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id gBUNEPfh003929 for ; Mon, 30 Dec 2002 15:14:25 -0800 (PST) (envelope-from green@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id gBUNEPcg003926 for perforce@freebsd.org; Mon, 30 Dec 2002 15:14:25 -0800 (PST) Date: Mon, 30 Dec 2002 15:14:25 -0800 (PST) Message-Id: <200212302314.gBUNEPcg003926@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to green@freebsd.org using -f From: Brian Feldman Subject: PERFORCE change 22955 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=22955 Change 22955 by green@green_laptop_2 on 2002/12/30 15:13:38 Add some more filesystem-related programs to the fsadm family. Affected files ... .. //depot/projects/trustedbsd/mac/contrib/sebsd/policy/file_contexts/program/fsadm.fc#2 edit Differences ... ==== //depot/projects/trustedbsd/mac/contrib/sebsd/policy/file_contexts/program/fsadm.fc#2 (text+ko) ==== @@ -1,7 +1,5 @@ # fs admin utilities -/sbin/fsck system_u:object_r:fsadm_exec_t -/sbin/fsck\.ext2 system_u:object_r:fsadm_exec_t -/sbin/fsck\.ext3 system_u:object_r:fsadm_exec_t +/sbin/fsck.* system_u:object_r:fsadm_exec_t /sbin/e2fsck system_u:object_r:fsadm_exec_t /sbin/e2label system_u:object_r:fsadm_exec_t /sbin/mkfs system_u:object_r:fsadm_exec_t @@ -21,3 +19,7 @@ /sbin/blockdev system_u:object_r:fsadm_exec_t /usr/sbin/updfstab system_u:object_r:fsadm_exec_t /usr/sbin/smart(d|ctl) system_u:object_r:fsadm_exec_t +/sbin/dumpon system_u:object_r:fsadm_exec_t +/sbin/newfs system_u:object_r:fsadm_exec_t +/sbin/disklabel system_u:object_r:fsadm_exec_t +/sbin/dump system_u:object_r:fsadm_exec_t To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Dec 30 15:30:51 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2401737B405; Mon, 30 Dec 2002 15:30:47 -0800 (PST) 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 AB54637B401 for ; Mon, 30 Dec 2002 15:30:46 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 551B843EA9 for ; Mon, 30 Dec 2002 15:30:46 -0800 (PST) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id gBUNUkfh009153 for ; Mon, 30 Dec 2002 15:30:46 -0800 (PST) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id gBUNUjVn009139 for perforce@freebsd.org; Mon, 30 Dec 2002 15:30:45 -0800 (PST) Date: Mon, 30 Dec 2002 15:30:45 -0800 (PST) Message-Id: <200212302330.gBUNUjVn009139@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar Subject: PERFORCE change 22956 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=22956 Change 22956 by marcel@marcel_nfs on 2002/12/30 15:30:22 Replace the debug printf() calls with calls to siodebug() and have the definition of siodebug() depend on whether SIO_DEBUG is defined. If SIO_DEBUG is not defined, we define siodebug() as an empty inline so that it gets optimized away. SIO_DEBUG is undefined by default, so the verbosity is now gone. Affected files ... .. //depot/projects/ia64/sys/dev/sio/sio.c#33 edit Differences ... ==== //depot/projects/ia64/sys/dev/sio/sio.c#33 (text+ko) ==== @@ -73,6 +73,7 @@ #include #include +#include #include #include @@ -264,6 +265,25 @@ 0, 0, sysctl_machdep_comdefaultrate, "I", ""); /* TUNABLE_INT("machdep.conspeed", &comdefaultrate); */ +#ifdef SIO_DEBUG +static void +siodebug(struct com_s *com, const char *fmt, ...) +{ + va_list ap; + + va_start(ap, fmt); + if (com != NULL) + device_print_prettyname(com->dev); + vprintf(fmt, ap); + va_end(ap); +} +#else +static __inline void +siodebug(struct com_s *com, const char *fmt, ...) +{ +} +#endif + /* * Flush the UART. Flush the transmitter FIFO and shift register first, then * flush the receiver FIFO. In this order flushing works correctly even when @@ -285,7 +305,7 @@ while ((sio_getreg(com, com_lsr) & LSR_TEMT) == 0 && --limit) DELAY(delay); if (limit == 0) { - printf("transmitter appears stuck... "); + siodebug(NULL, "transmitter appears stuck... "); return (EIO); } @@ -303,7 +323,7 @@ DELAY(5*delay); } if (limit == 0) { - printf("receiver appears broken... "); + siodebug(NULL, "receiver appears broken... "); return (EIO); } @@ -342,7 +362,7 @@ DELAY(delay); } if (limit == 0) { - printf("transmitter appears stuck"); + siodebug(NULL, "transmitter appears stuck"); return (EIO); } @@ -369,7 +389,7 @@ if (!com->hasfifo) { sio_setreg(com, com_mcr, com->reg_mcr); /* XXX barrier */ - printf("no FIFOs... "); + siodebug(NULL, "no FIFOs... "); return (0); } @@ -406,7 +426,7 @@ /* XXX barrier */ sio_setreg(com, com_mcr, com->reg_mcr); /* XXX barrier */ - printf("can't determine FIFO size... "); + siodebug(NULL, "can't determine FIFO size... "); goto fallback; } } @@ -433,11 +453,11 @@ else com->fifosize = 1; /* XXX */ - printf("count=%d; FIFO=%d... ", count, com->fifosize); + siodebug(NULL, "count=%d; FIFO=%d... ", count, com->fifosize); return (0); fallback: - printf("disabling FIFOs... "); + siodebug(NULL, "disabling FIFOs... "); com->hasfifo = 0; return (0); } @@ -607,8 +627,6 @@ int error; u_int flags; - device_printf(dev, "probing... "); - while (sio_inited != 2) if (atomic_cmpset_int(&sio_inited, 0, 1)) { mtx_init(&sio_lock, sio_driver_name, NULL, @@ -638,6 +656,8 @@ com->dev = dev; + siodebug(com, "probing... "); + /* * Perform rudimentary sanity checking and specific initialization * for non-console devices. We expect that the console device has @@ -647,7 +667,7 @@ if (com->consdev == NULL) { error = sioprobe1(com); if (error) { - printf("sanity check failed\n"); + siodebug(NULL, "sanity check failed\n"); bus_release_resource(dev, com->addr_type, com->addr_rid, com->addr_res); return (error); @@ -673,13 +693,13 @@ /* Initialize the FIFOs. */ error = sioinitfifo(com); if (error) { - printf("failed\n"); + siodebug(NULL, "failed\n"); bus_release_resource(dev, com->addr_type, com->addr_rid, com->addr_res); return (error); } - printf("ok\n"); + siodebug(NULL, "ok\n"); if (device_get_desc(dev) == NULL) siodescribe(com); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Dec 30 19: 3: 6 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1964C37B405; Mon, 30 Dec 2002 19:03:05 -0800 (PST) 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 A227D37B401 for ; Mon, 30 Dec 2002 19:03:04 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5BC0F43EB2 for ; Mon, 30 Dec 2002 19:03:04 -0800 (PST) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id gBV334fh085669 for ; Mon, 30 Dec 2002 19:03:04 -0800 (PST) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id gBV333rE085666 for perforce@freebsd.org; Mon, 30 Dec 2002 19:03:03 -0800 (PST) Date: Mon, 30 Dec 2002 19:03:03 -0800 (PST) Message-Id: <200212310303.gBV333rE085666@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar Subject: PERFORCE change 22959 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=22959 Change 22959 by marcel@marcel_nfs on 2002/12/30 19:02:53 Force RB_SERIAL if we have a DIG64 HCDP table, but not if we (just) have hints. Affected files ... .. //depot/projects/ia64/sys/ia64/ia64/sio_machdep.c#7 edit Differences ... ==== //depot/projects/ia64/sys/ia64/ia64/sio_machdep.c#7 (text+ko) ==== @@ -38,6 +38,7 @@ #include #include #include +#include #include #include @@ -95,6 +96,7 @@ if (ent->type != DIG64_HCDP_CONSOLE) continue; + boothowto |= RB_SERIAL; cd->bsh = ent->address.addr_high; cd->bsh = (cd->bsh << 32) + ent->address.addr_low; cd->bst = (ent->address.addr_space == 0) To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Dec 30 21:32:26 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3922937B405; Mon, 30 Dec 2002 21:32:10 -0800 (PST) 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 ACD0C37B401 for ; Mon, 30 Dec 2002 21:32:09 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E7F0843EB2 for ; Mon, 30 Dec 2002 21:32:08 -0800 (PST) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id gBV5W8fh039096 for ; Mon, 30 Dec 2002 21:32:08 -0800 (PST) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id gBV5W8g7039093 for perforce@freebsd.org; Mon, 30 Dec 2002 21:32:08 -0800 (PST) Date: Mon, 30 Dec 2002 21:32:08 -0800 (PST) Message-Id: <200212310532.gBV5W8g7039093@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar Subject: PERFORCE change 22965 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=22965 Change 22965 by marcel@marcel_nfs on 2002/12/30 21:31:28 Port alpha to sio/ng. Console handling on alpha is weird or broken. Or both... Affected files ... .. //depot/projects/ia64/sys/alpha/alpha/api_up1000.c#4 edit .. //depot/projects/ia64/sys/alpha/alpha/dec_1000a.c#4 edit .. //depot/projects/ia64/sys/alpha/alpha/dec_2100_a50.c#5 edit .. //depot/projects/ia64/sys/alpha/alpha/dec_2100_a500.c#4 edit .. //depot/projects/ia64/sys/alpha/alpha/dec_axppci_33.c#6 edit .. //depot/projects/ia64/sys/alpha/alpha/dec_eb164.c#4 edit .. //depot/projects/ia64/sys/alpha/alpha/dec_eb64plus.c#5 edit .. //depot/projects/ia64/sys/alpha/alpha/dec_kn20aa.c#4 edit .. //depot/projects/ia64/sys/alpha/alpha/dec_kn300.c#5 edit .. //depot/projects/ia64/sys/alpha/alpha/dec_st550.c#4 edit .. //depot/projects/ia64/sys/alpha/alpha/dec_st6600.c#4 edit .. //depot/projects/ia64/sys/alpha/alpha/machdep.c#22 edit .. //depot/projects/ia64/sys/alpha/alpha/sio_machdep.c#1 add .. //depot/projects/ia64/sys/conf/files.alpha#14 edit Differences ... ==== //depot/projects/ia64/sys/alpha/alpha/api_up1000.c#4 (text+ko) ==== @@ -55,8 +55,6 @@ void api_up1000_init(void); static void api_up1000_cons_init(void); -extern int siocnattach(int, int); -extern int siogdbattach(int, int); extern int sccnattach(void); void @@ -81,30 +79,13 @@ struct ctb *ctb; irongate_init(); -#ifdef DDB - siogdbattach(0x2f8, 57600); -#endif ctb = (struct ctb *)(((caddr_t)hwrpb) + hwrpb->rpb_ctb_off); switch (ctb->ctb_term_type) { case 2: /* serial console ... */ - /* XXX */ - { - /* - * Delay to allow PROM putchars to complete. - * FIFO depth * character time, - * character time = (1000000 / (defaultrate / 10)) - */ - DELAY(160000000 / comcnrate); - comconsole = 0; - if (siocnattach(0x3f8, comcnrate)) - panic("can't init serial console"); - - boothowto |= RB_SERIAL; - break; - } + break; case 3: /* display console ... */ ==== //depot/projects/ia64/sys/alpha/alpha/dec_1000a.c#4 (text+ko) ==== @@ -93,11 +93,6 @@ #include "opt_dev_sc.h" -#ifndef CONSPEED -#define CONSPEED TTYDEF_SPEED -#endif -static int comcnrate = CONSPEED; - void dec_1000a_init(int); static void dec_1000a_cons_init(void); @@ -112,8 +107,6 @@ static void dec_1000a_intr_enable(int); static void dec_1000a_intr_init(void); -extern int siocnattach(int, int); -extern int siogdbattach(int, int); extern int sccnattach(void); @@ -185,35 +178,12 @@ apecs_init(); } -#ifdef DDB - siogdbattach(0x2f8, 57600); -#endif - ctb = (struct ctb *)(((caddr_t)hwrpb) + hwrpb->rpb_ctb_off); switch (ctb->ctb_term_type) { case 2: /* serial console ... */ - /* XXX */ - { - /* - * Delay to allow PROM putchars to complete. - * FIFO depth * character time, - * character time = (1000000 / (defaultrate / 10)). - */ - DELAY(160000000 / comcnrate); - - /* - * Force a comconsole on com1 if the SRM has a serial - * console. - */ - comconsole = 0; - if (siocnattach(0x3f8, comcnrate)) - panic("can't init serial console"); - - boothowto |= RB_SERIAL; - break; - } + break; case 3: /* display console ... */ ==== //depot/projects/ia64/sys/alpha/alpha/dec_2100_a50.c#5 (text+ko) ==== @@ -51,10 +51,6 @@ #include #include "opt_dev_sc.h" -#ifndef CONSPEED -#define CONSPEED TTYDEF_SPEED -#endif -static int comcnrate = CONSPEED; void dec_2100_a50_init(void); static void dec_2100_a50_cons_init(void); @@ -63,8 +59,6 @@ void sio_intr_disestablish(int); void sio_intr_setup(void); -extern int siocnattach(int, int); -extern int siogdbattach(int, int); extern int sccnattach(void); const struct alpha_variation_table dec_2100_a50_variations[] = { @@ -110,32 +104,12 @@ apecs_init(); -#ifdef DDB - siogdbattach(0x2f8, 9600); -#endif ctb = (struct ctb *)(((caddr_t)hwrpb) + hwrpb->rpb_ctb_off); switch (ctb->ctb_term_type) { case 2: /* serial console ... */ - /* XXX */ - { - /* - * Delay to allow PROM putchars to complete. - * FIFO depth * character time, - * character time = (1000000 / (defaultrate / 10)). - */ - DELAY(160000000 / comcnrate); - /* - * Force a comconsole on com1 if the SRM has a serial console. - */ - comconsole = 0; - if (siocnattach(0x3f8, comcnrate)) - panic("can't init serial console"); - - boothowto |= RB_SERIAL; - break; - } + break; case 3: /* display console ... */ ==== //depot/projects/ia64/sys/alpha/alpha/dec_2100_a500.c#4 (text+ko) ==== @@ -44,17 +44,11 @@ #include #include "opt_dev_sc.h" -#ifndef CONSPEED -#define CONSPEED TTYDEF_SPEED -#endif -static int comcnrate = CONSPEED; void dec_2100_a500_init(int); static void dec_2100_a500_cons_init(void); static void dec_2100_a500_intr_init(void ); -extern int siocnattach(int, int); -extern int siogdbattach(int, int); extern int sccnattach(void); void @@ -97,29 +91,11 @@ struct ctb *ctb; t2_init(); -#ifdef DDB - siogdbattach(0x2f8, 9600); -#endif ctb = (struct ctb *)(((caddr_t)hwrpb) + hwrpb->rpb_ctb_off); switch (ctb->ctb_term_type) { case 2: /* serial console ... */ - /* XXX */ - /* - * Delay to allow PROM putchars to complete. - * FIFO depth * character time, - * character time = (1000000 / (defaultrate / 10)) - */ - DELAY(160000000 / comcnrate); - /* - * force a comconsole on com1 if the SRM has a serial console - */ - comconsole = 0; - if (siocnattach(0x3f8, comcnrate)) - panic("can't init serial console"); - - boothowto |= RB_SERIAL; break; case 3: ==== //depot/projects/ia64/sys/alpha/alpha/dec_axppci_33.c#6 (text+ko) ==== @@ -48,17 +48,11 @@ #include #include "opt_dev_sc.h" -#ifndef CONSPEED -#define CONSPEED TTYDEF_SPEED -#endif -static int comcnrate = CONSPEED; void dec_axppci_33_init(void); static void dec_axppci_33_cons_init(void); static int dec_axppci_33_intr_route (device_t, device_t, int); -extern int siocnattach(int, int); -extern int siogdbattach(int, int); extern int sccnattach(void); const struct alpha_variation_table dec_axppci_33_variations[] = { @@ -121,32 +115,12 @@ lca_init(); -#ifdef DDB - siogdbattach(0x2f8, 9600); -#endif ctb = (struct ctb *)(((caddr_t)hwrpb) + hwrpb->rpb_ctb_off); switch (ctb->ctb_term_type) { case 2: /* serial console ... */ - /* XXX */ - { - /* - * Delay to allow PROM putchars to complete. - * FIFO depth * character time, - * character time = (1000000 / (defaultrate / 10)) - */ - DELAY(160000000 / comcnrate); - /* - * force a comconsole on com1 if the SRM has a serial console - */ - comconsole = 0; - if (siocnattach(0x3f8, comcnrate)) - panic("can't init serial console"); - - boothowto |= RB_SERIAL; - break; - } + break; case 3: /* display console ... */ ==== //depot/projects/ia64/sys/alpha/alpha/dec_eb164.c#4 (text+ko) ==== @@ -47,11 +47,6 @@ #include "opt_dev_sc.h" -#ifndef CONSPEED -#define CONSPEED TTYDEF_SPEED -#endif -static int comcnrate = CONSPEED; - void dec_eb164_init(void); static void dec_eb164_cons_init(void); static void eb164_intr_init(void); @@ -60,8 +55,6 @@ extern void eb164_intr_enable_icsr(int irq); extern void eb164_intr_disable_icsr(int irq); -extern int siocnattach(int, int); -extern int siogdbattach(int, int); extern int sccnattach(void); void @@ -95,35 +88,12 @@ cia_init(); -#ifdef DDB - siogdbattach(0x2f8, 57600); -#endif - ctb = (struct ctb *)(((caddr_t)hwrpb) + hwrpb->rpb_ctb_off); switch (ctb->ctb_term_type) { case 2: /* serial console ... */ - /* XXX */ - { - /* - * Delay to allow PROM putchars to complete. - * FIFO depth * character time, - * character time = (1000000 / (defaultrate / 10)) - */ - DELAY(160000000 / comcnrate); - - /* - * Force a comconsole on com1 if the SRM has a serial - * console. - */ - comconsole = 0; - if (siocnattach(0x3f8, comcnrate)) - panic("can't init serial console"); - - boothowto |= RB_SERIAL; - break; - } + break; case 3: /* display console ... */ ==== //depot/projects/ia64/sys/alpha/alpha/dec_eb64plus.c#5 (text+ko) ==== @@ -67,11 +67,6 @@ #include "opt_dev_sc.h" -#ifndef CONSPEED -#define CONSPEED TTYDEF_SPEED -#endif -static int comcnrate = CONSPEED; - void dec_eb64plus_init(void); static void dec_eb64plus_cons_init(void); static void dec_eb64plus_intr_init(void); @@ -82,7 +77,6 @@ extern const char * bootdev_protocol(void); extern int bootdev_boot_dev_type(void); -extern int siocnattach(int, int); extern int sccnattach(void); const struct alpha_variation_table dec_eb64plus_variations[] = { @@ -131,26 +125,7 @@ switch (ctb->ctb_term_type) { case 2: /* serial console ... */ - /* XXX */ - { - /* - * Delay to allow PROM putchars to complete. - * FIFO depth * character time, - * character time = (1000000 / (defaultrate / 10)) - */ - DELAY(160000000 / comcnrate); - - /* - * force a comconsole on com1 if the SRM has a serial - * console. - */ - comconsole = 0; - if (siocnattach(0x3f8, comcnrate)) - panic("can't init serial console"); - - boothowto |= RB_SERIAL; - break; - } + break; case 3: #ifdef DEV_SC ==== //depot/projects/ia64/sys/alpha/alpha/dec_kn20aa.c#4 (text+ko) ==== @@ -49,11 +49,6 @@ #include "opt_dev_sc.h" -#ifndef CONSPEED -#define CONSPEED TTYDEF_SPEED -#endif -static int comcnrate = CONSPEED; - void dec_kn20aa_init(void); static void dec_kn20aa_cons_init(void); static void dec_kn20aa_intr_init(void); @@ -61,8 +56,6 @@ static void dec_kn20aa_intr_disable(int); static void dec_kn20aa_intr_enable(int); -extern int siocnattach(int, int); -extern int siogdbattach(int, int); extern int sccnattach(void); #if 0 @@ -104,29 +97,12 @@ cia_init(); -#ifdef DDB - siogdbattach(0x2f8, 9600); -#endif ctb = (struct ctb *)(((caddr_t)hwrpb) + hwrpb->rpb_ctb_off); switch (ctb->ctb_term_type) { case 2: /* serial console ... */ - /* XXX */ - { - /* - * Delay to allow PROM putchars to complete. - * FIFO depth * character time, - * character time = (1000000 / (defaultrate / 10)) - */ - DELAY(160000000 / comcnrate); - comconsole = 0; - if (siocnattach(0x3f8, comcnrate)) - panic("can't init serial console"); - - boothowto |= RB_SERIAL; - break; - } + break; case 3: /* display console ... */ ==== //depot/projects/ia64/sys/alpha/alpha/dec_kn300.c#5 (text+ko) ==== @@ -57,11 +57,6 @@ #include "opt_dev_sc.h" -#ifndef CONSPEED -#define CONSPEED TTYDEF_SPEED -#endif -static int comcnrate = CONSPEED; - void dec_kn300_init(void); void dec_kn300_cons_init(void); @@ -73,8 +68,6 @@ }; -extern int siocnattach(int, int); -extern int siogdbattach(int, int); extern int sccnattach(void); void @@ -103,26 +96,12 @@ struct ctb *ctb; mcbus_init(); -#ifdef DDB - siogdbattach(0x2f8, 57600); -#endif ctb = (struct ctb *)(((caddr_t)hwrpb) + hwrpb->rpb_ctb_off); switch (ctb->ctb_term_type) { case 2: /* serial console ... */ - /* - * Delay to allow PROM putchars to complete. - * FIFO depth * character time, - * character time = (1000000 / (defaultrate / 10)) - */ - DELAY(160000000 / comcnrate); - comconsole = 0; - if (siocnattach(0x3f8, comcnrate)) - panic("can't init serial console"); - - boothowto |= RB_SERIAL; break; case 3: ==== //depot/projects/ia64/sys/alpha/alpha/dec_st550.c#4 (text+ko) ==== @@ -54,11 +54,6 @@ #include "opt_dev_sc.h" -#ifndef CONSPEED -#define CONSPEED TTYDEF_SPEED -#endif -static int comcnrate = CONSPEED; - void st550_init(void); static void st550_cons_init(void); static void st550_intr_init(void); @@ -70,8 +65,6 @@ #define ST550_PCI_IRQ_BEGIN 8 #define ST550_PCI_MAX_IRQ 47 -extern int siocnattach(int, int); -extern int siogdbattach(int, int); extern int sccnattach(void); void @@ -102,27 +95,11 @@ cia_init(); -#ifdef DDB - siogdbattach(0x2f8, 57600); -#endif - ctb = (struct ctb *)(((caddr_t)hwrpb) + hwrpb->rpb_ctb_off); switch (ctb->ctb_term_type) { case 2: /* serial console ... */ - /* XXX */ - /* - * Delay to allow PROM putchars to complete. - * FIFO depth * character time, - * character time = (1000000 / (defaultrate / 10)) - */ - DELAY(160000000 / comcnrate); - comconsole = 0; - if (siocnattach(0x3f8, comcnrate)) - panic("can't init serial console"); - - boothowto |= RB_SERIAL; break; case 3: ==== //depot/projects/ia64/sys/alpha/alpha/dec_st6600.c#4 (text+ko) ==== @@ -46,11 +46,6 @@ #include "opt_dev_sc.h" -#ifndef CONSPEED -#define CONSPEED TTYDEF_SPEED -#endif -static int comcnrate = CONSPEED; - void st6600_init(void); static void st6600_cons_init(void); static void st6600_intr_init(void); @@ -58,8 +53,6 @@ #define ST6600_PCI_IRQ_BEGIN 8 #define ST6600_PCI_MAX_IRQ 63 -extern int siocnattach(int, int); -extern int siogdbattach(int, int); extern int sccnattach(void); void @@ -85,30 +78,13 @@ struct ctb *ctb; tsunami_init(); -#ifdef DDB - siogdbattach(0x2f8, 57600); -#endif ctb = (struct ctb *)(((caddr_t)hwrpb) + hwrpb->rpb_ctb_off); switch (ctb->ctb_term_type) { case 2: /* serial console ... */ - /* XXX */ - { - /* - * Delay to allow PROM putchars to complete. - * FIFO depth * character time, - * character time = (1000000 / (defaultrate / 10)) - */ - DELAY(160000000 / comcnrate); - comconsole = 0; - if (siocnattach(0x3f8, comcnrate)) - panic("can't init serial console"); - - boothowto |= RB_SERIAL; - break; - } + break; case 3: /* display console ... */ ==== //depot/projects/ia64/sys/alpha/alpha/machdep.c#22 (text+ko) ==== @@ -119,6 +119,7 @@ #include #include #include +#include #include #include #include @@ -593,10 +594,11 @@ * Initalize the real console, so the the bootstrap console is * no longer necessary. */ - if (platform.cons_init) { + if (platform.cons_init) platform.cons_init(); - promcndetach(); - } + promcndetach(); + cninit(); + /* NO MORE FIRMWARE ACCESS ALLOWED */ #ifdef _PMAP_MAY_USE_PROM_CONSOLE /* ==== //depot/projects/ia64/sys/conf/files.alpha#14 (text+ko) ==== @@ -80,6 +80,7 @@ alpha/alpha/promcons.c standard alpha/alpha/prom_disp.s standard alpha/alpha/sgmap.c standard +alpha/alpha/sio_machdep.c optional sio alpha/alpha/support.s standard alpha/alpha/swtch.s standard alpha/alpha/sys_machdep.c standard To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Mon Dec 30 23:53:52 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7997037B405; Mon, 30 Dec 2002 23:53:50 -0800 (PST) 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 0AA1A37B401; Mon, 30 Dec 2002 23:53:50 -0800 (PST) Received: from herring.nlsystems.com (mailgate.nlsystems.com [62.49.251.130]) by mx1.FreeBSD.org (Postfix) with ESMTP id 819AB43ED4; Mon, 30 Dec 2002 23:53:48 -0800 (PST) (envelope-from dfr@nlsystems.com) Received: from herring.nlsystems.com (herring.nlsystems.com [10.0.0.2]) by herring.nlsystems.com (8.12.6/8.12.6) with ESMTP id gBV7rkOR012502; Tue, 31 Dec 2002 07:53:46 GMT (envelope-from dfr@nlsystems.com) Content-Type: text/plain; charset="iso-8859-1" From: Doug Rabson To: Marcel Moolenaar , John Baldwin Subject: Re: PERFORCE change 22825 for review Date: Tue, 31 Dec 2002 07:53:45 +0000 User-Agent: KMail/1.4.3 Cc: Perforce Change Reviews References: <200212280132.gBS1WakY007301@repoman.freebsd.org> <20021230201350.GA696@dhcp01.pn.xcllnt.net> In-Reply-To: <20021230201350.GA696@dhcp01.pn.xcllnt.net> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Message-Id: <200212310753.46078.dfr@nlsystems.com> X-Spam-Status: No, hits=-7.7 required=6.0 tests=IN_REP_TO,QUOTED_EMAIL_TEXT,REFERENCES,SPAM_PHRASE_00_01, USER_AGENT,USER_AGENT_KMAIL version=2.41 Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG On Monday 30 December 2002 8:13 pm, Marcel Moolenaar wrote: > On Mon, Dec 30, 2002 at 02:41:58PM -0500, John Baldwin wrote: > > > DANGER, WILL ROBINSON: this change hardcodes the trigger > > > mode and polarity for 3 interrupt vectors to be edge > > > sensitive active high. Do not use this code unless you > > > know it cannot harm. The kludge committed to get a serial > > > console on the HP box in the cluster until we have figured > > > where and how we can get information about interrupts and > > > specificly about trigger mode and polarity. > > > > How about reading the default value of the vector in the IO APIC > > vector entry? Or better yet, leave the polarity and trigger mode > > of those entries alone and only ever change the vector. > > Hmmm... Not a bad idea. But a bit scary. If the default settings are > level sensitive active low, then I'm willing to give it a shot. > > Another idea I'm playing with is to look at the bus on which the > device is attached. PCI is (AFAICT) always level sensitive active > low. No need to guess if the device is attached to a PCI bus. The > hardcoding I did is typically for devices attached to the ACPI bus. > If ACPI defaults to edge sensitive active high (=3D compatible with > ISA), then this should work. > > > However, try looking at the madt. Check out the diffs in jhb_madt > > to print out the contents of the MADT. The MADT can describe when > > certain pins are not normal. > > You mean the redirection/override entries? We don't have those. I > haven't found anything in the MADT that tells us what the polarity > and trigger mode should be. > > The override entries only apply to PIC IRQs 0-15 and this box does > not have any PICs. It does not support non-APIC interrupt schemes. > Hence, no need for overrides. > > Apparently everything is perceived to be normal from ACPI's point of > view, so there's nothing there... The type of interrupt should be stated in the MADT. Look at=20 PLATFORM_INTERRUPT_SOURCE, fields Polarity and TriggerMode. --=20 Doug Rabson=09=09=09=09Mail: dfr@nlsystems.com =09=09=09=09=09Phone: +44 20 8348 6160 To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Dec 31 1:19:49 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3536B37B405; Tue, 31 Dec 2002 01:19:48 -0800 (PST) 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 C399D37B401; Tue, 31 Dec 2002 01:19:47 -0800 (PST) Received: from kayak.xcllnt.net (209-128-86-226.BAYAREA.NET [209.128.86.226]) by mx1.FreeBSD.org (Postfix) with ESMTP id AAFDA43E4A; Tue, 31 Dec 2002 01:19:46 -0800 (PST) (envelope-from marcel@xcllnt.net) Received: from dhcp01.pn.xcllnt.net (dhcp01.pn.xcllnt.net [192.168.4.201]) by kayak.xcllnt.net (8.12.6/8.12.6) with ESMTP id gBV9JfrT021926; Tue, 31 Dec 2002 01:19:41 -0800 (PST) (envelope-from marcel@kayak.pn.xcllnt.net) Received: from dhcp01.pn.xcllnt.net (localhost [127.0.0.1]) by dhcp01.pn.xcllnt.net (8.12.6/8.12.6) with ESMTP id gBV9Kpc8000728; Tue, 31 Dec 2002 01:20:51 -0800 (PST) (envelope-from marcel@dhcp01.pn.xcllnt.net) Received: (from marcel@localhost) by dhcp01.pn.xcllnt.net (8.12.6/8.12.6/Submit) id gBV9Koto000727; Tue, 31 Dec 2002 01:20:50 -0800 (PST) Date: Tue, 31 Dec 2002 01:20:50 -0800 From: Marcel Moolenaar To: Doug Rabson Cc: John Baldwin , Perforce Change Reviews Subject: Re: PERFORCE change 22825 for review Message-ID: <20021231092050.GA695@dhcp01.pn.xcllnt.net> References: <200212280132.gBS1WakY007301@repoman.freebsd.org> <20021230201350.GA696@dhcp01.pn.xcllnt.net> <200212310753.46078.dfr@nlsystems.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <200212310753.46078.dfr@nlsystems.com> User-Agent: Mutt/1.5.1i Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG On Tue, Dec 31, 2002 at 07:53:45AM +0000, Doug Rabson wrote: > > > > Apparently everything is perceived to be normal from ACPI's point of > > view, so there's nothing there... > > The type of interrupt should be stated in the MADT. Look at > PLATFORM_INTERRUPT_SOURCE, fields Polarity and TriggerMode. The platform interrupt source tells to which I/O APIC (and which pin) special platform interrupts are connected. The only interrupt sources that can be described are PMIs (or SMIs in ia32 slang), INITs or CPEIs (Corrected Platform Error Interrupts). It is and cannot be used for generic interrupts, so it will not have the information we need for an UART interrupt source (the case I had to hardcode). I want to know if the default trigger mode and polarity for ACPI defined devices is fixed or predefined... -- Marcel Moolenaar USPA: A-39004 marcel@xcllnt.net To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Dec 31 7:22:56 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1D1D737B405; Tue, 31 Dec 2002 07:22:54 -0800 (PST) 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 9EA9B37B401 for ; Tue, 31 Dec 2002 07:22:53 -0800 (PST) Received: from mail.speakeasy.net (mail11.speakeasy.net [216.254.0.211]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1F0AD43EA9 for ; Tue, 31 Dec 2002 07:22:53 -0800 (PST) (envelope-from jhb@FreeBSD.org) Received: (qmail 5155 invoked from network); 31 Dec 2002 15:22:50 -0000 Received: from unknown (HELO server.baldwin.cx) ([216.27.160.63]) (envelope-sender ) by mail11.speakeasy.net (qmail-ldap-1.03) with DES-CBC3-SHA encrypted SMTP for ; 31 Dec 2002 15:22:50 -0000 Received: from laptop.baldwin.cx (gw1.twc.weather.com [216.133.140.1]) by server.baldwin.cx (8.12.6/8.12.6) with ESMTP id gBVFMkUT053926; Tue, 31 Dec 2002 10:22:46 -0500 (EST) (envelope-from jhb@FreeBSD.org) Message-ID: X-Mailer: XFMail 1.5.2 on FreeBSD X-Priority: 3 (Normal) Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 8bit MIME-Version: 1.0 In-Reply-To: <20021230201350.GA696@dhcp01.pn.xcllnt.net> Date: Tue, 31 Dec 2002 10:22:52 -0500 (EST) From: John Baldwin To: Marcel Moolenaar Subject: Re: PERFORCE change 22825 for review Cc: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG On 30-Dec-2002 Marcel Moolenaar wrote: > On Mon, Dec 30, 2002 at 02:41:58PM -0500, John Baldwin wrote: >> >> > DANGER, WILL ROBINSON: this change hardcodes the trigger >> > mode and polarity for 3 interrupt vectors to be edge >> > sensitive active high. Do not use this code unless you >> > know it cannot harm. The kludge committed to get a serial >> > console on the HP box in the cluster until we have figured >> > where and how we can get information about interrupts and >> > specificly about trigger mode and polarity. >> >> How about reading the default value of the vector in the IO APIC >> vector entry? Or better yet, leave the polarity and trigger mode >> of those entries alone and only ever change the vector. > > Hmmm... Not a bad idea. But a bit scary. If the default settings are > level sensitive active low, then I'm willing to give it a shot. > > Another idea I'm playing with is to look at the bus on which the device > is attached. PCI is (AFAICT) always level sensitive active low. No need > to guess if the device is attached to a PCI bus. The hardcoding I did > is typically for devices attached to the ACPI bus. If ACPI defaults to > edge sensitive active high (= compatible with ISA), then this should > work. ACPI isn't a bus. However, you can probably (XXX) assume that if there is an ACPI device that isn't hung off of PCI, it's like an ISA device and thus use ISA-type properties. Ugly isn't it. :( >> However, try looking at the madt. Check out the diffs in jhb_madt >> to print out the contents of the MADT. The MADT can describe when >> certain pins are not normal. > > You mean the redirection/override entries? We don't have those. I > haven't found anything in the MADT that tells us what the polarity > and trigger mode should be. > > The override entries only apply to PIC IRQs 0-15 and this box does > not have any PICs. It does not support non-APIC interrupt schemes. > Hence, no need for overrides. > > Apparently everything is perceived to be normal from ACPI's point of > view, so there's nothing there... > > -- > Marcel Moolenaar USPA: A-39004 marcel@xcllnt.net -- John Baldwin <>< http://www.FreeBSD.org/~jhb/ "Power Users Use the Power to Serve!" - http://www.FreeBSD.org/ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Dec 31 8: 2: 4 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C1B5F37B405; Tue, 31 Dec 2002 08:02:02 -0800 (PST) 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 708B937B401 for ; Tue, 31 Dec 2002 08:02:02 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2B2EB43ED4 for ; Tue, 31 Dec 2002 08:02:02 -0800 (PST) (envelope-from cvance@tislabs.com) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id gBVG21fh062733 for ; Tue, 31 Dec 2002 08:02:01 -0800 (PST) (envelope-from cvance@tislabs.com) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id gBVG212H062718 for perforce@freebsd.org; Tue, 31 Dec 2002 08:02:01 -0800 (PST) Date: Tue, 31 Dec 2002 08:02:01 -0800 (PST) Message-Id: <200212311602.gBVG212H062718@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to cvance@tislabs.com using -f From: Chris Vance Subject: PERFORCE change 22978 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=22978 Change 22978 by cvance@cvance_laptop on 2002/12/31 08:01:04 Correctly label /usr/libexec/ld-elf.so.1 Affected files ... .. //depot/projects/trustedbsd/mac/contrib/sebsd/policy/file_contexts/types.fc#7 edit Differences ... ==== //depot/projects/trustedbsd/mac/contrib/sebsd/policy/file_contexts/types.fc#7 (text+ko) ==== @@ -180,6 +180,7 @@ /usr/etc(/.*)? system_u:object_r:etc_t /usr/home(/.*)? system_u:object_r:user_home_t /usr/libexec(/.*)? system_u:object_r:lib_t +/usr/libexec/ld-elf\.so.* system_u:object_r:ld_so_t /usr/src(/.*)? system_u:object_r:src_t /usr/tmp(/.*)? system_u:object_r:tmp_t /usr/man(/.*)? system_u:object_r:man_t To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Dec 31 8:48: 2 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8A29A37B407; Tue, 31 Dec 2002 08:48:00 -0800 (PST) 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 25CDF37B406 for ; Tue, 31 Dec 2002 08:48:00 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B345A43ED4 for ; Tue, 31 Dec 2002 08:47:59 -0800 (PST) (envelope-from green@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id gBVGlxfh078191 for ; Tue, 31 Dec 2002 08:47:59 -0800 (PST) (envelope-from green@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id gBVGlxVi078188 for perforce@freebsd.org; Tue, 31 Dec 2002 08:47:59 -0800 (PST) Date: Tue, 31 Dec 2002 08:47:59 -0800 (PST) Message-Id: <200212311647.gBVGlxVi078188@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to green@freebsd.org using -f From: Brian Feldman Subject: PERFORCE change 22981 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=22981 Change 22981 by green@green_laptop_2 on 2002/12/31 08:47:36 * consolectl_t should not exist; /dev/consolectl is really just "syscons(4)'s /dev/console" and as such should have the same label. * /dev/ttyv* should have tty_device_t labels, not the same label as /dev/tty has. Affected files ... .. //depot/projects/trustedbsd/mac/contrib/sebsd/policy/domains/program/moused.te#2 edit .. //depot/projects/trustedbsd/mac/contrib/sebsd/policy/genfs_contexts#5 edit Differences ... ==== //depot/projects/trustedbsd/mac/contrib/sebsd/policy/domains/program/moused.te#2 (text+ko) ==== @@ -8,7 +8,7 @@ # # moused_t is the domain of the console mouse server. # moused_exec_t is the type of the console mouse server program. -# consolectl_t is the type of the pseudo-mouse device that the +# sysmouse_device_t is the type of the pseudo-mouse device that the # console mouse server controls. # type moused_t, domain, privlog; @@ -16,13 +16,12 @@ every_domain(moused_t) type moused_exec_t, file_type, sysadmfile, exec_type; domain_auto_trans(initrc_t, moused_exec_t, moused_t) -type consolectl_t, file_type; type moused_var_run_t, file_type, sysadmfile, pidfile; file_type_auto_trans(moused_t, var_run_t, moused_var_run_t) -# Access consolectl and sysmouse. -allow moused_t consolectl_t:chr_file rw_file_perms; +# Access /dev/console{,ctl} and sysmouse. +allow moused_t console_device_t:chr_file rw_file_perms; allow moused_t sysmouse_device_t:chr_file rw_file_perms; # Access the mouse. ==== //depot/projects/trustedbsd/mac/contrib/sebsd/policy/genfs_contexts#5 (text+ko) ==== @@ -44,6 +44,7 @@ genfscon devfs /random system_u:object_r:random_device_t genfscon devfs /urandom system_u:object_r:random_device_t genfscon devfs /tty system_u:object_r:devtty_t +genfscon devfs /ttyv system_u:object_r:tty_device_t genfscon devfs /pty system_u:object_r:devpts_t genfscon devfs /ttyp system_u:object_r:devpts_t genfscon devfs /ttyq system_u:object_r:devpts_t @@ -69,7 +70,6 @@ genfscon devfs /psm system_u:object_r:mouse_device_t genfscon devfs /ums system_u:object_r:mouse_device_t genfscon devfs /sysmouse system_u:object_r:sysmouse_device_t -genfscon devfs /consolectl system_u:object_r:consolectl_t genfscon devfs /gpmctl system_u:object_r:gpmctl_t genfscon devfs /ptmx system_u:object_r:ptmx_t genfscon devfs /acpi system_u:object_r:apm_bios_t To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Dec 31 13: 7: 8 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 94CF037B405; Tue, 31 Dec 2002 13:07:07 -0800 (PST) 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 2D32C37B401 for ; Tue, 31 Dec 2002 13:07:07 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C715643EA9 for ; Tue, 31 Dec 2002 13:07:06 -0800 (PST) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id gBVL76fh071316 for ; Tue, 31 Dec 2002 13:07:06 -0800 (PST) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id gBVL76kq071313 for perforce@freebsd.org; Tue, 31 Dec 2002 13:07:06 -0800 (PST) Date: Tue, 31 Dec 2002 13:07:06 -0800 (PST) Message-Id: <200212312107.gBVL76kq071313@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar Subject: PERFORCE change 22991 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=22991 Change 22991 by marcel@marcel_vaio on 2002/12/31 13:06:36 Let's try porting VGA/ng to i386... Affected files ... .. //depot/projects/ia64/sys/i386/i386/vga_machdep.c#1 add Differences ... To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Dec 31 13:24:30 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4077237B405; Tue, 31 Dec 2002 13:24:29 -0800 (PST) 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 C9D2F37B401 for ; Tue, 31 Dec 2002 13:24:28 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 68A0943E4A for ; Tue, 31 Dec 2002 13:24:28 -0800 (PST) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id gBVLOSfh078301 for ; Tue, 31 Dec 2002 13:24:28 -0800 (PST) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id gBVLORi2078298 for perforce@freebsd.org; Tue, 31 Dec 2002 13:24:27 -0800 (PST) Date: Tue, 31 Dec 2002 13:24:27 -0800 (PST) Message-Id: <200212312124.gBVLORi2078298@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar Subject: PERFORCE change 22992 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=22992 Change 22992 by marcel@marcel_nfs on 2002/12/31 13:23:58 s### Affected files ... .. //depot/projects/ia64/sys/ia64/ia64/sio_machdep.c#8 edit Differences ... ==== //depot/projects/ia64/sys/ia64/ia64/sio_machdep.c#8 (text+ko) ==== @@ -32,13 +32,12 @@ #include #include #include - +#include #include #include #include #include #include -#include #include #include To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Dec 31 13:26:34 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 66BC637B405; Tue, 31 Dec 2002 13:26:32 -0800 (PST) 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 004B837B401 for ; Tue, 31 Dec 2002 13:26:32 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9B0BD43EC5 for ; Tue, 31 Dec 2002 13:26:31 -0800 (PST) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id gBVLQVfh078412 for ; Tue, 31 Dec 2002 13:26:31 -0800 (PST) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id gBVLQVVE078409 for perforce@freebsd.org; Tue, 31 Dec 2002 13:26:31 -0800 (PST) Date: Tue, 31 Dec 2002 13:26:31 -0800 (PST) Message-Id: <200212312126.gBVLQVVE078409@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar Subject: PERFORCE change 22993 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=22993 Change 22993 by marcel@marcel_nfs on 2002/12/31 13:26:29 Reorder includes so that it compiles on i386 as well. Affected files ... .. //depot/projects/ia64/sys/dev/vga/vga.c#6 edit .. //depot/projects/ia64/sys/dev/vga/vga_isa.c#2 edit .. //depot/projects/ia64/sys/dev/vga/vga_pci.c#5 edit Differences ... ==== //depot/projects/ia64/sys/dev/vga/vga.c#6 (text+ko) ==== @@ -26,13 +26,10 @@ * $FreeBSD$ */ -#include -#include +#include +#include #include #include - -#include -#include #include #include ==== //depot/projects/ia64/sys/dev/vga/vga_isa.c#2 (text+ko) ==== @@ -26,13 +26,10 @@ * $FreeBSD$ */ -#include -#include +#include +#include #include #include - -#include -#include #include #include #include ==== //depot/projects/ia64/sys/dev/vga/vga_pci.c#5 (text+ko) ==== @@ -26,15 +26,11 @@ * $FreeBSD$ */ -#include -#include +#include +#include #include #include - -#include -#include #include - #include #include #include To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Dec 31 13:51:13 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 04A6637B405; Tue, 31 Dec 2002 13:51:04 -0800 (PST) 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 8FACA37B401 for ; Tue, 31 Dec 2002 13:51:03 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1149B43EC5 for ; Tue, 31 Dec 2002 13:51:03 -0800 (PST) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id gBVLp2fh087938 for ; Tue, 31 Dec 2002 13:51:02 -0800 (PST) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id gBVLp21p087923 for perforce@freebsd.org; Tue, 31 Dec 2002 13:51:02 -0800 (PST) Date: Tue, 31 Dec 2002 13:51:02 -0800 (PST) Message-Id: <200212312151.gBVLp21p087923@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar Subject: PERFORCE change 22995 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=22995 Change 22995 by marcel@marcel_nfs on 2002/12/31 13:50:48 o Mostly revert the ia64 hacks to the FB structures. We really have to assume that the registers are I/O ports if we want to use fb(4) and syscons(4). Allowing memory mapped VGA registers in that context just makes it too hard. o Use inb and outb to access the registers in vga_vid.c so that we don't have to worry about tags. Limit this to vga_vid.c only. This file is specifically tied to fb(4) and syscons(4). o Hook-up VGA/ng to the i386 build. Affected files ... .. //depot/projects/ia64/sys/conf/files.i386#25 edit .. //depot/projects/ia64/sys/dev/fb/fb.c#4 edit .. //depot/projects/ia64/sys/dev/vga/vga_vid.c#5 edit .. //depot/projects/ia64/sys/sys/fbio.h#4 edit Differences ... ==== //depot/projects/ia64/sys/conf/files.i386#25 (text+ko) ==== @@ -116,9 +116,8 @@ dev/ed/if_ed_isa.c optional ed isa dev/eisa/eisaconf.c optional eisa dev/fb/fb.c optional fb -dev/fb/fb.c optional vga +dev/fb/fb.c optional vga sc dev/fb/splash.c optional splash -dev/fb/vga.c optional vga dev/fe/if_fe_isa.c optional fe isa dev/kbd/atkbd.c optional atkbd dev/kbd/atkbdc.c optional atkbdc @@ -148,6 +147,10 @@ dev/syscons/scvtb.c optional sc dev/syscons/syscons.c optional sc dev/syscons/sysmouse.c optional sc +dev/vga/vga.c optional vga +dev/vga/vga_isa.c optional vga isa +dev/vga/vga_pci.c optional vga pci +dev/vga/vga_vid.c optional vga sc geom/geom_bsd.c standard geom/geom_mbr.c standard gnu/i386/fpemul/div_small.s optional gpl_math_emulate \ @@ -232,6 +235,7 @@ i386/i386/swtch.s standard i386/i386/sys_machdep.c standard i386/i386/trap.c standard +i386/i386/vga_machdep.c optional vga i386/i386/vm86.c standard i386/i386/vm_machdep.c standard i386/ibcs2/ibcs2_errno.c optional ibcs2 @@ -405,7 +409,6 @@ isa/ppc.c optional ppc isa/psm.c optional psm isa/syscons_isa.c optional sc -isa/vga_isa.c optional vga kern/imgact_aout.c optional compat_aout kern/imgact_gzip.c optional gzip kern/subr_diskmbr.c standard ==== //depot/projects/ia64/sys/dev/fb/fb.c#4 (text+ko) ==== @@ -637,7 +637,6 @@ printf("%s%d: %s%d, %s, type:%s (%d), flags:0x%x\n", FB_DRIVER_NAME, adp->va_index, driver, adp->va_unit, adp->va_name, adapter_name(adp->va_type), adp->va_type, adp->va_flags); -#if !defined(__ia64__) printf("%s%d: port:0x%lx-0x%lx, crtc:0x%lx, mem:0x%lx 0x%x\n", FB_DRIVER_NAME, adp->va_index, (u_long)adp->va_io_base, (u_long)adp->va_io_base + adp->va_io_size - 1, @@ -651,7 +650,6 @@ (void *)adp->va_window, (int)adp->va_window_size/1024, (int)adp->va_window_gran/1024, (void *)adp->va_buffer, (int)adp->va_buffer_size/1024); -#endif } void @@ -720,55 +718,42 @@ *(int *)arg = adp->va_type; break; - case FBIO_ADPINFO: /* get video adapter info */ - ((video_adapter_info_t *)arg)->va_index = adp->va_index; - ((video_adapter_info_t *)arg)->va_type = adp->va_type; - bcopy(adp->va_name, ((video_adapter_info_t *)arg)->va_name, - imin(strlen(adp->va_name) + 1, - sizeof(((video_adapter_info_t *)arg)->va_name))); - ((video_adapter_info_t *)arg)->va_unit = adp->va_unit; - ((video_adapter_info_t *)arg)->va_flags = adp->va_flags; -#if !defined(__ia64__) - ((video_adapter_info_t *)arg)->va_io_base = adp->va_io_base; - ((video_adapter_info_t *)arg)->va_io_size = adp->va_io_size; - ((video_adapter_info_t *)arg)->va_crtc_addr = adp->va_crtc_addr; - ((video_adapter_info_t *)arg)->va_mem_base = adp->va_mem_base; - ((video_adapter_info_t *)arg)->va_mem_size = adp->va_mem_size; - ((video_adapter_info_t *)arg)->va_window + case FBIO_ADPINFO: { /* get video adapter info */ + video_adapter_info_t *vi = (void*)arg; + + vi->va_index = adp->va_index; + vi->va_type = adp->va_type; + bcopy(adp->va_name, vi->va_name, imin(strlen(adp->va_name) + 1, + sizeof(vi->va_name))); + vi->va_unit = adp->va_unit; + vi->va_flags = adp->va_flags; + vi->va_io_base = adp->va_io_base; + vi->va_io_size = adp->va_io_size; + vi->va_crtc_addr = adp->va_crtc_addr; + vi->va_mem_base = adp->va_mem_base; + vi->va_mem_size = adp->va_mem_size; #ifdef __i386__ - = vtophys(adp->va_window); + vi->va_window = vtophys(adp->va_window); #else - = adp->va_window; + vi->va_window = adp->va_window; #endif - ((video_adapter_info_t *)arg)->va_window_size - = adp->va_window_size; - ((video_adapter_info_t *)arg)->va_window_gran - = adp->va_window_gran; - ((video_adapter_info_t *)arg)->va_window_orig - = adp->va_window_orig; - ((video_adapter_info_t *)arg)->va_unused0 + vi->va_window_size = adp->va_window_size; + vi->va_window_gran = adp->va_window_gran; + vi->va_window_orig = adp->va_window_orig; #ifdef __i386__ - = (adp->va_buffer) ? vtophys(adp->va_buffer) : 0; + vi->va_unused0 = (adp->va_buffer) ? vtophys(adp->va_buffer) : 0; #else - = adp->va_buffer; + vi->va_unused0 = adp->va_buffer; #endif - ((video_adapter_info_t *)arg)->va_buffer_size - = adp->va_buffer_size; - ((video_adapter_info_t *)arg)->va_mode = adp->va_mode; - ((video_adapter_info_t *)arg)->va_initial_mode - = adp->va_initial_mode; - ((video_adapter_info_t *)arg)->va_initial_bios_mode - = adp->va_initial_bios_mode; -#endif - ((video_adapter_info_t *)arg)->va_line_width - = adp->va_line_width; - ((video_adapter_info_t *)arg)->va_disp_start.x - = adp->va_disp_start.x; - ((video_adapter_info_t *)arg)->va_disp_start.y - = adp->va_disp_start.y; + vi->va_buffer_size = adp->va_buffer_size; + vi->va_mode = adp->va_mode; + vi->va_initial_mode = adp->va_initial_mode; + vi->va_initial_bios_mode = adp->va_initial_bios_mode; + vi->va_line_width = adp->va_line_width; + vi->va_disp_start.x = adp->va_disp_start.x; + vi->va_disp_start.y = adp->va_disp_start.y; break; - -#if !defined(__ia64__) + } case FBIO_MODEINFO: /* get mode information */ error = (*vidsw[adp->va_index]->get_info)(adp, ((video_info_t *)arg)->vi_mode, @@ -795,7 +780,6 @@ case FBIO_GETWINORG: /* get frame buffer window origin */ *(u_int *)arg = adp->va_window_orig; break; -#endif case FBIO_GETDISPSTART: /* get display start address */ ((video_display_start_t *)arg)->x = adp->va_disp_start.x; ==== //depot/projects/ia64/sys/dev/vga/vga_vid.c#5 (text+ko) ==== @@ -26,13 +26,10 @@ * $FreeBSD$ */ -#include -#include +#include +#include #include #include - -#include -#include #include #include #include @@ -165,9 +162,8 @@ vga_adapter.va_flags |= (sc->vga_mono) ? 0 : V_ADP_COLOR; vga_adapter.va_name = vga_device_name; vga_adapter.va_type = KD_VGA; - vga_adapter.va_crtc_tag = sc->vga_crtc.bst; - vga_adapter.va_crtc_handle = sc->vga_crtc.bsh; - vga_adapter.va_window = sc->vga_screen.bsh; /* XXX */ + vga_adapter.va_crtc_addr = sc->vga_crtc.bsh; + vga_adapter.va_window = sc->vga_screen.bsh; /* XXX */ vga_adapter.va_info.vi_mode = 3; vga_adapter.va_info.vi_flags = V_INFO_COLOR; @@ -189,6 +185,10 @@ vid_register(&vga_adapter); vga_adapter.va_flags |= V_ADP_REGISTERED; + + /* Disable the hardware cursor. */ + vga_vid_set_hw_cursor_shape(&vga_adapter, 0, 0, 0, 0); + return (1); } @@ -309,23 +309,14 @@ static int vga_vid_read_hw_cursor(video_adapter_t *adp, int *col, int *row) { - bus_space_handle_t handle; - bus_space_tag_t tag; int s; uint16_t ofs; - handle = adp->va_crtc_handle; - tag = adp->va_crtc_tag; - s = spltty(); - bus_space_write_1(tag, handle, 0, 14); - bus_space_barrier(tag, handle, 0, 2, -1); - ofs = bus_space_read_1(tag, handle, 1) << 8; - bus_space_barrier(tag, handle, 0, 2, -1); - bus_space_write_1(tag, handle, 0, 15); - bus_space_barrier(tag, handle, 0, 2, -1); - ofs |= bus_space_read_1(tag, handle, 1) & 0xff; - bus_space_barrier(tag, handle, 0, 2, -1); + outb(adp->va_crtc_addr + 0, 14); + ofs = inb(adp->va_crtc_addr + 1) << 8; + outb(adp->va_crtc_addr + 0, 15); + ofs |= inb(adp->va_crtc_addr + 1) & 0xff; *row = ofs / adp->va_info.vi_width; *col = ofs % adp->va_info.vi_width; splx(s); @@ -368,24 +359,15 @@ vga_vid_set_hw_cursor_shape(video_adapter_t *adp, int base, int height, int celsize, int blink) { - bus_space_handle_t handle; - bus_space_tag_t tag; int s; - handle = adp->va_crtc_handle; - tag = adp->va_crtc_tag; - s = spltty(); - bus_space_write_1(tag, handle, 0, 10); - bus_space_barrier(tag, handle, 0, 2, -1); - bus_space_write_1(tag, handle, 1, (height > 0) + outb(adp->va_crtc_addr + 0, 10); + outb(adp->va_crtc_addr + 1, (height > 0) ? (celsize - base - height) & 0x1f : 0x20); - bus_space_barrier(tag, handle, 0, 2, -1); - bus_space_write_1(tag, handle, 0, 11); - bus_space_barrier(tag, handle, 0, 2, -1); - bus_space_write_1(tag, handle, 1, (height > 0) + outb(adp->va_crtc_addr + 0, 11); + outb(adp->va_crtc_addr + 1, (height > 0) ? (celsize - base - 1) & 0x1f : 0); - bus_space_barrier(tag, handle, 0, 2, -1); splx(s); return (0); } @@ -393,24 +375,15 @@ static int vga_vid_set_hw_cursor(video_adapter_t *adp, int col, int row) { - bus_space_handle_t handle; - bus_space_tag_t tag; int s; uint16_t ofs; - handle = adp->va_crtc_handle; - tag = adp->va_crtc_tag; - s = spltty(); ofs = (col != -1 || row != -1) ? row*adp->va_info.vi_width + col : -1; - bus_space_write_1(tag, handle, 0, 14); - bus_space_barrier(tag, handle, 0, 2, -1); - bus_space_write_1(tag, handle, 1, ofs >> 8); - bus_space_barrier(tag, handle, 0, 2, -1); - bus_space_write_1(tag, handle, 0, 15); - bus_space_barrier(tag, handle, 0, 2, -1); - bus_space_write_1(tag, handle, 1, ofs & 0xff); - bus_space_barrier(tag, handle, 0, 2, -1); + outb(adp->va_crtc_addr + 0, 14); + outb(adp->va_crtc_addr + 1, ofs >> 8); + outb(adp->va_crtc_addr + 0, 15); + outb(adp->va_crtc_addr + 1, ofs & 0xff); splx(s); return (0); } ==== //depot/projects/ia64/sys/sys/fbio.h#4 (text+ko) ==== @@ -42,7 +42,6 @@ #ifndef _SYS_FBIO_H_ #define _SYS_FBIO_H_ -#include #ifndef _KERNEL #include #endif @@ -332,7 +331,6 @@ #define V_ADP_INITIALIZED (1 << 17) #define V_ADP_REGISTERED (1 << 18) #define V_ADP_ATTACHED (1 << 19) -#if !defined(__ia64__) vm_offset_t va_io_base; int va_io_size; vm_offset_t va_crtc_addr; @@ -347,13 +345,6 @@ int va_initial_mode; int va_initial_bios_mode; int va_mode; -#else - bus_space_tag_t va_crtc_tag; - bus_space_handle_t va_crtc_handle; - vm_offset_t va_window; /* virtual address */ - size_t va_window_size; - int va_initial_mode; -#endif struct video_info va_info; int va_line_width; struct { @@ -378,7 +369,6 @@ char va_name[16]; int va_unit; int va_flags; -#if !defined(__ia64__) vm_offset_t va_io_base; int va_io_size; vm_offset_t va_crtc_addr; @@ -392,7 +382,6 @@ int va_initial_mode; int va_initial_bios_mode; int va_mode; -#endif int va_line_width; struct { int x; To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Dec 31 15:27: 1 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AFAB437B405; Tue, 31 Dec 2002 15:26:59 -0800 (PST) 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 6040E37B401 for ; Tue, 31 Dec 2002 15:26:59 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 058F943E4A for ; Tue, 31 Dec 2002 15:26:59 -0800 (PST) (envelope-from green@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id gBVNQwfh021142 for ; Tue, 31 Dec 2002 15:26:58 -0800 (PST) (envelope-from green@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id gBVNQw1U021139 for perforce@freebsd.org; Tue, 31 Dec 2002 15:26:58 -0800 (PST) Date: Tue, 31 Dec 2002 15:26:58 -0800 (PST) Message-Id: <200212312326.gBVNQw1U021139@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to green@freebsd.org using -f From: Brian Feldman Subject: PERFORCE change 22996 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=22996 Change 22996 by green@green_laptop_2 on 2002/12/31 15:26:38 * Fix an (unnecessary) extra character in the string in get_ordered_context_list(). Affected files ... .. //depot/projects/trustedbsd/mac/lib/libsebsd/get_ordered_context_list.c#2 edit Differences ... ==== //depot/projects/trustedbsd/mac/lib/libsebsd/get_ordered_context_list.c#2 (text+ko) ==== To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Dec 31 15:28: 2 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AB95937B405; Tue, 31 Dec 2002 15:28:01 -0800 (PST) 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 5A30A37B401 for ; Tue, 31 Dec 2002 15:28:01 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id F346F43E4A for ; Tue, 31 Dec 2002 15:28:00 -0800 (PST) (envelope-from green@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id gBVNS0fh021168 for ; Tue, 31 Dec 2002 15:28:00 -0800 (PST) (envelope-from green@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id gBVNS02b021161 for perforce@freebsd.org; Tue, 31 Dec 2002 15:28:00 -0800 (PST) Date: Tue, 31 Dec 2002 15:28:00 -0800 (PST) Message-Id: <200212312328.gBVNS02b021161@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to green@freebsd.org using -f From: Brian Feldman Subject: PERFORCE change 22997 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=22997 Change 22997 by green@green_laptop_2 on 2002/12/31 15:27:49 * Strike the previous change; the extra character is in security_get_user_contexts(). Affected files ... .. //depot/projects/trustedbsd/mac/lib/libsebsd/security_change_context.c#1 add Differences ... To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Dec 31 15:30: 7 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EA33F37B405; Tue, 31 Dec 2002 15:30:04 -0800 (PST) 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 94CE937B401 for ; Tue, 31 Dec 2002 15:30:04 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 47D1A43E4A for ; Tue, 31 Dec 2002 15:30:04 -0800 (PST) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id gBVNU4fh021305 for ; Tue, 31 Dec 2002 15:30:04 -0800 (PST) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id gBVNU3sh021291 for perforce@freebsd.org; Tue, 31 Dec 2002 15:30:03 -0800 (PST) Date: Tue, 31 Dec 2002 15:30:03 -0800 (PST) Message-Id: <200212312330.gBVNU3sh021291@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar Subject: PERFORCE change 22998 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=22998 Change 22998 by marcel@marcel_nfs on 2002/12/31 15:29:57 Move the IRQ kludge from sapic.c to interrupt.c so we have the kludge in the same function we determine the trigger mode and polarity. Affected files ... .. //depot/projects/ia64/sys/ia64/ia64/interrupt.c#20 edit .. //depot/projects/ia64/sys/ia64/ia64/sapic.c#17 edit Differences ... ==== //depot/projects/ia64/sys/ia64/ia64/interrupt.c#20 (text+ko) ==== @@ -230,9 +230,18 @@ struct sapic *sa = ia64_sapics[i]; if (irq < sa->sa_base || irq > sa->sa_limit) continue; + /* + * KLUDGE: Not all interrupts higher or equal to 16 are + * active low and level sensitive. We don't know yet how + * to check for this, so we hardcode the 2 cases we have + * wrong explicitly. This kludge is specific to the HP + * rx2600... + */ sapic_enable(sa, irq - sa->sa_base, vector, - (irq < 16) ? SAPIC_TRIGGER_EDGE : SAPIC_TRIGGER_LEVEL, - (irq < 16) ? SAPIC_POLARITY_HIGH : SAPIC_POLARITY_LOW); + ((irq < 16 || vector == 66 || vector == 67) + ? SAPIC_TRIGGER_EDGE : SAPIC_TRIGGER_LEVEL), + ((irq < 16 || vector == 66 || vector == 67) + ? SAPIC_POLARITY_HIGH : SAPIC_POLARITY_LOW)); } } ==== //depot/projects/ia64/sys/ia64/ia64/sapic.c#17 (text+ko) ==== @@ -144,13 +144,8 @@ bzero(&rte, sizeof(rte)); rte.rte_destination_id = (lid >> 24) & 255; rte.rte_destination_eid = (lid >> 16) & 255; - if (vector == 66 || vector == 67 || vector == 68) { - rte.rte_trigger_mode = SAPIC_TRIGGER_EDGE; - rte.rte_polarity = SAPIC_POLARITY_HIGH; - } else { - rte.rte_trigger_mode = trigger_mode; - rte.rte_polarity = polarity; - } + rte.rte_trigger_mode = trigger_mode; + rte.rte_polarity = polarity; rte.rte_delivery_mode = SAPIC_DELMODE_LOWPRI; rte.rte_vector = vector; sapic_write_rte(sa, input, &rte); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message From owner-p4-projects Tue Dec 31 15:31:11 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 49DA137B405; Tue, 31 Dec 2002 15:31:07 -0800 (PST) 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 D6F6A37B401 for ; Tue, 31 Dec 2002 15:31:06 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7F2C143EB2 for ; Tue, 31 Dec 2002 15:31:06 -0800 (PST) (envelope-from green@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id gBVNV6fh023511 for ; Tue, 31 Dec 2002 15:31:06 -0800 (PST) (envelope-from green@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id gBVNV5jK023492 for perforce@freebsd.org; Tue, 31 Dec 2002 15:31:05 -0800 (PST) Date: Tue, 31 Dec 2002 15:31:05 -0800 (PST) Message-Id: <200212312331.gBVNV5jK023492@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to green@freebsd.org using -f From: Brian Feldman Subject: PERFORCE change 22999 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=22999 Change 22999 by green@green_laptop_2 on 2002/12/31 15:30:36 I'm making a fine mess of perforce logs trying to separate changes, so I'll stop. This completes implementation of tty labelling for SEBSD. This also contains residue which is what the previous change should have been. Affected files ... .. //depot/projects/trustedbsd/mac/lib/libsebsd/Makefile#5 edit .. //depot/projects/trustedbsd/mac/lib/libsebsd/sebsd.h#6 edit .. //depot/projects/trustedbsd/mac/lib/libsebsd/security_get_user_contexts.c#4 edit .. //depot/projects/trustedbsd/mac/sys/security/sebsd/sebsd_sysctl.c#5 edit Differences ... ==== //depot/projects/trustedbsd/mac/lib/libsebsd/Makefile#5 (text+ko) ==== @@ -11,7 +11,7 @@ NOMAN= SRCS= system.c security_get_user_contexts.c get_ordered_context_list.c \ - getseccontext.c query_user_context.c + getseccontext.c query_user_context.c security_change_context.c INCS= sebsd_context.h sebsd_ss.h sebsd_proc.h sebsd_fs.h sebsd.h \ sebsd_syscalls.h flask_types.h ==== //depot/projects/trustedbsd/mac/lib/libsebsd/sebsd.h#6 (text+ko) ==== @@ -64,5 +64,7 @@ int security_get_user_contexts(const char *fromcontext, const char *username, char ***retcontexts, size_t *ncontexts); +int security_change_context(const char *domain, const char *ocontext, + security_class_t oclass, char **newcontext); #endif /* _SEBSD_H */ ==== //depot/projects/trustedbsd/mac/lib/libsebsd/security_get_user_contexts.c#4 (text+ko) ==== @@ -57,8 +57,8 @@ size_t contexts_len, n; int error; - arguments_len = asprintf(&arguments, "%s%c%s%c%c", fromcontext, 0, - username, 0, 0); + arguments_len = asprintf(&arguments, "%s%c%s%c", fromcontext, 0, + username, 0); if (arguments_len == -1) return (-1); bigger: ==== //depot/projects/trustedbsd/mac/sys/security/sebsd/sebsd_sysctl.c#5 (text+ko) ==== @@ -179,6 +179,57 @@ return (error); } +/* + * Sysctl handler for security.mac.sebsd.change_sid + * Report the SID to relabel to given input "scontext\0tcontext\0",tclass + */ +static int +sysctl_change_sid(SYSCTL_HANDLER_ARGS) +{ + u_int32_t newcontext_len; + security_id_t sid, tsid, newsid; + security_context_t newcontext; + security_class_t tclass; + char *scontext, *tcontext; + int error; + + if (req->newlen < 4 + sizeof(tclass)) + return (EINVAL); + if (req->newlen > 512) /* arbitrary */ + return (ENAMETOOLONG); + scontext = sebsd_malloc(req->newlen, M_SEBSD_SS, M_WAITOK); + error = SYSCTL_IN(req, scontext, req->newlen); + if (error) + goto out; + if (scontext[req->newlen - (1 + sizeof(tclass))] != '\0') { + error = EINVAL; + goto out; + } + tcontext = &scontext[strlen(scontext) + 1]; + if (tcontext >= &scontext[req->newlen - (1 + sizeof(tclass))]) { + error = EINVAL; + goto out; + } + bcopy(&scontext[strlen(scontext) + 1], &tclass, sizeof(tclass)); + error = security_context_to_sid(scontext, strlen(scontext) + 1, &sid); + if (error) + goto out; + error = security_context_to_sid(tcontext, strlen(tcontext) + 1, &tsid); + if (error) + goto out; + error = security_change_sid(sid, tsid, tclass, &newsid); + if (error) + goto out; + error = security_sid_to_context(newsid, &newcontext, &newcontext_len); + if (error) + goto out; + error = SYSCTL_OUT(req, newcontext, newcontext_len); + security_free_context(newcontext); +out: + sebsd_free(scontext, M_SEBSD_SS); + return (error); +} + SYSCTL_DECL(_security_mac); SYSCTL_NODE(_security_mac, OID_AUTO, sebsd, CTLFLAG_RW, 0, "Security Enhanced BSD policy controls"); @@ -192,6 +243,9 @@ SYSCTL_PROC(_security_mac_sebsd, OID_AUTO, user_sids, CTLTYPE_STRING | CTLFLAG_RW | CTLFLAG_ANYBODY, NULL, 0, sysctl_user_sids, "A", "SEBSD transitionable user SIDs"); +SYSCTL_PROC(_security_mac_sebsd, OID_AUTO, change_sid, CTLTYPE_STRING | + CTLFLAG_RW | CTLFLAG_ANYBODY, NULL, 0, sysctl_change_sid, "A", + "SEBSD (tty) SID relabel to perform along with transition"); #if 0 SYSCTL_PROC(_security_mac_sebsd, OID_AUTO, enforcing, CTLTYPE_INT | CTLFLAG_RW, To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message