From owner-p4-projects@FreeBSD.ORG Sun Aug 13 01:03:25 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A2B2016A4DF; Sun, 13 Aug 2006 01:03:25 +0000 (UTC) X-Original-To: perforce@FreeBSD.org 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 495C316A4DA for ; Sun, 13 Aug 2006 01:03:25 +0000 (UTC) (envelope-from cdjones@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id DE14943D45 for ; Sun, 13 Aug 2006 01:03:24 +0000 (GMT) (envelope-from cdjones@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7D13O9J014688 for ; Sun, 13 Aug 2006 01:03:24 GMT (envelope-from cdjones@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7D13O2X014685 for perforce@freebsd.org; Sun, 13 Aug 2006 01:03:24 GMT (envelope-from cdjones@FreeBSD.org) Date: Sun, 13 Aug 2006 01:03:24 GMT Message-Id: <200608130103.k7D13O2X014685@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to cdjones@FreeBSD.org using -f From: Chris Jones To: Perforce Change Reviews Cc: Subject: PERFORCE change 103741 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 13 Aug 2006 01:03:26 -0000 http://perforce.freebsd.org/chv.cgi?CH=103741 Change 103741 by cdjones@cdjones-impulse on 2006/08/13 01:02:50 Integrate to keep things building properly. Whee. Affected files ... .. //depot/projects/soc2006/cdjones_jail/src/sys/conf/NOTES#3 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/conf/files#3 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/conf/options#3 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/kern_mutex.c#6 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/kern_sx.c#5 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/kern_syscalls.c#5 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/kern_sysctl.c#6 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/sched_hier.c#7 edit .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/subr_autoconf.c#5 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/subr_lock.c#3 branch .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/subr_turnstile.c#5 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/subr_witness.c#5 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/kernel.h#5 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/lock.h#5 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/mutex.h#5 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/param.h#6 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/serial.h#5 integrate .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/sysent.h#5 integrate Differences ... ==== //depot/projects/soc2006/cdjones_jail/src/sys/conf/NOTES#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/NOTES,v 1.1325.2.14 2006/04/05 15:44:08 hrs Exp $ +# $FreeBSD: src/sys/conf/NOTES,v 1.1325.2.16 2006/08/10 10:40:45 glebius Exp $ # # NOTES -- Lines that can be cut/pasted into kernel and hints configs. # @@ -557,6 +557,7 @@ options NETGRAPH_SOCKET options NETGRAPH_SPLIT options NETGRAPH_SPPP +options NETGRAPH_TAG options NETGRAPH_TCPMSS options NETGRAPH_TEE options NETGRAPH_TTY @@ -1771,6 +1772,9 @@ # SMC91C90/92/94/95 chips. # ste: Sundance Technologies ST201 PCI fast ethernet controller, includes # the D-Link DFE-550TX. +# stge: Support for gigabit ethernet adapters based on the Sundance/Tamarack +# TC9021 family of controllers, including the Sundance ST2021/ST2023, +# the Sundance/Tamarack TC9021, the D-Link DL-4000 and ASUS NX1101. # ti: Support for PCI gigabit ethernet NICs based on the Alteon Networks # Tigon 1 and Tigon 2 chipsets. This includes the Alteon AceNIC, the # 3Com 3c985, the Netgear GA620 and various others. Note that you will ==== //depot/projects/soc2006/cdjones_jail/src/sys/conf/files#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.1031.2.33 2006/07/24 23:20:58 thompsa Exp $ +# $FreeBSD: src/sys/conf/files,v 1.1031.2.37 2006/08/10 10:40:45 glebius Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -681,8 +681,12 @@ dev/mii/e1000phy.c optional e1000phy dev/mii/exphy.c optional miibus dev/mii/exphy.c optional exphy +dev/mii/gentbi.c optional miibus +dev/mii/gentbi.c optional mii dev/mii/inphy.c optional miibus dev/mii/inphy.c optional inphy +dev/mii/ip1000phy.c optional miibus +dev/mii/ip1000phy.c optional ip1000phy dev/mii/lxtphy.c optional miibus dev/mii/lxtphy.c optional lxtphy dev/mii/mii.c optional miibus @@ -891,6 +895,7 @@ dev/stg/tmc18c30_pccard.c optional stg pccard dev/stg/tmc18c30_pci.c optional stg pci dev/stg/tmc18c30_subr.c optional stg +dev/stge/if_stge.c optional stge dev/streams/streams.c optional streams dev/sx/sx.c optional sx #dev/sx/sx_isa.c optional sx isa @@ -1300,6 +1305,7 @@ kern/subr_hints.c standard kern/subr_kdb.c standard kern/subr_kobj.c standard +kern/subr_lock.c standard kern/subr_log.c standard kern/subr_mbpool.c optional libmbpool kern/subr_mchain.c optional libmchain @@ -1623,6 +1629,7 @@ netgraph/ng_socket.c optional netgraph_socket netgraph/ng_split.c optional netgraph_split netgraph/ng_sppp.c optional netgraph_sppp +netgraph/ng_tag.c optional netgraph_tag netgraph/ng_tcpmss.c optional netgraph_tcpmss netgraph/ng_tee.c optional netgraph_tee netgraph/ng_tty.c optional netgraph_tty ==== //depot/projects/soc2006/cdjones_jail/src/sys/conf/options#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/options,v 1.510.2.13 2006/07/24 23:20:58 thompsa Exp $ +# $FreeBSD: src/sys/conf/options,v 1.510.2.14 2006/08/10 10:40:45 glebius Exp $ # # On the handling of kernel options # @@ -440,6 +440,7 @@ NETGRAPH_SOCKET opt_netgraph.h NETGRAPH_SPLIT opt_netgraph.h NETGRAPH_SPPP opt_netgraph.h +NETGRAPH_TAG opt_netgraph.h NETGRAPH_TCPMSS opt_netgraph.h NETGRAPH_TEE opt_netgraph.h NETGRAPH_TTY opt_netgraph.h ==== //depot/projects/soc2006/cdjones_jail/src/sys/kern/kern_mutex.c#6 (text+ko) ==== @@ -34,7 +34,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/kern_mutex.c,v 1.154.2.5 2005/12/20 19:28:23 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_mutex.c,v 1.154.2.9 2006/08/11 18:54:10 jhb Exp $"); #include "opt_adaptive_mutexes.h" #include "opt_ddb.h" @@ -278,7 +278,9 @@ { MPASS(curthread != NULL); - KASSERT(m->mtx_object.lo_class == &lock_class_mtx_sleep, + KASSERT(m->mtx_lock != MTX_DESTROYED, + ("mtx_lock() of destroyed mutex @ %s:%d", file, line)); + KASSERT(LOCK_CLASS(&m->mtx_object) == &lock_class_mtx_sleep, ("mtx_lock() of spin mutex %s @ %s:%d", m->mtx_object.lo_name, file, line)); WITNESS_CHECKORDER(&m->mtx_object, opts | LOP_NEWORDER | LOP_EXCLUSIVE, @@ -287,6 +289,7 @@ LOCK_LOG_LOCK("LOCK", &m->mtx_object, opts, m->mtx_recurse, file, line); WITNESS_LOCK(&m->mtx_object, opts | LOP_EXCLUSIVE, file, line); + curthread->td_locks++; #ifdef MUTEX_PROFILING /* don't reset the timer when/if recursing */ if (m->mtx_acqtime == 0) { @@ -303,9 +306,12 @@ { MPASS(curthread != NULL); - KASSERT(m->mtx_object.lo_class == &lock_class_mtx_sleep, + KASSERT(m->mtx_lock != MTX_DESTROYED, + ("mtx_unlock() of destroyed mutex @ %s:%d", file, line)); + KASSERT(LOCK_CLASS(&m->mtx_object) == &lock_class_mtx_sleep, ("mtx_unlock() of spin mutex %s @ %s:%d", m->mtx_object.lo_name, file, line)); + curthread->td_locks--; WITNESS_UNLOCK(&m->mtx_object, opts | LOP_EXCLUSIVE, file, line); LOCK_LOG_LOCK("UNLOCK", &m->mtx_object, opts, m->mtx_recurse, file, line); @@ -382,7 +388,9 @@ { MPASS(curthread != NULL); - KASSERT(m->mtx_object.lo_class == &lock_class_mtx_spin, + KASSERT(m->mtx_lock != MTX_DESTROYED, + ("mtx_lock_spin() of destroyed mutex @ %s:%d", file, line)); + KASSERT(LOCK_CLASS(&m->mtx_object) == &lock_class_mtx_spin, ("mtx_lock_spin() of sleep mutex %s @ %s:%d", m->mtx_object.lo_name, file, line)); WITNESS_CHECKORDER(&m->mtx_object, opts | LOP_NEWORDER | LOP_EXCLUSIVE, @@ -398,7 +406,9 @@ { MPASS(curthread != NULL); - KASSERT(m->mtx_object.lo_class == &lock_class_mtx_spin, + KASSERT(m->mtx_lock != MTX_DESTROYED, + ("mtx_unlock_spin() of destroyed mutex @ %s:%d", file, line)); + KASSERT(LOCK_CLASS(&m->mtx_object) == &lock_class_mtx_spin, ("mtx_unlock_spin() of sleep mutex %s @ %s:%d", m->mtx_object.lo_name, file, line)); WITNESS_UNLOCK(&m->mtx_object, opts | LOP_EXCLUSIVE, file, line); @@ -419,7 +429,9 @@ int rval; MPASS(curthread != NULL); - KASSERT(m->mtx_object.lo_class == &lock_class_mtx_sleep, + KASSERT(m->mtx_lock != MTX_DESTROYED, + ("mtx_trylock() of destroyed mutex @ %s:%d", file, line)); + KASSERT(LOCK_CLASS(&m->mtx_object) == &lock_class_mtx_sleep, ("mtx_trylock() of spin mutex %s @ %s:%d", m->mtx_object.lo_name, file, line)); @@ -431,9 +443,11 @@ rval = _obtain_lock(m, (uintptr_t)curthread); LOCK_LOG_TRY("LOCK", &m->mtx_object, opts, rval, file, line); - if (rval) + if (rval) { WITNESS_LOCK(&m->mtx_object, opts | LOP_EXCLUSIVE | LOP_TRYLOCK, file, line); + curthread->td_locks++; + } return (rval); } @@ -449,7 +463,7 @@ int line) { #if defined(SMP) && !defined(NO_ADAPTIVE_MUTEXES) - struct thread *owner; + volatile struct thread *owner; #endif uintptr_t v; #ifdef KTR @@ -830,7 +844,8 @@ void mtx_init(struct mtx *m, const char *name, const char *type, int opts) { - struct lock_object *lock; + struct lock_class *class; + int flags; MPASS((opts & ~(MTX_SPIN | MTX_QUIET | MTX_RECURSE | MTX_NOWITNESS | MTX_DUPOK)) == 0); @@ -840,30 +855,33 @@ mtx_validate(m); #endif - lock = &m->mtx_object; - KASSERT((lock->lo_flags & LO_INITIALIZED) == 0, - ("mutex \"%s\" %p already initialized", name, m)); - bzero(m, sizeof(*m)); + /* Determine lock class and lock flags. */ if (opts & MTX_SPIN) - lock->lo_class = &lock_class_mtx_spin; + class = &lock_class_mtx_spin; else - lock->lo_class = &lock_class_mtx_sleep; - lock->lo_name = name; - lock->lo_type = type != NULL ? type : name; + class = &lock_class_mtx_sleep; + flags = 0; if (opts & MTX_QUIET) - lock->lo_flags = LO_QUIET; + flags |= LO_QUIET; if (opts & MTX_RECURSE) - lock->lo_flags |= LO_RECURSABLE; + flags |= LO_RECURSABLE; if ((opts & MTX_NOWITNESS) == 0) - lock->lo_flags |= LO_WITNESS; + flags |= LO_WITNESS; if (opts & MTX_DUPOK) - lock->lo_flags |= LO_DUPOK; + flags |= LO_DUPOK; + /* Initialize mutex. */ m->mtx_lock = MTX_UNOWNED; + m->mtx_recurse = 0; +#ifdef MUTEX_PROFILING + m->mtx_acqtime = 0; + m->mtx_filename = NULL; + m->mtx_lineno = 0; + m->mtx_contest_holding = 0; + m->mtx_contest_locking = 0; +#endif - LOCK_LOG_INIT(lock, opts); - - WITNESS_INIT(lock); + lock_init(&m->mtx_object, class, name, type, flags); } /* @@ -876,19 +894,24 @@ mtx_destroy(struct mtx *m) { - LOCK_LOG_DESTROY(&m->mtx_object, 0); - if (!mtx_owned(m)) MPASS(mtx_unowned(m)); else { MPASS((m->mtx_lock & (MTX_RECURSED|MTX_CONTESTED)) == 0); + /* Perform the non-mtx related part of mtx_unlock_spin(). */ + if (LOCK_CLASS(&m->mtx_object) == &lock_class_mtx_spin) + spinlock_exit(); + else + curthread->td_locks--; + /* Tell witness this isn't locked to make it happy. */ WITNESS_UNLOCK(&m->mtx_object, LOP_EXCLUSIVE, __FILE__, __LINE__); } - WITNESS_DESTROY(&m->mtx_object); + m->mtx_lock = MTX_DESTROYED; + lock_destroy(&m->mtx_object); } /* @@ -900,9 +923,6 @@ mutex_init(void) { - /* Setup thread0 so that mutexes work. */ - LIST_INIT(&thread0.td_contested); - /* Setup turnstiles so that sleep mutexes work. */ init_turnstiles(); @@ -917,27 +937,6 @@ } #ifdef DDB -/* XXX: This function is not mutex-specific. */ -DB_SHOW_COMMAND(lock, db_show_lock) -{ - struct lock_object *lock; - - if (!have_addr) - return; - lock = (struct lock_object *)addr; - if (lock->lo_class != &lock_class_mtx_sleep && - lock->lo_class != &lock_class_mtx_spin && - lock->lo_class != &lock_class_sx) { - db_printf("Unknown lock class\n"); - return; - } - db_printf(" class: %s\n", lock->lo_class->lc_name); - db_printf(" name: %s\n", lock->lo_name); - if (lock->lo_type && lock->lo_type != lock->lo_name) - db_printf(" type: %s\n", lock->lo_type); - lock->lo_class->lc_ddb_show(lock); -} - void db_show_mtx(struct lock_object *lock) { @@ -947,7 +946,7 @@ m = (struct mtx *)lock; db_printf(" flags: {"); - if (m->mtx_object.lo_class == &lock_class_mtx_spin) + if (LOCK_CLASS(lock) == &lock_class_mtx_spin) db_printf("SPIN"); else db_printf("DEF"); ==== //depot/projects/soc2006/cdjones_jail/src/sys/kern/kern_sx.c#5 (text+ko) ==== @@ -34,7 +34,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/kern_sx.c,v 1.25.2.1 2005/12/20 19:28:23 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_sx.c,v 1.25.2.3 2006/08/11 18:54:10 jhb Exp $"); #include "opt_ddb.h" @@ -77,16 +77,7 @@ void sx_init(struct sx *sx, const char *description) { - struct lock_object *lock; - lock = &sx->sx_object; - KASSERT((lock->lo_flags & LO_INITIALIZED) == 0, - ("sx lock %s %p already initialized", description, sx)); - bzero(sx, sizeof(*sx)); - lock->lo_class = &lock_class_sx; - lock->lo_type = lock->lo_name = description; - lock->lo_flags = LO_WITNESS | LO_RECURSABLE | LO_SLEEPABLE | - LO_UPGRADABLE; sx->sx_lock = mtx_pool_find(mtxpool_lockbuilder, sx); sx->sx_cnt = 0; cv_init(&sx->sx_shrd_cv, description); @@ -94,18 +85,14 @@ cv_init(&sx->sx_excl_cv, description); sx->sx_excl_wcnt = 0; sx->sx_xholder = NULL; - - LOCK_LOG_INIT(lock, 0); - - WITNESS_INIT(lock); + lock_init(&sx->sx_object, &lock_class_sx, description, NULL, + LO_WITNESS | LO_RECURSABLE | LO_SLEEPABLE | LO_UPGRADABLE); } void sx_destroy(struct sx *sx) { - LOCK_LOG_DESTROY(&sx->sx_object, 0); - KASSERT((sx->sx_cnt == 0 && sx->sx_shrd_wcnt == 0 && sx->sx_excl_wcnt == 0), ("%s (%s): holders or waiters\n", __func__, sx->sx_object.lo_name)); @@ -114,7 +101,7 @@ cv_destroy(&sx->sx_shrd_cv); cv_destroy(&sx->sx_excl_cv); - WITNESS_DESTROY(&sx->sx_object); + lock_destroy(&sx->sx_object); } void @@ -141,6 +128,7 @@ LOCK_LOG_LOCK("SLOCK", &sx->sx_object, 0, 0, file, line); WITNESS_LOCK(&sx->sx_object, 0, file, line); + curthread->td_locks++; mtx_unlock(sx->sx_lock); } @@ -154,6 +142,7 @@ sx->sx_cnt++; LOCK_LOG_TRY("SLOCK", &sx->sx_object, 0, 1, file, line); WITNESS_LOCK(&sx->sx_object, LOP_TRYLOCK, file, line); + curthread->td_locks++; mtx_unlock(sx->sx_lock); return (1); } else { @@ -197,6 +186,7 @@ LOCK_LOG_LOCK("XLOCK", &sx->sx_object, 0, 0, file, line); WITNESS_LOCK(&sx->sx_object, LOP_EXCLUSIVE, file, line); + curthread->td_locks++; mtx_unlock(sx->sx_lock); } @@ -212,6 +202,7 @@ LOCK_LOG_TRY("XLOCK", &sx->sx_object, 0, 1, file, line); WITNESS_LOCK(&sx->sx_object, LOP_EXCLUSIVE | LOP_TRYLOCK, file, line); + curthread->td_locks++; mtx_unlock(sx->sx_lock); return (1); } else { @@ -228,6 +219,7 @@ _sx_assert(sx, SX_SLOCKED, file, line); mtx_lock(sx->sx_lock); + curthread->td_locks--; WITNESS_UNLOCK(&sx->sx_object, 0, file, line); /* Release. */ @@ -258,6 +250,7 @@ mtx_lock(sx->sx_lock); MPASS(sx->sx_cnt == -1); + curthread->td_locks--; WITNESS_UNLOCK(&sx->sx_object, LOP_EXCLUSIVE, file, line); /* Release. */ ==== //depot/projects/soc2006/cdjones_jail/src/sys/kern/kern_syscalls.c#5 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/kern_syscalls.c,v 1.11 2004/07/15 08:26:05 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_syscalls.c,v 1.11.8.1 2006/08/11 19:23:48 jhb Exp $"); #include #include @@ -97,8 +97,11 @@ case MOD_LOAD : error = syscall_register(data->offset, data->new_sysent, &data->old_sysent); - if (error) + if (error) { + /* Leave a mark so we know to safely unload below. */ + data->offset = NULL; return error; + } ms.intval = *data->offset; MOD_XLOCK; module_setspecific(mod, &ms); @@ -108,6 +111,13 @@ return error; case MOD_UNLOAD : + /* + * MOD_LOAD failed, so just return without calling the + * chained handler since we didn't pass along the MOD_LOAD + * event. + */ + if (data->offset == NULL) + return (0); if (data->chainevh) { error = data->chainevh(mod, what, data->chainarg); if (error) ==== //depot/projects/soc2006/cdjones_jail/src/sys/kern/kern_sysctl.c#6 (text+ko) ==== @@ -36,7 +36,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/kern_sysctl.c,v 1.165.2.3 2006/03/01 21:08:53 andre Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_sysctl.c,v 1.165.2.4 2006/08/07 10:12:56 yar Exp $"); #include "opt_compat.h" #include "opt_mac.h" @@ -1135,10 +1135,6 @@ /* * Wire the user space destination buffer. If set to a value greater than * zero, the len parameter limits the maximum amount of wired memory. - * - * XXX - The len parameter is currently ignored due to the lack of - * a place to save it in the sysctl_req structure so that the matching - * amount of memory can be unwired in the sysctl exit code. */ int sysctl_wire_old_buffer(struct sysctl_req *req, size_t len) ==== //depot/projects/soc2006/cdjones_jail/src/sys/kern/sched_hier.c#7 (text+ko) ==== ==== //depot/projects/soc2006/cdjones_jail/src/sys/kern/subr_autoconf.c#5 (text+ko) ==== @@ -35,10 +35,12 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/subr_autoconf.c,v 1.22 2005/01/06 23:35:39 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/subr_autoconf.c,v 1.22.2.1 2006/07/31 18:53:55 jhb Exp $"); #include #include +#include +#include #include /* @@ -50,26 +52,32 @@ */ static TAILQ_HEAD(, intr_config_hook) intr_config_hook_list = TAILQ_HEAD_INITIALIZER(intr_config_hook_list); - +static struct mtx intr_config_hook_lock; +MTX_SYSINIT(intr_config_hook, &intr_config_hook_lock, "intr config", MTX_DEF); /* ARGSUSED */ static void run_interrupt_driven_config_hooks(void *dummy); + static void run_interrupt_driven_config_hooks(dummy) void *dummy; { struct intr_config_hook *hook_entry, *next_entry; - for (hook_entry = TAILQ_FIRST(&intr_config_hook_list); - hook_entry != NULL; - hook_entry = next_entry) { + mtx_lock(&intr_config_hook_lock); + TAILQ_FOREACH_SAFE(hook_entry, &intr_config_hook_list, ich_links, + next_entry) { next_entry = TAILQ_NEXT(hook_entry, ich_links); + mtx_unlock(&intr_config_hook_lock); (*hook_entry->ich_func)(hook_entry->ich_arg); + mtx_lock(&intr_config_hook_lock); } while (!TAILQ_EMPTY(&intr_config_hook_list)) { - tsleep(&intr_config_hook_list, PCONFIG, "conifhk", 0); + msleep(&intr_config_hook_list, &intr_config_hook_lock, PCONFIG, + "conifhk", 0); } + mtx_unlock(&intr_config_hook_lock); } SYSINIT(intr_config_hooks, SI_SUB_INT_CONFIG_HOOKS, SI_ORDER_FIRST, run_interrupt_driven_config_hooks, NULL) @@ -85,17 +93,18 @@ { struct intr_config_hook *hook_entry; - for (hook_entry = TAILQ_FIRST(&intr_config_hook_list); - hook_entry != NULL; - hook_entry = TAILQ_NEXT(hook_entry, ich_links)) + mtx_lock(&intr_config_hook_lock); + TAILQ_FOREACH(hook_entry, &intr_config_hook_list, ich_links) if (hook_entry == hook) break; if (hook_entry != NULL) { + mtx_unlock(&intr_config_hook_lock); printf("config_intrhook_establish: establishing an " "already established hook.\n"); return (1); } TAILQ_INSERT_TAIL(&intr_config_hook_list, hook, ich_links); + mtx_unlock(&intr_config_hook_lock); if (cold == 0) /* XXX Sufficient for modules loaded after initial config??? */ run_interrupt_driven_config_hooks(NULL); @@ -108,9 +117,8 @@ { struct intr_config_hook *hook_entry; - for (hook_entry = TAILQ_FIRST(&intr_config_hook_list); - hook_entry != NULL; - hook_entry = TAILQ_NEXT(hook_entry, ich_links)) + mtx_lock(&intr_config_hook_lock); + TAILQ_FOREACH(hook_entry, &intr_config_hook_list, ich_links) if (hook_entry == hook) break; if (hook_entry == NULL) @@ -118,6 +126,8 @@ "unestablished hook"); TAILQ_REMOVE(&intr_config_hook_list, hook, ich_links); + /* Wakeup anyone watching the list */ wakeup(&intr_config_hook_list); + mtx_unlock(&intr_config_hook_lock); } ==== //depot/projects/soc2006/cdjones_jail/src/sys/kern/subr_turnstile.c#5 (text+ko) ==== @@ -59,7 +59,7 @@ #include "opt_turnstile_profiling.h" #include -__FBSDID("$FreeBSD: src/sys/kern/subr_turnstile.c,v 1.152.2.2 2006/04/05 21:15:19 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/subr_turnstile.c,v 1.152.2.3 2006/08/01 17:40:13 jhb Exp $"); #include #include @@ -334,6 +334,7 @@ NULL, MTX_SPIN); } mtx_init(&td_contested_lock, "td_contested", NULL, MTX_SPIN); + LIST_INIT(&thread0.td_contested); thread0.td_turnstile = NULL; } ==== //depot/projects/soc2006/cdjones_jail/src/sys/kern/subr_witness.c#5 (text+ko) ==== @@ -82,7 +82,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/subr_witness.c,v 1.195.2.9 2006/04/19 15:45:29 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/subr_witness.c,v 1.195.2.10 2006/08/01 17:40:13 jhb Exp $"); #include "opt_ddb.h" #include "opt_witness.h" @@ -511,7 +511,7 @@ TAILQ_FOREACH(lock, &all_locks, lo_list) { if (lock->lo_flags & LO_WITNESS) lock->lo_witness = enroll(lock->lo_type, - lock->lo_class); + LOCK_CLASS(lock)); else lock->lo_witness = NULL; } @@ -549,10 +549,7 @@ { struct lock_class *class; - class = lock->lo_class; - if (lock->lo_flags & LO_INITIALIZED) - panic("%s: lock (%s) %s is already initialized", __func__, - class->lc_name, lock->lo_name); + class = LOCK_CLASS(lock); if ((lock->lo_flags & LO_RECURSABLE) != 0 && (class->lc_flags & LC_RECURSABLE) == 0) panic("%s: lock (%s) %s can not be recursable", __func__, @@ -568,7 +565,6 @@ mtx_lock(&all_mtx); TAILQ_INSERT_TAIL(&all_locks, lock, lo_list); - lock->lo_flags |= LO_INITIALIZED; lock_cur_cnt++; if (lock_cur_cnt > lock_max_cnt) lock_max_cnt = lock_cur_cnt; @@ -583,14 +579,13 @@ void witness_destroy(struct lock_object *lock) { + struct lock_class *class; struct witness *w; + class = LOCK_CLASS(lock); if (witness_cold) panic("lock (%s) %s destroyed while witness_cold", - lock->lo_class->lc_name, lock->lo_name); - if ((lock->lo_flags & LO_INITIALIZED) == 0) - panic("%s: lock (%s) %s is not initialized", __func__, - lock->lo_class->lc_name, lock->lo_name); + class->lc_name, lock->lo_name); /* XXX: need to verify that no one holds the lock */ w = lock->lo_witness; @@ -610,7 +605,6 @@ mtx_lock(&all_mtx); lock_cur_cnt--; TAILQ_REMOVE(&all_locks, lock, lo_list); - lock->lo_flags &= ~LO_INITIALIZED; mtx_unlock(&all_mtx); } @@ -822,7 +816,7 @@ __func__); w = lock->lo_witness; - class = lock->lo_class; + class = LOCK_CLASS(lock); td = curthread; file = fixup_filename(file); @@ -1102,7 +1096,7 @@ file = fixup_filename(file); /* Determine lock list for this lock. */ - if (lock->lo_class->lc_flags & LC_SLEEPLOCK) + if (LOCK_CLASS(lock)->lc_flags & LC_SLEEPLOCK) lock_list = &td->td_sleeplocks; else lock_list = PCPU_PTR(spinlocks); @@ -1155,7 +1149,7 @@ KASSERT(!witness_cold, ("%s: witness_cold", __func__)); if (lock->lo_witness == NULL || witness_watch == 0 || panicstr != NULL) return; - class = lock->lo_class; + class = LOCK_CLASS(lock); file = fixup_filename(file); if ((lock->lo_flags & LO_UPGRADABLE) == 0) panic("upgrade of non-upgradable lock (%s) %s @ %s:%d", @@ -1163,7 +1157,7 @@ if ((flags & LOP_TRYLOCK) == 0) panic("non-try upgrade of lock (%s) %s @ %s:%d", class->lc_name, lock->lo_name, file, line); - if ((lock->lo_class->lc_flags & LC_SLEEPLOCK) == 0) + if ((class->lc_flags & LC_SLEEPLOCK) == 0) panic("upgrade of non-sleep lock (%s) %s @ %s:%d", class->lc_name, lock->lo_name, file, line); instance = find_instance(curthread->td_sleeplocks, lock); @@ -1190,12 +1184,12 @@ KASSERT(!witness_cold, ("%s: witness_cold", __func__)); if (lock->lo_witness == NULL || witness_watch == 0 || panicstr != NULL) return; - class = lock->lo_class; + class = LOCK_CLASS(lock); file = fixup_filename(file); if ((lock->lo_flags & LO_UPGRADABLE) == 0) panic("downgrade of non-upgradable lock (%s) %s @ %s:%d", class->lc_name, lock->lo_name, file, line); - if ((lock->lo_class->lc_flags & LC_SLEEPLOCK) == 0) + if ((class->lc_flags & LC_SLEEPLOCK) == 0) panic("downgrade of non-sleep lock (%s) %s @ %s:%d", class->lc_name, lock->lo_name, file, line); instance = find_instance(curthread->td_sleeplocks, lock); @@ -1226,7 +1220,7 @@ panicstr != NULL) return; td = curthread; - class = lock->lo_class; + class = LOCK_CLASS(lock); file = fixup_filename(file); /* Find lock instance associated with this lock. */ @@ -1737,7 +1731,7 @@ lock = instance->li_lock; printf("%s %s %s", (instance->li_flags & LI_EXCLUSIVE) != 0 ? - "exclusive" : "shared", lock->lo_class->lc_name, lock->lo_name); + "exclusive" : "shared", LOCK_CLASS(lock)->lc_name, lock->lo_name); if (lock->lo_type != lock->lo_name) printf(" (%s)", lock->lo_type); printf(" r = %d (%p) locked @ %s:%d\n", @@ -1805,18 +1799,25 @@ void witness_save(struct lock_object *lock, const char **filep, int *linep) { + struct lock_list_entry *lock_list; struct lock_instance *instance; + struct lock_class *class; KASSERT(!witness_cold, ("%s: witness_cold", __func__)); if (lock->lo_witness == NULL || witness_watch == 0 || panicstr != NULL) return; - if ((lock->lo_class->lc_flags & LC_SLEEPLOCK) == 0) - panic("%s: lock (%s) %s is not a sleep lock", __func__, - lock->lo_class->lc_name, lock->lo_name); - instance = find_instance(curthread->td_sleeplocks, lock); + class = LOCK_CLASS(lock); + if (class->lc_flags & LC_SLEEPLOCK) + lock_list = curthread->td_sleeplocks; + else { + if (witness_skipspin) + return; + lock_list = PCPU_GET(spinlocks); + } + instance = find_instance(lock_list, lock); if (instance == NULL) panic("%s: lock (%s) %s not locked", __func__, - lock->lo_class->lc_name, lock->lo_name); + class->lc_name, lock->lo_name); *filep = instance->li_file; *linep = instance->li_line; } @@ -1824,18 +1825,25 @@ void witness_restore(struct lock_object *lock, const char *file, int line) { + struct lock_list_entry *lock_list; struct lock_instance *instance; + struct lock_class *class; KASSERT(!witness_cold, ("%s: witness_cold", __func__)); if (lock->lo_witness == NULL || witness_watch == 0 || panicstr != NULL) return; - if ((lock->lo_class->lc_flags & LC_SLEEPLOCK) == 0) - panic("%s: lock (%s) %s is not a sleep lock", __func__, - lock->lo_class->lc_name, lock->lo_name); - instance = find_instance(curthread->td_sleeplocks, lock); + class = LOCK_CLASS(lock); + if (class->lc_flags & LC_SLEEPLOCK) + lock_list = curthread->td_sleeplocks; + else { + if (witness_skipspin) + return; + lock_list = PCPU_GET(spinlocks); + } + instance = find_instance(lock_list, lock); if (instance == NULL) panic("%s: lock (%s) %s not locked", __func__, - lock->lo_class->lc_name, lock->lo_name); + class->lc_name, lock->lo_name); lock->lo_witness->w_file = file; lock->lo_witness->w_line = line; instance->li_file = file; @@ -1847,23 +1855,25 @@ { #ifdef INVARIANT_SUPPORT struct lock_instance *instance; + struct lock_class *class; if (lock->lo_witness == NULL || witness_watch == 0 || panicstr != NULL) return; - if ((lock->lo_class->lc_flags & LC_SLEEPLOCK) != 0) + class = LOCK_CLASS(lock); + if ((class->lc_flags & LC_SLEEPLOCK) != 0) instance = find_instance(curthread->td_sleeplocks, lock); - else if ((lock->lo_class->lc_flags & LC_SPINLOCK) != 0) + else if ((class->lc_flags & LC_SPINLOCK) != 0) instance = find_instance(PCPU_GET(spinlocks), lock); else { panic("Lock (%s) %s is not sleep or spin!", - lock->lo_class->lc_name, lock->lo_name); + class->lc_name, lock->lo_name); } file = fixup_filename(file); switch (flags) { case LA_UNLOCKED: if (instance != NULL) panic("Lock (%s) %s locked @ %s:%d.", - lock->lo_class->lc_name, lock->lo_name, file, line); + class->lc_name, lock->lo_name, file, line); break; case LA_LOCKED: case LA_LOCKED | LA_RECURSED: @@ -1876,25 +1886,25 @@ case LA_XLOCKED | LA_NOTRECURSED: if (instance == NULL) { panic("Lock (%s) %s not locked @ %s:%d.", - lock->lo_class->lc_name, lock->lo_name, file, line); + class->lc_name, lock->lo_name, file, line); break; } if ((flags & LA_XLOCKED) != 0 && (instance->li_flags & LI_EXCLUSIVE) == 0) panic("Lock (%s) %s not exclusively locked @ %s:%d.", - lock->lo_class->lc_name, lock->lo_name, file, line); + class->lc_name, lock->lo_name, file, line); if ((flags & LA_SLOCKED) != 0 && (instance->li_flags & LI_EXCLUSIVE) != 0) panic("Lock (%s) %s exclusively locked @ %s:%d.", - lock->lo_class->lc_name, lock->lo_name, file, line); + class->lc_name, lock->lo_name, file, line); if ((flags & LA_RECURSED) != 0 && (instance->li_flags & LI_RECURSEMASK) == 0) panic("Lock (%s) %s not recursed @ %s:%d.", - lock->lo_class->lc_name, lock->lo_name, file, line); + class->lc_name, lock->lo_name, file, line); if ((flags & LA_NOTRECURSED) != 0 && (instance->li_flags & LI_RECURSEMASK) != 0) panic("Lock (%s) %s recursed @ %s:%d.", - lock->lo_class->lc_name, lock->lo_name, file, line); + class->lc_name, lock->lo_name, file, line); break; default: panic("Invalid lock assertion at %s:%d.", file, line); ==== //depot/projects/soc2006/cdjones_jail/src/sys/sys/kernel.h#5 (text+ko) ==== @@ -39,7 +39,7 @@ * SUCH DAMAGE. * * @(#)kernel.h 8.3 (Berkeley) 1/21/94 - * $FreeBSD: src/sys/sys/kernel.h,v 1.126.2.1 2005/11/12 20:55:59 csjp Exp $ + * $FreeBSD: src/sys/sys/kernel.h,v 1.126.2.2 2006/08/11 19:23:49 jhb Exp $ */ #ifndef _SYS_KERNEL_H_ @@ -160,6 +160,7 @@ SI_SUB_MOUNT_ROOT = 0xb400000, /* root mount*/ SI_SUB_SWAP = 0xc000000, /* swap */ SI_SUB_INTRINSIC_POST = 0xd000000, /* proc 0 cleanup*/ + SI_SUB_SYSCALLS = 0xd800000, /* register system calls */ SI_SUB_KTHREAD_INIT = 0xe000000, /* init process*/ SI_SUB_KTHREAD_PAGE = 0xe400000, /* pageout daemon*/ SI_SUB_KTHREAD_VM = 0xe800000, /* vm daemon*/ ==== //depot/projects/soc2006/cdjones_jail/src/sys/sys/lock.h#5 (text+ko) ==== @@ -26,7 +26,7 @@ * SUCH DAMAGE. * * from BSDI $Id: mutex.h,v 2.7.2.35 2000/04/27 03:10:26 cp Exp $ - * $FreeBSD: src/sys/sys/lock.h,v 1.52.2.1 2005/12/20 19:28:24 jhb Exp $ + * $FreeBSD: src/sys/sys/lock.h,v 1.52.2.2 2006/08/01 17:40:13 jhb Exp $ */ #ifndef _SYS_LOCK_H_ @@ -68,6 +68,8 @@ #define LO_UPGRADABLE 0x00200000 /* Lock may be upgraded/downgraded. */ #define LO_DUPOK 0x00400000 /* Don't check for duplicate acquires */ +#define LOCK_CLASS(lock) ((lock)->lo_class) + #define LI_RECURSEMASK 0x0000ffff /* Recursion depth of lock instance. */ #define LI_EXCLUSIVE 0x00010000 /* Exclusive lock instance. */ @@ -165,25 +167,27 @@ #define LOCK_LOG_LOCK(opname, lo, flags, recurse, file, line) do { \ if (LOCK_LOG_TEST((lo), (flags))) \ CTR5(KTR_LOCK, opname " (%s) %s r = %d at %s:%d", \ - (lo)->lo_class->lc_name, (lo)->lo_name, \ + LOCK_CLASS(lo)->lc_name, (lo)->lo_name, \ (u_int)(recurse), (file), (line)); \ } while (0) #define LOCK_LOG_TRY(opname, lo, flags, result, file, line) do { \ if (LOCK_LOG_TEST((lo), (flags))) \ CTR5(KTR_LOCK, "TRY_" opname " (%s) %s result=%d at %s:%d",\ - (lo)->lo_class->lc_name, (lo)->lo_name, \ + LOCK_CLASS(lo)->lc_name, (lo)->lo_name, \ (u_int)(result), (file), (line)); \ } while (0) #define LOCK_LOG_INIT(lo, flags) do { \ if (LOCK_LOG_TEST((lo), (flags))) \ CTR4(KTR_LOCK, "%s: %p (%s) %s", __func__, (lo), \ - (lo)->lo_class->lc_name, (lo)->lo_name); \ + LOCK_CLASS(lo)->lc_name, (lo)->lo_name); \ } while (0) #define LOCK_LOG_DESTROY(lo, flags) LOCK_LOG_INIT(lo, flags) +#define lock_initalized(lo) ((lo)->lo_flags & LO_INITIALIZED) + /* * Helpful macros for quickly coming up with assertions with informative * panic messages. @@ -198,6 +202,9 @@ extern struct lock_class lock_class_mtx_spin; extern struct lock_class lock_class_sx; +void lock_init(struct lock_object *lock, struct lock_class *class, + const char *name, const char *type, int flags); +void lock_destroy(struct lock_object *lock); void spinlock_enter(void); void spinlock_exit(void); void witness_init(struct lock_object *); @@ -269,8 +276,8 @@ witness_line(lock) #else /* WITNESS */ -#define WITNESS_INIT(lock) ((lock)->lo_flags |= LO_INITIALIZED) -#define WITNESS_DESTROY(lock) ((lock)->lo_flags &= ~LO_INITIALIZED) +#define WITNESS_INIT(lock) +#define WITNESS_DESTROY(lock) #define WITNESS_DEFINEORDER(lock1, lock2) 0 #define WITNESS_CHECKORDER(lock, flags, file, line) #define WITNESS_LOCK(lock, flags, file, line) ==== //depot/projects/soc2006/cdjones_jail/src/sys/sys/mutex.h#5 (text+ko) ==== @@ -26,7 +26,7 @@ * SUCH DAMAGE. * * from BSDI $Id: mutex.h,v 2.7.2.35 2000/04/27 03:10:26 cp Exp $ - * $FreeBSD: src/sys/sys/mutex.h,v 1.79.2.2 2005/08/05 20:21:46 jhb Exp $ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Aug 13 04:17:33 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BE1CC16A4E0; Sun, 13 Aug 2006 04:17:32 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 7C41116A4DE for ; Sun, 13 Aug 2006 04:17:32 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1B68E43D46 for ; Sun, 13 Aug 2006 04:17:32 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7D4HWUv027867 for ; Sun, 13 Aug 2006 04:17:32 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7D4HWQ2027864 for perforce@freebsd.org; Sun, 13 Aug 2006 04:17:32 GMT (envelope-from imp@freebsd.org) Date: Sun, 13 Aug 2006 04:17:32 GMT Message-Id: <200608130417.k7D4HWQ2027864@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 103745 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 13 Aug 2006 04:17:33 -0000 http://perforce.freebsd.org/chv.cgi?CH=103745 Change 103745 by imp@imp_paco-paco on 2006/08/13 04:17:00 IFC @103744 Affected files ... .. //depot/projects/arm/src/sbin/ifconfig/ifclone.c#2 integrate .. //depot/projects/arm/src/sbin/sysctl/sysctl.c#3 integrate .. //depot/projects/arm/src/share/man/man4/vlan.4#3 integrate .. //depot/projects/arm/src/share/man/man9/sysctl.9#2 integrate .. //depot/projects/arm/src/share/mk/bsd.cpu.mk#2 integrate .. //depot/projects/arm/src/sys/boot/arm/at91/bootiic/env_vars.c#13 integrate .. //depot/projects/arm/src/sys/boot/arm/at91/bootiic/env_vars.h#5 integrate .. //depot/projects/arm/src/sys/boot/arm/at91/bootiic/loader_prompt.c#14 integrate .. //depot/projects/arm/src/sys/boot/arm/at91/bootiic/loader_prompt.h#7 integrate .. //depot/projects/arm/src/sys/boot/arm/at91/libat91/spi_flash.c#15 integrate .. //depot/projects/arm/src/sys/boot/arm/at91/libat91/spi_flash.h#7 integrate .. //depot/projects/arm/src/sys/conf/files#42 integrate .. //depot/projects/arm/src/sys/contrib/dev/acpica/acfreebsd.h#3 integrate .. //depot/projects/arm/src/sys/geom/label/g_label.c#6 integrate .. //depot/projects/arm/src/sys/geom/label/g_label_msdosfs.c#4 integrate .. //depot/projects/arm/src/sys/geom/label/g_label_msdosfs.h#1 branch .. //depot/projects/arm/src/sys/kern/kern_subr.c#2 integrate .. //depot/projects/arm/src/sys/libkern/strstr.c#1 branch .. //depot/projects/arm/src/sys/net/bridgestp.c#8 integrate .. //depot/projects/arm/src/sys/sys/libkern.h#4 integrate .. //depot/projects/arm/src/sys/sys/sysctl.h#10 integrate .. //depot/projects/arm/src/sys/vm/vm_fault.c#13 integrate .. //depot/projects/arm/src/sys/vm/vm_object.c#13 integrate .. //depot/projects/arm/src/sys/vm/vm_page.c#17 integrate .. //depot/projects/arm/src/sys/vm/vm_page.h#6 integrate .. //depot/projects/arm/src/usr.sbin/pkg_install/version/perform.c#2 integrate Differences ... ==== //depot/projects/arm/src/sbin/ifconfig/ifclone.c#2 (text+ko) ==== @@ -29,7 +29,7 @@ #ifndef lint static const char rcsid[] = - "$FreeBSD: src/sbin/ifconfig/ifclone.c,v 1.2 2006/07/09 06:10:23 sam Exp $"; + "$FreeBSD: src/sbin/ifconfig/ifclone.c,v 1.3 2006/08/12 18:07:17 yar Exp $"; #endif /* not lint */ #include @@ -145,6 +145,7 @@ static struct cmd clone_cmds[] = { DEF_CMD("create", 0, clone_create), DEF_CMD("destroy", 0, clone_destroy), + DEF_CMD("plumb", 0, clone_create), DEF_CMD("unplumb", 0, clone_destroy), }; ==== //depot/projects/arm/src/sbin/sysctl/sysctl.c#3 (text+ko) ==== @@ -38,7 +38,7 @@ static char sccsid[] = "@(#)from: sysctl.c 8.1 (Berkeley) 6/6/93"; #endif static const char rcsid[] = - "$FreeBSD: src/sbin/sysctl/sysctl.c,v 1.71 2006/08/04 07:31:55 njl Exp $"; + "$FreeBSD: src/sbin/sysctl/sysctl.c,v 1.72 2006/08/12 23:33:10 obrien Exp $"; #endif /* not lint */ #ifdef __i386__ @@ -578,7 +578,11 @@ while (len >= sizeof(int)) { fputs(val, stdout); if (*fmt == 'U') - printf(hflag ? "%'u" : "%u", *(unsigned int *)p); + printf(hflag ? "%'u" : "%u", + *(unsigned int *)p); + else if (*fmt == 'X') + printf(hflag ? "%'#010x" : "%#010x", + *(unsigned int *)p); else if (*fmt == 'K') { if (*(long *)p < 0) printf("%ld", *(long *)p); @@ -601,7 +605,11 @@ while (len >= sizeof(long)) { fputs(val, stdout); if (*fmt == 'U') - printf(hflag ? "%'lu" : "%lu", *(unsigned long *)p); + printf(hflag ? "%'lu" : "%lu", + *(unsigned long *)p); + else if (*fmt == 'X') + printf(hflag ? "%'#018lx" : "%#018lx", + *(unsigned long *)p); else if (*fmt == 'K') { if (*(long *)p < 0) printf("%ld", *(long *)p); ==== //depot/projects/arm/src/share/man/man4/vlan.4#3 (text+ko) ==== @@ -23,7 +23,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/vlan.4,v 1.31 2006/08/11 17:09:27 yar Exp $ +.\" $FreeBSD: src/share/man/man4/vlan.4,v 1.32 2006/08/12 17:11:43 yar Exp $ .\" .Dd August 11, 2006 .Dt VLAN 4 @@ -84,7 +84,7 @@ .Nm assumes the same minimum length for tagged and untagged frames. This mode is selected by the -.Xr sysctl(8) +.Xr sysctl 8 variable .Va net.link.vlan.soft_pad set to 0 (default). ==== //depot/projects/arm/src/share/man/man9/sysctl.9#2 (text) ==== @@ -23,7 +23,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man9/sysctl.9,v 1.3 2006/04/28 23:21:36 keramida Exp $ +.\" $FreeBSD: src/share/man/man9/sysctl.9,v 1.5 2006/08/12 23:33:10 obrien Exp $ .\" .Dd April 28, 2006 .Dt SYSCTL 9 @@ -38,7 +38,9 @@ .Nm SYSCTL_STRING , .Nm SYSCTL_STRUCT , .Nm SYSCTL_UINT , -.Nm SYSCTL_ULONG +.Nm SYSCTL_ULONG , +.Nm SYSCTL_XINT , +.Nm SYSCTL_XLONG .Nd Static sysctl declaration functions .Sh SYNOPSIS .In sys/types.h @@ -129,6 +131,24 @@ .Fa "val" .Fa "descr" .Fc +.Fo SYSCTL_XINT +.Fa "parent" +.Fa "nbr" +.Fa "name" +.Fa "access" +.Fa "ptr" +.Fa "val" +.Fa "descr" +.Fc +.Fo SYSCTL_XLONG +.Fa "parent" +.Fa "nbr" +.Fa "name" +.Fa "access" +.Fa "ptr" +.Fa "val" +.Fa "descr" +.Fc .Sh DESCRIPTION The .Nm @@ -153,8 +173,10 @@ .Nm SYSCTL_STRING , .Nm SYSCTL_STRUCT , .Nm SYSCTL_UINT , +.Nm SYSCTL_ULONG , +.Nm SYSCTL_XINT , and -.Nm SYSCTL_ULONG . +.Nm SYSCTL_XLONG . Each macro accepts a parent name, as declared using .Nm SYSCTL_DECL , an OID number, typically @@ -194,7 +216,7 @@ .Bl -tag -width CTLFLAG_ANYBODY .It Dv CTLFLAG_RD This is a read-only sysctl. -It Dv CTLFLAG_WR +.It Dv CTLFLAG_WR This is a writable sysctl. .It Dv CTLFLAG_RW This sysctl is readable and writable. @@ -271,6 +293,7 @@ * Example of a constant integer value. Notice that the control * flags are CTLFLAG_RD, the variable pointer is NULL, and the * value is declared. + * If sysctl(8) should print this value in hex, use 'SYSCTL_XINT'. */ SYSCTL_INT(_debug_sizeof, OID_AUTO, bio, CTLFLAG_RD, NULL, sizeof(struct bio), "sizeof(struct bio)"); ==== //depot/projects/arm/src/share/mk/bsd.cpu.mk#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/share/mk/bsd.cpu.mk,v 1.54 2006/07/21 14:07:48 cognet Exp $ +# $FreeBSD: src/share/mk/bsd.cpu.mk,v 1.55 2006/08/12 09:46:43 des Exp $ # Set default CPU compile flags and baseline CPUTYPE for each arch. The # compile flags must support the minimum CPU type for each architecture but @@ -133,7 +133,7 @@ . elif ${CPUTYPE} == "k5" MACHINE_CPU = k5 i586 i486 i386 . elif ${CPUTYPE} == "c3" -MACHINE_CPU = 3dnow mmx i586 i486 i386 +MACHINE_CPU = mmx i586 i486 i386 . elif ${CPUTYPE} == "c3-2" MACHINE_CPU = sse mmx i586 i486 i386 . elif ${CPUTYPE} == "pentium4" || ${CPUTYPE} == "pentium4m" || ${CPUTYPE} == "pentium-m" ==== //depot/projects/arm/src/sys/boot/arm/at91/bootiic/env_vars.c#13 (text+ko) ==== ==== //depot/projects/arm/src/sys/boot/arm/at91/bootiic/env_vars.h#5 (text+ko) ==== ==== //depot/projects/arm/src/sys/boot/arm/at91/bootiic/loader_prompt.c#14 (text+ko) ==== ==== //depot/projects/arm/src/sys/boot/arm/at91/bootiic/loader_prompt.h#7 (text+ko) ==== ==== //depot/projects/arm/src/sys/boot/arm/at91/libat91/spi_flash.c#15 (text+ko) ==== ==== //depot/projects/arm/src/sys/boot/arm/at91/libat91/spi_flash.h#7 (text+ko) ==== ==== //depot/projects/arm/src/sys/conf/files#42 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.1137 2006/08/07 12:02:42 rwatson Exp $ +# $FreeBSD: src/sys/conf/files,v 1.1139 2006/08/12 18:29:49 pjd Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -1477,6 +1477,7 @@ libkern/strncpy.c standard libkern/strsep.c standard libkern/strspn.c standard +libkern/strstr.c standard libkern/strtol.c standard libkern/strtoq.c standard libkern/strtoul.c standard ==== //depot/projects/arm/src/sys/contrib/dev/acpica/acfreebsd.h#3 (text+ko) ==== @@ -169,26 +169,4 @@ /* Always use FreeBSD code over our local versions */ #define ACPI_USE_SYSTEM_CLIBRARY -#ifdef _KERNEL -/* Or strstr (used in debugging mode, also move to libkern) */ -static __inline char * -strstr(char *s, char *find) -{ - char c, sc; - size_t len; - - if ((c = *find++) != 0) { - len = strlen(find); - do { - do { - if ((sc = *s++) == 0) - return (NULL); - } while (sc != c); - } while (strncmp(s, find, len) != 0); - s--; - } - return ((char *)s); -} -#endif /* _KERNEL */ - #endif /* __ACFREEBSD_H__ */ ==== //depot/projects/arm/src/sys/geom/label/g_label.c#6 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/geom/label/g_label.c,v 1.20 2006/02/18 11:24:00 pjd Exp $"); +__FBSDID("$FreeBSD: src/sys/geom/label/g_label.c,v 1.21 2006/08/12 15:30:24 pjd Exp $"); #include #include @@ -36,6 +36,7 @@ #include #include #include +#include #include #include #include @@ -116,6 +117,23 @@ g_slice_spoiled(cp); } +static int +g_label_is_name_ok(const char *label) +{ + const char *s; + + /* Check is the label starts from ../ */ + if (strncmp(label, "../", 3) == 0) + return (0); + /* Check is the label contains /../ */ + if (strstr(label, "/../") != NULL) + return (0); + /* Check is the label ends at ../ */ + if ((s = strstr(label, "/..")) != NULL && s[3] == '\0') + return (0); + return (1); +} + static struct g_geom * g_label_create(struct gctl_req *req, struct g_class *mp, struct g_provider *pp, const char *label, const char *dir, off_t mediasize) @@ -127,6 +145,12 @@ g_topology_assert(); + if (!g_label_is_name_ok(label)) { + G_LABEL_DEBUG(0, "%s contains suspicious label, skipping.", + pp->name); + G_LABEL_DEBUG(1, "%s suspicious label is: %s", pp->name, label); + return (NULL); + } gp = NULL; cp = NULL; snprintf(name, sizeof(name), "%s/%s", dir, label); ==== //depot/projects/arm/src/sys/geom/label/g_label_msdosfs.c#4 (text+ko) ==== @@ -1,5 +1,6 @@ /*- * Copyright (c) 2004 Pawel Jakub Dawidek + * Copyright (c) 2006 Tobias Reifenberger * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -25,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/geom/label/g_label_msdosfs.c,v 1.4 2006/02/01 12:06:00 pjd Exp $"); +__FBSDID("$FreeBSD: src/sys/geom/label/g_label_msdosfs.c,v 1.5 2006/08/12 15:34:15 pjd Exp $"); #include #include @@ -34,57 +35,171 @@ #include #include +#include #define G_LABEL_MSDOSFS_DIR "msdosfs" - -#define FAT12 "FAT12 " -#define FAT16 "FAT16 " -#define FAT32 "FAT32 " -#define VOLUME_LEN 11 -#define NO_NAME "NO NAME " - +#define LABEL_NO_NAME "NO NAME " static void g_label_msdosfs_taste(struct g_consumer *cp, char *label, size_t size) { struct g_provider *pp; - char *sector, *volume; - int i; + FAT_BSBPB *pfat_bsbpb; + FAT32_BSBPB *pfat32_bsbpb; + FAT_DES *pfat_entry; + uint8_t *sector0, *sector; + uint32_t i; g_topology_assert_not(); pp = cp->provider; - label[0] = '\0'; + sector0 = NULL; + sector = NULL; + bzero(label, size); + + /* Check if the sector size of the medium is a valid FAT sector size. */ + switch(pp->sectorsize) { + case 512: + case 1024: + case 2048: + case 4096: + break; + default: + G_LABEL_DEBUG(1, "MSDOSFS: %s: sector size %d not compatible.", + pp->name, pp->sectorsize); + return; + } - sector = (char *)g_read_data(cp, 0, pp->sectorsize, NULL); - if (sector == NULL) + /* Load 1st sector with boot sector and boot parameter block. */ + sector0 = (uint8_t *)g_read_data(cp, 0, pp->sectorsize, NULL); + if (sector0 == NULL) return; - if (strncmp(sector + 0x36, FAT12, strlen(FAT12)) == 0) { - G_LABEL_DEBUG(1, "MSDOS (FAT12) file system detected on %s.", + + /* Check for the FAT boot sector signature. */ + if (sector0[510] != 0x55 || sector0[511] != 0xaa) { + G_LABEL_DEBUG(1, "MSDOSFS: %s: no FAT signature found.", pp->name); - volume = sector + 0x2b; - } else if (strncmp(sector + 0x36, FAT16, strlen(FAT16)) == 0) { - G_LABEL_DEBUG(1, "MSDOS (FAT16) file system detected on %s.", + goto error; + } + + + /* + * Test if this is really a FAT volume and determine the FAT type. + */ + + pfat_bsbpb = (FAT_BSBPB *)sector0; + pfat32_bsbpb = (FAT32_BSBPB *)sector0; + + if (UINT16BYTES(pfat_bsbpb->BPB_FATSz16) != 0) { + /* + * If the BPB_FATSz16 field is not zero and the string "FAT" is + * at the right place, this should be a FAT12 or FAT16 volume. + */ + if (strncmp(pfat_bsbpb->BS_FilSysType, "FAT", 3) != 0) { + G_LABEL_DEBUG(1, + "MSDOSFS: %s: FAT12/16 volume not valid.", + pp->name); + goto error; + } + G_LABEL_DEBUG(1, "MSDOSFS: %s: FAT12/FAT16 volume detected.", pp->name); - volume = sector + 0x2b; - } else if (strncmp(sector + 0x52, FAT32, strlen(FAT32)) == 0) { - G_LABEL_DEBUG(1, "MSDOS (FAT32) file system detected on %s.", + + /* A volume with no name should have "NO NAME " as label. */ + if (strncmp(pfat_bsbpb->BS_VolLab, LABEL_NO_NAME, + sizeof(pfat_bsbpb->BS_VolLab)) == 0) { + G_LABEL_DEBUG(1, + "MSDOSFS: %s: FAT12/16 volume has no name.", + pp->name); + goto error; + } + strlcpy(label, pfat_bsbpb->BS_VolLab, + MIN(size, sizeof(pfat_bsbpb->BS_VolLab) + 1)); + } else if (UINT32BYTES(pfat32_bsbpb->BPB_FATSz32) != 0) { + uint32_t fat_FirstDataSector, fat_BytesPerSector, offset; + + /* + * If the BPB_FATSz32 field is not zero and the string "FAT" is + * at the right place, this should be a FAT32 volume. + */ + if (strncmp(pfat32_bsbpb->BS_FilSysType, "FAT", 3) != 0) { + G_LABEL_DEBUG(1, "MSDOSFS: %s: FAT32 volume not valid.", + pp->name); + goto error; + } + G_LABEL_DEBUG(1, "MSDOSFS: %s: FAT32 volume detected.", pp->name); - volume = sector + 0x47; + + /* + * If the volume label is not "NO NAME " we're done. + */ + if (strncmp(pfat32_bsbpb->BS_VolLab, LABEL_NO_NAME, + sizeof(pfat32_bsbpb->BS_VolLab)) != 0) { + strlcpy(label, pfat32_bsbpb->BS_VolLab, + MIN(size, sizeof(pfat32_bsbpb->BS_VolLab) + 1)); + goto endofchecks; + } + + /* + * If the volume label "NO NAME " is in the boot sector, the + * label of FAT32 volumes may be stored as a special entry in + * the root directory. + */ + fat_FirstDataSector = + UINT16BYTES(pfat32_bsbpb->BPB_RsvdSecCnt) + + (pfat32_bsbpb->BPB_NumFATs * + UINT32BYTES(pfat32_bsbpb->BPB_FATSz32)); + fat_BytesPerSector = UINT16BYTES(pfat32_bsbpb->BPB_BytsPerSec); + + G_LABEL_DEBUG(2, + "MSDOSFS: FAT_FirstDataSector=0x%x, FAT_BytesPerSector=%d", + fat_FirstDataSector, fat_BytesPerSector); + + for (offset = fat_BytesPerSector * fat_FirstDataSector;; + offset += fat_BytesPerSector) { + sector = (uint8_t *)g_read_data(cp, offset, + fat_BytesPerSector, NULL); + if (sector == NULL) + goto error; + + pfat_entry = (FAT_DES *)sector; + do { + /* No more entries available. */ + if (pfat_entry->DIR_Name[0] == 0) { + G_LABEL_DEBUG(1, "MSDOSFS: %s: " + "FAT32 volume has no name.", + pp->name); + goto error; + } + + /* Skip empty or long name entries. */ + if (pfat_entry->DIR_Name[0] == 0xe5 || + (pfat_entry->DIR_Attr & + FAT_DES_ATTR_LONG_NAME) == + FAT_DES_ATTR_LONG_NAME) { + continue; + } + + /* + * The name of the entry is the volume label if + * ATTR_VOLUME_ID is set. + */ + if (pfat_entry->DIR_Attr & + FAT_DES_ATTR_VOLUME_ID) { + strlcpy(label, pfat_entry->DIR_Name, + MIN(size, + sizeof(pfat_bsbpb->BS_VolLab) + 1)); + goto endofchecks; + } + } while((uint8_t *)(++pfat_entry) < + (uint8_t *)(sector + fat_BytesPerSector)); + g_free(sector); + } } else { - g_free(sector); - return; + G_LABEL_DEBUG(1, "MSDOSFS: %s: no FAT volume detected.", + pp->name); + goto error; } - if (strncmp(volume, NO_NAME, VOLUME_LEN) == 0) { - g_free(sector); - return; - } - if (volume[0] == '\0') { - g_free(sector); - return; - } - bzero(label, size); - strlcpy(label, volume, MIN(size, VOLUME_LEN)); - g_free(sector); + +endofchecks: for (i = size - 1; i > 0; i--) { if (label[i] == '\0') continue; @@ -93,6 +208,12 @@ else break; } + +error: + if (sector0 != NULL) + g_free(sector0); + if (sector != NULL) + g_free(sector); } const struct g_label_desc g_label_msdosfs = { ==== //depot/projects/arm/src/sys/kern/kern_subr.c#2 (text+ko) ==== @@ -35,7 +35,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/kern_subr.c,v 1.96 2005/01/06 23:35:39 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_subr.c,v 1.97 2006/08/12 19:47:49 alc Exp $"); #include "opt_zero.h" @@ -105,9 +105,9 @@ VM_OBJECT_LOCK(uobject); retry: if ((user_pg = vm_page_lookup(uobject, upindex)) != NULL) { + if (vm_page_sleep_if_busy(user_pg, TRUE, "vm_pgmoveco")) + goto retry; vm_page_lock_queues(); - if (vm_page_sleep_if_busy(user_pg, 1, "vm_pgmoveco")) - goto retry; pmap_remove_all(user_pg); vm_page_free(user_pg); } else { ==== //depot/projects/arm/src/sys/net/bridgestp.c#8 (text+ko) ==== @@ -40,7 +40,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/net/bridgestp.c,v 1.18 2006/08/02 02:51:42 thompsa Exp $"); +__FBSDID("$FreeBSD: src/sys/net/bridgestp.c,v 1.19 2006/08/12 20:30:58 thompsa Exp $"); #include #include @@ -929,6 +929,7 @@ }; DECLARE_MODULE(bridgestp, bstp_mod, SI_SUB_PSEUDO, SI_ORDER_ANY); +MODULE_VERSION(bridgestp, 1); void bstp_attach(struct bstp_state *bs, bstp_state_cb_t state_callback) ==== //depot/projects/arm/src/sys/sys/libkern.h#4 (text+ko) ==== @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * @(#)libkern.h 8.1 (Berkeley) 6/10/93 - * $FreeBSD: src/sys/sys/libkern.h,v 1.53 2006/07/17 09:05:21 phk Exp $ + * $FreeBSD: src/sys/sys/libkern.h,v 1.54 2006/08/12 15:28:39 pjd Exp $ */ #ifndef _SYS_LIBKERN_H_ @@ -108,6 +108,7 @@ char *strncpy(char * __restrict, const char * __restrict, size_t); char *strsep(char **, const char *delim); size_t strspn(const char *, const char *); +char *strstr(const char *, const char *); int strvalid(const char *, size_t); extern uint32_t crc32_tab[]; ==== //depot/projects/arm/src/sys/sys/sysctl.h#10 (text+ko) ==== @@ -30,7 +30,7 @@ * SUCH DAMAGE. * * @(#)sysctl.h 8.1 (Berkeley) 6/2/93 - * $FreeBSD: src/sys/sys/sysctl.h,v 1.142 2006/07/18 17:00:51 imp Exp $ + * $FreeBSD: src/sys/sys/sysctl.h,v 1.143 2006/08/12 23:33:10 obrien Exp $ */ #ifndef _SYS_SYSCTL_H_ @@ -259,6 +259,14 @@ sysctl_add_oid(ctx, parent, nbr, name, CTLTYPE_UINT|(access), \ ptr, val, sysctl_handle_int, "IU", __DESCR(descr)) +#define SYSCTL_XINT(parent, nbr, name, access, ptr, val, descr) \ + SYSCTL_OID(parent, nbr, name, CTLTYPE_UINT|(access), \ + ptr, val, sysctl_handle_int, "IX", descr) + +#define SYSCTL_ADD_XINT(ctx, parent, nbr, name, access, ptr, val, descr) \ + sysctl_add_oid(ctx, parent, nbr, name, CTLTYPE_UINT|(access), \ + ptr, val, sysctl_handle_int, "IX", __DESCR(descr)) + /* Oid for a long. The pointer must be non NULL. */ #define SYSCTL_LONG(parent, nbr, name, access, ptr, val, descr) \ SYSCTL_OID(parent, nbr, name, CTLTYPE_LONG|(access), \ @@ -277,6 +285,14 @@ sysctl_add_oid(ctx, parent, nbr, name, CTLTYPE_ULONG|(access), \ ptr, 0, sysctl_handle_long, "LU", __DESCR(descr)) +#define SYSCTL_XLONG(parent, nbr, name, access, ptr, val, descr) \ + SYSCTL_OID(parent, nbr, name, CTLTYPE_ULONG|(access), \ + ptr, val, sysctl_handle_long, "LX", __DESCR(descr)) + +#define SYSCTL_ADD_XLONG(ctx, parent, nbr, name, access, ptr, descr) \ + sysctl_add_oid(ctx, parent, nbr, name, CTLTYPE_ULONG|(access), \ + ptr, 0, sysctl_handle_long, "LX", __DESCR(descr)) + /* Oid for an opaque object. Specified by a pointer and a length. */ #define SYSCTL_OPAQUE(parent, nbr, name, access, ptr, len, fmt, descr) \ SYSCTL_OID(parent, nbr, name, CTLTYPE_OPAQUE|(access), \ ==== //depot/projects/arm/src/sys/vm/vm_fault.c#13 (text+ko) ==== @@ -72,7 +72,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/vm/vm_fault.c,v 1.218 2006/08/06 00:17:17 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/vm/vm_fault.c,v 1.219 2006/08/13 00:11:09 alc Exp $"); #include #include @@ -842,14 +842,15 @@ if (prot & VM_PROT_WRITE) { vm_page_lock_queues(); vm_page_flag_set(fs.m, PG_WRITEABLE); - vm_object_set_writeable_dirty(fs.m->object); + vm_page_unlock_queues(); + vm_object_set_writeable_dirty(fs.object); /* * If the fault is a write, we know that this page is being * written NOW so dirty it explicitly to save on * pmap_is_modified() calls later. * - * If this is a NOSYNC mmap we do not want to set PG_NOSYNC + * If this is a NOSYNC mmap we do not want to set VPO_NOSYNC * if the page is already dirty to prevent data written with * the expectation of being synced from not being synced. * Likewise if this entry does not request NOSYNC then make @@ -861,11 +862,10 @@ */ if (fs.entry->eflags & MAP_ENTRY_NOSYNC) { if (fs.m->dirty == 0) - vm_page_flag_set(fs.m, PG_NOSYNC); + fs.m->oflags |= VPO_NOSYNC; } else { - vm_page_flag_clear(fs.m, PG_NOSYNC); + fs.m->oflags &= ~VPO_NOSYNC; } - vm_page_unlock_queues(); if (fault_flags & VM_FAULT_DIRTY) { vm_page_dirty(fs.m); vm_pager_page_unswapped(fs.m); ==== //depot/projects/arm/src/sys/vm/vm_object.c#13 (text+ko) ==== @@ -63,7 +63,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/vm/vm_object.c,v 1.365 2006/08/09 17:43:27 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/vm/vm_object.c,v 1.366 2006/08/13 00:11:09 alc Exp $"); #include #include @@ -687,7 +687,7 @@ * * Clean all dirty pages in the specified range of object. Leaves page * on whatever queue it is currently on. If NOSYNC is set then do not - * write out pages with PG_NOSYNC set (originally comes from MAP_NOSYNC), + * write out pages with VPO_NOSYNC set (originally comes from MAP_NOSYNC), * leaving the object dirty. * * When stuffing pages asynchronously, allow clustering. XXX we need a @@ -765,7 +765,7 @@ * If we have been asked to skip nosync pages and * this is a nosync page, we can't continue. */ - if ((flags & OBJPC_NOSYNC) && (p->flags & PG_NOSYNC)) { + if ((flags & OBJPC_NOSYNC) && (p->oflags & VPO_NOSYNC)) { if (--scanlimit == 0) break; ++tscan; @@ -805,7 +805,7 @@ clearobjflags = 1; TAILQ_FOREACH(p, &object->memq, listq) { vm_page_flag_set(p, PG_CLEANCHK); - if ((flags & OBJPC_NOSYNC) && (p->flags & PG_NOSYNC)) + if ((flags & OBJPC_NOSYNC) && (p->oflags & VPO_NOSYNC)) clearobjflags = 0; else pmap_remove_write(p); @@ -853,7 +853,7 @@ * nosync page, skip it. Note that the object flags were * not cleared in this case so we do not have to set them. */ - if ((flags & OBJPC_NOSYNC) && (p->flags & PG_NOSYNC)) { + if ((flags & OBJPC_NOSYNC) && (p->oflags & VPO_NOSYNC)) { vm_page_flag_clear(p, PG_CLEANCHK); continue; } ==== //depot/projects/arm/src/sys/vm/vm_page.c#17 (text+ko) ==== @@ -97,7 +97,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/vm/vm_page.c,v 1.324 2006/08/11 17:18:58 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/vm/vm_page.c,v 1.325 2006/08/13 00:11:09 alc Exp $"); #include #include @@ -1580,7 +1580,7 @@ /* * Set valid, clear dirty bits. If validating the entire * page we can safely clear the pmap modify bit. We also - * use this opportunity to clear the PG_NOSYNC flag. If a process + * use this opportunity to clear the VPO_NOSYNC flag. If a process * takes a write fault on a MAP_NOSYNC memory area the flag will * be set again. * @@ -1603,7 +1603,7 @@ m->dirty &= ~pagebits; if (base == 0 && size == PAGE_SIZE) { pmap_clear_modify(m); - vm_page_flag_clear(m, PG_NOSYNC); + m->oflags &= ~VPO_NOSYNC; } } ==== //depot/projects/arm/src/sys/vm/vm_page.h#6 (text+ko) ==== @@ -57,7 +57,7 @@ * any improvements or extensions that they make and grant Carnegie the * rights to redistribute these changes. * - * $FreeBSD: src/sys/vm/vm_page.h,v 1.140 2006/08/09 17:43:27 alc Exp $ + * $FreeBSD: src/sys/vm/vm_page.h,v 1.141 2006/08/13 00:11:09 alc Exp $ */ /* @@ -144,6 +144,7 @@ */ #define VPO_WANTED 0x0002 /* someone is waiting for page */ #define VPO_SWAPINPROG 0x0200 /* swap I/O in progress on page */ +#define VPO_NOSYNC 0x0400 /* do not collect for syncer */ /* Make sure that u_long is at least 64 bits when PAGE_SIZE is 32K. */ #if PAGE_SIZE == 32768 @@ -226,7 +227,6 @@ #define PG_ZERO 0x0040 /* page is zeroed */ #define PG_REFERENCED 0x0080 /* page has been referenced */ #define PG_CLEANCHK 0x0100 /* page will be checked for cleaning */ -#define PG_NOSYNC 0x0400 /* do not collect for syncer */ #define PG_UNMANAGED 0x0800 /* No PV management for page */ #define PG_MARKER 0x1000 /* special queue marker page */ #define PG_SLAB 0x2000 /* object pointer is actually a slab */ ==== //depot/projects/arm/src/usr.sbin/pkg_install/version/perform.c#2 (text+ko) ==== @@ -19,7 +19,7 @@ */ #include -__FBSDID("$FreeBSD: src/usr.sbin/pkg_install/version/perform.c,v 1.15 2006/02/12 16:09:33 krion Exp $"); +__FBSDID("$FreeBSD: src/usr.sbin/pkg_install/version/perform.c,v 1.16 2006/08/12 18:32:51 krion Exp $"); #include "lib.h" #include "version.h" @@ -259,7 +259,7 @@ if (!plist.name || strlen(plist.name) == 0) return; - if (ShowOrigin != FALSE) + if (ShowOrigin != FALSE && plist.origin != NULL) strlcpy(tmp, plist.origin, PATH_MAX); else { strlcpy(tmp, plist.name, PATH_MAX); From owner-p4-projects@FreeBSD.ORG Sun Aug 13 11:11:08 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 561EB16A501; Sun, 13 Aug 2006 11:11:08 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 EF8E716A4DF for ; Sun, 13 Aug 2006 11:11:07 +0000 (UTC) (envelope-from bushman@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E92B643D5E for ; Sun, 13 Aug 2006 11:11:04 +0000 (GMT) (envelope-from bushman@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7DBB4xx002384 for ; Sun, 13 Aug 2006 11:11:04 GMT (envelope-from bushman@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7DBB4Wp002381 for perforce@freebsd.org; Sun, 13 Aug 2006 11:11:04 GMT (envelope-from bushman@freebsd.org) Date: Sun, 13 Aug 2006 11:11:04 GMT Message-Id: <200608131111.k7DBB4Wp002381@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bushman@freebsd.org using -f From: Michael Bushkov To: Perforce Change Reviews Cc: Subject: PERFORCE change 103748 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 13 Aug 2006 11:11:08 -0000 http://perforce.freebsd.org/chv.cgi?CH=103748 Change 103748 by bushman@bushman_nss_ldap_cached on 2006/08/13 11:10:30 IFC Affected files ... .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/named/Makefile#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/pkg_install/lib/url.c#3 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/pkg_install/version/perform.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/rpc.lockd/lockd_lock.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/rpc.statd/procs.c#2 integrate Differences ... ==== //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/named/Makefile#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/usr.sbin/named/Makefile,v 1.41 2005/07/25 14:44:10 des Exp $ +# $FreeBSD: src/usr.sbin/named/Makefile,v 1.42 2006/08/13 05:32:10 cperciva Exp $ BIND_DIR= ${.CURDIR}/../../contrib/bind9 LIB_BIND_REL= ../../lib/bind @@ -24,6 +24,9 @@ CFLAGS+= -I${SRCDIR}/unix/include -I${SRCDIR}/include -I${LIB_BIND_DIR} +# Remove the date stamp to make it more obvious when real changes happen +CFLAGS+= -U__DATE__ + DPADD+= ${BIND_DPADD} ${CRYPTO_DPADD} LDADD+= ${BIND_LDADD} ${CRYPTO_LDADD} ==== //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/pkg_install/lib/url.c#3 (text+ko) ==== @@ -19,7 +19,7 @@ */ #include -__FBSDID("$FreeBSD: src/usr.sbin/pkg_install/lib/url.c,v 1.6 2006/07/08 14:34:56 des Exp $"); +__FBSDID("$FreeBSD: src/usr.sbin/pkg_install/lib/url.c,v 1.7 2006/08/11 17:17:14 des Exp $"); #include "lib.h" #include @@ -98,7 +98,7 @@ else strcpy(fname, spec); - if (keep_package) { + if (keep_package) { tmp = getenv("PKGDIR"); strlcpy(pkg, tmp ? tmp : ".", sizeof(pkg)); tmp = basename(fname); @@ -109,7 +109,7 @@ perror("open"); return NULL; } - } + } fetchDebug = (Verbose > 0); if ((ftp = fetchGetURL(fname, Verbose ? "v" : NULL)) == NULL) { ==== //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/pkg_install/version/perform.c#2 (text+ko) ==== @@ -19,7 +19,7 @@ */ #include -__FBSDID("$FreeBSD: src/usr.sbin/pkg_install/version/perform.c,v 1.15 2006/02/12 16:09:33 krion Exp $"); +__FBSDID("$FreeBSD: src/usr.sbin/pkg_install/version/perform.c,v 1.16 2006/08/12 18:32:51 krion Exp $"); #include "lib.h" #include "version.h" @@ -259,7 +259,7 @@ if (!plist.name || strlen(plist.name) == 0) return; - if (ShowOrigin != FALSE) + if (ShowOrigin != FALSE && plist.origin != NULL) strlcpy(tmp, plist.origin, PATH_MAX); else { strlcpy(tmp, plist.name, PATH_MAX); ==== //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/rpc.lockd/lockd_lock.c#2 (text+ko) ==== @@ -35,7 +35,7 @@ */ #include -__FBSDID("$FreeBSD: src/usr.sbin/rpc.lockd/lockd_lock.c,v 1.17 2005/05/20 13:01:47 charnier Exp $"); +__FBSDID("$FreeBSD: src/usr.sbin/rpc.lockd/lockd_lock.c,v 1.18 2006/08/11 23:03:16 thomas Exp $"); #define LOCKD_DEBUG @@ -2026,8 +2026,7 @@ bzero(&smon,sizeof(smon)); smon.mon_id.mon_name = nhp->name; - smon.mon_id.my_id.my_name = "localhost\0"; - + smon.mon_id.my_id.my_name = "localhost"; smon.mon_id.my_id.my_prog = NLM_PROG; smon.mon_id.my_id.my_vers = NLM_SM; smon.mon_id.my_id.my_proc = NLM_SM_NOTIFY; ==== //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/rpc.statd/procs.c#2 (text+ko) ==== @@ -33,7 +33,7 @@ #ifndef lint static const char rcsid[] = - "$FreeBSD: src/usr.sbin/rpc.statd/procs.c,v 1.14 2003/10/26 06:14:10 peter Exp $"; + "$FreeBSD: src/usr.sbin/rpc.statd/procs.c,v 1.15 2006/08/11 21:44:53 thomas Exp $"; #endif /* not lint */ #include @@ -158,8 +158,9 @@ { syslog(LOG_DEBUG, "monitor request for host %s", arg->mon_id.mon_name); syslog(LOG_DEBUG, "recall host: %s prog: %d ver: %d proc: %d", - arg->mon_id.mon_name, - arg->mon_id.my_id.my_prog, arg->mon_id.my_id.my_vers, + arg->mon_id.my_id.my_name, + arg->mon_id.my_id.my_prog, + arg->mon_id.my_id.my_vers, arg->mon_id.my_id.my_proc); } res.res_stat = stat_fail; /* Assume fail until set otherwise */ From owner-p4-projects@FreeBSD.ORG Sun Aug 13 11:19:17 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B970C16A4DF; Sun, 13 Aug 2006 11:19:17 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 7D39216A4DD for ; Sun, 13 Aug 2006 11:19:17 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3A7D843D45 for ; Sun, 13 Aug 2006 11:19:17 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7DBJHF1002677 for ; Sun, 13 Aug 2006 11:19:17 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7DBJEfK002674 for perforce@freebsd.org; Sun, 13 Aug 2006 11:19:14 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 13 Aug 2006 11:19:14 GMT Message-Id: <200608131119.k7DBJEfK002674@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 103749 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 13 Aug 2006 11:19:18 -0000 http://perforce.freebsd.org/chv.cgi?CH=103749 Change 103749 by rwatson@rwatson_peppercorn on 2006/08/13 11:18:37 Update for OpenBSM 1.0a8. Affected files ... .. //depot/projects/trustedbsd/openbsm/configure#23 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/configure#23 (xtext) ==== @@ -1,7 +1,7 @@ #! /bin/sh -# From configure.ac P4: //depot/projects/trustedbsd/openbsm/configure.ac#23 . +# From configure.ac P4: //depot/projects/trustedbsd/openbsm/configure.ac#25 . # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.59 for OpenBSM 1.0a7. +# Generated by GNU Autoconf 2.59 for OpenBSM 1.0a8. # # Report bugs to . # @@ -424,8 +424,8 @@ # Identity of this package. PACKAGE_NAME='OpenBSM' PACKAGE_TARNAME='openbsm' -PACKAGE_VERSION='1.0a7' -PACKAGE_STRING='OpenBSM 1.0a7' +PACKAGE_VERSION='1.0a8' +PACKAGE_STRING='OpenBSM 1.0a8' PACKAGE_BUGREPORT='trustedbsd-audit@TrustesdBSD.org' ac_unique_file="bin/auditreduce/auditreduce.c" @@ -955,7 +955,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures OpenBSM 1.0a7 to adapt to many kinds of systems. +\`configure' configures OpenBSM 1.0a8 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1021,7 +1021,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of OpenBSM 1.0a7:";; + short | recursive ) echo "Configuration of OpenBSM 1.0a8:";; esac cat <<\_ACEOF @@ -1162,7 +1162,7 @@ test -n "$ac_init_help" && exit 0 if $ac_init_version; then cat <<\_ACEOF -OpenBSM configure 1.0a7 +OpenBSM configure 1.0a8 generated by GNU Autoconf 2.59 Copyright (C) 2003 Free Software Foundation, Inc. @@ -1176,7 +1176,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by OpenBSM $as_me 1.0a7, which was +It was created by OpenBSM $as_me 1.0a8, which was generated by GNU Autoconf 2.59. Invocation command line was $ $0 $@ @@ -19278,7 +19278,7 @@ # Define the identity of the package. PACKAGE=OpenBSM - VERSION=1.0a7 + VERSION=1.0a8 cat >>confdefs.h <<_ACEOF @@ -23477,7 +23477,7 @@ } >&5 cat >&5 <<_CSEOF -This file was extended by OpenBSM $as_me 1.0a7, which was +This file was extended by OpenBSM $as_me 1.0a8, which was generated by GNU Autoconf 2.59. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -23540,7 +23540,7 @@ cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -OpenBSM config.status 1.0a7 +OpenBSM config.status 1.0a8 configured by $0, generated by GNU Autoconf 2.59, with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" From owner-p4-projects@FreeBSD.ORG Sun Aug 13 11:42:48 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 160B016A4DF; Sun, 13 Aug 2006 11:42:48 +0000 (UTC) X-Original-To: perforce@FreeBSD.org 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 B48C816A4DA for ; Sun, 13 Aug 2006 11:42:47 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7B10143D45 for ; Sun, 13 Aug 2006 11:42:47 +0000 (GMT) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7DBglvL003964 for ; Sun, 13 Aug 2006 11:42:47 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7DBglgG003959 for perforce@freebsd.org; Sun, 13 Aug 2006 11:42:47 GMT (envelope-from rdivacky@FreeBSD.org) Date: Sun, 13 Aug 2006 11:42:47 GMT Message-Id: <200608131142.k7DBglgG003959@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rdivacky@FreeBSD.org using -f From: Roman Divacky To: Perforce Change Reviews Cc: Subject: PERFORCE change 103750 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 13 Aug 2006 11:42:48 -0000 http://perforce.freebsd.org/chv.cgi?CH=103750 Change 103750 by rdivacky@rdivacky_witten on 2006/08/13 11:41:46 linux_timespec -> l_timespec, no functional change Affected files ... .. //depot/projects/soc2006/rdivacky_linuxolator/i386/linux/syscalls.master#22 edit Differences ... ==== //depot/projects/soc2006/rdivacky_linuxolator/i386/linux/syscalls.master#22 (text+ko) ==== @@ -429,11 +429,11 @@ 261 AUE_NULL STD { int linux_timer_gettime(l_timer_t timerid, struct itimerspec *setting); } 262 AUE_NULL STD { int linux_timer_getoverrun(l_timer_t timerid); } 263 AUE_NULL STD { int linux_timer_delete(l_timer_t timerid); } -264 AUE_CLOCK_SETTIME STD { int linux_clock_settime(clockid_t which, struct linux_timespec *tp); } -265 AUE_NULL STD { int linux_clock_gettime(clockid_t which, struct linux_timespec *tp); } -266 AUE_NULL STD { int linux_clock_getres(clockid_t which, struct linux_timespec *tp); } +264 AUE_CLOCK_SETTIME STD { int linux_clock_settime(clockid_t which, struct l_timespec *tp); } +265 AUE_NULL STD { int linux_clock_gettime(clockid_t which, struct l_timespec *tp); } +266 AUE_NULL STD { int linux_clock_getres(clockid_t which, struct l_timespec *tp); } 267 AUE_NULL STD { int linux_clock_nanosleep(clockid_t which, int flags, \ - struct linux_timespec *rqtp, struct linux_timespec *rmtp); } + struct l_timespec *rqtp, struct l_timespec *rmtp); } 268 AUE_NULL STD { int linux_statfs64(void); } 269 AUE_NULL STD { int linux_fstatfs64(void); } 270 AUE_NULL STD { int linux_tgkill(int tgid, int pid, int sig); } From owner-p4-projects@FreeBSD.ORG Sun Aug 13 11:42:48 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 97C8116A567; Sun, 13 Aug 2006 11:42:48 +0000 (UTC) X-Original-To: perforce@FreeBSD.org 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 5DBFC16A565 for ; Sun, 13 Aug 2006 11:42:48 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E496A43D49 for ; Sun, 13 Aug 2006 11:42:47 +0000 (GMT) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7DBgljU003971 for ; Sun, 13 Aug 2006 11:42:47 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7DBglZY003967 for perforce@freebsd.org; Sun, 13 Aug 2006 11:42:47 GMT (envelope-from rdivacky@FreeBSD.org) Date: Sun, 13 Aug 2006 11:42:47 GMT Message-Id: <200608131142.k7DBglZY003967@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rdivacky@FreeBSD.org using -f From: Roman Divacky To: Perforce Change Reviews Cc: Subject: PERFORCE change 103751 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 13 Aug 2006 11:42:48 -0000 http://perforce.freebsd.org/chv.cgi?CH=103751 Change 103751 by rdivacky@rdivacky_witten on 2006/08/13 11:42:06 Regen after syscalls.master update. Affected files ... .. //depot/projects/soc2006/rdivacky_linuxolator/i386/linux/linux_proto.h#22 edit .. //depot/projects/soc2006/rdivacky_linuxolator/i386/linux/linux_syscall.h#22 edit .. //depot/projects/soc2006/rdivacky_linuxolator/i386/linux/linux_sysent.c#22 edit Differences ... ==== //depot/projects/soc2006/rdivacky_linuxolator/i386/linux/linux_proto.h#22 (text+ko) ==== @@ -765,21 +765,21 @@ }; struct linux_clock_settime_args { char which_l_[PADL_(clockid_t)]; clockid_t which; char which_r_[PADR_(clockid_t)]; - char tp_l_[PADL_(struct linux_timespec *)]; struct linux_timespec * tp; char tp_r_[PADR_(struct linux_timespec *)]; + char tp_l_[PADL_(struct l_timespec *)]; struct l_timespec * tp; char tp_r_[PADR_(struct l_timespec *)]; }; struct linux_clock_gettime_args { char which_l_[PADL_(clockid_t)]; clockid_t which; char which_r_[PADR_(clockid_t)]; - char tp_l_[PADL_(struct linux_timespec *)]; struct linux_timespec * tp; char tp_r_[PADR_(struct linux_timespec *)]; + char tp_l_[PADL_(struct l_timespec *)]; struct l_timespec * tp; char tp_r_[PADR_(struct l_timespec *)]; }; struct linux_clock_getres_args { char which_l_[PADL_(clockid_t)]; clockid_t which; char which_r_[PADR_(clockid_t)]; - char tp_l_[PADL_(struct linux_timespec *)]; struct linux_timespec * tp; char tp_r_[PADR_(struct linux_timespec *)]; + char tp_l_[PADL_(struct l_timespec *)]; struct l_timespec * tp; char tp_r_[PADR_(struct l_timespec *)]; }; struct linux_clock_nanosleep_args { char which_l_[PADL_(clockid_t)]; clockid_t which; char which_r_[PADR_(clockid_t)]; char flags_l_[PADL_(int)]; int flags; char flags_r_[PADR_(int)]; - char rqtp_l_[PADL_(struct linux_timespec *)]; struct linux_timespec * rqtp; char rqtp_r_[PADR_(struct linux_timespec *)]; - char rmtp_l_[PADL_(struct linux_timespec *)]; struct linux_timespec * rmtp; char rmtp_r_[PADR_(struct linux_timespec *)]; + char rqtp_l_[PADL_(struct l_timespec *)]; struct l_timespec * rqtp; char rqtp_r_[PADR_(struct l_timespec *)]; + char rmtp_l_[PADL_(struct l_timespec *)]; struct l_timespec * rmtp; char rmtp_r_[PADR_(struct l_timespec *)]; }; struct linux_statfs64_args { register_t dummy; ==== //depot/projects/soc2006/rdivacky_linuxolator/i386/linux/linux_syscall.h#22 (text+ko) ==== ==== //depot/projects/soc2006/rdivacky_linuxolator/i386/linux/linux_sysent.c#22 (text+ko) ==== From owner-p4-projects@FreeBSD.ORG Sun Aug 13 11:42:49 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 417F416A5CB; Sun, 13 Aug 2006 11:42:48 +0000 (UTC) X-Original-To: perforce@FreeBSD.org 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 A409716A575 for ; Sun, 13 Aug 2006 11:42:48 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4E05443D46 for ; Sun, 13 Aug 2006 11:42:48 +0000 (GMT) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7DBgm2j003977 for ; Sun, 13 Aug 2006 11:42:48 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7DBglLV003974 for perforce@freebsd.org; Sun, 13 Aug 2006 11:42:47 GMT (envelope-from rdivacky@FreeBSD.org) Date: Sun, 13 Aug 2006 11:42:47 GMT Message-Id: <200608131142.k7DBglLV003974@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rdivacky@FreeBSD.org using -f From: Roman Divacky To: Perforce Change Reviews Cc: Subject: PERFORCE change 103752 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 13 Aug 2006 11:42:49 -0000 http://perforce.freebsd.org/chv.cgi?CH=103752 Change 103752 by rdivacky@rdivacky_witten on 2006/08/13 11:42:29 Remove usage of linux_timespec and use l_timespec instead. Affected files ... .. //depot/projects/soc2006/rdivacky_linuxolator/compat/linux/linux_time.c#3 edit .. //depot/projects/soc2006/rdivacky_linuxolator/i386/linux/linux.h#16 edit Differences ... ==== //depot/projects/soc2006/rdivacky_linuxolator/compat/linux/linux_time.c#3 (text+ko) ==== @@ -58,21 +58,21 @@ #include #endif -static void native_to_linux_timespec(struct linux_timespec *, +static void native_to_linux_timespec(struct l_timespec *, struct timespec *); static void linux_to_native_timespec(struct timespec *, - struct linux_timespec *); + struct l_timespec *); static int linux_to_native_clockid(clockid_t *, clockid_t); static void -native_to_linux_timespec(struct linux_timespec *ltp, struct timespec *ntp) +native_to_linux_timespec(struct l_timespec *ltp, struct timespec *ntp) { ltp->tv_sec = ntp->tv_sec; ltp->tv_nsec = ntp->tv_nsec; } static void -linux_to_native_timespec(struct timespec *ntp, struct linux_timespec *ltp) +linux_to_native_timespec(struct timespec *ntp, struct l_timespec *ltp) { ntp->tv_sec = ltp->tv_sec; ntp->tv_nsec = ltp->tv_nsec; @@ -101,7 +101,7 @@ int linux_clock_gettime(struct thread *td, struct linux_clock_gettime_args *args) { - struct linux_timespec lts; + struct l_timespec lts; int error; clockid_t nwhich = 0; /* XXX: GCC */ struct timespec tp; @@ -123,7 +123,7 @@ linux_clock_settime(struct thread *td, struct linux_clock_settime_args *args) { struct timespec ts; - struct linux_timespec lts; + struct l_timespec lts; int error; clockid_t nwhich = 0; /* XXX: GCC */ @@ -144,7 +144,7 @@ linux_clock_getres(struct thread *td, struct linux_clock_getres_args *args) { struct timespec ts; - struct linux_timespec lts; + struct l_timespec lts; int error; clockid_t nwhich = 0; /* XXX: GCC */ @@ -168,7 +168,7 @@ linux_clock_nanosleep(struct thread *td, struct linux_clock_nanosleep_args *args) { struct timespec *rmtp; - struct linux_timespec lrqts, lrmts; + struct l_timespec lrqts, lrmts; struct timespec rqts, rmts; int error; ==== //depot/projects/soc2006/rdivacky_linuxolator/i386/linux/linux.h#16 (text+ko) ==== @@ -816,12 +816,6 @@ #define EMUL_LOCKED 1 #define EMUL_UNLOCKED 0 -typedef long linux_time_t; -struct linux_timespec { - linux_time_t tv_sec; /* seconds */ - long tv_nsec; /* nanoseconds */ -}; - #define LINUX_CLOCK_REALTIME 0 #define LINUX_CLOCK_MONOTONIC 1 #define LINUX_CLOCK_PROCESS_CPUTIME_ID 2 From owner-p4-projects@FreeBSD.ORG Sun Aug 13 11:51:00 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B1DED16A4E0; Sun, 13 Aug 2006 11:51:00 +0000 (UTC) X-Original-To: perforce@FreeBSD.org 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 8CA5916A4DE for ; Sun, 13 Aug 2006 11:51:00 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5475743D46 for ; Sun, 13 Aug 2006 11:51:00 +0000 (GMT) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7DBp0OR004409 for ; Sun, 13 Aug 2006 11:51:00 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7DBp0d7004404 for perforce@freebsd.org; Sun, 13 Aug 2006 11:51:00 GMT (envelope-from rdivacky@FreeBSD.org) Date: Sun, 13 Aug 2006 11:51:00 GMT Message-Id: <200608131151.k7DBp0d7004404@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rdivacky@FreeBSD.org using -f From: Roman Divacky To: Perforce Change Reviews Cc: Subject: PERFORCE change 103754 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 13 Aug 2006 11:51:00 -0000 http://perforce.freebsd.org/chv.cgi?CH=103754 Change 103754 by rdivacky@rdivacky_witten on 2006/08/13 11:50:22 Change timespec to l_timespec to be 64bit clean. Affected files ... .. //depot/projects/soc2006/rdivacky_linuxolator/i386/linux/syscalls.master#23 edit Differences ... ==== //depot/projects/soc2006/rdivacky_linuxolator/i386/linux/syscalls.master#23 (text+ko) ==== @@ -403,7 +403,7 @@ 238 AUE_NULL STD { int linux_tkill(int tid, int sig); } 239 AUE_SENDFILE UNIMPL linux_sendfile64 240 AUE_NULL STD { int linux_sys_futex(void *uaddr, int op, int val, \ - struct timespec *timeout, void *uaddr2, int val3); } + struct l_timespec *timeout, void *uaddr2, int val3); } 241 AUE_NULL UNIMPL linux_sched_setaffinity 242 AUE_NULL UNIMPL linux_sched_getaffinity 243 AUE_NULL STD { int linux_set_thread_area(struct l_user_desc *desc); } @@ -448,11 +448,11 @@ 278 AUE_NULL STD { int linux_mq_unlink(const char *name); } 279 AUE_NULL STD { int linux_mq_timedsend(l_mqd_t mqd, const char *msg_ptr, \ size_t msg_len, unsigned int msg_prio, const struct \ - timespec *abs_timeout); } + l_timespec *abs_timeout); } 280 AUE_NULL STD { int linux_mq_timedreceive(l_mqd_t mqd, char *msg_ptr, \ size_t msg_len, unsigned int msg_prio, const struct \ - timespec *abs_timeout); } -281 AUE_NULL STD { int linux_mq_notify(l_mqd_t mqd, const struct timespec *abs_timeout); } + l_timespec *abs_timeout); } +281 AUE_NULL STD { int linux_mq_notify(l_mqd_t mqd, const struct l_timespec *abs_timeout); } 282 AUE_NULL STD { int linux_mq_getsetattr(l_mqd_t mqd, const struct mq_attr *attr, \ struct mq_attr *oattr); } 283 AUE_NULL STD { int linux_kexec_load(void); } From owner-p4-projects@FreeBSD.ORG Sun Aug 13 11:51:01 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3280116A563; Sun, 13 Aug 2006 11:51:01 +0000 (UTC) X-Original-To: perforce@FreeBSD.org 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 EC74816A562 for ; Sun, 13 Aug 2006 11:51:00 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id AD81043D46 for ; Sun, 13 Aug 2006 11:51:00 +0000 (GMT) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7DBp06L004418 for ; Sun, 13 Aug 2006 11:51:00 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7DBp0xd004414 for perforce@freebsd.org; Sun, 13 Aug 2006 11:51:00 GMT (envelope-from rdivacky@FreeBSD.org) Date: Sun, 13 Aug 2006 11:51:00 GMT Message-Id: <200608131151.k7DBp0xd004414@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rdivacky@FreeBSD.org using -f From: Roman Divacky To: Perforce Change Reviews Cc: Subject: PERFORCE change 103755 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 13 Aug 2006 11:51:01 -0000 http://perforce.freebsd.org/chv.cgi?CH=103755 Change 103755 by rdivacky@rdivacky_witten on 2006/08/13 11:50:47 Regen after syscalls.master update. Affected files ... .. //depot/projects/soc2006/rdivacky_linuxolator/i386/linux/linux_proto.h#23 edit .. //depot/projects/soc2006/rdivacky_linuxolator/i386/linux/linux_syscall.h#23 edit .. //depot/projects/soc2006/rdivacky_linuxolator/i386/linux/linux_sysent.c#23 edit Differences ... ==== //depot/projects/soc2006/rdivacky_linuxolator/i386/linux/linux_proto.h#23 (text+ko) ==== @@ -709,7 +709,7 @@ char uaddr_l_[PADL_(void *)]; void * uaddr; char uaddr_r_[PADR_(void *)]; char op_l_[PADL_(int)]; int op; char op_r_[PADR_(int)]; char val_l_[PADL_(int)]; int val; char val_r_[PADR_(int)]; - char timeout_l_[PADL_(struct timespec *)]; struct timespec * timeout; char timeout_r_[PADR_(struct timespec *)]; + char timeout_l_[PADL_(struct l_timespec *)]; struct l_timespec * timeout; char timeout_r_[PADR_(struct l_timespec *)]; char uaddr2_l_[PADL_(void *)]; void * uaddr2; char uaddr2_r_[PADR_(void *)]; char val3_l_[PADL_(int)]; int val3; char val3_r_[PADR_(int)]; }; @@ -821,18 +821,18 @@ char msg_ptr_l_[PADL_(const char *)]; const char * msg_ptr; char msg_ptr_r_[PADR_(const char *)]; char msg_len_l_[PADL_(size_t)]; size_t msg_len; char msg_len_r_[PADR_(size_t)]; char msg_prio_l_[PADL_(unsigned int)]; unsigned int msg_prio; char msg_prio_r_[PADR_(unsigned int)]; - char abs_timeout_l_[PADL_(const struct timespec *)]; const struct timespec * abs_timeout; char abs_timeout_r_[PADR_(const struct timespec *)]; + char abs_timeout_l_[PADL_(const struct l_timespec *)]; const struct l_timespec * abs_timeout; char abs_timeout_r_[PADR_(const struct l_timespec *)]; }; struct linux_mq_timedreceive_args { char mqd_l_[PADL_(l_mqd_t)]; l_mqd_t mqd; char mqd_r_[PADR_(l_mqd_t)]; char msg_ptr_l_[PADL_(char *)]; char * msg_ptr; char msg_ptr_r_[PADR_(char *)]; char msg_len_l_[PADL_(size_t)]; size_t msg_len; char msg_len_r_[PADR_(size_t)]; char msg_prio_l_[PADL_(unsigned int)]; unsigned int msg_prio; char msg_prio_r_[PADR_(unsigned int)]; - char abs_timeout_l_[PADL_(const struct timespec *)]; const struct timespec * abs_timeout; char abs_timeout_r_[PADR_(const struct timespec *)]; + char abs_timeout_l_[PADL_(const struct l_timespec *)]; const struct l_timespec * abs_timeout; char abs_timeout_r_[PADR_(const struct l_timespec *)]; }; struct linux_mq_notify_args { char mqd_l_[PADL_(l_mqd_t)]; l_mqd_t mqd; char mqd_r_[PADR_(l_mqd_t)]; - char abs_timeout_l_[PADL_(const struct timespec *)]; const struct timespec * abs_timeout; char abs_timeout_r_[PADR_(const struct timespec *)]; + char abs_timeout_l_[PADL_(const struct l_timespec *)]; const struct l_timespec * abs_timeout; char abs_timeout_r_[PADR_(const struct l_timespec *)]; }; struct linux_mq_getsetattr_args { char mqd_l_[PADL_(l_mqd_t)]; l_mqd_t mqd; char mqd_r_[PADR_(l_mqd_t)]; ==== //depot/projects/soc2006/rdivacky_linuxolator/i386/linux/linux_syscall.h#23 (text+ko) ==== ==== //depot/projects/soc2006/rdivacky_linuxolator/i386/linux/linux_sysent.c#23 (text+ko) ==== From owner-p4-projects@FreeBSD.ORG Sun Aug 13 11:54:05 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AF00816A4E0; Sun, 13 Aug 2006 11:54:05 +0000 (UTC) X-Original-To: perforce@FreeBSD.org 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 6A36C16A4DE for ; Sun, 13 Aug 2006 11:54:05 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1E41343D46 for ; Sun, 13 Aug 2006 11:54:05 +0000 (GMT) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7DBs41f004553 for ; Sun, 13 Aug 2006 11:54:04 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7DBs4aq004550 for perforce@freebsd.org; Sun, 13 Aug 2006 11:54:04 GMT (envelope-from rdivacky@FreeBSD.org) Date: Sun, 13 Aug 2006 11:54:04 GMT Message-Id: <200608131154.k7DBs4aq004550@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rdivacky@FreeBSD.org using -f From: Roman Divacky To: Perforce Change Reviews Cc: Subject: PERFORCE change 103756 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 13 Aug 2006 11:54:06 -0000 http://perforce.freebsd.org/chv.cgi?CH=103756 Change 103756 by rdivacky@rdivacky_witten on 2006/08/13 11:53:31 Make linux_futex.c 64bit clean with respect to timespec. Affected files ... .. //depot/projects/soc2006/rdivacky_linuxolator/compat/linux/linux_futex.c#20 edit Differences ... ==== //depot/projects/soc2006/rdivacky_linuxolator/compat/linux/linux_futex.c#20 (text+ko) ==== @@ -97,7 +97,7 @@ { int val; int ret; - struct timespec timeout = { 0, 0 }; + struct l_timespec timeout = { 0, 0 }; int error = 0; struct futex *f, *f2; struct futex *newf; From owner-p4-projects@FreeBSD.ORG Sun Aug 13 13:05:35 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9BE3416A4E2; Sun, 13 Aug 2006 13:05:35 +0000 (UTC) X-Original-To: perforce@FreeBSD.org 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 438CD16A4DA for ; Sun, 13 Aug 2006 13:05:35 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id DF27643D46 for ; Sun, 13 Aug 2006 13:05:34 +0000 (GMT) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7DD5YnE018487 for ; Sun, 13 Aug 2006 13:05:34 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7DD5Yxh018484 for perforce@freebsd.org; Sun, 13 Aug 2006 13:05:34 GMT (envelope-from rdivacky@FreeBSD.org) Date: Sun, 13 Aug 2006 13:05:34 GMT Message-Id: <200608131305.k7DD5Yxh018484@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rdivacky@FreeBSD.org using -f From: Roman Divacky To: Perforce Change Reviews Cc: Subject: PERFORCE change 103757 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 13 Aug 2006 13:05:35 -0000 http://perforce.freebsd.org/chv.cgi?CH=103757 Change 103757 by rdivacky@rdivacky_witten on 2006/08/13 13:04:55 Move code between MI and MD sources. Affected files ... .. //depot/projects/soc2006/rdivacky_linuxolator/compat/linux/linux_emul.c#1 add .. //depot/projects/soc2006/rdivacky_linuxolator/compat/linux/linux_emul.h#1 add .. //depot/projects/soc2006/rdivacky_linuxolator/compat/linux/linux_misc.c#12 edit .. //depot/projects/soc2006/rdivacky_linuxolator/compat/linux/linux_signal.c#5 edit .. //depot/projects/soc2006/rdivacky_linuxolator/compat/linux/linux_time.c#4 edit .. //depot/projects/soc2006/rdivacky_linuxolator/i386/linux/linux.h#17 edit .. //depot/projects/soc2006/rdivacky_linuxolator/i386/linux/linux_machdep.c#44 edit .. //depot/projects/soc2006/rdivacky_linuxolator/modules/linux/Makefile#7 edit Differences ... ==== //depot/projects/soc2006/rdivacky_linuxolator/compat/linux/linux_misc.c#12 (text+ko) ==== @@ -74,6 +74,7 @@ #include #include +#include #ifdef COMPAT_LINUX32 #include @@ -1349,6 +1350,19 @@ } int +linux_gettid(struct thread *td, struct linux_gettid_args *args) +{ +#ifdef DEBUG + if (ldebug(gettid)) + printf(ARGS(gettid, "")); +#endif + + td->td_retval[0] = td->td_proc->p_pid; + return (0); +} + + +int linux_getppid(struct thread *td, struct linux_getppid_args *args) { #ifdef LINUX_NTPL @@ -1450,3 +1464,39 @@ args->len, 0, 0)); } +int +linux_exit_group(struct thread *td, struct linux_exit_group_args *args) +{ + struct linux_emuldata *em, *td_em, *tmp_em; + struct proc *sp; + +#ifdef DEBUG + if (ldebug(exit_group)) + printf(ARGS(exit_group, "%i"), args->error_code); +#endif + + td_em = em_find(td->td_proc, EMUL_UNLOCKED); + + KASSERT(td_em != NULL, ("exit_group: emuldata not found.\n")); + + EMUL_SHARED_RLOCK(&emul_shared_lock); + LIST_FOREACH_SAFE(em, &td_em->shared->threads, threads, tmp_em) { + if (em->pid == td_em->pid) + continue; + + sp = pfind(em->pid); + psignal(sp, SIGKILL); + PROC_UNLOCK(sp); +#ifdef DEBUG + printf(LMSG("linux_sys_exit_group: kill PID %d\n"), em->pid); +#endif + } + + EMUL_SHARED_RUNLOCK(&emul_shared_lock); + EMUL_UNLOCK(&emul_lock); + + exit1(td, W_EXITCODE(args->error_code,0)); + + return (0); +} + ==== //depot/projects/soc2006/rdivacky_linuxolator/compat/linux/linux_signal.c#5 (text+ko) ==== @@ -49,6 +49,7 @@ #endif #include #include +#include extern struct sx emul_shared_lock; extern struct sx emul_lock; @@ -493,3 +494,14 @@ return linux_kill(td, &ka); } + +int +linux_tkill(struct thread *td, struct linux_tkill_args *args) +{ +#ifdef DEBUG + if (ldebug(tkill)) + printf(ARGS(tkill, "%i, %i"), args->tid, args->sig); +#endif + + return (linux_kill(td, (struct linux_kill_args *) args)); +} ==== //depot/projects/soc2006/rdivacky_linuxolator/compat/linux/linux_time.c#4 (text+ko) ==== @@ -201,34 +201,3 @@ return 0; } - -/* copied from kern/kern_time.c */ -int -linux_timer_create(struct thread *td, struct linux_timer_create_args *args) -{ - return ktimer_create(td, (struct ktimer_create_args *) args); -} - -int -linux_timer_settime(struct thread *td, struct linux_timer_settime_args *args) -{ - return ktimer_settime(td, (struct ktimer_settime_args *) args); -} - -int -linux_timer_gettime(struct thread *td, struct linux_timer_gettime_args *args) -{ - return ktimer_gettime(td, (struct ktimer_gettime_args *) args); -} - -int -linux_timer_getoverrun(struct thread *td, struct linux_timer_getoverrun_args *args) -{ - return ktimer_getoverrun(td, (struct ktimer_getoverrun_args *) args); -} - -int -linux_timer_delete(struct thread *td, struct linux_timer_delete_args *args) -{ - return ktimer_delete(td, (struct ktimer_delete_args *) args); -} ==== //depot/projects/soc2006/rdivacky_linuxolator/i386/linux/linux.h#17 (text+ko) ==== @@ -781,41 +781,6 @@ #define GET_PRESENT(desc) (((desc)->b >> ENTRY_B_SEG_NOT_PRESENT) & 1) #define GET_USEABLE(desc) (((desc)->b >> ENTRY_B_USEABLE) & 1) -struct linux_emuldata_shared { - int refs; - pid_t group_pid; - - LIST_HEAD(, linux_emuldata) threads; /* head of list of linux threads */ -}; - -/* modeled after similar structure in NetBSD - * this will be extended as we need more functionality - */ -struct linux_emuldata { - pid_t pid; - - int *child_set_tid; /* in clone(): Child's TID to set on clone */ - int *child_clear_tid; /* in clone(): Child's TID to clear on exit */ - - struct linux_emuldata_shared *shared; - - LIST_ENTRY(linux_emuldata) threads; /* list of linux threads */ -}; - -struct linux_emuldata *em_find(struct proc *, int locked); - -#define EMUL_LOCK(l) sx_xlock(l) -#define EMUL_UNLOCK(l) sx_xunlock(l) - -#define EMUL_SHARED_RLOCK(l) sx_slock(l) -#define EMUL_SHARED_RUNLOCK(l) sx_sunlock(l) -#define EMUL_SHARED_WLOCK(l) sx_xlock(l) -#define EMUL_SHARED_WUNLOCK(l) sx_xunlock(l) - -/* for em_find use */ -#define EMUL_LOCKED 1 -#define EMUL_UNLOCKED 0 - #define LINUX_CLOCK_REALTIME 0 #define LINUX_CLOCK_MONOTONIC 1 #define LINUX_CLOCK_PROCESS_CPUTIME_ID 2 @@ -826,4 +791,18 @@ typedef int l_timer_t; typedef int l_mqd_t; +#define CLONE_VM 0x100 +#define CLONE_FS 0x200 +#define CLONE_FILES 0x400 +#define CLONE_SIGHAND 0x800 +#define CLONE_PID 0x1000 /* this flag does not exist in linux */ +#define CLONE_PARENT 0x00008000 +#define CLONE_THREAD 0x10000 +#define CLONE_SETTLS 0x80000 +#define CLONE_CHILD_CLEARTID 0x00200000 +#define CLONE_CHILD_SETTID 0x01000000 +#define CLONE_PARENT_SETTID 0x00100000 + +#define THREADING_FLAGS (CLONE_VM | CLONE_FS | CLONE_FILES | CLONE_SIGHAND) + #endif /* !_I386_LINUX_LINUX_H_ */ ==== //depot/projects/soc2006/rdivacky_linuxolator/i386/linux/linux_machdep.c#44 (text+ko) ==== @@ -58,20 +58,15 @@ #include #include -#include #include #include #include +#include #include /* needed for pcb definition in linux_set_thread_area */ -static int linux_proc_init(struct thread *, pid_t, int); -void linux_proc_exit(void *, struct proc *); -void linux_schedtail(void *, struct proc *); -void linux_proc_exec(void *, struct proc *, struct image_params *); - -struct sx emul_shared_lock; -struct sx emul_lock; +extern struct sx emul_shared_lock; +extern struct sx emul_lock; extern struct sysentvec elf32_freebsd_sysvec; /* defined in i386/i386/elf_machdep.c */ @@ -296,23 +291,6 @@ return (linux_select(td, &newsel)); } -/* this returns locked reference to the emuldata entry (if found) */ -struct linux_emuldata * -em_find(struct proc *p, int locked) -{ - struct linux_emuldata *em; - - if (locked == EMUL_UNLOCKED) - EMUL_LOCK(&emul_lock); - - em = p->p_emuldata; - - if (em == NULL && locked == EMUL_UNLOCKED) - EMUL_UNLOCK(&emul_lock); - - return (em); -} - int linux_fork(struct thread *td, struct linux_fork_args *args) { @@ -356,20 +334,6 @@ return (0); } -#define CLONE_VM 0x100 -#define CLONE_FS 0x200 -#define CLONE_FILES 0x400 -#define CLONE_SIGHAND 0x800 -#define CLONE_PID 0x1000 /* this flag does not exist in linux */ -#define CLONE_PARENT 0x00008000 -#define CLONE_THREAD 0x10000 -#define CLONE_SETTLS 0x80000 -#define CLONE_CHILD_CLEARTID 0x00200000 -#define CLONE_CHILD_SETTID 0x01000000 -#define CLONE_PARENT_SETTID 0x00100000 - -#define THREADING_FLAGS (CLONE_VM | CLONE_FS | CLONE_FILES | CLONE_SIGHAND) - int linux_clone(struct thread *td, struct linux_clone_args *args) { @@ -1135,282 +1099,33 @@ return (0); } +/* copied from kern/kern_time.c */ int -linux_gettid(struct thread *td, struct linux_gettid_args *args) +linux_timer_create(struct thread *td, struct linux_timer_create_args *args) { -#ifdef DEBUG - if (ldebug(gettid)) - printf(ARGS(gettid, "")); -#endif - - td->td_retval[0] = td->td_proc->p_pid; - return (0); + return ktimer_create(td, (struct ktimer_create_args *) args); } int -linux_tkill(struct thread *td, struct linux_tkill_args *args) +linux_timer_settime(struct thread *td, struct linux_timer_settime_args *args) { -#ifdef DEBUG - if (ldebug(tkill)) - printf(ARGS(tkill, "%i, %i"), args->tid, args->sig); -#endif - - return (linux_kill(td, (struct linux_kill_args *) args)); + return ktimer_settime(td, (struct ktimer_settime_args *) args); } -static int -linux_proc_init(struct thread *td, pid_t child, int flags) +int +linux_timer_gettime(struct thread *td, struct linux_timer_gettime_args *args) { - struct linux_emuldata *em, *p_em; - struct proc *p; - - /* XXX: locking? */ - if (child != 0) { - /* non-exec call */ - MALLOC(em, struct linux_emuldata *, sizeof *em, M_LINUX, M_WAITOK | M_ZERO); - em->pid = child; - if (flags & CLONE_VM) { - /* handled later in the code */ - } else { - struct linux_emuldata_shared *s; - - MALLOC(s, struct linux_emuldata_shared *, sizeof *s, M_LINUX, M_WAITOK | M_ZERO); - em->shared = s; - s->refs = 1; - s->group_pid = child; - - LIST_INIT(&s->threads); - } - p = pfind(child); - if (p == NULL) - panic("process not found in proc_init\n"); - p->p_emuldata = em; - PROC_UNLOCK(p); - } else { - /* lookup the old one */ - em = em_find(td->td_proc, EMUL_UNLOCKED); - KASSERT(em != NULL, ("proc_init: emuldata not found in exec case.\n")); - } - - em->child_clear_tid = NULL; - em->child_set_tid = NULL; - - /* allocate the shared struct only in clone()/fork cases - * in the case of clone() td = calling proc and child = pid of - * the newly created proc - */ - if (child != 0) { - if (flags & CLONE_VM) { - /* lookup the parent */ - p_em = em_find(td->td_proc, EMUL_LOCKED); - KASSERT(p_em != NULL, ("proc_init: parent emuldata not found for CLONE_VM\n")); - em->shared = p_em->shared; - em->shared->refs++; - } else { - /* handled earlier to avoid malloc(M_WAITOK) with rwlock held */ - } - } - - - if (child != 0) { - EMUL_SHARED_WLOCK(&emul_shared_lock); - LIST_INSERT_HEAD(&em->shared->threads, em, threads); - EMUL_SHARED_WUNLOCK(&emul_shared_lock); - - p = pfind(child); - PROC_UNLOCK(p); - /* we might have a sleeping linux_schedtail */ - wakeup(&p->p_emuldata); - } else - EMUL_UNLOCK(&emul_lock); - - return (0); + return ktimer_gettime(td, (struct ktimer_gettime_args *) args); } -void -linux_proc_exit(void *arg __unused, struct proc *p) -{ - struct linux_emuldata *em; - int error; - struct thread *td = FIRST_THREAD_IN_PROC(p); - int *child_clear_tid; - - if (__predict_true(p->p_sysent != &elf_linux_sysvec)) - return; - - /* find the emuldata */ - em = em_find(p, EMUL_UNLOCKED); - - KASSERT(em != NULL, ("proc_exit: emuldata not found.\n")); - - child_clear_tid = em->child_clear_tid; - - EMUL_UNLOCK(&emul_lock); - - EMUL_SHARED_WLOCK(&emul_shared_lock); - LIST_REMOVE(em, threads); - - PROC_LOCK(p); - p->p_emuldata = NULL; - PROC_UNLOCK(p); - - em->shared->refs--; - if (em->shared->refs == 0) - FREE(em->shared, M_LINUX); - EMUL_SHARED_WUNLOCK(&emul_shared_lock); - - if (child_clear_tid != NULL) { - struct linux_sys_futex_args cup; - int null = 0; - - /* XXX: doesnt futex use the addr? */ - error = copyout(&null, child_clear_tid, sizeof(null)); - if (error) - return; - - /* futexes stuff */ - cup.uaddr = child_clear_tid; - cup.op = LINUX_FUTEX_WAKE; - cup.val = 0x7fffffff; /* Awake everyone */ - cup.timeout = NULL; - cup.uaddr2 = NULL; - cup.val3 = 0; - error = linux_sys_futex(FIRST_THREAD_IN_PROC(p), &cup); - if (error) - printf(LMSG("futex stuff in proc_exit failed.\n")); - } - - /* clean the stuff up */ - FREE(em, M_LINUX); -} - -/* This is used in a case of transition from FreeBSD binary execing to linux binary - * in this case we create linux emuldata proc entry with the pid of the currently running - * process. - */ -void linux_proc_exec(void *arg __unused, struct proc *p, struct image_params *imgp) -{ - if (__predict_false(imgp->sysent == &elf_linux_sysvec - && p->p_sysent != &elf_linux_sysvec)) - linux_proc_init(FIRST_THREAD_IN_PROC(p), p->p_pid, 0); - if (__predict_false(imgp->sysent != &elf_linux_sysvec - && p->p_sysent == &elf_linux_sysvec)) { - struct linux_emuldata *em; - - em = em_find(p, EMUL_UNLOCKED); - - KASSERT(em != NULL, ("proc_exec: emuldata not found.\n")); - - EMUL_UNLOCK(&emul_lock); - - EMUL_SHARED_WLOCK(&emul_shared_lock); - LIST_REMOVE(em, threads); - - PROC_LOCK(p); - p->p_emuldata = NULL; - PROC_UNLOCK(p); - - em->shared->refs--; - if (em->shared->refs == 0) - FREE(em->shared, M_LINUX); - EMUL_SHARED_WUNLOCK(&emul_shared_lock); - - FREE(em, M_LINUX); - } -} - -extern int hz; /* in subr_param.c */ - -void -linux_schedtail(void *arg __unused, struct proc *p) -{ - struct linux_emuldata *em; - int error = 0; -#ifdef DEBUG - struct thread *td = FIRST_THREAD_IN_PROC(p); -#endif - int *child_set_tid; - - if (p->p_sysent != &elf_linux_sysvec) - return; - -retry: - /* find the emuldata */ - em = em_find(p, EMUL_UNLOCKED); - - if (em == NULL) { - /* We might have been called before proc_init for this process so - * tsleep and be woken up by it. We use p->p_emuldata for this - */ - - error = tsleep(&p->p_emuldata, PLOCK, "linux_schedtail", hz); - if (error == 0) - goto retry; - panic("no emuldata found for userreting process.\n"); - } - child_set_tid = em->child_set_tid; - EMUL_UNLOCK(&emul_lock); - - if (child_set_tid != NULL) - error = copyout(&p->p_pid, (int *) child_set_tid, sizeof(p->p_pid)); - - return; -} - int -linux_set_tid_address(struct thread *td, struct linux_set_tid_address_args *args) +linux_timer_getoverrun(struct thread *td, struct linux_timer_getoverrun_args *args) { - struct linux_emuldata *em; - -#ifdef DEBUG - if (ldebug(set_tid_address)) - printf(ARGS(set_tid_address, "%p"), args->tidptr); -#endif - - /* find the emuldata */ - em = em_find(td->td_proc, EMUL_UNLOCKED); - - KASSERT(em != NULL, ("set_tid_address: emuldata not found.\n")); - - em->child_clear_tid = args->tidptr; - td->td_retval[0] = td->td_proc->p_pid; - - EMUL_UNLOCK(&emul_lock); - return 0; + return ktimer_getoverrun(td, (struct ktimer_getoverrun_args *) args); } int -linux_exit_group(struct thread *td, struct linux_exit_group_args *args) +linux_timer_delete(struct thread *td, struct linux_timer_delete_args *args) { - struct linux_emuldata *em, *td_em, *tmp_em; - struct proc *sp; - -#ifdef DEBUG - if (ldebug(exit_group)) - printf(ARGS(exit_group, "%i"), args->error_code); -#endif - - td_em = em_find(td->td_proc, EMUL_UNLOCKED); - - KASSERT(td_em != NULL, ("exit_group: emuldata not found.\n")); - - EMUL_SHARED_RLOCK(&emul_shared_lock); - LIST_FOREACH_SAFE(em, &td_em->shared->threads, threads, tmp_em) { - if (em->pid == td_em->pid) - continue; - - sp = pfind(em->pid); - psignal(sp, SIGKILL); - PROC_UNLOCK(sp); -#ifdef DEBUG - printf(LMSG("linux_sys_exit_group: kill PID %d\n"), em->pid); -#endif - } - - EMUL_SHARED_RUNLOCK(&emul_shared_lock); - EMUL_UNLOCK(&emul_lock); - - exit1(td, W_EXITCODE(args->error_code,0)); - - return (0); + return ktimer_delete(td, (struct ktimer_delete_args *) args); } ==== //depot/projects/soc2006/rdivacky_linuxolator/modules/linux/Makefile#7 (text+ko) ==== @@ -8,7 +8,7 @@ .PATH: ${.CURDIR}/../../compat/linux ${.CURDIR}/../../${MACHINE_ARCH}/linux${SFX} KMOD= linux -SRCS= linux${SFX}_dummy.c linux_file.c linux_futex.c linux_getcwd.c linux_ioctl.c \ +SRCS= linux${SFX}_dummy.c linux_emul.c linux_file.c linux_futex.c linux_getcwd.c linux_ioctl.c \ linux_ipc.c linux${SFX}_machdep.c linux_mib.c linux_misc.c linux_signal.c \ linux_socket.c linux_stats.c linux_sysctl.c linux${SFX}_sysent.c linux${SFX}_sysvec.c \ linux_uid16.c linux_util.c linux_time.c opt_inet6.h opt_mac.h opt_compat.h opt_posix.h \ From owner-p4-projects@FreeBSD.ORG Sun Aug 13 13:14:49 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E956316A4E6; Sun, 13 Aug 2006 13:14:48 +0000 (UTC) X-Original-To: perforce@FreeBSD.org 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 91C5416A4DA for ; Sun, 13 Aug 2006 13:14:48 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5279C43D45 for ; Sun, 13 Aug 2006 13:14:48 +0000 (GMT) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7DDEmED020830 for ; Sun, 13 Aug 2006 13:14:48 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7DDEmNc020827 for perforce@freebsd.org; Sun, 13 Aug 2006 13:14:48 GMT (envelope-from rdivacky@FreeBSD.org) Date: Sun, 13 Aug 2006 13:14:48 GMT Message-Id: <200608131314.k7DDEmNc020827@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rdivacky@FreeBSD.org using -f From: Roman Divacky To: Perforce Change Reviews Cc: Subject: PERFORCE change 103758 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 13 Aug 2006 13:14:49 -0000 http://perforce.freebsd.org/chv.cgi?CH=103758 Change 103758 by rdivacky@rdivacky_witten on 2006/08/13 13:14:43 Add MI syscalls to amd64 syscalls.master Affected files ... .. //depot/projects/soc2006/rdivacky_linuxolator/amd64/linux32/syscalls.master#10 edit Differences ... ==== //depot/projects/soc2006/rdivacky_linuxolator/amd64/linux32/syscalls.master#10 (text+ko) ==== @@ -121,7 +121,7 @@ 62 AUE_NULL STD { int linux_ustat(l_dev_t dev, \ struct l_ustat *ubuf); } 63 AUE_DUP2 NOPROTO { int dup2(u_int from, u_int to); } -64 AUE_GETPPID NOPROTO { int getppid(void); } +64 AUE_GETPPID STD { int linux_getppid(void); } 65 AUE_GETPGRP NOPROTO { int getpgrp(void); } 66 AUE_SETSID NOPROTO { int setsid(void); } 67 AUE_NULL STD { int linux_sigaction(l_int sig, \ @@ -213,6 +213,7 @@ 118 AUE_FSYNC NOPROTO { int fsync(int fd); } 119 AUE_SIGRETURN STD { int linux_sigreturn( \ struct l_sigframe *sfp); } +; linux uses some strange calling convention here so we have to use the dummy arg 120 AUE_RFORK STD { int linux_clone(l_int flags, void *stack); } 121 AUE_SYSCTL NOPROTO { int setdomainname(char *name, \ int len); } @@ -382,8 +383,7 @@ uintptr_t arg); } 222 AUE_NULL UNIMPL 223 AUE_NULL UNIMPL -224 AUE_NULL NOPROTO { long linux_getpid(void); } gettid \ - linux_getpid_args void +224 AUE_NULL STD { long linux_gettid(void); } 225 AUE_NULL UNIMPL linux_readahead 226 AUE_NULL STD { int linux_setxattr(void); } 227 AUE_NULL STD { int linux_lsetxattr(void); } @@ -397,9 +397,10 @@ 235 AUE_NULL STD { int linux_removexattr(void); } 236 AUE_NULL STD { int linux_lremovexattr(void); } 237 AUE_NULL STD { int linux_fremovexattr(void); } -238 AUE_NULL UNIMPL linux_tkill +238 AUE_NULL STD { int linux_tkill(int tid, int sig); } 239 AUE_SENDFILE UNIMPL linux_sendfile64 -240 AUE_NULL UNIMPL linux_futex +240 AUE_NULL STD { int linux_sys_futex(void *uaddr, int op, int val, \ + struct l_timespec *timeout, void *uaddr2, int val3); } 241 AUE_NULL UNIMPL linux_sched_setaffinity 242 AUE_NULL UNIMPL linux_sched_getaffinity 243 AUE_NULL UNIMPL linux_set_thread_area @@ -411,14 +412,13 @@ 249 AUE_NULL UNIMPL linux_io_cancel 250 AUE_NULL STD { int linux_fadvise64(void); } 251 AUE_NULL UNIMPL -252 AUE_EXIT NOPROTO { void sys_exit(int rval); } exit_group \ - sys_exit_args void +252 AUE_EXIT STD { int linux_exit_group(int error_code); } 253 AUE_NULL STD { int linux_lookup_dcookie(void); } 254 AUE_NULL STD { int linux_epoll_create(void); } 255 AUE_NULL STD { int linux_epoll_ctl(void); } 256 AUE_NULL STD { int linux_epoll_wait(void); } 257 AUE_NULL STD { int linux_remap_file_pages(void); } -258 AUE_NULL STD { int linux_set_tid_address(void); } +258 AUE_NULL STD { int linux_set_tid_address(int *tidptr); } 259 AUE_NULL STD { int linux_timer_create(void); } 260 AUE_NULL STD { int linux_timer_settime(void); } 261 AUE_NULL STD { int linux_timer_gettime(void); } @@ -430,7 +430,7 @@ 267 AUE_NULL STD { int linux_clock_nanosleep(void); } 268 AUE_NULL STD { int linux_statfs64(void); } 269 AUE_NULL STD { int linux_fstatfs64(void); } -270 AUE_NULL STD { int linux_tgkill(void); } +270 AUE_NULL STD { int linux_tgkill(int tgid, int pid, int sig); } 271 AUE_NULL STD { int linux_utimes(void); } 272 AUE_NULL STD { int linux_fadvise64_64(void); } 273 AUE_NULL UNIMPL From owner-p4-projects@FreeBSD.ORG Sun Aug 13 13:15:51 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6A66716A4E0; Sun, 13 Aug 2006 13:15:51 +0000 (UTC) X-Original-To: perforce@FreeBSD.org 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 37E9716A4DF for ; Sun, 13 Aug 2006 13:15:51 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 991FB43D46 for ; Sun, 13 Aug 2006 13:15:50 +0000 (GMT) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7DDFoSt020943 for ; Sun, 13 Aug 2006 13:15:50 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7DDFon8020940 for perforce@freebsd.org; Sun, 13 Aug 2006 13:15:50 GMT (envelope-from rdivacky@FreeBSD.org) Date: Sun, 13 Aug 2006 13:15:50 GMT Message-Id: <200608131315.k7DDFon8020940@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rdivacky@FreeBSD.org using -f From: Roman Divacky To: Perforce Change Reviews Cc: Subject: PERFORCE change 103759 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 13 Aug 2006 13:15:51 -0000 http://perforce.freebsd.org/chv.cgi?CH=103759 Change 103759 by rdivacky@rdivacky_witten on 2006/08/13 13:14:58 Regen after syscalls.master update. Affected files ... .. //depot/projects/soc2006/rdivacky_linuxolator/amd64/linux32/linux32_proto.h#10 edit .. //depot/projects/soc2006/rdivacky_linuxolator/amd64/linux32/linux32_syscall.h#10 edit .. //depot/projects/soc2006/rdivacky_linuxolator/amd64/linux32/linux32_sysent.c#10 edit Differences ... ==== //depot/projects/soc2006/rdivacky_linuxolator/amd64/linux32/linux32_proto.h#10 (text+ko) ==== @@ -2,7 +2,7 @@ * System call prototypes. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/amd64/linux32/linux32_proto.h,v 1.19 2006/07/28 19:08:35 jhb Exp $ + * $FreeBSD$ * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.18 2006/07/28 19:05:26 jhb Exp */ @@ -11,10 +11,7 @@ #include #include -#include -#include #include - #include struct proc; @@ -197,6 +194,9 @@ char dev_l_[PADL_(l_dev_t)]; l_dev_t dev; char dev_r_[PADR_(l_dev_t)]; char ubuf_l_[PADL_(struct l_ustat *)]; struct l_ustat * ubuf; char ubuf_r_[PADR_(struct l_ustat *)]; }; +struct linux_getppid_args { + register_t dummy; +}; struct linux_sigaction_args { char sig_l_[PADL_(l_int)]; l_int sig; char sig_r_[PADR_(l_int)]; char nsa_l_[PADL_(l_osigaction_t *)]; l_osigaction_t * nsa; char nsa_r_[PADR_(l_osigaction_t *)]; @@ -668,6 +668,9 @@ char cmd_l_[PADL_(l_uint)]; l_uint cmd; char cmd_r_[PADR_(l_uint)]; char arg_l_[PADL_(uintptr_t)]; uintptr_t arg; char arg_r_[PADR_(uintptr_t)]; }; +struct linux_gettid_args { + register_t dummy; +}; struct linux_setxattr_args { register_t dummy; }; @@ -704,9 +707,24 @@ struct linux_fremovexattr_args { register_t dummy; }; +struct linux_tkill_args { + char tid_l_[PADL_(int)]; int tid; char tid_r_[PADR_(int)]; + char sig_l_[PADL_(int)]; int sig; char sig_r_[PADR_(int)]; +}; +struct linux_sys_futex_args { + char uaddr_l_[PADL_(void *)]; void * uaddr; char uaddr_r_[PADR_(void *)]; + char op_l_[PADL_(int)]; int op; char op_r_[PADR_(int)]; + char val_l_[PADL_(int)]; int val; char val_r_[PADR_(int)]; + char timeout_l_[PADL_(struct l_timespec *)]; struct l_timespec * timeout; char timeout_r_[PADR_(struct l_timespec *)]; + char uaddr2_l_[PADL_(void *)]; void * uaddr2; char uaddr2_r_[PADR_(void *)]; + char val3_l_[PADL_(int)]; int val3; char val3_r_[PADR_(int)]; +}; struct linux_fadvise64_args { register_t dummy; }; +struct linux_exit_group_args { + char error_code_l_[PADL_(int)]; int error_code; char error_code_r_[PADR_(int)]; +}; struct linux_lookup_dcookie_args { register_t dummy; }; @@ -723,7 +741,7 @@ register_t dummy; }; struct linux_set_tid_address_args { - register_t dummy; + char tidptr_l_[PADL_(int *)]; int * tidptr; char tidptr_r_[PADR_(int *)]; }; struct linux_timer_create_args { register_t dummy; @@ -759,7 +777,9 @@ register_t dummy; }; struct linux_tgkill_args { - register_t dummy; + char tgid_l_[PADL_(int)]; int tgid; char tgid_r_[PADR_(int)]; + char pid_l_[PADL_(int)]; int pid; char pid_r_[PADR_(int)]; + char sig_l_[PADL_(int)]; int sig; char sig_r_[PADR_(int)]; }; struct linux_utimes_args { register_t dummy; @@ -919,6 +939,7 @@ int linux_fcntl(struct thread *, struct linux_fcntl_args *); int linux_olduname(struct thread *, struct linux_olduname_args *); int linux_ustat(struct thread *, struct linux_ustat_args *); +int linux_getppid(struct thread *, struct linux_getppid_args *); int linux_sigaction(struct thread *, struct linux_sigaction_args *); int linux_sgetmask(struct thread *, struct linux_sgetmask_args *); int linux_ssetmask(struct thread *, struct linux_ssetmask_args *); @@ -1033,6 +1054,7 @@ int linux_mincore(struct thread *, struct linux_mincore_args *); int linux_getdents64(struct thread *, struct linux_getdents64_args *); int linux_fcntl64(struct thread *, struct linux_fcntl64_args *); +int linux_gettid(struct thread *, struct linux_gettid_args *); int linux_setxattr(struct thread *, struct linux_setxattr_args *); int linux_lsetxattr(struct thread *, struct linux_lsetxattr_args *); int linux_fsetxattr(struct thread *, struct linux_fsetxattr_args *); @@ -1045,7 +1067,10 @@ int linux_removexattr(struct thread *, struct linux_removexattr_args *); int linux_lremovexattr(struct thread *, struct linux_lremovexattr_args *); int linux_fremovexattr(struct thread *, struct linux_fremovexattr_args *); +int linux_tkill(struct thread *, struct linux_tkill_args *); +int linux_sys_futex(struct thread *, struct linux_sys_futex_args *); int linux_fadvise64(struct thread *, struct linux_fadvise64_args *); +int linux_exit_group(struct thread *, struct linux_exit_group_args *); int linux_lookup_dcookie(struct thread *, struct linux_lookup_dcookie_args *); int linux_epoll_create(struct thread *, struct linux_epoll_create_args *); int linux_epoll_ctl(struct thread *, struct linux_epoll_ctl_args *); ==== //depot/projects/soc2006/rdivacky_linuxolator/amd64/linux32/linux32_syscall.h#10 (text+ko) ==== @@ -2,7 +2,7 @@ * System call numbers. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/amd64/linux32/linux32_syscall.h,v 1.19 2006/07/28 19:08:35 jhb Exp $ + * $FreeBSD$ * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.18 2006/07/28 19:05:26 jhb Exp */ @@ -60,7 +60,7 @@ #define LINUX_SYS_chroot 61 #define LINUX_SYS_linux_ustat 62 #define LINUX_SYS_dup2 63 -#define LINUX_SYS_getppid 64 +#define LINUX_SYS_linux_getppid 64 #define LINUX_SYS_getpgrp 65 #define LINUX_SYS_setsid 66 #define LINUX_SYS_linux_sigaction 67 @@ -206,7 +206,7 @@ #define LINUX_SYS_madvise 219 #define LINUX_SYS_linux_getdents64 220 #define LINUX_SYS_linux_fcntl64 221 -#define LINUX_SYS_gettid 224 +#define LINUX_SYS_linux_gettid 224 #define LINUX_SYS_linux_setxattr 226 #define LINUX_SYS_linux_lsetxattr 227 #define LINUX_SYS_linux_fsetxattr 228 @@ -219,8 +219,10 @@ #define LINUX_SYS_linux_removexattr 235 #define LINUX_SYS_linux_lremovexattr 236 #define LINUX_SYS_linux_fremovexattr 237 +#define LINUX_SYS_linux_tkill 238 +#define LINUX_SYS_linux_sys_futex 240 #define LINUX_SYS_linux_fadvise64 250 -#define LINUX_SYS_exit_group 252 +#define LINUX_SYS_linux_exit_group 252 #define LINUX_SYS_linux_lookup_dcookie 253 #define LINUX_SYS_linux_epoll_create 254 #define LINUX_SYS_linux_epoll_ctl 255 ==== //depot/projects/soc2006/rdivacky_linuxolator/amd64/linux32/linux32_sysent.c#10 (text+ko) ==== @@ -2,7 +2,7 @@ * System call switch table. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/amd64/linux32/linux32_sysent.c,v 1.19 2006/07/28 19:08:35 jhb Exp $ + * $FreeBSD$ * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.18 2006/07/28 19:05:26 jhb Exp */ @@ -20,315 +20,315 @@ /* The casts are bogus but will do for now. */ struct sysent linux_sysent[] = { #define nosys linux_nosys - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 0 = setup */ - { AS(sys_exit_args), (sy_call_t *)sys_exit, AUE_EXIT }, /* 1 = exit */ - { 0, (sy_call_t *)linux_fork, AUE_FORK }, /* 2 = linux_fork */ - { AS(read_args), (sy_call_t *)read, AUE_NULL }, /* 3 = read */ - { AS(write_args), (sy_call_t *)write, AUE_NULL }, /* 4 = write */ - { AS(linux_open_args), (sy_call_t *)linux_open, AUE_OPEN_RWTC }, /* 5 = linux_open */ - { AS(close_args), (sy_call_t *)close, AUE_CLOSE }, /* 6 = close */ - { AS(linux_waitpid_args), (sy_call_t *)linux_waitpid, AUE_WAIT4 }, /* 7 = linux_waitpid */ - { AS(linux_creat_args), (sy_call_t *)linux_creat, AUE_O_CREAT }, /* 8 = linux_creat */ - { AS(linux_link_args), (sy_call_t *)linux_link, AUE_LINK }, /* 9 = linux_link */ - { AS(linux_unlink_args), (sy_call_t *)linux_unlink, AUE_UNLINK }, /* 10 = linux_unlink */ - { AS(linux_execve_args), (sy_call_t *)linux_execve, AUE_EXECVE }, /* 11 = linux_execve */ - { AS(linux_chdir_args), (sy_call_t *)linux_chdir, AUE_CHDIR }, /* 12 = linux_chdir */ - { AS(linux_time_args), (sy_call_t *)linux_time, AUE_NULL }, /* 13 = linux_time */ - { AS(linux_mknod_args), (sy_call_t *)linux_mknod, AUE_MKNOD }, /* 14 = linux_mknod */ - { AS(linux_chmod_args), (sy_call_t *)linux_chmod, AUE_CHMOD }, /* 15 = linux_chmod */ - { AS(linux_lchown16_args), (sy_call_t *)linux_lchown16, AUE_LCHOWN }, /* 16 = linux_lchown16 */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 17 = break */ - { AS(linux_stat_args), (sy_call_t *)linux_stat, AUE_STAT }, /* 18 = linux_stat */ - { AS(linux_lseek_args), (sy_call_t *)linux_lseek, AUE_LSEEK }, /* 19 = linux_lseek */ - { 0, (sy_call_t *)linux_getpid, AUE_GETPID }, /* 20 = linux_getpid */ - { AS(linux_mount_args), (sy_call_t *)linux_mount, AUE_MOUNT }, /* 21 = linux_mount */ - { AS(linux_oldumount_args), (sy_call_t *)linux_oldumount, AUE_UMOUNT }, /* 22 = linux_oldumount */ - { AS(linux_setuid16_args), (sy_call_t *)linux_setuid16, AUE_SETUID }, /* 23 = linux_setuid16 */ - { 0, (sy_call_t *)linux_getuid16, AUE_GETUID }, /* 24 = linux_getuid16 */ - { 0, (sy_call_t *)linux_stime, AUE_SETTIMEOFDAY }, /* 25 = linux_stime */ - { AS(linux_ptrace_args), (sy_call_t *)linux_ptrace, AUE_PTRACE }, /* 26 = linux_ptrace */ - { AS(linux_alarm_args), (sy_call_t *)linux_alarm, AUE_NULL }, /* 27 = linux_alarm */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 28 = fstat */ - { 0, (sy_call_t *)linux_pause, AUE_NULL }, /* 29 = linux_pause */ - { AS(linux_utime_args), (sy_call_t *)linux_utime, AUE_UTIME }, /* 30 = linux_utime */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 31 = stty */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 32 = gtty */ - { AS(linux_access_args), (sy_call_t *)linux_access, AUE_ACCESS }, /* 33 = linux_access */ - { AS(linux_nice_args), (sy_call_t *)linux_nice, AUE_NICE }, /* 34 = linux_nice */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 35 = ftime */ - { 0, (sy_call_t *)sync, AUE_SYNC }, /* 36 = sync */ - { AS(linux_kill_args), (sy_call_t *)linux_kill, AUE_KILL }, /* 37 = linux_kill */ - { AS(linux_rename_args), (sy_call_t *)linux_rename, AUE_RENAME }, /* 38 = linux_rename */ - { AS(linux_mkdir_args), (sy_call_t *)linux_mkdir, AUE_MKDIR }, /* 39 = linux_mkdir */ - { AS(linux_rmdir_args), (sy_call_t *)linux_rmdir, AUE_RMDIR }, /* 40 = linux_rmdir */ - { AS(dup_args), (sy_call_t *)dup, AUE_DUP }, /* 41 = dup */ - { AS(linux_pipe_args), (sy_call_t *)linux_pipe, AUE_PIPE }, /* 42 = linux_pipe */ - { AS(linux_times_args), (sy_call_t *)linux_times, AUE_NULL }, /* 43 = linux_times */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 44 = prof */ - { AS(linux_brk_args), (sy_call_t *)linux_brk, AUE_NULL }, /* 45 = linux_brk */ - { AS(linux_setgid16_args), (sy_call_t *)linux_setgid16, AUE_SETGID }, /* 46 = linux_setgid16 */ - { 0, (sy_call_t *)linux_getgid16, AUE_GETGID }, /* 47 = linux_getgid16 */ - { AS(linux_signal_args), (sy_call_t *)linux_signal, AUE_NULL }, /* 48 = linux_signal */ - { 0, (sy_call_t *)linux_geteuid16, AUE_GETEUID }, /* 49 = linux_geteuid16 */ - { 0, (sy_call_t *)linux_getegid16, AUE_GETEGID }, /* 50 = linux_getegid16 */ - { AS(acct_args), (sy_call_t *)acct, AUE_ACCT }, /* 51 = acct */ - { AS(linux_umount_args), (sy_call_t *)linux_umount, AUE_UMOUNT }, /* 52 = linux_umount */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 53 = lock */ - { AS(linux_ioctl_args), (sy_call_t *)linux_ioctl, AUE_IOCTL }, /* 54 = linux_ioctl */ - { AS(linux_fcntl_args), (sy_call_t *)linux_fcntl, AUE_FCNTL }, /* 55 = linux_fcntl */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 56 = mpx */ - { AS(setpgid_args), (sy_call_t *)setpgid, AUE_SETPGRP }, /* 57 = setpgid */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 58 = ulimit */ - { 0, (sy_call_t *)linux_olduname, AUE_NULL }, /* 59 = linux_olduname */ - { AS(umask_args), (sy_call_t *)umask, AUE_UMASK }, /* 60 = umask */ - { AS(chroot_args), (sy_call_t *)chroot, AUE_CHROOT }, /* 61 = chroot */ - { AS(linux_ustat_args), (sy_call_t *)linux_ustat, AUE_NULL }, /* 62 = linux_ustat */ - { AS(dup2_args), (sy_call_t *)dup2, AUE_DUP2 }, /* 63 = dup2 */ - { 0, (sy_call_t *)getppid, AUE_GETPPID }, /* 64 = getppid */ - { 0, (sy_call_t *)getpgrp, AUE_GETPGRP }, /* 65 = getpgrp */ - { 0, (sy_call_t *)setsid, AUE_SETSID }, /* 66 = setsid */ - { AS(linux_sigaction_args), (sy_call_t *)linux_sigaction, AUE_NULL }, /* 67 = linux_sigaction */ - { 0, (sy_call_t *)linux_sgetmask, AUE_NULL }, /* 68 = linux_sgetmask */ - { AS(linux_ssetmask_args), (sy_call_t *)linux_ssetmask, AUE_NULL }, /* 69 = linux_ssetmask */ - { AS(linux_setreuid16_args), (sy_call_t *)linux_setreuid16, AUE_SETREUID }, /* 70 = linux_setreuid16 */ - { AS(linux_setregid16_args), (sy_call_t *)linux_setregid16, AUE_SETREGID }, /* 71 = linux_setregid16 */ - { AS(linux_sigsuspend_args), (sy_call_t *)linux_sigsuspend, AUE_NULL }, /* 72 = linux_sigsuspend */ - { AS(linux_sigpending_args), (sy_call_t *)linux_sigpending, AUE_NULL }, /* 73 = linux_sigpending */ - { AS(linux_sethostname_args), (sy_call_t *)linux_sethostname, AUE_SYSCTL }, /* 74 = linux_sethostname */ - { AS(linux_setrlimit_args), (sy_call_t *)linux_setrlimit, AUE_SETRLIMIT }, /* 75 = linux_setrlimit */ - { AS(linux_old_getrlimit_args), (sy_call_t *)linux_old_getrlimit, AUE_GETRLIMIT }, /* 76 = linux_old_getrlimit */ - { AS(linux_getrusage_args), (sy_call_t *)linux_getrusage, AUE_GETRUSAGE }, /* 77 = linux_getrusage */ - { AS(linux_gettimeofday_args), (sy_call_t *)linux_gettimeofday, AUE_NULL }, /* 78 = linux_gettimeofday */ - { AS(linux_settimeofday_args), (sy_call_t *)linux_settimeofday, AUE_SETTIMEOFDAY }, /* 79 = linux_settimeofday */ - { AS(linux_getgroups16_args), (sy_call_t *)linux_getgroups16, AUE_GETGROUPS }, /* 80 = linux_getgroups16 */ - { AS(linux_setgroups16_args), (sy_call_t *)linux_setgroups16, AUE_SETGROUPS }, /* 81 = linux_setgroups16 */ - { AS(linux_old_select_args), (sy_call_t *)linux_old_select, AUE_SELECT }, /* 82 = linux_old_select */ - { AS(linux_symlink_args), (sy_call_t *)linux_symlink, AUE_SYMLINK }, /* 83 = linux_symlink */ - { AS(linux_lstat_args), (sy_call_t *)linux_lstat, AUE_LSTAT }, /* 84 = linux_lstat */ - { AS(linux_readlink_args), (sy_call_t *)linux_readlink, AUE_READLINK }, /* 85 = linux_readlink */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 86 = linux_uselib */ - { AS(swapon_args), (sy_call_t *)swapon, AUE_SWAPON }, /* 87 = swapon */ - { AS(linux_reboot_args), (sy_call_t *)linux_reboot, AUE_REBOOT }, /* 88 = linux_reboot */ - { AS(linux_readdir_args), (sy_call_t *)linux_readdir, AUE_O_GETDENTS }, /* 89 = linux_readdir */ - { AS(linux_mmap_args), (sy_call_t *)linux_mmap, AUE_MMAP }, /* 90 = linux_mmap */ - { AS(munmap_args), (sy_call_t *)munmap, AUE_MUNMAP }, /* 91 = munmap */ - { AS(linux_truncate_args), (sy_call_t *)linux_truncate, AUE_TRUNCATE }, /* 92 = linux_truncate */ - { AS(linux_ftruncate_args), (sy_call_t *)linux_ftruncate, AUE_FTRUNCATE }, /* 93 = linux_ftruncate */ - { AS(fchmod_args), (sy_call_t *)fchmod, AUE_FCHMOD }, /* 94 = fchmod */ - { AS(fchown_args), (sy_call_t *)fchown, AUE_FCHOWN }, /* 95 = fchown */ - { AS(linux_getpriority_args), (sy_call_t *)linux_getpriority, AUE_GETPRIORITY }, /* 96 = linux_getpriority */ - { AS(setpriority_args), (sy_call_t *)setpriority, AUE_SETPRIORITY }, /* 97 = setpriority */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 98 = profil */ - { AS(linux_statfs_args), (sy_call_t *)linux_statfs, AUE_STATFS }, /* 99 = linux_statfs */ - { AS(linux_fstatfs_args), (sy_call_t *)linux_fstatfs, AUE_FSTATFS }, /* 100 = linux_fstatfs */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 101 = ioperm */ - { AS(linux_socketcall_args), (sy_call_t *)linux_socketcall, AUE_NULL }, /* 102 = linux_socketcall */ - { AS(linux_syslog_args), (sy_call_t *)linux_syslog, AUE_NULL }, /* 103 = linux_syslog */ - { AS(linux_setitimer_args), (sy_call_t *)linux_setitimer, AUE_SETITIMER }, /* 104 = linux_setitimer */ - { AS(linux_getitimer_args), (sy_call_t *)linux_getitimer, AUE_GETITIMER }, /* 105 = linux_getitimer */ - { AS(linux_newstat_args), (sy_call_t *)linux_newstat, AUE_STAT }, /* 106 = linux_newstat */ - { AS(linux_newlstat_args), (sy_call_t *)linux_newlstat, AUE_LSTAT }, /* 107 = linux_newlstat */ - { AS(linux_newfstat_args), (sy_call_t *)linux_newfstat, AUE_FSTAT }, /* 108 = linux_newfstat */ - { 0, (sy_call_t *)linux_uname, AUE_NULL }, /* 109 = linux_uname */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 110 = iopl */ - { 0, (sy_call_t *)linux_vhangup, AUE_NULL }, /* 111 = linux_vhangup */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 112 = idle */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 113 = vm86old */ - { AS(linux_wait4_args), (sy_call_t *)linux_wait4, AUE_WAIT4 }, /* 114 = linux_wait4 */ - { 0, (sy_call_t *)linux_swapoff, AUE_SWAPOFF }, /* 115 = linux_swapoff */ - { AS(linux_sysinfo_args), (sy_call_t *)linux_sysinfo, AUE_NULL }, /* 116 = linux_sysinfo */ - { AS(linux_ipc_args), (sy_call_t *)linux_ipc, AUE_NULL }, /* 117 = linux_ipc */ - { AS(fsync_args), (sy_call_t *)fsync, AUE_FSYNC }, /* 118 = fsync */ - { AS(linux_sigreturn_args), (sy_call_t *)linux_sigreturn, AUE_SIGRETURN }, /* 119 = linux_sigreturn */ - { AS(linux_clone_args), (sy_call_t *)linux_clone, AUE_RFORK }, /* 120 = linux_clone */ - { AS(setdomainname_args), (sy_call_t *)setdomainname, AUE_SYSCTL }, /* 121 = setdomainname */ - { AS(linux_newuname_args), (sy_call_t *)linux_newuname, AUE_NULL }, /* 122 = linux_newuname */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 123 = modify_ldt */ - { 0, (sy_call_t *)linux_adjtimex, AUE_ADJTIME }, /* 124 = linux_adjtimex */ - { AS(linux_mprotect_args), (sy_call_t *)linux_mprotect, AUE_MPROTECT }, /* 125 = linux_mprotect */ - { AS(linux_sigprocmask_args), (sy_call_t *)linux_sigprocmask, AUE_SIGPROCMASK }, /* 126 = linux_sigprocmask */ - { 0, (sy_call_t *)linux_create_module, AUE_NULL }, /* 127 = linux_create_module */ - { 0, (sy_call_t *)linux_init_module, AUE_NULL }, /* 128 = linux_init_module */ - { 0, (sy_call_t *)linux_delete_module, AUE_NULL }, /* 129 = linux_delete_module */ - { 0, (sy_call_t *)linux_get_kernel_syms, AUE_NULL }, /* 130 = linux_get_kernel_syms */ - { 0, (sy_call_t *)linux_quotactl, AUE_QUOTACTL }, /* 131 = linux_quotactl */ - { AS(getpgid_args), (sy_call_t *)getpgid, AUE_GETPGID }, /* 132 = getpgid */ - { AS(fchdir_args), (sy_call_t *)fchdir, AUE_FCHDIR }, /* 133 = fchdir */ - { 0, (sy_call_t *)linux_bdflush, AUE_BDFLUSH }, /* 134 = linux_bdflush */ - { AS(linux_sysfs_args), (sy_call_t *)linux_sysfs, AUE_NULL }, /* 135 = linux_sysfs */ - { AS(linux_personality_args), (sy_call_t *)linux_personality, AUE_PERSONALITY }, /* 136 = linux_personality */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 137 = afs_syscall */ - { AS(linux_setfsuid16_args), (sy_call_t *)linux_setfsuid16, AUE_SETFSUID }, /* 138 = linux_setfsuid16 */ - { AS(linux_setfsgid16_args), (sy_call_t *)linux_setfsgid16, AUE_SETFSGID }, /* 139 = linux_setfsgid16 */ - { AS(linux_llseek_args), (sy_call_t *)linux_llseek, AUE_LSEEK }, /* 140 = linux_llseek */ - { AS(linux_getdents_args), (sy_call_t *)linux_getdents, AUE_O_GETDENTS }, /* 141 = linux_getdents */ - { AS(linux_select_args), (sy_call_t *)linux_select, AUE_SELECT }, /* 142 = linux_select */ - { AS(flock_args), (sy_call_t *)flock, AUE_FLOCK }, /* 143 = flock */ - { AS(linux_msync_args), (sy_call_t *)linux_msync, AUE_MSYNC }, /* 144 = linux_msync */ - { AS(linux_readv_args), (sy_call_t *)linux_readv, AUE_READV }, /* 145 = linux_readv */ - { AS(linux_writev_args), (sy_call_t *)linux_writev, AUE_WRITEV }, /* 146 = linux_writev */ - { AS(linux_getsid_args), (sy_call_t *)linux_getsid, AUE_GETSID }, /* 147 = linux_getsid */ - { AS(linux_fdatasync_args), (sy_call_t *)linux_fdatasync, AUE_NULL }, /* 148 = linux_fdatasync */ - { AS(linux_sysctl_args), (sy_call_t *)linux_sysctl, AUE_SYSCTL }, /* 149 = linux_sysctl */ - { AS(mlock_args), (sy_call_t *)mlock, AUE_MLOCK }, /* 150 = mlock */ - { AS(munlock_args), (sy_call_t *)munlock, AUE_MUNLOCK }, /* 151 = munlock */ - { AS(mlockall_args), (sy_call_t *)mlockall, AUE_MLOCKALL }, /* 152 = mlockall */ - { 0, (sy_call_t *)munlockall, AUE_MUNLOCKALL }, /* 153 = munlockall */ - { AS(sched_setparam_args), (sy_call_t *)sched_setparam, AUE_SCHED_SETPARAM }, /* 154 = sched_setparam */ - { AS(sched_getparam_args), (sy_call_t *)sched_getparam, AUE_SCHED_GETPARAM }, /* 155 = sched_getparam */ - { AS(linux_sched_setscheduler_args), (sy_call_t *)linux_sched_setscheduler, AUE_SCHED_SETSCHEDULER }, /* 156 = linux_sched_setscheduler */ - { AS(linux_sched_getscheduler_args), (sy_call_t *)linux_sched_getscheduler, AUE_SCHED_GETSCHEDULER }, /* 157 = linux_sched_getscheduler */ - { 0, (sy_call_t *)sched_yield, AUE_NULL }, /* 158 = sched_yield */ - { AS(linux_sched_get_priority_max_args), (sy_call_t *)linux_sched_get_priority_max, AUE_SCHED_GET_PRIORITY_MAX }, /* 159 = linux_sched_get_priority_max */ - { AS(linux_sched_get_priority_min_args), (sy_call_t *)linux_sched_get_priority_min, AUE_SCHED_GET_PRIORITY_MIN }, /* 160 = linux_sched_get_priority_min */ - { AS(linux_sched_rr_get_interval_args), (sy_call_t *)linux_sched_rr_get_interval, AUE_SCHED_RR_GET_INTERVAL }, /* 161 = linux_sched_rr_get_interval */ - { AS(linux_nanosleep_args), (sy_call_t *)linux_nanosleep, AUE_NULL }, /* 162 = linux_nanosleep */ - { AS(linux_mremap_args), (sy_call_t *)linux_mremap, AUE_NULL }, /* 163 = linux_mremap */ - { AS(linux_setresuid16_args), (sy_call_t *)linux_setresuid16, AUE_SETRESUID }, /* 164 = linux_setresuid16 */ - { AS(linux_getresuid16_args), (sy_call_t *)linux_getresuid16, AUE_GETRESUID }, /* 165 = linux_getresuid16 */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 166 = vm86 */ - { 0, (sy_call_t *)linux_query_module, AUE_NULL }, /* 167 = linux_query_module */ - { AS(poll_args), (sy_call_t *)poll, AUE_POLL }, /* 168 = poll */ - { 0, (sy_call_t *)linux_nfsservctl, AUE_NULL }, /* 169 = linux_nfsservctl */ - { AS(linux_setresgid16_args), (sy_call_t *)linux_setresgid16, AUE_SETRESGID }, /* 170 = linux_setresgid16 */ - { AS(linux_getresgid16_args), (sy_call_t *)linux_getresgid16, AUE_GETRESGID }, /* 171 = linux_getresgid16 */ - { 0, (sy_call_t *)linux_prctl, AUE_PRCTL }, /* 172 = linux_prctl */ - { AS(linux_rt_sigreturn_args), (sy_call_t *)linux_rt_sigreturn, AUE_NULL }, /* 173 = linux_rt_sigreturn */ - { AS(linux_rt_sigaction_args), (sy_call_t *)linux_rt_sigaction, AUE_NULL }, /* 174 = linux_rt_sigaction */ - { AS(linux_rt_sigprocmask_args), (sy_call_t *)linux_rt_sigprocmask, AUE_NULL }, /* 175 = linux_rt_sigprocmask */ - { AS(linux_rt_sigpending_args), (sy_call_t *)linux_rt_sigpending, AUE_NULL }, /* 176 = linux_rt_sigpending */ - { 0, (sy_call_t *)linux_rt_sigtimedwait, AUE_NULL }, /* 177 = linux_rt_sigtimedwait */ - { 0, (sy_call_t *)linux_rt_sigqueueinfo, AUE_NULL }, /* 178 = linux_rt_sigqueueinfo */ - { AS(linux_rt_sigsuspend_args), (sy_call_t *)linux_rt_sigsuspend, AUE_NULL }, /* 179 = linux_rt_sigsuspend */ - { AS(linux_pread_args), (sy_call_t *)linux_pread, AUE_PREAD }, /* 180 = linux_pread */ - { AS(linux_pwrite_args), (sy_call_t *)linux_pwrite, AUE_PWRITE }, /* 181 = linux_pwrite */ - { AS(linux_chown16_args), (sy_call_t *)linux_chown16, AUE_CHOWN }, /* 182 = linux_chown16 */ - { AS(linux_getcwd_args), (sy_call_t *)linux_getcwd, AUE_GETCWD }, /* 183 = linux_getcwd */ - { 0, (sy_call_t *)linux_capget, AUE_CAPGET }, /* 184 = linux_capget */ - { 0, (sy_call_t *)linux_capset, AUE_CAPSET }, /* 185 = linux_capset */ - { AS(linux_sigaltstack_args), (sy_call_t *)linux_sigaltstack, AUE_NULL }, /* 186 = linux_sigaltstack */ - { 0, (sy_call_t *)linux_sendfile, AUE_SENDFILE }, /* 187 = linux_sendfile */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 188 = getpmsg */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 189 = putpmsg */ - { 0, (sy_call_t *)linux_vfork, AUE_VFORK }, /* 190 = linux_vfork */ - { AS(linux_getrlimit_args), (sy_call_t *)linux_getrlimit, AUE_GETRLIMIT }, /* 191 = linux_getrlimit */ - { AS(linux_mmap2_args), (sy_call_t *)linux_mmap2, AUE_MMAP }, /* 192 = linux_mmap2 */ - { AS(linux_truncate64_args), (sy_call_t *)linux_truncate64, AUE_TRUNCATE }, /* 193 = linux_truncate64 */ - { AS(linux_ftruncate64_args), (sy_call_t *)linux_ftruncate64, AUE_FTRUNCATE }, /* 194 = linux_ftruncate64 */ - { AS(linux_stat64_args), (sy_call_t *)linux_stat64, AUE_STAT }, /* 195 = linux_stat64 */ - { AS(linux_lstat64_args), (sy_call_t *)linux_lstat64, AUE_LSTAT }, /* 196 = linux_lstat64 */ - { AS(linux_fstat64_args), (sy_call_t *)linux_fstat64, AUE_FSTAT }, /* 197 = linux_fstat64 */ - { AS(linux_lchown_args), (sy_call_t *)linux_lchown, AUE_LCHOWN }, /* 198 = linux_lchown */ - { 0, (sy_call_t *)linux_getuid, AUE_GETUID }, /* 199 = linux_getuid */ - { 0, (sy_call_t *)linux_getgid, AUE_GETGID }, /* 200 = linux_getgid */ - { 0, (sy_call_t *)geteuid, AUE_GETEUID }, /* 201 = geteuid */ - { 0, (sy_call_t *)getegid, AUE_GETEGID }, /* 202 = getegid */ - { AS(setreuid_args), (sy_call_t *)setreuid, AUE_SETREUID }, /* 203 = setreuid */ - { AS(setregid_args), (sy_call_t *)setregid, AUE_SETREGID }, /* 204 = setregid */ - { AS(linux_getgroups_args), (sy_call_t *)linux_getgroups, AUE_GETGROUPS }, /* 205 = linux_getgroups */ - { AS(linux_setgroups_args), (sy_call_t *)linux_setgroups, AUE_SETGROUPS }, /* 206 = linux_setgroups */ - { AS(fchown_args), (sy_call_t *)fchown, AUE_NULL }, /* 207 = fchown */ - { AS(setresuid_args), (sy_call_t *)setresuid, AUE_SETRESUID }, /* 208 = setresuid */ - { AS(getresuid_args), (sy_call_t *)getresuid, AUE_GETRESUID }, /* 209 = getresuid */ - { AS(setresgid_args), (sy_call_t *)setresgid, AUE_SETRESGID }, /* 210 = setresgid */ - { AS(getresgid_args), (sy_call_t *)getresgid, AUE_GETRESGID }, /* 211 = getresgid */ - { AS(linux_chown_args), (sy_call_t *)linux_chown, AUE_CHOWN }, /* 212 = linux_chown */ - { AS(setuid_args), (sy_call_t *)setuid, AUE_SETUID }, /* 213 = setuid */ - { AS(setgid_args), (sy_call_t *)setgid, AUE_SETGID }, /* 214 = setgid */ - { AS(linux_setfsuid_args), (sy_call_t *)linux_setfsuid, AUE_SETFSUID }, /* 215 = linux_setfsuid */ - { AS(linux_setfsgid_args), (sy_call_t *)linux_setfsgid, AUE_SETFSGID }, /* 216 = linux_setfsgid */ - { AS(linux_pivot_root_args), (sy_call_t *)linux_pivot_root, AUE_PIVOT_ROOT }, /* 217 = linux_pivot_root */ - { AS(linux_mincore_args), (sy_call_t *)linux_mincore, AUE_MINCORE }, /* 218 = linux_mincore */ - { AS(madvise_args), (sy_call_t *)madvise, AUE_MADVISE }, /* 219 = madvise */ - { AS(linux_getdents64_args), (sy_call_t *)linux_getdents64, AUE_O_GETDENTS }, /* 220 = linux_getdents64 */ - { AS(linux_fcntl64_args), (sy_call_t *)linux_fcntl64, AUE_FCNTL }, /* 221 = linux_fcntl64 */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 222 = */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 223 = */ - { 0, (sy_call_t *)linux_getpid, AUE_NULL }, /* 224 = gettid */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 225 = linux_readahead */ - { 0, (sy_call_t *)linux_setxattr, AUE_NULL }, /* 226 = linux_setxattr */ - { 0, (sy_call_t *)linux_lsetxattr, AUE_NULL }, /* 227 = linux_lsetxattr */ - { 0, (sy_call_t *)linux_fsetxattr, AUE_NULL }, /* 228 = linux_fsetxattr */ - { 0, (sy_call_t *)linux_getxattr, AUE_NULL }, /* 229 = linux_getxattr */ - { 0, (sy_call_t *)linux_lgetxattr, AUE_NULL }, /* 230 = linux_lgetxattr */ - { 0, (sy_call_t *)linux_fgetxattr, AUE_NULL }, /* 231 = linux_fgetxattr */ - { 0, (sy_call_t *)linux_listxattr, AUE_NULL }, /* 232 = linux_listxattr */ - { 0, (sy_call_t *)linux_llistxattr, AUE_NULL }, /* 233 = linux_llistxattr */ - { 0, (sy_call_t *)linux_flistxattr, AUE_NULL }, /* 234 = linux_flistxattr */ - { 0, (sy_call_t *)linux_removexattr, AUE_NULL }, /* 235 = linux_removexattr */ - { 0, (sy_call_t *)linux_lremovexattr, AUE_NULL }, /* 236 = linux_lremovexattr */ - { 0, (sy_call_t *)linux_fremovexattr, AUE_NULL }, /* 237 = linux_fremovexattr */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 238 = linux_tkill */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 239 = linux_sendfile64 */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 240 = linux_futex */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 241 = linux_sched_setaffinity */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 242 = linux_sched_getaffinity */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 243 = linux_set_thread_area */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 244 = linux_get_thread_area */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 245 = linux_io_setup */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 246 = linux_io_destroy */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 247 = linux_io_getevents */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 248 = linux_io_submit */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 249 = linux_io_cancel */ - { 0, (sy_call_t *)linux_fadvise64, AUE_NULL }, /* 250 = linux_fadvise64 */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 251 = */ - { AS(sys_exit_args), (sy_call_t *)sys_exit, AUE_EXIT }, /* 252 = exit_group */ - { 0, (sy_call_t *)linux_lookup_dcookie, AUE_NULL }, /* 253 = linux_lookup_dcookie */ - { 0, (sy_call_t *)linux_epoll_create, AUE_NULL }, /* 254 = linux_epoll_create */ - { 0, (sy_call_t *)linux_epoll_ctl, AUE_NULL }, /* 255 = linux_epoll_ctl */ - { 0, (sy_call_t *)linux_epoll_wait, AUE_NULL }, /* 256 = linux_epoll_wait */ - { 0, (sy_call_t *)linux_remap_file_pages, AUE_NULL }, /* 257 = linux_remap_file_pages */ - { 0, (sy_call_t *)linux_set_tid_address, AUE_NULL }, /* 258 = linux_set_tid_address */ - { 0, (sy_call_t *)linux_timer_create, AUE_NULL }, /* 259 = linux_timer_create */ - { 0, (sy_call_t *)linux_timer_settime, AUE_NULL }, /* 260 = linux_timer_settime */ - { 0, (sy_call_t *)linux_timer_gettime, AUE_NULL }, /* 261 = linux_timer_gettime */ - { 0, (sy_call_t *)linux_timer_getoverrun, AUE_NULL }, /* 262 = linux_timer_getoverrun */ - { 0, (sy_call_t *)linux_timer_delete, AUE_NULL }, /* 263 = linux_timer_delete */ - { 0, (sy_call_t *)linux_clock_settime, AUE_CLOCK_SETTIME }, /* 264 = linux_clock_settime */ - { 0, (sy_call_t *)linux_clock_gettime, AUE_NULL }, /* 265 = linux_clock_gettime */ - { 0, (sy_call_t *)linux_clock_getres, AUE_NULL }, /* 266 = linux_clock_getres */ - { 0, (sy_call_t *)linux_clock_nanosleep, AUE_NULL }, /* 267 = linux_clock_nanosleep */ - { 0, (sy_call_t *)linux_statfs64, AUE_NULL }, /* 268 = linux_statfs64 */ - { 0, (sy_call_t *)linux_fstatfs64, AUE_NULL }, /* 269 = linux_fstatfs64 */ - { 0, (sy_call_t *)linux_tgkill, AUE_NULL }, /* 270 = linux_tgkill */ - { 0, (sy_call_t *)linux_utimes, AUE_NULL }, /* 271 = linux_utimes */ - { 0, (sy_call_t *)linux_fadvise64_64, AUE_NULL }, /* 272 = linux_fadvise64_64 */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 273 = */ - { 0, (sy_call_t *)linux_mbind, AUE_NULL }, /* 274 = linux_mbind */ - { 0, (sy_call_t *)linux_get_mempolicy, AUE_NULL }, /* 275 = linux_get_mempolicy */ - { 0, (sy_call_t *)linux_set_mempolicy, AUE_NULL }, /* 276 = linux_set_mempolicy */ - { 0, (sy_call_t *)linux_mq_open, AUE_NULL }, /* 277 = linux_mq_open */ - { 0, (sy_call_t *)linux_mq_unlink, AUE_NULL }, /* 278 = linux_mq_unlink */ - { 0, (sy_call_t *)linux_mq_timedsend, AUE_NULL }, /* 279 = linux_mq_timedsend */ - { 0, (sy_call_t *)linux_mq_timedreceive, AUE_NULL }, /* 280 = linux_mq_timedreceive */ - { 0, (sy_call_t *)linux_mq_notify, AUE_NULL }, /* 281 = linux_mq_notify */ - { 0, (sy_call_t *)linux_mq_getsetattr, AUE_NULL }, /* 282 = linux_mq_getsetattr */ - { 0, (sy_call_t *)linux_kexec_load, AUE_NULL }, /* 283 = linux_kexec_load */ - { 0, (sy_call_t *)linux_waitid, AUE_NULL }, /* 284 = linux_waitid */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 285 = */ - { 0, (sy_call_t *)linux_add_key, AUE_NULL }, /* 286 = linux_add_key */ - { 0, (sy_call_t *)linux_request_key, AUE_NULL }, /* 287 = linux_request_key */ - { 0, (sy_call_t *)linux_keyctl, AUE_NULL }, /* 288 = linux_keyctl */ - { 0, (sy_call_t *)linux_ioprio_set, AUE_NULL }, /* 289 = linux_ioprio_set */ - { 0, (sy_call_t *)linux_ioprio_get, AUE_NULL }, /* 290 = linux_ioprio_get */ - { 0, (sy_call_t *)linux_inotify_init, AUE_NULL }, /* 291 = linux_inotify_init */ - { 0, (sy_call_t *)linux_inotify_add_watch, AUE_NULL }, /* 292 = linux_inotify_add_watch */ - { 0, (sy_call_t *)linux_inotify_rm_watch, AUE_NULL }, /* 293 = linux_inotify_rm_watch */ - { 0, (sy_call_t *)linux_migrate_pages, AUE_NULL }, /* 294 = linux_migrate_pages */ - { 0, (sy_call_t *)linux_openat, AUE_NULL }, /* 295 = linux_openat */ - { 0, (sy_call_t *)linux_mkdirat, AUE_NULL }, /* 296 = linux_mkdirat */ - { 0, (sy_call_t *)linux_mknodat, AUE_NULL }, /* 297 = linux_mknodat */ - { 0, (sy_call_t *)linux_fchownat, AUE_NULL }, /* 298 = linux_fchownat */ - { 0, (sy_call_t *)linux_futimesat, AUE_NULL }, /* 299 = linux_futimesat */ - { 0, (sy_call_t *)linux_fstatat64, AUE_NULL }, /* 300 = linux_fstatat64 */ - { 0, (sy_call_t *)linux_unlinkat, AUE_NULL }, /* 301 = linux_unlinkat */ - { 0, (sy_call_t *)linux_renameat, AUE_NULL }, /* 302 = linux_renameat */ - { 0, (sy_call_t *)linux_linkat, AUE_NULL }, /* 303 = linux_linkat */ - { 0, (sy_call_t *)linux_symlinkat, AUE_NULL }, /* 304 = linux_symlinkat */ - { 0, (sy_call_t *)linux_readlinkat, AUE_NULL }, /* 305 = linux_readlinkat */ - { 0, (sy_call_t *)linux_fchmodat, AUE_NULL }, /* 306 = linux_fchmodat */ - { 0, (sy_call_t *)linux_faccessat, AUE_NULL }, /* 307 = linux_faccessat */ - { 0, (sy_call_t *)linux_pselect6, AUE_NULL }, /* 308 = linux_pselect6 */ - { 0, (sy_call_t *)linux_ppoll, AUE_NULL }, /* 309 = linux_ppoll */ - { 0, (sy_call_t *)linux_unshare, AUE_NULL }, /* 310 = linux_unshare */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 0 = setup */ + { AS(sys_exit_args), (sy_call_t *)sys_exit, AUE_EXIT, NULL, 0, 0 }, /* 1 = exit */ + { 0, (sy_call_t *)linux_fork, AUE_FORK, NULL, 0, 0 }, /* 2 = linux_fork */ + { AS(read_args), (sy_call_t *)read, AUE_NULL, NULL, 0, 0 }, /* 3 = read */ + { AS(write_args), (sy_call_t *)write, AUE_NULL, NULL, 0, 0 }, /* 4 = write */ + { AS(linux_open_args), (sy_call_t *)linux_open, AUE_OPEN_RWTC, NULL, 0, 0 }, /* 5 = linux_open */ + { AS(close_args), (sy_call_t *)close, AUE_CLOSE, NULL, 0, 0 }, /* 6 = close */ + { AS(linux_waitpid_args), (sy_call_t *)linux_waitpid, AUE_WAIT4, NULL, 0, 0 }, /* 7 = linux_waitpid */ + { AS(linux_creat_args), (sy_call_t *)linux_creat, AUE_O_CREAT, NULL, 0, 0 }, /* 8 = linux_creat */ + { AS(linux_link_args), (sy_call_t *)linux_link, AUE_LINK, NULL, 0, 0 }, /* 9 = linux_link */ + { AS(linux_unlink_args), (sy_call_t *)linux_unlink, AUE_UNLINK, NULL, 0, 0 }, /* 10 = linux_unlink */ + { AS(linux_execve_args), (sy_call_t *)linux_execve, AUE_EXECVE, NULL, 0, 0 }, /* 11 = linux_execve */ + { AS(linux_chdir_args), (sy_call_t *)linux_chdir, AUE_CHDIR, NULL, 0, 0 }, /* 12 = linux_chdir */ + { AS(linux_time_args), (sy_call_t *)linux_time, AUE_NULL, NULL, 0, 0 }, /* 13 = linux_time */ + { AS(linux_mknod_args), (sy_call_t *)linux_mknod, AUE_MKNOD, NULL, 0, 0 }, /* 14 = linux_mknod */ + { AS(linux_chmod_args), (sy_call_t *)linux_chmod, AUE_CHMOD, NULL, 0, 0 }, /* 15 = linux_chmod */ + { AS(linux_lchown16_args), (sy_call_t *)linux_lchown16, AUE_LCHOWN, NULL, 0, 0 }, /* 16 = linux_lchown16 */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 17 = break */ + { AS(linux_stat_args), (sy_call_t *)linux_stat, AUE_STAT, NULL, 0, 0 }, /* 18 = linux_stat */ + { AS(linux_lseek_args), (sy_call_t *)linux_lseek, AUE_LSEEK, NULL, 0, 0 }, /* 19 = linux_lseek */ + { 0, (sy_call_t *)linux_getpid, AUE_GETPID, NULL, 0, 0 }, /* 20 = linux_getpid */ + { AS(linux_mount_args), (sy_call_t *)linux_mount, AUE_MOUNT, NULL, 0, 0 }, /* 21 = linux_mount */ + { AS(linux_oldumount_args), (sy_call_t *)linux_oldumount, AUE_UMOUNT, NULL, 0, 0 }, /* 22 = linux_oldumount */ + { AS(linux_setuid16_args), (sy_call_t *)linux_setuid16, AUE_SETUID, NULL, 0, 0 }, /* 23 = linux_setuid16 */ + { 0, (sy_call_t *)linux_getuid16, AUE_GETUID, NULL, 0, 0 }, /* 24 = linux_getuid16 */ + { 0, (sy_call_t *)linux_stime, AUE_SETTIMEOFDAY, NULL, 0, 0 }, /* 25 = linux_stime */ + { AS(linux_ptrace_args), (sy_call_t *)linux_ptrace, AUE_PTRACE, NULL, 0, 0 }, /* 26 = linux_ptrace */ + { AS(linux_alarm_args), (sy_call_t *)linux_alarm, AUE_NULL, NULL, 0, 0 }, /* 27 = linux_alarm */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 28 = fstat */ + { 0, (sy_call_t *)linux_pause, AUE_NULL, NULL, 0, 0 }, /* 29 = linux_pause */ + { AS(linux_utime_args), (sy_call_t *)linux_utime, AUE_UTIME, NULL, 0, 0 }, /* 30 = linux_utime */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 31 = stty */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 32 = gtty */ + { AS(linux_access_args), (sy_call_t *)linux_access, AUE_ACCESS, NULL, 0, 0 }, /* 33 = linux_access */ + { AS(linux_nice_args), (sy_call_t *)linux_nice, AUE_NICE, NULL, 0, 0 }, /* 34 = linux_nice */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 35 = ftime */ + { 0, (sy_call_t *)sync, AUE_SYNC, NULL, 0, 0 }, /* 36 = sync */ + { AS(linux_kill_args), (sy_call_t *)linux_kill, AUE_KILL, NULL, 0, 0 }, /* 37 = linux_kill */ + { AS(linux_rename_args), (sy_call_t *)linux_rename, AUE_RENAME, NULL, 0, 0 }, /* 38 = linux_rename */ + { AS(linux_mkdir_args), (sy_call_t *)linux_mkdir, AUE_MKDIR, NULL, 0, 0 }, /* 39 = linux_mkdir */ + { AS(linux_rmdir_args), (sy_call_t *)linux_rmdir, AUE_RMDIR, NULL, 0, 0 }, /* 40 = linux_rmdir */ + { AS(dup_args), (sy_call_t *)dup, AUE_DUP, NULL, 0, 0 }, /* 41 = dup */ + { AS(linux_pipe_args), (sy_call_t *)linux_pipe, AUE_PIPE, NULL, 0, 0 }, /* 42 = linux_pipe */ + { AS(linux_times_args), (sy_call_t *)linux_times, AUE_NULL, NULL, 0, 0 }, /* 43 = linux_times */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 44 = prof */ + { AS(linux_brk_args), (sy_call_t *)linux_brk, AUE_NULL, NULL, 0, 0 }, /* 45 = linux_brk */ + { AS(linux_setgid16_args), (sy_call_t *)linux_setgid16, AUE_SETGID, NULL, 0, 0 }, /* 46 = linux_setgid16 */ + { 0, (sy_call_t *)linux_getgid16, AUE_GETGID, NULL, 0, 0 }, /* 47 = linux_getgid16 */ + { AS(linux_signal_args), (sy_call_t *)linux_signal, AUE_NULL, NULL, 0, 0 }, /* 48 = linux_signal */ + { 0, (sy_call_t *)linux_geteuid16, AUE_GETEUID, NULL, 0, 0 }, /* 49 = linux_geteuid16 */ + { 0, (sy_call_t *)linux_getegid16, AUE_GETEGID, NULL, 0, 0 }, /* 50 = linux_getegid16 */ + { AS(acct_args), (sy_call_t *)acct, AUE_ACCT, NULL, 0, 0 }, /* 51 = acct */ + { AS(linux_umount_args), (sy_call_t *)linux_umount, AUE_UMOUNT, NULL, 0, 0 }, /* 52 = linux_umount */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 53 = lock */ + { AS(linux_ioctl_args), (sy_call_t *)linux_ioctl, AUE_IOCTL, NULL, 0, 0 }, /* 54 = linux_ioctl */ + { AS(linux_fcntl_args), (sy_call_t *)linux_fcntl, AUE_FCNTL, NULL, 0, 0 }, /* 55 = linux_fcntl */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 56 = mpx */ + { AS(setpgid_args), (sy_call_t *)setpgid, AUE_SETPGRP, NULL, 0, 0 }, /* 57 = setpgid */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 58 = ulimit */ + { 0, (sy_call_t *)linux_olduname, AUE_NULL, NULL, 0, 0 }, /* 59 = linux_olduname */ + { AS(umask_args), (sy_call_t *)umask, AUE_UMASK, NULL, 0, 0 }, /* 60 = umask */ + { AS(chroot_args), (sy_call_t *)chroot, AUE_CHROOT, NULL, 0, 0 }, /* 61 = chroot */ + { AS(linux_ustat_args), (sy_call_t *)linux_ustat, AUE_NULL, NULL, 0, 0 }, /* 62 = linux_ustat */ + { AS(dup2_args), (sy_call_t *)dup2, AUE_DUP2, NULL, 0, 0 }, /* 63 = dup2 */ + { 0, (sy_call_t *)linux_getppid, AUE_GETPPID, NULL, 0, 0 }, /* 64 = linux_getppid */ + { 0, (sy_call_t *)getpgrp, AUE_GETPGRP, NULL, 0, 0 }, /* 65 = getpgrp */ + { 0, (sy_call_t *)setsid, AUE_SETSID, NULL, 0, 0 }, /* 66 = setsid */ + { AS(linux_sigaction_args), (sy_call_t *)linux_sigaction, AUE_NULL, NULL, 0, 0 }, /* 67 = linux_sigaction */ + { 0, (sy_call_t *)linux_sgetmask, AUE_NULL, NULL, 0, 0 }, /* 68 = linux_sgetmask */ + { AS(linux_ssetmask_args), (sy_call_t *)linux_ssetmask, AUE_NULL, NULL, 0, 0 }, /* 69 = linux_ssetmask */ + { AS(linux_setreuid16_args), (sy_call_t *)linux_setreuid16, AUE_SETREUID, NULL, 0, 0 }, /* 70 = linux_setreuid16 */ + { AS(linux_setregid16_args), (sy_call_t *)linux_setregid16, AUE_SETREGID, NULL, 0, 0 }, /* 71 = linux_setregid16 */ + { AS(linux_sigsuspend_args), (sy_call_t *)linux_sigsuspend, AUE_NULL, NULL, 0, 0 }, /* 72 = linux_sigsuspend */ + { AS(linux_sigpending_args), (sy_call_t *)linux_sigpending, AUE_NULL, NULL, 0, 0 }, /* 73 = linux_sigpending */ + { AS(linux_sethostname_args), (sy_call_t *)linux_sethostname, AUE_SYSCTL, NULL, 0, 0 }, /* 74 = linux_sethostname */ + { AS(linux_setrlimit_args), (sy_call_t *)linux_setrlimit, AUE_SETRLIMIT, NULL, 0, 0 }, /* 75 = linux_setrlimit */ + { AS(linux_old_getrlimit_args), (sy_call_t *)linux_old_getrlimit, AUE_GETRLIMIT, NULL, 0, 0 }, /* 76 = linux_old_getrlimit */ + { AS(linux_getrusage_args), (sy_call_t *)linux_getrusage, AUE_GETRUSAGE, NULL, 0, 0 }, /* 77 = linux_getrusage */ + { AS(linux_gettimeofday_args), (sy_call_t *)linux_gettimeofday, AUE_NULL, NULL, 0, 0 }, /* 78 = linux_gettimeofday */ + { AS(linux_settimeofday_args), (sy_call_t *)linux_settimeofday, AUE_SETTIMEOFDAY, NULL, 0, 0 }, /* 79 = linux_settimeofday */ + { AS(linux_getgroups16_args), (sy_call_t *)linux_getgroups16, AUE_GETGROUPS, NULL, 0, 0 }, /* 80 = linux_getgroups16 */ + { AS(linux_setgroups16_args), (sy_call_t *)linux_setgroups16, AUE_SETGROUPS, NULL, 0, 0 }, /* 81 = linux_setgroups16 */ + { AS(linux_old_select_args), (sy_call_t *)linux_old_select, AUE_SELECT, NULL, 0, 0 }, /* 82 = linux_old_select */ + { AS(linux_symlink_args), (sy_call_t *)linux_symlink, AUE_SYMLINK, NULL, 0, 0 }, /* 83 = linux_symlink */ + { AS(linux_lstat_args), (sy_call_t *)linux_lstat, AUE_LSTAT, NULL, 0, 0 }, /* 84 = linux_lstat */ + { AS(linux_readlink_args), (sy_call_t *)linux_readlink, AUE_READLINK, NULL, 0, 0 }, /* 85 = linux_readlink */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 86 = linux_uselib */ + { AS(swapon_args), (sy_call_t *)swapon, AUE_SWAPON, NULL, 0, 0 }, /* 87 = swapon */ + { AS(linux_reboot_args), (sy_call_t *)linux_reboot, AUE_REBOOT, NULL, 0, 0 }, /* 88 = linux_reboot */ + { AS(linux_readdir_args), (sy_call_t *)linux_readdir, AUE_O_GETDENTS, NULL, 0, 0 }, /* 89 = linux_readdir */ + { AS(linux_mmap_args), (sy_call_t *)linux_mmap, AUE_MMAP, NULL, 0, 0 }, /* 90 = linux_mmap */ + { AS(munmap_args), (sy_call_t *)munmap, AUE_MUNMAP, NULL, 0, 0 }, /* 91 = munmap */ + { AS(linux_truncate_args), (sy_call_t *)linux_truncate, AUE_TRUNCATE, NULL, 0, 0 }, /* 92 = linux_truncate */ + { AS(linux_ftruncate_args), (sy_call_t *)linux_ftruncate, AUE_FTRUNCATE, NULL, 0, 0 }, /* 93 = linux_ftruncate */ + { AS(fchmod_args), (sy_call_t *)fchmod, AUE_FCHMOD, NULL, 0, 0 }, /* 94 = fchmod */ + { AS(fchown_args), (sy_call_t *)fchown, AUE_FCHOWN, NULL, 0, 0 }, /* 95 = fchown */ + { AS(linux_getpriority_args), (sy_call_t *)linux_getpriority, AUE_GETPRIORITY, NULL, 0, 0 }, /* 96 = linux_getpriority */ + { AS(setpriority_args), (sy_call_t *)setpriority, AUE_SETPRIORITY, NULL, 0, 0 }, /* 97 = setpriority */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 98 = profil */ + { AS(linux_statfs_args), (sy_call_t *)linux_statfs, AUE_STATFS, NULL, 0, 0 }, /* 99 = linux_statfs */ + { AS(linux_fstatfs_args), (sy_call_t *)linux_fstatfs, AUE_FSTATFS, NULL, 0, 0 }, /* 100 = linux_fstatfs */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 101 = ioperm */ + { AS(linux_socketcall_args), (sy_call_t *)linux_socketcall, AUE_NULL, NULL, 0, 0 }, /* 102 = linux_socketcall */ + { AS(linux_syslog_args), (sy_call_t *)linux_syslog, AUE_NULL, NULL, 0, 0 }, /* 103 = linux_syslog */ + { AS(linux_setitimer_args), (sy_call_t *)linux_setitimer, AUE_SETITIMER, NULL, 0, 0 }, /* 104 = linux_setitimer */ + { AS(linux_getitimer_args), (sy_call_t *)linux_getitimer, AUE_GETITIMER, NULL, 0, 0 }, /* 105 = linux_getitimer */ + { AS(linux_newstat_args), (sy_call_t *)linux_newstat, AUE_STAT, NULL, 0, 0 }, /* 106 = linux_newstat */ + { AS(linux_newlstat_args), (sy_call_t *)linux_newlstat, AUE_LSTAT, NULL, 0, 0 }, /* 107 = linux_newlstat */ + { AS(linux_newfstat_args), (sy_call_t *)linux_newfstat, AUE_FSTAT, NULL, 0, 0 }, /* 108 = linux_newfstat */ + { 0, (sy_call_t *)linux_uname, AUE_NULL, NULL, 0, 0 }, /* 109 = linux_uname */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 110 = iopl */ + { 0, (sy_call_t *)linux_vhangup, AUE_NULL, NULL, 0, 0 }, /* 111 = linux_vhangup */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 112 = idle */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 113 = vm86old */ + { AS(linux_wait4_args), (sy_call_t *)linux_wait4, AUE_WAIT4, NULL, 0, 0 }, /* 114 = linux_wait4 */ + { 0, (sy_call_t *)linux_swapoff, AUE_SWAPOFF, NULL, 0, 0 }, /* 115 = linux_swapoff */ + { AS(linux_sysinfo_args), (sy_call_t *)linux_sysinfo, AUE_NULL, NULL, 0, 0 }, /* 116 = linux_sysinfo */ + { AS(linux_ipc_args), (sy_call_t *)linux_ipc, AUE_NULL, NULL, 0, 0 }, /* 117 = linux_ipc */ + { AS(fsync_args), (sy_call_t *)fsync, AUE_FSYNC, NULL, 0, 0 }, /* 118 = fsync */ + { AS(linux_sigreturn_args), (sy_call_t *)linux_sigreturn, AUE_SIGRETURN, NULL, 0, 0 }, /* 119 = linux_sigreturn */ + { AS(linux_clone_args), (sy_call_t *)linux_clone, AUE_RFORK, NULL, 0, 0 }, /* 120 = linux_clone */ + { AS(setdomainname_args), (sy_call_t *)setdomainname, AUE_SYSCTL, NULL, 0, 0 }, /* 121 = setdomainname */ + { AS(linux_newuname_args), (sy_call_t *)linux_newuname, AUE_NULL, NULL, 0, 0 }, /* 122 = linux_newuname */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 123 = modify_ldt */ + { 0, (sy_call_t *)linux_adjtimex, AUE_ADJTIME, NULL, 0, 0 }, /* 124 = linux_adjtimex */ + { AS(linux_mprotect_args), (sy_call_t *)linux_mprotect, AUE_MPROTECT, NULL, 0, 0 }, /* 125 = linux_mprotect */ + { AS(linux_sigprocmask_args), (sy_call_t *)linux_sigprocmask, AUE_SIGPROCMASK, NULL, 0, 0 }, /* 126 = linux_sigprocmask */ + { 0, (sy_call_t *)linux_create_module, AUE_NULL, NULL, 0, 0 }, /* 127 = linux_create_module */ + { 0, (sy_call_t *)linux_init_module, AUE_NULL, NULL, 0, 0 }, /* 128 = linux_init_module */ + { 0, (sy_call_t *)linux_delete_module, AUE_NULL, NULL, 0, 0 }, /* 129 = linux_delete_module */ + { 0, (sy_call_t *)linux_get_kernel_syms, AUE_NULL, NULL, 0, 0 }, /* 130 = linux_get_kernel_syms */ + { 0, (sy_call_t *)linux_quotactl, AUE_QUOTACTL, NULL, 0, 0 }, /* 131 = linux_quotactl */ + { AS(getpgid_args), (sy_call_t *)getpgid, AUE_GETPGID, NULL, 0, 0 }, /* 132 = getpgid */ + { AS(fchdir_args), (sy_call_t *)fchdir, AUE_FCHDIR, NULL, 0, 0 }, /* 133 = fchdir */ + { 0, (sy_call_t *)linux_bdflush, AUE_BDFLUSH, NULL, 0, 0 }, /* 134 = linux_bdflush */ + { AS(linux_sysfs_args), (sy_call_t *)linux_sysfs, AUE_NULL, NULL, 0, 0 }, /* 135 = linux_sysfs */ + { AS(linux_personality_args), (sy_call_t *)linux_personality, AUE_PERSONALITY, NULL, 0, 0 }, /* 136 = linux_personality */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 137 = afs_syscall */ + { AS(linux_setfsuid16_args), (sy_call_t *)linux_setfsuid16, AUE_SETFSUID, NULL, 0, 0 }, /* 138 = linux_setfsuid16 */ + { AS(linux_setfsgid16_args), (sy_call_t *)linux_setfsgid16, AUE_SETFSGID, NULL, 0, 0 }, /* 139 = linux_setfsgid16 */ + { AS(linux_llseek_args), (sy_call_t *)linux_llseek, AUE_LSEEK, NULL, 0, 0 }, /* 140 = linux_llseek */ + { AS(linux_getdents_args), (sy_call_t *)linux_getdents, AUE_O_GETDENTS, NULL, 0, 0 }, /* 141 = linux_getdents */ + { AS(linux_select_args), (sy_call_t *)linux_select, AUE_SELECT, NULL, 0, 0 }, /* 142 = linux_select */ + { AS(flock_args), (sy_call_t *)flock, AUE_FLOCK, NULL, 0, 0 }, /* 143 = flock */ + { AS(linux_msync_args), (sy_call_t *)linux_msync, AUE_MSYNC, NULL, 0, 0 }, /* 144 = linux_msync */ + { AS(linux_readv_args), (sy_call_t *)linux_readv, AUE_READV, NULL, 0, 0 }, /* 145 = linux_readv */ + { AS(linux_writev_args), (sy_call_t *)linux_writev, AUE_WRITEV, NULL, 0, 0 }, /* 146 = linux_writev */ + { AS(linux_getsid_args), (sy_call_t *)linux_getsid, AUE_GETSID, NULL, 0, 0 }, /* 147 = linux_getsid */ + { AS(linux_fdatasync_args), (sy_call_t *)linux_fdatasync, AUE_NULL, NULL, 0, 0 }, /* 148 = linux_fdatasync */ + { AS(linux_sysctl_args), (sy_call_t *)linux_sysctl, AUE_SYSCTL, NULL, 0, 0 }, /* 149 = linux_sysctl */ + { AS(mlock_args), (sy_call_t *)mlock, AUE_MLOCK, NULL, 0, 0 }, /* 150 = mlock */ + { AS(munlock_args), (sy_call_t *)munlock, AUE_MUNLOCK, NULL, 0, 0 }, /* 151 = munlock */ + { AS(mlockall_args), (sy_call_t *)mlockall, AUE_MLOCKALL, NULL, 0, 0 }, /* 152 = mlockall */ + { 0, (sy_call_t *)munlockall, AUE_MUNLOCKALL, NULL, 0, 0 }, /* 153 = munlockall */ + { AS(sched_setparam_args), (sy_call_t *)sched_setparam, AUE_SCHED_SETPARAM, NULL, 0, 0 }, /* 154 = sched_setparam */ + { AS(sched_getparam_args), (sy_call_t *)sched_getparam, AUE_SCHED_GETPARAM, NULL, 0, 0 }, /* 155 = sched_getparam */ + { AS(linux_sched_setscheduler_args), (sy_call_t *)linux_sched_setscheduler, AUE_SCHED_SETSCHEDULER, NULL, 0, 0 }, /* 156 = linux_sched_setscheduler */ + { AS(linux_sched_getscheduler_args), (sy_call_t *)linux_sched_getscheduler, AUE_SCHED_GETSCHEDULER, NULL, 0, 0 }, /* 157 = linux_sched_getscheduler */ + { 0, (sy_call_t *)sched_yield, AUE_NULL, NULL, 0, 0 }, /* 158 = sched_yield */ + { AS(linux_sched_get_priority_max_args), (sy_call_t *)linux_sched_get_priority_max, AUE_SCHED_GET_PRIORITY_MAX, NULL, 0, 0 }, /* 159 = linux_sched_get_priority_max */ + { AS(linux_sched_get_priority_min_args), (sy_call_t *)linux_sched_get_priority_min, AUE_SCHED_GET_PRIORITY_MIN, NULL, 0, 0 }, /* 160 = linux_sched_get_priority_min */ + { AS(linux_sched_rr_get_interval_args), (sy_call_t *)linux_sched_rr_get_interval, AUE_SCHED_RR_GET_INTERVAL, NULL, 0, 0 }, /* 161 = linux_sched_rr_get_interval */ + { AS(linux_nanosleep_args), (sy_call_t *)linux_nanosleep, AUE_NULL, NULL, 0, 0 }, /* 162 = linux_nanosleep */ + { AS(linux_mremap_args), (sy_call_t *)linux_mremap, AUE_NULL, NULL, 0, 0 }, /* 163 = linux_mremap */ + { AS(linux_setresuid16_args), (sy_call_t *)linux_setresuid16, AUE_SETRESUID, NULL, 0, 0 }, /* 164 = linux_setresuid16 */ + { AS(linux_getresuid16_args), (sy_call_t *)linux_getresuid16, AUE_GETRESUID, NULL, 0, 0 }, /* 165 = linux_getresuid16 */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 166 = vm86 */ + { 0, (sy_call_t *)linux_query_module, AUE_NULL, NULL, 0, 0 }, /* 167 = linux_query_module */ + { AS(poll_args), (sy_call_t *)poll, AUE_POLL, NULL, 0, 0 }, /* 168 = poll */ + { 0, (sy_call_t *)linux_nfsservctl, AUE_NULL, NULL, 0, 0 }, /* 169 = linux_nfsservctl */ + { AS(linux_setresgid16_args), (sy_call_t *)linux_setresgid16, AUE_SETRESGID, NULL, 0, 0 }, /* 170 = linux_setresgid16 */ + { AS(linux_getresgid16_args), (sy_call_t *)linux_getresgid16, AUE_GETRESGID, NULL, 0, 0 }, /* 171 = linux_getresgid16 */ + { 0, (sy_call_t *)linux_prctl, AUE_PRCTL, NULL, 0, 0 }, /* 172 = linux_prctl */ + { AS(linux_rt_sigreturn_args), (sy_call_t *)linux_rt_sigreturn, AUE_NULL, NULL, 0, 0 }, /* 173 = linux_rt_sigreturn */ + { AS(linux_rt_sigaction_args), (sy_call_t *)linux_rt_sigaction, AUE_NULL, NULL, 0, 0 }, /* 174 = linux_rt_sigaction */ + { AS(linux_rt_sigprocmask_args), (sy_call_t *)linux_rt_sigprocmask, AUE_NULL, NULL, 0, 0 }, /* 175 = linux_rt_sigprocmask */ + { AS(linux_rt_sigpending_args), (sy_call_t *)linux_rt_sigpending, AUE_NULL, NULL, 0, 0 }, /* 176 = linux_rt_sigpending */ + { 0, (sy_call_t *)linux_rt_sigtimedwait, AUE_NULL, NULL, 0, 0 }, /* 177 = linux_rt_sigtimedwait */ + { 0, (sy_call_t *)linux_rt_sigqueueinfo, AUE_NULL, NULL, 0, 0 }, /* 178 = linux_rt_sigqueueinfo */ + { AS(linux_rt_sigsuspend_args), (sy_call_t *)linux_rt_sigsuspend, AUE_NULL, NULL, 0, 0 }, /* 179 = linux_rt_sigsuspend */ + { AS(linux_pread_args), (sy_call_t *)linux_pread, AUE_PREAD, NULL, 0, 0 }, /* 180 = linux_pread */ + { AS(linux_pwrite_args), (sy_call_t *)linux_pwrite, AUE_PWRITE, NULL, 0, 0 }, /* 181 = linux_pwrite */ + { AS(linux_chown16_args), (sy_call_t *)linux_chown16, AUE_CHOWN, NULL, 0, 0 }, /* 182 = linux_chown16 */ + { AS(linux_getcwd_args), (sy_call_t *)linux_getcwd, AUE_GETCWD, NULL, 0, 0 }, /* 183 = linux_getcwd */ + { 0, (sy_call_t *)linux_capget, AUE_CAPGET, NULL, 0, 0 }, /* 184 = linux_capget */ + { 0, (sy_call_t *)linux_capset, AUE_CAPSET, NULL, 0, 0 }, /* 185 = linux_capset */ + { AS(linux_sigaltstack_args), (sy_call_t *)linux_sigaltstack, AUE_NULL, NULL, 0, 0 }, /* 186 = linux_sigaltstack */ + { 0, (sy_call_t *)linux_sendfile, AUE_SENDFILE, NULL, 0, 0 }, /* 187 = linux_sendfile */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 188 = getpmsg */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 189 = putpmsg */ + { 0, (sy_call_t *)linux_vfork, AUE_VFORK, NULL, 0, 0 }, /* 190 = linux_vfork */ + { AS(linux_getrlimit_args), (sy_call_t *)linux_getrlimit, AUE_GETRLIMIT, NULL, 0, 0 }, /* 191 = linux_getrlimit */ + { AS(linux_mmap2_args), (sy_call_t *)linux_mmap2, AUE_MMAP, NULL, 0, 0 }, /* 192 = linux_mmap2 */ + { AS(linux_truncate64_args), (sy_call_t *)linux_truncate64, AUE_TRUNCATE, NULL, 0, 0 }, /* 193 = linux_truncate64 */ + { AS(linux_ftruncate64_args), (sy_call_t *)linux_ftruncate64, AUE_FTRUNCATE, NULL, 0, 0 }, /* 194 = linux_ftruncate64 */ + { AS(linux_stat64_args), (sy_call_t *)linux_stat64, AUE_STAT, NULL, 0, 0 }, /* 195 = linux_stat64 */ + { AS(linux_lstat64_args), (sy_call_t *)linux_lstat64, AUE_LSTAT, NULL, 0, 0 }, /* 196 = linux_lstat64 */ + { AS(linux_fstat64_args), (sy_call_t *)linux_fstat64, AUE_FSTAT, NULL, 0, 0 }, /* 197 = linux_fstat64 */ + { AS(linux_lchown_args), (sy_call_t *)linux_lchown, AUE_LCHOWN, NULL, 0, 0 }, /* 198 = linux_lchown */ + { 0, (sy_call_t *)linux_getuid, AUE_GETUID, NULL, 0, 0 }, /* 199 = linux_getuid */ + { 0, (sy_call_t *)linux_getgid, AUE_GETGID, NULL, 0, 0 }, /* 200 = linux_getgid */ + { 0, (sy_call_t *)geteuid, AUE_GETEUID, NULL, 0, 0 }, /* 201 = geteuid */ + { 0, (sy_call_t *)getegid, AUE_GETEGID, NULL, 0, 0 }, /* 202 = getegid */ + { AS(setreuid_args), (sy_call_t *)setreuid, AUE_SETREUID, NULL, 0, 0 }, /* 203 = setreuid */ + { AS(setregid_args), (sy_call_t *)setregid, AUE_SETREGID, NULL, 0, 0 }, /* 204 = setregid */ + { AS(linux_getgroups_args), (sy_call_t *)linux_getgroups, AUE_GETGROUPS, NULL, 0, 0 }, /* 205 = linux_getgroups */ + { AS(linux_setgroups_args), (sy_call_t *)linux_setgroups, AUE_SETGROUPS, NULL, 0, 0 }, /* 206 = linux_setgroups */ + { AS(fchown_args), (sy_call_t *)fchown, AUE_NULL, NULL, 0, 0 }, /* 207 = fchown */ + { AS(setresuid_args), (sy_call_t *)setresuid, AUE_SETRESUID, NULL, 0, 0 }, /* 208 = setresuid */ + { AS(getresuid_args), (sy_call_t *)getresuid, AUE_GETRESUID, NULL, 0, 0 }, /* 209 = getresuid */ + { AS(setresgid_args), (sy_call_t *)setresgid, AUE_SETRESGID, NULL, 0, 0 }, /* 210 = setresgid */ + { AS(getresgid_args), (sy_call_t *)getresgid, AUE_GETRESGID, NULL, 0, 0 }, /* 211 = getresgid */ + { AS(linux_chown_args), (sy_call_t *)linux_chown, AUE_CHOWN, NULL, 0, 0 }, /* 212 = linux_chown */ + { AS(setuid_args), (sy_call_t *)setuid, AUE_SETUID, NULL, 0, 0 }, /* 213 = setuid */ + { AS(setgid_args), (sy_call_t *)setgid, AUE_SETGID, NULL, 0, 0 }, /* 214 = setgid */ + { AS(linux_setfsuid_args), (sy_call_t *)linux_setfsuid, AUE_SETFSUID, NULL, 0, 0 }, /* 215 = linux_setfsuid */ + { AS(linux_setfsgid_args), (sy_call_t *)linux_setfsgid, AUE_SETFSGID, NULL, 0, 0 }, /* 216 = linux_setfsgid */ + { AS(linux_pivot_root_args), (sy_call_t *)linux_pivot_root, AUE_PIVOT_ROOT, NULL, 0, 0 }, /* 217 = linux_pivot_root */ + { AS(linux_mincore_args), (sy_call_t *)linux_mincore, AUE_MINCORE, NULL, 0, 0 }, /* 218 = linux_mincore */ + { AS(madvise_args), (sy_call_t *)madvise, AUE_MADVISE, NULL, 0, 0 }, /* 219 = madvise */ + { AS(linux_getdents64_args), (sy_call_t *)linux_getdents64, AUE_O_GETDENTS, NULL, 0, 0 }, /* 220 = linux_getdents64 */ + { AS(linux_fcntl64_args), (sy_call_t *)linux_fcntl64, AUE_FCNTL, NULL, 0, 0 }, /* 221 = linux_fcntl64 */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 222 = */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 223 = */ + { 0, (sy_call_t *)linux_gettid, AUE_NULL, NULL, 0, 0 }, /* 224 = linux_gettid */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 225 = linux_readahead */ + { 0, (sy_call_t *)linux_setxattr, AUE_NULL, NULL, 0, 0 }, /* 226 = linux_setxattr */ + { 0, (sy_call_t *)linux_lsetxattr, AUE_NULL, NULL, 0, 0 }, /* 227 = linux_lsetxattr */ + { 0, (sy_call_t *)linux_fsetxattr, AUE_NULL, NULL, 0, 0 }, /* 228 = linux_fsetxattr */ + { 0, (sy_call_t *)linux_getxattr, AUE_NULL, NULL, 0, 0 }, /* 229 = linux_getxattr */ + { 0, (sy_call_t *)linux_lgetxattr, AUE_NULL, NULL, 0, 0 }, /* 230 = linux_lgetxattr */ + { 0, (sy_call_t *)linux_fgetxattr, AUE_NULL, NULL, 0, 0 }, /* 231 = linux_fgetxattr */ + { 0, (sy_call_t *)linux_listxattr, AUE_NULL, NULL, 0, 0 }, /* 232 = linux_listxattr */ + { 0, (sy_call_t *)linux_llistxattr, AUE_NULL, NULL, 0, 0 }, /* 233 = linux_llistxattr */ + { 0, (sy_call_t *)linux_flistxattr, AUE_NULL, NULL, 0, 0 }, /* 234 = linux_flistxattr */ + { 0, (sy_call_t *)linux_removexattr, AUE_NULL, NULL, 0, 0 }, /* 235 = linux_removexattr */ + { 0, (sy_call_t *)linux_lremovexattr, AUE_NULL, NULL, 0, 0 }, /* 236 = linux_lremovexattr */ + { 0, (sy_call_t *)linux_fremovexattr, AUE_NULL, NULL, 0, 0 }, /* 237 = linux_fremovexattr */ + { AS(linux_tkill_args), (sy_call_t *)linux_tkill, AUE_NULL, NULL, 0, 0 }, /* 238 = linux_tkill */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 239 = linux_sendfile64 */ + { AS(linux_sys_futex_args), (sy_call_t *)linux_sys_futex, AUE_NULL, NULL, 0, 0 }, /* 240 = linux_sys_futex */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 241 = linux_sched_setaffinity */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 242 = linux_sched_getaffinity */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 243 = linux_set_thread_area */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 244 = linux_get_thread_area */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 245 = linux_io_setup */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 246 = linux_io_destroy */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 247 = linux_io_getevents */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 248 = linux_io_submit */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 249 = linux_io_cancel */ + { 0, (sy_call_t *)linux_fadvise64, AUE_NULL, NULL, 0, 0 }, /* 250 = linux_fadvise64 */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 251 = */ + { AS(linux_exit_group_args), (sy_call_t *)linux_exit_group, AUE_EXIT, NULL, 0, 0 }, /* 252 = linux_exit_group */ + { 0, (sy_call_t *)linux_lookup_dcookie, AUE_NULL, NULL, 0, 0 }, /* 253 = linux_lookup_dcookie */ + { 0, (sy_call_t *)linux_epoll_create, AUE_NULL, NULL, 0, 0 }, /* 254 = linux_epoll_create */ + { 0, (sy_call_t *)linux_epoll_ctl, AUE_NULL, NULL, 0, 0 }, /* 255 = linux_epoll_ctl */ + { 0, (sy_call_t *)linux_epoll_wait, AUE_NULL, NULL, 0, 0 }, /* 256 = linux_epoll_wait */ + { 0, (sy_call_t *)linux_remap_file_pages, AUE_NULL, NULL, 0, 0 }, /* 257 = linux_remap_file_pages */ + { AS(linux_set_tid_address_args), (sy_call_t *)linux_set_tid_address, AUE_NULL, NULL, 0, 0 }, /* 258 = linux_set_tid_address */ + { 0, (sy_call_t *)linux_timer_create, AUE_NULL, NULL, 0, 0 }, /* 259 = linux_timer_create */ + { 0, (sy_call_t *)linux_timer_settime, AUE_NULL, NULL, 0, 0 }, /* 260 = linux_timer_settime */ + { 0, (sy_call_t *)linux_timer_gettime, AUE_NULL, NULL, 0, 0 }, /* 261 = linux_timer_gettime */ + { 0, (sy_call_t *)linux_timer_getoverrun, AUE_NULL, NULL, 0, 0 }, /* 262 = linux_timer_getoverrun */ + { 0, (sy_call_t *)linux_timer_delete, AUE_NULL, NULL, 0, 0 }, /* 263 = linux_timer_delete */ + { 0, (sy_call_t *)linux_clock_settime, AUE_CLOCK_SETTIME, NULL, 0, 0 }, /* 264 = linux_clock_settime */ + { 0, (sy_call_t *)linux_clock_gettime, AUE_NULL, NULL, 0, 0 }, /* 265 = linux_clock_gettime */ + { 0, (sy_call_t *)linux_clock_getres, AUE_NULL, NULL, 0, 0 }, /* 266 = linux_clock_getres */ + { 0, (sy_call_t *)linux_clock_nanosleep, AUE_NULL, NULL, 0, 0 }, /* 267 = linux_clock_nanosleep */ + { 0, (sy_call_t *)linux_statfs64, AUE_NULL, NULL, 0, 0 }, /* 268 = linux_statfs64 */ + { 0, (sy_call_t *)linux_fstatfs64, AUE_NULL, NULL, 0, 0 }, /* 269 = linux_fstatfs64 */ + { AS(linux_tgkill_args), (sy_call_t *)linux_tgkill, AUE_NULL, NULL, 0, 0 }, /* 270 = linux_tgkill */ + { 0, (sy_call_t *)linux_utimes, AUE_NULL, NULL, 0, 0 }, /* 271 = linux_utimes */ + { 0, (sy_call_t *)linux_fadvise64_64, AUE_NULL, NULL, 0, 0 }, /* 272 = linux_fadvise64_64 */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 273 = */ + { 0, (sy_call_t *)linux_mbind, AUE_NULL, NULL, 0, 0 }, /* 274 = linux_mbind */ + { 0, (sy_call_t *)linux_get_mempolicy, AUE_NULL, NULL, 0, 0 }, /* 275 = linux_get_mempolicy */ + { 0, (sy_call_t *)linux_set_mempolicy, AUE_NULL, NULL, 0, 0 }, /* 276 = linux_set_mempolicy */ + { 0, (sy_call_t *)linux_mq_open, AUE_NULL, NULL, 0, 0 }, /* 277 = linux_mq_open */ + { 0, (sy_call_t *)linux_mq_unlink, AUE_NULL, NULL, 0, 0 }, /* 278 = linux_mq_unlink */ + { 0, (sy_call_t *)linux_mq_timedsend, AUE_NULL, NULL, 0, 0 }, /* 279 = linux_mq_timedsend */ + { 0, (sy_call_t *)linux_mq_timedreceive, AUE_NULL, NULL, 0, 0 }, /* 280 = linux_mq_timedreceive */ + { 0, (sy_call_t *)linux_mq_notify, AUE_NULL, NULL, 0, 0 }, /* 281 = linux_mq_notify */ + { 0, (sy_call_t *)linux_mq_getsetattr, AUE_NULL, NULL, 0, 0 }, /* 282 = linux_mq_getsetattr */ + { 0, (sy_call_t *)linux_kexec_load, AUE_NULL, NULL, 0, 0 }, /* 283 = linux_kexec_load */ + { 0, (sy_call_t *)linux_waitid, AUE_NULL, NULL, 0, 0 }, /* 284 = linux_waitid */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 285 = */ + { 0, (sy_call_t *)linux_add_key, AUE_NULL, NULL, 0, 0 }, /* 286 = linux_add_key */ + { 0, (sy_call_t *)linux_request_key, AUE_NULL, NULL, 0, 0 }, /* 287 = linux_request_key */ + { 0, (sy_call_t *)linux_keyctl, AUE_NULL, NULL, 0, 0 }, /* 288 = linux_keyctl */ + { 0, (sy_call_t *)linux_ioprio_set, AUE_NULL, NULL, 0, 0 }, /* 289 = linux_ioprio_set */ + { 0, (sy_call_t *)linux_ioprio_get, AUE_NULL, NULL, 0, 0 }, /* 290 = linux_ioprio_get */ + { 0, (sy_call_t *)linux_inotify_init, AUE_NULL, NULL, 0, 0 }, /* 291 = linux_inotify_init */ + { 0, (sy_call_t *)linux_inotify_add_watch, AUE_NULL, NULL, 0, 0 }, /* 292 = linux_inotify_add_watch */ + { 0, (sy_call_t *)linux_inotify_rm_watch, AUE_NULL, NULL, 0, 0 }, /* 293 = linux_inotify_rm_watch */ + { 0, (sy_call_t *)linux_migrate_pages, AUE_NULL, NULL, 0, 0 }, /* 294 = linux_migrate_pages */ + { 0, (sy_call_t *)linux_openat, AUE_NULL, NULL, 0, 0 }, /* 295 = linux_openat */ + { 0, (sy_call_t *)linux_mkdirat, AUE_NULL, NULL, 0, 0 }, /* 296 = linux_mkdirat */ + { 0, (sy_call_t *)linux_mknodat, AUE_NULL, NULL, 0, 0 }, /* 297 = linux_mknodat */ + { 0, (sy_call_t *)linux_fchownat, AUE_NULL, NULL, 0, 0 }, /* 298 = linux_fchownat */ + { 0, (sy_call_t *)linux_futimesat, AUE_NULL, NULL, 0, 0 }, /* 299 = linux_futimesat */ + { 0, (sy_call_t *)linux_fstatat64, AUE_NULL, NULL, 0, 0 }, /* 300 = linux_fstatat64 */ + { 0, (sy_call_t *)linux_unlinkat, AUE_NULL, NULL, 0, 0 }, /* 301 = linux_unlinkat */ + { 0, (sy_call_t *)linux_renameat, AUE_NULL, NULL, 0, 0 }, /* 302 = linux_renameat */ + { 0, (sy_call_t *)linux_linkat, AUE_NULL, NULL, 0, 0 }, /* 303 = linux_linkat */ + { 0, (sy_call_t *)linux_symlinkat, AUE_NULL, NULL, 0, 0 }, /* 304 = linux_symlinkat */ + { 0, (sy_call_t *)linux_readlinkat, AUE_NULL, NULL, 0, 0 }, /* 305 = linux_readlinkat */ + { 0, (sy_call_t *)linux_fchmodat, AUE_NULL, NULL, 0, 0 }, /* 306 = linux_fchmodat */ + { 0, (sy_call_t *)linux_faccessat, AUE_NULL, NULL, 0, 0 }, /* 307 = linux_faccessat */ + { 0, (sy_call_t *)linux_pselect6, AUE_NULL, NULL, 0, 0 }, /* 308 = linux_pselect6 */ + { 0, (sy_call_t *)linux_ppoll, AUE_NULL, NULL, 0, 0 }, /* 309 = linux_ppoll */ + { 0, (sy_call_t *)linux_unshare, AUE_NULL, NULL, 0, 0 }, /* 310 = linux_unshare */ }; From owner-p4-projects@FreeBSD.ORG Sun Aug 13 13:18:57 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6E65116A4E5; Sun, 13 Aug 2006 13:18:57 +0000 (UTC) X-Original-To: perforce@FreeBSD.org 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 298C916A4DD for ; Sun, 13 Aug 2006 13:18:57 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E6D0D43D45 for ; Sun, 13 Aug 2006 13:18:56 +0000 (GMT) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7DDIupP021066 for ; Sun, 13 Aug 2006 13:18:56 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7DDIu2V021053 for perforce@freebsd.org; Sun, 13 Aug 2006 13:18:56 GMT (envelope-from rdivacky@FreeBSD.org) Date: Sun, 13 Aug 2006 13:18:56 GMT Message-Id: <200608131318.k7DDIu2V021053@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rdivacky@FreeBSD.org using -f From: Roman Divacky To: Perforce Change Reviews Cc: Subject: PERFORCE change 103760 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 13 Aug 2006 13:18:57 -0000 http://perforce.freebsd.org/chv.cgi?CH=103760 Change 103760 by rdivacky@rdivacky_witten on 2006/08/13 13:18:36 Remove added syscalls from linux32_dummy.c Affected files ... .. //depot/projects/soc2006/rdivacky_linuxolator/amd64/linux32/linux32_dummy.c#4 edit Differences ... ==== //depot/projects/soc2006/rdivacky_linuxolator/amd64/linux32/linux32_dummy.c#4 (text+ko) ==== @@ -72,7 +72,6 @@ DUMMY(epoll_ctl); DUMMY(epoll_wait); DUMMY(remap_file_pages); -DUMMY(set_tid_address); DUMMY(timer_create); DUMMY(timer_settime); DUMMY(timer_gettime); @@ -84,7 +83,6 @@ DUMMY(clock_nanosleep); DUMMY(statfs64); DUMMY(fstatfs64); -DUMMY(tgkill); DUMMY(utimes); DUMMY(fadvise64_64); DUMMY(mbind); From owner-p4-projects@FreeBSD.ORG Sun Aug 13 13:28:09 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A028D16A4DD; Sun, 13 Aug 2006 13:28:09 +0000 (UTC) X-Original-To: perforce@FreeBSD.org 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 6068816A4E0 for ; Sun, 13 Aug 2006 13:28:09 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1F3D843D45 for ; Sun, 13 Aug 2006 13:28:09 +0000 (GMT) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7DDS8n8021757 for ; Sun, 13 Aug 2006 13:28:09 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7DDS8cD021754 for perforce@freebsd.org; Sun, 13 Aug 2006 13:28:08 GMT (envelope-from rdivacky@FreeBSD.org) Date: Sun, 13 Aug 2006 13:28:08 GMT Message-Id: <200608131328.k7DDS8cD021754@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rdivacky@FreeBSD.org using -f From: Roman Divacky To: Perforce Change Reviews Cc: Subject: PERFORCE change 103761 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 13 Aug 2006 13:28:09 -0000 http://perforce.freebsd.org/chv.cgi?CH=103761 Change 103761 by rdivacky@rdivacky_witten on 2006/08/13 13:27:15 Move mq* syscalls to MD, it uses timespec. Affected files ... .. //depot/projects/soc2006/rdivacky_linuxolator/compat/linux/linux_ipc.c#5 edit .. //depot/projects/soc2006/rdivacky_linuxolator/i386/linux/linux_machdep.c#45 edit Differences ... ==== //depot/projects/soc2006/rdivacky_linuxolator/compat/linux/linux_ipc.c#5 (text+ko) ==== @@ -40,7 +40,6 @@ #include #include "opt_compat.h" -#include "opt_posix.h" #ifdef COMPAT_LINUX32 #include @@ -806,66 +805,6 @@ } } -int -linux_mq_open(struct thread *td, struct linux_mq_open_args *args) -{ -#ifdef P1003_1B_MQUEUE - return kmq_open(td, (struct kmq_open_args *) args); -#else - return (ENOSYS); -#endif -} - -int -linux_mq_unlink(struct thread *td, struct linux_mq_unlink_args *args) -{ -#ifdef P1003_1B_MQUEUE - return kmq_unlink(td, (struct kmq_unlink_args *) args); -#else - return (ENOSYS); -#endif -} - -int -linux_mq_timedsend(struct thread *td, struct linux_mq_timedsend_args *args) -{ -#ifdef P1003_1B_MQUEUE - return kmq_timedsend(td, (struct kmq_timedsend_args *) args); -#else - return (ENOSYS); -#endif -} - -int -linux_mq_timedreceive(struct thread *td, struct linux_mq_timedreceive_args *args) -{ -#ifdef P1003_1B_MQUEUE - return kmq_timedreceive(td, (struct kmq_timedreceive_args *) args); -#else - return (ENOSYS); -#endif -} - -int -linux_mq_notify(struct thread *td, struct linux_mq_notify_args *args) -{ -#ifdef P1003_1B_MQUEUE - return kmq_notify(td, (struct kmq_notify_args *) args); -#else - return (ENOSYS); -#endif -} - -int -linux_mq_getsetattr(struct thread *td, struct linux_mq_getsetattr_args *args) -{ -#ifdef P1003_1B_MQUEUE - return kmq_setattr(td, (struct kmq_setattr_args *) args); -#else - return (ENOSYS); -#endif -} - MODULE_DEPEND(linux, sysvmsg, 1, 1, 1); MODULE_DEPEND(linux, sysvsem, 1, 1, 1); MODULE_DEPEND(linux, sysvshm, 1, 1, 1); ==== //depot/projects/soc2006/rdivacky_linuxolator/i386/linux/linux_machdep.c#45 (text+ko) ==== @@ -65,6 +65,8 @@ #include /* needed for pcb definition in linux_set_thread_area */ +#include "opt_posix.h" + extern struct sx emul_shared_lock; extern struct sx emul_lock; @@ -1129,3 +1131,65 @@ { return ktimer_delete(td, (struct ktimer_delete_args *) args); } + +/* XXX: this wont work with module - convert it */ +int +linux_mq_open(struct thread *td, struct linux_mq_open_args *args) +{ +#ifdef P1003_1B_MQUEUE + return kmq_open(td, (struct kmq_open_args *) args); +#else + return (ENOSYS); +#endif +} + +int +linux_mq_unlink(struct thread *td, struct linux_mq_unlink_args *args) +{ +#ifdef P1003_1B_MQUEUE + return kmq_unlink(td, (struct kmq_unlink_args *) args); +#else + return (ENOSYS); +#endif +} + +int +linux_mq_timedsend(struct thread *td, struct linux_mq_timedsend_args *args) +{ +#ifdef P1003_1B_MQUEUE + return kmq_timedsend(td, (struct kmq_timedsend_args *) args); +#else + return (ENOSYS); +#endif +} + +int +linux_mq_timedreceive(struct thread *td, struct linux_mq_timedreceive_args *args) +{ +#ifdef P1003_1B_MQUEUE + return kmq_timedreceive(td, (struct kmq_timedreceive_args *) args); +#else + return (ENOSYS); +#endif +} + +int +linux_mq_notify(struct thread *td, struct linux_mq_notify_args *args) +{ +#ifdef P1003_1B_MQUEUE + return kmq_notify(td, (struct kmq_notify_args *) args); +#else + return (ENOSYS); +#endif +} + +int +linux_mq_getsetattr(struct thread *td, struct linux_mq_getsetattr_args *args) +{ +#ifdef P1003_1B_MQUEUE + return kmq_setattr(td, (struct kmq_setattr_args *) args); +#else + return (ENOSYS); +#endif +} + From owner-p4-projects@FreeBSD.ORG Sun Aug 13 13:34:19 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EF40A16A4E2; Sun, 13 Aug 2006 13:34:18 +0000 (UTC) X-Original-To: perforce@FreeBSD.org 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 B225416A4E0 for ; Sun, 13 Aug 2006 13:34:18 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id ECB8143D45 for ; Sun, 13 Aug 2006 13:34:17 +0000 (GMT) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7DDYHCd022176 for ; Sun, 13 Aug 2006 13:34:17 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7DDYGuY022173 for perforce@freebsd.org; Sun, 13 Aug 2006 13:34:16 GMT (envelope-from rdivacky@FreeBSD.org) Date: Sun, 13 Aug 2006 13:34:16 GMT Message-Id: <200608131334.k7DDYGuY022173@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rdivacky@FreeBSD.org using -f From: Roman Divacky To: Perforce Change Reviews Cc: Subject: PERFORCE change 103762 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 13 Aug 2006 13:34:19 -0000 http://perforce.freebsd.org/chv.cgi?CH=103762 Change 103762 by rdivacky@rdivacky_witten on 2006/08/13 13:34:05 IFC Affected files ... .. //depot/projects/soc2006/rdivacky_linuxolator/amd64/acpica/madt.c#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/amd64/amd64/pmap.c#7 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/amd64/include/pmap.h#3 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/conf/files#8 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/contrib/dev/acpica/acfreebsd.h#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/dev/acpica/Osd/OsdMemory.c#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/dev/acpica/acpi_hpet.c#3 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/dev/ata/ata-chipset.c#6 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/dev/ata/ata-pci.h#5 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/dev/exca/excareg.h#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/dev/hme/if_hme.c#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/dev/mii/rgephy.c#4 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/dev/pccbb/pccbb.c#3 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/dev/pccbb/pccbb_pci.c#3 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/dev/pccbb/pccbbreg.h#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/dev/sk/if_sk.c#7 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/dev/stge/if_stge.c#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/dev/ti/if_ti.c#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/geom/eli/g_eli.c#5 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/geom/eli/g_eli.h#4 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/geom/label/g_label.c#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/geom/label/g_label_msdosfs.c#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/geom/label/g_label_msdosfs.h#1 branch .. //depot/projects/soc2006/rdivacky_linuxolator/i386/acpica/acpi_machdep.c#3 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/i386/acpica/madt.c#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/i386/i386/pmap.c#7 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/i386/include/pmap.h#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/ia64/include/pmap.h#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/kern/kern_subr.c#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/kern/uipc_socket.c#6 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/libkern/strstr.c#1 branch .. //depot/projects/soc2006/rdivacky_linuxolator/net/bridgestp.c#4 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/net/if_vlan.c#6 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/netinet/tcp_input.c#5 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/netinet/tcp_subr.c#4 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/netinet/tcp_timer.c#3 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/netinet/tcp_timer.h#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/pci/agp.c#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/pci/if_xl.c#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/sys/libkern.h#3 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/sys/sysctl.h#4 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/vm/device_pager.c#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/vm/vm_fault.c#5 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/vm/vm_object.c#6 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/vm/vm_page.c#7 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/vm/vm_page.h#3 integrate Differences ... ==== //depot/projects/soc2006/rdivacky_linuxolator/amd64/acpica/madt.c#2 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/acpica/madt.c,v 1.20 2006/03/27 15:59:48 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/acpica/madt.c,v 1.21 2006/08/11 19:22:55 jhb Exp $"); #include #include @@ -203,15 +203,15 @@ /* * Map in the RSDP. Since ACPI uses AcpiOsMapMemory() which in turn - * calls pmap_mapdev() to find the RSDP, we assume that we can use - * pmap_mapdev() to map the RSDP. + * calls pmap_mapbios() to find the RSDP, we assume that we can use + * pmap_mapbios() to map the RSDP. */ if (AcpiOsGetRootPointer(ACPI_LOGICAL_ADDRESSING, &rsdp_ptr) != AE_OK) return (ENXIO); #ifdef __i386__ KASSERT(rsdp_ptr.Pointer.Physical < KERNLOAD, ("RSDP too high")); #endif - rsdp = pmap_mapdev(rsdp_ptr.Pointer.Physical, sizeof(RSDP_DESCRIPTOR)); + rsdp = pmap_mapbios(rsdp_ptr.Pointer.Physical, sizeof(RSDP_DESCRIPTOR)); if (rsdp == NULL) { if (bootverbose) printf("MADT: Failed to map RSDP\n"); @@ -261,7 +261,7 @@ break; madt_unmap_table(rsdt); } - pmap_unmapdev((vm_offset_t)rsdp, sizeof(RSDP_DESCRIPTOR)); + pmap_unmapbios((vm_offset_t)rsdp, sizeof(RSDP_DESCRIPTOR)); if (madt_physaddr == 0) { if (bootverbose) printf("MADT: No MADT table found\n"); @@ -335,7 +335,7 @@ madt_setup_local(void) { - madt = pmap_mapdev(madt_physaddr, madt_length); + madt = pmap_mapbios(madt_physaddr, madt_length); lapic_init((uintptr_t)madt->LocalApicAddress); printf("ACPI APIC Table: <%.*s %.*s>\n", (int)sizeof(madt->OemId), madt->OemId, ==== //depot/projects/soc2006/rdivacky_linuxolator/amd64/amd64/pmap.c#7 (text+ko) ==== @@ -77,7 +77,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.569 2006/08/06 06:29:16 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.570 2006/08/11 19:22:55 jhb Exp $"); /* * Manages physical address maps. @@ -665,6 +665,84 @@ * Low level helper routines..... ***************************************************/ +/* + * Determine the appropriate bits to set in a PTE or PDE for a specified + * caching mode. + */ +static int +pmap_cache_bits(int mode, boolean_t is_pde) +{ + int pat_flag, pat_index, cache_bits; + + /* The PAT bit is different for PTE's and PDE's. */ + pat_flag = is_pde ? PG_PDE_PAT : PG_PTE_PAT; + + /* If we don't support PAT, map extended modes to older ones. */ + if (!(cpu_feature & CPUID_PAT)) { + switch (mode) { + case PAT_UNCACHEABLE: + case PAT_WRITE_THROUGH: + case PAT_WRITE_BACK: + break; + case PAT_UNCACHED: + case PAT_WRITE_COMBINING: + case PAT_WRITE_PROTECTED: + mode = PAT_UNCACHEABLE; + break; + } + } + + /* Map the caching mode to a PAT index. */ + switch (mode) { +#ifdef PAT_WORKS + case PAT_UNCACHEABLE: + pat_index = 3; + break; + case PAT_WRITE_THROUGH: + pat_index = 1; + break; + case PAT_WRITE_BACK: + pat_index = 0; + break; + case PAT_UNCACHED: + pat_index = 2; + break; + case PAT_WRITE_COMBINING: + pat_index = 5; + break; + case PAT_WRITE_PROTECTED: + pat_index = 4; + break; +#else + case PAT_UNCACHED: + case PAT_UNCACHEABLE: + case PAT_WRITE_PROTECTED: + pat_index = 3; + break; + case PAT_WRITE_THROUGH: + pat_index = 1; + break; + case PAT_WRITE_BACK: + pat_index = 0; + break; + case PAT_WRITE_COMBINING: + pat_index = 2; + break; +#endif + default: + panic("Unknown caching mode %d\n", mode); + } + + /* Map the 3-bit index value into the PAT, PCD, and PWT bits. */ + cache_bits = 0; + if (pat_index & 0x4) + cache_bits |= pat_flag; + if (pat_index & 0x2) + cache_bits |= PG_NC_PCD; + if (pat_index & 0x1) + cache_bits |= PG_NC_PWT; + return (cache_bits); +} #ifdef SMP /* * For SMP, these functions have to use the IPI mechanism for coherence. @@ -962,6 +1040,15 @@ pte_store(pte, pa | PG_RW | PG_V | PG_G); } +PMAP_INLINE void +pmap_kenter_attr(vm_offset_t va, vm_paddr_t pa, int mode) +{ + pt_entry_t *pte; + + pte = vtopte(va); + pte_store(pte, pa | PG_RW | PG_V | PG_G | pmap_cache_bits(mode, 0)); +} + /* * Remove a page from the kernel pagetables. * Note: not SMP coherent. @@ -2281,6 +2368,10 @@ if (pmap == kernel_pmap) newpte |= PG_G; + /* Preserve any caching attributes. */ + /* XXX: Should this be conditional on something? */ + newpte |= (origpte & (PG_PTE_PAT | PG_NC_PCD | PG_NC_PWT)); + /* * if the mapping or permission bits are different, we need * to update the pte. @@ -3101,6 +3192,46 @@ * Miscellaneous support routines follow */ +/* Adjust the cache mode for a 4KB page mapped via a PTE. */ +static __inline void +pmap_pte_attr(vm_offset_t va, int mode) +{ + pt_entry_t *pte; + u_int opte, npte; + + pte = vtopte(va); + + /* + * The cache mode bits are all in the low 32-bits of the + * PTE, so we can just spin on updating the low 32-bits. + */ + do { + opte = *(u_int *)pte; + npte = opte & ~(PG_PTE_PAT | PG_NC_PCD | PG_NC_PWT); + npte |= pmap_cache_bits(mode, 0); + } while (npte != opte && !atomic_cmpset_int((u_int *)pte, opte, npte)); +} + +/* Adjust the cache mode for a 2MB page mapped via a PDE. */ +static __inline void +pmap_pde_attr(vm_offset_t va, int mode) +{ + pd_entry_t *pde; + u_int opde, npde; + + pde = pmap_pde(kernel_pmap, va); + + /* + * The cache mode bits are all in the low 32-bits of the + * PDE, so we can just spin on updating the low 32-bits. + */ + do { + opde = *(u_int *)pde; + npde = opde & ~(PG_PDE_PAT | PG_NC_PCD | PG_NC_PWT); + npde |= pmap_cache_bits(mode, 1); + } while (npde != opde && !atomic_cmpset_int((u_int *)pde, opde, npde)); +} + /* * Map a set of physical memory pages into the kernel virtual * address space. Return a pointer to where it is mapped. This @@ -3108,12 +3239,15 @@ * NOT real memory. */ void * -pmap_mapdev(vm_paddr_t pa, vm_size_t size) +pmap_mapdev_attr(vm_paddr_t pa, vm_size_t size, int mode) { vm_offset_t va, tmpva, offset; - /* If this fits within the direct map window, use it */ - if (pa < dmaplimit && (pa + size) < dmaplimit) + /* + * If this fits within the direct map window and use WB caching + * mode, use the direct map. + */ + if (pa < dmaplimit && (pa + size) < dmaplimit && mode == PAT_WRITE_BACK) return ((void *)PHYS_TO_DMAP(pa)); offset = pa & PAGE_MASK; size = roundup(offset + size, PAGE_SIZE); @@ -3122,15 +3256,30 @@ panic("pmap_mapdev: Couldn't alloc kernel virtual memory"); pa = trunc_page(pa); for (tmpva = va; size > 0; ) { - pmap_kenter(tmpva, pa); + pmap_kenter_attr(tmpva, pa, mode); size -= PAGE_SIZE; tmpva += PAGE_SIZE; pa += PAGE_SIZE; } pmap_invalidate_range(kernel_pmap, va, tmpva); + pmap_invalidate_cache(); return ((void *)(va + offset)); } +void * +pmap_mapdev(vm_paddr_t pa, vm_size_t size) +{ + + return (pmap_mapdev_attr(pa, size, PAT_UNCACHEABLE)); +} + +void * +pmap_mapbios(vm_paddr_t pa, vm_size_t size) +{ + + return (pmap_mapdev_attr(pa, size, PAT_WRITE_BACK)); +} + void pmap_unmapdev(vm_offset_t va, vm_size_t size) { @@ -3148,6 +3297,73 @@ kmem_free(kernel_map, base, size); } +int +pmap_change_attr(va, size, mode) + vm_offset_t va; + vm_size_t size; + int mode; +{ + vm_offset_t base, offset, tmpva; + pd_entry_t *pde; + pt_entry_t *pte; + + base = va & PG_FRAME; + offset = va & PAGE_MASK; + size = roundup(offset + size, PAGE_SIZE); + + /* Only supported on kernel virtual addresses. */ + if (base <= VM_MAXUSER_ADDRESS) + return (EINVAL); + + /* + * XXX: We have to support tearing 2MB pages down into 4k pages if + * needed here. + */ + /* Pages that aren't mapped aren't supported. */ + for (tmpva = base; tmpva < (base + size); ) { + pde = pmap_pde(kernel_pmap, tmpva); + if (*pde == 0) + return (EINVAL); + if (*pde & PG_PS) { + /* Handle 2MB pages that are completely contained. */ + if (size >= NBPDR) { + tmpva += NBPDR; + continue; + } + return (EINVAL); + } + pte = vtopte(va); + if (*pte == 0) + return (EINVAL); + tmpva += PAGE_SIZE; + } + + /* + * Ok, all the pages exist, so run through them updating their + * cache mode. + */ + for (tmpva = base; size > 0; ) { + pde = pmap_pde(kernel_pmap, tmpva); + if (*pde & PG_PS) { + pmap_pde_attr(tmpva, mode); + tmpva += NBPDR; + size -= NBPDR; + } else { + pmap_pte_attr(tmpva, mode); + tmpva += PAGE_SIZE; + size -= PAGE_SIZE; + } + } + + /* + * Flush CPU caches to make sure any data isn't cached that shouldn't + * be, etc. + */ + pmap_invalidate_range(kernel_pmap, base, tmpva); + pmap_invalidate_cache(); + return (0); +} + /* * perform the pmap work for mincore */ ==== //depot/projects/soc2006/rdivacky_linuxolator/amd64/include/pmap.h#3 (text+ko) ==== @@ -39,7 +39,7 @@ * * from: hp300: @(#)pmap.h 7.2 (Berkeley) 12/16/90 * from: @(#)pmap.h 7.4 (Berkeley) 5/12/91 - * $FreeBSD: src/sys/amd64/include/pmap.h,v 1.133 2006/08/02 16:24:23 alc Exp $ + * $FreeBSD: src/sys/amd64/include/pmap.h,v 1.134 2006/08/11 19:22:56 jhb Exp $ */ #ifndef _MACHINE_PMAP_H_ @@ -302,14 +302,19 @@ extern vm_offset_t virtual_end; #define pmap_page_is_mapped(m) (!TAILQ_EMPTY(&(m)->md.pv_list)) +#define pmap_unmapbios(va, sz) pmap_unmapdev((va), (sz)) void pmap_bootstrap(vm_paddr_t *); +int pmap_change_attr(vm_offset_t, vm_size_t, int); void pmap_init_pat(void); void pmap_kenter(vm_offset_t va, vm_paddr_t pa); +void pmap_kenter_attr(vm_offset_t va, vm_paddr_t pa, int mode); void *pmap_kenter_temporary(vm_paddr_t pa, int i); vm_paddr_t pmap_kextract(vm_offset_t); void pmap_kremove(vm_offset_t); +void *pmap_mapbios(vm_paddr_t, vm_size_t); void *pmap_mapdev(vm_paddr_t, vm_size_t); +void *pmap_mapdev_attr(vm_paddr_t, vm_size_t, int); void pmap_unmapdev(vm_offset_t, vm_size_t); void pmap_invalidate_page(pmap_t, vm_offset_t); void pmap_invalidate_range(pmap_t, vm_offset_t, vm_offset_t); ==== //depot/projects/soc2006/rdivacky_linuxolator/conf/files#8 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.1137 2006/08/07 12:02:42 rwatson Exp $ +# $FreeBSD: src/sys/conf/files,v 1.1139 2006/08/12 18:29:49 pjd Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -1477,6 +1477,7 @@ libkern/strncpy.c standard libkern/strsep.c standard libkern/strspn.c standard +libkern/strstr.c standard libkern/strtol.c standard libkern/strtoq.c standard libkern/strtoul.c standard ==== //depot/projects/soc2006/rdivacky_linuxolator/contrib/dev/acpica/acfreebsd.h#2 (text+ko) ==== @@ -169,26 +169,4 @@ /* Always use FreeBSD code over our local versions */ #define ACPI_USE_SYSTEM_CLIBRARY -#ifdef _KERNEL -/* Or strstr (used in debugging mode, also move to libkern) */ -static __inline char * -strstr(char *s, char *find) -{ - char c, sc; - size_t len; - - if ((c = *find++) != 0) { - len = strlen(find); - do { - do { - if ((sc = *s++) == 0) - return (NULL); - } while (sc != c); - } while (strncmp(s, find, len) != 0); - s--; - } - return ((char *)s); -} -#endif /* _KERNEL */ - #endif /* __ACFREEBSD_H__ */ ==== //depot/projects/soc2006/rdivacky_linuxolator/dev/acpica/Osd/OsdMemory.c#2 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/acpica/Osd/OsdMemory.c,v 1.13 2005/09/11 18:39:02 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/acpica/Osd/OsdMemory.c,v 1.14 2006/08/11 19:22:56 jhb Exp $"); #include @@ -58,7 +58,7 @@ AcpiOsMapMemory(ACPI_PHYSICAL_ADDRESS PhysicalAddress, ACPI_SIZE Length, void **LogicalAddress) { - *LogicalAddress = pmap_mapdev((vm_offset_t)PhysicalAddress, Length); + *LogicalAddress = pmap_mapbios((vm_offset_t)PhysicalAddress, Length); if (*LogicalAddress == NULL) return (AE_BAD_ADDRESS); return (AE_OK); @@ -67,7 +67,7 @@ void AcpiOsUnmapMemory(void *LogicalAddress, ACPI_SIZE Length) { - pmap_unmapdev((vm_offset_t)LogicalAddress, Length); + pmap_unmapbios((vm_offset_t)LogicalAddress, Length); } ACPI_STATUS ==== //depot/projects/soc2006/rdivacky_linuxolator/dev/acpica/acpi_hpet.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_hpet.c,v 1.4 2006/06/04 08:04:19 njl Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_hpet.c,v 1.5 2006/08/11 17:12:16 des Exp $"); #include "opt_acpi.h" #include @@ -66,7 +66,7 @@ .tc_get_timecount = hpet_get_timecount, .tc_counter_mask = ~0u, .tc_name = "HPET", - .tc_quality = -200, + .tc_quality = 2000, }; static u_int ==== //depot/projects/soc2006/rdivacky_linuxolator/dev/ata/ata-chipset.c#6 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/ata-chipset.c,v 1.167 2006/08/05 11:41:46 sos Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/ata-chipset.c,v 1.168 2006/08/11 21:19:29 sos Exp $"); #include "opt_ata.h" #include @@ -2778,11 +2778,11 @@ { ATA_NFORCE_CK804_S1, 0, 0, NV4, ATA_SA300, "nForce CK804" }, { ATA_NFORCE_CK804_S2, 0, 0, NV4, ATA_SA300, "nForce CK804" }, { ATA_NFORCE_MCP51, 0, AMDNVIDIA, NVIDIA, ATA_UDMA6, "nForce MCP51" }, - { ATA_NFORCE_MCP51_S1, 0, 0, NV4LONG, ATA_SA300, "nForce MCP51" }, - { ATA_NFORCE_MCP51_S2, 0, 0, NV4LONG, ATA_SA300, "nForce MCP51" }, + { ATA_NFORCE_MCP51_S1, 0, 0, NV4|NVQ, ATA_SA300, "nForce MCP51" }, + { ATA_NFORCE_MCP51_S2, 0, 0, NV4|NVQ, ATA_SA300, "nForce MCP51" }, { ATA_NFORCE_MCP55, 0, AMDNVIDIA, NVIDIA, ATA_UDMA6, "nForce MCP55" }, - { ATA_NFORCE_MCP55_S1, 0, 0, NV4LONG, ATA_SA300, "nForce MCP55" }, - { ATA_NFORCE_MCP55_S2, 0, 0, NV4LONG, ATA_SA300, "nForce MCP55" }, + { ATA_NFORCE_MCP55_S1, 0, 0, NV4|NVQ, ATA_SA300, "nForce MCP55" }, + { ATA_NFORCE_MCP55_S2, 0, 0, NV4|NVQ, ATA_SA300, "nForce MCP55" }, { 0, 0, 0, 0, 0, 0}} ; char buffer[64] ; @@ -2821,7 +2821,7 @@ /* enable control access */ pci_write_config(dev, 0x50, pci_read_config(dev, 0x50, 1) | 0x04,1); - if (ctlr->chip->cfg2 & NV4LONG) { + if (ctlr->chip->cfg2 & NVQ) { /* clear interrupt status */ ATA_OUTL(ctlr->r_res2, offset, 0x00ff00ff); @@ -2881,11 +2881,11 @@ struct ata_channel *ch = device_get_softc(dev); int offset = ctlr->chip->cfg2 & NV4 ? 0x0440 : 0x0010; struct ata_connect_task *tp; - int shift = ch->unit << (ctlr->chip->cfg2 & NV4LONG ? 4 : 2); + int shift = ch->unit << (ctlr->chip->cfg2 & NVQ ? 4 : 2); u_int32_t status; /* get and clear interrupt status */ - if (ctlr->chip->cfg2 & NV4LONG) { + if (ctlr->chip->cfg2 & NVQ) { status = ATA_INL(ctlr->r_res2, offset); ATA_OUTL(ctlr->r_res2, offset, (0x0f << shift)); } ==== //depot/projects/soc2006/rdivacky_linuxolator/dev/ata/ata-pci.h#5 (text+ko) ==== @@ -23,7 +23,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/ata/ata-pci.h,v 1.67 2006/08/05 11:41:46 sos Exp $ + * $FreeBSD: src/sys/dev/ata/ata-pci.h,v 1.68 2006/08/11 21:19:29 sos Exp $ */ /* structure holding chipset config info */ @@ -392,7 +392,7 @@ #define AMDBUG 0x0002 #define NVIDIA 0x0004 #define NV4 0x0010 -#define NV4LONG 0x0030 +#define NVQ 0x0020 #define VIACLK 0x0100 #define VIABUG 0x0200 #define VIABAR 0x0400 ==== //depot/projects/soc2006/rdivacky_linuxolator/dev/exca/excareg.h#2 (text+ko) ==== @@ -1,5 +1,5 @@ /* $NetBSD: i82365reg.h,v 1.3 1998/12/20 17:53:28 nathanw Exp $ */ -/* $FreeBSD: src/sys/dev/exca/excareg.h,v 1.5 2005/01/06 01:42:40 imp Exp $ */ +/* $FreeBSD: src/sys/dev/exca/excareg.h,v 1.6 2006/08/12 08:53:54 imp Exp $ */ /*- * Copyright (c) 2002 M Warner Losh. All rights reserved. @@ -402,6 +402,12 @@ #define EXCA_O2CC_IREQ_INTC 0x80 #define EXCA_O2CC_STSCHG_INTC 0x20 +/* + * TOPIC specific registers + */ +#define EXCA_TOPIC97_CTRL 0x3e +#define EXCA_TOPIC97_CTRL_LV_MASK 0x03 + /* Plug and play */ #define EXCA_PNP_ACTIONTEC 0x1802A904 /* AEI0218 */ #define EXCA_PNP_IBM3765 0x65374d24 /* IBM3765 */ ==== //depot/projects/soc2006/rdivacky_linuxolator/dev/hme/if_hme.c#2 (text+ko) ==== @@ -38,7 +38,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/hme/if_hme.c,v 1.48 2006/05/27 09:28:59 simon Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/hme/if_hme.c,v 1.49 2006/08/12 01:19:37 yongari Exp $"); /* * HME Ethernet module driver. @@ -936,7 +936,6 @@ hme_load_txmbuf(struct hme_softc *sc, struct mbuf **m0) { struct hme_txdesc *htx; - struct mbuf *m, *n; caddr_t txd; int i, pci, si, ri, nseg; u_int32_t flags, cflags = 0; @@ -944,31 +943,30 @@ if ((htx = STAILQ_FIRST(&sc->sc_rb.rb_txfreeq)) == NULL) return (-1); - m = *m0; - if ((m->m_pkthdr.csum_flags & sc->sc_csum_features) != 0) - hme_txcksum(m, &cflags); error = bus_dmamap_load_mbuf_sg(sc->sc_tdmatag, htx->htx_dmamap, - m, sc->sc_rb.rb_txsegs, &nseg, 0); + *m0, sc->sc_rb.rb_txsegs, &nseg, 0); if (error == EFBIG) { - n = m_defrag(m, M_DONTWAIT); - if (n == NULL) { - m_freem(m); - m = NULL; + struct mbuf *m; + + m = m_defrag(*m0, M_DONTWAIT); + if (m == NULL) { + m_freem(*m0); + *m0 = NULL; return (ENOMEM); } - m = n; + *m0 = m; error = bus_dmamap_load_mbuf_sg(sc->sc_tdmatag, htx->htx_dmamap, - m, sc->sc_rb.rb_txsegs, &nseg, 0); + *m0, sc->sc_rb.rb_txsegs, &nseg, 0); if (error != 0) { - m_freem(m); - m = NULL; + m_freem(*m0); + *m0 = NULL; return (error); } } else if (error != 0) return (error); if (nseg == 0) { - m_freem(m); - m = NULL; + m_freem(*m0); + *m0 = NULL; return (EIO); } if (sc->sc_rb.rb_td_nbusy + nseg >= HME_NTXDESC) { @@ -976,6 +974,8 @@ /* retry with m_defrag(9)? */ return (-2); } + if (((*m0)->m_pkthdr.csum_flags & sc->sc_csum_features) != 0) + hme_txcksum(*m0, &cflags); bus_dmamap_sync(sc->sc_tdmatag, htx->htx_dmamap, BUS_DMASYNC_PREWRITE); si = ri = sc->sc_rb.rb_tdhead; @@ -1017,7 +1017,7 @@ STAILQ_REMOVE_HEAD(&sc->sc_rb.rb_txfreeq, htx_q); STAILQ_INSERT_TAIL(&sc->sc_rb.rb_txbusyq, htx, htx_q); - htx->htx_m = m; + htx->htx_m = *m0; /* start the transmission. */ HME_ETX_WRITE_4(sc, HME_ETXI_PENDING, HME_ETX_TP_DMAWAKEUP); ==== //depot/projects/soc2006/rdivacky_linuxolator/dev/mii/rgephy.c#4 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/mii/rgephy.c,v 1.10 2006/07/03 02:53:39 yongari Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/mii/rgephy.c,v 1.11 2006/08/12 01:38:49 yongari Exp $"); /* * Driver for the RealTek 8169S/8110S internal 10/100/1000 PHY. @@ -166,7 +166,7 @@ rgephy_service(struct mii_softc *sc, struct mii_data *mii, int cmd) { struct ifmedia_entry *ife = mii->mii_media.ifm_cur; - int reg, speed, gig; + int reg, speed, gig, anar; switch (cmd) { case MII_POLLSTAT: @@ -196,6 +196,10 @@ rgephy_reset(sc); /* XXX hardware bug work-around */ + anar = PHY_READ(sc, RGEPHY_MII_ANAR); + anar &= ~(RGEPHY_ANAR_TX_FD | RGEPHY_ANAR_TX | + RGEPHY_ANAR_10_FD | RGEPHY_ANAR_10); + switch (IFM_SUBTYPE(ife->ifm_media)) { case IFM_AUTO: #ifdef foo @@ -212,29 +216,31 @@ goto setit; case IFM_100_TX: speed = RGEPHY_S100; + anar |= RGEPHY_ANAR_TX_FD | RGEPHY_ANAR_TX; goto setit; case IFM_10_T: speed = RGEPHY_S10; + anar |= RGEPHY_ANAR_10_FD | RGEPHY_ANAR_10; setit: rgephy_loop(sc); if ((ife->ifm_media & IFM_GMASK) == IFM_FDX) { speed |= RGEPHY_BMCR_FDX; gig = RGEPHY_1000CTL_AFD; + anar &= ~(RGEPHY_ANAR_TX | RGEPHY_ANAR_10); } else { gig = RGEPHY_1000CTL_AHD; + anar &= + ~(RGEPHY_ANAR_TX_FD | RGEPHY_ANAR_10_FD); } - PHY_WRITE(sc, RGEPHY_MII_1000CTL, 0); - PHY_WRITE(sc, RGEPHY_MII_BMCR, speed); - PHY_WRITE(sc, RGEPHY_MII_ANAR, RGEPHY_SEL_TYPE); - - if (IFM_SUBTYPE(ife->ifm_media) != IFM_1000_T) + if (IFM_SUBTYPE(ife->ifm_media) != IFM_1000_T) { + PHY_WRITE(sc, RGEPHY_MII_1000CTL, 0); + PHY_WRITE(sc, RGEPHY_MII_ANAR, anar); + PHY_WRITE(sc, RGEPHY_MII_BMCR, speed | + RGEPHY_BMCR_AUTOEN | RGEPHY_BMCR_STARTNEG); break; + } - PHY_WRITE(sc, RGEPHY_MII_1000CTL, gig); - PHY_WRITE(sc, RGEPHY_MII_BMCR, - speed|RGEPHY_BMCR_AUTOEN|RGEPHY_BMCR_STARTNEG); - /* * When settning the link manually, one side must * be the master and the other the slave. However @@ -250,6 +256,8 @@ PHY_WRITE(sc, RGEPHY_MII_1000CTL, gig|RGEPHY_1000CTL_MSE); } + PHY_WRITE(sc, RGEPHY_MII_BMCR, speed | + RGEPHY_BMCR_AUTOEN | RGEPHY_BMCR_STARTNEG); break; #ifdef foo case IFM_NONE: ==== //depot/projects/soc2006/rdivacky_linuxolator/dev/pccbb/pccbb.c#3 (text+ko) ==== @@ -75,7 +75,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/pccbb/pccbb.c,v 1.150 2006/06/03 21:05:36 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/pccbb/pccbb.c,v 1.151 2006/08/12 09:06:55 imp Exp $"); #include #include @@ -700,7 +700,7 @@ int cbb_power(device_t brdev, int volts) { - uint32_t status, sock_ctrl, mask; + uint32_t status, sock_ctrl, reg_ctrl, mask; struct cbb_softc *sc = device_get_softc(brdev); int cnt, sane; int retval = 0; @@ -744,14 +744,15 @@ reg = cbb_o2micro_power_hack(sc); /* - * We have to mask the card change detect interrupt while we're - * messing with the power. It is allowed to bounce while we're - * messing with power as things settle down. In addition, we mask off - * the card's function interrupt by routing it via the ISA bus. This - * bit generally only affects 16bit cards. Some bridges allow one to - * set another bit to have it also affect 32bit cards. Since 32bit - * cards are required to be better behaved, we don't bother to get - * into those bridge specific features. + * We have to mask the card change detect interrupt while + * we're messing with the power. It is allowed to bounce + * while we're messing with power as things settle down. In + * addition, we mask off the card's function interrupt by + * routing it via the ISA bus. This bit generally only + * affects 16-bit cards. Some bridges allow one to set + * another bit to have it also affect 32-bit cards. Since + * 32-bit cards are required to be better behaved, we don't + * bother to get into those bridge specific features. */ mask = cbb_get(sc, CBB_SOCKET_MASK); mask |= CBB_SOCKET_MASK_POWER; @@ -763,13 +764,29 @@ if (on) { mtx_lock(&sc->mtx); cnt = sc->powerintr; - sane = 200; + /* + * We have a shortish timeout of 500ms here. Some + * bridges do not generate a POWER_CYCLE event for + * 16-bit cards. In those cases, we have to cope the + * best we can, and having only a short delay is + * better than the alternatives. + */ + sane = 10; while (!(cbb_get(sc, CBB_SOCKET_STATE) & CBB_STATE_POWER_CYCLE) && cnt == sc->powerintr && sane-- > 0) - cv_timedwait(&sc->powercv, &sc->mtx, hz / 10); + cv_timedwait(&sc->powercv, &sc->mtx, hz / 20); mtx_unlock(&sc->mtx); - if (sane <= 0) + /* + * The TOPIC95B requires a little bit extra time to get + * its act together, so delay for an additional 100ms. Also + * as documented below, it doesn't seem to set the POWER_CYCLE + * bit, so don't whine if it never came on. + */ + if (sc->chipset == CB_TOPIC95) { + tsleep(sc, PZERO, "cbb95B", hz / 10); + } else if (sane <= 0) { device_printf(sc->dev, "power timeout, doom?\n"); + } } /* @@ -782,10 +799,13 @@ * we're called from the card insertion code, in which case the cbb * thread will turn it on for us before it waits to be woken by a * change event. + * + * NB: Topic95B doesn't set the power cycle bit. we assume that + * both it and the TOPIC95 behave the same. */ cbb_clrb(sc, CBB_SOCKET_MASK, CBB_SOCKET_MASK_POWER); status = cbb_get(sc, CBB_SOCKET_STATE); - if (on) { + if (on && sc->chipset != CB_TOPIC95) { if ((status & CBB_STATE_POWER_CYCLE) == 0) device_printf(sc->dev, "Power not on?\n"); } @@ -794,6 +814,15 @@ /* XXX Do we want to do something to mitigate things here? */ goto done; } + if (sc->chipset == CB_TOPIC97) { + reg_ctrl = pci_read_config(sc->dev, TOPIC_REG_CTRL, 4); + reg_ctrl &= ~TOPIC97_REG_CTRL_TESTMODE; + if (on) + reg_ctrl |= TOPIC97_REG_CTRL_CLKRUN_ENA; + else + reg_ctrl &= ~TOPIC97_REG_CTRL_CLKRUN_ENA; + pci_write_config(sc->dev, TOPIC_REG_CTRL, reg_ctrl, 4); + } PCI_MASK_CONFIG(brdev, CBBR_BRIDGECTRL, & ~CBBM_BRIDGECTRL_INTR_IREQ_ISA_EN, 2); retval = 1; ==== //depot/projects/soc2006/rdivacky_linuxolator/dev/pccbb/pccbb_pci.c#3 (text+ko) ==== @@ -72,7 +72,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/pccbb/pccbb_pci.c,v 1.21 2006/06/03 19:16:45 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/pccbb/pccbb_pci.c,v 1.22 2006/08/12 09:06:55 imp Exp $"); #include #include @@ -302,10 +302,11 @@ { static int curr_bus_number = 2; /* XXX EVILE BAD (see below) */ struct cbb_softc *sc = (struct cbb_softc *)device_get_softc(brdev); + struct sysctl_ctx_list *sctx; + struct sysctl_oid *soid; int rid; device_t parent; - struct sysctl_ctx_list *sctx; - struct sysctl_oid *soid; + uint32_t pribus; parent = device_get_parent(brdev); mtx_init(&sc->mtx, device_get_nameunit(brdev), "cbb", MTX_DEF); @@ -317,7 +318,7 @@ sc->exca[0].pccarddev = NULL; sc->secbus = pci_read_config(brdev, PCIR_SECBUS_2, 1); sc->subbus = pci_read_config(brdev, PCIR_SUBBUS_2, 1); - sc->pribus = pci_read_config(brdev, PCIR_PRIBUS_2, 1); + sc->pribus = pcib_get_bus(parent); SLIST_INIT(&sc->rl); cbb_powerstate_d0(brdev); @@ -359,10 +360,11 @@ * are in an appropriate range. */ DEVPRINTF((brdev, "Secondary bus is %d\n", sc->secbus)); - if (sc->secbus == 0) { + pribus = pci_read_config(brdev, PCIR_PRIBUS_2, 1); + if (sc->secbus == 0 || sc->pribus != pribus) { if (curr_bus_number <= sc->pribus) curr_bus_number = sc->pribus + 1; - if (pci_read_config(brdev, PCIR_PRIBUS_2, 1) != sc->pribus) { + if (pribus != sc->pribus) { DEVPRINTF((brdev, "Setting primary bus to %d\n", sc->pribus)); pci_write_config(brdev, PCIR_PRIBUS_2, sc->pribus, 1); @@ -553,27 +555,32 @@ reg = (reg & 0x0f) | EXCA_O2CC_IREQ_INTC | EXCA_O2CC_STSCHG_INTC; exca_putb(&sc->exca[0], EXCA_O2MICRO_CTRL_C, reg); - break; case CB_TOPIC97: /* * Disable Zoom Video, ToPIC 97, 100. */ - pci_write_config(sc->dev, CBBR_TOPIC_ZV_CONTROL, 0, 1); + pci_write_config(sc->dev, TOPIC97_ZV_CONTROL, 0, 1); /* * ToPIC 97, 100 * At offset 0xa1: INTERRUPT CONTROL register * 0x1: Turn on INT interrupts. */ - PCI_MASK_CONFIG(sc->dev, CBBR_TOPIC_INTCTRL, - | CBBM_TOPIC_INTCTRL_INTIRQSEL, 1); + PCI_MASK_CONFIG(sc->dev, TOPIC_INTCTRL, + | TOPIC97_INTCTRL_INTIRQSEL, 1); + /* + * ToPIC97, 100 + * Need to assert support for low voltage cards + */ + exca_setb(&sc->exca[0], EXCA_TOPIC97_CTRL, + EXCA_TOPIC97_CTRL_LV_MASK); goto topic_common; case CB_TOPIC95: /* * SOCKETCTRL appears to be TOPIC 95/B specific */ - PCI_MASK_CONFIG(sc->dev, CBBR_TOPIC_SOCKETCTRL, - | CBBM_TOPIC_SOCKETCTRL_SCR_IRQSEL, 4); + PCI_MASK_CONFIG(sc->dev, TOPIC95_SOCKETCTRL, + | TOPIC95_SOCKETCTRL_SCR_IRQSEL, 4); topic_common:; /* @@ -586,20 +593,19 @@ * in legacy mode to 0x3e0 and offset 0. (legacy * mode is determined elsewhere) */ - pci_write_config(sc->dev, CBBR_TOPIC_SLOTCTRL, - CBBM_TOPIC_SLOTCTRL_SLOTON | - CBBM_TOPIC_SLOTCTRL_SLOTEN | - CBBM_TOPIC_SLOTCTRL_ID_LOCK | - CBBM_TOPIC_SLOTCTRL_ID_WP, 1); + pci_write_config(sc->dev, TOPIC_SLOTCTRL, + TOPIC_SLOTCTRL_SLOTON | + TOPIC_SLOTCTRL_SLOTEN | + TOPIC_SLOTCTRL_ID_LOCK | + TOPIC_SLOTCTRL_ID_WP, 1); >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Aug 13 14:52:00 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 63BEE16A4E7; Sun, 13 Aug 2006 14:52:00 +0000 (UTC) X-Original-To: perforce@FreeBSD.org 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 109AC16A4DE for ; Sun, 13 Aug 2006 14:52:00 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8BFD843D49 for ; Sun, 13 Aug 2006 14:51:59 +0000 (GMT) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7DEpxS7032428 for ; Sun, 13 Aug 2006 14:51:59 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7DEpx5Q032425 for perforce@freebsd.org; Sun, 13 Aug 2006 14:51:59 GMT (envelope-from rdivacky@FreeBSD.org) Date: Sun, 13 Aug 2006 14:51:59 GMT Message-Id: <200608131451.k7DEpx5Q032425@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rdivacky@FreeBSD.org using -f From: Roman Divacky To: Perforce Change Reviews Cc: Subject: PERFORCE change 103770 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 13 Aug 2006 14:52:00 -0000 http://perforce.freebsd.org/chv.cgi?CH=103770 Change 103770 by rdivacky@rdivacky_witten on 2006/08/13 14:51:27 o make amd64 compile o add linux_emul.c and linux_futex.c to files.arch o sync linux.h in amd64 with i386 version o make FUTEX_WAKE_OP temporarily i386 only Affected files ... .. //depot/projects/soc2006/rdivacky_linuxolator/amd64/linux32/linux.h#2 edit .. //depot/projects/soc2006/rdivacky_linuxolator/amd64/linux32/linux32_machdep.c#3 edit .. //depot/projects/soc2006/rdivacky_linuxolator/compat/linux/linux_emul.c#2 edit .. //depot/projects/soc2006/rdivacky_linuxolator/compat/linux/linux_futex.c#21 edit .. //depot/projects/soc2006/rdivacky_linuxolator/compat/linux/linux_util.c#7 edit .. //depot/projects/soc2006/rdivacky_linuxolator/conf/files.amd64#4 edit .. //depot/projects/soc2006/rdivacky_linuxolator/conf/files.i386#4 edit Differences ... ==== //depot/projects/soc2006/rdivacky_linuxolator/amd64/linux32/linux.h#2 (text+ko) ==== @@ -34,6 +34,10 @@ #define _AMD64_LINUX_LINUX_H_ #include /* for sigval union */ +#include +#include +#include +#include #include @@ -495,6 +499,7 @@ extern int bsd_to_linux_signal[]; extern int linux_to_bsd_signal[]; +extern struct sysentvec elf_linux_sysvec; /* * Pluggable ioctl handlers @@ -527,6 +532,11 @@ #define LINUX_O_NDELAY LINUX_O_NONBLOCK #define LINUX_O_SYNC 010000 #define LINUX_FASYNC 020000 +#define LINUX_O_DIRECT 040000 /* direct disk access hint */ +#define LINUX_O_LARGEFILE 0100000 +#define LINUX_O_DIRECTORY 0200000 /* must be a directory */ +#define LINUX_O_NOFOLLOW 0400000 /* don't follow links */ +#define LINUX_O_NOATIME 01000000 #define LINUX_F_DUPFD 0 #define LINUX_F_GETFD 1 @@ -737,4 +747,99 @@ l_short revents; } __packed; +struct l_user_desc { + l_uint entry_number; + l_uint base_addr; + l_uint limit; + l_uint seg_32bit:1; + l_uint contents:2; + l_uint read_exec_only:1; + l_uint limit_in_pages:1; + l_uint seg_not_present:1; + l_uint useable:1; +}; + +struct l_desc_struct { + unsigned long a,b; +}; + + +#define LINUX_LOWERWORD 0x0000ffff + +/* macros which does the same thing as those in linux include/asm-um/ldt-i386.h + * these convert linux user-space descriptor to machine one + */ +#define LDT_entry_a(info) \ + ((((info)->base_addr & LINUX_LOWERWORD) << 16) | ((info)->limit & LINUX_LOWERWORD)) + +#define ENTRY_B_READ_EXEC_ONLY 9 +#define ENTRY_B_CONTENTS 10 +#define ENTRY_B_SEG_NOT_PRESENT 15 +#define ENTRY_B_BASE_ADDR 16 +#define ENTRY_B_USEABLE 20 +#define ENTRY_B_SEG32BIT 22 +#define ENTRY_B_LIMIT 23 + +#define LDT_entry_b(info) \ + (((info)->base_addr & 0xff000000) | \ + ((info)->limit & 0xf0000) | \ + ((info)->contents << ENTRY_B_CONTENTS) | \ + (((info)->seg_not_present == 0) << ENTRY_B_SEG_NOT_PRESENT) | \ + (((info)->base_addr & 0x00ff0000) >> ENTRY_B_BASE_ADDR) | \ + (((info)->read_exec_only == 0) << ENTRY_B_READ_EXEC_ONLY) | \ + ((info)->seg_32bit << ENTRY_B_SEG32BIT) | \ + ((info)->useable << ENTRY_B_USEABLE) | \ + ((info)->limit_in_pages << ENTRY_B_LIMIT) | 0x7000) + +#define LDT_empty(info) (\ + (info)->base_addr == 0 && \ + (info)->limit == 0 && \ + (info)->contents == 0 && \ + (info)->seg_not_present == 1 && \ + (info)->read_exec_only == 1 && \ + (info)->seg_32bit == 0 && \ + (info)->limit_in_pages == 0 && \ + (info)->useable == 0 ) + +/* macros for converting segments, they do the same as those in arch/i386/kernel/process.c */ +#define GET_BASE(desc) ( \ + (((desc)->a >> 16) & LINUX_LOWERWORD) | \ + (((desc)->b << 16) & 0x00ff0000) | \ + ( (desc)->b & 0xff000000) ) + +#define GET_LIMIT(desc) ( \ + ((desc)->a & LINUX_LOWERWORD) | \ + ((desc)->b & 0xf0000) ) + +#define GET_32BIT(desc) (((desc)->b >> ENTRY_B_SEG32BIT) & 1) +#define GET_CONTENTS(desc) (((desc)->b >> ENTRY_B_CONTENTS) & 3) +#define GET_WRITABLE(desc) (((desc)->b >> ENTRY_B_READ_EXEC_ONLY) & 1) +#define GET_LIMIT_PAGES(desc) (((desc)->b >> ENTRY_B_LIMIT) & 1) +#define GET_PRESENT(desc) (((desc)->b >> ENTRY_B_SEG_NOT_PRESENT) & 1) +#define GET_USEABLE(desc) (((desc)->b >> ENTRY_B_USEABLE) & 1) + +#define LINUX_CLOCK_REALTIME 0 +#define LINUX_CLOCK_MONOTONIC 1 +#define LINUX_CLOCK_PROCESS_CPUTIME_ID 2 +#define LINUX_CLOCK_THREAD_CPUTIME_ID 3 +#define LINUX_CLOCK_REALTIME_HR 4 +#define LINUX_CLOCK_MONOTONIC_HR 5 + +typedef int l_timer_t; +typedef int l_mqd_t; + +#define CLONE_VM 0x100 +#define CLONE_FS 0x200 +#define CLONE_FILES 0x400 +#define CLONE_SIGHAND 0x800 +#define CLONE_PID 0x1000 /* this flag does not exist in linux */ +#define CLONE_PARENT 0x00008000 +#define CLONE_THREAD 0x10000 +#define CLONE_SETTLS 0x80000 +#define CLONE_CHILD_CLEARTID 0x00200000 +#define CLONE_CHILD_SETTID 0x01000000 +#define CLONE_PARENT_SETTID 0x00100000 + +#define THREADING_FLAGS (CLONE_VM | CLONE_FS | CLONE_FILES | CLONE_SIGHAND) + #endif /* !_AMD64_LINUX_LINUX_H_ */ ==== //depot/projects/soc2006/rdivacky_linuxolator/amd64/linux32/linux32_machdep.c#3 (text+ko) ==== @@ -35,6 +35,7 @@ #include #include #include +#include #include #include #include ==== //depot/projects/soc2006/rdivacky_linuxolator/compat/linux/linux_emul.c#2 (text+ko) ==== @@ -26,6 +26,8 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include "opt_compat.h" + #include #include #include ==== //depot/projects/soc2006/rdivacky_linuxolator/compat/linux/linux_futex.c#21 (text+ko) ==== @@ -34,6 +34,8 @@ #include /* __KERNEL_RCSID(1, "$NetBSD: linux_futex.c,v 1.5 2005/11/23 16:14:57 manu Exp $"); */ +#include "opt_compat.h" + #include #include #include @@ -83,7 +85,9 @@ static void futex_put(struct futex *); static int futex_sleep(struct futex *, struct thread *, unsigned long); static int futex_wake(struct futex *, int, struct futex *); +#ifdef __i386__ static int futex_atomic_op(struct thread *td, int encoded_op, caddr_t uaddr); +#endif /* support.s */ int futex_xchgl(int oparg, caddr_t uaddr, int *oldval); @@ -99,11 +103,14 @@ int ret; struct l_timespec timeout = { 0, 0 }; int error = 0; - struct futex *f, *f2; + struct futex *f; struct futex *newf; int timeout_hz; struct timeval tv = {0, 0}; +#ifdef __i386__ + struct futex *f2; int op_ret; +#endif #ifdef DEBUG if (ldebug(sys_futex)) @@ -256,6 +263,7 @@ break; case LINUX_FUTEX_WAKE_OP: +#ifdef __i386__ FUTEX_SYSTEM_LOCK; #ifdef DEBUG if (ldebug(sys_futex)) @@ -297,6 +305,9 @@ td->td_retval[0] = ret; FUTEX_SYSTEM_UNLOCK; +#else + printf("linux_sys_futex: wake_op not implemented"); +#endif break; default: @@ -412,6 +423,7 @@ return count; } +#ifdef __i386__ static int futex_atomic_op(struct thread *td, int encoded_op, caddr_t uaddr) { @@ -479,3 +491,4 @@ return (ret); } +#endif ==== //depot/projects/soc2006/rdivacky_linuxolator/compat/linux/linux_util.c#7 (text+ko) ==== @@ -32,6 +32,8 @@ #include __FBSDID("$FreeBSD: src/sys/compat/linux/linux_util.c,v 1.30 2006/05/05 16:10:45 ambrisko Exp $"); +#include "opt_compat.h" + #include #include #include ==== //depot/projects/soc2006/rdivacky_linuxolator/conf/files.amd64#4 (text+ko) ==== @@ -233,7 +233,9 @@ amd64/linux32/linux32_machdep.c optional compat_linux32 amd64/linux32/linux32_sysent.c optional compat_linux32 amd64/linux32/linux32_sysvec.c optional compat_linux32 +compat/linux/linux_emul.c optional compat_linux32 compat/linux/linux_file.c optional compat_linux32 +compat/linux/linux_futex.c optional compat_linux32 compat/linux/linux_getcwd.c optional compat_linux32 compat/linux/linux_ioctl.c optional compat_linux32 compat/linux/linux_ipc.c optional compat_linux32 ==== //depot/projects/soc2006/rdivacky_linuxolator/conf/files.i386#4 (text+ko) ==== @@ -85,7 +85,9 @@ # compat/linprocfs/linprocfs.c optional linprocfs compat/linsysfs/linsysfs.c optional linsysfs +compat/linux/linux_emul.c optional compat_linux compat/linux/linux_file.c optional compat_linux +compat/linux/linux_futex.c optional compat_linux compat/linux/linux_getcwd.c optional compat_linux compat/linux/linux_ioctl.c optional compat_linux compat/linux/linux_ipc.c optional compat_linux From owner-p4-projects@FreeBSD.ORG Sun Aug 13 15:14:29 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D41C016A4DF; Sun, 13 Aug 2006 15:14:28 +0000 (UTC) X-Original-To: perforce@FreeBSD.org 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 962DE16A4DD for ; Sun, 13 Aug 2006 15:14:28 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5D60643D45 for ; Sun, 13 Aug 2006 15:14:28 +0000 (GMT) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7DFESd4035158 for ; Sun, 13 Aug 2006 15:14:28 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7DFESgp035155 for perforce@freebsd.org; Sun, 13 Aug 2006 15:14:28 GMT (envelope-from hselasky@FreeBSD.org) Date: Sun, 13 Aug 2006 15:14:28 GMT Message-Id: <200608131514.k7DFESgp035155@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Cc: Subject: PERFORCE change 103772 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 13 Aug 2006 15:14:29 -0000 http://perforce.freebsd.org/chv.cgi?CH=103772 Change 103772 by hselasky@hselasky_mini_itx on 2006/08/13 15:13:51 Add some more debugging statements. Bugfix: Make sure that D_TRACKCLOSE is set for cdevs created by the USB cdev system. Affected files ... .. //depot/projects/usb/src/sys/dev/usb/usb_cdev.c#5 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/usb_cdev.c#5 (text+ko) ==== @@ -943,12 +943,16 @@ mtx_unlock(&Giant); + DPRINTF(0, "x=0x%08x\n", x); + return x; } static void usb_cdev_free_minor(u_int32_t x) { + DPRINTF(0, "x=0x%08x\n", x); + if (x & 0x00FF00) { /* invalid minor */ return; @@ -1351,4 +1355,5 @@ .d_ioctl = usb_cdev_ioctl, .d_poll = usb_cdev_poll, .d_name = "usb_cdev", + .d_flags = D_TRACKCLOSE, }; From owner-p4-projects@FreeBSD.ORG Sun Aug 13 15:40:01 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1061416A4E1; Sun, 13 Aug 2006 15:40:01 +0000 (UTC) X-Original-To: perforce@FreeBSD.org 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 DC82116A4DE for ; Sun, 13 Aug 2006 15:40:00 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8260343D46 for ; Sun, 13 Aug 2006 15:40:00 +0000 (GMT) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7DFe0Ur036728 for ; Sun, 13 Aug 2006 15:40:00 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7DFe0BF036713 for perforce@freebsd.org; Sun, 13 Aug 2006 15:40:00 GMT (envelope-from rdivacky@FreeBSD.org) Date: Sun, 13 Aug 2006 15:40:00 GMT Message-Id: <200608131540.k7DFe0BF036713@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rdivacky@FreeBSD.org using -f From: Roman Divacky To: Perforce Change Reviews Cc: Subject: PERFORCE change 103773 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 13 Aug 2006 15:40:01 -0000 http://perforce.freebsd.org/chv.cgi?CH=103773 Change 103773 by rdivacky@rdivacky_witten on 2006/08/13 15:39:41 Fix typo: limit.h -> limits.h Affected files ... .. //depot/projects/soc2006/rdivacky_linuxolator/amd64/linux32/linux32_machdep.c#4 edit Differences ... ==== //depot/projects/soc2006/rdivacky_linuxolator/amd64/linux32/linux32_machdep.c#4 (text+ko) ==== @@ -35,7 +35,7 @@ #include #include #include -#include +#include #include #include #include From owner-p4-projects@FreeBSD.ORG Sun Aug 13 15:56:22 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6F15516A4E0; Sun, 13 Aug 2006 15:56:22 +0000 (UTC) X-Original-To: perforce@FreeBSD.org 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 4AD3216A4DA for ; Sun, 13 Aug 2006 15:56:22 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1374C43D46 for ; Sun, 13 Aug 2006 15:56:22 +0000 (GMT) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7DFuLuP038928 for ; Sun, 13 Aug 2006 15:56:21 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7DFuLtO038925 for perforce@freebsd.org; Sun, 13 Aug 2006 15:56:21 GMT (envelope-from rdivacky@FreeBSD.org) Date: Sun, 13 Aug 2006 15:56:21 GMT Message-Id: <200608131556.k7DFuLtO038925@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rdivacky@FreeBSD.org using -f From: Roman Divacky To: Perforce Change Reviews Cc: Subject: PERFORCE change 103774 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 13 Aug 2006 15:56:22 -0000 http://perforce.freebsd.org/chv.cgi?CH=103774 Change 103774 by rdivacky@rdivacky_witten on 2006/08/13 15:55:43 Change clock_* prototypes to match the real ones. Affected files ... .. //depot/projects/soc2006/rdivacky_linuxolator/amd64/linux32/syscalls.master#11 edit Differences ... ==== //depot/projects/soc2006/rdivacky_linuxolator/amd64/linux32/syscalls.master#11 (text+ko) ==== @@ -424,10 +424,11 @@ 261 AUE_NULL STD { int linux_timer_gettime(void); } 262 AUE_NULL STD { int linux_timer_getoverrun(void); } 263 AUE_NULL STD { int linux_timer_delete(void); } -264 AUE_CLOCK_SETTIME STD { int linux_clock_settime(void); } -265 AUE_NULL STD { int linux_clock_gettime(void); } -266 AUE_NULL STD { int linux_clock_getres(void); } -267 AUE_NULL STD { int linux_clock_nanosleep(void); } +264 AUE_CLOCK_SETTIME STD { int linux_clock_settime(clockid_t which, struct l_timespec *tp); } +265 AUE_NULL STD { int linux_clock_gettime(clockid_t which, struct l_timespec *tp); } +266 AUE_NULL STD { int linux_clock_getres(clockid_t which, struct l_timespec *tp); } +267 AUE_NULL STD { int linux_clock_nanosleep(clockid_t which, int flags, \ + struct l_timespec *rqtp, struct l_timespec *rmtp); } 268 AUE_NULL STD { int linux_statfs64(void); } 269 AUE_NULL STD { int linux_fstatfs64(void); } 270 AUE_NULL STD { int linux_tgkill(int tgid, int pid, int sig); } From owner-p4-projects@FreeBSD.ORG Sun Aug 13 15:56:23 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0BC6D16A563; Sun, 13 Aug 2006 15:56:23 +0000 (UTC) X-Original-To: perforce@FreeBSD.org 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 C5CAF16A561 for ; Sun, 13 Aug 2006 15:56:22 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8497643D46 for ; Sun, 13 Aug 2006 15:56:22 +0000 (GMT) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7DFuM8A038935 for ; Sun, 13 Aug 2006 15:56:22 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7DFuMoi038931 for perforce@freebsd.org; Sun, 13 Aug 2006 15:56:22 GMT (envelope-from rdivacky@FreeBSD.org) Date: Sun, 13 Aug 2006 15:56:22 GMT Message-Id: <200608131556.k7DFuMoi038931@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rdivacky@FreeBSD.org using -f From: Roman Divacky To: Perforce Change Reviews Cc: Subject: PERFORCE change 103775 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 13 Aug 2006 15:56:23 -0000 http://perforce.freebsd.org/chv.cgi?CH=103775 Change 103775 by rdivacky@rdivacky_witten on 2006/08/13 15:56:17 Regen after syscalls.master update. Affected files ... .. //depot/projects/soc2006/rdivacky_linuxolator/amd64/linux32/linux32_proto.h#11 edit .. //depot/projects/soc2006/rdivacky_linuxolator/amd64/linux32/linux32_syscall.h#11 edit .. //depot/projects/soc2006/rdivacky_linuxolator/amd64/linux32/linux32_sysent.c#11 edit Differences ... ==== //depot/projects/soc2006/rdivacky_linuxolator/amd64/linux32/linux32_proto.h#11 (text+ko) ==== @@ -759,16 +759,22 @@ register_t dummy; }; struct linux_clock_settime_args { - register_t dummy; + char which_l_[PADL_(clockid_t)]; clockid_t which; char which_r_[PADR_(clockid_t)]; + char tp_l_[PADL_(struct l_timespec *)]; struct l_timespec * tp; char tp_r_[PADR_(struct l_timespec *)]; }; struct linux_clock_gettime_args { - register_t dummy; + char which_l_[PADL_(clockid_t)]; clockid_t which; char which_r_[PADR_(clockid_t)]; + char tp_l_[PADL_(struct l_timespec *)]; struct l_timespec * tp; char tp_r_[PADR_(struct l_timespec *)]; }; struct linux_clock_getres_args { - register_t dummy; + char which_l_[PADL_(clockid_t)]; clockid_t which; char which_r_[PADR_(clockid_t)]; + char tp_l_[PADL_(struct l_timespec *)]; struct l_timespec * tp; char tp_r_[PADR_(struct l_timespec *)]; }; struct linux_clock_nanosleep_args { - register_t dummy; + char which_l_[PADL_(clockid_t)]; clockid_t which; char which_r_[PADR_(clockid_t)]; + char flags_l_[PADL_(int)]; int flags; char flags_r_[PADR_(int)]; + char rqtp_l_[PADL_(struct l_timespec *)]; struct l_timespec * rqtp; char rqtp_r_[PADR_(struct l_timespec *)]; + char rmtp_l_[PADL_(struct l_timespec *)]; struct l_timespec * rmtp; char rmtp_r_[PADR_(struct l_timespec *)]; }; struct linux_statfs64_args { register_t dummy; ==== //depot/projects/soc2006/rdivacky_linuxolator/amd64/linux32/linux32_syscall.h#11 (text+ko) ==== ==== //depot/projects/soc2006/rdivacky_linuxolator/amd64/linux32/linux32_sysent.c#11 (text+ko) ==== @@ -284,10 +284,10 @@ { 0, (sy_call_t *)linux_timer_gettime, AUE_NULL, NULL, 0, 0 }, /* 261 = linux_timer_gettime */ { 0, (sy_call_t *)linux_timer_getoverrun, AUE_NULL, NULL, 0, 0 }, /* 262 = linux_timer_getoverrun */ { 0, (sy_call_t *)linux_timer_delete, AUE_NULL, NULL, 0, 0 }, /* 263 = linux_timer_delete */ - { 0, (sy_call_t *)linux_clock_settime, AUE_CLOCK_SETTIME, NULL, 0, 0 }, /* 264 = linux_clock_settime */ - { 0, (sy_call_t *)linux_clock_gettime, AUE_NULL, NULL, 0, 0 }, /* 265 = linux_clock_gettime */ - { 0, (sy_call_t *)linux_clock_getres, AUE_NULL, NULL, 0, 0 }, /* 266 = linux_clock_getres */ - { 0, (sy_call_t *)linux_clock_nanosleep, AUE_NULL, NULL, 0, 0 }, /* 267 = linux_clock_nanosleep */ + { AS(linux_clock_settime_args), (sy_call_t *)linux_clock_settime, AUE_CLOCK_SETTIME, NULL, 0, 0 }, /* 264 = linux_clock_settime */ + { AS(linux_clock_gettime_args), (sy_call_t *)linux_clock_gettime, AUE_NULL, NULL, 0, 0 }, /* 265 = linux_clock_gettime */ + { AS(linux_clock_getres_args), (sy_call_t *)linux_clock_getres, AUE_NULL, NULL, 0, 0 }, /* 266 = linux_clock_getres */ + { AS(linux_clock_nanosleep_args), (sy_call_t *)linux_clock_nanosleep, AUE_NULL, NULL, 0, 0 }, /* 267 = linux_clock_nanosleep */ { 0, (sy_call_t *)linux_statfs64, AUE_NULL, NULL, 0, 0 }, /* 268 = linux_statfs64 */ { 0, (sy_call_t *)linux_fstatfs64, AUE_NULL, NULL, 0, 0 }, /* 269 = linux_fstatfs64 */ { AS(linux_tgkill_args), (sy_call_t *)linux_tgkill, AUE_NULL, NULL, 0, 0 }, /* 270 = linux_tgkill */ From owner-p4-projects@FreeBSD.ORG Sun Aug 13 15:57:26 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A026316A4DE; Sun, 13 Aug 2006 15:57:26 +0000 (UTC) X-Original-To: perforce@FreeBSD.org 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 7E5B716A4E7 for ; Sun, 13 Aug 2006 15:57:26 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 53E2D43D5F for ; Sun, 13 Aug 2006 15:57:24 +0000 (GMT) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7DFvO04038998 for ; Sun, 13 Aug 2006 15:57:24 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7DFvOQU038995 for perforce@freebsd.org; Sun, 13 Aug 2006 15:57:24 GMT (envelope-from rdivacky@FreeBSD.org) Date: Sun, 13 Aug 2006 15:57:24 GMT Message-Id: <200608131557.k7DFvOQU038995@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rdivacky@FreeBSD.org using -f From: Roman Divacky To: Perforce Change Reviews Cc: Subject: PERFORCE change 103776 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 13 Aug 2006 15:57:26 -0000 http://perforce.freebsd.org/chv.cgi?CH=103776 Change 103776 by rdivacky@rdivacky_witten on 2006/08/13 15:57:09 Remove clock_* from linux32_dummy. Affected files ... .. //depot/projects/soc2006/rdivacky_linuxolator/amd64/linux32/linux32_dummy.c#5 edit Differences ... ==== //depot/projects/soc2006/rdivacky_linuxolator/amd64/linux32/linux32_dummy.c#5 (text+ko) ==== @@ -77,10 +77,6 @@ DUMMY(timer_gettime); DUMMY(timer_getoverrun); DUMMY(timer_delete); -DUMMY(clock_settime); -DUMMY(clock_gettime); -DUMMY(clock_getres); -DUMMY(clock_nanosleep); DUMMY(statfs64); DUMMY(fstatfs64); DUMMY(utimes); From owner-p4-projects@FreeBSD.ORG Sun Aug 13 15:59:27 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B841816A4DF; Sun, 13 Aug 2006 15:59:27 +0000 (UTC) X-Original-To: perforce@FreeBSD.org 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 9465216A4E2 for ; Sun, 13 Aug 2006 15:59:27 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5AEF643D46 for ; Sun, 13 Aug 2006 15:59:27 +0000 (GMT) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7DFxR94039108 for ; Sun, 13 Aug 2006 15:59:27 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7DFxRV1039105 for perforce@freebsd.org; Sun, 13 Aug 2006 15:59:27 GMT (envelope-from rdivacky@FreeBSD.org) Date: Sun, 13 Aug 2006 15:59:27 GMT Message-Id: <200608131559.k7DFxRV1039105@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rdivacky@FreeBSD.org using -f From: Roman Divacky To: Perforce Change Reviews Cc: Subject: PERFORCE change 103777 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 13 Aug 2006 15:59:28 -0000 http://perforce.freebsd.org/chv.cgi?CH=103777 Change 103777 by rdivacky@rdivacky_witten on 2006/08/13 15:58:51 Add linux_time.c to files.arch. Affected files ... .. //depot/projects/soc2006/rdivacky_linuxolator/conf/files.amd64#5 edit .. //depot/projects/soc2006/rdivacky_linuxolator/conf/files.i386#5 edit Differences ... ==== //depot/projects/soc2006/rdivacky_linuxolator/conf/files.amd64#5 (text+ko) ==== @@ -245,6 +245,7 @@ compat/linux/linux_socket.c optional compat_linux32 compat/linux/linux_stats.c optional compat_linux32 compat/linux/linux_sysctl.c optional compat_linux32 +compat/linux/linux_time.c optional compat_linux32 compat/linux/linux_uid16.c optional compat_linux32 compat/linux/linux_util.c optional compat_linux32 dev/amr/amr_linux.c optional compat_linux32 amr ==== //depot/projects/soc2006/rdivacky_linuxolator/conf/files.i386#5 (text+ko) ==== @@ -97,6 +97,7 @@ compat/linux/linux_socket.c optional compat_linux compat/linux/linux_stats.c optional compat_linux compat/linux/linux_sysctl.c optional compat_linux +compat/linux/linux_time.c optional compat_linux compat/linux/linux_uid16.c optional compat_linux compat/linux/linux_util.c optional compat_linux compat/ndis/kern_ndis.c optional ndisapi pci From owner-p4-projects@FreeBSD.ORG Sun Aug 13 16:33:10 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8F9C916A4DF; Sun, 13 Aug 2006 16:33:10 +0000 (UTC) X-Original-To: perforce@FreeBSD.org 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 53D6416A4DD for ; Sun, 13 Aug 2006 16:33:10 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E1BE943D45 for ; Sun, 13 Aug 2006 16:33:09 +0000 (GMT) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7DGX9nw042674 for ; Sun, 13 Aug 2006 16:33:09 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7DGX9xc042671 for perforce@freebsd.org; Sun, 13 Aug 2006 16:33:09 GMT (envelope-from rdivacky@FreeBSD.org) Date: Sun, 13 Aug 2006 16:33:09 GMT Message-Id: <200608131633.k7DGX9xc042671@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rdivacky@FreeBSD.org using -f From: Roman Divacky To: Perforce Change Reviews Cc: Subject: PERFORCE change 103779 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 13 Aug 2006 16:33:10 -0000 http://perforce.freebsd.org/chv.cgi?CH=103779 Change 103779 by rdivacky@rdivacky_witten on 2006/08/13 16:32:14 Make amd64 compilable. Affected files ... .. //depot/projects/soc2006/rdivacky_linuxolator/compat/linux/linux_time.c#5 edit Differences ... ==== //depot/projects/soc2006/rdivacky_linuxolator/compat/linux/linux_time.c#5 (text+ko) ==== @@ -39,6 +39,8 @@ #include /*__KERNEL_RCSID(0, "$NetBSD: linux_time.c,v 1.14 2006/05/14 03:40:54 christos Exp $");*/ +#include "opt_compat.h" + #include #include #include From owner-p4-projects@FreeBSD.ORG Mon Aug 14 08:28:28 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 27A2F16A4DE; Mon, 14 Aug 2006 08:28:28 +0000 (UTC) X-Original-To: perforce@FreeBSD.org 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 DDB0816A4DA for ; Mon, 14 Aug 2006 08:28:27 +0000 (UTC) (envelope-from cdjones@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A8C2343D45 for ; Mon, 14 Aug 2006 08:28:27 +0000 (GMT) (envelope-from cdjones@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7E8SRQm043595 for ; Mon, 14 Aug 2006 08:28:27 GMT (envelope-from cdjones@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7E8SRkU043592 for perforce@freebsd.org; Mon, 14 Aug 2006 08:28:27 GMT (envelope-from cdjones@FreeBSD.org) Date: Mon, 14 Aug 2006 08:28:27 GMT Message-Id: <200608140828.k7E8SRkU043592@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to cdjones@FreeBSD.org using -f From: Chris Jones To: Perforce Change Reviews Cc: Subject: PERFORCE change 103815 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 14 Aug 2006 08:28:28 -0000 http://perforce.freebsd.org/chv.cgi?CH=103815 Change 103815 by cdjones@cdjones-impulse on 2006/08/14 08:28:02 Add support for SCHED_HIER (experimental CPU-limiting for jails, patched from 4BSD). Affected files ... .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/kern_switch.c#6 edit Differences ... ==== //depot/projects/soc2006/cdjones_jail/src/sys/kern/kern_switch.c#6 (text+ko) ==== @@ -105,7 +105,7 @@ #if defined(SMP) && (defined(__i386__) || defined(__amd64__)) #include #endif -#if defined(SMP) && defined(SCHED_4BSD) +#if defined(SMP) && (defined(SCHED_4BSD) || defined(SCHED_HIER)) #include #endif @@ -234,7 +234,7 @@ } } -#ifdef SCHED_4BSD +#if (defined(SCHED_4BSD) || defined(SCHED_HIER)) /* * Remove a thread from its KSEGRP's run queue. * This in turn may remove it from a KSE if it was already assigned @@ -856,7 +856,7 @@ return (0); } -#if defined(SMP) && defined(SCHED_4BSD) +#if defined(SMP) && (defined(SCHED_4BSD) || defined(SCHED_HIER)) int runq_fuzz = 1; SYSCTL_INT(_kern_sched, OID_AUTO, runq_fuzz, CTLFLAG_RW, &runq_fuzz, 0, ""); #endif @@ -874,7 +874,7 @@ mtx_assert(&sched_lock, MA_OWNED); while ((pri = runq_findbit(rq)) != -1) { rqh = &rq->rq_queues[pri]; -#if defined(SMP) && defined(SCHED_4BSD) +#if defined(SMP) && (defined(SCHED_4BSD) || defined(SCHED_HIER)) /* fuzz == 1 is normal.. 0 or less are ignored */ if (runq_fuzz > 1) { /* From owner-p4-projects@FreeBSD.ORG Mon Aug 14 08:29:30 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 93DCE16A4E6; Mon, 14 Aug 2006 08:29:30 +0000 (UTC) X-Original-To: perforce@FreeBSD.org 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 6EEF616A4DE for ; Mon, 14 Aug 2006 08:29:30 +0000 (UTC) (envelope-from cdjones@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8A9E143D58 for ; Mon, 14 Aug 2006 08:29:29 +0000 (GMT) (envelope-from cdjones@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7E8TTl0043699 for ; Mon, 14 Aug 2006 08:29:29 GMT (envelope-from cdjones@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7E8TTWv043696 for perforce@freebsd.org; Mon, 14 Aug 2006 08:29:29 GMT (envelope-from cdjones@FreeBSD.org) Date: Mon, 14 Aug 2006 08:29:29 GMT Message-Id: <200608140829.k7E8TTWv043696@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to cdjones@FreeBSD.org using -f From: Chris Jones To: Perforce Change Reviews Cc: Subject: PERFORCE change 103816 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 14 Aug 2006 08:29:30 -0000 http://perforce.freebsd.org/chv.cgi?CH=103816 Change 103816 by cdjones@cdjones-impulse on 2006/08/14 08:28:55 Rename priority struct member to sched_shares. Affected files ... .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/kern_jail.c#21 edit .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/jail.h#16 edit Differences ... ==== //depot/projects/soc2006/cdjones_jail/src/sys/kern/kern_jail.c#21 (text+ko) ==== @@ -274,7 +274,7 @@ goto e_dropvnref; pr->pr_ip = j.ip_number; pr->pr_linux = NULL; - pr->pr_priority = j.priority; + pr->pr_sched_shares = j.priority; pr->pr_securelevel = securelevel; pr->pr_mem_limit = j.mem_limit; ==== //depot/projects/soc2006/cdjones_jail/src/sys/sys/jail.h#16 (text+ko) ==== @@ -99,7 +99,7 @@ int pr_securelevel; /* (p) securelevel */ struct task pr_task; /* (d) destroy task */ struct mtx pr_mtx; - unsigned int pr_priority; /* (p) jail priority */ + u_int32_t pr_sched_shares; /* (p) jail priority */ struct proc *pr_scheduler; /* (c) scheduler pid */ int *pr_scheduler_flags_ptr; /* (p) communication to scheduler */ struct proc *pr_pager; /* (c) pager pid */ From owner-p4-projects@FreeBSD.ORG Mon Aug 14 08:31:33 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 50DD416A4DF; Mon, 14 Aug 2006 08:31:33 +0000 (UTC) X-Original-To: perforce@FreeBSD.org 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 01B6516A4DE for ; Mon, 14 Aug 2006 08:31:33 +0000 (UTC) (envelope-from cdjones@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A4BB343D45 for ; Mon, 14 Aug 2006 08:31:32 +0000 (GMT) (envelope-from cdjones@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7E8VWSZ043870 for ; Mon, 14 Aug 2006 08:31:32 GMT (envelope-from cdjones@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7E8VWiB043867 for perforce@freebsd.org; Mon, 14 Aug 2006 08:31:32 GMT (envelope-from cdjones@FreeBSD.org) Date: Mon, 14 Aug 2006 08:31:32 GMT Message-Id: <200608140831.k7E8VWiB043867@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to cdjones@FreeBSD.org using -f From: Chris Jones To: Perforce Change Reviews Cc: Subject: PERFORCE change 103817 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 14 Aug 2006 08:31:33 -0000 http://perforce.freebsd.org/chv.cgi?CH=103817 Change 103817 by cdjones@cdjones-impulse on 2006/08/14 08:31:14 Limit jailed KSEs' priorities based on their jails' shares of total jailed CPU shares. (Experimental) Affected files ... .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/sched_hier.c#8 edit Differences ... ==== //depot/projects/soc2006/cdjones_jail/src/sys/kern/sched_hier.c#8 (text+ko) ==== @@ -41,6 +41,7 @@ #include #include +#include #include #include #include @@ -176,6 +177,8 @@ static int forward_wakeup(int cpunum); #endif +static uint32_t total_jail_sched_shares; + static struct kproc_desc sched_kp = { "schedcpu", schedcpu_thread, @@ -227,7 +230,7 @@ SYSCTL_NODE(_kern, OID_AUTO, sched, CTLFLAG_RD, 0, "Scheduler"); -SYSCTL_STRING(_kern_sched, OID_AUTO, name, CTLFLAG_RD, "4BSD", 0, +SYSCTL_STRING(_kern_sched, OID_AUTO, name, CTLFLAG_RD, "HIER", 0, "Scheduler name"); SYSCTL_PROC(_kern_sched, OID_AUTO, quantum, CTLTYPE_INT | CTLFLAG_RW, @@ -540,8 +543,25 @@ schedcpu_thread(void) { int nowake; + struct prison *pr; + u_int32_t nShares = 0; for (;;) { + /* + * Update total jail CPU shares in case they've changed. + * Safe to read pr_sched_shares without mutex because + * in worst case, we get a bogus value which will be + * corrected on the next pass. + * + * TODO: this should be done by forcing a recalculation + * when jail CPU shares are added / changed, rather than + * doing it every second. + */ + LIST_FOREACH(pr, &allprison, pr_list) { + nShares += pr->pr_sched_shares; + } + total_jail_sched_shares = nShares; + schedcpu(); tsleep(&nowake, 0, "-", hz); } @@ -579,10 +599,23 @@ resetpriority(struct ksegrp *kg) { register unsigned int newpriority; + struct prison *pr = kg->kg_proc->p_ucred->cr_prison; if (kg->kg_pri_class == PRI_TIMESHARE) { newpriority = PUSER + kg->kg_estcpu / INVERSE_ESTCPU_WEIGHT + NICE_WEIGHT * (kg->kg_proc->p_nice - PRIO_MIN); + if (NULL != pr) { + /* + * Skew the priority by the jail's share of CPU resources. + * The unjailed processes get half the CPU time. + * + * TODO: this is a hard limit. We should really also have + * soft limits available. Also, the amount of CPU time + * reserved to unjailed processes really should be sysctl'd. + */ + newpriority *= pr->pr_sched_shares; + newpriority /= 2*total_jail_sched_shares; + } newpriority = min(max(newpriority, PRI_MIN_TIMESHARE), PRI_MAX_TIMESHARE); kg->kg_user_pri = newpriority; From owner-p4-projects@FreeBSD.ORG Mon Aug 14 08:47:55 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 85B6B16A4E2; Mon, 14 Aug 2006 08:47:55 +0000 (UTC) X-Original-To: perforce@FreeBSD.org 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 45EE316A4DA for ; Mon, 14 Aug 2006 08:47:55 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6F42D43D5D for ; Mon, 14 Aug 2006 08:47:53 +0000 (GMT) (envelope-from gonzo@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7E8lrLl052358 for ; Mon, 14 Aug 2006 08:47:53 GMT (envelope-from gonzo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7E8lrFL052355 for perforce@freebsd.org; Mon, 14 Aug 2006 08:47:53 GMT (envelope-from gonzo@FreeBSD.org) Date: Mon, 14 Aug 2006 08:47:53 GMT Message-Id: <200608140847.k7E8lrFL052355@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gonzo@FreeBSD.org using -f From: Oleksandr Tymoshenko To: Perforce Change Reviews Cc: Subject: PERFORCE change 103818 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 14 Aug 2006 08:47:55 -0000 http://perforce.freebsd.org/chv.cgi?CH=103818 Change 103818 by gonzo@gonzo_hq on 2006/08/14 08:47:38 o remove commented part. Affected files ... .. //depot/projects/mips2/src/sys/mips/mips/exception.S#8 edit Differences ... ==== //depot/projects/mips2/src/sys/mips/mips/exception.S#8 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/mips2/src/sys/mips/mips/exception.S#7 $ + * $P4: //depot/projects/mips2/src/sys/mips/mips/exception.S#8 $ */ #include "opt_ddb.h" @@ -127,10 +127,6 @@ jal save_kdbaux nop #endif /* DDB */ - /* - li t0, MIPS_SR_KX - mtc0 t0, MIPS_COP_0_STATUS - */ /* * If this is an interrupt, call cpu_intr() with the arguments: From owner-p4-projects@FreeBSD.ORG Mon Aug 14 08:51:06 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4104816A4E5; Mon, 14 Aug 2006 08:51:06 +0000 (UTC) X-Original-To: perforce@FreeBSD.org 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 1CE1C16A4E1 for ; Mon, 14 Aug 2006 08:51:06 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0924643D67 for ; Mon, 14 Aug 2006 08:50:57 +0000 (GMT) (envelope-from gonzo@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7E8ovaX052645 for ; Mon, 14 Aug 2006 08:50:57 GMT (envelope-from gonzo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7E8ovoN052642 for perforce@freebsd.org; Mon, 14 Aug 2006 08:50:57 GMT (envelope-from gonzo@FreeBSD.org) Date: Mon, 14 Aug 2006 08:50:57 GMT Message-Id: <200608140850.k7E8ovoN052642@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gonzo@FreeBSD.org using -f From: Oleksandr Tymoshenko To: Perforce Change Reviews Cc: Subject: PERFORCE change 103819 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 14 Aug 2006 08:51:06 -0000 http://perforce.freebsd.org/chv.cgi?CH=103819 Change 103819 by gonzo@gonzo_hq on 2006/08/14 08:50:21 o Make threads' stack aligned to 8 bytes. It's required by EABI for proper handling of 64-bits arguments in va_args. Affected files ... .. //depot/projects/mips2/src/sys/mips/mips/vm_machdep.c#7 edit Differences ... ==== //depot/projects/mips2/src/sys/mips/mips/vm_machdep.c#7 (text+ko) ==== @@ -188,10 +188,11 @@ * Enable interrupts and unmask timer interrupt (HW IRQ5) */ td->td_pcb->pcb_regs[PCB_REG_SR] = MIPS_SR_INT_IE | - (((1 << 5) << 8) << 2); + (((1 << 5) << 8) << 2); - /* Stack pointer. */ - td->td_pcb->pcb_regs[PCB_REG_SP] = (register_t)_ALIGN(td->td_frame - 1); + /* Stack pointer. Should be double-word aligned due to EABI */ + td->td_pcb->pcb_regs[PCB_REG_SP] = + (register_t)((uint32_t)(td->td_frame - 1) & ~7); } void From owner-p4-projects@FreeBSD.ORG Mon Aug 14 08:57:06 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A13D316A4E5; Mon, 14 Aug 2006 08:57:06 +0000 (UTC) X-Original-To: perforce@FreeBSD.org 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 6548D16A4E1 for ; Mon, 14 Aug 2006 08:57:06 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id EC25443D6A for ; Mon, 14 Aug 2006 08:57:05 +0000 (GMT) (envelope-from gonzo@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7E8v5fq052914 for ; Mon, 14 Aug 2006 08:57:05 GMT (envelope-from gonzo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7E8v5H0052911 for perforce@freebsd.org; Mon, 14 Aug 2006 08:57:05 GMT (envelope-from gonzo@FreeBSD.org) Date: Mon, 14 Aug 2006 08:57:05 GMT Message-Id: <200608140857.k7E8v5H0052911@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gonzo@FreeBSD.org using -f From: Oleksandr Tymoshenko To: Perforce Change Reviews Cc: Subject: PERFORCE change 103820 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 14 Aug 2006 08:57:06 -0000 http://perforce.freebsd.org/chv.cgi?CH=103820 Change 103820 by gonzo@gonzo_hq on 2006/08/14 08:56:07 o Change KVA from KUSEG to KSEG3 as it should be. Affected files ... .. //depot/projects/mips2/src/sys/mips/include/cpuregs.h#8 edit .. //depot/projects/mips2/src/sys/mips/include/vmparam.h#6 edit Differences ... ==== //depot/projects/mips2/src/sys/mips/include/cpuregs.h#8 (text+ko) ==== @@ -82,6 +82,7 @@ #define MIPS_KSEG1_START 0xa0000000 #define MIPS_KSEG1_END 0xbfffffff #define MIPS_KSEG2_START 0xc0000000 +#define MIPS_KSEG2_END 0xffffffff #define MIPS_MAX_MEM_ADDR 0xbe000000 #define MIPS_RESERVED_ADDR 0xbfc80000 ==== //depot/projects/mips2/src/sys/mips/include/vmparam.h#6 (text+ko) ==== @@ -104,10 +104,10 @@ * XXXMIPS: This values need to be changed!!! */ #define VM_MIN_ADDRESS ((vm_offset_t)0x0000000000010000) -#define VM_MAXUSER_ADDRESS ((vm_offset_t)0x0000000100000000) +#define VM_MAXUSER_ADDRESS ((vm_offset_t)MIPS_KSEG0_START-1) #define VM_MAX_ADDRESS ((vm_offset_t)0x0000000100000000) -#define VM_MIN_KERNEL_ADDRESS ((vm_offset_t)0x0000000000010000) -#define VM_MAX_KERNEL_ADDRESS ((vm_offset_t)MIPS_KSEG0_START-1) +#define VM_MIN_KERNEL_ADDRESS ((vm_offset_t)MIPS_KSEG2_START) +#define VM_MAX_KERNEL_ADDRESS ((vm_offset_t)MIPS_KSEG2_END) #define KERNBASE (VM_MIN_KERNEL_ADDRESS) /* virtual sizes (bytes) for various kernel submaps */ From owner-p4-projects@FreeBSD.ORG Mon Aug 14 09:00:32 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 05F1D16A4EF; Mon, 14 Aug 2006 09:00:32 +0000 (UTC) X-Original-To: perforce@FreeBSD.org 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 B8F4D16A4E2 for ; Mon, 14 Aug 2006 09:00:31 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7336043D5C for ; Mon, 14 Aug 2006 09:00:10 +0000 (GMT) (envelope-from gonzo@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7E90AF0053010 for ; Mon, 14 Aug 2006 09:00:10 GMT (envelope-from gonzo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7E90Aqr053007 for perforce@freebsd.org; Mon, 14 Aug 2006 09:00:10 GMT (envelope-from gonzo@FreeBSD.org) Date: Mon, 14 Aug 2006 09:00:10 GMT Message-Id: <200608140900.k7E90Aqr053007@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gonzo@FreeBSD.org using -f From: Oleksandr Tymoshenko To: Perforce Change Reviews Cc: Subject: PERFORCE change 103821 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 14 Aug 2006 09:00:32 -0000 http://perforce.freebsd.org/chv.cgi?CH=103821 Change 103821 by gonzo@gonzo_hq on 2006/08/14 08:59:12 o pmap_qenter: fixed mapping of several virtual pages to one physical. Affected files ... .. //depot/projects/mips2/src/sys/mips/mips/pmap.c#8 edit Differences ... ==== //depot/projects/mips2/src/sys/mips/mips/pmap.c#8 (text+ko) ==== @@ -615,6 +615,7 @@ while (count-- > 0) { pmap_kenter(va, VM_PAGE_TO_PHYS(m[i])); va += PAGE_SIZE; + i++; } } From owner-p4-projects@FreeBSD.ORG Mon Aug 14 11:57:55 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 91DAD16A4DE; Mon, 14 Aug 2006 11:57:55 +0000 (UTC) X-Original-To: perforce@FreeBSD.org 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 6BCDC16A4DA for ; Mon, 14 Aug 2006 11:57:55 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id AF7EB43D53 for ; Mon, 14 Aug 2006 11:57:54 +0000 (GMT) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7EBvs6I066529 for ; Mon, 14 Aug 2006 11:57:54 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7EBvs9H066526 for perforce@freebsd.org; Mon, 14 Aug 2006 11:57:54 GMT (envelope-from rdivacky@FreeBSD.org) Date: Mon, 14 Aug 2006 11:57:54 GMT Message-Id: <200608141157.k7EBvs9H066526@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rdivacky@FreeBSD.org using -f From: Roman Divacky To: Perforce Change Reviews Cc: Subject: PERFORCE change 103827 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 14 Aug 2006 11:57:55 -0000 http://perforce.freebsd.org/chv.cgi?CH=103827 Change 103827 by rdivacky@rdivacky_witten on 2006/08/14 11:57:26 Remove CLONE_PID checking, this flag doesnt exist in linux anymore. Also remove forgotten defines from linux32_machdep.c. Affected files ... .. //depot/projects/soc2006/rdivacky_linuxolator/amd64/linux32/linux.h#3 edit .. //depot/projects/soc2006/rdivacky_linuxolator/amd64/linux32/linux32_machdep.c#5 edit .. //depot/projects/soc2006/rdivacky_linuxolator/i386/linux/linux.h#18 edit .. //depot/projects/soc2006/rdivacky_linuxolator/i386/linux/linux_machdep.c#46 edit Differences ... ==== //depot/projects/soc2006/rdivacky_linuxolator/amd64/linux32/linux.h#3 (text+ko) ==== @@ -832,7 +832,7 @@ #define CLONE_FS 0x200 #define CLONE_FILES 0x400 #define CLONE_SIGHAND 0x800 -#define CLONE_PID 0x1000 /* this flag does not exist in linux */ +#define CLONE_PID 0x1000 /* this flag does not exist in linux anymore */ #define CLONE_PARENT 0x00008000 #define CLONE_THREAD 0x10000 #define CLONE_SETTLS 0x80000 ==== //depot/projects/soc2006/rdivacky_linuxolator/amd64/linux32/linux32_machdep.c#5 (text+ko) ==== @@ -473,12 +473,6 @@ return (0); } -#define CLONE_VM 0x100 -#define CLONE_FS 0x200 -#define CLONE_FILES 0x400 -#define CLONE_SIGHAND 0x800 -#define CLONE_PID 0x1000 - int linux_clone(struct thread *td, struct linux_clone_args *args) { @@ -492,8 +486,6 @@ printf(ARGS(clone, "flags %x, stack %x"), (unsigned int)(uintptr_t)args->flags, (unsigned int)(uintptr_t)args->stack); - if (args->flags & CLONE_PID) - printf(LMSG("CLONE_PID not yet supported")); } #endif ==== //depot/projects/soc2006/rdivacky_linuxolator/i386/linux/linux.h#18 (text+ko) ==== @@ -795,7 +795,7 @@ #define CLONE_FS 0x200 #define CLONE_FILES 0x400 #define CLONE_SIGHAND 0x800 -#define CLONE_PID 0x1000 /* this flag does not exist in linux */ +#define CLONE_PID 0x1000 /* this flag does not exist in linux anymore */ #define CLONE_PARENT 0x00008000 #define CLONE_THREAD 0x10000 #define CLONE_SETTLS 0x80000 ==== //depot/projects/soc2006/rdivacky_linuxolator/i386/linux/linux_machdep.c#46 (text+ko) ==== @@ -350,8 +350,6 @@ printf(ARGS(clone, "flags %x, stack %x, parent tid: %x, child tid: %x"), (unsigned int)args->flags, (unsigned int)args->stack, (unsigned int)args->parent_tidptr, (unsigned int)args->child_tidptr); - if (args->flags & CLONE_PID) - printf(LMSG("CLONE_PID not yet supported")); } #endif From owner-p4-projects@FreeBSD.ORG Mon Aug 14 12:01:00 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 03D9916A69D; Mon, 14 Aug 2006 12:01:00 +0000 (UTC) X-Original-To: perforce@FreeBSD.org 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 B8FFD16A69A for ; Mon, 14 Aug 2006 12:00:59 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 849CF43D49 for ; Mon, 14 Aug 2006 12:00:59 +0000 (GMT) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7EC0xun066758 for ; Mon, 14 Aug 2006 12:00:59 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7EC0xSl066754 for perforce@freebsd.org; Mon, 14 Aug 2006 12:00:59 GMT (envelope-from rdivacky@FreeBSD.org) Date: Mon, 14 Aug 2006 12:00:59 GMT Message-Id: <200608141200.k7EC0xSl066754@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rdivacky@FreeBSD.org using -f From: Roman Divacky To: Perforce Change Reviews Cc: Subject: PERFORCE change 103828 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 14 Aug 2006 12:01:00 -0000 http://perforce.freebsd.org/chv.cgi?CH=103828 Change 103828 by rdivacky@rdivacky_witten on 2006/08/14 12:00:10 Change comment from XXX: one to normal one. s/esp/rsp in amd64 version. Affected files ... .. //depot/projects/soc2006/rdivacky_linuxolator/amd64/linux32/linux32_machdep.c#6 edit .. //depot/projects/soc2006/rdivacky_linuxolator/i386/linux/linux_machdep.c#47 edit Differences ... ==== //depot/projects/soc2006/rdivacky_linuxolator/amd64/linux32/linux32_machdep.c#6 (text+ko) ==== @@ -512,8 +512,8 @@ p2->p_sigparent = exit_signal; PROC_UNLOCK(p2); td2 = FIRST_THREAD_IN_PROC(p2); - /* XXX: in a case of stack = NULL we are supposed to COW calling process stack - * this is what normal fork() does so we just keep the tf_esp arg intact + /* in a case of stack = NULL we are supposed to COW calling process stack + * this is what normal fork() does so we just keep the tf_rsp arg intact */ if (args->stack) td2->td_frame->tf_rsp = PTROUT(args->stack); ==== //depot/projects/soc2006/rdivacky_linuxolator/i386/linux/linux_machdep.c#47 (text+ko) ==== @@ -431,7 +431,7 @@ p2->p_sigparent = exit_signal; PROC_UNLOCK(p2); td2 = FIRST_THREAD_IN_PROC(p2); - /* XXX: in a case of stack = NULL we are supposed to COW calling process stack + /* in a case of stack = NULL we are supposed to COW calling process stack * this is what normal fork() does so we just keep the tf_esp arg intact */ if (args->stack) From owner-p4-projects@FreeBSD.ORG Mon Aug 14 12:03:03 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E15F716A4E0; Mon, 14 Aug 2006 12:03:02 +0000 (UTC) X-Original-To: perforce@FreeBSD.org 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 A4FF116A4DE for ; Mon, 14 Aug 2006 12:03:02 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7191943D46 for ; Mon, 14 Aug 2006 12:03:02 +0000 (GMT) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7EC325h067457 for ; Mon, 14 Aug 2006 12:03:02 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7EC32oT067379 for perforce@freebsd.org; Mon, 14 Aug 2006 12:03:02 GMT (envelope-from rdivacky@FreeBSD.org) Date: Mon, 14 Aug 2006 12:03:02 GMT Message-Id: <200608141203.k7EC32oT067379@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rdivacky@FreeBSD.org using -f From: Roman Divacky To: Perforce Change Reviews Cc: Subject: PERFORCE change 103829 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 14 Aug 2006 12:03:03 -0000 http://perforce.freebsd.org/chv.cgi?CH=103829 Change 103829 by rdivacky@rdivacky_witten on 2006/08/14 12:02:59 Make the linux_clone() prototype match real 2.6.x one. Affected files ... .. //depot/projects/soc2006/rdivacky_linuxolator/amd64/linux32/syscalls.master#12 edit Differences ... ==== //depot/projects/soc2006/rdivacky_linuxolator/amd64/linux32/syscalls.master#12 (text+ko) ==== @@ -214,7 +214,8 @@ 119 AUE_SIGRETURN STD { int linux_sigreturn( \ struct l_sigframe *sfp); } ; linux uses some strange calling convention here so we have to use the dummy arg -120 AUE_RFORK STD { int linux_clone(l_int flags, void *stack); } +120 AUE_RFORK STD { int linux_clone(l_int flags, void *stack \ + void *parent_tidptr, int dummy, void * child_tidptr); } 121 AUE_SYSCTL NOPROTO { int setdomainname(char *name, \ int len); } 122 AUE_NULL STD { int linux_newuname( \ From owner-p4-projects@FreeBSD.ORG Mon Aug 14 12:04:10 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C3A1816A4E1; Mon, 14 Aug 2006 12:04:09 +0000 (UTC) X-Original-To: perforce@FreeBSD.org 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 9E8AE16A4DE for ; Mon, 14 Aug 2006 12:04:09 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9143043D5A for ; Mon, 14 Aug 2006 12:04:04 +0000 (GMT) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7EC44El068132 for ; Mon, 14 Aug 2006 12:04:04 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7EC43WP068129 for perforce@freebsd.org; Mon, 14 Aug 2006 12:04:03 GMT (envelope-from rdivacky@FreeBSD.org) Date: Mon, 14 Aug 2006 12:04:03 GMT Message-Id: <200608141204.k7EC43WP068129@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rdivacky@FreeBSD.org using -f From: Roman Divacky To: Perforce Change Reviews Cc: Subject: PERFORCE change 103830 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 14 Aug 2006 12:04:10 -0000 http://perforce.freebsd.org/chv.cgi?CH=103830 Change 103830 by rdivacky@rdivacky_witten on 2006/08/14 12:03:59 Add missing comma. Affected files ... .. //depot/projects/soc2006/rdivacky_linuxolator/amd64/linux32/syscalls.master#13 edit Differences ... ==== //depot/projects/soc2006/rdivacky_linuxolator/amd64/linux32/syscalls.master#13 (text+ko) ==== @@ -214,7 +214,7 @@ 119 AUE_SIGRETURN STD { int linux_sigreturn( \ struct l_sigframe *sfp); } ; linux uses some strange calling convention here so we have to use the dummy arg -120 AUE_RFORK STD { int linux_clone(l_int flags, void *stack \ +120 AUE_RFORK STD { int linux_clone(l_int flags, void *stack, \ void *parent_tidptr, int dummy, void * child_tidptr); } 121 AUE_SYSCTL NOPROTO { int setdomainname(char *name, \ int len); } From owner-p4-projects@FreeBSD.ORG Mon Aug 14 12:05:24 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A34B016A53B; Mon, 14 Aug 2006 12:05:23 +0000 (UTC) X-Original-To: perforce@FreeBSD.org 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 5F18516A57B for ; Mon, 14 Aug 2006 12:05:23 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5680B43D92 for ; Mon, 14 Aug 2006 12:05:06 +0000 (GMT) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7EC5569068198 for ; Mon, 14 Aug 2006 12:05:06 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7EC55gp068195 for perforce@freebsd.org; Mon, 14 Aug 2006 12:05:05 GMT (envelope-from rdivacky@FreeBSD.org) Date: Mon, 14 Aug 2006 12:05:05 GMT Message-Id: <200608141205.k7EC55gp068195@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rdivacky@FreeBSD.org using -f From: Roman Divacky To: Perforce Change Reviews Cc: Subject: PERFORCE change 103831 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 14 Aug 2006 12:05:24 -0000 http://perforce.freebsd.org/chv.cgi?CH=103831 Change 103831 by rdivacky@rdivacky_witten on 2006/08/14 12:04:17 Regen after syscalls.master update. Affected files ... .. //depot/projects/soc2006/rdivacky_linuxolator/amd64/linux32/linux32_proto.h#12 edit .. //depot/projects/soc2006/rdivacky_linuxolator/amd64/linux32/linux32_syscall.h#12 edit .. //depot/projects/soc2006/rdivacky_linuxolator/amd64/linux32/linux32_sysent.c#12 edit Differences ... ==== //depot/projects/soc2006/rdivacky_linuxolator/amd64/linux32/linux32_proto.h#12 (text+ko) ==== @@ -367,7 +367,9 @@ }; struct linux_clone_args { char flags_l_[PADL_(l_int)]; l_int flags; char flags_r_[PADR_(l_int)]; - char stack_l_[PADL_(void *)]; void * stack; char stack_r_[PADR_(void *)]; + char parent_tidptr_l_[PADL_(void *stack void *)]; void *stack void * parent_tidptr; char parent_tidptr_r_[PADR_(void *stack void *)]; + char dummy_l_[PADL_(int)]; int dummy; char dummy_r_[PADR_(int)]; + char child_tidptr_l_[PADL_(void *)]; void * child_tidptr; char child_tidptr_r_[PADR_(void *)]; }; struct linux_newuname_args { char buf_l_[PADL_(struct l_new_utsname *)]; struct l_new_utsname * buf; char buf_r_[PADR_(struct l_new_utsname *)]; ==== //depot/projects/soc2006/rdivacky_linuxolator/amd64/linux32/linux32_syscall.h#12 (text+ko) ==== ==== //depot/projects/soc2006/rdivacky_linuxolator/amd64/linux32/linux32_sysent.c#12 (text+ko) ==== From owner-p4-projects@FreeBSD.ORG Mon Aug 14 12:29:44 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2816D16A4EA; Mon, 14 Aug 2006 12:29:44 +0000 (UTC) X-Original-To: perforce@FreeBSD.org 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 DE81A16A4E2 for ; Mon, 14 Aug 2006 12:29:43 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8491A43D78 for ; Mon, 14 Aug 2006 12:29:37 +0000 (GMT) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7ECTbdx069356 for ; Mon, 14 Aug 2006 12:29:37 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7ECTat8069353 for perforce@freebsd.org; Mon, 14 Aug 2006 12:29:36 GMT (envelope-from rdivacky@FreeBSD.org) Date: Mon, 14 Aug 2006 12:29:36 GMT Message-Id: <200608141229.k7ECTat8069353@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rdivacky@FreeBSD.org using -f From: Roman Divacky To: Perforce Change Reviews Cc: Subject: PERFORCE change 103832 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 14 Aug 2006 12:29:44 -0000 http://perforce.freebsd.org/chv.cgi?CH=103832 Change 103832 by rdivacky@rdivacky_witten on 2006/08/14 12:28:36 Attempt to be more style compliant. Some obsolete XXX comments removal, some new comments added. Affected files ... .. //depot/projects/soc2006/rdivacky_linuxolator/compat/linux/linux_emul.c#3 edit .. //depot/projects/soc2006/rdivacky_linuxolator/compat/linux/linux_futex.c#22 edit .. //depot/projects/soc2006/rdivacky_linuxolator/compat/linux/linux_time.c#6 edit .. //depot/projects/soc2006/rdivacky_linuxolator/i386/linux/linux_machdep.c#48 edit Differences ... ==== //depot/projects/soc2006/rdivacky_linuxolator/compat/linux/linux_emul.c#3 (text+ko) ==== @@ -77,7 +77,6 @@ struct linux_emuldata *em, *p_em; struct proc *p; - /* XXX: locking? */ if (child != 0) { /* non-exec call */ MALLOC(em, struct linux_emuldata *, sizeof *em, M_LINUX, M_WAITOK | M_ZERO); @@ -176,7 +175,6 @@ struct linux_sys_futex_args cup; int null = 0; - /* XXX: doesnt futex use the addr? */ error = copyout(&null, child_clear_tid, sizeof(null)); if (error) return; ==== //depot/projects/soc2006/rdivacky_linuxolator/compat/linux/linux_futex.c#22 (text+ko) ==== @@ -32,7 +32,9 @@ */ #include -/* __KERNEL_RCSID(1, "$NetBSD: linux_futex.c,v 1.5 2005/11/23 16:14:57 manu Exp $"); */ +#if 0 + __KERNEL_RCSID(1, "$NetBSD: linux_futex.c,v 1.5 2005/11/23 16:14:57 manu Exp $"); +#endif #include "opt_compat.h" @@ -157,7 +159,7 @@ * make sure we do not turn it into an infinite * timeout because timeout_hz gets null. * - * We use a minimal timeout of 1/hz. Mayve it would + * We use a minimal timeout of 1/hz. Maybe it would * make sense to just return ETIMEDOUT without sleeping. */ if (((timeout.tv_sec != 0) || (timeout.tv_nsec != 0)) && @@ -273,10 +275,13 @@ f = futex_get(args->uaddr, FUTEX_UNLOCKED); f2 = futex_get(args->uaddr2, FUTEX_UNLOCKED); + /* This function returns positive number as results + * and negative as errors + */ op_ret = futex_atomic_op(td, args->val3, args->uaddr2); if (op_ret < 0) { - /* XXX: ? */ + /* XXX: we dont handle the EFAULT yet */ if (op_ret != -EFAULT) { futex_put(f); futex_put(f2); ==== //depot/projects/soc2006/rdivacky_linuxolator/compat/linux/linux_time.c#6 (text+ko) ==== @@ -37,7 +37,9 @@ */ #include -/*__KERNEL_RCSID(0, "$NetBSD: linux_time.c,v 1.14 2006/05/14 03:40:54 christos Exp $");*/ +#if 0 +__KERNEL_RCSID(0, "$NetBSD: linux_time.c,v 1.14 2006/05/14 03:40:54 christos Exp $"); +#endif #include "opt_compat.h" ==== //depot/projects/soc2006/rdivacky_linuxolator/i386/linux/linux_machdep.c#48 (text+ko) ==== @@ -367,7 +367,6 @@ if (!(args->flags & CLONE_FILES)) ff |= RFFDG; - /* * Attempt to detect when linux_clone(2) is used for creating * kernel threads. Unfortunately despite the existence of the @@ -410,8 +409,10 @@ printf("linux_clone: CLONE_PARENT\n"); if (args->flags & CLONE_THREAD) { - // p2->p_pgrp = td->td_proc->p_pgrp; - // p2->p_pptr = td->td_proc->p_pptr; +#ifdef notyet + p2->p_pgrp = td->td_proc->p_pgrp; + p2->p_pptr = td->td_proc->p_pptr; +#endif exit_signal = 0; printf("linux_clone: CLONE_THREADS\n"); } From owner-p4-projects@FreeBSD.ORG Mon Aug 14 12:42:58 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 021C916A4E6; Mon, 14 Aug 2006 12:42:58 +0000 (UTC) X-Original-To: perforce@FreeBSD.org 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 AD95D16A4DF for ; Mon, 14 Aug 2006 12:42:57 +0000 (UTC) (envelope-from howardsu@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9A7B743D5C for ; Mon, 14 Aug 2006 12:42:54 +0000 (GMT) (envelope-from howardsu@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7ECgrpX070087 for ; Mon, 14 Aug 2006 12:42:53 GMT (envelope-from howardsu@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7ECgr0x070084 for perforce@freebsd.org; Mon, 14 Aug 2006 12:42:53 GMT (envelope-from howardsu@FreeBSD.org) Date: Mon, 14 Aug 2006 12:42:53 GMT Message-Id: <200608141242.k7ECgr0x070084@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to howardsu@FreeBSD.org using -f From: Howard Su To: Perforce Change Reviews Cc: Subject: PERFORCE change 103833 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 14 Aug 2006 12:42:58 -0000 http://perforce.freebsd.org/chv.cgi?CH=103833 Change 103833 by howardsu@su_vm on 2006/08/14 12:42:22 Change the behavir of SCE/SCX. It just set the flag of the p_stop. It will not change the state of tracing process anymore. Affected files ... .. //depot/projects/dtrace/src/sys/kern/sys_process.c#7 edit .. //depot/projects/dtrace/src/usr.bin/truss/setup.c#7 edit Differences ... ==== //depot/projects/dtrace/src/sys/kern/sys_process.c#7 (text+ko) ==== @@ -721,9 +721,6 @@ case PT_STEP: case PT_CONTINUE: - case PT_TO_SCE: - case PT_TO_SCX: - case PT_SYSCALL: case PT_DETACH: /* Zero means do not send any signal */ if (data < 0 || data > _SIG_MAXSIG) { @@ -731,21 +728,10 @@ break; } - switch (req) { - case PT_STEP: + if (req == PT_STEP) { error = ptrace_single_step(td2); if (error) goto out; - break; - case PT_TO_SCE: - p->p_stops |= S_PT_SCE; - break; - case PT_TO_SCX: - p->p_stops |= S_PT_SCX; - break; - case PT_SYSCALL: - p->p_stops |= S_PT_SCE | S_PT_SCX; - break; } if (addr != (void *)1) { @@ -817,6 +803,30 @@ break; + case PT_TO_SCE: + if (data == -1) + p->p_stops &= ~S_PT_SCE; + else + p->p_stops |= S_PT_SCE; + break; + case PT_TO_SCX: + if (data == -1) + p->p_stops &=~S_PT_SCE; + else + p->p_stops |= S_PT_SCX; + break; + case PT_SYSCALL: + if (data == -1) + p->p_stops &=~S_PT_SCE | ~S_PT_SCX; + else + p->p_stops |= S_PT_SCE | S_PT_SCX; + break; + case PT_FFORK: + if (data == -1) + p->p_stops &= ~S_PT_FFORK; + else + p->p_stops |= S_PT_FFORK; + break; case PT_WRITE_I: case PT_WRITE_D: write = 1; ==== //depot/projects/dtrace/src/usr.bin/truss/setup.c#7 (text+ko) ==== @@ -84,6 +84,7 @@ waitpid(pid, NULL, WNOHANG); /* Only in the parent here */ + ptrace(PT_SYSCALL, pid, NULL, 0); return (pid); } @@ -98,6 +99,7 @@ { if (ptrace(PT_ATTACH, pid, NULL, 0)) err(1, "can not attach to target process"); + ptrace(PT_SYSCALL, pid, NULL, 0); return (0); } @@ -118,14 +120,14 @@ int waitval; struct ptrace_lwpinfo lwpinfo; - ptrace(PT_SYSCALL, info->pid, (caddr_t)1, 0); - if (waitpid(info->pid, &waitval, WNOHANG) == -1) { + ptrace(PT_CONTINUE, info->pid, (caddr_t)1, 0); + if (waitpid(info->pid, &waitval, 0) == -1) { switch (errno) { case EINTR: break; default: - err(1, "failed"); + err(1, "failed wait pid"); } } if (WIFCONTINUED(waitval)) { @@ -144,17 +146,17 @@ switch(lwpinfo.pl_event) { case PL_EVENT_SYSENTER: info->pr_why = S_SCE; - break; - case PL_EVENT_SYSEXIT: - info->pr_why = S_SCX; - break; - case PL_EVENT_SIGNAL: - info->pr_why = S_SIG; - info->pr_data = lwpinfo.pl_signal; - break; - default: - info->pr_why = S_NONE; - } + break; + case PL_EVENT_SYSEXIT: + info->pr_why = S_SCX; + break; + case PL_EVENT_SIGNAL: + info->pr_why = S_SIG; + info->pr_data = lwpinfo.pl_signal; + break; + default: + info->pr_why = S_NONE; + } return; } } From owner-p4-projects@FreeBSD.ORG Mon Aug 14 12:59:16 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0AEA116A4E1; Mon, 14 Aug 2006 12:59:16 +0000 (UTC) X-Original-To: perforce@FreeBSD.org 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 DA92516A4DF for ; Mon, 14 Aug 2006 12:59:15 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5125343D58 for ; Mon, 14 Aug 2006 12:59:15 +0000 (GMT) (envelope-from gonzo@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7ECxFSv078656 for ; Mon, 14 Aug 2006 12:59:15 GMT (envelope-from gonzo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7ECxFnD078653 for perforce@freebsd.org; Mon, 14 Aug 2006 12:59:15 GMT (envelope-from gonzo@FreeBSD.org) Date: Mon, 14 Aug 2006 12:59:15 GMT Message-Id: <200608141259.k7ECxFnD078653@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gonzo@FreeBSD.org using -f From: Oleksandr Tymoshenko To: Perforce Change Reviews Cc: Subject: PERFORCE change 103834 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 14 Aug 2006 12:59:16 -0000 http://perforce.freebsd.org/chv.cgi?CH=103834 Change 103834 by gonzo@gonzo_hq on 2006/08/14 12:58:36 o Add link/information for gxemul 0.4.1 patch that made gxemul work with p4 tree. o Add disk image generation/usage information. Affected files ... .. //depot/projects/mips2/src/EMULATION#2 edit Differences ... ==== //depot/projects/mips2/src/EMULATION#2 (text+ko) ==== @@ -22,7 +22,7 @@ Now you have tool required to cross-compile the kernel. It's how it's done: make TARGET_ARCH=mips NO_MODULES=yes \ - MIPS_LITTLE_ENDIAN=yes buildkernel KERNCONF=QEMU + MIPS_LITTLE_ENDIAN=yes buildkernel KERNCONF=MALTA Each time we bring a change to the tree, you'll be forced to synchronize with it (p4 sync command) and rebuild (so repeat last step). @@ -30,7 +30,24 @@ Installation of GXemul ---------------------- - cd /usr/ports/emulators/gxemul && make && make install clean + Get GXemul 0.4.1 from + http://gavare.se/gxemul/src/gxemul-0.4.1.tar.gz + + Apply following patch (see changes below) + http://gonzo.kiev.ua/mips/freebsd-gxemul-0.4.1.patch + - ATA ERROR register on power up should be 1 + - Do not reset ATA ERROR register on read (there is no + such requirement in specs). + - Mark ATA device as legacy device with fixed resources + IRQ14, IO ports etc. for gxemul does not report + wdc resources. + - Change words order for 4-bytes values of ata identify + struct. they seemed to be in wrong order. + - Set EPC if in EXCL mode. This is temporary hack till + we will check it with spec/real hardware though this + change hasn't broken linux/netbsd support. + + ./configure && make && ... save gxemul binary somewhere Running ------- @@ -45,5 +62,13 @@ -v stands for verbose. We're emulating Malta board and 4Kc processor, thus -e malta -C 4Kc is used. -Image is set with -d /dev/null, since we don't need it at this stage. -'kernel' is your kernel image. + +Also you can create disk image to play with. Something like this commands +sequence : + dd if=/dev/zero of=mips.img bs=128M count=4 + mdconfig -a -f mips.img + fdisk -I /dev/md0 + disklabel -w /dev/md0s1 auto + newfs /dev/md0s1a + mdconfig -d -u 0 +Then just change "-d /dev/null" to "-d i:/path/to/mips.img". From owner-p4-projects@FreeBSD.ORG Mon Aug 14 13:11:34 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C188B16A4E9; Mon, 14 Aug 2006 13:11:34 +0000 (UTC) X-Original-To: perforce@FreeBSD.org 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 2DD9616A4DE for ; Mon, 14 Aug 2006 13:11:34 +0000 (UTC) (envelope-from howardsu@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2DD1F43D5E for ; Mon, 14 Aug 2006 13:11:32 +0000 (GMT) (envelope-from howardsu@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7EDBVNk080708 for ; Mon, 14 Aug 2006 13:11:31 GMT (envelope-from howardsu@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7EDBVHC080705 for perforce@freebsd.org; Mon, 14 Aug 2006 13:11:31 GMT (envelope-from howardsu@FreeBSD.org) Date: Mon, 14 Aug 2006 13:11:31 GMT Message-Id: <200608141311.k7EDBVHC080705@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to howardsu@FreeBSD.org using -f From: Howard Su To: Perforce Change Reviews Cc: Subject: PERFORCE change 103836 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 14 Aug 2006 13:11:35 -0000 http://perforce.freebsd.org/chv.cgi?CH=103836 Change 103836 by howardsu@su_vm on 2006/08/14 13:11:21 Remove unfinished FFORK code of ptrace Affected files ... .. //depot/projects/dtrace/src/sys/kern/sys_process.c#8 edit Differences ... ==== //depot/projects/dtrace/src/sys/kern/sys_process.c#8 (text+ko) ==== @@ -821,12 +821,6 @@ else p->p_stops |= S_PT_SCE | S_PT_SCX; break; - case PT_FFORK: - if (data == -1) - p->p_stops &= ~S_PT_FFORK; - else - p->p_stops |= S_PT_FFORK; - break; case PT_WRITE_I: case PT_WRITE_D: write = 1; From owner-p4-projects@FreeBSD.ORG Mon Aug 14 13:28:02 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id F162716A4E2; Mon, 14 Aug 2006 13:28:01 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 ADD2D16A4E0 for ; Mon, 14 Aug 2006 13:28:01 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2DDEE43D8D for ; Mon, 14 Aug 2006 13:27:52 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7EDRqJA083852 for ; Mon, 14 Aug 2006 13:27:52 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7EDRqbb083849 for perforce@freebsd.org; Mon, 14 Aug 2006 13:27:52 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 14 Aug 2006 13:27:52 GMT Message-Id: <200608141327.k7EDRqbb083849@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 103837 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 14 Aug 2006 13:28:02 -0000 http://perforce.freebsd.org/chv.cgi?CH=103837 Change 103837 by rwatson@rwatson_fledge on 2006/08/14 13:27:05 Restructure, update, expand OpenBSM web page. Affected files ... .. //depot/projects/trustedbsd/www/openbsm.page#11 edit Differences ... ==== //depot/projects/trustedbsd/www/openbsm.page#11 (text+ko) ==== @@ -29,7 +29,7 @@ - $P4: //depot/projects/trustedbsd/www/openbsm.page#10 $ + $P4: //depot/projects/trustedbsd/www/openbsm.page#11 $ @@ -68,6 +68,19 @@ easier audit trail analysis, including a pattern matching library.

+ + + +
+ History and Vendors + + +

OpenBSM is derived from the BSM audit implementation found in + Apple's open source Darwin operating system, generously released by + Apple under a BSD license. The Darwin BSM implementation was + created by McAfee Research under contract to Apple Computer, and has + since been extended by the volunteer TrustedBSD team.

+

OpenBSM is the core user space component of the TrustedBSD Audit Implementation for FreeBSD, providing tools, libraries, and include files. Pre-releases @@ -75,15 +88,35 @@ as integration of audit into the FreeBSD CVS tree is largely complete.

+ +
+ +
+ Mailing List + +

Discussion of the TrustedBSD Audit implementation, as well as the OpenBSM package, takes place on the trustedbsd-audit mailing list.

-

OpenBSM is derived from the BSM audit implementation found in - Apple's open source Darwin operating system, generously released by - Apple under a BSD license. The Darwin BSM implementation was - created by McAfee Research under contract to Apple Computer, and has - since been extended by the volunteer TrustedBSD team.

+ +
+ +
+ Downloads + + +

OpenBSM source code is available for download via occasional + snapshot and release tarballs, vendor integrated source code (such as + the FreeBSD source tree), cvsup, and the TrustedBSD Perforce + repository. + The first full release of OpenBSM, 1.0, is expected to take place in + October, 2006; current development snapshots are appropriate for use + in production systems, but consumers of these snapshots should be + aware that APIs, file formats, and tools are under active + development, and may change at any time. + Please see the file README present in the OpenBSM distribution for + build and installation instructions.

2006-06-27 - OpenBSM 1.0 alpha 7 release is a test release of the OpenBSM code base, and matches what is present in FreeBSD CVS at @@ -111,6 +144,7 @@ of the OpenBSM code base, and matches what is present in FreeBSD CVS at this date. Download.

+
From owner-p4-projects@FreeBSD.ORG Mon Aug 14 13:30:05 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E907E16A4DF; Mon, 14 Aug 2006 13:30:04 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 C2F8416A4DD for ; Mon, 14 Aug 2006 13:30:04 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id DE5CD43D86 for ; Mon, 14 Aug 2006 13:29:57 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7EDTvCO084060 for ; Mon, 14 Aug 2006 13:29:57 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7EDTvqP084057 for perforce@freebsd.org; Mon, 14 Aug 2006 13:29:57 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 14 Aug 2006 13:29:57 GMT Message-Id: <200608141329.k7EDTvqP084057@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 103838 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 14 Aug 2006 13:30:05 -0000 http://perforce.freebsd.org/chv.cgi?CH=103838 Change 103838 by rwatson@rwatson_fledge on 2006/08/14 13:29:44 Add sample sedarwin8 cvsup tag. Affected files ... .. //depot/projects/trustedbsd/www/trustedbsd-supfile#3 edit Differences ... ==== //depot/projects/trustedbsd/www/trustedbsd-supfile#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $P4: //depot/projects/trustedbsd/www/trustedbsd-supfile#2 $ +# $P4: //depot/projects/trustedbsd/www/trustedbsd-supfile#3 $ # # This is the sample CVSup supfile for the TrustedBSD Project. # @@ -51,3 +51,4 @@ p4-cvs-trustedbsd-mac p4-cvs-trustedbsd-openbsm p4-cvs-trustedbsd-sebsd +p4-cvs-trustedbsd-sedarwin8 From owner-p4-projects@FreeBSD.ORG Mon Aug 14 13:32:05 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id F41F016A4E5; Mon, 14 Aug 2006 13:32:04 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 B835916A4E1 for ; Mon, 14 Aug 2006 13:32:04 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id EB81243D6B for ; Mon, 14 Aug 2006 13:32:00 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7EDW0sq084287 for ; Mon, 14 Aug 2006 13:32:00 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7EDW0ec084284 for perforce@freebsd.org; Mon, 14 Aug 2006 13:32:00 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 14 Aug 2006 13:32:00 GMT Message-Id: <200608141332.k7EDW0ec084284@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 103839 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 14 Aug 2006 13:32:05 -0000 http://perforce.freebsd.org/chv.cgi?CH=103839 Change 103839 by rwatson@rwatson_fledge on 2006/08/14 13:31:48 Include OpenBSM cvsup collection name. Affected files ... .. //depot/projects/trustedbsd/www/openbsm.page#12 edit Differences ... ==== //depot/projects/trustedbsd/www/openbsm.page#12 (text+ko) ==== @@ -29,7 +29,7 @@ - $P4: //depot/projects/trustedbsd/www/openbsm.page#11 $ + $P4: //depot/projects/trustedbsd/www/openbsm.page#12 $ @@ -41,6 +41,8 @@

Perforce: //depot/projects/trustedbsd/openbsm/... + cvsup: + p4-cvs-trustedbsd-openbsm

OpenBSM is a portable, open source implementation of Sun's Basic From owner-p4-projects@FreeBSD.ORG Mon Aug 14 15:21:28 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EEB5316A4E1; Mon, 14 Aug 2006 15:21:27 +0000 (UTC) X-Original-To: perforce@FreeBSD.org 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 ADC5E16A4DE for ; Mon, 14 Aug 2006 15:21:27 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5BF9D43D77 for ; Mon, 14 Aug 2006 15:21:27 +0000 (GMT) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7EFLRho093241 for ; Mon, 14 Aug 2006 15:21:27 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7EFLRwp093238 for perforce@freebsd.org; Mon, 14 Aug 2006 15:21:27 GMT (envelope-from rdivacky@FreeBSD.org) Date: Mon, 14 Aug 2006 15:21:27 GMT Message-Id: <200608141521.k7EFLRwp093238@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rdivacky@FreeBSD.org using -f From: Roman Divacky To: Perforce Change Reviews Cc: Subject: PERFORCE change 103857 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 14 Aug 2006 15:21:28 -0000 http://perforce.freebsd.org/chv.cgi?CH=103857 Change 103857 by rdivacky@rdivacky_witten on 2006/08/14 15:21:01 Backout the LINUX_NPTL change. It never worked in the first place (I made a typo) and its sufficient to set osrelease=2.4.2 to get working linuxolator. Affected files ... .. //depot/projects/soc2006/rdivacky_linuxolator/compat/linux/linux_mib.c#7 edit .. //depot/projects/soc2006/rdivacky_linuxolator/compat/linux/linux_misc.c#13 edit .. //depot/projects/soc2006/rdivacky_linuxolator/conf/options.amd64#4 edit .. //depot/projects/soc2006/rdivacky_linuxolator/conf/options.i386#4 edit Differences ... ==== //depot/projects/soc2006/rdivacky_linuxolator/compat/linux/linux_mib.c#7 (text+ko) ==== @@ -81,11 +81,7 @@ 0, 0, linux_sysctl_osname, "A", "Linux kernel OS name"); -#ifdef LINUX_NPTL static char linux_osrelease[LINUX_MAX_UTSNAME] = "2.6.16"; -#else -static char linux_osrelease[LINUX_MAX_UTSNAME] = "2.4.2"; -#endif static int linux_sysctl_osrelease(SYSCTL_HANDLER_ARGS) ==== //depot/projects/soc2006/rdivacky_linuxolator/compat/linux/linux_misc.c#13 (text+ko) ==== @@ -1334,7 +1334,6 @@ int linux_getpid(struct thread *td, struct linux_getpid_args *args) { -#ifdef LINUX_NTPL struct linux_emuldata *em; em = em_find(td->td_proc, EMUL_UNLOCKED); @@ -1343,9 +1342,6 @@ td->td_retval[0] = em->shared->group_pid; EMUL_UNLOCK(&emul_lock); -#else - td->td_retval[0] = td->td_proc->p_pid; -#endif return (0); } @@ -1365,7 +1361,6 @@ int linux_getppid(struct thread *td, struct linux_getppid_args *args) { -#ifdef LINUX_NTPL struct linux_emuldata *em; struct proc *p, *pp; @@ -1400,9 +1395,6 @@ PROC_UNLOCK(pp); return (0); -#else - return getppid(td, (struct getppid_args *) args); -#endif } int ==== //depot/projects/soc2006/rdivacky_linuxolator/conf/options.amd64#4 (text+ko) ==== @@ -20,7 +20,6 @@ LINPROCFS opt_dontuse.h LINSYSFS opt_dontuse.h NDISAPI opt_dontuse.h -LINUX_NPTL opt_compat.h CLK_CALIBRATION_LOOP opt_clock.h CLK_USE_I8254_CALIBRATION opt_clock.h ==== //depot/projects/soc2006/rdivacky_linuxolator/conf/options.i386#4 (text+ko) ==== @@ -29,7 +29,6 @@ NDISAPI opt_dontuse.h PECOFF_DEBUG opt_pecoff.h PECOFF_SUPPORT opt_dontuse.h -LINUX_NPTL opt_compat.h # Change KVM size. Changes things all over the kernel. KVA_PAGES opt_global.h From owner-p4-projects@FreeBSD.ORG Mon Aug 14 15:29:39 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A194816A4E5; Mon, 14 Aug 2006 15:29:39 +0000 (UTC) X-Original-To: perforce@FreeBSD.org 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 7C72316A4E1 for ; Mon, 14 Aug 2006 15:29:39 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 566E543D55 for ; Mon, 14 Aug 2006 15:29:38 +0000 (GMT) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7EFTcCr093590 for ; Mon, 14 Aug 2006 15:29:38 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7EFTbbi093587 for perforce@freebsd.org; Mon, 14 Aug 2006 15:29:37 GMT (envelope-from rdivacky@FreeBSD.org) Date: Mon, 14 Aug 2006 15:29:37 GMT Message-Id: <200608141529.k7EFTbbi093587@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rdivacky@FreeBSD.org using -f From: Roman Divacky To: Perforce Change Reviews Cc: Subject: PERFORCE change 103858 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 14 Aug 2006 15:29:39 -0000 http://perforce.freebsd.org/chv.cgi?CH=103858 Change 103858 by rdivacky@rdivacky_witten on 2006/08/14 15:29:31 Add freebsd cvs id to newly added files. Affected files ... .. //depot/projects/soc2006/rdivacky_linuxolator/compat/linux/linux_emul.c#4 edit .. //depot/projects/soc2006/rdivacky_linuxolator/compat/linux/linux_emul.h#2 edit .. //depot/projects/soc2006/rdivacky_linuxolator/compat/linux/linux_futex.c#23 edit .. //depot/projects/soc2006/rdivacky_linuxolator/compat/linux/linux_futex.h#6 edit .. //depot/projects/soc2006/rdivacky_linuxolator/compat/linux/linux_time.c#7 edit Differences ... ==== //depot/projects/soc2006/rdivacky_linuxolator/compat/linux/linux_emul.c#4 (text+ko) ==== @@ -26,6 +26,9 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include +__FBSDID("$FreeBSD$"); + #include "opt_compat.h" #include ==== //depot/projects/soc2006/rdivacky_linuxolator/compat/linux/linux_emul.h#2 (text+ko) ==== @@ -24,6 +24,8 @@ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * (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$ */ #ifndef _LINUX_EMUL_H_ ==== //depot/projects/soc2006/rdivacky_linuxolator/compat/linux/linux_futex.c#23 (text+ko) ==== @@ -32,6 +32,7 @@ */ #include +__FBSDID("$FreeBSD$"); #if 0 __KERNEL_RCSID(1, "$NetBSD: linux_futex.c,v 1.5 2005/11/23 16:14:57 manu Exp $"); #endif ==== //depot/projects/soc2006/rdivacky_linuxolator/compat/linux/linux_futex.h#6 (text+ko) ==== @@ -29,6 +29,8 @@ * CONTRACT, STRICT LIABILITY, OR TORT (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$ */ #ifndef _LINUX_FUTEX_H ==== //depot/projects/soc2006/rdivacky_linuxolator/compat/linux/linux_time.c#7 (text+ko) ==== @@ -37,6 +37,7 @@ */ #include +__FBSDID("$FreeBSD$"); #if 0 __KERNEL_RCSID(0, "$NetBSD: linux_time.c,v 1.14 2006/05/14 03:40:54 christos Exp $"); #endif From owner-p4-projects@FreeBSD.ORG Mon Aug 14 15:44:00 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 97A6516A4E7; Mon, 14 Aug 2006 15:44:00 +0000 (UTC) X-Original-To: perforce@FreeBSD.org 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 7085616A4DF for ; Mon, 14 Aug 2006 15:44:00 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6E68943D5A for ; Mon, 14 Aug 2006 15:43:58 +0000 (GMT) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7EFhwYH094657 for ; Mon, 14 Aug 2006 15:43:58 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7EFhvat094654 for perforce@freebsd.org; Mon, 14 Aug 2006 15:43:57 GMT (envelope-from rdivacky@FreeBSD.org) Date: Mon, 14 Aug 2006 15:43:57 GMT Message-Id: <200608141543.k7EFhvat094654@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rdivacky@FreeBSD.org using -f From: Roman Divacky To: Perforce Change Reviews Cc: Subject: PERFORCE change 103863 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 14 Aug 2006 15:44:00 -0000 http://perforce.freebsd.org/chv.cgi?CH=103863 Change 103863 by rdivacky@rdivacky_witten on 2006/08/14 15:43:06 ifdef DEBUG some printfs Affected files ... .. //depot/projects/soc2006/rdivacky_linuxolator/i386/linux/linux_machdep.c#49 edit Differences ... ==== //depot/projects/soc2006/rdivacky_linuxolator/i386/linux/linux_machdep.c#49 (text+ko) ==== @@ -405,8 +405,11 @@ } } - if (args->flags & CLONE_PARENT) + if (args->flags & CLONE_PARENT) { +#ifdef DEBUG printf("linux_clone: CLONE_PARENT\n"); +#endif + } if (args->flags & CLONE_THREAD) { #ifdef notyet @@ -414,7 +417,9 @@ p2->p_pptr = td->td_proc->p_pptr; #endif exit_signal = 0; +#ifdef DEBUG printf("linux_clone: CLONE_THREADS\n"); +#endif } if (args->flags & CLONE_CHILD_SETTID) From owner-p4-projects@FreeBSD.ORG Mon Aug 14 16:43:14 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3055E16A4E6; Mon, 14 Aug 2006 16:43:14 +0000 (UTC) X-Original-To: perforce@FreeBSD.org 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 E824F16A4E0 for ; Mon, 14 Aug 2006 16:43:13 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B391243D53 for ; Mon, 14 Aug 2006 16:43:13 +0000 (GMT) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7EGhDVp099419 for ; Mon, 14 Aug 2006 16:43:13 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7EGhDRh099416 for perforce@freebsd.org; Mon, 14 Aug 2006 16:43:13 GMT (envelope-from rdivacky@FreeBSD.org) Date: Mon, 14 Aug 2006 16:43:13 GMT Message-Id: <200608141643.k7EGhDRh099416@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rdivacky@FreeBSD.org using -f From: Roman Divacky To: Perforce Change Reviews Cc: Subject: PERFORCE change 103865 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 14 Aug 2006 16:43:14 -0000 http://perforce.freebsd.org/chv.cgi?CH=103865 Change 103865 by rdivacky@rdivacky_witten on 2006/08/14 16:42:53 A few more comments. Affected files ... .. //depot/projects/soc2006/rdivacky_linuxolator/compat/linux/linux_emul.c#5 edit .. //depot/projects/soc2006/rdivacky_linuxolator/i386/linux/linux_machdep.c#50 edit Differences ... ==== //depot/projects/soc2006/rdivacky_linuxolator/compat/linux/linux_emul.c#5 (text+ko) ==== @@ -190,6 +190,9 @@ cup.uaddr2 = NULL; cup.val3 = 0; error = linux_sys_futex(FIRST_THREAD_IN_PROC(p), &cup); + /* this cannot happen at the moment and if this happens + * it probably mean there is a userspace bug + */ if (error) printf(LMSG("futex stuff in proc_exit failed.\n")); } ==== //depot/projects/soc2006/rdivacky_linuxolator/i386/linux/linux_machdep.c#50 (text+ko) ==== @@ -412,6 +412,9 @@ } if (args->flags & CLONE_THREAD) { + /* XXX: linux mangles pgrp and pptr somehow + * I think it might be this but I am not sure. + */ #ifdef notyet p2->p_pgrp = td->td_proc->p_pgrp; p2->p_pptr = td->td_proc->p_pptr; From owner-p4-projects@FreeBSD.ORG Mon Aug 14 16:45:21 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5C00416A4E2; Mon, 14 Aug 2006 16:45:21 +0000 (UTC) X-Original-To: perforce@FreeBSD.org 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 0985716A4DD for ; Mon, 14 Aug 2006 16:45:21 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0C99B43D53 for ; Mon, 14 Aug 2006 16:45:18 +0000 (GMT) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7EGjHgO099529 for ; Mon, 14 Aug 2006 16:45:17 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7EGjGTk099526 for perforce@freebsd.org; Mon, 14 Aug 2006 16:45:16 GMT (envelope-from rdivacky@FreeBSD.org) Date: Mon, 14 Aug 2006 16:45:16 GMT Message-Id: <200608141645.k7EGjGTk099526@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rdivacky@FreeBSD.org using -f From: Roman Divacky To: Perforce Change Reviews Cc: Subject: PERFORCE change 103866 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 14 Aug 2006 16:45:21 -0000 http://perforce.freebsd.org/chv.cgi?CH=103866 Change 103866 by rdivacky@rdivacky_witten on 2006/08/14 16:44:38 IFC Affected files ... .. //depot/projects/soc2006/rdivacky_linuxolator/amd64/amd64/pmap.c#8 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/amd64/amd64/trap.c#5 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/conf/kern.post.mk#3 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/conf/kmod.mk#4 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/dev/em/if_em.c#7 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/dev/em/if_em.h#4 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/dev/isp/isp.c#5 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/dev/isp/isp_pci.c#4 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/dev/isp/ispvar.h#3 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/dev/nfe/if_nfe.c#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/i386/i386/pmap.c#8 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/kern/uipc_usrreq.c#8 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/modules/if_ef/Makefile#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/modules/if_ppp/Makefile#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/modules/netgraph/mppc/Makefile#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/modules/sound/sound/Makefile#3 integrate Differences ... ==== //depot/projects/soc2006/rdivacky_linuxolator/amd64/amd64/pmap.c#8 (text+ko) ==== @@ -77,7 +77,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.570 2006/08/11 19:22:55 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.571 2006/08/14 15:39:41 jhb Exp $"); /* * Manages physical address maps. @@ -2368,10 +2368,6 @@ if (pmap == kernel_pmap) newpte |= PG_G; - /* Preserve any caching attributes. */ - /* XXX: Should this be conditional on something? */ - newpte |= (origpte & (PG_PTE_PAT | PG_NC_PCD | PG_NC_PWT)); - /* * if the mapping or permission bits are different, we need * to update the pte. ==== //depot/projects/soc2006/rdivacky_linuxolator/amd64/amd64/trap.c#5 (text+ko) ==== @@ -38,7 +38,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/trap.c,v 1.308 2006/08/08 04:01:29 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/trap.c,v 1.309 2006/08/14 06:15:16 alc Exp $"); /* * AMD64 Trap and System call handling @@ -568,11 +568,11 @@ /* * PGEX_I is defined only if the execute disable bit capability is - * supported and enabled; otherwise, that bit is reserved, i.e., zero. + * supported and enabled. */ if (frame->tf_err & PGEX_W) ftype = VM_PROT_WRITE; - else if (frame->tf_err & PGEX_I) + else if ((frame->tf_err & PGEX_I) && pg_nx != 0) ftype = VM_PROT_EXECUTE; else ftype = VM_PROT_READ; ==== //depot/projects/soc2006/rdivacky_linuxolator/conf/kern.post.mk#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/kern.post.mk,v 1.95 2006/06/18 17:48:45 imp Exp $ +# $FreeBSD: src/sys/conf/kern.post.mk,v 1.96 2006/08/14 13:28:52 des Exp $ # Part of a unified Makefile for building kernels. This part includes all # the definitions that need to be after all the % directives except %RULES @@ -132,7 +132,7 @@ # in the a.out ld. For now, this works. HACK_EXTRA_FLAGS?= -shared hack.So: Makefile - touch hack.c + :> hack.c ${CC} ${HACK_EXTRA_FLAGS} -nostdlib hack.c -o hack.So rm -f hack.c ==== //depot/projects/soc2006/rdivacky_linuxolator/conf/kmod.mk#4 (text+ko) ==== @@ -1,5 +1,5 @@ # From: @(#)bsd.prog.mk 5.26 (Berkeley) 6/25/91 -# $FreeBSD: src/sys/conf/kmod.mk,v 1.209 2006/06/30 19:35:35 jkim Exp $ +# $FreeBSD: src/sys/conf/kmod.mk,v 1.210 2006/08/14 13:28:52 des Exp $ # # The include file handles building and installing loadable # kernel modules. @@ -192,7 +192,7 @@ .if defined(EXPORT_SYMS) .if ${EXPORT_SYMS} != YES .if ${EXPORT_SYMS} == NO - touch export_syms + :> export_syms .elif !exists(${.CURDIR}/${EXPORT_SYMS}) echo ${EXPORT_SYMS} > export_syms .else @@ -311,7 +311,7 @@ CLEANFILES+= ${_src} .if !target(${_src}) ${_src}: - touch ${.TARGET} + :> ${.TARGET} .endif .endfor .endif ==== //depot/projects/soc2006/rdivacky_linuxolator/dev/em/if_em.c#7 (text+ko) ==== @@ -31,7 +31,7 @@ ***************************************************************************/ -/*$FreeBSD: src/sys/dev/em/if_em.c,v 1.127 2006/08/11 10:58:23 glebius Exp $*/ +/*$FreeBSD: src/sys/dev/em/if_em.c,v 1.131 2006/08/14 09:52:35 glebius Exp $*/ #ifdef HAVE_KERNEL_OPTION_HEADERS #include "opt_device_polling.h" @@ -236,7 +236,7 @@ static void em_set_multi(struct adapter *); static void em_print_hw_stats(struct adapter *); static void em_update_link_status(struct adapter *); -static int em_get_buf(int i, struct adapter *, struct mbuf *); +static int em_get_buf(struct adapter *, int); static void em_enable_vlans(struct adapter *); static void em_disable_vlans(struct adapter *); static int em_encap(struct adapter *, struct mbuf **); @@ -1486,20 +1486,45 @@ tx_buffer = &adapter->tx_buffer_area[adapter->next_avail_tx_desc]; tx_buffer_last = tx_buffer; map = tx_buffer->map; - error = bus_dmamap_load_mbuf_sg(adapter->txtag, map, m_head, segs, &nsegs, - BUS_DMA_NOWAIT); - if (error != 0) { + error = bus_dmamap_load_mbuf_sg(adapter->txtag, map, *m_headp, segs, + &nsegs, BUS_DMA_NOWAIT); + if (error == EFBIG) { + struct mbuf *m; + + m = m_defrag(*m_headp, M_DONTWAIT); + if (m == NULL) { + /* Assume m_defrag(9) used only m_get(9). */ + adapter->mbuf_alloc_failed++; + m_freem(*m_headp); + *m_headp = NULL; + return (ENOBUFS); + } + *m_headp = m; + error = bus_dmamap_load_mbuf_sg(adapter->txtag, map, *m_headp, + segs, &nsegs, BUS_DMA_NOWAIT); + if (error != 0) { + adapter->no_tx_dma_setup++; + m_freem(*m_headp); + *m_headp = NULL; + return (error); + } + } else if (error != 0) { adapter->no_tx_dma_setup++; return (error); } - KASSERT(nsegs != 0, ("em_encap: empty packet")); + if (nsegs == 0) { + m_freem(*m_headp); + *m_headp = NULL; + return (EIO); + } if (nsegs > adapter->num_tx_desc_avail) { adapter->no_tx_desc_avail2++; - error = ENOBUFS; - goto encap_fail; + bus_dmamap_unload(adapter->txtag, map); + return (ENOBUFS); } + m_head = *m_headp; if (ifp->if_hwassist > 0) em_transmit_checksum_setup(adapter, m_head, &txd_upper, &txd_lower); else @@ -1526,8 +1551,8 @@ if (txd_used == adapter->num_tx_desc_avail) { adapter->next_avail_tx_desc = txd_saved; adapter->no_tx_desc_avail2++; - error = ENOBUFS; - goto encap_fail; + bus_dmamap_unload(adapter->txtag, map); + return (ENOBUFS); } tx_buffer = &adapter->tx_buffer_area[i]; current_tx_desc = &adapter->tx_desc_base[i]; @@ -1599,10 +1624,6 @@ } return (0); - -encap_fail: - bus_dmamap_unload(adapter->txtag, map); - return (error); } /********************************************************************* @@ -2587,7 +2608,7 @@ (E1000_COLLISION_THRESHOLD << E1000_CT_SHIFT); if (adapter->hw.mac_type >= em_82571) reg_tctl |= E1000_TCTL_MULR; - if (adapter->link_duplex == 1) { + if (adapter->link_duplex == FULL_DUPLEX) { reg_tctl |= E1000_FDX_COLLISION_DISTANCE << E1000_COLD_SHIFT; } else { reg_tctl |= E1000_HDX_COLLISION_DISTANCE << E1000_COLD_SHIFT; @@ -2803,46 +2824,49 @@ * **********************************************************************/ static int -em_get_buf(int i, struct adapter *adapter, struct mbuf *mp) +em_get_buf(struct adapter *adapter, int i) { - struct ifnet *ifp = adapter->ifp; + struct mbuf *m; bus_dma_segment_t segs[1]; + bus_dmamap_t map; struct em_buffer *rx_buffer; int error, nsegs; - if (mp == NULL) { - mp = m_getcl(M_DONTWAIT, MT_DATA, M_PKTHDR); - if (mp == NULL) { - adapter->mbuf_cluster_failed++; - return (ENOBUFS); - } - mp->m_len = mp->m_pkthdr.len = MCLBYTES; - } else { - mp->m_len = mp->m_pkthdr.len = MCLBYTES; - mp->m_data = mp->m_ext.ext_buf; - mp->m_next = NULL; + m = m_getcl(M_DONTWAIT, MT_DATA, M_PKTHDR); + if (m == NULL) { + adapter->mbuf_cluster_failed++; + return (ENOBUFS); } + m->m_len = m->m_pkthdr.len = MCLBYTES; + if (adapter->hw.max_frame_size <= (MCLBYTES - ETHER_ALIGN)) + m_adj(m, ETHER_ALIGN); - if (ifp->if_mtu <= ETHERMTU) - m_adj(mp, ETHER_ALIGN); - - rx_buffer = &adapter->rx_buffer_area[i]; - /* * Using memory from the mbuf cluster pool, invoke the * bus_dma machinery to arrange the memory mapping. */ - error = bus_dmamap_load_mbuf_sg(adapter->rxtag, rx_buffer->map, - mp, segs, &nsegs, 0); + error = bus_dmamap_load_mbuf_sg(adapter->rxtag, adapter->rx_sparemap, + m, segs, &nsegs, BUS_DMA_NOWAIT); if (error != 0) { - m_free(mp); + m_free(m); return (error); } /* If nsegs is wrong then the stack is corrupt. */ KASSERT(nsegs == 1, ("Too many segments returned!")); - rx_buffer->m_head = mp; + + rx_buffer = &adapter->rx_buffer_area[i]; + if (rx_buffer->m_head != NULL) + bus_dmamap_unload(adapter->rxtag, rx_buffer->map); + + map = rx_buffer->map; + rx_buffer->map = adapter->rx_sparemap; + adapter->rx_sparemap = map; + bus_dmamap_sync(adapter->rxtag, rx_buffer->map, BUS_DMASYNC_PREREAD); + rx_buffer->m_head = m; + adapter->rx_desc_base[i].buffer_addr = htole64(segs[0].ds_addr); - bus_dmamap_sync(adapter->rxtag, rx_buffer->map, BUS_DMASYNC_PREREAD); + /* Zero out the receive descriptors status. */ + adapter->rx_desc_base[i].status = 0; return (0); } @@ -2889,6 +2913,13 @@ goto fail; } + error = bus_dmamap_create(adapter->rxtag, BUS_DMA_NOWAIT, + &adapter->rx_sparemap); + if (error) { + device_printf(dev, "%s: bus_dmamap_create failed: %d\n", + __func__, error); + goto fail; + } rx_buffer = adapter->rx_buffer_area; for (i = 0; i < adapter->num_rx_desc; i++, rx_buffer++) { error = bus_dmamap_create(adapter->rxtag, BUS_DMA_NOWAIT, @@ -2901,7 +2932,7 @@ } for (i = 0; i < adapter->num_rx_desc; i++) { - error = em_get_buf(i, adapter, NULL); + error = em_get_buf(adapter, i); if (error) goto fail; } @@ -3036,6 +3067,10 @@ INIT_DEBUGOUT("free_receive_structures: begin"); + if (adapter->rx_sparemap) { + bus_dmamap_destroy(adapter->rxtag, adapter->rx_sparemap); + adapter->rx_sparemap = NULL; + } if (adapter->rx_buffer_area != NULL) { rx_buffer = adapter->rx_buffer_area; for (i = 0; i < adapter->num_rx_desc; i++, rx_buffer++) { @@ -3104,10 +3139,12 @@ struct mbuf *m = NULL; mp = adapter->rx_buffer_area[i].m_head; + /* + * Can't defer bus_dmamap_sync(9) because TBI_ACCEPT + * needs to access the last received byte in the mbuf. + */ bus_dmamap_sync(adapter->rxtag, adapter->rx_buffer_area[i].map, BUS_DMASYNC_POSTREAD); - bus_dmamap_unload(adapter->rxtag, - adapter->rx_buffer_area[i].map); accept_frame = 1; prev_len_adj = 0; @@ -3146,14 +3183,9 @@ } if (accept_frame) { - if (em_get_buf(i, adapter, NULL) == ENOBUFS) { - adapter->dropped_pkts++; - em_get_buf(i, adapter, mp); - if (adapter->fmp != NULL) - m_freem(adapter->fmp); - adapter->fmp = NULL; - adapter->lmp = NULL; - break; + if (em_get_buf(adapter, i) != 0) { + ifp->if_iqdrops++; + goto discard; } /* Assign correct length to the current fragment */ @@ -3187,7 +3219,8 @@ em_receive_checksum(adapter, current_desc, adapter->fmp); #ifndef __NO_STRICT_ALIGNMENT - if (ifp->if_mtu > ETHERMTU && + if (adapter->hw.max_frame_size > + (MCLBYTES - ETHER_ALIGN) && em_fixup_rx(adapter) != 0) goto skip; #endif @@ -3203,16 +3236,25 @@ adapter->lmp = NULL; } } else { - adapter->dropped_pkts++; - em_get_buf(i, adapter, mp); - if (adapter->fmp != NULL) + ifp->if_ierrors++; +discard: + /* Reuse loaded DMA map and just update mbuf chain */ + mp = adapter->rx_buffer_area[i].m_head; + mp->m_len = mp->m_pkthdr.len = MCLBYTES; + mp->m_data = mp->m_ext.ext_buf; + mp->m_next = NULL; + if (adapter->hw.max_frame_size <= (MCLBYTES - ETHER_ALIGN)) + m_adj(mp, ETHER_ALIGN); + if (adapter->fmp != NULL) { m_freem(adapter->fmp); - adapter->fmp = NULL; - adapter->lmp = NULL; + adapter->fmp = NULL; + adapter->lmp = NULL; + } + /* Zero out the receive descriptors status. */ + adapter->rx_desc_base[i].status = 0; + m = NULL; } - /* Zero out the receive descriptors status. */ - current_desc->status = 0; bus_dmamap_sync(adapter->rxdma.dma_tag, adapter->rxdma.dma_map, BUS_DMASYNC_PREREAD | BUS_DMASYNC_PREWRITE); @@ -3281,10 +3323,12 @@ n->m_next = m; adapter->fmp = n; } else { - adapter->dropped_pkts++; + adapter->ifp->if_iqdrops++; + adapter->mbuf_alloc_failed++; m_freem(adapter->fmp); adapter->fmp = NULL; - error = ENOMEM; + adapter->lmp = NULL; + error = ENOBUFS; } } @@ -3556,9 +3600,9 @@ ifp->if_collisions = adapter->stats.colc; /* Rx Errors */ - ifp->if_ierrors = adapter->dropped_pkts + adapter->stats.rxerrc + - adapter->stats.crcerrs + adapter->stats.algnerrc + adapter->stats.ruc + - adapter->stats.roc + adapter->stats.mpc + adapter->stats.cexterr; + ifp->if_ierrors = adapter->stats.rxerrc + adapter->stats.crcerrs + + adapter->stats.algnerrc + adapter->stats.ruc + adapter->stats.roc + + adapter->stats.mpc + adapter->stats.cexterr; /* Tx Errors */ ifp->if_oerrors = adapter->stats.ecol + adapter->stats.latecol + @@ -3611,8 +3655,6 @@ adapter->mbuf_alloc_failed); device_printf(dev, "Std mbuf cluster failed = %ld\n", adapter->mbuf_cluster_failed); - device_printf(dev, "Driver dropped packets = %ld\n", - adapter->dropped_pkts); } static void ==== //depot/projects/soc2006/rdivacky_linuxolator/dev/em/if_em.h#4 (text+ko) ==== @@ -31,7 +31,7 @@ ***************************************************************************/ -/*$FreeBSD: src/sys/dev/em/if_em.h,v 1.47 2006/08/03 19:05:04 pdeuskar Exp $*/ +/*$FreeBSD: src/sys/dev/em/if_em.h,v 1.48 2006/08/14 01:50:54 yongari Exp $*/ #ifndef _EM_H_DEFINED_ #define _EM_H_DEFINED_ @@ -324,13 +324,13 @@ int rx_process_limit; struct em_buffer *rx_buffer_area; bus_dma_tag_t rxtag; + bus_dmamap_t rx_sparemap; /* First/last mbuf pointers, for collecting multisegment RX packets. */ struct mbuf *fmp; struct mbuf *lmp; /* Misc stats maintained by the driver */ - unsigned long dropped_pkts; unsigned long mbuf_alloc_failed; unsigned long mbuf_cluster_failed; unsigned long no_tx_desc_avail1; ==== //depot/projects/soc2006/rdivacky_linuxolator/dev/isp/isp.c#5 (text+ko) ==== @@ -42,7 +42,7 @@ #endif #ifdef __FreeBSD__ #include -__FBSDID("$FreeBSD: src/sys/dev/isp/isp.c,v 1.125 2006/08/05 04:21:20 mjacob Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/isp/isp.c,v 1.126 2006/08/14 05:42:46 mjacob Exp $"); #include #endif #ifdef __OpenBSD__ @@ -160,7 +160,7 @@ isp_reset(ispsoftc_t *isp) { mbreg_t mbs; - uint16_t code_org; + uint32_t code_org; int loops, i, dodnld = 1; char *btype = "????"; @@ -654,36 +654,27 @@ } /* - * Verify that it downloaded correctly. + * If we're a 2322, the firmware actually comes in three chunks. + * We loaded the first at the code_org address. The other two + * chunks, which follow right after each other in memory here, + * get loaded at addresses specfied at offset 0x9..0xB. */ - MEMZERO(&mbs, sizeof (mbs)); - mbs.param[0] = MBOX_VERIFY_CHECKSUM; - mbs.param[1] = code_org; - isp_mboxcmd(isp, &mbs, MBLOGNONE); - if (mbs.param[0] != MBOX_COMMAND_COMPLETE) { - isp_prt(isp, ISP_LOGERR, "Ram Checksum Failure"); - return; - } - - /* - * If we're a 2322 or 2422, the firmware actually comes - * in three chunks. We loaded the first at the code_org - * address. The other two chunks, which follow right - * after each other in memory here, get loaded at addresses - * specfied at offset 0x9..0xB. - */ if (IS_2322(isp)) { + uint32_t nxtaddr; + uint32_t offset; - ptr = &ptr[ptr[3]]; + nxtaddr = ptr[3]; + ptr = &ptr[nxtaddr]; + offset = ptr[5] | (((uint32_t)(ptr[4] & 0xff)) << 16); isp->isp_mbxworkp = &ptr[1]; - isp->isp_mbxwrk0 = ptr[3] - 1; - isp->isp_mbxwrk1 = ptr[5] + 1; - isp->isp_mbxwrk8 = ptr[4]; + isp->isp_mbxwrk0 = ptr[3] + 1; + isp->isp_mbxwrk1 = offset + 1; + isp->isp_mbxwrk8 = (offset + 1) >> 16; MEMZERO(&mbs, sizeof (mbs)); mbs.param[0] = MBOX_WRITE_RAM_WORD_EXTENDED; - mbs.param[1] = ptr[5]; + mbs.param[1] = offset; mbs.param[2] = ptr[0]; - mbs.param[8] = ptr[4]; + mbs.param[8] = offset >> 16; isp_mboxcmd(isp, &mbs, MBLOGNONE); if (mbs.param[0] != MBOX_COMMAND_COMPLETE) { isp_prt(isp, ISP_LOGERR, @@ -691,24 +682,39 @@ return; } - ptr = &ptr[ptr[3]]; + nxtaddr = ptr[3]; + ptr = &ptr[nxtaddr]; + offset = ptr[5] | (((uint32_t)(ptr[4] & 0xff)) << 16); isp->isp_mbxworkp = &ptr[1]; isp->isp_mbxwrk0 = ptr[3] - 1; - isp->isp_mbxwrk1 = ptr[5] + 1; - isp->isp_mbxwrk8 = ptr[4]; + isp->isp_mbxwrk1 = (offset + 1); + isp->isp_mbxwrk8 = (offset + 1) >> 16; MEMZERO(&mbs, sizeof (mbs)); mbs.param[0] = MBOX_WRITE_RAM_WORD_EXTENDED; - mbs.param[1] = ptr[5]; + mbs.param[1] = offset; mbs.param[2] = ptr[0]; - mbs.param[8] = ptr[4]; + mbs.param[8] = offset >> 16; isp_mboxcmd(isp, &mbs, MBLOGNONE); if (mbs.param[0] != MBOX_COMMAND_COMPLETE) { isp_prt(isp, ISP_LOGERR, "Transmit Sequencer F/W Load Failed"); return; } + } else { + /* + * Verify that it downloaded correctly. + */ + MEMZERO(&mbs, sizeof (mbs)); + mbs.param[0] = MBOX_VERIFY_CHECKSUM; + mbs.param[1] = code_org; + isp_mboxcmd(isp, &mbs, MBLOGNONE); + if (mbs.param[0] != MBOX_COMMAND_COMPLETE) { + isp_prt(isp, ISP_LOGERR, + "Downloaded RISC Code Checksum Failure"); + return; + } + } - isp->isp_loaded_fw = 1; } else { isp->isp_loaded_fw = 0; @@ -732,9 +738,15 @@ } else { mbs.param[2] = 1; } - mbs.obits |= 2; } isp_mboxcmd(isp, &mbs, MBLOGNONE); + if (IS_2322(isp) || IS_24XX(isp)) { + if (mbs.param[0] != MBOX_COMMAND_COMPLETE) { + isp_prt(isp, ISP_LOGERR, "EXEC F/W failed: 0x%x", + mbs.param[0]); + return; + } + } /* * Give it a chance to start. @@ -1547,7 +1559,7 @@ mbs.param[0] = MBOX_GET_PORT_DB; if (IS_2KLOGIN(isp)) { mbs.param[1] = id; - mbs.obits |= (1 << 10); + mbs.ibits |= (1 << 10); } else { mbs.param[1] = id << 8; } @@ -1577,7 +1589,7 @@ mbs.param[0] = MBOX_GET_PORT_NAME; if (IS_2KLOGIN(isp)) { mbs.param[1] = loopid; - mbs.obits |= (1 << 10); + mbs.ibits |= (1 << 10); if (nodename) { mbs.param[10] = 1; } @@ -2043,7 +2055,7 @@ mbs.param[0] = MBOX_FABRIC_LOGOUT; if (IS_2KLOGIN(isp)) { mbs.param[1] = lp->loopid; - mbs.obits |= (1 << 10); + mbs.ibits |= (1 << 10); } else { mbs.param[1] = lp->loopid << 8; } @@ -2069,7 +2081,7 @@ mbs.param[0] = MBOX_FABRIC_LOGIN; if (IS_2KLOGIN(isp)) { mbs.param[1] = loopid; - mbs.obits |= (1 << 10); + mbs.ibits |= (1 << 10); } else { mbs.param[1] = loopid << 8; } @@ -2195,7 +2207,7 @@ mbs.param[0] = MBOX_FABRIC_LOGOUT; if (IS_2KLOGIN(isp)) { mbs.param[1] = lp->loopid; - mbs.obits |= (1 << 10); + mbs.ibits |= (1 << 10); } else { mbs.param[1] = lp->loopid << 8; } @@ -3488,7 +3500,7 @@ } else { if (IS_2KLOGIN(isp)) { mbs.param[1] = tgt; - mbs.obits |= (1 << 10); + mbs.ibits |= (1 << 10); } else { mbs.param[1] = (tgt << 8); } @@ -3583,7 +3595,7 @@ if (IS_FC(isp)) { mbs.param[0] = MBOX_INIT_LIP; if (IS_2KLOGIN(isp)) { - mbs.obits |= (1 << 10); + mbs.ibits |= (1 << 10); } isp_mboxcmd(isp, &mbs, MBLOGALL); if (mbs.param[0] == MBOX_COMMAND_COMPLETE) { @@ -4865,7 +4877,7 @@ MEMZERO(&mbs, sizeof (mbs)); mbs.param[0] = MBOX_INIT_LIP; if (IS_2KLOGIN(isp)) { - mbs.obits |= (1 << 10); + mbs.ibits |= (1 << 10); } isp_mboxcmd_qnw(isp, &mbs, 1); } @@ -4946,6 +4958,7 @@ { mbreg_t mbs; uint16_t *ptr; + uint32_t offset; switch (isp->isp_lastmbxcmd) { case MBOX_WRITE_RAM_WORD: @@ -4974,33 +4987,37 @@ ptr = isp->isp_mbxworkp; switch (isp->isp_lastmbxcmd) { case MBOX_WRITE_RAM_WORD: - mbs.param[2] = *ptr++; - mbs.param[1] = isp->isp_mbxwrk1++; - break; - case MBOX_WRITE_RAM_WORD_EXTENDED: - mbs.param[2] = *ptr++; - mbs.param[1] = isp->isp_mbxwrk1++; - if (isp->isp_mbxwrk1 == 0) { - isp->isp_mbxwrk8++; - } - mbs.param[8] = isp->isp_mbxwrk8; + mbs.param[1] = isp->isp_mbxwrk1++;; + mbs.param[2] = *ptr++;; break; case MBOX_READ_RAM_WORD: *ptr++ = isp->isp_mboxtmp[2]; mbs.param[1] = isp->isp_mbxwrk1++; break; + case MBOX_WRITE_RAM_WORD_EXTENDED: + offset = isp->isp_mbxwrk1; + offset |= ((uint32_t) isp->isp_mbxwrk8 << 16); + + mbs.param[2] = *ptr++;; + mbs.param[1] = offset; + mbs.param[8] = offset >> 16; + isp->isp_mbxwrk1 = ++offset; + isp->isp_mbxwrk8 = offset >> 16; + break; case MBOX_READ_RAM_WORD_EXTENDED: + offset = isp->isp_mbxwrk1; + offset |= ((uint32_t) isp->isp_mbxwrk8 << 16); + *ptr++ = isp->isp_mboxtmp[2]; - mbs.param[1] = isp->isp_mbxwrk1++; - if (isp->isp_mbxwrk1 == 0) { - isp->isp_mbxwrk8++; - } - mbs.param[8] = isp->isp_mbxwrk8; + mbs.param[1] = offset; + mbs.param[8] = offset >> 16; + isp->isp_mbxwrk1 = ++offset; + isp->isp_mbxwrk8 = offset >> 16; break; } isp->isp_mbxworkp = ptr; + isp->isp_mbxwrk0--; mbs.param[0] = isp->isp_lastmbxcmd; - isp->isp_mbxwrk0 -= 1; isp_mboxcmd_qnw(isp, &mbs, 0); return (0); } @@ -5017,7 +5034,7 @@ ISPOPMAP(0x07, 0x07), /* 0x04: MBOX_WRITE_RAM_WORD */ ISPOPMAP(0x03, 0x07), /* 0x05: MBOX_READ_RAM_WORD */ ISPOPMAP(0x3f, 0x3f), /* 0x06: MBOX_MAILBOX_REG_TEST */ - ISPOPMAP(0x03, 0x07), /* 0x07: MBOX_VERIFY_CHECKSUM */ + ISPOPMAP(0x07, 0x07), /* 0x07: MBOX_VERIFY_CHECKSUM */ ISPOPMAP(0x01, 0x0f), /* 0x08: MBOX_ABOUT_FIRMWARE */ ISPOPMAP(0x00, 0x00), /* 0x09: */ ISPOPMAP(0x00, 0x00), /* 0x0a: */ @@ -5208,7 +5225,7 @@ static const uint32_t mbpfc[] = { ISPOPMAP(0x01, 0x01), /* 0x00: MBOX_NO_OP */ ISPOPMAP(0x1f, 0x01), /* 0x01: MBOX_LOAD_RAM */ - ISPOPMAP(0x03, 0x01), /* 0x02: MBOX_EXEC_FIRMWARE */ + ISPOPMAP(0x07, 0x01), /* 0x02: MBOX_EXEC_FIRMWARE */ ISPOPMAP(0xdf, 0x01), /* 0x03: MBOX_DUMP_RAM */ ISPOPMAP(0x07, 0x07), /* 0x04: MBOX_WRITE_RAM_WORD */ ISPOPMAP(0x03, 0x07), /* 0x05: MBOX_READ_RAM_WORD */ @@ -5219,9 +5236,9 @@ ISPOPMAP(0xdf, 0x01), /* 0x0a: DUMP RAM */ ISPOPMAP(0x00, 0x00), /* 0x0b: */ ISPOPMAP(0x00, 0x00), /* 0x0c: */ - ISPOPMAP(0x13, 0x01), /* 0x0d: MBOX_WRITE_RAM_WORD_EXTENDED) */ + ISPOPMAP(0x10f, 0x01), /* 0x0d: MBOX_WRITE_RAM_WORD_EXTENDED) */ ISPOPMAP(0x01, 0x05), /* 0x0e: MBOX_CHECK_FIRMWARE */ - ISPOPMAP(0x13, 0x05), /* 0x0f: MBOX_READ_RAM_WORD_EXTENDED */ + ISPOPMAP(0x10f, 0x05), /* 0x0f: MBOX_READ_RAM_WORD_EXTENDED */ ISPOPMAP(0x1f, 0x11), /* 0x10: MBOX_INIT_REQ_QUEUE */ ISPOPMAP(0x2f, 0x21), /* 0x11: MBOX_INIT_RES_QUEUE */ ISPOPMAP(0x0f, 0x01), /* 0x12: MBOX_EXECUTE_IOCB */ @@ -5511,7 +5528,7 @@ * command. */ if (nodelay) { - USEC_DELAY(1000); + USEC_DELAY(100); } } ==== //depot/projects/soc2006/rdivacky_linuxolator/dev/isp/isp_pci.c#4 (text+ko) ==== @@ -30,7 +30,7 @@ * FreeBSD Version. */ #include -__FBSDID("$FreeBSD: src/sys/dev/isp/isp_pci.c,v 1.118 2006/07/16 20:11:49 mjacob Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/isp/isp_pci.c,v 1.119 2006/08/14 05:36:26 mjacob Exp $"); #include #include @@ -1127,7 +1127,7 @@ #define IspVirt2Off(a, x) \ (((struct isp_pcisoftc *)a)->pci_poff[((x) & _BLK_REG_MASK) >> \ - _BLK_REG_SHFT] + ((x) & 0xff)) + _BLK_REG_SHFT] + ((x) & 0xfff)) #define BXR2(pcs, off) \ bus_space_read_2(pcs->pci_st, pcs->pci_sh, off) ==== //depot/projects/soc2006/rdivacky_linuxolator/dev/isp/ispvar.h#3 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/dev/isp/ispvar.h,v 1.76 2006/07/03 08:24:09 mjacob Exp $ */ +/* $FreeBSD: src/sys/dev/isp/ispvar.h,v 1.77 2006/08/14 05:35:41 mjacob Exp $ */ /*- * Soft Definitions for for Qlogic ISP SCSI adapters. * @@ -557,7 +557,8 @@ #define IS_FC(isp) ((isp)->isp_type & ISP_HA_FC) #define IS_2100(isp) ((isp)->isp_type == ISP_HA_FC_2100) #define IS_2200(isp) ((isp)->isp_type == ISP_HA_FC_2200) -#define IS_23XX(isp) ((isp)->isp_type >= ISP_HA_FC_2300) +#define IS_23XX(isp) \ + ((isp)->isp_type >= ISP_HA_FC_2300 && (isp)->isp_type < ISP_HA_FC_2400) #define IS_2300(isp) ((isp)->isp_type == ISP_HA_FC_2300) #define IS_2312(isp) ((isp)->isp_type == ISP_HA_FC_2312) #define IS_2322(isp) ((isp)->isp_type == ISP_HA_FC_2322) ==== //depot/projects/soc2006/rdivacky_linuxolator/dev/nfe/if_nfe.c#2 (text+ko) ==== @@ -21,7 +21,7 @@ /* Driver for NVIDIA nForce MCP Fast Ethernet and Gigabit Ethernet */ #include -__FBSDID("$FreeBSD: src/sys/dev/nfe/if_nfe.c,v 1.2 2006/06/26 23:41:07 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/nfe/if_nfe.c,v 1.3 2006/08/14 15:35:43 ru Exp $"); /* Uncomment the following line to enable polling. */ /* #define DEVICE_POLLING */ @@ -652,7 +652,7 @@ physaddr = jbuf->physaddr; } else { error = bus_dma_tag_create(sc->nfe_parent_tag, - PAGE_SIZE, 0, /* alignment, boundary */ + ETHER_ALIGN, 0, /* alignment, boundary */ BUS_SPACE_MAXADDR_32BIT,/* lowaddr */ BUS_SPACE_MAXADDR, /* highaddr */ NULL, NULL, /* filter, filterarg */ @@ -681,7 +681,7 @@ error = bus_dmamap_load(data->rx_data_tag, data->rx_data_map, mtod(data->m, void *), MCLBYTES, nfe_dma_map_segs, &data->rx_data_segs, BUS_DMA_NOWAIT); if (error != 0) { - printf("nfe%d: could not load rx buf DMA map", sc->nfe_unit); + printf("nfe%d: could not load rx buf DMA map\n", sc->nfe_unit); goto fail; } ==== //depot/projects/soc2006/rdivacky_linuxolator/i386/i386/pmap.c#8 (text+ko) ==== @@ -75,7 +75,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/i386/i386/pmap.c,v 1.574 2006/08/11 19:22:56 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/i386/i386/pmap.c,v 1.575 2006/08/14 15:39:41 jhb Exp $"); /* * Manages physical address maps. @@ -2443,10 +2443,6 @@ if (pmap == kernel_pmap) newpte |= pgeflag; - /* Preserve any caching attributes. */ - /* XXX: Should this be conditional on something? */ - newpte |= (origpte & (PG_PTE_PAT | PG_NC_PCD | PG_NC_PWT)); - /* * if the mapping or permission bits are different, we need * to update the pte. ==== //depot/projects/soc2006/rdivacky_linuxolator/kern/uipc_usrreq.c#8 (text+ko) ==== @@ -50,7 +50,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/uipc_usrreq.c,v 1.186 2006/08/07 12:02:42 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/uipc_usrreq.c,v 1.187 2006/08/13 23:16:59 rwatson Exp $"); #include "opt_mac.h" @@ -263,7 +263,6 @@ KASSERT(so->so_pcb == NULL, ("uipc_attach: so_pcb != NULL")); if (so->so_snd.sb_hiwat == 0 || so->so_rcv.sb_hiwat == 0) { switch (so->so_type) { - case SOCK_STREAM: error = soreserve(so, unpst_sendspace, unpst_recvspace); break; @@ -288,8 +287,8 @@ UNP_LOCK(); unp->unp_gencnt = ++unp_gencnt; unp_count++; - LIST_INSERT_HEAD(so->so_type == SOCK_DGRAM ? &unp_dhead - : &unp_shead, unp, unp_link); + LIST_INSERT_HEAD(so->so_type == SOCK_DGRAM ? &unp_dhead : &unp_shead, + unp, unp_link); UNP_UNLOCK(); return (0); @@ -1059,7 +1058,6 @@ KASSERT(unp2 != NULL, ("unp_connect2: unp2 == NULL")); unp->unp_conn = unp2; switch (so->so_type) { - case SOCK_DGRAM: LIST_INSERT_HEAD(&unp2->unp_refs, unp, unp_reflink); soisconnected(so); ==== //depot/projects/soc2006/rdivacky_linuxolator/modules/if_ef/Makefile#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/modules/if_ef/Makefile,v 1.13 2006/02/24 12:27:09 yar Exp $ +# $FreeBSD: src/sys/modules/if_ef/Makefile,v 1.14 2006/08/14 13:28:52 des Exp $ .PATH: ${.CURDIR}/../../net @@ -19,16 +19,16 @@ #ETHER_SNAP= opt_inet.h: - echo "#define INET 1" > opt_inet.h + echo "#define INET 1" > ${.TARGET} opt_ipx.h: - echo "#define IPX 1" > opt_ipx.h + echo "#define IPX 1" > ${.TARGET} opt_ef.h: - touch opt_ef.h + :> ${.TARGET} .for frame in ETHER_II ETHER_8023 ETHER_8022 ETHER_SNAP .if defined(${frame}) - echo "#define ${frame} 1" >> opt_ef.h + echo "#define ${frame} 1" >> ${.TARGET} .endif .endfor .endif ==== //depot/projects/soc2006/rdivacky_linuxolator/modules/if_ppp/Makefile#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/modules/if_ppp/Makefile,v 1.35 2006/02/27 16:56:22 wkoszek Exp $ +# $FreeBSD: src/sys/modules/if_ppp/Makefile,v 1.36 2006/08/14 13:28:53 des Exp $ .PATH: ${.CURDIR}/../../net @@ -22,16 +22,16 @@ .if !defined(KERNBUILDDIR) .if ${PPP_INET} > 0 opt_inet.h: - echo "#define INET 1" >> ${.TARGET} + echo "#define INET 1" > ${.TARGET} .endif .if ${PPP_IPX} > 0 opt_ipx.h: - echo "#define IPX ${PPP_IPX}" >> ${.TARGET} + echo "#define IPX ${PPP_IPX}" > ${.TARGET} .endif opt_ppp.h: - touch ${.TARGET} + :> ${.TARGET} .if ${PPP_BSDCOMP} > 0 echo "#define PPP_BSDCOMP ${PPP_BSDCOMP}" >> ${.TARGET} .endif ==== //depot/projects/soc2006/rdivacky_linuxolator/modules/netgraph/mppc/Makefile#2 (text+ko) ==== @@ -1,5 +1,5 @@ # $Whistle: Makefile,v 1.1 1999/12/08 20:20:39 archie Exp $ -# $FreeBSD: src/sys/modules/netgraph/mppc/Makefile,v 1.13 2005/10/14 23:30:13 yar Exp $ +# $FreeBSD: src/sys/modules/netgraph/mppc/Makefile,v 1.14 2006/08/14 13:28:53 des Exp $ KMOD= ng_mppc SRCS= ng_mppc.c opt_netgraph.h @@ -20,7 +20,7 @@ .if !defined(KERNBUILDDIR) opt_netgraph.h: - touch ${.TARGET} + :> ${.TARGET} .if ${NETGRAPH_MPPC_COMPRESSION} > 0 echo "#define NETGRAPH_MPPC_COMPRESSION 1" >> ${.TARGET} .endif ==== //depot/projects/soc2006/rdivacky_linuxolator/modules/sound/sound/Makefile#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/modules/sound/sound/Makefile,v 1.18 2006/05/27 16:32:05 netchild Exp $ +# $FreeBSD: src/sys/modules/sound/sound/Makefile,v 1.19 2006/08/14 13:28:53 des Exp $ .PATH: ${.CURDIR}/../../../dev/sound/pcm .PATH: ${.CURDIR}/../../../dev/sound/midi @@ -22,7 +22,7 @@ # existing one from KERNBUILDDIR which possibly has DEV_ISA defined so # sound.ko is always built without isadma support. >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Aug 14 17:16:10 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A536F16A4DF; Mon, 14 Aug 2006 17:16:10 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 481A316A4DD for ; Mon, 14 Aug 2006 17:16:10 +0000 (UTC) (envelope-from bushman@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id EBC1D43D49 for ; Mon, 14 Aug 2006 17:15:58 +0000 (GMT) (envelope-from bushman@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7EHFwvY010274 for ; Mon, 14 Aug 2006 17:15:58 GMT (envelope-from bushman@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7EHFw8R010271 for perforce@freebsd.org; Mon, 14 Aug 2006 17:15:58 GMT (envelope-from bushman@freebsd.org) Date: Mon, 14 Aug 2006 17:15:58 GMT Message-Id: <200608141715.k7EHFw8R010271@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bushman@freebsd.org using -f From: Michael Bushkov To: Perforce Change Reviews Cc: Subject: PERFORCE change 103872 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 14 Aug 2006 17:16:10 -0000 http://perforce.freebsd.org/chv.cgi?CH=103872 Change 103872 by bushman@bushman_nss_ldap_cached on 2006/08/14 17:15:41 Branch for OpenLDAP integration created Affected files ... .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/Makefile#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/amd.map#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/apmd.conf#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/auth.conf#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/bluetooth/Makefile#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/bluetooth/hcsecd.conf#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/bluetooth/hosts#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/bluetooth/protocols#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/cached.conf#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/crontab#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/csh.cshrc#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/csh.login#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/csh.logout#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/defaults/Makefile#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/defaults/bluetooth.device.conf#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/defaults/devfs.rules#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/defaults/pccard.conf#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/defaults/periodic.conf#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/defaults/rc.conf#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/devd.conf#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/devfs.conf#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/dhclient.conf#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/disktab#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/etc.alpha/ttys#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/etc.amd64/ttys#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/etc.arm/ttys#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/etc.i386/ttys#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/etc.ia64/ttys#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/etc.powerpc/ttys#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/etc.sparc64/ttys#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/fbtab#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/ftpusers#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/gettytab#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/group#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/gss/Makefile#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/gss/mech#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/gss/qop#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/hosts#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/hosts.allow#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/hosts.equiv#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/hosts.lpd#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/inetd.conf#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/isdn/Makefile#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/isdn/answer#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/isdn/holidays.D#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/isdn/isdnd.rates.A#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/isdn/isdnd.rates.D#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/isdn/isdnd.rates.F#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/isdn/isdnd.rates.L#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/isdn/isdnd.rates.UK.BT#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/isdn/isdnd.rc.sample#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/isdn/isdntel.alias.sample#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/isdn/isdntel.sh#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/isdn/record#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/isdn/tell#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/isdn/tell-record#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/isdn/unknown_incoming#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/login.access#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/login.conf#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/mac.conf#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/mail/Makefile#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/mail/README#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/mail/access.sample#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/mail/aliases#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/mail/mailer.conf#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/mail/mailertable.sample#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/mail/virtusertable.sample#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/man.alias#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/master.passwd#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/minfree#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/motd#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/mtree/BIND.chroot.dist#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/mtree/BIND.include.dist#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/mtree/BSD.include.dist#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/mtree/BSD.local.dist#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/mtree/BSD.release.dist#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/mtree/BSD.root.dist#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/mtree/BSD.sendmail.dist#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/mtree/BSD.usr.dist#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/mtree/BSD.var.dist#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/mtree/BSD.x11-4.dist#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/mtree/BSD.x11.dist#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/mtree/Makefile#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/mtree/README#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/namedb/Makefile#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/namedb/PROTO.localhost-v6.rev#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/namedb/PROTO.localhost.rev#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/namedb/make-localhost#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/namedb/named.conf#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/namedb/named.root#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/netconfig#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/netstart#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/network.subr#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/networks#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/newsyslog.conf#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/nls.alias#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/nsmb.conf#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/nsswitch.conf#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/opieaccess#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/pam.d/Makefile#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/pam.d/README#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/pam.d/convert.pl#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/pam.d/ftpd#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/pam.d/gdm#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/pam.d/imap#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/pam.d/kde#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/pam.d/login#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/pam.d/other#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/pam.d/passwd#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/pam.d/pop3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/pam.d/rsh#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/pam.d/sshd#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/pam.d/su#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/pam.d/system#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/pam.d/telnetd#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/pam.d/xdm#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/pccard_ether#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/periodic/Makefile#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/periodic/Makefile.inc#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/periodic/daily/100.clean-disks#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/periodic/daily/110.clean-tmps#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/periodic/daily/120.clean-preserve#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/periodic/daily/130.clean-msgs#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/periodic/daily/140.clean-rwho#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/periodic/daily/150.clean-hoststat#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/periodic/daily/200.backup-passwd#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/periodic/daily/210.backup-aliases#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/periodic/daily/300.calendar#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/periodic/daily/310.accounting#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/periodic/daily/330.news#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/periodic/daily/400.status-disks#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/periodic/daily/405.status-ata-raid#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/periodic/daily/406.status-gmirror#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/periodic/daily/407.status-graid3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/periodic/daily/408.status-gstripe#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/periodic/daily/409.status-gconcat#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/periodic/daily/420.status-network#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/periodic/daily/430.status-rwho#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/periodic/daily/440.status-mailq#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/periodic/daily/450.status-security#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/periodic/daily/460.status-mail-rejects#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/periodic/daily/470.status-named#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/periodic/daily/500.queuerun#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/periodic/daily/999.local#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/periodic/daily/Makefile#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/periodic/monthly/200.accounting#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/periodic/monthly/999.local#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/periodic/monthly/Makefile#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/periodic/security/100.chksetuid#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/periodic/security/200.chkmounts#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/periodic/security/300.chkuid0#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/periodic/security/400.passwdless#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/periodic/security/500.ipfwdenied#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/periodic/security/510.ipfdenied#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/periodic/security/520.pfdenied#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/periodic/security/550.ipfwlimit#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/periodic/security/610.ipf6denied#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/periodic/security/700.kernelmsg#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/periodic/security/800.loginfail#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/periodic/security/900.tcpwrap#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/periodic/security/Makefile#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/periodic/security/security.functions#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/periodic/weekly/120.clean-kvmdb#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/periodic/weekly/310.locate#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/periodic/weekly/320.whatis#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/periodic/weekly/330.catman#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/periodic/weekly/340.noid#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/periodic/weekly/400.status-pkg#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/periodic/weekly/999.local#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/periodic/weekly/Makefile#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/pf.conf#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/pf.os#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/phones#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/portsnap.conf#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/ppp/ppp.conf#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/printcap#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/profile#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/protocols#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/rc#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/rc.bsdextended#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/rc.d/DAEMON#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/rc.d/LOGIN#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/rc.d/Makefile#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/rc.d/NETWORKING#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/rc.d/SERVERS#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/rc.d/abi#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/rc.d/accounting#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/rc.d/addswap#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/rc.d/adjkerntz#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/rc.d/amd#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/rc.d/apm#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/rc.d/apmd#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/rc.d/archdep#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/rc.d/atm1#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/rc.d/atm2#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/rc.d/atm3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/rc.d/auditd#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/rc.d/bgfsck#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/rc.d/bluetooth#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/rc.d/bootconf.sh#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/rc.d/bootparams#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/rc.d/bridge#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/rc.d/bsnmpd#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/rc.d/cached#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/rc.d/ccd#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/rc.d/cleanvar#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/rc.d/cleartmp#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/rc.d/cron#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/rc.d/devd#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/rc.d/devfs#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/rc.d/dhclient#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/rc.d/dmesg#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/rc.d/dumpon#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/rc.d/early.sh#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/rc.d/encswap#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/rc.d/fsck#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/rc.d/ftpd#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/rc.d/gbde#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/rc.d/geli#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/rc.d/geli2#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/rc.d/hcsecd#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/rc.d/hostapd#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/rc.d/hostname#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/rc.d/inetd#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/rc.d/initrandom#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/rc.d/ip6addrctl#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/rc.d/ip6fw#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/rc.d/ipfilter#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/rc.d/ipfs#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/rc.d/ipfw#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/rc.d/ipmon#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/rc.d/ipnat#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/rc.d/ipsec#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/rc.d/ipxrouted#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/rc.d/isdnd#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/rc.d/jail#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/rc.d/kadmind#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/rc.d/kerberos#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/rc.d/kernel#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/rc.d/keyserv#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/rc.d/kldxref#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/rc.d/kpasswdd#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/rc.d/ldconfig#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/rc.d/local#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/rc.d/localpkg#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/rc.d/lpd#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/rc.d/mdconfig#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/rc.d/mdconfig2#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/rc.d/mixer#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/rc.d/motd#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/rc.d/mountcritlocal#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/rc.d/mountcritremote#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/rc.d/mountd#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/rc.d/mountlate#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/rc.d/moused#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/rc.d/mroute6d#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/rc.d/mrouted#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/rc.d/msgs#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/rc.d/named#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/rc.d/natd#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/rc.d/netif#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/rc.d/netoptions#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/rc.d/network_ipv6#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/rc.d/newsyslog#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/rc.d/nfsclient#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/rc.d/nfsd#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/rc.d/nfslocking#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/rc.d/nfsserver#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/rc.d/nisdomain#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/rc.d/nsswitch#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/rc.d/ntpd#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/rc.d/ntpdate#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/rc.d/othermta#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/rc.d/pf#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/rc.d/pflog#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/rc.d/pfsync#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/rc.d/power_profile#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/rc.d/powerd#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/rc.d/ppp#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/rc.d/pppoed#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/rc.d/pwcheck#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/rc.d/quota#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/rc.d/ramdisk#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/rc.d/ramdisk-own#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/rc.d/random#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/rc.d/rarpd#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/rc.d/resolv#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/rc.d/root#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/rc.d/route6d#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/rc.d/routed#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/rc.d/routing#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/rc.d/rpcbind#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/rc.d/rtadvd#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/rc.d/rwho#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/rc.d/savecore#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/rc.d/sdpd#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/rc.d/securelevel#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/rc.d/sendmail#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/rc.d/serial#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/rc.d/sppp#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/rc.d/sshd#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/rc.d/swap1#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/rc.d/syscons#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/rc.d/sysctl#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/rc.d/syslogd#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/rc.d/timed#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/rc.d/tmp#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/rc.d/ugidfw#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/rc.d/var#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/rc.d/virecover#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/rc.d/watchdogd#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/rc.d/wpa_supplicant#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/rc.d/ypbind#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/rc.d/yppasswdd#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/rc.d/ypserv#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/rc.d/ypset#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/rc.d/ypupdated#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/rc.d/ypxfrd#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/rc.firewall#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/rc.firewall6#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/rc.initdiskless#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/rc.resume#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/rc.sendmail#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/rc.shutdown#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/rc.subr#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/rc.suspend#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/remote#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/root/dot.cshrc#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/root/dot.k5login#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/root/dot.login#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/root/dot.profile#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/rpc#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/sendmail/Makefile#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/sendmail/freebsd.mc#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/sendmail/freebsd.submit.mc#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/sendmail/freefall.mc#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/services#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/shells#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/snmpd.config#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/sysctl.conf#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/syslog.conf#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/termcap.small#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/include/Makefile#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/include/_ctype.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/include/a.out.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/include/ar.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/include/arpa/Makefile#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/include/arpa/ftp.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/include/arpa/inet.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/include/arpa/nameser.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/include/arpa/nameser_compat.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/include/arpa/telnet.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/include/arpa/tftp.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/include/assert.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/include/bitstring.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/include/complex.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/include/cpio.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/include/ctype.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/include/db.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/include/dirent.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/include/dlfcn.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/include/elf-hints.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/include/elf.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/include/err.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/include/fmtmsg.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/include/fnmatch.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/include/fstab.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/include/fts.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/include/ftw.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/include/getopt.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/include/glob.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/include/grp.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/include/gssapi.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/include/gssapi/Makefile#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/include/gssapi/gssapi.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/include/hesiod.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/include/histedit.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/include/ieeefp.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/include/ifaddrs.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/include/inttypes.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/include/iso646.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/include/kenv.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/include/langinfo.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/include/libgen.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/include/limits.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/include/link.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/include/locale.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/include/malloc.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/include/malloc_np.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/include/memory.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/include/monetary.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/include/mpool.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/include/mqueue.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/include/ndbm.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/include/netconfig.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/include/netdb.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/include/nl_types.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/include/nlist.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/include/nss.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/include/nsswitch.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/include/objformat.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/include/paths.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/include/printf.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/include/proc_service.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/include/protocols/Makefile#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/include/protocols/dumprestore.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/include/protocols/routed.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/include/protocols/rwhod.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/include/protocols/talkd.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/include/protocols/timed.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/include/pthread.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/include/pthread_np.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/include/pwd.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/include/ranlib.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/include/readpassphrase.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/include/regex.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/include/regexp.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/include/res_update.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/include/resolv.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/include/rpc/Makefile#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/include/rpc/auth.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/include/rpc/auth_des.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/include/rpc/auth_kerb.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/include/rpc/auth_unix.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/include/rpc/clnt.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/include/rpc/clnt_soc.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/include/rpc/clnt_stat.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/include/rpc/des.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/include/rpc/des_crypt.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/include/rpc/nettype.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/include/rpc/pmap_clnt.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/include/rpc/pmap_prot.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/include/rpc/pmap_rmt.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/include/rpc/raw.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/include/rpc/rpc.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/include/rpc/rpc_com.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/include/rpc/rpc_msg.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/include/rpc/rpcb_clnt.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/include/rpc/rpcb_prot.x#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/include/rpc/rpcent.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/include/rpc/svc.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/include/rpc/svc_auth.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/include/rpc/svc_dg.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/include/rpc/svc_soc.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/include/rpc/types.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/include/rpc/xdr.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/include/rpcsvc/Makefile#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/include/rpcsvc/bootparam_prot.x#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/include/rpcsvc/crypt.x#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/include/rpcsvc/key_prot.x#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/include/rpcsvc/klm_prot.x#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/include/rpcsvc/mount.x#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/include/rpcsvc/nfs_prot.x#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/include/rpcsvc/nis.x#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/include/rpcsvc/nis_cache.x#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/include/rpcsvc/nis_callback.x#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/include/rpcsvc/nis_db.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/include/rpcsvc/nis_object.x#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/include/rpcsvc/nis_tags.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/include/rpcsvc/nislib.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/include/rpcsvc/nlm_prot.x#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/include/rpcsvc/pmap_prot.x#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/include/rpcsvc/rex.x#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/include/rpcsvc/rnusers.x#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/include/rpcsvc/rquota.x#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/include/rpcsvc/rstat.x#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/include/rpcsvc/rwall.x#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/include/rpcsvc/sm_inter.x#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/include/rpcsvc/spray.x#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/include/rpcsvc/yp.x#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/include/rpcsvc/yp_prot.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/include/rpcsvc/ypclnt.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/include/rpcsvc/yppasswd.x#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/include/rpcsvc/ypupdate_prot.x#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/include/rpcsvc/ypxfrd.x#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/include/runetype.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/include/search.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/include/setjmp.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/include/sgtty.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/include/signal.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/include/stab.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/include/stdbool.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/include/stddef.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/include/stdio.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/include/stdlib.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/include/string.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/include/stringlist.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/include/strings.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/include/sysexits.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/include/tar.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/include/tgmath.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/include/time.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/include/timeconv.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/include/timers.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/include/ttyent.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/include/ulimit.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/include/unistd.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/include/utime.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/include/utmp.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/include/uuid.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/include/varargs.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/include/vis.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/include/wchar.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/include/wctype.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/include/wordexp.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/Makefile#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/Makefile.inc#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/Makefile#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/Versions.def#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/alpha/Makefile.inc#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/alpha/SYS.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/alpha/Symbol.map#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/alpha/_fpmath.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/alpha/arith.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/alpha/gen/Makefile.inc#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/alpha/gen/_ctx_start.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/alpha/gen/_set_tp.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/alpha/gen/_setjmp.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/alpha/gen/divrem.m4#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/alpha/gen/fabs.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/alpha/gen/flt_rounds.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/alpha/gen/fpgetmask.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/alpha/gen/fpgetround.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/alpha/gen/fpgetsticky.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/alpha/gen/fpsetmask.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/alpha/gen/fpsetround.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/alpha/gen/infinity.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/alpha/gen/makecontext.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/alpha/gen/modf.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/alpha/gen/rfork_thread.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/alpha/gen/setjmp.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/alpha/gen/signalcontext.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/alpha/gen/sigsetjmp.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/alpha/net/Makefile.inc#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/alpha/net/byte_swap_2.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/alpha/net/byte_swap_4.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/alpha/net/htonl.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/alpha/net/htons.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/alpha/net/ntohl.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/alpha/net/ntohs.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/alpha/stdlib/Makefile.inc#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/alpha/string/Makefile.inc#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/alpha/string/bcopy.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/alpha/string/bzero.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/alpha/string/ffs.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/alpha/string/memcpy.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/alpha/string/memmove.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/alpha/sys/Makefile.inc#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/alpha/sys/Ovfork.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/alpha/sys/brk.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/alpha/sys/cerror.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/alpha/sys/exect.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/alpha/sys/fork.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/alpha/sys/pipe.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/alpha/sys/ptrace.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/alpha/sys/sbrk.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/alpha/sys/setlogin.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/alpha/sys/sigreturn.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/amd64/Makefile.inc#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/amd64/SYS.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/amd64/Symbol.map#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/amd64/_fpmath.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/amd64/arith.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/amd64/gen/Makefile.inc#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/amd64/gen/_set_tp.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/amd64/gen/_setjmp.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/amd64/gen/fabs.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/amd64/gen/flt_rounds.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/amd64/gen/fpgetmask.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/amd64/gen/fpgetprec.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/amd64/gen/fpgetround.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/amd64/gen/fpgetsticky.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/amd64/gen/fpsetmask.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/amd64/gen/fpsetprec.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/amd64/gen/fpsetround.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/amd64/gen/infinity.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/amd64/gen/ldexp.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/amd64/gen/makecontext.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/amd64/gen/modf.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/amd64/gen/rfork_thread.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/amd64/gen/setjmp.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/amd64/gen/signalcontext.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/amd64/gen/sigsetjmp.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/amd64/net/Makefile.inc#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/amd64/net/htonl.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/amd64/net/htons.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/amd64/net/ntohl.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/amd64/net/ntohs.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/amd64/string/Makefile.inc#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/amd64/string/bcmp.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/amd64/string/bcopy.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/amd64/string/bzero.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/amd64/string/memcmp.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/amd64/string/memcpy.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/amd64/string/memmove.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/amd64/string/memset.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/amd64/string/strcat.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/amd64/string/strcmp.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/amd64/string/strcpy.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/amd64/sys/Makefile.inc#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/amd64/sys/amd64_get_fsbase.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/amd64/sys/amd64_get_gsbase.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/amd64/sys/amd64_set_fsbase.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/amd64/sys/amd64_set_gsbase.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/amd64/sys/brk.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/amd64/sys/cerror.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/amd64/sys/exect.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/amd64/sys/getcontext.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/amd64/sys/pipe.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/amd64/sys/ptrace.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/amd64/sys/reboot.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/amd64/sys/sbrk.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/amd64/sys/setlogin.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/amd64/sys/sigreturn.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/amd64/sys/vfork.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/arm/Makefile.inc#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/arm/SYS.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/arm/Symbol.map#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/arm/_fpmath.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/arm/arith.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/arm/gen/Makefile.inc#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/arm/gen/_ctx_start.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/arm/gen/_set_tp.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/arm/gen/_setjmp.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/arm/gen/alloca.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/arm/gen/divsi3.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/arm/gen/fabs.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/arm/gen/infinity.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/arm/gen/makecontext.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/arm/gen/modf.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/arm/gen/setjmp.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/arm/gen/signalcontext.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/arm/gen/sigsetjmp.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/arm/net/Makefile.inc#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/arm/net/htonl.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/arm/net/htons.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/arm/net/ntohl.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/arm/net/ntohs.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/arm/softfloat/arm-gcc.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/arm/softfloat/milieu.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/arm/softfloat/softfloat.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/arm/stdlib/Makefile.inc#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/arm/string/Makefile.inc#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/arm/string/bcopy.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/arm/string/bzero.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/arm/string/ffs.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/arm/string/memcmp.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/arm/string/memcpy.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/arm/string/memcpy_arm.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/arm/string/memcpy_xscale.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/arm/string/memmove.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/arm/string/memset.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/arm/string/strcmp.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/arm/string/strlen.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/arm/string/strncmp.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/arm/sys/Makefile.inc#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/arm/sys/Ovfork.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/arm/sys/brk.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/arm/sys/cerror.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/arm/sys/fork.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/arm/sys/pipe.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/arm/sys/ptrace.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/arm/sys/sbrk.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/arm/sys/shmat.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/arm/sys/sigreturn.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/arm/sys/syscall.S#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/compat-43/Makefile.inc#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/compat-43/Symbol.map#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/compat-43/creat.2#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/compat-43/creat.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/compat-43/gethostid.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/compat-43/gethostid.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/compat-43/getwd.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/compat-43/killpg.2#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/compat-43/killpg.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/compat-43/sethostid.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/compat-43/setpgrp.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/compat-43/setrgid.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/compat-43/setruid.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/compat-43/setruid.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/compat-43/sigcompat.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/compat-43/sigpause.2#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/compat-43/sigsetmask.2#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/compat-43/sigvec.2#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/db/Makefile.inc#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/db/README#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/db/Symbol.map#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/db/btree/Makefile.inc#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/db/btree/bt_close.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/db/btree/bt_conv.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/db/btree/bt_debug.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/db/btree/bt_delete.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/db/btree/bt_get.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/db/btree/bt_open.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/db/btree/bt_overflow.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/db/btree/bt_page.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/db/btree/bt_put.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/db/btree/bt_search.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/db/btree/bt_seq.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/db/btree/bt_split.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/db/btree/bt_utils.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/db/btree/btree.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/db/btree/extern.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/db/changelog#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/db/db/Makefile.inc#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/db/db/db.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/db/docs/hash.usenix.ps#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/db/docs/libtp.usenix.ps#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/db/hash/Makefile.inc#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/db/hash/README#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/db/hash/extern.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/db/hash/hash.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/db/hash/hash.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/db/hash/hash_bigkey.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/db/hash/hash_buf.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/db/hash/hash_func.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/db/hash/hash_log2.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/db/hash/hash_page.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/db/hash/ndbm.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/db/hash/page.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/db/man/Makefile.inc#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/db/man/btree.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/db/man/dbm.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/db/man/dbopen.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/db/man/hash.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/db/man/mpool.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/db/man/recno.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/db/mpool/Makefile.inc#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/db/mpool/README#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/db/mpool/mpool.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/db/mpool/mpool.libtp#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/db/recno/Makefile.inc#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/db/recno/extern.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/db/recno/rec_close.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/db/recno/rec_delete.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/db/recno/rec_get.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/db/recno/rec_open.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/db/recno/rec_put.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/db/recno/rec_search.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/db/recno/rec_seq.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/db/recno/rec_utils.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/db/recno/recno.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/db/test/Makefile#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/db/test/README#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/db/test/btree.tests/main.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/db/test/dbtest.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/db/test/hash.tests/driver2.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/db/test/hash.tests/makedb.sh#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/db/test/hash.tests/tcreat3.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/db/test/hash.tests/tdel.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/db/test/hash.tests/testit#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/db/test/hash.tests/thash4.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/db/test/hash.tests/tread2.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/db/test/hash.tests/tseq.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/db/test/hash.tests/tverify.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/db/test/run.test#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gdtoa/Makefile.inc#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gdtoa/Symbol.map#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gdtoa/_hdtoa.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gdtoa/_ldtoa.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gdtoa/glue.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gdtoa/machdep_ldisQ.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gdtoa/machdep_ldisd.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gdtoa/machdep_ldisx.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/Makefile.inc#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/Symbol.map#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/__xuname.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/_pthread_stubs.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/_rand48.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/_spinlock_stub.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/_thread_init.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/alarm.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/alarm.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/arc4random.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/arc4random.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/assert.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/basename.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/basename.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/check_utility_compat.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/check_utility_compat.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/clock.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/clock.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/closedir.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/confstr.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/confstr.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/crypt.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/ctermid.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/ctermid.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/daemon.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/daemon.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/devname.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/devname.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/directory.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/dirname.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/dirname.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/disklabel.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/dladdr.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/dlfcn.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/dlfunc.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/dlinfo.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/dllockinit.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/dlopen.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/drand48.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/erand48.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/err.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/err.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/errlst.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/errno.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/exec.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/exec.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/fmtcheck.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/fmtcheck.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/fmtmsg.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/fmtmsg.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/fnmatch.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/fnmatch.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/fpclassify.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/fpclassify.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/frexp.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/frexp.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/fstab.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/ftok.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/ftok.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/fts.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/fts.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/ftw.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/ftw.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/getbootfile.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/getbootfile.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/getbsize.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/getbsize.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/getcap.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/getcap.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/getcontext.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/getcwd.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/getcwd.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/getdiskbyname.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/getdomainname.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/getdomainname.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/getfsent.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/getgrent.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/getgrent.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/getgrouplist.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/getgrouplist.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/gethostname.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/gethostname.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/getloadavg.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/getloadavg.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/getlogin.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/getmntinfo.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/getmntinfo.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/getnetgrent.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/getnetgrent.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/getobjformat.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/getobjformat.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/getosreldate.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/getosreldate.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/getpagesize.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/getpagesize.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/getpass.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/getpeereid.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/getpeereid.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/getprogname.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/getprogname.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/getpwent.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/getpwent.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/getttyent.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/getttyent.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/getusershell.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/getusershell.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/getvfsbyname.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/getvfsbyname.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/glob.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/glob.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/initgroups.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/initgroups.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/isatty.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/isgreater.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/isinf.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/isnan.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/jrand48.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/lcong48.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/ldexp.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/ldexp.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/lockf.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/lockf.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/lrand48.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/makecontext.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/modf.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/mrand48.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/msgctl.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/msgget.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/msgrcv.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/msgsnd.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/nftw.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/nice.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/nice.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/nlist.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/nlist.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/nrand48.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/opendir.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/pause.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/pause.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/pmadvise.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/popen.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/popen.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/posixshm.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/pselect.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/pselect.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/psignal.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/psignal.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/pw_scan.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/pw_scan.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/pwcache.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/pwcache.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/raise.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/raise.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/rand48.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/rand48.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/readdir.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/readpassphrase.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/readpassphrase.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/rewinddir.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/rfork_thread.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/scandir.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/scandir.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/seed48.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/seekdir.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/sem.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/sem_destroy.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/sem_getvalue.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/sem_init.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/sem_open.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/sem_post.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/sem_wait.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/semctl.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/setdomainname.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/sethostname.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/setjmp.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/setjmperr.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/setmode.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/setmode.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/setproctitle.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/setproctitle.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/setprogname.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/shm_open.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/siginterrupt.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/siginterrupt.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/siglist.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/signal.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/signal.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/sigsetops.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/sigsetops.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/sleep.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/sleep.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/srand48.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/statvfs.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/statvfs.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/stringlist.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/stringlist.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/strtofflags.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/strtofflags.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/swapcontext.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/sysconf.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/sysconf.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/sysctl.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/sysctl.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/sysctlbyname.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/sysctlnametomib.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/syslog.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/syslog.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/tcgetpgrp.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/tcsendbreak.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/tcsetattr.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/tcsetpgrp.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/telldir.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/telldir.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/termios.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/time.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/time.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/times.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/times.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/timezone.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/timezone.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/tls.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/ttyname.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/ttyname.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/ttyslot.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/tzset.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/ualarm.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/ualarm.c#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/ucontext.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/ulimit.3#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/gen/ulimit.c#1 branch >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Aug 14 17:27:16 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C9B0E16A4E0; Mon, 14 Aug 2006 17:27:16 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 A67FB16A4DE for ; Mon, 14 Aug 2006 17:27:16 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5D5D343D45 for ; Mon, 14 Aug 2006 17:27:16 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7EHRGMD011074 for ; Mon, 14 Aug 2006 17:27:16 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7EHRFRN011071 for perforce@freebsd.org; Mon, 14 Aug 2006 17:27:15 GMT (envelope-from jhb@freebsd.org) Date: Mon, 14 Aug 2006 17:27:15 GMT Message-Id: <200608141727.k7EHRFRN011071@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Cc: Subject: PERFORCE change 103879 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 14 Aug 2006 17:27:17 -0000 http://perforce.freebsd.org/chv.cgi?CH=103879 Change 103879 by jhb@jhb_mutex on 2006/08/14 17:26:50 Add 'show lockmgr'. Affected files ... .. //depot/projects/smpng/sys/kern/kern_lock.c#49 edit Differences ... ==== //depot/projects/smpng/sys/kern/kern_lock.c#49 (text+ko) ==== @@ -616,4 +616,16 @@ } return (1); } + +DB_SHOW_COMMAND(lockmgr, db_show_lockmgr) +{ + struct lock *lkp; + + if (!have_addr) + return; + lkp = (struct lock *)addr; + + /* XXX: Should use db_printf(). */ + lockmgr_printinfo(lkp); +} #endif From owner-p4-projects@FreeBSD.ORG Mon Aug 14 18:25:47 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7771216A4E8; Mon, 14 Aug 2006 18:25:47 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 5250216A4E6 for ; Mon, 14 Aug 2006 18:25:47 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 519BC43D69 for ; Mon, 14 Aug 2006 18:25:34 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7EIPYhd015923 for ; Mon, 14 Aug 2006 18:25:34 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7EIPYVb015918 for perforce@freebsd.org; Mon, 14 Aug 2006 18:25:34 GMT (envelope-from jhb@freebsd.org) Date: Mon, 14 Aug 2006 18:25:34 GMT Message-Id: <200608141825.k7EIPYVb015918@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Cc: Subject: PERFORCE change 103884 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 14 Aug 2006 18:25:47 -0000 http://perforce.freebsd.org/chv.cgi?CH=103884 Change 103884 by jhb@jhb_mutex on 2006/08/14 18:25:33 Just do it inline using db_printf() and showing more info about the owning thread. Affected files ... .. //depot/projects/smpng/sys/kern/kern_lock.c#50 edit Differences ... ==== //depot/projects/smpng/sys/kern/kern_lock.c#50 (text+ko) ==== @@ -619,13 +619,25 @@ DB_SHOW_COMMAND(lockmgr, db_show_lockmgr) { + struct thread *td; struct lock *lkp; if (!have_addr) return; lkp = (struct lock *)addr; - /* XXX: Should use db_printf(). */ - lockmgr_printinfo(lkp); + db_printf("lock type: %s\n", lkp->lk_wmesg); + db_printf("state: "); + if (lkp->lk_sharecount) + db_printf("SHARED (count %d)\n", lkp->lk_sharecount); + else if (lkp->lk_flags & LK_HAVE_EXCL) { + td = lkp->lk_lockholder; + db_printf("EXCL (count %d) %p ", lkp->lk_exclusivecount, td); + db_printf("(tid %d, pid %d, \"%s\")\n", td->td_tid, + td->td_proc->p_pid, td->td_proc->p_comm); + } else + db_printf("UNLOCKED\n"); + if (lkp->lk_waitcount > 0) + db_printf("waiters: %d\n", lkp->lk_waitcount); } #endif From owner-p4-projects@FreeBSD.ORG Mon Aug 14 18:27:39 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CD4E916A4E1; Mon, 14 Aug 2006 18:27:38 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 7868D16A517 for ; Mon, 14 Aug 2006 18:27:38 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 437E943D72 for ; Mon, 14 Aug 2006 18:27:38 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7EIRceZ016064 for ; Mon, 14 Aug 2006 18:27:38 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7EIRc6f016061 for perforce@freebsd.org; Mon, 14 Aug 2006 18:27:38 GMT (envelope-from jhb@freebsd.org) Date: Mon, 14 Aug 2006 18:27:38 GMT Message-Id: <200608141827.k7EIRc6f016061@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Cc: Subject: PERFORCE change 103886 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 14 Aug 2006 18:27:39 -0000 http://perforce.freebsd.org/chv.cgi?CH=103886 Change 103886 by jhb@jhb_mutex on 2006/08/14 18:26:42 Use shared locks for the second lockers in the mixed test. Affected files ... .. //depot/projects/smpng/sys/modules/crash2/crash2.c#11 edit Differences ... ==== //depot/projects/smpng/sys/modules/crash2/crash2.c#11 (text+ko) ==== @@ -112,9 +112,9 @@ lockmgr(locks[thread % 4], LK_EXCLUSIVE, NULL, curthread); tsleep(sxs, 0, "slp_dead", hz/10); if (thread % 2) - lockmgr(locks[(thread + 1) % 4], LK_EXCLUSIVE, NULL, curthread); + lockmgr(locks[(thread + 1) % 4], LK_SHARED, NULL, curthread); else - sx_xlock(sxs[(thread + 1) % 4]); + sx_slock(sxs[(thread + 1) % 4]); } CRASH2_EVENT("sx and lockmgr cycle", sleep_deadlock, sleep_deadlock, sleep_deadlock, sleep_deadlock); From owner-p4-projects@FreeBSD.ORG Mon Aug 14 19:24:20 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E205616A4E5; Mon, 14 Aug 2006 19:24:19 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 BE62116A4DF for ; Mon, 14 Aug 2006 19:24:19 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0520943D7E for ; Mon, 14 Aug 2006 19:24:14 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7EJOD8v021510 for ; Mon, 14 Aug 2006 19:24:13 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7EJODdK021507 for perforce@freebsd.org; Mon, 14 Aug 2006 19:24:13 GMT (envelope-from jhb@freebsd.org) Date: Mon, 14 Aug 2006 19:24:13 GMT Message-Id: <200608141924.k7EJODdK021507@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Cc: Subject: PERFORCE change 103890 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 14 Aug 2006 19:24:20 -0000 http://perforce.freebsd.org/chv.cgi?CH=103890 Change 103890 by jhb@jhb_mutex on 2006/08/14 19:24:10 Tag lockmgr locks with 'lk'. Affected files ... .. //depot/projects/smpng/sys/kern/kern_lock.c#51 edit Differences ... ==== //depot/projects/smpng/sys/kern/kern_lock.c#51 (text+ko) ==== @@ -606,7 +606,7 @@ return (0); /* Ok, we think we have a lockmgr lock, so output some details. */ - db_printf("blocked on \"%s\" ", lkp->lk_wmesg); + db_printf("blocked on lk \"%s\" ", lkp->lk_wmesg); if (lkp->lk_sharecount) { db_printf("SHARED (count %d)\n", lkp->lk_sharecount); *ownerp = NULL; From owner-p4-projects@FreeBSD.ORG Mon Aug 14 19:54:58 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C40CC16A4EB; Mon, 14 Aug 2006 19:54:58 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 9DF0716A4DE for ; Mon, 14 Aug 2006 19:54:58 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5BF2643D5A for ; Mon, 14 Aug 2006 19:54:58 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7EJswIP023202 for ; Mon, 14 Aug 2006 19:54:58 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7EJswSa023199 for perforce@freebsd.org; Mon, 14 Aug 2006 19:54:58 GMT (envelope-from jhb@freebsd.org) Date: Mon, 14 Aug 2006 19:54:58 GMT Message-Id: <200608141954.k7EJswSa023199@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Cc: Subject: PERFORCE change 103893 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 14 Aug 2006 19:54:59 -0000 http://perforce.freebsd.org/chv.cgi?CH=103893 Change 103893 by jhb@jhb_mutex on 2006/08/14 19:53:56 Add a mutex cycle. Affected files ... .. //depot/projects/smpng/sys/modules/crash2/crash2.c#12 edit Differences ... ==== //depot/projects/smpng/sys/modules/crash2/crash2.c#12 (text+ko) ==== @@ -88,6 +88,7 @@ static int event[NTHREADS]; static struct rwlock foo; static struct mtx bar; +static struct mtx abc, def, ghi, jkl; static struct sx one, two, three, four; static struct lock fee, fi, fo, fum; @@ -99,6 +100,19 @@ /* Events. */ +static struct mtx *mtxen[] = { &abc, &def, &ghi, &jkl }; + +static void +mtx_deadlock(int thread) +{ + + mtx_lock(mtxen[thread % 4]); + tsleep(mtxen, 0, "mtx_dead", hz/10); + mtx_lock(mtxen[(thread + 1) % 4]); +} +CRASH2_EVENT("mutex cycle", mtx_deadlock, mtx_deadlock, mtx_deadlock, + mtx_deadlock); + static struct lock *locks[] = { &fee, &fi, &fo, &fum }; static struct sx *sxs[] = { &one, &two, &three, &four }; @@ -124,7 +138,7 @@ { lockmgr(locks[thread % 4], LK_EXCLUSIVE, NULL, curthread); - tsleep(sxs, 0, "lk_dead", hz/10); + tsleep(locks, 0, "lk_dead", hz/10); lockmgr(locks[(thread + 1) % 4], LK_EXCLUSIVE, NULL, curthread); } CRASH2_EVENT("lockmgr cycle", lockmgr_deadlock, lockmgr_deadlock, @@ -367,6 +381,10 @@ rw_init(&foo, "foo"); mtx_init(&bar, "bar", NULL, MTX_DEF); + mtx_init(&abc, "abc", NULL, MTX_DEF); + mtx_init(&def, "def", NULL, MTX_DEF); + mtx_init(&ghi, "ghi", NULL, MTX_DEF); + mtx_init(&jkl, "jkl", NULL, MTX_DEF); sx_init(&one, "one"); sx_init(&two, "two"); sx_init(&three, "three"); @@ -414,6 +432,10 @@ sx_destroy(&three); sx_destroy(&two); sx_destroy(&one); + mtx_destroy(&jkl); + mtx_destroy(&ghi); + mtx_destroy(&def); + mtx_destroy(&abc); mtx_destroy(&bar); rw_destroy(&foo); return (0); From owner-p4-projects@FreeBSD.ORG Mon Aug 14 20:03:10 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4D8C216A4E2; Mon, 14 Aug 2006 20:03:10 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 109E616A4E0 for ; Mon, 14 Aug 2006 20:03:10 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A8B1343D46 for ; Mon, 14 Aug 2006 20:03:09 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7EK39iH024862 for ; Mon, 14 Aug 2006 20:03:09 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7EK39YI024859 for perforce@freebsd.org; Mon, 14 Aug 2006 20:03:09 GMT (envelope-from jb@freebsd.org) Date: Mon, 14 Aug 2006 20:03:09 GMT Message-Id: <200608142003.k7EK39YI024859@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 103895 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 14 Aug 2006 20:03:10 -0000 http://perforce.freebsd.org/chv.cgi?CH=103895 Change 103895 by jb@jb_freebsd2 on 2006/08/14 20:02:32 IFlibbsdelf Affected files ... .. //depot/projects/dtrace/src/lib/libelf/Makefile#3 integrate .. //depot/projects/dtrace/src/lib/libelf/_libelf.h#2 integrate .. //depot/projects/dtrace/src/lib/libelf/elf.3#2 integrate .. //depot/projects/dtrace/src/lib/libelf/elf_allocate.c#2 integrate .. //depot/projects/dtrace/src/lib/libelf/elf_begin.3#2 integrate .. //depot/projects/dtrace/src/lib/libelf/elf_begin.c#2 integrate .. //depot/projects/dtrace/src/lib/libelf/elf_end.3#2 integrate .. //depot/projects/dtrace/src/lib/libelf/elf_end.c#2 integrate .. //depot/projects/dtrace/src/lib/libelf/elf_memory.c#2 integrate .. //depot/projects/dtrace/src/lib/libelf/elf_next.3#2 integrate .. //depot/projects/dtrace/src/lib/libelf/elf_next.c#2 integrate .. //depot/projects/dtrace/src/lib/libelf/elf_rand.c#2 integrate .. //depot/projects/dtrace/src/lib/libelf/gelf_xlate.c#2 integrate .. //depot/projects/dtrace/src/lib/libelf/libelf_msize.m4#1 branch Differences ... ==== //depot/projects/dtrace/src/lib/libelf/Makefile#3 (text+ko) ==== @@ -5,6 +5,7 @@ SRCS= elf_allocate.c \ elf_begin.c \ elf_cntl.c \ + elf_dump.c elf_dump_argv.c \ elf_end.c elf_errmsg.c elf_errno.c \ elf_fill.c \ elf_getbase.c \ @@ -23,11 +24,11 @@ libelf.c INCS= libelf.h gelf.h -DPSRCS+= libelf_fsize.c libelf_convert.c -CLEANFILES+= libelf_fsize.c libelf_convert.c +DPSRCS+= libelf_fsize.c libelf_msize.c libelf_convert.c +CLEANFILES+= libelf_fsize.c libelf_msize.c libelf_convert.c CFLAGS+= -I${.OBJDIR} -I${.CURDIR} -OBJS+= libelf_convert.o +OBJS+= libelf_convert.o libelf_msize.o WARNS?= 9 @@ -114,8 +115,9 @@ CFLAGS+= -DLIBELF_TEST_HOOKS=1 .endif +libelf_convert.c: elf_types.m4 libelf_convert.m4 libelf_fsize.c: elf_types.m4 libelf_fsize.m4 -libelf_convert.c: elf_types.m4 libelf_convert.m4 +libelf_msize.c: elf_types.m4 libelf_msize.m4 .include ==== //depot/projects/dtrace/src/lib/libelf/_libelf.h#2 (text+ko) ==== @@ -67,7 +67,8 @@ * flags field. */ -#define LIBELF_F_ALLOCED 0x10000 /* whether rawdata is malloc'ed */ +#define LIBELF_F_ALLOCED 0x10000 /* whether e_rawfile is malloc'ed */ +#define LIBELF_F_MMAP 0x20000 /* whether e_rawfile was mmap'ed by us */ struct _Elf { int e_activations; /* activation count */ @@ -82,9 +83,13 @@ size_t e_rawsize; /* size of uninterpreted bytes */ unsigned int e_version; /* file version */ + Elf32_Ehdr e_eh32; /* 32-bit ELF header */ + Elf64_Ehdr e_eh64; /* 64-bit ELF header */ + union { - struct { /* archive files */ + struct { /* ar(1) archives */ off_t e_next; + int e_nchildren; } e_ar; struct { /* regular ELF files */ } e_elf; @@ -105,11 +110,15 @@ */ Elf *_libelf_allocate_elf(void); +int _libelf_dump32(Elf *_elf, const char *_name, const char *_outfile, + unsigned int _flags); +int _libelf_dump64(Elf *_elf, const char *_name, const char *_outfile, + unsigned int _flags); void *libelf_ehdr(Elf *_e, int _elfclass, int _allocate); void (*_libelf_get_translator(Elf_Type _t, int _direction, int _elfclass)) (char *_dst, char *_src, int _cnt, int _byteswap); int _libelf_malign(Elf_Type _t, int _elfclass); -size_t _libelf_msize(Elf_Type _t, unsigned int _version); +size_t _libelf_msize(Elf_Type _t, int _elfclass, unsigned int _version); void _libelf_release_elf(Elf *_e); #endif /* __LIBELF_H_ */ ==== //depot/projects/dtrace/src/lib/libelf/elf.3#2 (text+ko) ==== @@ -45,3 +45,5 @@ . \" Memory management discipline: Note that no ELF data structure should . \" be explicitly free()'ed by the application. All free'ing happens when . \" an elf_end() is done, after which pointers go stale. +. \" Describe all prefixes used by the library and namespace use by +. \" and (in gelf.3). ==== //depot/projects/dtrace/src/lib/libelf/elf_allocate.c#2 (text+ko) ==== @@ -67,6 +67,5 @@ void _libelf_release_elf(Elf *e) { - assert(e->e_activations == 1); free(e); } ==== //depot/projects/dtrace/src/lib/libelf/elf_begin.3#2 (text+ko) ==== @@ -244,6 +244,19 @@ differs from the value specified when ELF descriptor .Ar elf was created. +.It Bq Er ELF_E_ARGUMENT +Argument +.Ar elf +was not a descriptor for an +.Xr ar 1 +archive. +.It Bq Er ELF_E_MODE +An +.Xr ar 1 +archive was opened with with +.Ar cmd +set to +.Dv ELF_C_RDWR . .It Bq Er ELF_E_RESOURCE An out of memory condition was encountered. .It Bq Er ELF_E_SEQUENCE @@ -265,4 +278,4 @@ .Xr elf_next 3 , .Xr elf_rand 3 , .Xr elf_update 3 , -.Xr gelf 3+.Xr gelf 3 ==== //depot/projects/dtrace/src/lib/libelf/elf_begin.c#2 (text+ko) ==== @@ -27,106 +27,166 @@ #include __FBSDID("$FreeBSD$"); +#include #include #include #include +#include #include +#include #include #include "_libelf.h" -Elf * -elf_begin(int fd, Elf_Cmd c, Elf *ar) +static Elf * +libelf_open_object(int fd, Elf_Cmd c) { Elf *e; void *m; struct stat sb; + /* + * 'Raw' files are always mapped with 'PROT_READ'. At + * elf_update(3) time for files opened with ELF_C_RDWR the + * mapping is unmapped, file data is written to using write(2) + * and then the raw data is immediately mapped back in. + */ + if (fstat(fd, &sb) < 0) { + LIBELF_SET_ERROR(STAT, errno); + return (NULL); + } + + m = NULL; + if ((m = mmap(NULL, sb.st_size, PROT_READ, MAP_PRIVATE, fd, + (off_t) 0)) == MAP_FAILED) { + LIBELF_SET_ERROR(MMAP, errno); + return (NULL); + } + + if ((e = elf_memory(m, sb.st_size)) == NULL) { + (void) munmap(m, sb.st_size); + return (NULL); + } + + e->e_flags |= LIBELF_F_MMAP; + e->e_fd = fd; + e->e_cmd = c; + + if (c == ELF_C_RDWR && e->e_kind == ELF_K_AR) { + (void) elf_end(e); + LIBELF_SET_ERROR(MODE, 0); + return (NULL); + } + + return (e); +} + +static Elf * +libelf_open_member(int fd, Elf_Cmd c, Elf *elf) +{ + Elf *e; + struct ar_hdr *arh; + int i, ch, sz; + + assert(elf->e_kind == ELF_K_AR); + + /* + * TODO: The following code is incorrect for archives using + * the new extended header scheme. + */ + arh = (struct ar_hdr *) (elf->e_rawfile + elf->e_u.e_ar.e_next); + for (i = sz = 0; i < 10; i++) { + ch = arh->ar_size[i]; + if (isdigit(ch)) { + sz *= 10; + sz += ch; + } else { + LIBELF_SET_ERROR(ARCHIVE, 0); + return (NULL); + } + } + + assert(sz > 0); + + arh++; /* skip over archive member header */ + + if ((e = elf_memory((char *) arh, sz)) == NULL) { + LIBELF_SET_ERROR(RESOURCE, 0); + return (NULL); + } + + e->e_fd = fd; + e->e_cmd = c; + + elf->e_u.e_ar.e_nchildren++; + e->e_parent = elf; + + return (e); +} + +Elf * +elf_begin(int fd, Elf_Cmd c, Elf *elf) +{ + Elf *e; + + e = NULL; + if (LIBELF_PRIVATE(version) == EV_NONE) { LIBELF_SET_ERROR(SEQUENCE, 0); return (NULL); } - if (c == ELF_C_NULL) + switch (c) { + case ELF_C_NULL: return (NULL); - if (c == ELF_C_WRITE) { + case ELF_C_WRITE: + + /* + * Check writeability of `fd' immediately and fail if + * not writeable. + */ if (ftruncate(fd, (off_t) 0) < 0) { LIBELF_SET_ERROR(TRUNCATE, errno); return (NULL); } if ((e = _libelf_allocate_elf()) != NULL) { - LIBELF_SET_ERROR(NONE, 0); e->e_byteorder = LIBELF_PRIVATE(byteorder); e->e_class = LIBELF_PRIVATE(class); e->e_fd = fd; e->e_kind = ELF_K_ELF; + e->e_cmd = c; } return (e); - } - if (c != ELF_C_READ && c != ELF_C_RDWR) { - LIBELF_SET_ERROR(ARGUMENT, 0); - return (NULL); - } - - if (c == ELF_C_RDWR && ar != NULL) { - LIBELF_SET_ERROR(ARGUMENT, 0); - return (NULL); - } - - if (ar != NULL) { - - if (c != ar->e_cmd || fd != e->e_fd) { + case ELF_C_RDWR: + if (elf != NULL) { LIBELF_SET_ERROR(ARGUMENT, 0); return (NULL); } - - if (ar->e_kind != ELF_K_AR) { - ar->e_activations++; - return (ar); + /*FALLTHROUGH*/ + case ELF_C_READ: + if (elf && (elf->e_fd != fd || c != elf->e_cmd)) { + LIBELF_SET_ERROR(ARGUMENT, 0); + return (NULL); } - /* XXX todo 'ar' handling */ - return (NULL); - } + break; - /* - * Determine the type of the file (ar), or (ELF). - * For AR archives, read the symbol table and - * move the 'next' pointer to the first normal - * file in the archive. - * For ELF files, get mmap and hand over the - * pointer to elf_memory for further processing. - */ - - if (fstat(fd, &sb) < 0) { - LIBELF_SET_ERROR(STAT, errno); + default: + LIBELF_SET_ERROR(ARGUMENT, 0); return (NULL); - } - /* - * 'Raw' files are always mapped with 'PROT_READ'. At elf_update(3) - * time these are unmapped, file data is written to using write(2) - * and then remapped. - */ - m = NULL; - if ((m = mmap(NULL, sb.st_size, PROT_READ, MAP_PRIVATE, fd, - (off_t) 0)) == MAP_FAILED) { - LIBELF_SET_ERROR(MMAP, errno); - return (NULL); } - e = elf_memory(m, sb.st_size); - - if ((e = elf_memory(m, sb.st_size)) == NULL) { - (void) munmap(m, sb.st_size); - return (NULL); - } - - e->e_fd = fd; + if (elf == NULL) + e = libelf_open_object(fd, c); + else if (elf->e_kind == ELF_K_AR) + e = libelf_open_member(fd, c, elf); + else + (e = elf)->e_activations++; return (e); } ==== //depot/projects/dtrace/src/lib/libelf/elf_end.3#2 (text+ko) ==== @@ -45,23 +45,32 @@ .Xr elf_begin 3 or .Xr elf_memory 3 . -For convenience a NULL value is permitted for argument +For programming convenience, a NULL value is permitted for argument .Ar elf . .Pp A call to .Fn elf_end decrements the activation count for descriptor .Ar elf -by 1. +by one. The resources associated with the descriptor are only released with its activation count goes to zero. +.Pp +Once function +.Fn elf_end +returns zero, the ELF descriptor +.Ar elf +will no longer be valid and should not be used further. .Sh RETURN VALUES Function .Fn elf_end -returns the current value of the ELF descriptor's activation count. +returns the current value of the ELF descriptor +.Ar elf Ap s +activation count, or zero if argument +.Ar elf +was NULL. .Sh SEE ALSO .Xr elf 3 , .Xr elf_begin 3 , .Xr elf_memory 3 , .Xr gelf 3 - ==== //depot/projects/dtrace/src/lib/libelf/elf_end.c#2 (text+ko) ==== @@ -27,23 +27,56 @@ #include __FBSDID("$FreeBSD$"); +#include + #include #include +#include #include "_libelf.h" int elf_end(Elf *e) { - if (e == NULL || e->e_activations <= 0) + Elf *sv; + + if (e == NULL || e->e_activations == 0) return (0); + if (--e->e_activations > 0) return (e->e_activations); assert(e->e_activations == 0); - /* TODO release ELF descriptor's resources */ + while (e && e->e_activations == 0) { + switch (e->e_kind) { + case ELF_K_AR: + /* + * If we still have open child descriptors, we + * need to defer reclaiming resources till all + * the child descriptors for the archive are + * closed. + */ + if (e->e_u.e_ar.e_nchildren > 0) + return (0); + break; + case ELF_K_ELF: + break; + case ELF_K_NUM: + assert(0); + default: + break; + } + + if (e->e_flags & LIBELF_F_MMAP) + (void) munmap(e->e_rawfile, e->e_rawsize); + + sv = e; + if ((e = e->e_parent) != NULL) + e->e_u.e_ar.e_nchildren--; + _libelf_release_elf(sv); + } - return 0; + return (0); } ==== //depot/projects/dtrace/src/lib/libelf/elf_memory.c#2 (text+ko) ==== @@ -28,6 +28,7 @@ __FBSDID("$FreeBSD$"); #include +#include #include #include @@ -37,6 +38,7 @@ elf_memory(char *image, size_t sz) { Elf *e; + Elf_Data dst, src; if (LIBELF_PRIVATE(version) == EV_NONE) { LIBELF_SET_ERROR(SEQUENCE, 0); @@ -71,6 +73,8 @@ } } else if (sz >= SARMAG && strncmp(image, ARMAG, SARMAG) == 0) { e->e_kind = ELF_K_AR; + e->e_u.e_ar.e_nchildren = 0; + e->e_u.e_ar.e_next = (off_t) -1; /* XXX set to first element */ } else e->e_kind = ELF_K_NONE; @@ -78,6 +82,35 @@ e->e_rawfile = image; e->e_rawsize = sz; + if (e->e_kind == ELF_K_ELF) { + src.d_buf = image; + src.d_off = 0; + src.d_align = 0; + src.d_type = ELF_T_EHDR; + src.d_version = EV_CURRENT; + + dst.d_off = 0; + dst.d_align = 0; + dst.d_type = ELF_T_EHDR; + dst.d_version = EV_CURRENT; + + if (e->e_class == ELFCLASS32) { + dst.d_buf = &e->e_eh32; + dst.d_size = sizeof(e->e_eh32); + src.d_size = sizeof(e->e_eh32); + } else if (e->e_class == ELFCLASS64) { + dst.d_buf = &e->e_eh64; + dst.d_size = sizeof(e->e_eh64); + src.d_size = sizeof(e->e_eh64); + } else { + LIBELF_SET_ERROR(CLASS, e->e_class); + return (NULL); + } + + if (gelf_xlatetom(e, &dst, &src, e->e_byteorder) == NULL) + return (NULL); + } + return (e); } ==== //depot/projects/dtrace/src/lib/libelf/elf_next.3#2 (text+ko) ==== @@ -81,4 +81,4 @@ .Xr elf 3 , .Xr elf_begin 3 , .Xr elf_end 3 , -.Xr gelf 3 +.Xr elf_rand 3 ==== //depot/projects/dtrace/src/lib/libelf/elf_next.c#2 (text+ko) ==== @@ -29,25 +29,34 @@ #include +#include +#include #include #include "_libelf.h" Elf_Cmd -elf_next(Elf *elf) +elf_next(Elf *e) { - Elf *parent, *next; +#ifdef DOODAD + off_t next; + Elf *parent; +#endif - if (elf == NULL || elf->e_parent == NULL) + if (e == NULL || (parent = e->e_parent) == NULL) return (ELF_C_NULL); - if ((next = LIST_NEXT(&elf->e_u.e_member, e_sibling)) == NULL) - return (ELF_C_NULL); +#ifdef DOODAD + assert (parent->e_kind == ELF_K_AR); + assert (parent->e_cmd == ELF_C_READ); + assert((uintptr_t) e->e_rawfile % 2 == 0); + assert(e->e_rawfile > parent->e_rawfile); - if ((parent = elf->e_u.e_member.e_parent) == NULL) - return (ELF_C_NULL); + next = e->e_rawfile - parent->e_rawfile + e->e_rawsize; + next = (next + 1) & ~1; /* round up to next 2-byte offset */ - parent->e_u.e_ar.e_next = next; + parent->e_u.e_ar.e_next = (next >= parent->e_rawsize) ? (off_t) -1 : next; +#endif return (ELF_C_READ); } ==== //depot/projects/dtrace/src/lib/libelf/elf_rand.c#2 (text+ko) ==== @@ -33,26 +33,26 @@ #include "_libelf.h" off_t -elf_rand(Elf *archive, off_t offset) +elf_rand(Elf *ar, off_t offset) { - struct ar_hdr *ar; + struct ar_hdr *arh; - if (archive == NULL || archive->e_kind != ELF_K_AR || - offset & 1 || - offset < SARMAG || offset + sizeof(struct ar_hdr) > archive->e_rawsize) { + if (ar == NULL || ar->e_kind != ELF_K_AR || + offset & 1 || offset < SARMAG || + offset + sizeof(struct ar_hdr) >= ar->e_rawsize) { LIBELF_SET_ERROR(ARGUMENT, 0); return 0; } - ar = (struct ar_hdr *) (archive->e_rawfile + offset); + arh = (struct ar_hdr *) (ar->e_rawfile + offset); /* a too simple sanity check */ - if (ar->ar_fmag[0] != '`' || ar->ar_fmag[1] != '\n') { + if (arh->ar_fmag[0] != '`' || arh->ar_fmag[1] != '\n') { LIBELF_SET_ERROR(ARGUMENT, 0); return 0; } - archive->e_u.e_ar.e_next = offset; + ar->e_u.e_ar.e_next = offset; return (offset); } ==== //depot/projects/dtrace/src/lib/libelf/gelf_xlate.c#2 (text+ko) ==== @@ -82,7 +82,7 @@ 1, src->d_version)) == 0) return (NULL); - msz = _libelf_msize(src->d_type, src->d_version); + msz = _libelf_msize(src->d_type, elfclass, src->d_version); assert(msz > 0); From owner-p4-projects@FreeBSD.ORG Mon Aug 14 20:13:23 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BF52A16A4E0; Mon, 14 Aug 2006 20:13:23 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 85FED16A4DE for ; Mon, 14 Aug 2006 20:13:23 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 33ACD43D46 for ; Mon, 14 Aug 2006 20:13:23 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7EKDNwp025419 for ; Mon, 14 Aug 2006 20:13:23 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7EKDMmn025416 for perforce@freebsd.org; Mon, 14 Aug 2006 20:13:22 GMT (envelope-from jb@freebsd.org) Date: Mon, 14 Aug 2006 20:13:22 GMT Message-Id: <200608142013.k7EKDMmn025416@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 103897 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 14 Aug 2006 20:13:24 -0000 http://perforce.freebsd.org/chv.cgi?CH=103897 Change 103897 by jb@jb_freebsd2 on 2006/08/14 20:13:05 Fix a couple of variable types to match the macro they are in. Offset the pointer for the READ_IDENT macro. Affected files ... .. //depot/projects/dtrace/src/lib/libelf/libelf_convert.m4#3 edit Differences ... ==== //depot/projects/dtrace/src/lib/libelf/libelf_convert.m4#3 (text+ko) ==== @@ -152,7 +152,7 @@ (X) = _t; \ } while (0) #define READ_WORD(P,X) do { \ - uint16_t _t; \ + uint32_t _t; \ unsigned char *const _q = (unsigned char *) &_t; \ const unsigned char *const _p = \ (const unsigned char *) (P); \ @@ -167,7 +167,7 @@ #define READ_OFF32(P,X) READ_WORD(P,X) #define READ_SWORD(P,X) READ_WORD(P,X) #define READ_WORD64(P,X) do { \ - uint16_t _t; \ + uint64_t _t; \ unsigned char *const _q = (unsigned char *) &_t; \ const unsigned char *const _p = \ (const unsigned char *) (P); \ @@ -188,6 +188,7 @@ #define READ_XWORD(P,X) READ_WORD64(P,X) #define READ_IDENT(P,X) do { \ (void) memcpy((X), (P), sizeof((X))); \ + (P) = (P) + sizeof((X)); \ } while (0) divert(-1) From owner-p4-projects@FreeBSD.ORG Mon Aug 14 20:14:25 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7850116A4DF; Mon, 14 Aug 2006 20:14:25 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 53F9E16A4DE for ; Mon, 14 Aug 2006 20:14:25 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0277E43D49 for ; Mon, 14 Aug 2006 20:14:25 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7EKEOsb025516 for ; Mon, 14 Aug 2006 20:14:24 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7EKEOuN025513 for perforce@freebsd.org; Mon, 14 Aug 2006 20:14:24 GMT (envelope-from jb@freebsd.org) Date: Mon, 14 Aug 2006 20:14:24 GMT Message-Id: <200608142014.k7EKEOuN025513@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 103898 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 14 Aug 2006 20:14:25 -0000 http://perforce.freebsd.org/chv.cgi?CH=103898 Change 103898 by jb@jb_freebsd2 on 2006/08/14 20:14:11 Add elfdump prototypes and flag definitions. Fix a prototype. Affected files ... .. //depot/projects/dtrace/src/lib/libelf/libelf.h#3 edit Differences ... ==== //depot/projects/dtrace/src/lib/libelf/libelf.h#3 (text+ko) ==== @@ -140,6 +140,7 @@ ELF_E_NONE, /* No error */ ELF_E_ARCHIVE, /* Malformed ar(1) archive */ ELF_E_ARGUMENT, /* Invalid argument */ + ELF_E_CLASS, /* ELF class mismatch */ ELF_E_HEADER, /* Missing ELF header */ ELF_E_MMAP, /* File mapping failed */ ELF_E_MODE, /* Wrong mode for ELF descriptor */ @@ -159,9 +160,35 @@ #define ELF_F_LAYOUT 0x001 /* application will layout the file */ #define ELF_F_DIRTY 0x002 /* a section or ELF file is dirty */ +/* + * Flags passed to elf_dump(). + */ +#define ELF_DUMP_CAP (1 << 0) +#define ELF_DUMP_CHECKSUM (1 << 1) +#define ELF_DUMP_DEMANGLE (1 << 2) +#define ELF_DUMP_DYN (1 << 3) +#define ELF_DUMP_EHDR (1 << 4) +#define ELF_DUMP_GOT (1 << 5) +#define ELF_DUMP_GROUP (1 << 6) +#define ELF_DUMP_HASH (1 << 7) +#define ELF_DUMP_INTERP (1 << 8) +#define ELF_DUMP_LONGNAME (1 << 9) +#define ELF_DUMP_MOVE (1 << 10) +#define ELF_DUMP_NOTE (1 << 11) +#define ELF_DUMP_PHDR (1 << 12) +#define ELF_DUMP_RELOC (1 << 13) +#define ELF_DUMP_SHDR (1 << 14) +#define ELF_DUMP_SYMBOLS (1 << 15) +#define ELF_DUMP_SYMINFO (1 << 16) +#define ELF_DUMP_UNWIND (1 << 17) +#define ELF_DUMP_VERSIONS (1 << 18) + __BEGIN_DECLS Elf *elf_begin(int _fd, Elf_Cmd _cmd, Elf *_elf); int elf_cntl(Elf *_elf, Elf_Cmd _cmd); +int elf_dump(const char *_elf_file, const char *name, + const char *_outfile, unsigned int _flags); +int elf_dump_argv(int _argc, char **_argv); int elf_end(Elf *_elf); const char *elf_errmsg(int _error); int elf_errno(void); @@ -193,7 +220,7 @@ Elf_Data *elf_rawdata(Elf_Scn *_scn, Elf_Data *_data); char *elf_rawfile(Elf *_elf, size_t *_size); char *elf_strptr(Elf *_elf, size_t _section, size_t _offset); -off_t elf_update(Elf *_elf, Elf_Cmd *_cmd); +off_t elf_update(Elf *_elf, Elf_Cmd _cmd); unsigned int elf_version(unsigned int _version); long elf32_checksum(Elf *_elf); From owner-p4-projects@FreeBSD.ORG Mon Aug 14 20:17:31 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5A0AE16A4E6; Mon, 14 Aug 2006 20:17:31 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 2C69E16A4DD for ; Mon, 14 Aug 2006 20:17:31 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D6B8E43D45 for ; Mon, 14 Aug 2006 20:17:30 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7EKHULl025688 for ; Mon, 14 Aug 2006 20:17:30 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7EKHUbu025685 for perforce@freebsd.org; Mon, 14 Aug 2006 20:17:30 GMT (envelope-from imp@freebsd.org) Date: Mon, 14 Aug 2006 20:17:30 GMT Message-Id: <200608142017.k7EKHUbu025685@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 103899 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 14 Aug 2006 20:17:31 -0000 http://perforce.freebsd.org/chv.cgi?CH=103899 Change 103899 by imp@imp_lighthouse on 2006/08/14 20:17:27 tweak-o-matic Affected files ... .. //depot/projects/arm/src/sys/i386/conf/505TS#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Mon Aug 14 20:35:58 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7F5D016A4DE; Mon, 14 Aug 2006 20:35:58 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 5237C16A4DA for ; Mon, 14 Aug 2006 20:35:58 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D152843D5D for ; Mon, 14 Aug 2006 20:35:54 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7EKZsvg026765 for ; Mon, 14 Aug 2006 20:35:54 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7EKZsAJ026762 for perforce@freebsd.org; Mon, 14 Aug 2006 20:35:54 GMT (envelope-from jb@freebsd.org) Date: Mon, 14 Aug 2006 20:35:54 GMT Message-Id: <200608142035.k7EKZsAJ026762@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 103901 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 14 Aug 2006 20:35:58 -0000 http://perforce.freebsd.org/chv.cgi?CH=103901 Change 103901 by jb@jb_freebsd2 on 2006/08/14 20:35:44 Implement libelf_ehdr() Affected files ... .. //depot/projects/dtrace/src/lib/libelf/gelf_getehdr.c#2 edit Differences ... ==== //depot/projects/dtrace/src/lib/libelf/gelf_getehdr.c#2 (text+ko) ==== @@ -28,12 +28,46 @@ __FBSDID("$FreeBSD$"); #include +#include #include #include +#include #include #include "_libelf.h" +void * +libelf_ehdr(Elf *e, int elfclass, int allocate) +{ + size_t s; + void *eh; + + if (elfclass != e->e_class) { + LIBELF_SET_ERROR(CLASS, elfclass); + return (NULL); + } + + if ((s = _libelf_msize(ELF_T_EHDR, elfclass, EV_CURRENT)) == 0) + return (NULL); + + if (allocate) { + if ((eh = malloc(s)) == NULL) { + LIBELF_SET_ERROR(RESOURCE, errno); + return (NULL); + } + if (elfclass == ELFCLASS32) + memcpy(eh, &e->e_eh32, s); + else + memcpy(eh, &e->e_eh64, s); + + } else if (elfclass == ELFCLASS32) + eh = &e->e_eh32; + else + eh = &e->e_eh64; + + return (eh); +} + Elf32_Ehdr * elf32_getehdr(Elf *e) { From owner-p4-projects@FreeBSD.ORG Mon Aug 14 20:36:57 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 59A1316A4DF; Mon, 14 Aug 2006 20:36:57 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 382D716A4DA for ; Mon, 14 Aug 2006 20:36:57 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E7F5C43D55 for ; Mon, 14 Aug 2006 20:36:56 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7EKau0q026817 for ; Mon, 14 Aug 2006 20:36:56 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7EKauBV026814 for perforce@freebsd.org; Mon, 14 Aug 2006 20:36:56 GMT (envelope-from jb@freebsd.org) Date: Mon, 14 Aug 2006 20:36:56 GMT Message-Id: <200608142036.k7EKauBV026814@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 103902 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 14 Aug 2006 20:36:57 -0000 http://perforce.freebsd.org/chv.cgi?CH=103902 Change 103902 by jb@jb_freebsd2 on 2006/08/14 20:36:43 Add some more GELF -> ELF64 defines. Affected files ... .. //depot/projects/dtrace/src/lib/libelf/gelf.h#2 edit Differences ... ==== //depot/projects/dtrace/src/lib/libelf/gelf.h#2 (text+ko) ==== @@ -55,6 +55,17 @@ typedef Elf64_Cap GElf_Cap; #endif +#define GELF_ST_BIND ELF64_ST_BIND +#define GELF_ST_TYPE ELF64_ST_TYPE +#define GELF_ST_INFO ELF64_ST_INFO + +#define GELF_R_TYPE ELF64_R_TYPE_ID +#define GELF_R_SYM ELF64_R_SYM +#define GELF_R_INFO ELF64_R_INFO +#define GELF_R_TYPE_DATA ELF64_R_TYPE_DATA +#define GELF_R_TYPE_ID ELF64_R_TYPE_ID +#define GELF_R_TYPE_INFO ELF64_R_TYPE_INFO + __BEGIN_DECLS long gelf_checksum(Elf *_elf); size_t gelf_fsize(Elf *_elf, Elf_Type _type, size_t _count, From owner-p4-projects@FreeBSD.ORG Mon Aug 14 20:40:17 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EA89B16A4ED; Mon, 14 Aug 2006 20:40:16 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 920BF16A4E1 for ; Mon, 14 Aug 2006 20:40:01 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id F26D043D5C for ; Mon, 14 Aug 2006 20:40:00 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7EKe09i027000 for ; Mon, 14 Aug 2006 20:40:00 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7EKe0fS026997 for perforce@freebsd.org; Mon, 14 Aug 2006 20:40:00 GMT (envelope-from jb@freebsd.org) Date: Mon, 14 Aug 2006 20:40:00 GMT Message-Id: <200608142040.k7EKe0fS026997@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 103903 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 14 Aug 2006 20:40:17 -0000 http://perforce.freebsd.org/chv.cgi?CH=103903 Change 103903 by jb@jb_freebsd2 on 2006/08/14 20:39:02 Remove some hacks which aren't needed after the last integration from libbsdelf. Affected files ... .. //depot/projects/dtrace/src/lib/libelf/elf_next.c#3 edit Differences ... ==== //depot/projects/dtrace/src/lib/libelf/elf_next.c#3 (text+ko) ==== @@ -38,15 +38,12 @@ Elf_Cmd elf_next(Elf *e) { -#ifdef DOODAD off_t next; Elf *parent; -#endif if (e == NULL || (parent = e->e_parent) == NULL) return (ELF_C_NULL); -#ifdef DOODAD assert (parent->e_kind == ELF_K_AR); assert (parent->e_cmd == ELF_C_READ); assert((uintptr_t) e->e_rawfile % 2 == 0); @@ -56,7 +53,6 @@ next = (next + 1) & ~1; /* round up to next 2-byte offset */ parent->e_u.e_ar.e_next = (next >= parent->e_rawsize) ? (off_t) -1 : next; -#endif return (ELF_C_READ); } From owner-p4-projects@FreeBSD.ORG Mon Aug 14 20:40:17 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 39F2D16A54A; Mon, 14 Aug 2006 20:40:17 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 932C416A4E2 for ; Mon, 14 Aug 2006 20:40:01 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 55FF343D5E for ; Mon, 14 Aug 2006 20:40:01 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7EKe1sX027018 for ; Mon, 14 Aug 2006 20:40:01 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7EKe0Oa027015 for perforce@freebsd.org; Mon, 14 Aug 2006 20:40:00 GMT (envelope-from jb@freebsd.org) Date: Mon, 14 Aug 2006 20:40:00 GMT Message-Id: <200608142040.k7EKe0Oa027015@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 103904 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 14 Aug 2006 20:40:17 -0000 http://perforce.freebsd.org/chv.cgi?CH=103904 Change 103904 by jb@jb_freebsd2 on 2006/08/14 20:39:40 Add another error class. Affected files ... .. //depot/projects/dtrace/src/lib/libelf/elf_errmsg.c#3 edit Differences ... ==== //depot/projects/dtrace/src/lib/libelf/elf_errmsg.c#3 (text+ko) ==== @@ -42,6 +42,7 @@ DEFINE_ERROR(ARCHIVE, "Malformed ar(1) archive"), DEFINE_ERROR(ARGUMENT, "Invalid argument"), DEFINE_ERROR(HEADER, "Missing ELF header"), + DEFINE_ERROR(CLASS, "ELF class mismatch"), DEFINE_ERROR(MMAP, "File mapping failed"), DEFINE_ERROR(MODE, "Incorrect ELF descriptor mode"), DEFINE_ERROR(RESOURCE, "Resource exhaustion"), From owner-p4-projects@FreeBSD.ORG Mon Aug 14 20:44:11 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0C10916A4E5; Mon, 14 Aug 2006 20:44:11 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 B9BB016A4E0 for ; Mon, 14 Aug 2006 20:44:10 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9ADB543D5D for ; Mon, 14 Aug 2006 20:44:07 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7EKi7ji027395 for ; Mon, 14 Aug 2006 20:44:07 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7EKi7op027392 for perforce@freebsd.org; Mon, 14 Aug 2006 20:44:07 GMT (envelope-from jb@freebsd.org) Date: Mon, 14 Aug 2006 20:44:07 GMT Message-Id: <200608142044.k7EKi7op027392@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 103906 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 14 Aug 2006 20:44:11 -0000 http://perforce.freebsd.org/chv.cgi?CH=103906 Change 103906 by jb@jb_freebsd2 on 2006/08/14 20:43:22 Add more structures which are described in the Solaris Linker and Libraries Guide, the copy of which I have is dated Nov 2006. Hehehe. Affected files ... .. //depot/projects/dtrace/src/sys/sys/elf32.h#3 edit .. //depot/projects/dtrace/src/sys/sys/elf64.h#4 edit Differences ... ==== //depot/projects/dtrace/src/sys/sys/elf32.h#3 (text+ko) ==== @@ -40,6 +40,7 @@ typedef uint32_t Elf32_Off; typedef int32_t Elf32_Sword; typedef uint32_t Elf32_Word; +typedef uint64_t Elf32_Lword; typedef Elf32_Word Elf32_Hashelt; @@ -138,6 +139,48 @@ #define ELF32_R_INFO(sym, type) (((sym) << 8) + (unsigned char)(type)) /* + * Note entry header + */ +typedef struct { + Elf32_Word n_namesz; /* length of note's name */ + Elf32_Word n_descsz; /* length of note's "desc" */ + Elf32_Word n_type; /* type of note */ +} Elf32_Nhdr; + +/* + * Move entry + */ +typedef struct { + Elf32_Lword m_value; /* symbol value */ + Elf32_Word m_info; /* size + index */ + Elf32_Word m_poffset; /* symbol offset */ + Elf32_Half m_repeat; /* repeat count */ + Elf32_Half m_stride; /* stride info */ +} Elf32_Move; + +/* + * The macros compose and decompose values for Move.r_info + * + * sym = ELF32_M_SYM(M.m_info) + * size = ELF32_M_SIZE(M.m_info) + * M.m_info = ELF32_M_INFO(sym, size) + */ +#define ELF32_M_SYM(info) ((info)>>8) +#define ELF32_M_SIZE(info) ((unsigned char)(info)) +#define ELF32_M_INFO(sym, size) (((sym)<<8)+(unsigned char)(size)) + +/* + * Hardware/Software capabilities entry + */ +typedef struct { + Elf32_Word c_tag; /* how to interpret value */ + union { + Elf32_Word c_val; + Elf32_Addr c_ptr; + } c_un; +} Elf32_Cap; + +/* * Symbol table entries. */ @@ -198,4 +241,9 @@ typedef Elf32_Half Elf32_Versym; +typedef struct { + Elf32_Half si_boundto; /* direct bindings - symbol bound to */ + Elf32_Half si_flags; /* per symbol flags */ +} Elf32_Syminfo; + #endif /* !_SYS_ELF32_H_ */ ==== //depot/projects/dtrace/src/sys/sys/elf64.h#4 (text+ko) ==== @@ -41,6 +41,7 @@ typedef int32_t Elf64_Sword; typedef int64_t Elf64_Sxword; typedef uint32_t Elf64_Word; +typedef uint64_t Elf64_Lword; typedef uint64_t Elf64_Xword; /* @@ -147,6 +148,41 @@ #define ELF64_R_INFO(sym, type) (((sym) << 32) + ((type) & 0xffffffffL)) /* + * Note entry header + */ +typedef struct { + Elf64_Word n_namesz; /* length of note's name */ + Elf64_Word n_descsz; /* length of note's "desc" */ + Elf64_Word n_type; /* type of note */ +} Elf64_Nhdr; + +/* + * Move entry + */ +typedef struct { + Elf64_Lword m_value; /* symbol value */ + Elf64_Xword m_info; /* size + index */ + Elf64_Xword m_poffset; /* symbol offset */ + Elf64_Half m_repeat; /* repeat count */ + Elf64_Half m_stride; /* stride info */ +} Elf64_Move; + +#define ELF64_M_SYM(info) ((info)>>8) +#define ELF64_M_SIZE(info) ((unsigned char)(info)) +#define ELF64_M_INFO(sym, size) (((sym)<<8)+(unsigned char)(size)) + +/* + * Hardware/Software capabilities entry + */ +typedef struct { + Elf64_Xword c_tag; /* how to interpret value */ + union { + Elf64_Xword c_val; + Elf64_Addr c_ptr; + } c_un; +} Elf64_Cap; + +/* * Symbol table entries. */ @@ -203,4 +239,9 @@ typedef Elf64_Half Elf64_Versym; +typedef struct { + Elf64_Half si_boundto; /* direct bindings - symbol bound to */ + Elf64_Half si_flags; /* per symbol flags */ +} Elf64_Syminfo; + #endif /* !_SYS_ELF64_H_ */ From owner-p4-projects@FreeBSD.ORG Mon Aug 14 20:44:11 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2ED4916A530; Mon, 14 Aug 2006 20:44:11 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 D405816A4E1 for ; Mon, 14 Aug 2006 20:44:10 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id EE5AC43D77 for ; Mon, 14 Aug 2006 20:44:07 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7EKi7aC027401 for ; Mon, 14 Aug 2006 20:44:07 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7EKi7Bu027398 for perforce@freebsd.org; Mon, 14 Aug 2006 20:44:07 GMT (envelope-from jhb@freebsd.org) Date: Mon, 14 Aug 2006 20:44:07 GMT Message-Id: <200608142044.k7EKi7Bu027398@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Cc: Subject: PERFORCE change 103907 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 14 Aug 2006 20:44:11 -0000 http://perforce.freebsd.org/chv.cgi?CH=103907 Change 103907 by jhb@jhb_mutex on 2006/08/14 20:43:31 Sleep bad. Affected files ... .. //depot/projects/smpng/sys/modules/crash2/crash2.c#13 edit Differences ... ==== //depot/projects/smpng/sys/modules/crash2/crash2.c#13 (text+ko) ==== @@ -107,7 +107,7 @@ { mtx_lock(mtxen[thread % 4]); - tsleep(mtxen, 0, "mtx_dead", hz/10); + DELAY(500); mtx_lock(mtxen[(thread + 1) % 4]); } CRASH2_EVENT("mutex cycle", mtx_deadlock, mtx_deadlock, mtx_deadlock, From owner-p4-projects@FreeBSD.ORG Mon Aug 14 21:02:32 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 46DE916A4E1; Mon, 14 Aug 2006 21:02:32 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 12ACA16A4DE for ; Mon, 14 Aug 2006 21:02:32 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C13EF43D4C for ; Mon, 14 Aug 2006 21:02:31 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7EL2VM4036096 for ; Mon, 14 Aug 2006 21:02:31 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7EL2VDU036093 for perforce@freebsd.org; Mon, 14 Aug 2006 21:02:31 GMT (envelope-from jhb@freebsd.org) Date: Mon, 14 Aug 2006 21:02:31 GMT Message-Id: <200608142102.k7EL2VDU036093@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Cc: Subject: PERFORCE change 103908 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 14 Aug 2006 21:02:32 -0000 http://perforce.freebsd.org/chv.cgi?CH=103908 Change 103908 by jhb@jhb_mutex on 2006/08/14 21:01:30 Less sucky. Affected files ... .. //depot/projects/smpng/sys/modules/crash2/crash2.c#14 edit Differences ... ==== //depot/projects/smpng/sys/modules/crash2/crash2.c#14 (text+ko) ==== @@ -91,6 +91,7 @@ static struct mtx abc, def, ghi, jkl; static struct sx one, two, three, four; static struct lock fee, fi, fo, fum; +static int crash2_wait = 1; static int mod_event(struct module *module, int cmd, void *arg); static int load(void *arg); @@ -105,10 +106,21 @@ static void mtx_deadlock(int thread) { + static int barrier; + atomic_add_int(&barrier, 1); + while (barrier != NTHREADS) + cpu_spinwait(); mtx_lock(mtxen[thread % 4]); DELAY(500); + + atomic_add_int(&barrier, 1); + while (barrier != 2 * NTHREADS) + cpu_spinwait(); mtx_lock(mtxen[(thread + 1) % 4]); + + while (crash2_wait) + cpu_spinwait(); } CRASH2_EVENT("mutex cycle", mtx_deadlock, mtx_deadlock, mtx_deadlock, mtx_deadlock); From owner-p4-projects@FreeBSD.ORG Mon Aug 14 21:13:48 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2AD8116A4E0; Mon, 14 Aug 2006 21:13:48 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 06DA816A4DD for ; Mon, 14 Aug 2006 21:13:48 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B1BA243D45 for ; Mon, 14 Aug 2006 21:13:47 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7ELDlPV037897 for ; Mon, 14 Aug 2006 21:13:47 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7ELDlEq037894 for perforce@freebsd.org; Mon, 14 Aug 2006 21:13:47 GMT (envelope-from jhb@freebsd.org) Date: Mon, 14 Aug 2006 21:13:47 GMT Message-Id: <200608142113.k7ELDlEq037894@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Cc: Subject: PERFORCE change 103910 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 14 Aug 2006 21:13:48 -0000 http://perforce.freebsd.org/chv.cgi?CH=103910 Change 103910 by jhb@jhb_mutex on 2006/08/14 21:13:02 Bah. Affected files ... .. //depot/projects/smpng/sys/modules/crash2/crash2.c#15 edit Differences ... ==== //depot/projects/smpng/sys/modules/crash2/crash2.c#15 (text+ko) ==== @@ -60,6 +60,8 @@ #include #include +#include + #define NTHREADS 4 typedef void (*event_handler)(int); From owner-p4-projects@FreeBSD.ORG Mon Aug 14 21:19:05 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 458F516A4E9; Mon, 14 Aug 2006 21:19:05 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 2170D16A4E5 for ; Mon, 14 Aug 2006 21:19:05 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id EB16243D5C for ; Mon, 14 Aug 2006 21:18:55 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7ELItOU038113 for ; Mon, 14 Aug 2006 21:18:55 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7ELIta6038110 for perforce@freebsd.org; Mon, 14 Aug 2006 21:18:55 GMT (envelope-from jhb@freebsd.org) Date: Mon, 14 Aug 2006 21:18:55 GMT Message-Id: <200608142118.k7ELIta6038110@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Cc: Subject: PERFORCE change 103911 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 14 Aug 2006 21:19:05 -0000 http://perforce.freebsd.org/chv.cgi?CH=103911 Change 103911 by jhb@jhb_mutex on 2006/08/14 21:18:11 Bah! Affected files ... .. //depot/projects/smpng/sys/modules/crash2/crash2.c#16 edit Differences ... ==== //depot/projects/smpng/sys/modules/crash2/crash2.c#16 (text+ko) ==== @@ -111,13 +111,13 @@ static int barrier; atomic_add_int(&barrier, 1); - while (barrier != NTHREADS) + while (barrier < NTHREADS) cpu_spinwait(); mtx_lock(mtxen[thread % 4]); DELAY(500); atomic_add_int(&barrier, 1); - while (barrier != 2 * NTHREADS) + while (barrier < 2 * NTHREADS) cpu_spinwait(); mtx_lock(mtxen[(thread + 1) % 4]); From owner-p4-projects@FreeBSD.ORG Mon Aug 14 21:22:00 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9908A16A4DF; Mon, 14 Aug 2006 21:22:00 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 57B2316A4DD for ; Mon, 14 Aug 2006 21:22:00 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E4A9A43D9A for ; Mon, 14 Aug 2006 21:21:59 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7ELLxJt038335 for ; Mon, 14 Aug 2006 21:21:59 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7ELLx4U038332 for perforce@freebsd.org; Mon, 14 Aug 2006 21:21:59 GMT (envelope-from jb@freebsd.org) Date: Mon, 14 Aug 2006 21:21:59 GMT Message-Id: <200608142121.k7ELLx4U038332@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 103912 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 14 Aug 2006 21:22:00 -0000 http://perforce.freebsd.org/chv.cgi?CH=103912 Change 103912 by jb@jb_freebsd2 on 2006/08/14 21:21:58 Add ELF compatibiity definitions for OpenSolaris these are only enabled if _SOLARIS_C_SOURCE is defined. Affected files ... .. //depot/projects/dtrace/src/include/elf.h#3 edit .. //depot/projects/dtrace/src/sys/sys/_elf_solaris.h#1 add Differences ... ==== //depot/projects/dtrace/src/include/elf.h#3 (text+ko) ==== @@ -38,4 +38,8 @@ #include #include +#ifdef _SOLARIS_C_SOURCE +#include +#endif + #endif /* !_ELF_H_ */ From owner-p4-projects@FreeBSD.ORG Mon Aug 14 21:26:06 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8064A16A4E1; Mon, 14 Aug 2006 21:26:06 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 42ADB16A4DA for ; Mon, 14 Aug 2006 21:26:06 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7B09543D69 for ; Mon, 14 Aug 2006 21:26:05 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7ELQ5uf038560 for ; Mon, 14 Aug 2006 21:26:05 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7ELQ4K0038557 for perforce@freebsd.org; Mon, 14 Aug 2006 21:26:04 GMT (envelope-from jb@freebsd.org) Date: Mon, 14 Aug 2006 21:26:04 GMT Message-Id: <200608142126.k7ELQ4K0038557@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 103913 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 14 Aug 2006 21:26:06 -0000 http://perforce.freebsd.org/chv.cgi?CH=103913 Change 103913 by jb@jb_freebsd2 on 2006/08/14 21:25:39 Add some more common definitions from the Solaris Linker and Libraries guide. Move all the relocation definitions into the common header so that we can build ELF tools which can handle target machine arches by default. Affected files ... .. //depot/projects/dtrace/src/sys/amd64/include/elf.h#3 edit .. //depot/projects/dtrace/src/sys/arm/include/elf.h#3 edit .. //depot/projects/dtrace/src/sys/i386/include/elf.h#3 edit .. //depot/projects/dtrace/src/sys/ia64/include/elf.h#3 edit .. //depot/projects/dtrace/src/sys/powerpc/include/elf.h#3 edit .. //depot/projects/dtrace/src/sys/sparc64/include/elf.h#3 edit .. //depot/projects/dtrace/src/sys/sun4v/include/elf.h#2 edit .. //depot/projects/dtrace/src/sys/sys/elf_common.h#5 edit Differences ... ==== //depot/projects/dtrace/src/sys/amd64/include/elf.h#3 (text+ko) ==== @@ -108,31 +108,6 @@ * Relocation types. */ -#define R_X86_64_NONE 0 /* No relocation. */ -#define R_X86_64_64 1 /* Add 64 bit symbol value. */ -#define R_X86_64_PC32 2 /* PC-relative 32 bit signed sym value. */ -#define R_X86_64_GOT32 3 /* PC-relative 32 bit GOT offset. */ -#define R_X86_64_PLT32 4 /* PC-relative 32 bit PLT offset. */ -#define R_X86_64_COPY 5 /* Copy data from shared object. */ -#define R_X86_64_GLOB_DAT 6 /* Set GOT entry to data address. */ -#define R_X86_64_JMP_SLOT 7 /* Set GOT entry to code address. */ -#define R_X86_64_RELATIVE 8 /* Add load address of shared object. */ -#define R_X86_64_GOTPCREL 9 /* Add 32 bit signed pcrel offset to GOT. */ -#define R_X86_64_32 10 /* Add 32 bit zero extended symbol value */ -#define R_X86_64_32S 11 /* Add 32 bit sign extended symbol value */ -#define R_X86_64_16 12 /* Add 16 bit zero extended symbol value */ -#define R_X86_64_PC16 13 /* Add 16 bit signed extended pc relative symbol value */ -#define R_X86_64_8 14 /* Add 8 bit zero extended symbol value */ -#define R_X86_64_PC8 15 /* Add 8 bit signed extended pc relative symbol value */ -#define R_X86_64_DTPMOD64 16 /* ID of module containing symbol */ -#define R_X86_64_DTPOFF64 17 /* Offset in TLS block */ -#define R_X86_64_TPOFF64 18 /* Offset in static TLS block */ -#define R_X86_64_TLSGD 19 /* PC relative offset to GD GOT entry */ -#define R_X86_64_TLSLD 20 /* PC relative offset to LD GOT entry */ -#define R_X86_64_DTPOFF32 21 /* Offset in TLS block */ -#define R_X86_64_GOTTPOFF 22 /* PC relative offset to IE GOT entry */ -#define R_X86_64_TPOFF32 23 /* Offset in static TLS block */ - #define R_X86_64_COUNT 24 /* Count of defined relocation types. */ /* Define "machine" characteristics */ ==== //depot/projects/dtrace/src/sys/arm/include/elf.h#3 (text+ko) ==== @@ -82,40 +82,6 @@ #define AT_COUNT 15 /* Count of defined aux entry types. */ -#define R_ARM_NONE 0 /* No relocation. */ -#define R_ARM_PC24 1 -#define R_ARM_ABS32 2 -#define R_ARM_REL32 3 -#define R_ARM_PC13 4 -#define R_ARM_ABS16 5 -#define R_ARM_ABS12 6 -#define R_ARM_THM_ABS5 7 -#define R_ARM_ABS8 8 -#define R_ARM_SBREL32 9 -#define R_ARM_THM_PC22 10 -#define R_ARM_THM_PC8 11 -#define R_ARM_AMP_VCALL9 12 -#define R_ARM_SWI24 13 -#define R_ARM_THM_SWI8 14 -#define R_ARM_XPC25 15 -#define R_ARM_THM_XPC22 16 -#define R_ARM_COPY 20 /* Copy data from shared object. */ -#define R_ARM_GLOB_DAT 21 /* Set GOT entry to data address. */ -#define R_ARM_JUMP_SLOT 22 /* Set GOT entry to code address. */ -#define R_ARM_RELATIVE 23 /* Add load address of shared object. */ -#define R_ARM_GOTOFF 24 /* Add GOT-relative symbol address. */ -#define R_ARM_GOTPC 25 /* Add PC-relative GOT table address. */ -#define R_ARM_GOT32 26 /* Add PC-relative GOT offset. */ -#define R_ARM_PLT32 27 /* Add PC-relative PLT offset. */ -#define R_ARM_GNU_VTENTRY 100 -#define R_ARM_GNU_VTINHERIT 101 -#define R_ARM_RSBREL32 250 -#define R_ARM_THM_RPC22 251 -#define R_ARM_RREL32 252 -#define R_ARM_RABS32 253 -#define R_ARM_RPC24 254 -#define R_ARM_RBASE 255 - #define R_ARM_COUNT 33 /* Count of defined relocation types. */ ==== //depot/projects/dtrace/src/sys/i386/include/elf.h#3 (text+ko) ==== @@ -111,38 +111,6 @@ * Relocation types. */ -#define R_386_NONE 0 /* No relocation. */ -#define R_386_32 1 /* Add symbol value. */ -#define R_386_PC32 2 /* Add PC-relative symbol value. */ -#define R_386_GOT32 3 /* Add PC-relative GOT offset. */ -#define R_386_PLT32 4 /* Add PC-relative PLT offset. */ -#define R_386_COPY 5 /* Copy data from shared object. */ -#define R_386_GLOB_DAT 6 /* Set GOT entry to data address. */ -#define R_386_JMP_SLOT 7 /* Set GOT entry to code address. */ -#define R_386_RELATIVE 8 /* Add load address of shared object. */ -#define R_386_GOTOFF 9 /* Add GOT-relative symbol address. */ -#define R_386_GOTPC 10 /* Add PC-relative GOT table address. */ -#define R_386_TLS_TPOFF 14 /* Negative offset in static TLS block */ -#define R_386_TLS_IE 15 /* Absolute address of GOT for -ve static TLS */ -#define R_386_TLS_GOTIE 16 /* GOT entry for negative static TLS block */ -#define R_386_TLS_LE 17 /* Negative offset relative to static TLS */ -#define R_386_TLS_GD 18 /* 32 bit offset to GOT (index,off) pair */ -#define R_386_TLS_LDM 19 /* 32 bit offset to GOT (index,zero) pair */ -#define R_386_TLS_GD_32 24 /* 32 bit offset to GOT (index,off) pair */ -#define R_386_TLS_GD_PUSH 25 /* pushl instruction for Sun ABI GD sequence */ -#define R_386_TLS_GD_CALL 26 /* call instruction for Sun ABI GD sequence */ -#define R_386_TLS_GD_POP 27 /* popl instruction for Sun ABI GD sequence */ -#define R_386_TLS_LDM_32 28 /* 32 bit offset to GOT (index,zero) pair */ -#define R_386_TLS_LDM_PUSH 29 /* pushl instruction for Sun ABI LD sequence */ -#define R_386_TLS_LDM_CALL 30 /* call instruction for Sun ABI LD sequence */ -#define R_386_TLS_LDM_POP 31 /* popl instruction for Sun ABI LD sequence */ -#define R_386_TLS_LDO_32 32 /* 32 bit offset from start of TLS block */ -#define R_386_TLS_IE_32 33 /* 32 bit offset to GOT static TLS offset entry */ -#define R_386_TLS_LE_32 34 /* 32 bit offset within static TLS block */ -#define R_386_TLS_DTPMOD32 35 /* GOT entry containing TLS index */ -#define R_386_TLS_DTPOFF32 36 /* GOT entry containing TLS offset */ -#define R_386_TLS_TPOFF32 37 /* GOT entry of -ve static TLS offset */ - #define R_386_COUNT 38 /* Count of defined relocation types. */ /* Define "machine" characteristics */ ==== //depot/projects/dtrace/src/sys/ia64/include/elf.h#3 (text+ko) ==== @@ -141,92 +141,6 @@ #define SHF_IA_64_SHORT 0x10000000 #define SHF_IA_64_NORECOV 0x20000000 -/* - * Relocation types. - */ - -/* Name Value Field Calculation */ -#define R_IA_64_NONE 0 /* None */ -#define R_IA_64_IMM14 0x21 /* immediate14 S + A */ -#define R_IA_64_IMM22 0x22 /* immediate22 S + A */ -#define R_IA_64_IMM64 0x23 /* immediate64 S + A */ -#define R_IA_64_DIR32MSB 0x24 /* word32 MSB S + A */ -#define R_IA_64_DIR32LSB 0x25 /* word32 LSB S + A */ -#define R_IA_64_DIR64MSB 0x26 /* word64 MSB S + A */ -#define R_IA_64_DIR64LSB 0x27 /* word64 LSB S + A */ -#define R_IA_64_GPREL22 0x2a /* immediate22 @gprel(S + A) */ -#define R_IA_64_GPREL64I 0x2b /* immediate64 @gprel(S + A) */ -#define R_IA_64_GPREL32MSB 0x2c /* word32 MSB @gprel(S + A) */ -#define R_IA_64_GPREL32LSB 0x2d /* word32 LSB @gprel(S + A) */ -#define R_IA_64_GPREL64MSB 0x2e /* word64 MSB @gprel(S + A) */ -#define R_IA_64_GPREL64LSB 0x2f /* word64 LSB @gprel(S + A) */ -#define R_IA_64_LTOFF22 0x32 /* immediate22 @ltoff(S + A) */ -#define R_IA_64_LTOFF64I 0x33 /* immediate64 @ltoff(S + A) */ -#define R_IA_64_PLTOFF22 0x3a /* immediate22 @pltoff(S + A) */ -#define R_IA_64_PLTOFF64I 0x3b /* immediate64 @pltoff(S + A) */ -#define R_IA_64_PLTOFF64MSB 0x3e /* word64 MSB @pltoff(S + A) */ -#define R_IA_64_PLTOFF64LSB 0x3f /* word64 LSB @pltoff(S + A) */ -#define R_IA_64_FPTR64I 0x43 /* immediate64 @fptr(S + A) */ -#define R_IA_64_FPTR32MSB 0x44 /* word32 MSB @fptr(S + A) */ -#define R_IA_64_FPTR32LSB 0x45 /* word32 LSB @fptr(S + A) */ -#define R_IA_64_FPTR64MSB 0x46 /* word64 MSB @fptr(S + A) */ -#define R_IA_64_FPTR64LSB 0x47 /* word64 LSB @fptr(S + A) */ -#define R_IA_64_PCREL60B 0x48 /* immediate60 form1 S + A - P */ -#define R_IA_64_PCREL21B 0x49 /* immediate21 form1 S + A - P */ -#define R_IA_64_PCREL21M 0x4a /* immediate21 form2 S + A - P */ -#define R_IA_64_PCREL21F 0x4b /* immediate21 form3 S + A - P */ -#define R_IA_64_PCREL32MSB 0x4c /* word32 MSB S + A - P */ -#define R_IA_64_PCREL32LSB 0x4d /* word32 LSB S + A - P */ -#define R_IA_64_PCREL64MSB 0x4e /* word64 MSB S + A - P */ -#define R_IA_64_PCREL64LSB 0x4f /* word64 LSB S + A - P */ -#define R_IA_64_LTOFF_FPTR22 0x52 /* immediate22 @ltoff(@fptr(S + A)) */ -#define R_IA_64_LTOFF_FPTR64I 0x53 /* immediate64 @ltoff(@fptr(S + A)) */ -#define R_IA_64_LTOFF_FPTR32MSB 0x54 /* word32 MSB @ltoff(@fptr(S + A)) */ -#define R_IA_64_LTOFF_FPTR32LSB 0x55 /* word32 LSB @ltoff(@fptr(S + A)) */ -#define R_IA_64_LTOFF_FPTR64MSB 0x56 /* word64 MSB @ltoff(@fptr(S + A)) */ -#define R_IA_64_LTOFF_FPTR64LSB 0x57 /* word64 LSB @ltoff(@fptr(S + A)) */ -#define R_IA_64_SEGREL32MSB 0x5c /* word32 MSB @segrel(S + A) */ -#define R_IA_64_SEGREL32LSB 0x5d /* word32 LSB @segrel(S + A) */ -#define R_IA_64_SEGREL64MSB 0x5e /* word64 MSB @segrel(S + A) */ -#define R_IA_64_SEGREL64LSB 0x5f /* word64 LSB @segrel(S + A) */ -#define R_IA_64_SECREL32MSB 0x64 /* word32 MSB @secrel(S + A) */ -#define R_IA_64_SECREL32LSB 0x65 /* word32 LSB @secrel(S + A) */ -#define R_IA_64_SECREL64MSB 0x66 /* word64 MSB @secrel(S + A) */ -#define R_IA_64_SECREL64LSB 0x67 /* word64 LSB @secrel(S + A) */ -#define R_IA_64_REL32MSB 0x6c /* word32 MSB BD + A */ -#define R_IA_64_REL32LSB 0x6d /* word32 LSB BD + A */ -#define R_IA_64_REL64MSB 0x6e /* word64 MSB BD + A */ -#define R_IA_64_REL64LSB 0x6f /* word64 LSB BD + A */ -#define R_IA_64_LTV32MSB 0x74 /* word32 MSB S + A */ -#define R_IA_64_LTV32LSB 0x75 /* word32 LSB S + A */ -#define R_IA_64_LTV64MSB 0x76 /* word64 MSB S + A */ -#define R_IA_64_LTV64LSB 0x77 /* word64 LSB S + A */ -#define R_IA_64_PCREL21BI 0x79 /* immediate21 form1 S + A - P */ -#define R_IA_64_PCREL22 0x7a /* immediate22 S + A - P */ -#define R_IA_64_PCREL64I 0x7b /* immediate64 S + A - P */ -#define R_IA_64_IPLTMSB 0x80 /* function descriptor MSB special */ -#define R_IA_64_IPLTLSB 0x81 /* function descriptor LSB speciaal */ -#define R_IA_64_SUB 0x85 /* immediate64 A - S */ -#define R_IA_64_LTOFF22X 0x86 /* immediate22 special */ -#define R_IA_64_LDXMOV 0x87 /* immediate22 special */ -#define R_IA_64_TPREL14 0x91 /* imm14 @tprel(S + A) */ -#define R_IA_64_TPREL22 0x92 /* imm22 @tprel(S + A) */ -#define R_IA_64_TPREL64I 0x93 /* imm64 @tprel(S + A) */ -#define R_IA_64_TPREL64MSB 0x96 /* word64 MSB @tprel(S + A) */ -#define R_IA_64_TPREL64LSB 0x97 /* word64 LSB @tprel(S + A) */ -#define R_IA_64_LTOFF_TPREL22 0x9a /* imm22 @ltoff(@tprel(S+A)) */ -#define R_IA_64_DTPMOD64MSB 0xa6 /* word64 MSB @dtpmod(S + A) */ -#define R_IA_64_DTPMOD64LSB 0xa7 /* word64 LSB @dtpmod(S + A) */ -#define R_IA_64_LTOFF_DTPMOD22 0xaa /* imm22 @ltoff(@dtpmod(S+A)) */ -#define R_IA_64_DTPREL14 0xb1 /* imm14 @dtprel(S + A) */ -#define R_IA_64_DTPREL22 0xb2 /* imm22 @dtprel(S + A) */ -#define R_IA_64_DTPREL64I 0xb3 /* imm64 @dtprel(S + A) */ -#define R_IA_64_DTPREL32MSB 0xb4 /* word32 MSB @dtprel(S + A) */ -#define R_IA_64_DTPREL32LSB 0xb5 /* word32 LSB @dtprel(S + A) */ -#define R_IA_64_DTPREL64MSB 0xb6 /* word64 MSB @dtprel(S + A) */ -#define R_IA_64_DTPREL64LSB 0xb7 /* word64 LSB @dtprel(S + A) */ -#define R_IA_64_LTOFF_DTPREL22 0xba /* imm22 @ltoff(@dtprel(S+A)) */ - /* Define "machine" characteristics */ #if __ELF_WORD_SIZE == 32 #define ELF_TARG_CLASS ELFCLASS32 ==== //depot/projects/dtrace/src/sys/powerpc/include/elf.h#3 (text+ko) ==== @@ -87,96 +87,8 @@ * Relocation types. */ -#define R_PPC_NONE 0 /* No relocation. */ -#define R_PPC_ADDR32 1 -#define R_PPC_ADDR24 2 -#define R_PPC_ADDR16 3 -#define R_PPC_ADDR16_LO 4 -#define R_PPC_ADDR16_HI 5 -#define R_PPC_ADDR16_HA 6 -#define R_PPC_ADDR14 7 -#define R_PPC_ADDR14_BRTAKEN 8 -#define R_PPC_ADDR14_BRNTAKEN 9 -#define R_PPC_REL24 10 -#define R_PPC_REL14 11 -#define R_PPC_REL14_BRTAKEN 12 -#define R_PPC_REL14_BRNTAKEN 13 -#define R_PPC_GOT16 14 -#define R_PPC_GOT16_LO 15 -#define R_PPC_GOT16_HI 16 -#define R_PPC_GOT16_HA 17 -#define R_PPC_PLTREL24 18 -#define R_PPC_COPY 19 -#define R_PPC_GLOB_DAT 20 -#define R_PPC_JMP_SLOT 21 -#define R_PPC_RELATIVE 22 -#define R_PPC_LOCAL24PC 23 -#define R_PPC_UADDR32 24 -#define R_PPC_UADDR16 25 -#define R_PPC_REL32 26 -#define R_PPC_PLT32 27 -#define R_PPC_PLTREL32 28 -#define R_PPC_PLT16_LO 29 -#define R_PPC_PLT16_HI 30 -#define R_PPC_PLT16_HA 31 -#define R_PPC_SDAREL16 32 -#define R_PPC_SECTOFF 33 -#define R_PPC_SECTOFF_LO 34 -#define R_PPC_SECTOFF_HI 35 -#define R_PPC_SECTOFF_HA 36 - #define R_PPC_COUNT 37 /* Count of defined relocation types. */ -/* - * TLS relocations - */ -#define R_PPC_TLS 67 -#define R_PPC_DTPMOD32 68 -#define R_PPC_TPREL16 69 -#define R_PPC_TPREL16_LO 70 -#define R_PPC_TPREL16_HI 71 -#define R_PPC_TPREL16_HA 72 -#define R_PPC_TPREL32 73 -#define R_PPC_DTPREL16 74 -#define R_PPC_DTPREL16_LO 75 -#define R_PPC_DTPREL16_HI 76 -#define R_PPC_DTPREL16_HA 77 -#define R_PPC_DTPREL32 78 -#define R_PPC_GOT_TLSGD16 79 -#define R_PPC_GOT_TLSGD16_LO 80 -#define R_PPC_GOT_TLSGD16_HI 81 -#define R_PPC_GOT_TLSGD16_HA 82 -#define R_PPC_GOT_TLSLD16 83 -#define R_PPC_GOT_TLSLD16_LO 84 -#define R_PPC_GOT_TLSLD16_HI 85 -#define R_PPC_GOT_TLSLD16_HA 86 -#define R_PPC_GOT_TPREL16 87 -#define R_PPC_GOT_TPREL16_LO 88 -#define R_PPC_GOT_TPREL16_HI 89 -#define R_PPC_GOT_TPREL16_HA 90 - -/* - * The remaining relocs are from the Embedded ELF ABI, and are not in the - * SVR4 ELF ABI. - */ - -#define R_PPC_EMB_NADDR32 101 -#define R_PPC_EMB_NADDR16 102 -#define R_PPC_EMB_NADDR16_LO 103 -#define R_PPC_EMB_NADDR16_HI 104 -#define R_PPC_EMB_NADDR16_HA 105 -#define R_PPC_EMB_SDAI16 106 -#define R_PPC_EMB_SDA2I16 107 -#define R_PPC_EMB_SDA2REL 108 -#define R_PPC_EMB_SDA21 109 -#define R_PPC_EMB_MRKREF 110 -#define R_PPC_EMB_RELSEC16 111 -#define R_PPC_EMB_RELST_LO 112 -#define R_PPC_EMB_RELST_HI 113 -#define R_PPC_EMB_RELST_HA 114 -#define R_PPC_EMB_BIT_FLD 115 -#define R_PPC_EMB_RELSDA 116 - /* Count of defined relocation types. */ #define R_PPC_EMB_COUNT (R_PPC_EMB_RELSDA - R_PPC_EMB_NADDR32 + 1) ==== //depot/projects/dtrace/src/sys/sparc64/include/elf.h#3 (text+ko) ==== @@ -101,90 +101,6 @@ #define AT_COUNT 15 /* Count of defined aux entry types. */ -/* - * Relocation types. - */ -#define R_SPARC_NONE 0 -#define R_SPARC_8 1 -#define R_SPARC_16 2 -#define R_SPARC_32 3 -#define R_SPARC_DISP8 4 -#define R_SPARC_DISP16 5 -#define R_SPARC_DISP32 6 -#define R_SPARC_WDISP30 7 -#define R_SPARC_WDISP22 8 -#define R_SPARC_HI22 9 -#define R_SPARC_22 10 -#define R_SPARC_13 11 -#define R_SPARC_LO10 12 -#define R_SPARC_GOT10 13 -#define R_SPARC_GOT13 14 -#define R_SPARC_GOT22 15 -#define R_SPARC_PC10 16 -#define R_SPARC_PC22 17 -#define R_SPARC_WPLT30 18 -#define R_SPARC_COPY 19 -#define R_SPARC_GLOB_DAT 20 -#define R_SPARC_JMP_SLOT 21 -#define R_SPARC_RELATIVE 22 -#define R_SPARC_UA32 23 -#define R_SPARC_PLT32 24 -#define R_SPARC_HIPLT22 25 -#define R_SPARC_LOPLT10 26 -#define R_SPARC_PCPLT32 27 -#define R_SPARC_PCPLT22 28 -#define R_SPARC_PCPLT10 29 -#define R_SPARC_10 30 -#define R_SPARC_11 31 -#define R_SPARC_64 32 -#define R_SPARC_OLO10 33 -#define R_SPARC_HH22 34 -#define R_SPARC_HM10 35 -#define R_SPARC_LM22 36 -#define R_SPARC_PC_HH22 37 -#define R_SPARC_PC_HM10 38 -#define R_SPARC_PC_LM22 39 -#define R_SPARC_WDISP16 40 -#define R_SPARC_WDISP19 41 -#define R_SPARC_GLOB_JMP 42 -#define R_SPARC_7 43 -#define R_SPARC_5 44 -#define R_SPARC_6 45 -#define R_SPARC_DISP64 46 -#define R_SPARC_PLT64 47 -#define R_SPARC_HIX22 48 -#define R_SPARC_LOX10 49 -#define R_SPARC_H44 50 -#define R_SPARC_M44 51 -#define R_SPARC_L44 52 -#define R_SPARC_REGISTER 53 -#define R_SPARC_UA64 54 -#define R_SPARC_UA16 55 -#define R_SPARC_TLS_GD_HI22 56 -#define R_SPARC_TLS_GD_LO10 57 -#define R_SPARC_TLS_GD_ADD 58 -#define R_SPARC_TLS_GD_CALL 59 -#define R_SPARC_TLS_LDM_HI22 60 -#define R_SPARC_TLS_LDM_LO10 61 -#define R_SPARC_TLS_LDM_ADD 62 -#define R_SPARC_TLS_LDM_CALL 63 -#define R_SPARC_TLS_LDO_HIX22 64 -#define R_SPARC_TLS_LDO_LOX10 65 -#define R_SPARC_TLS_LDO_ADD 66 -#define R_SPARC_TLS_IE_HI22 67 -#define R_SPARC_TLS_IE_LO10 68 -#define R_SPARC_TLS_IE_LD 69 -#define R_SPARC_TLS_IE_LDX 70 -#define R_SPARC_TLS_IE_ADD 71 -#define R_SPARC_TLS_LE_HIX22 72 -#define R_SPARC_TLS_LE_LOX10 73 -#define R_SPARC_TLS_DTPMOD32 74 -#define R_SPARC_TLS_DTPMOD64 75 -#define R_SPARC_TLS_DTPOFF32 76 -#define R_SPARC_TLS_DTPOFF64 77 -#define R_SPARC_TLS_TPOFF32 78 -#define R_SPARC_TLS_TPOFF64 79 - /* Define "machine" characteristics */ #if __ELF_WORD_SIZE == 32 #define ELF_TARG_CLASS ELFCLASS32 ==== //depot/projects/dtrace/src/sys/sun4v/include/elf.h#2 (text+ko) ==== @@ -101,90 +101,6 @@ #define AT_COUNT 15 /* Count of defined aux entry types. */ -/* - * Relocation types. - */ -#define R_SPARC_NONE 0 -#define R_SPARC_8 1 -#define R_SPARC_16 2 -#define R_SPARC_32 3 -#define R_SPARC_DISP8 4 -#define R_SPARC_DISP16 5 -#define R_SPARC_DISP32 6 -#define R_SPARC_WDISP30 7 -#define R_SPARC_WDISP22 8 -#define R_SPARC_HI22 9 -#define R_SPARC_22 10 -#define R_SPARC_13 11 -#define R_SPARC_LO10 12 -#define R_SPARC_GOT10 13 -#define R_SPARC_GOT13 14 -#define R_SPARC_GOT22 15 -#define R_SPARC_PC10 16 -#define R_SPARC_PC22 17 -#define R_SPARC_WPLT30 18 -#define R_SPARC_COPY 19 -#define R_SPARC_GLOB_DAT 20 -#define R_SPARC_JMP_SLOT 21 -#define R_SPARC_RELATIVE 22 -#define R_SPARC_UA32 23 -#define R_SPARC_PLT32 24 -#define R_SPARC_HIPLT22 25 -#define R_SPARC_LOPLT10 26 -#define R_SPARC_PCPLT32 27 -#define R_SPARC_PCPLT22 28 -#define R_SPARC_PCPLT10 29 -#define R_SPARC_10 30 -#define R_SPARC_11 31 -#define R_SPARC_64 32 -#define R_SPARC_OLO10 33 -#define R_SPARC_HH22 34 -#define R_SPARC_HM10 35 -#define R_SPARC_LM22 36 -#define R_SPARC_PC_HH22 37 -#define R_SPARC_PC_HM10 38 -#define R_SPARC_PC_LM22 39 -#define R_SPARC_WDISP16 40 -#define R_SPARC_WDISP19 41 -#define R_SPARC_GLOB_JMP 42 -#define R_SPARC_7 43 -#define R_SPARC_5 44 -#define R_SPARC_6 45 -#define R_SPARC_DISP64 46 -#define R_SPARC_PLT64 47 -#define R_SPARC_HIX22 48 -#define R_SPARC_LOX10 49 -#define R_SPARC_H44 50 -#define R_SPARC_M44 51 -#define R_SPARC_L44 52 -#define R_SPARC_REGISTER 53 -#define R_SPARC_UA64 54 -#define R_SPARC_UA16 55 -#define R_SPARC_TLS_GD_HI22 56 -#define R_SPARC_TLS_GD_LO10 57 -#define R_SPARC_TLS_GD_ADD 58 -#define R_SPARC_TLS_GD_CALL 59 -#define R_SPARC_TLS_LDM_HI22 60 -#define R_SPARC_TLS_LDM_LO10 61 -#define R_SPARC_TLS_LDM_ADD 62 -#define R_SPARC_TLS_LDM_CALL 63 -#define R_SPARC_TLS_LDO_HIX22 64 -#define R_SPARC_TLS_LDO_LOX10 65 -#define R_SPARC_TLS_LDO_ADD 66 -#define R_SPARC_TLS_IE_HI22 67 -#define R_SPARC_TLS_IE_LO10 68 -#define R_SPARC_TLS_IE_LD 69 -#define R_SPARC_TLS_IE_LDX 70 -#define R_SPARC_TLS_IE_ADD 71 -#define R_SPARC_TLS_LE_HIX22 72 -#define R_SPARC_TLS_LE_LOX10 73 -#define R_SPARC_TLS_DTPMOD32 74 -#define R_SPARC_TLS_DTPMOD64 75 -#define R_SPARC_TLS_DTPOFF32 76 -#define R_SPARC_TLS_DTPOFF64 77 -#define R_SPARC_TLS_TPOFF32 78 -#define R_SPARC_TLS_TPOFF64 79 - /* Define "machine" characteristics */ #if __ELF_WORD_SIZE == 32 #define ELF_TARG_CLASS ELFCLASS32 ==== //depot/projects/dtrace/src/sys/sys/elf_common.h#5 (text+ko) ==== @@ -168,6 +168,7 @@ #define EM_ST100 60 /* STMicroelectronics ST100 processor. */ #define EM_TINYJ 61 /* Advanced Logic Corp. TinyJ processor. */ #define EM_X86_64 62 /* Advanced Micro Devices x86-64 */ +#define EM_AMD64 EM_X86_64 /* Advanced Micro Devices x86-64 (compat) */ /* Non-standard or deprecated. */ #define EM_486 6 /* Intel i486. */ @@ -205,15 +206,30 @@ #define SHT_PREINIT_ARRAY 16 /* Pre-initialization function ptrs. */ #define SHT_GROUP 17 /* Section group. */ #define SHT_SYMTAB_SHNDX 18 /* Section indexes (see SHN_XINDEX). */ -#define SHT_LOOS 0x60000000 /* First of OS specific semantics */ -#define SHT_GNU_verdef 0x6ffffffd /* Symbol versions provided */ -#define SHT_GNU_verneed 0x6ffffffe /* Symbol versions required */ -#define SHT_GNU_versym 0x6fffffff /* Symbol version table */ -#define SHT_HIOS 0x6fffffff /* Last of OS specific semantics */ -#define SHT_LOPROC 0x70000000 /* reserved range for processor */ -#define SHT_HIPROC 0x7fffffff /* specific section header types */ -#define SHT_LOUSER 0x80000000 /* reserved range for application */ -#define SHT_HIUSER 0xffffffff /* specific indexes */ +#define SHT_LOOS 0x60000000 /* First of OS specific semantics */ +#define SHT_LOSUNW 0x6ffffff4 +#define SHT_SUNW_dof 0x6ffffff4 +#define SHT_SUNW_cap 0x6ffffff5 +#define SHT_SUNW_SIGNATURE 0x6ffffff6 +#define SHT_SUNW_ANNOTATE 0x6ffffff7 +#define SHT_SUNW_DEBUGSTR 0x6ffffff8 +#define SHT_SUNW_DEBUG 0x6ffffff9 +#define SHT_SUNW_move 0x6ffffffa +#define SHT_SUNW_COMDAT 0x6ffffffb +#define SHT_SUNW_syminfo 0x6ffffffc +#define SHT_SUNW_verdef 0x6ffffffd +#define SHT_GNU_verdef 0x6ffffffd /* Symbol versions provided */ +#define SHT_SUNW_verneed 0x6ffffffe +#define SHT_GNU_verneed 0x6ffffffe /* Symbol versions required */ +#define SHT_SUNW_versym 0x6fffffff +#define SHT_GNU_versym 0x6fffffff /* Symbol version table */ +#define SHT_HISUNW 0x6fffffff +#define SHT_HIOS 0x6fffffff /* Last of OS specific semantics */ +#define SHT_LOPROC 0x70000000 /* reserved range for processor */ +#define SHT_AMD64_UNWIND 0x70000001 /* unwind information */ +#define SHT_HIPROC 0x7fffffff /* specific section header types */ +#define SHT_LOUSER 0x80000000 /* reserved range for application */ +#define SHT_HIUSER 0xffffffff /* specific indexes */ /* Flags for sh_flags. */ #define SHF_WRITE 0x1 /* Section contains writable data. */ @@ -239,6 +255,14 @@ #define PT_PHDR 6 /* Location of program header itself. */ #define PT_TLS 7 /* Thread local storage segment */ #define PT_LOOS 0x60000000 /* First OS-specific. */ +#define PT_SUNW_UNWIND 0x6464e550 /* amd64 UNWIND program header */ +#define PT_GNU_EH_FRAME PT_SUNW_UNWIND +#define PT_LOSUNW 0x6ffffffa +#define PT_SUNWBSS 0x6ffffffa /* Sun Specific segment */ +#define PT_SUNWSTACK 0x6ffffffb /* describes the stack segment */ +#define PT_SUNWDTRACE 0x6ffffffc /* private */ +#define PT_SUNWCAP 0x6ffffffd /* hard/soft capabilities segment */ +#define PT_HISUNW 0x6fffffff #define PT_HIOS 0x6fffffff /* Last OS-specific. */ #define PT_LOPROC 0x70000000 /* First processor-specific type. */ #define PT_HIPROC 0x7fffffff /* Last processor-specific type. */ @@ -299,17 +323,63 @@ pre-initialization functions. */ #define DT_PREINIT_ARRAYSZ 33 /* Size in bytes of the array of pre-initialization functions. */ +#define DT_MAXPOSTAGS 34 /* number of positive tags */ #define DT_LOOS 0x6000000d /* First OS-specific */ +#define DT_SUNW_AUXILIARY 0x6000000d /* symbol auxiliary name */ +#define DT_SUNW_RTLDINF 0x6000000e /* ld.so.1 info (private) */ +#define DT_SUNW_FILTER 0x6000000f /* symbol filter name */ +#define DT_SUNW_CAP 0x60000010 /* hardware/software */ #define DT_HIOS 0x6ffff000 /* Last OS-specific */ -#define DT_LOPROC 0x70000000 /* First processor-specific type. */ -#define DT_HIPROC 0x7fffffff /* Last processor-specific type. */ + +/* + * DT_* entries which fall between DT_VALRNGHI & DT_VALRNGLO use the + * Dyn.d_un.d_val field of the Elf*_Dyn structure. + */ +#define DT_VALRNGLO 0x6ffffd00 +#define DT_CHECKSUM 0x6ffffdf8 /* elf checksum */ +#define DT_PLTPADSZ 0x6ffffdf9 /* pltpadding size */ +#define DT_MOVEENT 0x6ffffdfa /* move table entry size */ +#define DT_MOVESZ 0x6ffffdfb /* move table size */ +#define DT_FEATURE_1 0x6ffffdfc /* feature holder */ +#define DT_POSFLAG_1 0x6ffffdfd /* flags for DT_* entries, effecting */ + /* the following DT_* entry. */ + /* See DF_P1_* definitions */ +#define DT_SYMINSZ 0x6ffffdfe /* syminfo table size (in bytes) */ +#define DT_SYMINENT 0x6ffffdff /* syminfo entry size (in bytes) */ +#define DT_VALRNGHI 0x6ffffdff + +/* + * DT_* entries which fall between DT_ADDRRNGHI & DT_ADDRRNGLO use the + * Dyn.d_un.d_ptr field of the Elf*_Dyn structure. + * + * If any adjustment is made to the ELF object after it has been + * built, these entries will need to be adjusted. + */ +#define DT_ADDRRNGLO 0x6ffffe00 +#define DT_CONFIG 0x6ffffefa /* configuration information */ +#define DT_DEPAUDIT 0x6ffffefb /* dependency auditing */ +#define DT_AUDIT 0x6ffffefc /* object auditing */ +#define DT_PLTPAD 0x6ffffefd /* pltpadding (sparcv9) */ +#define DT_MOVETAB 0x6ffffefe /* move table */ +#define DT_SYMINFO 0x6ffffeff /* syminfo table */ +#define DT_ADDRRNGHI 0x6ffffeff #define DT_VERSYM 0x6ffffff0 /* Address of versym section. */ +#define DT_RELACOUNT 0x6ffffff9 /* number of RELATIVE relocations */ +#define DT_RELCOUNT 0x6ffffffa /* number of RELATIVE relocations */ +#define DT_FLAGS_1 0x6ffffffb /* state flags - see DF_1_* defs */ #define DT_VERDEF 0x6ffffffc /* Address of verdef section. */ #define DT_VERDEFNUM 0x6ffffffd /* Number of elems in verdef section */ #define DT_VERNEED 0x6ffffffe /* Address of verneed section. */ #define DT_VERNEEDNUM 0x6fffffff /* Number of elems in verneed section */ +#define DT_LOPROC 0x70000000 /* First processor-specific type. */ +#define DT_DEPRECATED_SPARC_REGISTER 0x7000001 +#define DT_AUXILIARY 0x7ffffffd /* shared library auxiliary name */ +#define DT_USED 0x7ffffffe /* ignored - same as needed */ +#define DT_FILTER 0x7fffffff /* shared library filter name */ +#define DT_HIPROC 0x7fffffff /* Last processor-specific type. */ + /* Values for DT_FLAGS */ #define DF_ORIGIN 0x0001 /* Indicates that the object being loaded may make reference to the $ORIGIN substitution @@ -381,4 +451,390 @@ #define VER_NDX_HIDDEN (1u << 15) #define VER_NDX(x) ((x) & ~(1u << 15)) +#define CA_SUNW_NULL 0 +#define CA_SUNW_HW_1 1 /* first hardware capabilities entry */ +#define CA_SUNW_SF_1 2 /* first software capabilities entry */ + +/* + * Syminfo flag values + */ +#define SYMINFO_FLG_DIRECT 0x0001 /* symbol ref has direct association */ + /* to object containing defn. */ +#define SYMINFO_FLG_PASSTHRU 0x0002 /* ignored - see SYMINFO_FLG_FILTER */ +#define SYMINFO_FLG_COPY 0x0004 /* symbol is a copy-reloc */ +#define SYMINFO_FLG_LAZYLOAD 0x0008 /* object containing defn should be */ + /* lazily-loaded */ +#define SYMINFO_FLG_DIRECTBIND 0x0010 /* ref should be bound directly to */ + /* object containing defn. */ +#define SYMINFO_FLG_NOEXTDIRECT 0x0020 /* don't let an external reference */ + /* directly bind to this symbol */ +#define SYMINFO_FLG_FILTER 0x0002 /* symbol ref is associated to a */ +#define SYMINFO_FLG_AUXILIARY 0x0040 /* standard or auxiliary filter */ + +/* + * Syminfo.si_boundto values. + */ +#define SYMINFO_BT_SELF 0xffff /* symbol bound to self */ +#define SYMINFO_BT_PARENT 0xfffe /* symbol bound to parent */ +#define SYMINFO_BT_NONE 0xfffd /* no special symbol binding */ +#define SYMINFO_BT_EXTERN 0xfffc /* symbol defined as external */ +#define SYMINFO_BT_LOWRESERVE 0xff00 /* beginning of reserved entries */ + +/* + * Syminfo version values. + */ +#define SYMINFO_NONE 0 /* Syminfo version */ +#define SYMINFO_CURRENT 1 +#define SYMINFO_NUM 2 + +/* + * Relocation types. + * + * All machine architectures are defined here to allow tools on one to + * handle others. + */ + +#define R_386_NONE 0 /* No relocation. */ +#define R_386_32 1 /* Add symbol value. */ +#define R_386_PC32 2 /* Add PC-relative symbol value. */ +#define R_386_GOT32 3 /* Add PC-relative GOT offset. */ +#define R_386_PLT32 4 /* Add PC-relative PLT offset. */ +#define R_386_COPY 5 /* Copy data from shared object. */ +#define R_386_GLOB_DAT 6 /* Set GOT entry to data address. */ +#define R_386_JMP_SLOT 7 /* Set GOT entry to code address. */ +#define R_386_RELATIVE 8 /* Add load address of shared object. */ +#define R_386_GOTOFF 9 /* Add GOT-relative symbol address. */ +#define R_386_GOTPC 10 /* Add PC-relative GOT table address. */ +#define R_386_TLS_TPOFF 14 /* Negative offset in static TLS block */ +#define R_386_TLS_IE 15 /* Absolute address of GOT for -ve static TLS */ +#define R_386_TLS_GOTIE 16 /* GOT entry for negative static TLS block */ +#define R_386_TLS_LE 17 /* Negative offset relative to static TLS */ +#define R_386_TLS_GD 18 /* 32 bit offset to GOT (index,off) pair */ +#define R_386_TLS_LDM 19 /* 32 bit offset to GOT (index,zero) pair */ +#define R_386_TLS_GD_32 24 /* 32 bit offset to GOT (index,off) pair */ +#define R_386_TLS_GD_PUSH 25 /* pushl instruction for Sun ABI GD sequence */ +#define R_386_TLS_GD_CALL 26 /* call instruction for Sun ABI GD sequence */ +#define R_386_TLS_GD_POP 27 /* popl instruction for Sun ABI GD sequence */ +#define R_386_TLS_LDM_32 28 /* 32 bit offset to GOT (index,zero) pair */ +#define R_386_TLS_LDM_PUSH 29 /* pushl instruction for Sun ABI LD sequence */ +#define R_386_TLS_LDM_CALL 30 /* call instruction for Sun ABI LD sequence */ +#define R_386_TLS_LDM_POP 31 /* popl instruction for Sun ABI LD sequence */ +#define R_386_TLS_LDO_32 32 /* 32 bit offset from start of TLS block */ +#define R_386_TLS_IE_32 33 /* 32 bit offset to GOT static TLS offset entry */ +#define R_386_TLS_LE_32 34 /* 32 bit offset within static TLS block */ +#define R_386_TLS_DTPMOD32 35 /* GOT entry containing TLS index */ +#define R_386_TLS_DTPOFF32 36 /* GOT entry containing TLS offset */ +#define R_386_TLS_TPOFF32 37 /* GOT entry of -ve static TLS offset */ + +#define R_ARM_NONE 0 /* No relocation. */ +#define R_ARM_PC24 1 +#define R_ARM_ABS32 2 +#define R_ARM_REL32 3 +#define R_ARM_PC13 4 +#define R_ARM_ABS16 5 +#define R_ARM_ABS12 6 +#define R_ARM_THM_ABS5 7 +#define R_ARM_ABS8 8 +#define R_ARM_SBREL32 9 +#define R_ARM_THM_PC22 10 +#define R_ARM_THM_PC8 11 +#define R_ARM_AMP_VCALL9 12 +#define R_ARM_SWI24 13 +#define R_ARM_THM_SWI8 14 +#define R_ARM_XPC25 15 +#define R_ARM_THM_XPC22 16 +#define R_ARM_COPY 20 /* Copy data from shared object. */ +#define R_ARM_GLOB_DAT 21 /* Set GOT entry to data address. */ +#define R_ARM_JUMP_SLOT 22 /* Set GOT entry to code address. */ +#define R_ARM_RELATIVE 23 /* Add load address of shared object. */ +#define R_ARM_GOTOFF 24 /* Add GOT-relative symbol address. */ +#define R_ARM_GOTPC 25 /* Add PC-relative GOT table address. */ +#define R_ARM_GOT32 26 /* Add PC-relative GOT offset. */ +#define R_ARM_PLT32 27 /* Add PC-relative PLT offset. */ +#define R_ARM_GNU_VTENTRY 100 +#define R_ARM_GNU_VTINHERIT 101 +#define R_ARM_RSBREL32 250 +#define R_ARM_THM_RPC22 251 +#define R_ARM_RREL32 252 +#define R_ARM_RABS32 253 +#define R_ARM_RPC24 254 +#define R_ARM_RBASE 255 + +/* Name Value Field Calculation */ +#define R_IA_64_NONE 0 /* None */ +#define R_IA_64_IMM14 0x21 /* immediate14 S + A */ +#define R_IA_64_IMM22 0x22 /* immediate22 S + A */ +#define R_IA_64_IMM64 0x23 /* immediate64 S + A */ +#define R_IA_64_DIR32MSB 0x24 /* word32 MSB S + A */ +#define R_IA_64_DIR32LSB 0x25 /* word32 LSB S + A */ +#define R_IA_64_DIR64MSB 0x26 /* word64 MSB S + A */ +#define R_IA_64_DIR64LSB 0x27 /* word64 LSB S + A */ +#define R_IA_64_GPREL22 0x2a /* immediate22 @gprel(S + A) */ +#define R_IA_64_GPREL64I 0x2b /* immediate64 @gprel(S + A) */ +#define R_IA_64_GPREL32MSB 0x2c /* word32 MSB @gprel(S + A) */ +#define R_IA_64_GPREL32LSB 0x2d /* word32 LSB @gprel(S + A) */ +#define R_IA_64_GPREL64MSB 0x2e /* word64 MSB @gprel(S + A) */ +#define R_IA_64_GPREL64LSB 0x2f /* word64 LSB @gprel(S + A) */ +#define R_IA_64_LTOFF22 0x32 /* immediate22 @ltoff(S + A) */ +#define R_IA_64_LTOFF64I 0x33 /* immediate64 @ltoff(S + A) */ +#define R_IA_64_PLTOFF22 0x3a /* immediate22 @pltoff(S + A) */ +#define R_IA_64_PLTOFF64I 0x3b /* immediate64 @pltoff(S + A) */ +#define R_IA_64_PLTOFF64MSB 0x3e /* word64 MSB @pltoff(S + A) */ +#define R_IA_64_PLTOFF64LSB 0x3f /* word64 LSB @pltoff(S + A) */ +#define R_IA_64_FPTR64I 0x43 /* immediate64 @fptr(S + A) */ +#define R_IA_64_FPTR32MSB 0x44 /* word32 MSB @fptr(S + A) */ +#define R_IA_64_FPTR32LSB 0x45 /* word32 LSB @fptr(S + A) */ +#define R_IA_64_FPTR64MSB 0x46 /* word64 MSB @fptr(S + A) */ +#define R_IA_64_FPTR64LSB 0x47 /* word64 LSB @fptr(S + A) */ +#define R_IA_64_PCREL60B 0x48 /* immediate60 form1 S + A - P */ +#define R_IA_64_PCREL21B 0x49 /* immediate21 form1 S + A - P */ +#define R_IA_64_PCREL21M 0x4a /* immediate21 form2 S + A - P */ +#define R_IA_64_PCREL21F 0x4b /* immediate21 form3 S + A - P */ +#define R_IA_64_PCREL32MSB 0x4c /* word32 MSB S + A - P */ +#define R_IA_64_PCREL32LSB 0x4d /* word32 LSB S + A - P */ +#define R_IA_64_PCREL64MSB 0x4e /* word64 MSB S + A - P */ +#define R_IA_64_PCREL64LSB 0x4f /* word64 LSB S + A - P */ +#define R_IA_64_LTOFF_FPTR22 0x52 /* immediate22 @ltoff(@fptr(S + A)) */ +#define R_IA_64_LTOFF_FPTR64I 0x53 /* immediate64 @ltoff(@fptr(S + A)) */ +#define R_IA_64_LTOFF_FPTR32MSB 0x54 /* word32 MSB @ltoff(@fptr(S + A)) */ +#define R_IA_64_LTOFF_FPTR32LSB 0x55 /* word32 LSB @ltoff(@fptr(S + A)) */ +#define R_IA_64_LTOFF_FPTR64MSB 0x56 /* word64 MSB @ltoff(@fptr(S + A)) */ +#define R_IA_64_LTOFF_FPTR64LSB 0x57 /* word64 LSB @ltoff(@fptr(S + A)) */ +#define R_IA_64_SEGREL32MSB 0x5c /* word32 MSB @segrel(S + A) */ +#define R_IA_64_SEGREL32LSB 0x5d /* word32 LSB @segrel(S + A) */ +#define R_IA_64_SEGREL64MSB 0x5e /* word64 MSB @segrel(S + A) */ +#define R_IA_64_SEGREL64LSB 0x5f /* word64 LSB @segrel(S + A) */ +#define R_IA_64_SECREL32MSB 0x64 /* word32 MSB @secrel(S + A) */ +#define R_IA_64_SECREL32LSB 0x65 /* word32 LSB @secrel(S + A) */ +#define R_IA_64_SECREL64MSB 0x66 /* word64 MSB @secrel(S + A) */ +#define R_IA_64_SECREL64LSB 0x67 /* word64 LSB @secrel(S + A) */ +#define R_IA_64_REL32MSB 0x6c /* word32 MSB BD + A */ +#define R_IA_64_REL32LSB 0x6d /* word32 LSB BD + A */ +#define R_IA_64_REL64MSB 0x6e /* word64 MSB BD + A */ +#define R_IA_64_REL64LSB 0x6f /* word64 LSB BD + A */ +#define R_IA_64_LTV32MSB 0x74 /* word32 MSB S + A */ +#define R_IA_64_LTV32LSB 0x75 /* word32 LSB S + A */ +#define R_IA_64_LTV64MSB 0x76 /* word64 MSB S + A */ +#define R_IA_64_LTV64LSB 0x77 /* word64 LSB S + A */ +#define R_IA_64_PCREL21BI 0x79 /* immediate21 form1 S + A - P */ +#define R_IA_64_PCREL22 0x7a /* immediate22 S + A - P */ +#define R_IA_64_PCREL64I 0x7b /* immediate64 S + A - P */ +#define R_IA_64_IPLTMSB 0x80 /* function descriptor MSB special */ +#define R_IA_64_IPLTLSB 0x81 /* function descriptor LSB speciaal */ +#define R_IA_64_SUB 0x85 /* immediate64 A - S */ +#define R_IA_64_LTOFF22X 0x86 /* immediate22 special */ +#define R_IA_64_LDXMOV 0x87 /* immediate22 special */ +#define R_IA_64_TPREL14 0x91 /* imm14 @tprel(S + A) */ +#define R_IA_64_TPREL22 0x92 /* imm22 @tprel(S + A) */ +#define R_IA_64_TPREL64I 0x93 /* imm64 @tprel(S + A) */ +#define R_IA_64_TPREL64MSB 0x96 /* word64 MSB @tprel(S + A) */ +#define R_IA_64_TPREL64LSB 0x97 /* word64 LSB @tprel(S + A) */ +#define R_IA_64_LTOFF_TPREL22 0x9a /* imm22 @ltoff(@tprel(S+A)) */ +#define R_IA_64_DTPMOD64MSB 0xa6 /* word64 MSB @dtpmod(S + A) */ +#define R_IA_64_DTPMOD64LSB 0xa7 /* word64 LSB @dtpmod(S + A) */ +#define R_IA_64_LTOFF_DTPMOD22 0xaa /* imm22 @ltoff(@dtpmod(S+A)) */ +#define R_IA_64_DTPREL14 0xb1 /* imm14 @dtprel(S + A) */ +#define R_IA_64_DTPREL22 0xb2 /* imm22 @dtprel(S + A) */ +#define R_IA_64_DTPREL64I 0xb3 /* imm64 @dtprel(S + A) */ +#define R_IA_64_DTPREL32MSB 0xb4 /* word32 MSB @dtprel(S + A) */ +#define R_IA_64_DTPREL32LSB 0xb5 /* word32 LSB @dtprel(S + A) */ +#define R_IA_64_DTPREL64MSB 0xb6 /* word64 MSB @dtprel(S + A) */ +#define R_IA_64_DTPREL64LSB 0xb7 /* word64 LSB @dtprel(S + A) */ +#define R_IA_64_LTOFF_DTPREL22 0xba /* imm22 @ltoff(@dtprel(S+A)) */ + +#define R_PPC_NONE 0 /* No relocation. */ +#define R_PPC_ADDR32 1 +#define R_PPC_ADDR24 2 +#define R_PPC_ADDR16 3 +#define R_PPC_ADDR16_LO 4 +#define R_PPC_ADDR16_HI 5 +#define R_PPC_ADDR16_HA 6 +#define R_PPC_ADDR14 7 +#define R_PPC_ADDR14_BRTAKEN 8 +#define R_PPC_ADDR14_BRNTAKEN 9 +#define R_PPC_REL24 10 +#define R_PPC_REL14 11 +#define R_PPC_REL14_BRTAKEN 12 +#define R_PPC_REL14_BRNTAKEN 13 +#define R_PPC_GOT16 14 +#define R_PPC_GOT16_LO 15 +#define R_PPC_GOT16_HI 16 +#define R_PPC_GOT16_HA 17 +#define R_PPC_PLTREL24 18 +#define R_PPC_COPY 19 +#define R_PPC_GLOB_DAT 20 +#define R_PPC_JMP_SLOT 21 +#define R_PPC_RELATIVE 22 +#define R_PPC_LOCAL24PC 23 +#define R_PPC_UADDR32 24 +#define R_PPC_UADDR16 25 +#define R_PPC_REL32 26 +#define R_PPC_PLT32 27 +#define R_PPC_PLTREL32 28 +#define R_PPC_PLT16_LO 29 +#define R_PPC_PLT16_HI 30 +#define R_PPC_PLT16_HA 31 +#define R_PPC_SDAREL16 32 +#define R_PPC_SECTOFF 33 +#define R_PPC_SECTOFF_LO 34 +#define R_PPC_SECTOFF_HI 35 +#define R_PPC_SECTOFF_HA 36 + +/* + * TLS relocations + */ +#define R_PPC_TLS 67 +#define R_PPC_DTPMOD32 68 +#define R_PPC_TPREL16 69 +#define R_PPC_TPREL16_LO 70 +#define R_PPC_TPREL16_HI 71 +#define R_PPC_TPREL16_HA 72 +#define R_PPC_TPREL32 73 +#define R_PPC_DTPREL16 74 +#define R_PPC_DTPREL16_LO 75 +#define R_PPC_DTPREL16_HI 76 +#define R_PPC_DTPREL16_HA 77 +#define R_PPC_DTPREL32 78 +#define R_PPC_GOT_TLSGD16 79 +#define R_PPC_GOT_TLSGD16_LO 80 +#define R_PPC_GOT_TLSGD16_HI 81 +#define R_PPC_GOT_TLSGD16_HA 82 +#define R_PPC_GOT_TLSLD16 83 +#define R_PPC_GOT_TLSLD16_LO 84 +#define R_PPC_GOT_TLSLD16_HI 85 +#define R_PPC_GOT_TLSLD16_HA 86 +#define R_PPC_GOT_TPREL16 87 +#define R_PPC_GOT_TPREL16_LO 88 +#define R_PPC_GOT_TPREL16_HI 89 +#define R_PPC_GOT_TPREL16_HA 90 + +/* + * The remaining relocs are from the Embedded ELF ABI, and are not in the + * SVR4 ELF ABI. + */ + +#define R_PPC_EMB_NADDR32 101 +#define R_PPC_EMB_NADDR16 102 +#define R_PPC_EMB_NADDR16_LO 103 +#define R_PPC_EMB_NADDR16_HI 104 +#define R_PPC_EMB_NADDR16_HA 105 +#define R_PPC_EMB_SDAI16 106 +#define R_PPC_EMB_SDA2I16 107 +#define R_PPC_EMB_SDA2REL 108 +#define R_PPC_EMB_SDA21 109 +#define R_PPC_EMB_MRKREF 110 +#define R_PPC_EMB_RELSEC16 111 +#define R_PPC_EMB_RELST_LO 112 +#define R_PPC_EMB_RELST_HI 113 +#define R_PPC_EMB_RELST_HA 114 +#define R_PPC_EMB_BIT_FLD 115 +#define R_PPC_EMB_RELSDA 116 + +#define R_SPARC_NONE 0 +#define R_SPARC_8 1 +#define R_SPARC_16 2 +#define R_SPARC_32 3 +#define R_SPARC_DISP8 4 +#define R_SPARC_DISP16 5 +#define R_SPARC_DISP32 6 +#define R_SPARC_WDISP30 7 +#define R_SPARC_WDISP22 8 +#define R_SPARC_HI22 9 +#define R_SPARC_22 10 +#define R_SPARC_13 11 +#define R_SPARC_LO10 12 +#define R_SPARC_GOT10 13 +#define R_SPARC_GOT13 14 +#define R_SPARC_GOT22 15 +#define R_SPARC_PC10 16 +#define R_SPARC_PC22 17 +#define R_SPARC_WPLT30 18 +#define R_SPARC_COPY 19 +#define R_SPARC_GLOB_DAT 20 +#define R_SPARC_JMP_SLOT 21 +#define R_SPARC_RELATIVE 22 +#define R_SPARC_UA32 23 +#define R_SPARC_PLT32 24 +#define R_SPARC_HIPLT22 25 +#define R_SPARC_LOPLT10 26 +#define R_SPARC_PCPLT32 27 +#define R_SPARC_PCPLT22 28 +#define R_SPARC_PCPLT10 29 +#define R_SPARC_10 30 +#define R_SPARC_11 31 +#define R_SPARC_64 32 +#define R_SPARC_OLO10 33 +#define R_SPARC_HH22 34 +#define R_SPARC_HM10 35 +#define R_SPARC_LM22 36 +#define R_SPARC_PC_HH22 37 +#define R_SPARC_PC_HM10 38 +#define R_SPARC_PC_LM22 39 +#define R_SPARC_WDISP16 40 +#define R_SPARC_WDISP19 41 +#define R_SPARC_GLOB_JMP 42 +#define R_SPARC_7 43 +#define R_SPARC_5 44 +#define R_SPARC_6 45 +#define R_SPARC_DISP64 46 +#define R_SPARC_PLT64 47 +#define R_SPARC_HIX22 48 +#define R_SPARC_LOX10 49 +#define R_SPARC_H44 50 +#define R_SPARC_M44 51 +#define R_SPARC_L44 52 +#define R_SPARC_REGISTER 53 +#define R_SPARC_UA64 54 +#define R_SPARC_UA16 55 +#define R_SPARC_TLS_GD_HI22 56 +#define R_SPARC_TLS_GD_LO10 57 +#define R_SPARC_TLS_GD_ADD 58 >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Aug 15 00:47:24 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C3F1B16A4E5; Tue, 15 Aug 2006 00:47:24 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 8874016A4DE for ; Tue, 15 Aug 2006 00:47:24 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 56A9443D45 for ; Tue, 15 Aug 2006 00:47:24 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7F0lOkM071969 for ; Tue, 15 Aug 2006 00:47:24 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7F0lNqv071966 for perforce@freebsd.org; Tue, 15 Aug 2006 00:47:23 GMT (envelope-from jb@freebsd.org) Date: Tue, 15 Aug 2006 00:47:23 GMT Message-Id: <200608150047.k7F0lNqv071966@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 103927 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Aug 2006 00:47:25 -0000 http://perforce.freebsd.org/chv.cgi?CH=103927 Change 103927 by jb@jb_freebsd2 on 2006/08/15 00:46:51 Add a toggle to tell gcc to just STFU when it comes to "#pragma ident" that is used EVERYWHERE in OpenSolaris code. I want to be anble to warn up WARNS to have genuine warnings reported, but #pragma ident is just annoying, so just make it go away. This will allow me to undo a lot of the hacks that I've had to do to OpenSolaris files. Affected files ... .. //depot/projects/dtrace/src/share/mk/bsd.sys.mk#3 edit Differences ... ==== //depot/projects/dtrace/src/share/mk/bsd.sys.mk#3 (text+ko) ==== @@ -52,5 +52,9 @@ . endif .endif +.if defined(IGNORE_PRAGMA) +CWARNFLAGS += -Wno-unknown-pragmas +.endif + # Allow user-specified additional warning flags CFLAGS += ${CWARNFLAGS} From owner-p4-projects@FreeBSD.ORG Tue Aug 15 01:45:43 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CBE1A16A4DF; Tue, 15 Aug 2006 01:45:42 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 8F31416A4DE for ; Tue, 15 Aug 2006 01:45:42 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 15AF043D4C for ; Tue, 15 Aug 2006 01:45:42 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7F1jf68079668 for ; Tue, 15 Aug 2006 01:45:41 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7F1jfR9079665 for perforce@freebsd.org; Tue, 15 Aug 2006 01:45:41 GMT (envelope-from jb@freebsd.org) Date: Tue, 15 Aug 2006 01:45:41 GMT Message-Id: <200608150145.k7F1jfR9079665@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 103933 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Aug 2006 01:45:43 -0000 http://perforce.freebsd.org/chv.cgi?CH=103933 Change 103933 by jb@jb_freebsd2 on 2006/08/15 01:45:38 Conditional compilation based on the KDTRACE kernel option. Affected files ... .. //depot/projects/dtrace/src/sys/kern/kern_exec.c#9 edit .. //depot/projects/dtrace/src/sys/kern/kern_exit.c#7 edit .. //depot/projects/dtrace/src/sys/kern/kern_fork.c#6 edit Differences ... ==== //depot/projects/dtrace/src/sys/kern/kern_exec.c#9 (text+ko) ==== @@ -54,7 +54,9 @@ #include #include #include +#ifdef KDTRACE #include +#endif #include #include #include @@ -346,7 +348,9 @@ if (error) goto exec_fail; #endif +#ifdef KDTRACE DTRACE_PROBE1(__proc_exec, char *, imgp->interpreter_name); +#endif imgp->image_header = NULL; @@ -787,12 +791,14 @@ VFS_UNLOCK_GIANT(vfslocked); exec_free_args(args); +#ifdef KDTRACE if (error == 0) { DTRACE_PROBE1(__proc_exec__success, proc *, p); } else { DTRACE_PROBE1(__proc_exec__failure, int, error); } +#endif if (error && imgp->vmspace_destroyed) { /* sorry, no more process anymore. exit gracefully */ exit1(td, W_EXITCODE(0, SIGABRT)); ==== //depot/projects/dtrace/src/sys/kern/kern_exit.c#7 (text+ko) ==== @@ -59,7 +59,9 @@ #include #include #include +#ifdef KDTRACE #include +#endif #include #include #include @@ -236,7 +238,9 @@ */ EVENTHANDLER_INVOKE(process_exit, p); +#ifdef KDTRACE DTRACE_PROBE1(__proc_exit, int, WTERMSIG(rv)); +#endif MALLOC(p->p_ru, struct rusage *, sizeof(struct rusage), M_ZOMBIE, M_WAITOK); ==== //depot/projects/dtrace/src/sys/kern/kern_fork.c#6 (text+ko) ==== @@ -65,7 +65,9 @@ #include #include #include +#ifdef KDTRACE #include +#endif #include #include @@ -694,7 +696,10 @@ mtx_lock_spin(&sched_lock); p2->p_state = PRS_NORMAL; +#ifdef KDTRACE DTRACE_PROBE1(__proc_create, proc *, p2); +#endif + /* * If RFSTOPPED not requested, make child runnable and add to * run queue. From owner-p4-projects@FreeBSD.ORG Tue Aug 15 01:48:47 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 072F716A4DF; Tue, 15 Aug 2006 01:48:47 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 BF9EF16A4DA for ; Tue, 15 Aug 2006 01:48:46 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 68ABC43D49 for ; Tue, 15 Aug 2006 01:48:46 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7F1mkPl079935 for ; Tue, 15 Aug 2006 01:48:46 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7F1mj1A079932 for perforce@freebsd.org; Tue, 15 Aug 2006 01:48:45 GMT (envelope-from jb@freebsd.org) Date: Tue, 15 Aug 2006 01:48:45 GMT Message-Id: <200608150148.k7F1mj1A079932@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 103934 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Aug 2006 01:48:47 -0000 http://perforce.freebsd.org/chv.cgi?CH=103934 Change 103934 by jb@jb_freebsd2 on 2006/08/15 01:47:58 Be specific that no arguments are passed. Affected files ... .. //depot/projects/dtrace/src/sys/sys/time.h#8 edit Differences ... ==== //depot/projects/dtrace/src/sys/sys/time.h#8 (text+ko) ==== @@ -339,7 +339,7 @@ typedef longlong_t hrtime_t; #ifndef _KERNEL -static __inline hrtime_t gethrtime() { +static __inline hrtime_t gethrtime(void) { struct timespec ts; clock_gettime(CLOCK_UPTIME,&ts); return (((u_int64_t) ts.tv_sec) * NANOSEC + ts.tv_nsec); From owner-p4-projects@FreeBSD.ORG Tue Aug 15 01:51:52 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8AC5916A4E1; Tue, 15 Aug 2006 01:51:52 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 4E0A716A4DE for ; Tue, 15 Aug 2006 01:51:52 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id BCC7643D68 for ; Tue, 15 Aug 2006 01:51:50 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7F1powc080201 for ; Tue, 15 Aug 2006 01:51:50 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7F1poob080198 for perforce@freebsd.org; Tue, 15 Aug 2006 01:51:50 GMT (envelope-from jb@freebsd.org) Date: Tue, 15 Aug 2006 01:51:50 GMT Message-Id: <200608150151.k7F1poob080198@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 103935 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Aug 2006 01:51:52 -0000 http://perforce.freebsd.org/chv.cgi?CH=103935 Change 103935 by jb@jb_freebsd2 on 2006/08/15 01:51:15 Add a Solaris compatibility header. FreeBSD code would actually be cleaner if this header was included rather than having to include each one individually. Affected files ... .. //depot/projects/dtrace/src/sys/sys/elf.h#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Tue Aug 15 01:55:57 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 42DB816A4E1; Tue, 15 Aug 2006 01:55:57 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 0FC2216A4DA for ; Tue, 15 Aug 2006 01:55:57 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A422E43D53 for ; Tue, 15 Aug 2006 01:55:56 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7F1tuTn080369 for ; Tue, 15 Aug 2006 01:55:56 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7F1tuKB080366 for perforce@freebsd.org; Tue, 15 Aug 2006 01:55:56 GMT (envelope-from jb@freebsd.org) Date: Tue, 15 Aug 2006 01:55:56 GMT Message-Id: <200608150155.k7F1tuKB080366@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 103936 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Aug 2006 01:55:57 -0000 http://perforce.freebsd.org/chv.cgi?CH=103936 Change 103936 by jb@jb_freebsd2 on 2006/08/15 01:55:53 When compiling ALL OpenSolaris CDDL code, use the -Wno-unknown-pragmas compiler option to stop gcc whinging about the "#pragma ident" that Sun adds to _every_ source and header file. Affected files ... .. //depot/projects/dtrace/src/cddl/Makefile.inc#3 edit Differences ... ==== //depot/projects/dtrace/src/cddl/Makefile.inc#3 (text+ko) ==== @@ -5,3 +5,5 @@ CFLAGS+= -I${.CURDIR}/../../../sys CFLAGS+= -D_SOLARIS_C_SOURCE + +IGNORE_PRAGMA= 1 From owner-p4-projects@FreeBSD.ORG Tue Aug 15 02:03:06 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9E82016A4E1; Tue, 15 Aug 2006 02:03:06 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 7B05416A4DD for ; Tue, 15 Aug 2006 02:03:06 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 021EF43D5A for ; Tue, 15 Aug 2006 02:03:05 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7F235CP082092 for ; Tue, 15 Aug 2006 02:03:05 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7F235d5082081 for perforce@freebsd.org; Tue, 15 Aug 2006 02:03:05 GMT (envelope-from jb@freebsd.org) Date: Tue, 15 Aug 2006 02:03:05 GMT Message-Id: <200608150203.k7F235d5082081@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 103937 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Aug 2006 02:03:06 -0000 http://perforce.freebsd.org/chv.cgi?CH=103937 Change 103937 by jb@jb_freebsd2 on 2006/08/15 02:02:10 Jack the compile warning level up to encourage people to write clean code. It would be nice if the OpenSolaris people would stop wearing the "we compile our tree with gcc" as a badge of honour because that means very little if you don't use even the most basic gcc warning levels. I was once shouted down by a gcc developer for asking that code compile cleanly. He said: "we'll never let a compiler tell us how to write code". I disagree. If the warnings make sense, then they should be used. All all the 'const' override casts in OpenSolaris code fall into that category. If a developer goes to the trouble of declaring something 'const', then it's supposed to be _CONSTANT_ and that doesn't give you the right to override that. [ Little rant there. 8-) ] Affected files ... .. //depot/projects/dtrace/src/cddl/Makefile.inc#4 edit Differences ... ==== //depot/projects/dtrace/src/cddl/Makefile.inc#4 (text+ko) ==== @@ -7,3 +7,5 @@ CFLAGS+= -D_SOLARIS_C_SOURCE IGNORE_PRAGMA= 1 + +WARNS?= 6 From owner-p4-projects@FreeBSD.ORG Tue Aug 15 02:05:09 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5C0B816A4E0; Tue, 15 Aug 2006 02:05:09 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 3393616A4DE for ; Tue, 15 Aug 2006 02:05:09 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E2C1D43D46 for ; Tue, 15 Aug 2006 02:05:08 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7F258xc082216 for ; Tue, 15 Aug 2006 02:05:08 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7F25820082213 for perforce@freebsd.org; Tue, 15 Aug 2006 02:05:08 GMT (envelope-from jb@freebsd.org) Date: Tue, 15 Aug 2006 02:05:08 GMT Message-Id: <200608150205.k7F25820082213@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 103938 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Aug 2006 02:05:09 -0000 http://perforce.freebsd.org/chv.cgi?CH=103938 Change 103938 by jb@jb_freebsd2 on 2006/08/15 02:04:14 Use the compiler warning level set above. Stop using the OpenSolaris ELF header files and just use the FreeBSD ones now that they contain everything we need. Affected files ... .. //depot/projects/dtrace/src/cddl/usr.bin/sgsmsg/Makefile#9 edit Differences ... ==== //depot/projects/dtrace/src/cddl/usr.bin/sgsmsg/Makefile#9 (text+ko) ==== @@ -7,21 +7,11 @@ SRCS= avl.c sgsmsg.c string_table.c findprime.c -WARNS?= 1 - - CFLAGS+= -I${.CURDIR}/../../../contrib \ -I${.CURDIR}/../../../sys/contrib \ - -I${OPENSOLARIS_USR_DISTDIR}/head \ -I${OPENSOLARIS_USR_DISTDIR}/cmd/sgs/include \ -I${OPENSOLARIS_SYS_DISTDIR}/uts/common -.if ${MACHINE_ARCH} == "i386" -CFLAGS+= -I${OPENSOLARIS_SYS_DISTDIR}/uts/intel -.elif ${MACHINE_ARCH} == "sparc64" -CFLAGS+= -I${OPENSOLARIS_SYS_DISTDIR}/uts/sparc -.endif - .PATH: ${OPENSOLARIS_USR_DISTDIR}/cmd/sgs/tools/common .PATH: ${OPENSOLARIS_SYS_DISTDIR}/common/avl From owner-p4-projects@FreeBSD.ORG Tue Aug 15 02:06:11 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 05C6316A4E1; Tue, 15 Aug 2006 02:06:11 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 D8C1E16A4DA for ; Tue, 15 Aug 2006 02:06:10 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9171543D45 for ; Tue, 15 Aug 2006 02:06:10 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7F26ATT082325 for ; Tue, 15 Aug 2006 02:06:10 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7F26A3Y082320 for perforce@freebsd.org; Tue, 15 Aug 2006 02:06:10 GMT (envelope-from jb@freebsd.org) Date: Tue, 15 Aug 2006 02:06:10 GMT Message-Id: <200608150206.k7F26A3Y082320@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 103939 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Aug 2006 02:06:11 -0000 http://perforce.freebsd.org/chv.cgi?CH=103939 Change 103939 by jb@jb_freebsd2 on 2006/08/15 02:05:14 Use the compiler warning level specified above. Affected files ... .. //depot/projects/dtrace/src/cddl/lib/libctf/Makefile#4 edit Differences ... ==== //depot/projects/dtrace/src/cddl/lib/libctf/Makefile#4 (text+ko) ==== @@ -17,8 +17,6 @@ ctf_types.c \ ctf_util.c -WARNS?= 0 - .PATH: ${OPENSOLARIS_USR_DISTDIR}/common/ctf .PATH: ${OPENSOLARIS_USR_DISTDIR}/lib/libctf/common .PATH: ${OPENSOLARIS_SYS_DISTDIR}/common/ctf From owner-p4-projects@FreeBSD.ORG Tue Aug 15 02:09:16 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E454816A4E0; Tue, 15 Aug 2006 02:09:15 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 C1C7C16A4DE for ; Tue, 15 Aug 2006 02:09:15 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7584243D46 for ; Tue, 15 Aug 2006 02:09:15 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7F29F8k082450 for ; Tue, 15 Aug 2006 02:09:15 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7F29FV4082447 for perforce@freebsd.org; Tue, 15 Aug 2006 02:09:15 GMT (envelope-from jb@freebsd.org) Date: Tue, 15 Aug 2006 02:09:15 GMT Message-Id: <200608150209.k7F29FV4082447@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 103940 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Aug 2006 02:09:16 -0000 http://perforce.freebsd.org/chv.cgi?CH=103940 Change 103940 by jb@jb_freebsd2 on 2006/08/15 02:09:09 Fix compiler warnings by including a header to get a prototype; using a different variable name to stop shadowing a global variable; and matching the signed/unsigned variable types. Affected files ... .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/sgs/tools/common/sgsmsg.c#3 edit Differences ... ==== //depot/projects/dtrace/src/contrib/opensolaris/cmd/sgs/tools/common/sgsmsg.c#3 (text) ==== @@ -67,6 +67,7 @@ * the data array being built in msg.c. The index into this array * becomes the `message' identifier created in the msg.h file. */ + #pragma ident "@(#)sgsmsg.c 1.16 05/06/08 SMI" #include @@ -318,21 +319,21 @@ * Dump contents of String Table to standard out */ static void -dump_stringtab(Str_tbl *stp) +dump_stringtab(Str_tbl *dump_stp) { uint_t i; - if ((stp->st_flags & FLG_STTAB_COMPRESS) == 0) { + if ((dump_stp->st_flags & FLG_STTAB_COMPRESS) == 0) { (void) printf("uncompressed strings: %d\n", - stp->st_fullstringsize); + dump_stp->st_fullstringsize); return; } - for (i = 0; i < stp->st_hbckcnt; i++) { + for (i = 0; i < dump_stp->st_hbckcnt; i++) { Str_hash *sthash; (void) printf("Bucket: [%3d]\n", i); - for (sthash = stp->st_hashbcks[i]; sthash; + for (sthash = dump_stp->st_hashbcks[i]; sthash; sthash = sthash->hi_next) { uint_t stroff; stroff = sthash->hi_mstr->sm_stlen - sthash->hi_stlen; @@ -350,7 +351,7 @@ } } (void) printf("fullstringsize: %d compressed: %d\n", - stp->st_fullstringsize, stp->st_stringsize); + dump_stp->st_fullstringsize, dump_stp->st_stringsize); } /* * Initialize the message definition header file stream. @@ -630,7 +631,7 @@ } static int -file() +file(void) { char buffer[LINE_MAX], * token; uint_t bufsize; @@ -646,8 +647,9 @@ line = 1; while ((token = fgets(buffer, LINE_MAX, fddesc)) != NULL) { - char defn[PATH_MAX], * _defn, * str; - int len; + char defn[PATH_MAX], * _defn; + const char *str; + int len = 0; switch (*token) { case '#': @@ -940,7 +942,7 @@ return (1); } - if (len >= bufsize) { + if (len >= (int) bufsize) { bufsize += LINE_MAX; if ((token_buffer = realloc( token_buffer, bufsize)) == 0) { From owner-p4-projects@FreeBSD.ORG Tue Aug 15 02:11:19 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EC35D16A4E2; Tue, 15 Aug 2006 02:11:18 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 C753016A4DF for ; Tue, 15 Aug 2006 02:11:18 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7EDEA43D49 for ; Tue, 15 Aug 2006 02:11:18 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7F2BI2J082678 for ; Tue, 15 Aug 2006 02:11:18 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7F2BI44082670 for perforce@freebsd.org; Tue, 15 Aug 2006 02:11:18 GMT (envelope-from jb@freebsd.org) Date: Tue, 15 Aug 2006 02:11:18 GMT Message-Id: <200608150211.k7F2BI44082670@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 103941 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Aug 2006 02:11:19 -0000 http://perforce.freebsd.org/chv.cgi?CH=103941 Change 103941 by jb@jb_freebsd2 on 2006/08/15 02:10:19 Fix compiler warnings. (insert rant here) Affected files ... .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/sgs/tools/common/string_table.c#3 edit Differences ... ==== //depot/projects/dtrace/src/contrib/opensolaris/cmd/sgs/tools/common/string_table.c#3 (text) ==== @@ -28,6 +28,7 @@ #include #include +#include #include #include @@ -124,12 +125,12 @@ /* LINTLIBRARY */ -int +static int strlen_compare(const void *elem1, const void *elem2) { uint_t l1, l2; - l1 = ((Stringelem *)elem1)->se_stlen; - l2 = ((Stringelem *)elem2)->se_stlen; + l1 = ((const Stringelem *)elem1)->se_stlen; + l2 = ((const Stringelem *)elem2)->se_stlen; if (l1 == l2) return (0); From owner-p4-projects@FreeBSD.ORG Tue Aug 15 02:15:25 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DF3AE16A4DF; Tue, 15 Aug 2006 02:15:24 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 B67E416A4DE for ; Tue, 15 Aug 2006 02:15:24 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 83FCC43D45 for ; Tue, 15 Aug 2006 02:15:24 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7F2FOJd082856 for ; Tue, 15 Aug 2006 02:15:24 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7F2FOtn082853 for perforce@freebsd.org; Tue, 15 Aug 2006 02:15:24 GMT (envelope-from jb@freebsd.org) Date: Tue, 15 Aug 2006 02:15:24 GMT Message-Id: <200608150215.k7F2FOtn082853@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 103942 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Aug 2006 02:15:25 -0000 http://perforce.freebsd.org/chv.cgi?CH=103942 Change 103942 by jb@jb_freebsd2 on 2006/08/15 02:14:51 Just use the installed libelf on all architectures. Time is better spent helping out jkoshy's libbsdelf development than messing with Sun's libelf. Affected files ... .. //depot/projects/dtrace/src/cddl/usr.bin/ctfconvert/Makefile#6 edit .. //depot/projects/dtrace/src/cddl/usr.bin/ctfdump/Makefile#3 edit .. //depot/projects/dtrace/src/cddl/usr.bin/ctfmerge/Makefile#6 edit Differences ... ==== //depot/projects/dtrace/src/cddl/usr.bin/ctfconvert/Makefile#6 (text+ko) ==== @@ -41,11 +41,6 @@ LDADD+= -lctf -ldwarf -lelf -lz -.if ${MACHINE_ARCH} != "i386" -LDFLAGS+= -L/usr/local/lib -LDADD+= -lintl -liconv -.endif - .if ${MK_LIBC_THREADS} == "no" LDADD+= -lpthread .endif ==== //depot/projects/dtrace/src/cddl/usr.bin/ctfdump/Makefile#3 (text+ko) ==== @@ -22,11 +22,6 @@ LDADD+= -lelf -lz -.if ${MACHINE_ARCH} != "i386" -LDFLAGS+= -L/usr/local/lib -LDADD+= -lintl -liconv -.endif - .PATH: ${OPENSOLARIS_USR_DISTDIR}/cmd/mdb/tools/common .PATH: ${OPENSOLARIS_USR_DISTDIR}/tools/ctf/common .PATH: ${OPENSOLARIS_USR_DISTDIR}/tools/ctf/dump ==== //depot/projects/dtrace/src/cddl/usr.bin/ctfmerge/Makefile#6 (text+ko) ==== @@ -38,11 +38,6 @@ LDADD+= -lctf -ldwarf -lelf -lz -.if ${MACHINE_ARCH} != "i386" -LDFLAGS+= -L/usr/local/lib -LDADD+= -lintl -liconv -.endif - .if ${MK_LIBC_THREADS} == "no" LDADD+= -lpthread .endif From owner-p4-projects@FreeBSD.ORG Tue Aug 15 02:16:27 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3F57016A4E2; Tue, 15 Aug 2006 02:16:27 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 EE6AA16A4E0 for ; Tue, 15 Aug 2006 02:16:26 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A691643D46 for ; Tue, 15 Aug 2006 02:16:26 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7F2GQU7082947 for ; Tue, 15 Aug 2006 02:16:26 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7F2GQeu082940 for perforce@freebsd.org; Tue, 15 Aug 2006 02:16:26 GMT (envelope-from jb@freebsd.org) Date: Tue, 15 Aug 2006 02:16:26 GMT Message-Id: <200608150216.k7F2GQeu082940@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 103943 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Aug 2006 02:16:27 -0000 http://perforce.freebsd.org/chv.cgi?CH=103943 Change 103943 by jb@jb_freebsd2 on 2006/08/15 02:16:13 Fix a compiler warning by including the header containing the prototype. Affected files ... .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/sgs/tools/common/findprime.c#3 edit Differences ... ==== //depot/projects/dtrace/src/contrib/opensolaris/cmd/sgs/tools/common/findprime.c#3 (text) ==== @@ -27,6 +27,7 @@ #pragma ident "@(#)findprime.c 1.2 05/06/08 SMI" #include +#include /* * function that will find a prime'ish number. Usefull for From owner-p4-projects@FreeBSD.ORG Tue Aug 15 02:19:33 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C9DF216A4E1; Tue, 15 Aug 2006 02:19:33 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 A3DA516A4DA for ; Tue, 15 Aug 2006 02:19:33 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 069B243D6D for ; Tue, 15 Aug 2006 02:19:31 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7F2JUUI083090 for ; Tue, 15 Aug 2006 02:19:30 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7F2JULG083087 for perforce@freebsd.org; Tue, 15 Aug 2006 02:19:30 GMT (envelope-from jb@freebsd.org) Date: Tue, 15 Aug 2006 02:19:30 GMT Message-Id: <200608150219.k7F2JULG083087@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 103944 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Aug 2006 02:19:34 -0000 http://perforce.freebsd.org/chv.cgi?CH=103944 Change 103944 by jb@jb_freebsd2 on 2006/08/15 02:19:04 Fix a compiler warning. Affected files ... .. //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/dtrace.h#3 edit Differences ... ==== //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/dtrace.h#3 (text) ==== @@ -148,7 +148,7 @@ dtrace_actdesc_t *dtsd_action_last; /* last action in action list */ void *dtsd_aggdata; /* aggregation data */ void *dtsd_fmtdata; /* type-specific output data */ - void (*dtsd_callback)(); /* callback function for EPID */ + void (*dtsd_callback)(void); /* callback function for EPID */ void *dtsd_data; /* callback data pointer */ dtrace_attribute_t dtsd_descattr; /* probedesc attributes */ dtrace_attribute_t dtsd_stmtattr; /* statement attributes */ From owner-p4-projects@FreeBSD.ORG Tue Aug 15 02:20:33 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 39A3A16A4E1; Tue, 15 Aug 2006 02:20:33 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 00A2316A4DD for ; Tue, 15 Aug 2006 02:20:33 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C29FA43D45 for ; Tue, 15 Aug 2006 02:20:32 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7F2KW4B083219 for ; Tue, 15 Aug 2006 02:20:32 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7F2KWgg083213 for perforce@freebsd.org; Tue, 15 Aug 2006 02:20:32 GMT (envelope-from jb@freebsd.org) Date: Tue, 15 Aug 2006 02:20:32 GMT Message-Id: <200608150220.k7F2KWgg083213@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 103945 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Aug 2006 02:20:33 -0000 http://perforce.freebsd.org/chv.cgi?CH=103945 Change 103945 by jb@jb_freebsd2 on 2006/08/15 02:19:57 Fix compiler warnings. Affected files ... .. //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/dt_aggregate.c#9 edit Differences ... ==== //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/dt_aggregate.c#9 (text) ==== @@ -58,7 +58,7 @@ static void dt_aggregate_count(int64_t *existing, int64_t *new, size_t size) { - int i; + uint_t i; for (i = 0; i < size / sizeof (int64_t); i++) existing[i] = existing[i] + new[i]; @@ -196,9 +196,10 @@ static int dt_aggregate_quantizedcmp(int64_t *lhs, int64_t *rhs) { - int nbuckets = DTRACE_QUANTIZE_NBUCKETS, i; + int nbuckets = DTRACE_QUANTIZE_NBUCKETS; long double ltotal = 0, rtotal = 0; int64_t lzero, rzero; + uint_t i; for (i = 0; i < nbuckets; i++) { int64_t bucketval = DTRACE_QUANTIZE_BUCKETVAL(i); @@ -634,7 +635,7 @@ return (0); for (i = 0; i < agp->dtat_ncpus; i++) { - if (rval = dt_aggregate_snap_cpu(dtp, agp->dtat_cpus[i])) + if ((rval = dt_aggregate_snap_cpu(dtp, agp->dtat_cpus[i]))) return (rval); } @@ -1088,7 +1089,7 @@ case DTRACE_AGGWALK_REMOVE: { dtrace_aggdata_t *aggdata = &h->dtahe_data; - int i, max_cpus = agp->dtat_maxcpu; + int max_cpus = agp->dtat_maxcpu; /* * First, remove this hash entry from its hash chain. From owner-p4-projects@FreeBSD.ORG Tue Aug 15 02:23:37 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 65B1416A4DE; Tue, 15 Aug 2006 02:23:37 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 42C8216A4DA for ; Tue, 15 Aug 2006 02:23:37 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1151243D45 for ; Tue, 15 Aug 2006 02:23:37 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7F2Na2M083461 for ; Tue, 15 Aug 2006 02:23:36 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7F2Na6A083458 for perforce@freebsd.org; Tue, 15 Aug 2006 02:23:36 GMT (envelope-from jb@freebsd.org) Date: Tue, 15 Aug 2006 02:23:36 GMT Message-Id: <200608150223.k7F2Na6A083458@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 103946 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Aug 2006 02:23:37 -0000 http://perforce.freebsd.org/chv.cgi?CH=103946 Change 103946 by jb@jb_freebsd2 on 2006/08/15 02:22:45 Fix compiler warnings. [insert glass houses reference here. 8-) ] Affected files ... .. //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/dt_impl.h#11 edit Differences ... ==== //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/dt_impl.h#11 (text) ==== @@ -271,7 +271,7 @@ int dt_ctferr; /* error resulting from last CTF failure */ int dt_errno; /* error resulting from last failed operation */ #if !defined(sun) - char *dt_errfile; + const char *dt_errfile; int dt_errline; #endif int dt_fd; /* file descriptor for dtrace pseudo-device */ @@ -553,8 +553,8 @@ #if defined(sun) extern int dt_set_errno(dtrace_hdl_t *, int); #else -int _dt_set_errno(dtrace_hdl_t *, int, char *, int); -void dt_get_errloc(dtrace_hdl_t *, char **, int *); +int _dt_set_errno(dtrace_hdl_t *, int, const char *, int); +void dt_get_errloc(dtrace_hdl_t *, const char **, int *); #define dt_set_errno(_a,_b) _dt_set_errno(_a,_b,__FILE__,__LINE__) #endif extern void dt_set_errmsg(dtrace_hdl_t *, const char *, const char *, From owner-p4-projects@FreeBSD.ORG Tue Aug 15 02:24:39 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2C48916A4E1; Tue, 15 Aug 2006 02:24:39 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 0B42B16A4DA for ; Tue, 15 Aug 2006 02:24:39 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B47E743D46 for ; Tue, 15 Aug 2006 02:24:38 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7F2OcYm083529 for ; Tue, 15 Aug 2006 02:24:38 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7F2Occe083526 for perforce@freebsd.org; Tue, 15 Aug 2006 02:24:38 GMT (envelope-from jb@freebsd.org) Date: Tue, 15 Aug 2006 02:24:38 GMT Message-Id: <200608150224.k7F2Occe083526@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 103947 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Aug 2006 02:24:39 -0000 http://perforce.freebsd.org/chv.cgi?CH=103947 Change 103947 by jb@jb_freebsd2 on 2006/08/15 02:24:06 Use only FreeBSD ELF headers from now on. Affected files ... .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/sgs/include/alist.h#2 edit .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/sgs/include/sgs.h#3 edit Differences ... ==== //depot/projects/dtrace/src/contrib/opensolaris/cmd/sgs/include/alist.h#2 (text) ==== @@ -39,7 +39,11 @@ #endif #include +#if defined(sun) #include +#else +#include +#endif #define ALO_DATA (sizeof (Alist) - sizeof (void *)) ==== //depot/projects/dtrace/src/contrib/opensolaris/cmd/sgs/include/sgs.h#3 (text) ==== @@ -35,7 +35,6 @@ #pragma ident "@(#)sgs.h 1.53 06/05/09 SMI" - #ifdef __cplusplus extern "C" { #endif @@ -49,7 +48,11 @@ #ifndef _ASM #include +#if defined(sun) #include +#else +#include +#endif #include #include #include From owner-p4-projects@FreeBSD.ORG Tue Aug 15 02:26:42 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 12E7B16A4E0; Tue, 15 Aug 2006 02:26:42 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 E592916A4DA for ; Tue, 15 Aug 2006 02:26:41 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 95AB543D46 for ; Tue, 15 Aug 2006 02:26:41 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7F2Qfu4083673 for ; Tue, 15 Aug 2006 02:26:41 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7F2Qfrn083657 for perforce@freebsd.org; Tue, 15 Aug 2006 02:26:41 GMT (envelope-from jb@freebsd.org) Date: Tue, 15 Aug 2006 02:26:41 GMT Message-Id: <200608150226.k7F2Qfrn083657@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 103948 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Aug 2006 02:26:42 -0000 http://perforce.freebsd.org/chv.cgi?CH=103948 Change 103948 by jb@jb_freebsd2 on 2006/08/15 02:25:45 Declare the constructor. Fix compiler warnings. Affected files ... .. //depot/projects/dtrace/src/contrib/opensolaris/lib/libctf/common/ctf_lib.c#5 edit Differences ... ==== //depot/projects/dtrace/src/contrib/opensolaris/lib/libctf/common/ctf_lib.c#5 (text) ==== @@ -29,6 +29,7 @@ #include #include #include +#include #if !defined(sun) #include #endif @@ -58,7 +59,11 @@ static size_t _PAGESIZE; static size_t _PAGEMASK; +#if defined(sun) #pragma init(_libctf_init) +#else +void _libctf_init(void) __attribute__ ((constructor)); +#endif void _libctf_init(void) { @@ -92,8 +97,8 @@ if ((zlib.z_dlp = dlopen(_libctf_zlib, RTLD_LAZY | RTLD_LOCAL)) == NULL) return (ctf_set_open_errno(errp, ECTF_ZINIT)); - zlib.z_uncompress = (int (*)()) dlsym(zlib.z_dlp, "uncompress"); - zlib.z_error = (const char *(*)()) dlsym(zlib.z_dlp, "zError"); + zlib.z_uncompress = (int (*)(uchar_t *, ulong_t *, const uchar_t *, ulong_t)) dlsym(zlib.z_dlp, "uncompress"); + zlib.z_error = (const char *(*)(int)) dlsym(zlib.z_dlp, "zError"); if (zlib.z_uncompress == NULL || zlib.z_error == NULL) { (void) dlclose(zlib.z_dlp); @@ -227,7 +232,7 @@ * If we have read enough bytes to form a CTF header and the magic * string matches, attempt to interpret the file as raw CTF. */ - if (nbytes >= sizeof (ctf_preamble_t) && + if (nbytes >= (ssize_t) sizeof (ctf_preamble_t) && hdr.ctf.ctp_magic == CTF_MAGIC) { if (hdr.ctf.ctp_version > CTF_VERSION) return (ctf_set_open_errno(errp, ECTF_CTFVERS)); @@ -257,7 +262,7 @@ * do our own largefile ELF processing, and convert everything to * GElf structures so that clients can operate on any data model. */ - if (nbytes >= sizeof (Elf32_Ehdr) && + if (nbytes >= (ssize_t) sizeof (Elf32_Ehdr) && bcmp(&hdr.e32.e_ident[EI_MAG0], ELFMAG, SELFMAG) == 0) { #ifdef _BIG_ENDIAN uchar_t order = ELFDATA2MSB; @@ -269,7 +274,7 @@ void *strs_map; size_t strs_mapsz; - const char *strs; + char *strs; if (hdr.e32.e_ident[EI_DATA] != order) return (ctf_set_open_errno(errp, ECTF_ENDIAN)); @@ -277,7 +282,7 @@ return (ctf_set_open_errno(errp, ECTF_ELFVERS)); if (hdr.e32.e_ident[EI_CLASS] == ELFCLASS64) { - if (nbytes < sizeof (GElf_Ehdr)) + if (nbytes < (ssize_t) sizeof (GElf_Ehdr)) return (ctf_set_open_errno(errp, ECTF_FMT)); } else { Elf32_Ehdr e32 = hdr.e32; @@ -328,7 +333,7 @@ strs_map = mmap64(NULL, strs_mapsz, PROT_READ, MAP_PRIVATE, fd, sp[hdr.e64.e_shstrndx].sh_offset & _PAGEMASK); - strs = (const char *)strs_map + + strs = (char *)strs_map + (sp[hdr.e64.e_shstrndx].sh_offset & ~_PAGEMASK); if (strs_map == MAP_FAILED) { From owner-p4-projects@FreeBSD.ORG Tue Aug 15 02:26:42 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6158B16A556; Tue, 15 Aug 2006 02:26:42 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 2617E16A50D for ; Tue, 15 Aug 2006 02:26:42 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E908A43D46 for ; Tue, 15 Aug 2006 02:26:41 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7F2Qf8M083679 for ; Tue, 15 Aug 2006 02:26:41 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7F2QfQp083676 for perforce@freebsd.org; Tue, 15 Aug 2006 02:26:41 GMT (envelope-from jb@freebsd.org) Date: Tue, 15 Aug 2006 02:26:41 GMT Message-Id: <200608150226.k7F2QfQp083676@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 103949 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Aug 2006 02:26:42 -0000 http://perforce.freebsd.org/chv.cgi?CH=103949 Change 103949 by jb@jb_freebsd2 on 2006/08/15 02:26:27 Fix compiler warnings. Affected files ... .. //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/dt_error.c#4 edit Differences ... ==== //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/dt_error.c#4 (text) ==== @@ -148,7 +148,7 @@ } #else int -_dt_set_errno(dtrace_hdl_t *dtp, int err, char *errfile, int errline) +_dt_set_errno(dtrace_hdl_t *dtp, int err, const char *errfile, int errline) { dtp->dt_errno = err; dtp->dt_errfile = errfile; @@ -156,7 +156,7 @@ return (-1); } -void dt_get_errloc(dtrace_hdl_t *dtp, char **p_errfile, int *p_errline) +void dt_get_errloc(dtrace_hdl_t *dtp, const char **p_errfile, int *p_errline) { *p_errfile = dtp->dt_errfile; *p_errline = dtp->dt_errline; From owner-p4-projects@FreeBSD.ORG Tue Aug 15 02:27:44 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3147A16A4DE; Tue, 15 Aug 2006 02:27:44 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 0D95216A4DA for ; Tue, 15 Aug 2006 02:27:44 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B7B7A43D46 for ; Tue, 15 Aug 2006 02:27:43 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7F2RhNT083770 for ; Tue, 15 Aug 2006 02:27:43 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7F2RhIX083767 for perforce@freebsd.org; Tue, 15 Aug 2006 02:27:43 GMT (envelope-from jb@freebsd.org) Date: Tue, 15 Aug 2006 02:27:43 GMT Message-Id: <200608150227.k7F2RhIX083767@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 103950 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Aug 2006 02:27:44 -0000 http://perforce.freebsd.org/chv.cgi?CH=103950 Change 103950 by jb@jb_freebsd2 on 2006/08/15 02:26:59 Fix compiler warnings. Affected files ... .. //depot/projects/dtrace/src/sys/contrib/opensolaris/common/ctf/ctf_types.c#2 edit Differences ... ==== //depot/projects/dtrace/src/sys/contrib/opensolaris/common/ctf/ctf_types.c#2 (text) ==== @@ -309,7 +309,7 @@ ctf_type_name(ctf_file_t *fp, ctf_id_t type, char *buf, size_t len) { ssize_t rv = ctf_type_lname(fp, type, buf, len); - return (rv >= 0 && rv < len ? buf : NULL); + return (rv >= 0 && rv < (ssize_t) len ? buf : NULL); } /* @@ -368,7 +368,7 @@ ssize_t ctf_type_align(ctf_file_t *fp, ctf_id_t type) { - const ctf_type_t *tp; + ctf_type_t *tp; ctf_arinfo_t r; if ((type = ctf_type_resolve(fp, type)) == CTF_ERR) @@ -391,7 +391,7 @@ case CTF_K_UNION: { uint_t n = LCTF_INFO_VLEN(fp, tp->ctt_info); ssize_t size, increment; - size_t align = 0; + ssize_t align = 0; const void *vmp; (void) ctf_get_ctt_size(fp, tp, &size, &increment); From owner-p4-projects@FreeBSD.ORG Tue Aug 15 02:29:47 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4397316A4E2; Tue, 15 Aug 2006 02:29:47 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 07D0516A4DE for ; Tue, 15 Aug 2006 02:29:47 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id CC10143D49 for ; Tue, 15 Aug 2006 02:29:46 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7F2Tki1083910 for ; Tue, 15 Aug 2006 02:29:46 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7F2TkkE083907 for perforce@freebsd.org; Tue, 15 Aug 2006 02:29:46 GMT (envelope-from jb@freebsd.org) Date: Tue, 15 Aug 2006 02:29:46 GMT Message-Id: <200608150229.k7F2TkkE083907@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 103951 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Aug 2006 02:29:47 -0000 http://perforce.freebsd.org/chv.cgi?CH=103951 Change 103951 by jb@jb_freebsd2 on 2006/08/15 02:29:03 Undo hacks prior to simply not compiling this source file. Affected files ... .. //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/drti.c#4 edit Differences ... ==== //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/drti.c#4 (text) ==== @@ -86,11 +86,10 @@ } #pragma init(dtrace_dof_init) + static void dtrace_dof_init(void) { -printf("%s:%s(%d): DOODAD\n",__FUNCTION__,__FILE__,__LINE__); -#ifdef DOODAD dof_hdr_t *dof = &__SUNW_dof; #ifdef _LP64 Elf64_Ehdr *elf; @@ -169,15 +168,12 @@ dprintf(1, "DTrace ioctl succeeded for DOF at %p\n", dof); (void) close(fd); -#endif } #pragma fini(dtrace_dof_fini) static void dtrace_dof_fini(void) { -printf("%s:%s(%d): DOODAD\n",__FUNCTION__,__FILE__,__LINE__); -#ifdef DOODAD int fd; if ((fd = open64(devnamep, O_RDWR)) < 0) { @@ -191,5 +187,4 @@ dprintf(1, "DTrace ioctl removed DOF (%d)\n", gen); (void) close(fd); -#endif } From owner-p4-projects@FreeBSD.ORG Tue Aug 15 02:33:54 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E043416A4DF; Tue, 15 Aug 2006 02:33:53 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 AE77416A4DA for ; Tue, 15 Aug 2006 02:33:53 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 48B2F43D6B for ; Tue, 15 Aug 2006 02:33:53 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7F2Xrs2084203 for ; Tue, 15 Aug 2006 02:33:53 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7F2Xr8s084200 for perforce@freebsd.org; Tue, 15 Aug 2006 02:33:53 GMT (envelope-from jb@freebsd.org) Date: Tue, 15 Aug 2006 02:33:53 GMT Message-Id: <200608150233.k7F2Xr8s084200@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 103952 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Aug 2006 02:33:54 -0000 http://perforce.freebsd.org/chv.cgi?CH=103952 Change 103952 by jb@jb_freebsd2 on 2006/08/15 02:33:08 Just use FreeBSD's ELF header files from now on. Fix a compiler warning. Affected files ... .. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/sys/ctf_api.h#7 edit Differences ... ==== //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/sys/ctf_api.h#7 (text) ==== @@ -40,20 +40,11 @@ #ifndef _CTF_API_H #define _CTF_API_H -#if defined(sun) #pragma ident "@(#)ctf_api.h 1.4 05/06/08 SMI" -#endif #include #include -#if defined(sun) #include -#else -#include -#include -#include -#include -#endif #include #ifdef __cplusplus @@ -74,7 +65,7 @@ * filling in ctf_sect_t structures and passing them to ctf_bufopen(): */ typedef struct ctf_sect { - const char *cts_name; /* section name (if any) */ + char *cts_name; /* section name (if any) */ ulong_t cts_type; /* section type (ELF SHT_... value) */ ulong_t cts_flags; /* section flags (ELF SHF_... value) */ #if defined(sun) From owner-p4-projects@FreeBSD.ORG Tue Aug 15 02:34:55 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8D1D016A4EC; Tue, 15 Aug 2006 02:34:55 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 56D8F16A4E5 for ; Tue, 15 Aug 2006 02:34:55 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1178043D46 for ; Tue, 15 Aug 2006 02:34:55 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7F2YsLD084258 for ; Tue, 15 Aug 2006 02:34:54 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7F2YsBI084255 for perforce@freebsd.org; Tue, 15 Aug 2006 02:34:54 GMT (envelope-from jb@freebsd.org) Date: Tue, 15 Aug 2006 02:34:54 GMT Message-Id: <200608150234.k7F2YsBI084255@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 103953 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Aug 2006 02:34:55 -0000 http://perforce.freebsd.org/chv.cgi?CH=103953 Change 103953 by jb@jb_freebsd2 on 2006/08/15 02:34:36 Fix compiler warnings. Affected files ... .. //depot/projects/dtrace/src/contrib/opensolaris/lib/libctf/common/ctf_subr.c#3 edit Differences ... ==== //depot/projects/dtrace/src/contrib/opensolaris/lib/libctf/common/ctf_subr.c#3 (text) ==== @@ -27,7 +27,6 @@ #pragma ident "@(#)ctf_subr.c 1.2 05/06/08 SMI" #include -#include #include #include @@ -58,7 +57,7 @@ /*ARGSUSED*/ void -ctf_free(void *buf, size_t size) +ctf_free(void *buf, __unused size_t size) { free(buf); } From owner-p4-projects@FreeBSD.ORG Tue Aug 15 02:35:57 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7049916A4E1; Tue, 15 Aug 2006 02:35:57 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 4B0C716A4DD for ; Tue, 15 Aug 2006 02:35:57 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id EA05A43D73 for ; Tue, 15 Aug 2006 02:35:56 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7F2Zusd084390 for ; Tue, 15 Aug 2006 02:35:56 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7F2ZuNE084385 for perforce@freebsd.org; Tue, 15 Aug 2006 02:35:56 GMT (envelope-from jb@freebsd.org) Date: Tue, 15 Aug 2006 02:35:56 GMT Message-Id: <200608150235.k7F2ZuNE084385@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 103954 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Aug 2006 02:35:57 -0000 http://perforce.freebsd.org/chv.cgi?CH=103954 Change 103954 by jb@jb_freebsd2 on 2006/08/15 02:35:23 Fix compiler warnings. Affected files ... .. //depot/projects/dtrace/src/sys/contrib/opensolaris/common/ctf/ctf_hash.c#2 edit Differences ... ==== //depot/projects/dtrace/src/sys/contrib/opensolaris/common/ctf/ctf_hash.c#2 (text) ==== @@ -29,7 +29,7 @@ #include -static const ushort_t _CTF_EMPTY[1] = { 0 }; +static ushort_t _CTF_EMPTY[1] = { 0 }; int ctf_hash_create(ctf_hash_t *hp, ulong_t nelems) From owner-p4-projects@FreeBSD.ORG Tue Aug 15 02:36:59 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EDC8C16A4E0; Tue, 15 Aug 2006 02:36:58 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 CC90516A4DA for ; Tue, 15 Aug 2006 02:36:58 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 982D543D45 for ; Tue, 15 Aug 2006 02:36:58 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7F2awlt084462 for ; Tue, 15 Aug 2006 02:36:58 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7F2awqF084455 for perforce@freebsd.org; Tue, 15 Aug 2006 02:36:58 GMT (envelope-from jb@freebsd.org) Date: Tue, 15 Aug 2006 02:36:58 GMT Message-Id: <200608150236.k7F2awqF084455@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 103955 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Aug 2006 02:36:59 -0000 http://perforce.freebsd.org/chv.cgi?CH=103955 Change 103955 by jb@jb_freebsd2 on 2006/08/15 02:36:50 Remove 'const' from places which aren't treated as constant throughout the OpenSolaris code. Grrrr. Affected files ... .. //depot/projects/dtrace/src/sys/contrib/opensolaris/common/ctf/ctf_impl.h#3 edit Differences ... ==== //depot/projects/dtrace/src/sys/contrib/opensolaris/common/ctf/ctf_impl.h#3 (text) ==== @@ -52,6 +52,7 @@ #else /* _KERNEL */ #include +#include #include #include #include @@ -188,8 +189,8 @@ ctf_hash_t ctf_names; /* hash table of remaining type names */ ctf_lookup_t ctf_lookups[5]; /* pointers to hashes for name lookup */ ctf_strs_t ctf_str[2]; /* array of string table base and bounds */ - const uchar_t *ctf_base; /* base of CTF header + uncompressed buffer */ - const uchar_t *ctf_buf; /* uncompressed CTF data buffer */ + uchar_t *ctf_base; /* base of CTF header + uncompressed buffer */ + uchar_t *ctf_buf; /* uncompressed CTF data buffer */ size_t ctf_size; /* size of CTF header + uncompressed data */ uint_t *ctf_sxlate; /* translation table for symtab entries */ ulong_t ctf_nsyms; /* number of entries in symtab xlate table */ @@ -277,7 +278,7 @@ extern ssize_t ctf_get_ctt_size(const ctf_file_t *, const ctf_type_t *, ssize_t *, ssize_t *); -extern const ctf_type_t *ctf_lookup_by_id(ctf_file_t **, ctf_id_t); +extern ctf_type_t *ctf_lookup_by_id(ctf_file_t **, ctf_id_t); extern int ctf_hash_create(ctf_hash_t *, ulong_t); extern int ctf_hash_insert(ctf_hash_t *, ctf_file_t *, ushort_t, uint_t); @@ -325,8 +326,8 @@ extern void *ctf_zopen(int *); -extern const char _CTF_SECTION[]; /* name of CTF ELF section */ -extern const char _CTF_NULLSTR[]; /* empty string */ +extern char _CTF_SECTION[]; /* name of CTF ELF section */ +extern char _CTF_NULLSTR[]; /* empty string */ extern int _libctf_version; /* library client version */ extern int _libctf_debug; /* debugging messages enabled */ From owner-p4-projects@FreeBSD.ORG Tue Aug 15 02:39:02 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7401616A4DF; Tue, 15 Aug 2006 02:39:02 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 1F96116A4E0 for ; Tue, 15 Aug 2006 02:39:02 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B115343D6A for ; Tue, 15 Aug 2006 02:39:01 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7F2d1Zk084558 for ; Tue, 15 Aug 2006 02:39:01 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7F2d1xE084553 for perforce@freebsd.org; Tue, 15 Aug 2006 02:39:01 GMT (envelope-from jb@freebsd.org) Date: Tue, 15 Aug 2006 02:39:01 GMT Message-Id: <200608150239.k7F2d1xE084553@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 103956 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Aug 2006 02:39:02 -0000 http://perforce.freebsd.org/chv.cgi?CH=103956 Change 103956 by jb@jb_freebsd2 on 2006/08/15 02:38:02 More 'const' removal. Also remove the casts which attempted to override the consts. Affected files ... .. //depot/projects/dtrace/src/sys/contrib/opensolaris/common/ctf/ctf_open.c#2 edit Differences ... ==== //depot/projects/dtrace/src/sys/contrib/opensolaris/common/ctf/ctf_open.c#2 (text) ==== @@ -25,7 +25,9 @@ * Use is subject to license terms. */ +#if defined(sun) #pragma ident "@(#)ctf_open.c 1.10 06/01/07 SMI" +#endif #include #include @@ -37,8 +39,8 @@ { NULL, 0, 0, 0, 0, 0, 0 } }; -const char _CTF_SECTION[] = ".SUNW_ctf"; -const char _CTF_NULLSTR[] = ""; +char _CTF_SECTION[] = ".SUNW_ctf"; +char _CTF_NULLSTR[] = ""; int _libctf_version = CTF_VERSION; /* library client version */ int _libctf_debug = 0; /* debugging messages enabled */ @@ -80,7 +82,7 @@ } static const ctf_fileops_t ctf_fileops[] = { - { NULL, NULL }, + { NULL, NULL, NULL }, { get_kind_v1, get_root_v1, get_vlen_v1 }, { get_kind_v2, get_root_v2, get_vlen_v2 }, }; @@ -199,9 +201,9 @@ init_types(ctf_file_t *fp, const ctf_header_t *cth) { /* LINTED - pointer alignment */ - const ctf_type_t *tbuf = (ctf_type_t *)(fp->ctf_buf + cth->cth_typeoff); + const ctf_type_t *tbuf = (const ctf_type_t *)(const void *)(fp->ctf_buf + cth->cth_typeoff); /* LINTED - pointer alignment */ - const ctf_type_t *tend = (ctf_type_t *)(fp->ctf_buf + cth->cth_stroff); + const ctf_type_t *tend = (const ctf_type_t *)(const void *)(fp->ctf_buf + cth->cth_stroff); ulong_t pop[CTF_K_MAX + 1] = { 0 }; const ctf_type_t *tp; @@ -479,7 +481,7 @@ * in fp->ctf_ptrtab[ index of referenced type ]. */ if (CTF_TYPE_ISCHILD(tp->ctt_type) == child && - CTF_TYPE_TO_INDEX(tp->ctt_type) <= fp->ctf_typemax) + CTF_TYPE_TO_INDEX(tp->ctt_type) <= (long) fp->ctf_typemax) fp->ctf_ptrtab[ CTF_TYPE_TO_INDEX(tp->ctt_type)] = id; /*FALLTHRU*/ @@ -524,7 +526,7 @@ if (LCTF_INFO_KIND(fp, tp->ctt_info) == CTF_K_TYPEDEF && strcmp(ctf_strptr(fp, tp->ctt_name), "") == 0 && CTF_TYPE_ISCHILD(tp->ctt_type) == child && - CTF_TYPE_TO_INDEX(tp->ctt_type) <= fp->ctf_typemax) + CTF_TYPE_TO_INDEX(tp->ctt_type) <= (long) fp->ctf_typemax) fp->ctf_ptrtab[ CTF_TYPE_TO_INDEX(tp->ctt_type)] = dst; } @@ -828,24 +830,24 @@ if (fp->ctf_data.cts_name != _CTF_NULLSTR && fp->ctf_data.cts_name != NULL) { - ctf_free((char *)fp->ctf_data.cts_name, + ctf_free(fp->ctf_data.cts_name, strlen(fp->ctf_data.cts_name) + 1); } if (fp->ctf_symtab.cts_name != _CTF_NULLSTR && fp->ctf_symtab.cts_name != NULL) { - ctf_free((char *)fp->ctf_symtab.cts_name, + ctf_free(fp->ctf_symtab.cts_name, strlen(fp->ctf_symtab.cts_name) + 1); } if (fp->ctf_strtab.cts_name != _CTF_NULLSTR && fp->ctf_strtab.cts_name != NULL) { - ctf_free((char *)fp->ctf_strtab.cts_name, + ctf_free(fp->ctf_strtab.cts_name, strlen(fp->ctf_strtab.cts_name) + 1); } if (fp->ctf_base != fp->ctf_data.cts_data && fp->ctf_base != NULL) - ctf_data_free((void *)fp->ctf_base, fp->ctf_size); + ctf_data_free(fp->ctf_base, fp->ctf_size); if (fp->ctf_sxlate != NULL) ctf_free(fp->ctf_sxlate, sizeof (uint_t) * fp->ctf_nsyms); From owner-p4-projects@FreeBSD.ORG Tue Aug 15 02:40:04 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E3E2216A4EA; Tue, 15 Aug 2006 02:40:03 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 A9EE816A4E8 for ; Tue, 15 Aug 2006 02:40:03 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6351F43D45 for ; Tue, 15 Aug 2006 02:40:03 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7F2e3ch084644 for ; Tue, 15 Aug 2006 02:40:03 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7F2e3rA084639 for perforce@freebsd.org; Tue, 15 Aug 2006 02:40:03 GMT (envelope-from jb@freebsd.org) Date: Tue, 15 Aug 2006 02:40:03 GMT Message-Id: <200608150240.k7F2e3rA084639@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 103957 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Aug 2006 02:40:04 -0000 http://perforce.freebsd.org/chv.cgi?CH=103957 Change 103957 by jb@jb_freebsd2 on 2006/08/15 02:39:22 Fix yet more compiler warnings. Affected files ... .. //depot/projects/dtrace/src/sys/contrib/opensolaris/common/ctf/ctf_lookup.c#3 edit Differences ... ==== //depot/projects/dtrace/src/sys/contrib/opensolaris/common/ctf/ctf_lookup.c#3 (text) ==== @@ -27,7 +27,7 @@ #pragma ident "@(#)ctf_lookup.c 1.6 06/01/07 SMI" -#if defined(sun) +#if defined(sun) #include #endif #include @@ -63,7 +63,7 @@ int h = s[len - 1] + (int)len - 105; const struct qual *qp = &qhash[h]; - return (h >= 0 && h < sizeof (qhash) / sizeof (qhash[0]) && + return (h >= 0 && h < (int) (sizeof (qhash) / sizeof (qhash[0])) && len == qp->q_len && strncmp(qp->q_name, s, qp->q_len) == 0); } @@ -214,7 +214,7 @@ * given type ID. If the ID is invalid, the function returns NULL. * This function is not exported outside of the library. */ -const ctf_type_t * +ctf_type_t * ctf_lookup_by_id(ctf_file_t **fpp, ctf_id_t type) { ctf_file_t *fp = *fpp; /* caller passes in starting CTF container */ @@ -226,7 +226,7 @@ } type = CTF_TYPE_TO_INDEX(type); - if (type > 0 && type <= fp->ctf_typemax) { + if (type > 0 && type <= (long) fp->ctf_typemax) { *fpp = fp; /* function returns ending CTF container */ return (LCTF_INDEX_TO_TYPEPTR(fp, type)); } From owner-p4-projects@FreeBSD.ORG Tue Aug 15 02:41:05 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8A4EA16A4E1; Tue, 15 Aug 2006 02:41:05 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 659FB16A4DF for ; Tue, 15 Aug 2006 02:41:05 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 300F143D53 for ; Tue, 15 Aug 2006 02:41:05 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7F2f551084785 for ; Tue, 15 Aug 2006 02:41:05 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7F2f4EH084782 for perforce@freebsd.org; Tue, 15 Aug 2006 02:41:04 GMT (envelope-from jb@freebsd.org) Date: Tue, 15 Aug 2006 02:41:04 GMT Message-Id: <200608150241.k7F2f4EH084782@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 103958 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Aug 2006 02:41:05 -0000 http://perforce.freebsd.org/chv.cgi?CH=103958 Change 103958 by jb@jb_freebsd2 on 2006/08/15 02:41:00 On Solaris this code has been linted so they are confident that the compiler warnings can be ignored. On FreeBSD I'd like to avoid compiler warnings. Affected files ... .. //depot/projects/dtrace/src/sys/contrib/opensolaris/common/ctf/ctf_labels.c#2 edit Differences ... ==== //depot/projects/dtrace/src/sys/contrib/opensolaris/common/ctf/ctf_labels.c#2 (text) ==== @@ -31,7 +31,12 @@ static int extract_label_info(ctf_file_t *fp, const ctf_lblent_t **ctl, uint_t *num_labels) { +#if defined(sun) const ctf_header_t *h; +#else + ctf_header_t *h; + const void *p; +#endif /* * Labels are only supported in V2 or later @@ -39,10 +44,17 @@ if (fp->ctf_version < CTF_VERSION_2) return (ctf_set_errno(fp, ECTF_NOTSUP)); +#if defined(sun) h = (const ctf_header_t *)fp->ctf_data.cts_data; /* LINTED - pointer alignment */ *ctl = (const ctf_lblent_t *)(fp->ctf_buf + h->cth_lbloff); +#else + h = (ctf_header_t *)fp->ctf_data.cts_data; + + p = fp->ctf_buf + h->cth_lbloff; + *ctl = p; +#endif *num_labels = (h->cth_objtoff - h->cth_lbloff) / sizeof (ctf_lblent_t); return (0); From owner-p4-projects@FreeBSD.ORG Tue Aug 15 02:42:07 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7279116A4DF; Tue, 15 Aug 2006 02:42:07 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 516E616A4DE for ; Tue, 15 Aug 2006 02:42:07 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1D92F43D49 for ; Tue, 15 Aug 2006 02:42:07 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7F2g6LK084912 for ; Tue, 15 Aug 2006 02:42:06 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7F2g63W084909 for perforce@freebsd.org; Tue, 15 Aug 2006 02:42:06 GMT (envelope-from jb@freebsd.org) Date: Tue, 15 Aug 2006 02:42:06 GMT Message-Id: <200608150242.k7F2g63W084909@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 103959 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Aug 2006 02:42:07 -0000 http://perforce.freebsd.org/chv.cgi?CH=103959 Change 103959 by jb@jb_freebsd2 on 2006/08/15 02:41:56 More compiler warning avoidance. Affected files ... .. //depot/projects/dtrace/src/sys/contrib/opensolaris/common/ctf/ctf_create.c#4 edit Differences ... ==== //depot/projects/dtrace/src/sys/contrib/opensolaris/common/ctf/ctf_create.c#4 (text) ==== @@ -54,7 +54,7 @@ ctf_file_t * ctf_create(int *errp) { - static const ctf_header_t hdr = { { CTF_MAGIC, CTF_VERSION, 0 } }; + static ctf_header_t hdr = { { CTF_MAGIC, CTF_VERSION, 0 }, 0, 0, 0, 0, 0, 0, 0, 0 }; const ulong_t hashlen = 128; ctf_dtdef_t **hash = ctf_alloc(hashlen * sizeof (ctf_dtdef_t *)); @@ -504,7 +504,7 @@ int ctf_discard(ctf_file_t *fp) { - ctf_dtdef_t *dtd, *ntd; + ctf_dtdef_t *dtd, *ntd = NULL; if (!(fp->ctf_flags & LCTF_RDWR)) return (ctf_set_errno(fp, ECTF_RDONLY)); @@ -513,7 +513,7 @@ return (0); /* no update required */ for (dtd = ctf_list_next(&fp->ctf_dtdefs); dtd != NULL; dtd = ntd) { - if (dtd->dtd_type <= fp->ctf_dtoldid) + if ((ulong_t) dtd->dtd_type <= fp->ctf_dtoldid) continue; /* skip types that have been committed */ ntd = ctf_list_next(dtd); @@ -1037,7 +1037,7 @@ /*ARGSUSED*/ static int -membcmp(const char *name, ctf_id_t type, ulong_t offset, void *arg) +membcmp(const char *name, __unused ctf_id_t type, ulong_t offset, void *arg) { ctf_bundle_t *ctb = arg; ctf_membinfo_t ctm; @@ -1164,9 +1164,9 @@ */ if (dst_type == CTF_ERR && name[0] != '\0') { for (dtd = ctf_list_prev(&dst_fp->ctf_dtdefs); dtd != NULL && - dtd->dtd_type > dst_fp->ctf_dtoldid; + (ulong_t) dtd->dtd_type > dst_fp->ctf_dtoldid; dtd = ctf_list_prev(dtd)) { - if (CTF_INFO_KIND(dtd->dtd_data.ctt_info) == kind && + if ((uint_t) CTF_INFO_KIND(dtd->dtd_data.ctt_info) == kind && dtd->dtd_name != NULL && strcmp(dtd->dtd_name, name) == 0) return (dtd->dtd_type); From owner-p4-projects@FreeBSD.ORG Tue Aug 15 02:44:10 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BDA0216A4E0; Tue, 15 Aug 2006 02:44:10 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 985BE16A4DE for ; Tue, 15 Aug 2006 02:44:10 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3A1B543D45 for ; Tue, 15 Aug 2006 02:44:10 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7F2iAUh085021 for ; Tue, 15 Aug 2006 02:44:10 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7F2i9TI085018 for perforce@freebsd.org; Tue, 15 Aug 2006 02:44:09 GMT (envelope-from jb@freebsd.org) Date: Tue, 15 Aug 2006 02:44:09 GMT Message-Id: <200608150244.k7F2i9TI085018@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 103960 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Aug 2006 02:44:11 -0000 http://perforce.freebsd.org/chv.cgi?CH=103960 Change 103960 by jb@jb_freebsd2 on 2006/08/15 02:43:44 Add source files for all the functions in libelf that DTrace references. Affected files ... .. //depot/projects/dtrace/src/lib/libelf/Makefile#4 edit Differences ... ==== //depot/projects/dtrace/src/lib/libelf/Makefile#4 (text+ko) ==== @@ -5,21 +5,41 @@ SRCS= elf_allocate.c \ elf_begin.c \ elf_cntl.c \ - elf_dump.c elf_dump_argv.c \ + elf_dump.c \ + elf_dump_argv.c \ elf_end.c elf_errmsg.c elf_errno.c \ elf_fill.c \ + elf_flagelf.c \ + elf_getarhdr.c \ elf_getbase.c \ + elf_getdata.c \ elf_getident.c \ + elf_getscn.c \ elf_kind.c \ elf_memory.c \ + elf_ndxscn.c \ + elf_newdata.c \ + elf_newscn.c \ elf_next.c \ + elf_nextscn.c \ elf_rand.c \ + elf_rawdata.c \ elf_rawfile.c \ + elf_strptr.c \ + elf_update.c \ elf_version.c \ gelf_fsize.c \ gelf_getclass.c \ gelf_getehdr.c \ + gelf_getphdr.c \ + gelf_getshdr.c \ + gelf_getsym.c \ gelf_newehdr.c \ + gelf_newphdr.c \ + gelf_update_ehdr.c \ + gelf_update_phdr.c \ + gelf_update_shdr.c \ + gelf_update_sym.c \ gelf_xlate.c \ libelf.c INCS= libelf.h gelf.h From owner-p4-projects@FreeBSD.ORG Tue Aug 15 02:48:16 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A5E0216A4DD; Tue, 15 Aug 2006 02:48:16 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 807F716A4E1 for ; Tue, 15 Aug 2006 02:48:16 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4E90743D4C for ; Tue, 15 Aug 2006 02:48:16 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7F2mG1G085214 for ; Tue, 15 Aug 2006 02:48:16 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7F2mFmd085211 for perforce@freebsd.org; Tue, 15 Aug 2006 02:48:15 GMT (envelope-from jb@freebsd.org) Date: Tue, 15 Aug 2006 02:48:15 GMT Message-Id: <200608150248.k7F2mFmd085211@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 103961 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Aug 2006 02:48:16 -0000 http://perforce.freebsd.org/chv.cgi?CH=103961 Change 103961 by jb@jb_freebsd2 on 2006/08/15 02:47:41 Use the compiler warning level specified above. Remove a source file that contains code we don't have an implementation for. Affected files ... .. //depot/projects/dtrace/src/cddl/lib/libdtrace/Makefile#10 edit Differences ... ==== //depot/projects/dtrace/src/cddl/lib/libdtrace/Makefile#10 (text+ko) ==== @@ -5,8 +5,7 @@ LIB= dtrace SHLIB_MAJOR= 1 -SRCS= drti.c \ - dt_aggregate.c \ +SRCS= dt_aggregate.c \ dt_as.c \ dt_buf.c \ dt_cc.c \ @@ -48,8 +47,6 @@ DSRCS= errno.d \ psinfo.d -WARNS?= 0 - .PATH: ${OPENSOLARIS_USR_DISTDIR}/lib/libdtrace/common .PATH: ${OPENSOLARIS_USR_DISTDIR}/lib/libgen/common From owner-p4-projects@FreeBSD.ORG Tue Aug 15 02:53:23 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A53AB16A4E5; Tue, 15 Aug 2006 02:53:23 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 68A7416A4DE for ; Tue, 15 Aug 2006 02:53:23 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id F3B4B43D69 for ; Tue, 15 Aug 2006 02:53:22 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7F2rMVh085532 for ; Tue, 15 Aug 2006 02:53:22 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7F2rM8w085523 for perforce@freebsd.org; Tue, 15 Aug 2006 02:53:22 GMT (envelope-from jb@freebsd.org) Date: Tue, 15 Aug 2006 02:53:22 GMT Message-Id: <200608150253.k7F2rM8w085523@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 103962 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Aug 2006 02:53:23 -0000 http://perforce.freebsd.org/chv.cgi?CH=103962 Change 103962 by jb@jb_freebsd2 on 2006/08/15 02:53:00 Stop building Sun's libelf altogether now. This might be a bit premature, but it will provide inspiration to get libbsdelf finished. 8-) Affected files ... .. //depot/projects/dtrace/src/cddl/lib/Makefile#5 edit Differences ... ==== //depot/projects/dtrace/src/cddl/lib/Makefile#5 (text+ko) ==== @@ -2,8 +2,4 @@ SUBDIR= libctf libdtrace libproc -.if ${MACHINE_ARCH} == "i386" -SUBDIR+= libelf -.endif - .include From owner-p4-projects@FreeBSD.ORG Tue Aug 15 03:00:34 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B686716A524; Tue, 15 Aug 2006 03:00:33 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 8FC7316A517 for ; Tue, 15 Aug 2006 03:00:33 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9837743D53 for ; Tue, 15 Aug 2006 03:00:32 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7F30WuU085823 for ; Tue, 15 Aug 2006 03:00:32 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7F30W4J085820 for perforce@freebsd.org; Tue, 15 Aug 2006 03:00:32 GMT (envelope-from jb@freebsd.org) Date: Tue, 15 Aug 2006 03:00:32 GMT Message-Id: <200608150300.k7F30W4J085820@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 103963 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Aug 2006 03:00:34 -0000 http://perforce.freebsd.org/chv.cgi?CH=103963 Change 103963 by jb@jb_freebsd2 on 2006/08/15 02:59:33 Add libelf. Affected files ... .. //depot/projects/dtrace/src/lib/Makefile#6 edit Differences ... ==== //depot/projects/dtrace/src/lib/Makefile#6 (text+ko) ==== @@ -29,7 +29,7 @@ ${_libypclnt} libalias libarchive ${_libatm} \ libbegemot ${_libbluetooth} libbsnmp libbz2 libc ${_libc_r} \ libcalendar libcam libcompat libdevinfo libdevstat libdisk \ - libedit libexpat libfetch libform libftpio libgeom ${_libgpib} \ + libedit libelf libexpat libfetch libform libftpio libgeom ${_libgpib} \ libgssapi ${_libio} libipsec \ ${_libipx} libkiconv libmagic libmemstat libmenu ${_libmilter} ${_libmp} \ ${_libncp} ${_libngatm} libopie libpam libpanel libpcap \ From owner-p4-projects@FreeBSD.ORG Tue Aug 15 03:01:35 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D922316A4DF; Tue, 15 Aug 2006 03:01:34 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 9F80216A4DA for ; Tue, 15 Aug 2006 03:01:34 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5104643D49 for ; Tue, 15 Aug 2006 03:01:34 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7F31Yxt086119 for ; Tue, 15 Aug 2006 03:01:34 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7F31X3Q086116 for perforce@freebsd.org; Tue, 15 Aug 2006 03:01:33 GMT (envelope-from jb@freebsd.org) Date: Tue, 15 Aug 2006 03:01:33 GMT Message-Id: <200608150301.k7F31X3Q086116@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 103964 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Aug 2006 03:01:35 -0000 http://perforce.freebsd.org/chv.cgi?CH=103964 Change 103964 by jb@jb_freebsd2 on 2006/08/15 03:00:36 Stop using Sun's libelf and start using our own (even though it isn't complete yet -- we need to concentrate on that!). Affected files ... .. //depot/projects/dtrace/src/Makefile.inc1#14 edit Differences ... ==== //depot/projects/dtrace/src/Makefile.inc1#14 (text+ko) ==== @@ -863,7 +863,7 @@ .endif .if ${MK_CDDL} != "no" -_dtrace_tools= cddl/usr.bin/sgsmsg cddl/lib/libctf gnu/lib/libdwarf cddl/lib/libelf cddl/usr.bin/ctfconvert cddl/usr.bin/ctfmerge +_dtrace_tools= cddl/usr.bin/sgsmsg cddl/lib/libctf gnu/lib/libdwarf lib/libelf cddl/usr.bin/ctfconvert cddl/usr.bin/ctfmerge .endif bootstrap-tools: From owner-p4-projects@FreeBSD.ORG Tue Aug 15 03:03:37 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C54DA16A4E1; Tue, 15 Aug 2006 03:03:37 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 A138416A4DF for ; Tue, 15 Aug 2006 03:03:37 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3E7D543D45 for ; Tue, 15 Aug 2006 03:03:37 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7F33bEA087414 for ; Tue, 15 Aug 2006 03:03:37 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7F33aZD087411 for perforce@freebsd.org; Tue, 15 Aug 2006 03:03:36 GMT (envelope-from jb@freebsd.org) Date: Tue, 15 Aug 2006 03:03:36 GMT Message-Id: <200608150303.k7F33aZD087411@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 103965 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Aug 2006 03:03:38 -0000 http://perforce.freebsd.org/chv.cgi?CH=103965 Change 103965 by jb@jb_freebsd2 on 2006/08/15 03:02:57 FreeBSD's struct _Elf has the leading underscore because it is private to the library. libdwarf should really be using the typedef'd name. Affected files ... .. //depot/projects/dtrace/src/contrib/libdwarf/libdwarf.h#3 edit Differences ... ==== //depot/projects/dtrace/src/contrib/libdwarf/libdwarf.h#3 (text) ==== @@ -63,8 +63,8 @@ struct elf_sgi; typedef struct elf_sgi* dwarf_elf_handle; #else -struct Elf; -typedef struct Elf* dwarf_elf_handle; +struct _Elf; +typedef struct _Elf* dwarf_elf_handle; #endif #if (_MIPS_SZLONG == 64) From owner-p4-projects@FreeBSD.ORG Tue Aug 15 03:31:14 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5787E16A4E1; Tue, 15 Aug 2006 03:31:14 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 3356B16A4DA for ; Tue, 15 Aug 2006 03:31:14 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E351D43D45 for ; Tue, 15 Aug 2006 03:31:13 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7F3VD6w088884 for ; Tue, 15 Aug 2006 03:31:13 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7F3VDVi088881 for perforce@freebsd.org; Tue, 15 Aug 2006 03:31:13 GMT (envelope-from jhb@freebsd.org) Date: Tue, 15 Aug 2006 03:31:13 GMT Message-Id: <200608150331.k7F3VDVi088881@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Cc: Subject: PERFORCE change 103967 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Aug 2006 03:31:14 -0000 http://perforce.freebsd.org/chv.cgi?CH=103967 Change 103967 by jhb@jhb_zion on 2006/08/15 03:31:02 Grrr. Affected files ... .. //depot/projects/smpng/sys/modules/crash2/crash2.c#17 edit Differences ... ==== //depot/projects/smpng/sys/modules/crash2/crash2.c#17 (text+ko) ==== @@ -108,7 +108,7 @@ static void mtx_deadlock(int thread) { - static int barrier; + static volatile int barrier; atomic_add_int(&barrier, 1); while (barrier < NTHREADS) From owner-p4-projects@FreeBSD.ORG Tue Aug 15 03:37:27 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1533B16A4E2; Tue, 15 Aug 2006 03:37:27 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 DDF5B16A4DF for ; Tue, 15 Aug 2006 03:37:26 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7414443D6A for ; Tue, 15 Aug 2006 03:37:22 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7F3bLnB089173 for ; Tue, 15 Aug 2006 03:37:21 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7F3bLo9089170 for perforce@freebsd.org; Tue, 15 Aug 2006 03:37:21 GMT (envelope-from jb@freebsd.org) Date: Tue, 15 Aug 2006 03:37:21 GMT Message-Id: <200608150337.k7F3bLo9089170@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 103968 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Aug 2006 03:37:27 -0000 http://perforce.freebsd.org/chv.cgi?CH=103968 Change 103968 by jb@jb_freebsd2 on 2006/08/15 03:37:15 Change a 'copystr' to a 'copyout' since the destination is in user space and 'copystr' is only for kernel to kernel copies. Without this change, sun4v panics. Affected files ... .. //depot/projects/dtrace/src/sys/kern/vfs_mount.c#7 edit Differences ... ==== //depot/projects/dtrace/src/sys/kern/vfs_mount.c#7 (text+ko) ==== @@ -697,10 +697,9 @@ errmsg, fsoptions->uio_iov[2 * errmsg_pos + 1].iov_len); } else { - copystr(errmsg, + copyout(errmsg, fsoptions->uio_iov[2 * errmsg_pos + 1].iov_base, - fsoptions->uio_iov[2 * errmsg_pos + 1].iov_len, - NULL); + fsoptions->uio_iov[2 * errmsg_pos + 1].iov_len); } } From owner-p4-projects@FreeBSD.ORG Tue Aug 15 04:00:52 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id F422916A4E1; Tue, 15 Aug 2006 04:00:51 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 9E2A616A4DD for ; Tue, 15 Aug 2006 04:00:51 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 593B443D45 for ; Tue, 15 Aug 2006 04:00:51 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7F40pdF091832 for ; Tue, 15 Aug 2006 04:00:51 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7F40pH2091829 for perforce@freebsd.org; Tue, 15 Aug 2006 04:00:51 GMT (envelope-from jb@freebsd.org) Date: Tue, 15 Aug 2006 04:00:51 GMT Message-Id: <200608150400.k7F40pH2091829@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 103969 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Aug 2006 04:00:52 -0000 http://perforce.freebsd.org/chv.cgi?CH=103969 Change 103969 by jb@jb_freebsd2 on 2006/08/15 04:00:44 Ignore unknown pragmas in Sun's CDDL code. Affected files ... .. //depot/projects/dtrace/src/sys/modules/dtrace/Makefile.inc#6 edit Differences ... ==== //depot/projects/dtrace/src/sys/modules/dtrace/Makefile.inc#6 (text+ko) ==== @@ -1,5 +1,7 @@ # $FreeBSD +IGNORE_PRAGMA= 1 + load : -kldload cyclic -kldload dtrace From owner-p4-projects@FreeBSD.ORG Tue Aug 15 04:01:53 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BB55716A4E0; Tue, 15 Aug 2006 04:01:53 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 7F7FE16A4DA for ; Tue, 15 Aug 2006 04:01:53 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3A97643D46 for ; Tue, 15 Aug 2006 04:01:53 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7F41rdS091969 for ; Tue, 15 Aug 2006 04:01:53 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7F41qwA091964 for perforce@freebsd.org; Tue, 15 Aug 2006 04:01:52 GMT (envelope-from jb@freebsd.org) Date: Tue, 15 Aug 2006 04:01:52 GMT Message-Id: <200608150401.k7F41qwA091964@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 103970 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Aug 2006 04:01:54 -0000 http://perforce.freebsd.org/chv.cgi?CH=103970 Change 103970 by jb@jb_freebsd2 on 2006/08/15 04:01:31 copystr -> copyout bug fix. Affected files ... .. //depot/projects/kmacy_sun4v_stable/src/sys/kern/vfs_mount.c#3 edit Differences ... ==== //depot/projects/kmacy_sun4v_stable/src/sys/kern/vfs_mount.c#3 (text+ko) ==== @@ -697,10 +697,9 @@ errmsg, fsoptions->uio_iov[2 * errmsg_pos + 1].iov_len); } else { - copystr(errmsg, + copyout(errmsg, fsoptions->uio_iov[2 * errmsg_pos + 1].iov_base, - fsoptions->uio_iov[2 * errmsg_pos + 1].iov_len, - NULL); + fsoptions->uio_iov[2 * errmsg_pos + 1].iov_len); } } From owner-p4-projects@FreeBSD.ORG Tue Aug 15 04:06:03 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CDAB416A4E2; Tue, 15 Aug 2006 04:06:03 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 A9D6816A4DE for ; Tue, 15 Aug 2006 04:06:03 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 54F8643D6D for ; Tue, 15 Aug 2006 04:05:59 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7F45wXg093397 for ; Tue, 15 Aug 2006 04:05:58 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7F45wrV093394 for perforce@freebsd.org; Tue, 15 Aug 2006 04:05:58 GMT (envelope-from jb@freebsd.org) Date: Tue, 15 Aug 2006 04:05:58 GMT Message-Id: <200608150405.k7F45wrV093394@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 103971 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Aug 2006 04:06:04 -0000 http://perforce.freebsd.org/chv.cgi?CH=103971 Change 103971 by jb@jb_freebsd2 on 2006/08/15 04:05:35 Add the the shell of elfdump to libelf. I prefer to have all the functionality in the library so that an embedded, threaded application can include it. Doing embedded stuff by crunching together standalone apps sucks IMHO. Thread-safe library functions integrate much more neatly. Affected files ... .. //depot/projects/dtrace/src/lib/libelf/elf_dump.c#1 add .. //depot/projects/dtrace/src/lib/libelf/elf_dump_argv.c#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Tue Aug 15 04:07:01 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4410D16A4E0; Tue, 15 Aug 2006 04:07:01 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 233C816A4DA for ; Tue, 15 Aug 2006 04:07:01 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C85B543D5C for ; Tue, 15 Aug 2006 04:07:00 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7F470Md093503 for ; Tue, 15 Aug 2006 04:07:00 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7F470bk093494 for perforce@freebsd.org; Tue, 15 Aug 2006 04:07:00 GMT (envelope-from jb@freebsd.org) Date: Tue, 15 Aug 2006 04:07:00 GMT Message-Id: <200608150407.k7F470bk093494@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 103973 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Aug 2006 04:07:01 -0000 http://perforce.freebsd.org/chv.cgi?CH=103973 Change 103973 by jb@jb_freebsd2 on 2006/08/15 04:06:57 Part of the elf dump library functionality. Affected files ... .. //depot/projects/dtrace/src/lib/libelf/libelf_dump.c#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Tue Aug 15 04:07:01 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 84B8A16A556; Tue, 15 Aug 2006 04:07:01 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 5043616A4EB for ; Tue, 15 Aug 2006 04:07:01 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8A71C43D58 for ; Tue, 15 Aug 2006 04:07:00 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7F470nh093483 for ; Tue, 15 Aug 2006 04:07:00 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7F4700c093476 for perforce@freebsd.org; Tue, 15 Aug 2006 04:07:00 GMT (envelope-from jb@freebsd.org) Date: Tue, 15 Aug 2006 04:07:00 GMT Message-Id: <200608150407.k7F4700c093476@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 103972 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Aug 2006 04:07:01 -0000 http://perforce.freebsd.org/chv.cgi?CH=103972 Change 103972 by jb@jb_freebsd2 on 2006/08/15 04:06:28 Add the shell of the functions that DTrace requires. Affected files ... .. //depot/projects/dtrace/src/lib/libelf/elf_flagelf.c#1 add .. //depot/projects/dtrace/src/lib/libelf/elf_getarhdr.c#1 add .. //depot/projects/dtrace/src/lib/libelf/elf_getdata.c#1 add .. //depot/projects/dtrace/src/lib/libelf/elf_getscn.c#1 add .. //depot/projects/dtrace/src/lib/libelf/elf_ndxscn.c#1 add .. //depot/projects/dtrace/src/lib/libelf/elf_newdata.c#1 add .. //depot/projects/dtrace/src/lib/libelf/elf_newscn.c#1 add .. //depot/projects/dtrace/src/lib/libelf/elf_nextscn.c#1 add .. //depot/projects/dtrace/src/lib/libelf/elf_rawdata.c#1 add .. //depot/projects/dtrace/src/lib/libelf/elf_strptr.c#1 add .. //depot/projects/dtrace/src/lib/libelf/elf_update.c#1 add .. //depot/projects/dtrace/src/lib/libelf/gelf_getphdr.c#1 add .. //depot/projects/dtrace/src/lib/libelf/gelf_getshdr.c#1 add .. //depot/projects/dtrace/src/lib/libelf/gelf_getsym.c#1 add .. //depot/projects/dtrace/src/lib/libelf/gelf_newphdr.c#1 add .. //depot/projects/dtrace/src/lib/libelf/gelf_update_ehdr.c#1 add .. //depot/projects/dtrace/src/lib/libelf/gelf_update_phdr.c#1 add .. //depot/projects/dtrace/src/lib/libelf/gelf_update_shdr.c#1 add .. //depot/projects/dtrace/src/lib/libelf/gelf_update_sym.c#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Tue Aug 15 04:27:31 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 085C116A4E7; Tue, 15 Aug 2006 04:27:31 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 BBFDE16A4E5 for ; Tue, 15 Aug 2006 04:27:30 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 22F2643D46 for ; Tue, 15 Aug 2006 04:27:30 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7F4RTwE094799 for ; Tue, 15 Aug 2006 04:27:30 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7F4RQv7094796 for perforce@freebsd.org; Tue, 15 Aug 2006 04:27:26 GMT (envelope-from jb@freebsd.org) Date: Tue, 15 Aug 2006 04:27:26 GMT Message-Id: <200608150427.k7F4RQv7094796@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 103974 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Aug 2006 04:27:31 -0000 http://perforce.freebsd.org/chv.cgi?CH=103974 Change 103974 by jb@jb_freebsd2 on 2006/08/15 04:27:23 IFC Affected files ... .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#21 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/contributors/contrib.committers.sgml#16 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/contributors/contrib.develalumni.sgml#11 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/contributors/contrib.staff.sgml#4 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/linux-comparison/article.sgml#2 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/dev-model/book.sgml#2 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/firewalls/chapter.sgml#6 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/serialcomms/chapter.sgml#3 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/porters-handbook/book.sgml#19 integrate .. //depot/projects/dtrace/doc/nl_NL.ISO8859-1/share/sgml/glossary/freebsd-glossary.sgml#3 integrate .. //depot/projects/dtrace/doc/ru_RU.KOI8-R/share/sgml/freebsd.dsl#2 integrate .. //depot/projects/dtrace/doc/share/pgpkeys/markus.key#2 integrate .. //depot/projects/dtrace/doc/share/pgpkeys/shaun.key#2 integrate .. //depot/projects/dtrace/doc/share/pgpkeys/simon.key#2 integrate .. //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/Makefile#5 integrate .. //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/advanced-networking/chapter.sgml#6 integrate .. //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/book.sgml#4 integrate .. //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/config/chapter.sgml#6 integrate .. //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/disks/chapter.sgml#5 integrate .. //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/firewalls/chapter.sgml#4 integrate .. //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/install/chapter.sgml#8 integrate .. //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/mac/chapter.sgml#5 integrate .. //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/ports/chapter.sgml#5 integrate .. //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/serialcomms/chapter.sgml#4 integrate .. //depot/projects/dtrace/doc/zh_CN.GB2312/books/porters-handbook/book.sgml#7 integrate .. //depot/projects/dtrace/doc/zh_CN.GB2312/share/sgml/glossary/freebsd-glossary.sgml#1 branch .. //depot/projects/dtrace/doc/zh_CN.GB2312/share/sgml/l10n.ent#4 integrate .. //depot/projects/dtrace/doc/zh_CN.GB2312/share/sgml/trademarks.ent#3 integrate .. //depot/projects/dtrace/ports/MOVED#12 integrate .. //depot/projects/dtrace/ports/Mk/bsd.emacs.mk#3 integrate .. //depot/projects/dtrace/ports/Mk/bsd.gnome.mk#4 integrate .. //depot/projects/dtrace/ports/Mk/bsd.port.mk#6 integrate .. //depot/projects/dtrace/ports/Mk/bsd.sites.mk#6 integrate .. //depot/projects/dtrace/src/Makefile.inc1#15 integrate .. //depot/projects/dtrace/src/ObsoleteFiles.inc#9 integrate .. //depot/projects/dtrace/src/contrib/smbfs/smbutil/print.c#3 integrate .. //depot/projects/dtrace/src/contrib/smbfs/smbutil/view.c#3 integrate .. //depot/projects/dtrace/src/gnu/usr.bin/binutils/libbfd/Makefile.arm#2 integrate .. //depot/projects/dtrace/src/gnu/usr.bin/groff/contrib/mm/Makefile#3 integrate .. //depot/projects/dtrace/src/gnu/usr.bin/groff/tmac/Makefile#3 integrate .. //depot/projects/dtrace/src/gnu/usr.bin/groff/tmac/mdoc.local#4 integrate .. //depot/projects/dtrace/src/lib/libc/gen/msgctl.3#3 integrate .. //depot/projects/dtrace/src/lib/libc/stdlib/malloc.c#6 integrate .. //depot/projects/dtrace/src/lib/libc/string/strcoll.3#3 integrate .. //depot/projects/dtrace/src/lib/libdisk/write_ia64_disk.c#3 integrate .. //depot/projects/dtrace/src/lib/libpam/modules/pam_lastlog/pam_lastlog.c#3 integrate .. //depot/projects/dtrace/src/lib/libthr/thread/thr_init.c#7 integrate .. //depot/projects/dtrace/src/lib/libthr/thread/thr_mutex.c#4 integrate .. //depot/projects/dtrace/src/lib/libthr/thread/thr_private.h#6 integrate .. //depot/projects/dtrace/src/lib/libthr/thread/thr_pspinlock.c#3 integrate .. //depot/projects/dtrace/src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#15 integrate .. //depot/projects/dtrace/src/sbin/geom/class/eli/geli.8#3 integrate .. //depot/projects/dtrace/src/sbin/geom/class/eli/geom_eli.c#5 integrate .. //depot/projects/dtrace/src/sbin/ifconfig/ifclone.c#4 integrate .. //depot/projects/dtrace/src/sbin/ifconfig/ifieee80211.c#4 integrate .. //depot/projects/dtrace/src/sbin/ping/ping.c#3 integrate .. //depot/projects/dtrace/src/sbin/sysctl/sysctl.c#5 integrate .. //depot/projects/dtrace/src/share/examples/drivers/make_device_driver.sh#4 integrate .. //depot/projects/dtrace/src/share/examples/drivers/make_pseudo_driver.sh#3 integrate .. //depot/projects/dtrace/src/share/man/man4/acpi.4#7 integrate .. //depot/projects/dtrace/src/share/man/man4/if_bridge.4#6 integrate .. //depot/projects/dtrace/src/share/man/man4/ng_pppoe.4#3 integrate .. //depot/projects/dtrace/src/share/man/man4/uscanner.4#4 integrate .. //depot/projects/dtrace/src/share/man/man4/vlan.4#4 integrate .. //depot/projects/dtrace/src/share/man/man7/release.7#3 integrate .. //depot/projects/dtrace/src/share/man/man9/sysctl.9#2 integrate .. //depot/projects/dtrace/src/share/mk/bsd.cpu.mk#4 integrate .. //depot/projects/dtrace/src/share/mk/bsd.sys.mk#4 integrate .. //depot/projects/dtrace/src/sys/Makefile#6 integrate .. //depot/projects/dtrace/src/sys/amd64/acpica/madt.c#3 integrate .. //depot/projects/dtrace/src/sys/amd64/amd64/pmap.c#14 integrate .. //depot/projects/dtrace/src/sys/amd64/amd64/trap.c#7 integrate .. //depot/projects/dtrace/src/sys/amd64/include/pmap.h#5 integrate .. //depot/projects/dtrace/src/sys/amd64/linux32/linux32_sysvec.c#4 integrate .. //depot/projects/dtrace/src/sys/arm/arm/mem.c#3 integrate .. //depot/projects/dtrace/src/sys/arm/arm/pmap.c#11 integrate .. //depot/projects/dtrace/src/sys/arm/arm/vm_machdep.c#5 integrate .. //depot/projects/dtrace/src/sys/arm/at91/at91_st.c#5 integrate .. //depot/projects/dtrace/src/sys/arm/at91/kb920x_machdep.c#8 integrate .. //depot/projects/dtrace/src/sys/arm/include/pmap.h#6 integrate .. //depot/projects/dtrace/src/sys/arm/include/sf_buf.h#3 integrate .. //depot/projects/dtrace/src/sys/arm/include/vmparam.h#3 integrate .. //depot/projects/dtrace/src/sys/arm/sa11x0/assabet_machdep.c#6 integrate .. //depot/projects/dtrace/src/sys/arm/xscale/i80321/iq31244_machdep.c#5 integrate .. //depot/projects/dtrace/src/sys/boot/Makefile#4 integrate .. //depot/projects/dtrace/src/sys/boot/arm/Makefile#1 branch .. //depot/projects/dtrace/src/sys/boot/arm/at91/Makefile.inc#2 integrate .. //depot/projects/dtrace/src/sys/boot/arm/at91/bootiic/Makefile#2 integrate .. //depot/projects/dtrace/src/sys/boot/arm/at91/bootiic/arm_init.S#2 integrate .. //depot/projects/dtrace/src/sys/boot/arm/at91/bootiic/env_vars.c#1 branch .. //depot/projects/dtrace/src/sys/boot/arm/at91/bootiic/env_vars.h#1 branch .. //depot/projects/dtrace/src/sys/boot/arm/at91/bootiic/loader_prompt.c#1 branch .. //depot/projects/dtrace/src/sys/boot/arm/at91/bootiic/loader_prompt.h#1 branch .. //depot/projects/dtrace/src/sys/boot/arm/at91/bootiic/main.c#2 integrate .. //depot/projects/dtrace/src/sys/boot/arm/at91/libat91/Makefile#2 integrate .. //depot/projects/dtrace/src/sys/boot/arm/at91/libat91/at91rm9200.h#2 integrate .. //depot/projects/dtrace/src/sys/boot/arm/at91/libat91/at91rm9200_lowlevel.h#2 integrate .. //depot/projects/dtrace/src/sys/boot/arm/at91/libat91/eeprom.c#2 integrate .. //depot/projects/dtrace/src/sys/boot/arm/at91/libat91/eeprom.h#2 delete .. //depot/projects/dtrace/src/sys/boot/arm/at91/libat91/emac.c#2 integrate .. //depot/projects/dtrace/src/sys/boot/arm/at91/libat91/emac.h#2 integrate .. //depot/projects/dtrace/src/sys/boot/arm/at91/libat91/env_vars.c#2 delete .. //depot/projects/dtrace/src/sys/boot/arm/at91/libat91/env_vars.h#2 delete .. //depot/projects/dtrace/src/sys/boot/arm/at91/libat91/lib.h#2 integrate .. //depot/projects/dtrace/src/sys/boot/arm/at91/libat91/loader_prompt.c#2 delete .. //depot/projects/dtrace/src/sys/boot/arm/at91/libat91/loader_prompt.h#2 delete .. //depot/projects/dtrace/src/sys/boot/arm/at91/libat91/p_string.c#2 integrate .. //depot/projects/dtrace/src/sys/boot/arm/at91/libat91/p_string.h#2 delete .. //depot/projects/dtrace/src/sys/boot/arm/at91/libat91/spi_flash.c#1 branch .. //depot/projects/dtrace/src/sys/boot/arm/at91/libat91/spi_flash.h#1 branch .. //depot/projects/dtrace/src/sys/boot/arm/at91/libat91/xmodem.c#2 integrate .. //depot/projects/dtrace/src/sys/boot/forth/loader.conf#5 integrate .. //depot/projects/dtrace/src/sys/cam/scsi/scsi_pass.c#3 integrate .. //depot/projects/dtrace/src/sys/compat/linprocfs/linprocfs.c#5 integrate .. //depot/projects/dtrace/src/sys/conf/files#28 integrate .. //depot/projects/dtrace/src/sys/conf/kern.post.mk#6 integrate .. //depot/projects/dtrace/src/sys/conf/kmod.mk#5 integrate .. //depot/projects/dtrace/src/sys/conf/options.arm#5 integrate .. //depot/projects/dtrace/src/sys/contrib/dev/acpica/acfreebsd.h#3 integrate .. //depot/projects/dtrace/src/sys/dev/acpi_support/acpi_ibm.c#3 integrate .. //depot/projects/dtrace/src/sys/dev/acpica/Osd/OsdMemory.c#3 integrate .. //depot/projects/dtrace/src/sys/dev/acpica/acpi_dock.c#3 integrate .. //depot/projects/dtrace/src/sys/dev/acpica/acpi_hpet.c#3 integrate .. //depot/projects/dtrace/src/sys/dev/acpica/acpi_video.c#3 integrate .. //depot/projects/dtrace/src/sys/dev/ata/ata-chipset.c#7 integrate .. //depot/projects/dtrace/src/sys/dev/ata/ata-disk.c#3 integrate .. //depot/projects/dtrace/src/sys/dev/ata/ata-pci.h#6 integrate .. //depot/projects/dtrace/src/sys/dev/ath/if_ath.c#10 integrate .. //depot/projects/dtrace/src/sys/dev/ath/if_athioctl.h#4 integrate .. //depot/projects/dtrace/src/sys/dev/exca/excareg.h#3 integrate .. //depot/projects/dtrace/src/sys/dev/hme/if_hme.c#3 integrate .. //depot/projects/dtrace/src/sys/dev/isp/isp.c#8 integrate .. //depot/projects/dtrace/src/sys/dev/isp/isp_pci.c#8 integrate .. //depot/projects/dtrace/src/sys/dev/isp/ispvar.h#4 integrate .. //depot/projects/dtrace/src/sys/dev/mii/rgephy.c#4 integrate .. //depot/projects/dtrace/src/sys/dev/nfe/if_nfe.c#2 integrate .. //depot/projects/dtrace/src/sys/dev/pccard/pccard_cis.c#3 integrate .. //depot/projects/dtrace/src/sys/dev/pccbb/pccbb.c#7 integrate .. //depot/projects/dtrace/src/sys/dev/pccbb/pccbb_pci.c#5 integrate .. //depot/projects/dtrace/src/sys/dev/pccbb/pccbbreg.h#3 integrate .. //depot/projects/dtrace/src/sys/dev/sk/if_sk.c#9 integrate .. //depot/projects/dtrace/src/sys/dev/sound/pci/emu10k1.c#4 integrate .. //depot/projects/dtrace/src/sys/dev/sound/pci/emu10kx-pcm.c#2 integrate .. //depot/projects/dtrace/src/sys/dev/sound/pci/emu10kx.c#2 integrate .. //depot/projects/dtrace/src/sys/dev/sound/pci/emu10kx.h#2 integrate .. //depot/projects/dtrace/src/sys/dev/stge/if_stge.c#2 integrate .. //depot/projects/dtrace/src/sys/dev/ti/if_ti.c#3 integrate .. //depot/projects/dtrace/src/sys/fs/nwfs/nwfs_io.c#3 integrate .. //depot/projects/dtrace/src/sys/fs/smbfs/smbfs_io.c#3 integrate .. //depot/projects/dtrace/src/sys/geom/eli/g_eli.c#6 integrate .. //depot/projects/dtrace/src/sys/geom/eli/g_eli.h#3 integrate .. //depot/projects/dtrace/src/sys/geom/eli/g_eli_ctl.c#3 integrate .. //depot/projects/dtrace/src/sys/geom/geom_gpt.c#5 integrate .. //depot/projects/dtrace/src/sys/geom/label/g_label.c#3 integrate .. //depot/projects/dtrace/src/sys/geom/label/g_label_msdosfs.c#3 integrate .. //depot/projects/dtrace/src/sys/geom/label/g_label_msdosfs.h#1 branch .. //depot/projects/dtrace/src/sys/geom/mirror/g_mirror.c#9 integrate .. //depot/projects/dtrace/src/sys/geom/raid3/g_raid3.c#12 integrate .. //depot/projects/dtrace/src/sys/i386/acpica/acpi_machdep.c#4 integrate .. //depot/projects/dtrace/src/sys/i386/acpica/acpi_wakeup.c#4 integrate .. //depot/projects/dtrace/src/sys/i386/acpica/madt.c#3 integrate .. //depot/projects/dtrace/src/sys/i386/conf/XBOX#3 integrate .. //depot/projects/dtrace/src/sys/i386/i386/machdep.c#8 integrate .. //depot/projects/dtrace/src/sys/i386/i386/pmap.c#10 integrate .. //depot/projects/dtrace/src/sys/i386/i386/trap.c#12 integrate .. //depot/projects/dtrace/src/sys/i386/include/pmap.h#5 integrate .. //depot/projects/dtrace/src/sys/i386/isa/clock.c#3 integrate .. //depot/projects/dtrace/src/sys/i386/linux/linux_sysvec.c#4 integrate .. //depot/projects/dtrace/src/sys/ia64/include/pmap.h#3 integrate .. //depot/projects/dtrace/src/sys/kern/kern_subr.c#3 integrate .. //depot/projects/dtrace/src/sys/kern/uipc_socket.c#9 integrate .. //depot/projects/dtrace/src/sys/kern/uipc_syscalls.c#10 integrate .. //depot/projects/dtrace/src/sys/kern/uipc_usrreq.c#12 integrate .. //depot/projects/dtrace/src/sys/kern/vfs_bio.c#4 integrate .. //depot/projects/dtrace/src/sys/kern/vfs_subr.c#10 integrate .. //depot/projects/dtrace/src/sys/libkern/strstr.c#1 branch .. //depot/projects/dtrace/src/sys/modules/if_ef/Makefile#3 integrate .. //depot/projects/dtrace/src/sys/modules/if_ppp/Makefile#3 integrate .. //depot/projects/dtrace/src/sys/modules/netgraph/mppc/Makefile#3 integrate .. //depot/projects/dtrace/src/sys/modules/sound/sound/Makefile#3 integrate .. //depot/projects/dtrace/src/sys/net/bpf.c#8 integrate .. //depot/projects/dtrace/src/sys/net/bridgestp.c#5 integrate .. //depot/projects/dtrace/src/sys/net/if_tun.c#4 integrate .. //depot/projects/dtrace/src/sys/net/if_vlan.c#6 integrate .. //depot/projects/dtrace/src/sys/net80211/ieee80211_input.c#4 integrate .. //depot/projects/dtrace/src/sys/net80211/ieee80211_ioctl.c#5 integrate .. //depot/projects/dtrace/src/sys/net80211/ieee80211_ioctl.h#4 integrate .. //depot/projects/dtrace/src/sys/net80211/ieee80211_output.c#4 integrate .. //depot/projects/dtrace/src/sys/netgraph/ng_pppoe.c#4 integrate .. //depot/projects/dtrace/src/sys/netgraph/ng_pppoe.h#3 integrate .. //depot/projects/dtrace/src/sys/netinet/tcp_input.c#5 integrate .. //depot/projects/dtrace/src/sys/netinet/tcp_subr.c#7 integrate .. //depot/projects/dtrace/src/sys/netinet/tcp_timer.c#5 integrate .. //depot/projects/dtrace/src/sys/netinet/tcp_timer.h#3 integrate .. //depot/projects/dtrace/src/sys/nfsclient/nfs_bio.c#4 integrate .. //depot/projects/dtrace/src/sys/nfsclient/nfs_vfsops.c#5 integrate .. //depot/projects/dtrace/src/sys/pc98/include/md_var.h#3 integrate .. //depot/projects/dtrace/src/sys/pc98/pc98/pc98_machdep.c#4 integrate .. //depot/projects/dtrace/src/sys/pci/agp.c#4 integrate .. //depot/projects/dtrace/src/sys/pci/if_xl.c#3 integrate .. //depot/projects/dtrace/src/sys/sys/libkern.h#4 integrate .. //depot/projects/dtrace/src/sys/sys/sysctl.h#6 integrate .. //depot/projects/dtrace/src/sys/vm/device_pager.c#3 integrate .. //depot/projects/dtrace/src/sys/vm/swap_pager.c#7 integrate .. //depot/projects/dtrace/src/sys/vm/vm_fault.c#6 integrate .. //depot/projects/dtrace/src/sys/vm/vm_object.c#7 integrate .. //depot/projects/dtrace/src/sys/vm/vm_page.c#11 integrate .. //depot/projects/dtrace/src/sys/vm/vm_page.h#3 integrate .. //depot/projects/dtrace/src/sys/vm/vnode_pager.c#3 integrate .. //depot/projects/dtrace/src/tools/tools/ath/athstats/Makefile#3 integrate .. //depot/projects/dtrace/src/tools/tools/ath/athstats/athstats.c#4 integrate .. //depot/projects/dtrace/src/tools/tools/ath/athstats/athstats.h#1 branch .. //depot/projects/dtrace/src/tools/tools/ath/athstats/main.c#1 branch .. //depot/projects/dtrace/src/tools/tools/ath/athstats/statfoo.c#1 branch .. //depot/projects/dtrace/src/tools/tools/ath/athstats/statfoo.h#1 branch .. //depot/projects/dtrace/src/tools/tools/net80211/wlanstats/Makefile#3 integrate .. //depot/projects/dtrace/src/tools/tools/net80211/wlanstats/main.c#1 branch .. //depot/projects/dtrace/src/tools/tools/net80211/wlanstats/statfoo.c#1 branch .. //depot/projects/dtrace/src/tools/tools/net80211/wlanstats/statfoo.h#1 branch .. //depot/projects/dtrace/src/tools/tools/net80211/wlanstats/wlanstats.c#3 integrate .. //depot/projects/dtrace/src/tools/tools/net80211/wlanstats/wlanstats.h#1 branch .. //depot/projects/dtrace/src/usr.bin/hexdump/parse.c#3 integrate .. //depot/projects/dtrace/src/usr.bin/split/split.1#3 integrate .. //depot/projects/dtrace/src/usr.bin/split/split.c#3 integrate .. //depot/projects/dtrace/src/usr.sbin/Makefile#8 integrate .. //depot/projects/dtrace/src/usr.sbin/named/Makefile#3 integrate .. //depot/projects/dtrace/src/usr.sbin/ngctl/main.c#5 integrate .. //depot/projects/dtrace/src/usr.sbin/pkg_install/lib/url.c#4 integrate .. //depot/projects/dtrace/src/usr.sbin/pkg_install/version/perform.c#3 integrate .. //depot/projects/dtrace/src/usr.sbin/rpc.lockd/lockd_lock.c#3 integrate .. //depot/projects/dtrace/src/usr.sbin/rpc.statd/procs.c#3 integrate .. //depot/projects/dtrace/src/usr.sbin/rtsold/rtsold.8#3 integrate .. //depot/projects/dtrace/src/usr.sbin/sade/Makefile#2 integrate .. //depot/projects/dtrace/src/usr.sbin/sade/command.c#2 integrate .. //depot/projects/dtrace/src/usr.sbin/sade/config.c#2 integrate .. //depot/projects/dtrace/src/usr.sbin/sade/devices.c#2 integrate .. //depot/projects/dtrace/src/usr.sbin/sade/disks.c#2 integrate .. //depot/projects/dtrace/src/usr.sbin/sade/dispatch.c#2 integrate .. //depot/projects/dtrace/src/usr.sbin/sade/dmenu.c#2 integrate .. //depot/projects/dtrace/src/usr.sbin/sade/globals.c#2 integrate .. //depot/projects/dtrace/src/usr.sbin/sade/install.c#2 integrate .. //depot/projects/dtrace/src/usr.sbin/sade/keymap.c#2 delete .. //depot/projects/dtrace/src/usr.sbin/sade/label.c#2 integrate .. //depot/projects/dtrace/src/usr.sbin/sade/list.h#2 integrate .. //depot/projects/dtrace/src/usr.sbin/sade/main.c#2 integrate .. //depot/projects/dtrace/src/usr.sbin/sade/menus.c#2 integrate .. //depot/projects/dtrace/src/usr.sbin/sade/misc.c#2 integrate .. //depot/projects/dtrace/src/usr.sbin/sade/msg.c#2 integrate .. //depot/projects/dtrace/src/usr.sbin/sade/rtermcap.c#2 delete .. //depot/projects/dtrace/src/usr.sbin/sade/sade.8#2 integrate .. //depot/projects/dtrace/src/usr.sbin/sade/sade.h#2 integrate .. //depot/projects/dtrace/src/usr.sbin/sade/system.c#2 integrate .. //depot/projects/dtrace/src/usr.sbin/sade/termcap.c#2 integrate .. //depot/projects/dtrace/src/usr.sbin/sade/usb.c#2 delete .. //depot/projects/dtrace/src/usr.sbin/sade/variable.c#2 integrate .. //depot/projects/dtrace/src/usr.sbin/sade/wizard.c#2 integrate .. //depot/projects/dtrace/src/usr.sbin/yppush/yppush_main.c#3 integrate .. //depot/projects/dtrace/www/en/donations/wantlist.sgml#9 integrate .. //depot/projects/dtrace/www/en/gnome/news.xml#7 integrate .. //depot/projects/dtrace/www/en/internal/machines.sgml#4 integrate .. //depot/projects/dtrace/www/en/news/press.xml#10 integrate .. //depot/projects/dtrace/www/en/platforms/amd64/motherboards.sgml#8 integrate .. //depot/projects/dtrace/www/en/platforms/index.sgml#2 integrate .. //depot/projects/dtrace/www/en/releng/index.sgml#10 integrate .. //depot/projects/dtrace/www/en/security/security.sgml#5 integrate .. //depot/projects/dtrace/www/en/snapshots/index.sgml#7 integrate .. //depot/projects/dtrace/www/zh_CN/news/press.xml#4 integrate Differences ... ==== //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#21 (text+ko) ==== @@ -1,4 +1,4 @@ - + + + + &a.joe; (1999 - 2006) + + + + &a.kiri; (2000 - 2006) + + + &a.nbm; (1999 - 2006) ==== //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/contributors/contrib.staff.sgml#4 (text+ko) ==== @@ -1,4 +1,4 @@ - + The &os; Documentation Engineering Team @@ -218,7 +218,7 @@ - &a.wilko; + &a.joel; ==== //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/linux-comparison/article.sgml#2 (text+ko) ==== @@ -28,7 +28,7 @@ ANY WAY OUT OF THE USE OF THIS DOCUMENTATION, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - $FreeBSD: doc/en_US.ISO8859-1/articles/linux-comparison/article.sgml,v 1.8 2006/01/03 15:23:16 bvs Exp $ + $FreeBSD: doc/en_US.ISO8859-1/articles/linux-comparison/article.sgml,v 1.10 2006/08/08 19:35:13 jcamou Exp $ --> Dru Lavigne - $FreeBSD: doc/en_US.ISO8859-1/articles/linux-comparison/article.sgml,v 1.8 2006/01/03 15:23:16 bvs Exp $ + $FreeBSD: doc/en_US.ISO8859-1/articles/linux-comparison/article.sgml,v 1.10 2006/08/08 19:35:13 jcamou Exp $ &tm-attrib.freebsd; @@ -200,6 +200,11 @@ DesktopBSD which + aims at being a stable and powerful operating system for + desktop users. + + FreeSBIE which provides a LiveCD of &os;. ==== //depot/projects/dtrace/doc/en_US.ISO8859-1/books/dev-model/book.sgml#2 (text+ko) ==== @@ -23,7 +23,7 @@ - OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - SUCH DAMAGE. - - - $FreeBSD: doc/en_US.ISO8859-1/books/dev-model/book.sgml,v 1.12 2006/02/10 16:32:46 keramida Exp $ + - $FreeBSD: doc/en_US.ISO8859-1/books/dev-model/book.sgml,v 1.13 2006/08/11 13:58:37 keramida Exp $ --> - Hat currently held by: - Wilko Bulte wilko@FreeBSD.org. + Hat currently held by: &a.joel;. ==== //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/firewalls/chapter.sgml#6 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -1905,19 +1905,24 @@ Using a pool of public addresses - In very large LANs there comes a point where there are - just too many LAN addresses to fit into a single public - address. By changing the following rule: + In very large LANs there comes a point where there are just too + many LAN addresses to fit into a single public address. If a block + of public IP addresses is available, you can use these addresses as + a pool, and let IPNAT pick one of + the public IP addresses as packet-addresses are mapped on their way + out. + + For example, instead of mapping all packets through a single + public IP address, as in: map dc0 192.168.1.0/24 -> 204.134.75.1 - Currently this rule maps all connections through 204.134.75.1. This can be changed - to specify a range: + A range of public IP addresses can be specified either with a + netmask: - map dc0 192.168.1.0/24 -> 204.134.75.1-10 + map dc0 192.168.1.0/24 -> 204.134.75.0/255.255.255.0 - Or a subnet using CIDR notation such as: + or using CIDR notation: map dc0 192.168.1.0/24 -> 204.134.75.0/24 ==== //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/serialcomms/chapter.sgml#3 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -746,6 +746,42 @@ spouse is busy working on your FreeBSD system's console, you can do some text-only work at the same time from a less powerful personal computer hooked up as a terminal to the FreeBSD system. + + There are at least two utilities in the base-system of + &os; that can be used to work through a serial connection: + &man.cu.1; and &man.tip.1;. + + To connect from a client system that runs &os; to the + serial connection of another system, you can use: + + &prompt.root; cu -l serial-port-device + + Where serial-port-device is the name of a + special device file denoting a serial port of your system. + These device files are called + /dev/cuaaN + for &os; versions older than 6.0, and + /dev/cuadN + for 6.0 and later versions. + + The N-part of a device name is the serial + port number. + + + Note that device numbers in &os; start from zero and not + one (like they do, for instance in &ms-dos;-derived systems). + This means that what &ms-dos;-based systems + call COM1 is + usually /dev/cuad0 in &os;. + + + + Some people prefer to use other programs, available + through the Ports Collection. The Ports include quite a few + utilities which can work in ways similar to &man.cu.1; and + &man.tip.1;, + i.e. comms/minicom. + ==== //depot/projects/dtrace/doc/en_US.ISO8859-1/books/porters-handbook/book.sgml#19 (text+ko) ==== @@ -1,7 +1,7 @@ 601103 + 6.1-STABLE after DSO (dynamic shared + objects) support has been enabled in + OpenSSL. + 601104 + + 7.0-CURRENT. 700000 ==== //depot/projects/dtrace/doc/nl_NL.ISO8859-1/share/sgml/glossary/freebsd-glossary.sgml#3 (text+ko) ==== @@ -1,8 +1,8 @@ @@ -46,7 +46,7 @@ (make element gi: "p" attributes: (list (list "align" "center")) (make element gi: "small" - (literal "ðÏ ×ÏÐÒÏÓÁÍ Ó×ÑÚÁÎÎÙÍÉ Ó FreeBSD, ÐÒÏÞÉÔÁÊÔÅ ") + (literal "ðÏ ×ÏÐÒÏÓÁÍ, Ó×ÑÚÁÎÎÙÍ Ó FreeBSD, ÐÒÏÞÉÔÁÊÔÅ ") (create-link (list (list "HREF" "http://www.FreeBSD.org/ru/docs.html")) (literal "ÄÏËÕÍÅÎÔÁÃÉÀ")) @@ -56,12 +56,12 @@ (literal "questions@FreeBSD.org")) (literal ">.") (make empty-element gi: "br") - (literal "ðÏ ×ÏÐÒÏÓÁÍ Ó×ÑÚÁÎÎÙÍ Ó ÜÔÏÊ ÄÏËÕÍÅÎÔÁÃÉÅÊ, ÐÉÛÉÔÅ <") + (literal "ðÏ ×ÏÐÒÏÓÁÍ, Ó×ÑÚÁÎÎÙÍ Ó ÜÔÏÊ ÄÏËÕÍÅÎÔÁÃÉÅÊ, ÐÉÛÉÔÅ <") (create-link (list (list "HREF" "mailto:doc@FreeBSD.org")) (literal "doc@FreeBSD.org")) (literal ">.") (make empty-element gi: "br") - (literal "ðÏ ×ÏÐÒÏÓÁÍ Ó×ÑÚÁÎÎÙÍ Ó ÒÕÓÓËÉÍ ÐÅÒÅ×ÏÄÏÍ ÄÏËÕÍÅÎÔÁÃÉÉ, ÐÉÛÉÔÅ × ÒÁÓÓÙÌËÕ <") + (literal "ðÏ ×ÏÐÒÏÓÁÍ, Ó×ÑÚÁÎÎÙÍ Ó ÒÕÓÓËÉÍ ÐÅÒÅ×ÏÄÏÍ ÄÏËÕÍÅÎÔÁÃÉÉ, ÐÉÛÉÔÅ × ÒÁÓÓÙÌËÕ <") (create-link (list (list "HREF" "mailto:frdp@FreeBSD.org.ua")) (literal "frdp@FreeBSD.org.ua")) (literal ">.") ==== //depot/projects/dtrace/doc/share/pgpkeys/markus.key#2 (text+ko) ==== @@ -1,15 +1,15 @@ - + - Key fingerprint = 3F9B EBE8 F290 E5CC 1447 8760 D48D 1072 78F8 A8D4 -uid Markus Brueffer -uid Markus Brueffer -uid Markus Brueffer -uid Markus Brueffer -sub 4096g/B7E5C7B6 2002-10-21 +pub 1024D/78F8A8D4 2002-10-21 + Key fingerprint = 3F9B EBE8 F290 E5CC 1447 8760 D48D 1072 78F8 A8D4 +uid Markus Brueffer +uid Markus Brueffer +uid Markus Brueffer +uid Markus Brueffer +sub 4096g/B7E5C7B6 2002-10-21 ]]> ==== //depot/projects/dtrace/doc/share/pgpkeys/shaun.key#2 (text+ko) ==== @@ -1,4 +1,4 @@ - + @@ -23,42 +23,42 @@ TGeZmlGas4vbz22FN5mEMU1xO6EArt3RFq4uL2ePWM/nmRiTGWVWfZN9ps0qL0VV PPd4A/9oa3eSYuJs9bzyFtm4h0rAyQyr7koNIia3757kMQr1L/OmBXUiPS6r51EX WISBLslMksGtfLdzlprd21x7Y+iRhwysjX9fyoul5Tzn9HENbZdp5ACeEjFFX7LX -K1sI6ZVeFDMfwex+TMBmWfv66HGzRgBCpjN3TtcOwHPNo6x6g7QfU2hhdW4gQW1v -dHQgPHNoYXVuQEZyZWVCU0Qub3JnPohgBBMRAgAgBQJEkc8TAhsDBgsJCAcDAgQV -AggDBBYCAwECHgECF4AACgkQkmhdCGs4eprRzACeKm4RV5PtM2FV8+bWD4TYrV9N -hpAAn2KSSDZMLa+x2hCGp2kQFVaWNY2dtB1TaGF1biBBbW90dCA8c2hhdW5AaW5l -cmQuY29tPohhBBMRAgAhAhsDBgsJCAcDAgMVAgMDFgIBAh4BAheABQJEko88AhkB -AAoJEJJoXQhrOHqa0t8AoJPfehm/H22oR+e3fax6Mk4nyqu1AKCNAlSAdLfGWUoK -GyC0/vRujpqkp7QdU2hhdW4gQW1vdHQgPHNoYXVuQGNvZGVyLm5ldD6IWQQTEQIA -GQUCOrZswQQLBwMCAxUCAwMWAgECHgECF4AACgkQkmhdCGs4eprquQCcD4dMk7eZ -0RaxCqopFueVdRZQ+XsAnAyMgYh01vkIBLRYdz33PTygESN3uQINBDq2bOAQCADL -eZzD6b21ivZMLkZ8FD7gtkUK1x0CIcgzIWyyJgdPYc19woloRg6oytRDmrdaOI4N -w7x1Bqgosh33oawDL9DG8Z+ElnXNIx2xvAQpApWffU+CHKpk2lL66hZtAGOM3Hx3 -SGk0s25JamtsTwao1ZEoYTnIsnuvTEF4j84CAPEMITXKxON5fncm6y1aHZVbYy+w -zfj7Tdz6YvLmasAMYE/Ycw9q1u8s7Am5UAPL/N7XLfD78WIAwKuLQOIkNjHHMA4E -WnxOy+eDy5Ew6HYebF+mEhX2Nh7X0v0a7y7insRJGLCbapNR5SxX4nzgedw7LQCH -UBKNlOxpFALRyXr+1onnAAURB/9lx5+XRzlJ/jN2vIQKV1Fdn/jdFSN32LhjjvTO -la8g8hMgvdkawOiclCKIC8X8SZtXhwM+hTHj0OvYsJE1fu+xMOKLtMD+ayDwf2px -TK5GKIGLsvsigUTlM6asEBtQsvWyMATePrao20BrxdEYb9xfEmdEGnmfXdbHN0PV -7EvBE6UeuyiRdUcVtWaGaQXr0yw0nf1hO/VjuEIhjnZQYxjwrg+YY7EvHUWGIa29 -45ZpTl4ShGNjy1MQHsSrB5kN3D6N0wuzfU1wC1bSyaI+hcuEWvmr79i6sF06d7fv -btZ3HkvvjLmdY5W0GYlzxIxhzwU5FXrWfSjIbd+Jy/l0I+hiiEYEGBECAAYFAjq2 -bOAACgkQkmhdCGs4epr4pwCg4BZwVjOpQEQDCX5x8hQOu9rjGwcAnA7Xr9tPHD1D -GinmsMh0c3rLC5cFuQELBENtYrQBCADmP/CuDdbokktItDF5wjpoj1oZ1zw76uNZ -nYqFD8bHjonxuUSJSHRgpfG1bEgpVLoTZdx5yqJWI+fPOfTUctAciqiEt7ZFx2ou -jSe+nOpxDt9lN8148tVvBnhLrywFchn1Wgw4gZVIEjAcDpJ4zMblNJE8dskAK+ei -O/UKkaLz9AqOLZrslCSxATwt8P3tSLFrPbyM52gtNHFcUriKoKyn+2KDS0EzYGPG -PHI4LA+2kCCze2eYTTCKW4PgMYoxcYzuN2M6JtHSfHIUKsxBiAk41fH+8YudNZUx -+SkZNbF3bnj6i7UHYuGpPZVOEpt0HhouGFCzMU1FhWSuF6dtfOxRAAYpiEkEGBEC -AAkFAkNtYrQCGwIACgkQkmhdCGs4eppYegCgvQoZETQ7CgB6SeYKqpTdhf2S4/8A -n3WQnyj05jRtui6cGw6xHHts8lbEuQELBENtYtgBCADYpNwsVwVgPJ2JxnJE0ovR -QIrkrKDWpD46zqm+/ZO0iJQ7W82S9YNK0wCshHao6NdnVaz2TmGYeVzdG7ABXitu -W+FKpdHBcZ5OwcjXqC05XqMK2hmsbRXdFKcXgUZu6CJhUGa0sUsZ8Wbh2piw8Ele -wWwEAokF/BZWq9dEVSsGAlbYcBnXWpuFOSQkNiTcKlVxFVezGvbrzI6lTPr8qXdi -lRhecwAVu2FG9B4yfSrFq5UnTgI1QXtBQMYLnAm19J24fFDxz6G8wnp14eW7KSJg -DS7A3pZwvzXaC9s059iZ84mOOssgf8cBewI/TROWjZhd5oaHeknieHoplrvvLChX -AAYpiEkEGBECAAkFAkNtYtgCGwwACgkQkmhdCGs4epqDsQCfcoBp9tmmAEVGQ1ds -krPb576rp/QAoOxAhjPsMbEXTa6q1lxGNnNrFxKZ -=LHPc +K1sI6ZVeFDMfwex+TMBmWfv66HGzRgBCpjN3TtcOwHPNo6x6g7QdU2hhdW4gQW1v +dHQgPHNoYXVuQGluZXJkLmNvbT6IYwQTEQIAIwIbAwIeAQIXgAIZAQUCRK2r0QYL +CQgHAwIEFQIIAwQWAgMBAAoJEJJoXQhrOHqa4A8AoLpKui3MGaN7QoP7+ABKFjar +IVzkAJ0XMx2qfpovyhKEaD5mIVmE/HPdm7QfU2hhdW4gQW1vdHQgPHNoYXVuQEZy +ZWVCU0Qub3JnPohgBBMRAgAgAhsDAh4BAheABQJEravfBgsJCAcDAgQVAggDBBYC +AwEACgkQkmhdCGs4eppDtwCg5tYU74gBC7sqeDhEXKimC/7Tz0MAnjduBqG32uxo +mc/IV69B0JSmJr6qtB1TaGF1biBBbW90dCA8c2hhdW5AY29kZXIubmV0PohZBBMR +AgAZBQI6tmzBBAsHAwIDFQIDAxYCAQIeAQIXgAAKCRCSaF0Iazh6muq5AJwPh0yT +t5nRFrEKqikW55V1FlD5ewCcDIyBiHTW+QgEtFh3Pfc9PKARI3e5Ag0EOrZs4BAI +AMt5nMPpvbWK9kwuRnwUPuC2RQrXHQIhyDMhbLImB09hzX3CiWhGDqjK1EOat1o4 +jg3DvHUGqCiyHfehrAMv0Mbxn4SWdc0jHbG8BCkClZ99T4IcqmTaUvrqFm0AY4zc +fHdIaTSzbklqa2xPBqjVkShhOciye69MQXiPzgIA8QwhNcrE43l+dybrLVodlVtj +L7DN+PtN3Ppi8uZqwAxgT9hzD2rW7yzsCblQA8v83tct8PvxYgDAq4tA4iQ2Mccw +DgRafE7L54PLkTDodh5sX6YSFfY2HtfS/RrvLuKexEkYsJtqk1HlLFfifOB53Dst +AIdQEo2U7GkUAtHJev7WiecABREH/2XHn5dHOUn+M3a8hApXUV2f+N0VI3fYuGOO +9M6VryDyEyC92RrA6JyUIogLxfxJm1eHAz6FMePQ69iwkTV+77Ew4ou0wP5rIPB/ +anFMrkYogYuy+yKBROUzpqwQG1Cy9bIwBN4+tqjbQGvF0Rhv3F8SZ0QaeZ9d1sc3 +Q9XsS8ETpR67KJF1RxW1ZoZpBevTLDSd/WE79WO4QiGOdlBjGPCuD5hjsS8dRYYh +rb3jlmlOXhKEY2PLUxAexKsHmQ3cPo3TC7N9TXALVtLJoj6Fy4Ra+avv2LqwXTp3 +t+9u1nceS++MuZ1jlbQZiXPEjGHPBTkVetZ9KMht34nL+XQj6GKIRgQYEQIABgUC +OrZs4AAKCRCSaF0Iazh6mvinAKDgFnBWM6lARAMJfnHyFA672uMbBwCcDtev208c +PUMaKeawyHRzessLlwW5AQsEQ21itAEIAOY/8K4N1uiSS0i0MXnCOmiPWhnXPDvq +41mdioUPxseOifG5RIlIdGCl8bVsSClUuhNl3HnKolYj58859NRy0ByKqIS3tkXH +ai6NJ76c6nEO32U3zXjy1W8GeEuvLAVyGfVaDDiBlUgSMBwOknjMxuU0kTx2yQAr +56I79QqRovP0Co4tmuyUJLEBPC3w/e1IsWs9vIznaC00cVxSuIqgrKf7YoNLQTNg +Y8Y8cjgsD7aQILN7Z5hNMIpbg+AxijFxjO43Yzom0dJ8chQqzEGICTjV8f7xi501 +lTH5KRk1sXduePqLtQdi4ak9lU4Sm3QeGi4YULMxTUWFZK4Xp2187FEABimISQQY +EQIACQUCQ21itAIbAgAKCRCSaF0Iazh6mlh6AKC9ChkRNDsKAHpJ5gqqlN2F/ZLj +/wCfdZCfKPTmNG26LpwbDrEce2zyVsS5AQsEQ21i2AEIANik3CxXBWA8nYnGckTS +i9FAiuSsoNakPjrOqb79k7SIlDtbzZL1g0rTAKyEdqjo12dVrPZOYZh5XN0bsAFe +K25b4Uql0cFxnk7ByNeoLTleowraGaxtFd0UpxeBRm7oImFQZrSxSxnxZuHamLDw +SV7BbAQCiQX8Flar10RVKwYCVthwGddam4U5JCQ2JNwqVXEVV7Ma9uvMjqVM+vyp +d2KVGF5zABW7YUb0HjJ9KsWrlSdOAjVBe0FAxgucCbX0nbh8UPHPobzCenXh5bsp +ImANLsDelnC/NdoL2zTn2JnziY46yyB/xwF7Aj9NE5aNmF3mhod6SeJ4eimWu+8s +KFcABimISQQYEQIACQUCQ21i2AIbDAAKCRCSaF0Iazh6moOxAJ9ygGn22aYARUZD +V2ySs9vnvqun9ACg7ECGM+wxsRdNrqrWXEY2c2sXEpk= +=Hf4Z -----END PGP PUBLIC KEY BLOCK----- ]]> ==== //depot/projects/dtrace/doc/share/pgpkeys/simon.key#2 (text+ko) ==== @@ -1,84 +1,48 @@ - + uid Simon L. Nielsen -uid Simon L. Nielsen -sub 2048g/C11D9097 2003-07-22 [expires: 2006-07-21] +sub 2048g/20F948B9 2006-08-09 ]]> ==== //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/Makefile#5 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: doc/zh_CN.GB2312/books/handbook/Makefile,v 1.7 2006/06/03 15:34:22 delphij Exp $ +# $FreeBSD: doc/zh_CN.GB2312/books/handbook/Makefile,v 1.8 2006/08/14 02:07:47 delphij Exp $ # # Build the FreeBSD Handbook (Simplified Chinese). # @@ -156,7 +156,7 @@ SRCS+= audit/chapter.sgml SRCS+= book.sgml SRCS+= colophon.sgml -#SRCS+= freebsd-glossary.sgml +SRCS+= freebsd-glossary.sgml SRCS+= advanced-networking/chapter.sgml SRCS+= basics/chapter.sgml SRCS+= bibliography/chapter.sgml @@ -198,7 +198,7 @@ CHAPTERS?= ${SRCS:M*chapter.sgml} SGMLFLAGS+= ${CHAPTERS:S/\/chapter.sgml//:S/^/-i chap./} -#SGMLFLAGS+= -i chap.freebsd-glossary +SGMLFLAGS+= -i chap.freebsd-glossary pgpkeyring: pgpkeys/chapter.sgml @${JADE} -V nochunks ${OTHERFLAGS} ${JADEOPTS} -d ${DSLPGP} -t sgml ${MASTERDOC} ==== //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/advanced-networking/chapter.sgml#6 (text+ko) ==== @@ -2,8 +2,8 @@ The FreeBSD Documentation Project The FreeBSD Chinese Documentation Project - Original revision: 1.382 - $FreeBSD: doc/zh_CN.GB2312/books/handbook/advanced-networking/chapter.sgml,v 1.8 2006/07/08 13:01:33 delphij Exp $ + Original revision: 1.384 + $FreeBSD: doc/zh_CN.GB2312/books/handbook/advanced-networking/chapter.sgml,v 1.9 2006/08/14 02:26:09 delphij Exp $ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Aug 15 05:02:16 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D2F7116A4E0; Tue, 15 Aug 2006 05:02:15 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 9BF4C16A4DE for ; Tue, 15 Aug 2006 05:02:15 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5AFF743D49 for ; Tue, 15 Aug 2006 05:02:15 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7F52F8Q005973 for ; Tue, 15 Aug 2006 05:02:15 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7F52F3f005970 for perforce@freebsd.org; Tue, 15 Aug 2006 05:02:15 GMT (envelope-from jb@freebsd.org) Date: Tue, 15 Aug 2006 05:02:15 GMT Message-Id: <200608150502.k7F52F3f005970@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 103976 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Aug 2006 05:02:16 -0000 http://perforce.freebsd.org/chv.cgi?CH=103976 Change 103976 by jb@jb_freebsd2 on 2006/08/15 05:01:16 Hmmm. gcc is picker on sun4v than on i386 when it comes to signed - unsigned comparisons. Affected files ... .. //depot/projects/dtrace/src/lib/libelf/elf_next.c#4 edit Differences ... ==== //depot/projects/dtrace/src/lib/libelf/elf_next.c#4 (text+ko) ==== @@ -52,7 +52,7 @@ next = e->e_rawfile - parent->e_rawfile + e->e_rawsize; next = (next + 1) & ~1; /* round up to next 2-byte offset */ - parent->e_u.e_ar.e_next = (next >= parent->e_rawsize) ? (off_t) -1 : next; + parent->e_u.e_ar.e_next = (next >= (off_t) parent->e_rawsize) ? (off_t) -1 : next; return (ELF_C_READ); } From owner-p4-projects@FreeBSD.ORG Tue Aug 15 05:03:22 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7952E16A4DF; Tue, 15 Aug 2006 05:03:22 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 53C2C16A4DA for ; Tue, 15 Aug 2006 05:03:22 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9BCB343D58 for ; Tue, 15 Aug 2006 05:03:17 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7F53HtY007227 for ; Tue, 15 Aug 2006 05:03:17 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7F53HDa007224 for perforce@freebsd.org; Tue, 15 Aug 2006 05:03:17 GMT (envelope-from jb@freebsd.org) Date: Tue, 15 Aug 2006 05:03:17 GMT Message-Id: <200608150503.k7F53HDa007224@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 103978 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Aug 2006 05:03:22 -0000 http://perforce.freebsd.org/chv.cgi?CH=103978 Change 103978 by jb@jb_freebsd2 on 2006/08/15 05:02:20 Change the generated code to use memcpy rather than a structure assignment to avoid possible alignment problems on sun4v. Affected files ... .. //depot/projects/dtrace/src/lib/libelf/libelf_convert.m4#4 edit Differences ... ==== //depot/projects/dtrace/src/lib/libelf/libelf_convert.m4#4 (text+ko) ==== @@ -251,19 +251,20 @@ static void libelf_cvt_$1$3_tof(char *dst, char *src, int count, int byteswap) { - Elf64_$2 t, *s = (Elf64_$2 *) src; + Elf64_$2 t; int c; if (dst == src && !byteswap) return; if (!byteswap) { - (void) memcpy(dst, src, count * sizeof(*s)); + (void) memcpy(dst, src, count * sizeof(t)); return; } for (c = 0; c < count; c++) { - t = *s++; + memcpy(&t, src, sizeof(t)); + src += sizeof(t); SWAP_$1$3(t); WRITE_$1$3(dst,t); } @@ -274,21 +275,22 @@ static void libelf_cvt_$1$3_tom(char *dst, char *src, int count, int byteswap) { - Elf64_$2 t, *d = (Elf64_$2 *) dst; + Elf64_$2 t; int c; if (dst == src && !byteswap) return; if (!byteswap) { - (void) memcpy(dst, src, count * sizeof(*d)); + (void) memcpy(dst, src, count * sizeof(t)); return; } for (c = 0; c < count; c++) { READ_$1$3(src,t); SWAP_$1$3(t); - *d++ = t; + memcpy(dst, &t, sizeof(t)); + dst += sizeof(t); } } ') @@ -364,12 +366,12 @@ static void libelf_cvt$3_$1_tof(char *dst, char *src, int count, int byteswap) { - Elf$3_$2 t, *s; + Elf$3_$2 t; int c; - s = (Elf$3_$2 *) src; for (c = 0; c < count; c++) { - t = *s++; + memcpy(&t, src, sizeof(t)); + src += sizeof(t); if (byteswap) { SWAP_STRUCT($2,$3) } @@ -383,21 +385,22 @@ static void libelf_cvt$3_$1_tom(char *dst, char *src, int count, int byteswap) { - Elf$3_$2 t, *d; - unsigned char *s,*s0; + Elf$3_$2 t; + unsigned char *s; + int i; size_t fsz; fsz = elf$3_fsize(ELF_T_$1, 1, EV_CURRENT); - d = ((Elf$3_$2 *) dst) + (count - 1); - s0 = (unsigned char *) src + (count - 1) * fsz; - while (count--) { - s = s0; + for (i = 0; i < count; i++) { + s = (unsigned char *) src; READ_STRUCT($2,$3) if (byteswap) { SWAP_STRUCT($2,$3) } - *d-- = t; s0 -= fsz; + memcpy(dst, &t, sizeof(t)); + dst += sizeof(t); + src += fsz; } } ')') From owner-p4-projects@FreeBSD.ORG Tue Aug 15 07:14:07 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9725C16A4E1; Tue, 15 Aug 2006 07:14:07 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 563A216A4DE for ; Tue, 15 Aug 2006 07:14:07 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id F26A243D49 for ; Tue, 15 Aug 2006 07:14:06 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7F7E6HJ034708 for ; Tue, 15 Aug 2006 07:14:06 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7F7E6DA034705 for perforce@freebsd.org; Tue, 15 Aug 2006 07:14:06 GMT (envelope-from jb@freebsd.org) Date: Tue, 15 Aug 2006 07:14:06 GMT Message-Id: <200608150714.k7F7E6DA034705@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 103981 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Aug 2006 07:14:07 -0000 http://perforce.freebsd.org/chv.cgi?CH=103981 Change 103981 by jb@jb_freebsd2 on 2006/08/15 07:13:12 Stop importing these OpenSolaris headers. FreeBSD's are now hot to trot. Affected files ... .. //depot/projects/dtrace/src/contrib/opensolaris/head/gelf.h#7 delete .. //depot/projects/dtrace/src/contrib/opensolaris/head/libelf.h#3 delete Differences ... From owner-p4-projects@FreeBSD.ORG Tue Aug 15 07:16:10 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 30DD416A4E1; Tue, 15 Aug 2006 07:16:10 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 05BA416A4DE for ; Tue, 15 Aug 2006 07:16:10 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B3AA443D45 for ; Tue, 15 Aug 2006 07:16:09 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7F7G9mw034842 for ; Tue, 15 Aug 2006 07:16:09 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7F7G9JN034839 for perforce@freebsd.org; Tue, 15 Aug 2006 07:16:09 GMT (envelope-from jb@freebsd.org) Date: Tue, 15 Aug 2006 07:16:09 GMT Message-Id: <200608150716.k7F7G9JN034839@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 103982 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Aug 2006 07:16:10 -0000 http://perforce.freebsd.org/chv.cgi?CH=103982 Change 103982 by jb@jb_freebsd2 on 2006/08/15 07:15:20 Stop importing more OpenSolaris headers. FreeBSD's are now full featured. Affected files ... .. //depot/projects/dtrace/src/sys/contrib/opensolaris/compat/sys/elf.h#5 delete .. //depot/projects/dtrace/src/sys/contrib/opensolaris/compat/sys/link.h#2 delete .. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/sys/elf_386.h#4 delete .. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/sys/elf_SPARC.h#4 delete .. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/sys/elf_amd64.h#4 delete Differences ... From owner-p4-projects@FreeBSD.ORG Tue Aug 15 07:19:14 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AF54C16A4DE; Tue, 15 Aug 2006 07:19:14 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 895BC16A4DA for ; Tue, 15 Aug 2006 07:19:14 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4042843D45 for ; Tue, 15 Aug 2006 07:19:14 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7F7JEhX035218 for ; Tue, 15 Aug 2006 07:19:14 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7F7JDPV035215 for perforce@freebsd.org; Tue, 15 Aug 2006 07:19:13 GMT (envelope-from jb@freebsd.org) Date: Tue, 15 Aug 2006 07:19:13 GMT Message-Id: <200608150719.k7F7JDPV035215@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 103983 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Aug 2006 07:19:14 -0000 http://perforce.freebsd.org/chv.cgi?CH=103983 Change 103983 by jb@jb_freebsd2 on 2006/08/15 07:18:46 Take the axe to Sun's libelf. Bye bye ELF. Bye bye. 8-) Affected files ... .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/sgs/libelf/common/ar.c#2 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/sgs/libelf/common/begin.c#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/sgs/libelf/common/checksum.c#2 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/sgs/libelf/common/clscook.c#2 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/sgs/libelf/common/cntl.c#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/sgs/libelf/common/cook.c#2 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/sgs/libelf/common/data.c#2 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/sgs/libelf/common/decl.h#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/sgs/libelf/common/end.c#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/sgs/libelf/common/error.c#4 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/sgs/libelf/common/fill.c#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/sgs/libelf/common/flag.c#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/sgs/libelf/common/gelf.c#4 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/sgs/libelf/common/getarhdr.c#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/sgs/libelf/common/getarsym.c#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/sgs/libelf/common/getbase.c#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/sgs/libelf/common/getdata.c#4 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/sgs/libelf/common/getehdr.c#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/sgs/libelf/common/getident.c#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/sgs/libelf/common/getphdr.c#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/sgs/libelf/common/getphnum.c#2 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/sgs/libelf/common/getscn.c#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/sgs/libelf/common/getshdr.c#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/sgs/libelf/common/getshnum.c#2 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/sgs/libelf/common/getshstrndx.c#2 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/sgs/libelf/common/hash.c#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/sgs/libelf/common/input.c#4 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/sgs/libelf/common/kind.c#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/sgs/libelf/common/libelf.32.msg#2 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/sgs/libelf/common/libelf.msg#2 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/sgs/libelf/common/member.h#2 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/sgs/libelf/common/ndxscn.c#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/sgs/libelf/common/newdata.c#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/sgs/libelf/common/newehdr.c#4 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/sgs/libelf/common/newphdr.c#4 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/sgs/libelf/common/newscn.c#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/sgs/libelf/common/next.c#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/sgs/libelf/common/nextscn.c#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/sgs/libelf/common/output.c#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/sgs/libelf/common/rand.c#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/sgs/libelf/common/rawdata.c#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/sgs/libelf/common/rawfile.c#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/sgs/libelf/common/rawput.c#2 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/sgs/libelf/common/strptr.c#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/sgs/libelf/common/syn.h#2 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/sgs/libelf/common/update.c#5 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/sgs/libelf/common/xlate.m4#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/sgs/libelf/common/xlate64.m4#2 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/sgs/libelf/misc/String.c#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/sgs/libelf/misc/String.h#2 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/sgs/libelf/misc/args.c#2 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/sgs/libelf/misc/demangle.c#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/sgs/libelf/misc/elf_dem.h#3 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/sgs/libelf/misc/nlist.c#2 delete .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/sgs/libelf/misc/nplist.c#2 delete Differences ... From owner-p4-projects@FreeBSD.ORG Tue Aug 15 07:22:19 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EA2B416A4DF; Tue, 15 Aug 2006 07:22:18 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 BA08216A4DA for ; Tue, 15 Aug 2006 07:22:18 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 88ED043D55 for ; Tue, 15 Aug 2006 07:22:18 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7F7MIex035467 for ; Tue, 15 Aug 2006 07:22:18 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7F7MIbE035464 for perforce@freebsd.org; Tue, 15 Aug 2006 07:22:18 GMT (envelope-from jb@freebsd.org) Date: Tue, 15 Aug 2006 07:22:18 GMT Message-Id: <200608150722.k7F7MIbE035464@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 103984 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Aug 2006 07:22:19 -0000 http://perforce.freebsd.org/chv.cgi?CH=103984 Change 103984 by jb@jb_freebsd2 on 2006/08/15 07:21:48 IFlibbsdelf Affected files ... .. //depot/projects/dtrace/src/lib/libelf/Makefile#5 integrate .. //depot/projects/dtrace/src/lib/libelf/elf_hash.3#1 branch .. //depot/projects/dtrace/src/lib/libelf/elf_hash.c#1 branch Differences ... ==== //depot/projects/dtrace/src/lib/libelf/Makefile#5 (text+ko) ==== @@ -15,6 +15,7 @@ elf_getdata.c \ elf_getident.c \ elf_getscn.c \ + elf_hash.c \ elf_kind.c \ elf_memory.c \ elf_ndxscn.c \ @@ -60,6 +61,7 @@ elf_flagdata.3 \ elf_getbase.3 \ elf_getident.3 \ + elf_hash.3 \ elf_kind.3 \ elf_memory.3 \ elf_next.3 \ @@ -106,7 +108,6 @@ elf.3 elf_getarsym.3 \ elf.3 elf_getdata.3 \ elf.3 elf_getscn.3 \ - elf.3 elf_hash.3 \ elf.3 elf_ndxscn.3 \ elf.3 elf_newdata.3 \ elf.3 elf_newscn.3 \ From owner-p4-projects@FreeBSD.ORG Tue Aug 15 09:06:29 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 99BA816A4E1; Tue, 15 Aug 2006 09:06:29 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 5373416A4DA for ; Tue, 15 Aug 2006 09:06:29 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0E0E143D45 for ; Tue, 15 Aug 2006 09:06:29 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7F96SnU053790 for ; Tue, 15 Aug 2006 09:06:28 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7F96Sxf053787 for perforce@freebsd.org; Tue, 15 Aug 2006 09:06:28 GMT (envelope-from jb@freebsd.org) Date: Tue, 15 Aug 2006 09:06:28 GMT Message-Id: <200608150906.k7F96Sxf053787@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 103987 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Aug 2006 09:06:29 -0000 http://perforce.freebsd.org/chv.cgi?CH=103987 Change 103987 by jb@jb_freebsd2 on 2006/08/15 09:06:13 Jacking up the WARNS level in _this_ library was just a liiiiiiiiiiiiiiiitle bit premature. Affected files ... .. //depot/projects/dtrace/src/cddl/lib/libdtrace/Makefile#11 edit Differences ... ==== //depot/projects/dtrace/src/cddl/lib/libdtrace/Makefile#11 (text+ko) ==== @@ -5,6 +5,8 @@ LIB= dtrace SHLIB_MAJOR= 1 +WARNS= 1 + SRCS= dt_aggregate.c \ dt_as.c \ dt_buf.c \ From owner-p4-projects@FreeBSD.ORG Tue Aug 15 10:45:45 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6CFFA16A4E8; Tue, 15 Aug 2006 10:45:45 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 1751216A4DA for ; Tue, 15 Aug 2006 10:45:45 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B57D243D45 for ; Tue, 15 Aug 2006 10:45:44 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7FAji3T060619 for ; Tue, 15 Aug 2006 10:45:44 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7FAjiNq060616 for perforce@freebsd.org; Tue, 15 Aug 2006 10:45:44 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 15 Aug 2006 10:45:44 GMT Message-Id: <200608151045.k7FAjiNq060616@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 104000 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Aug 2006 10:45:45 -0000 http://perforce.freebsd.org/chv.cgi?CH=104000 Change 104000 by rwatson@rwatson_peppercorn on 2006/08/15 10:44:46 Test for clock_gettime(), which is not available on Darwin. Affected files ... .. //depot/projects/trustedbsd/openbsm/config/config.h.in#8 edit .. //depot/projects/trustedbsd/openbsm/configure#24 edit .. //depot/projects/trustedbsd/openbsm/configure.ac#27 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/config/config.h.in#8 (text+ko) ==== @@ -12,6 +12,9 @@ /* Define to 1 if your system has a working `chown' function. */ #undef HAVE_CHOWN +/* Define to 1 if you have the `clock_gettime' function. */ +#undef HAVE_CLOCK_GETTIME + /* Define to 1 if you have the header file. */ #undef HAVE_DLFCN_H ==== //depot/projects/trustedbsd/openbsm/configure#24 (xtext) ==== @@ -1,5 +1,5 @@ #! /bin/sh -# From configure.ac P4: //depot/projects/trustedbsd/openbsm/configure.ac#25 . +# From configure.ac P4: //depot/projects/trustedbsd/openbsm/configure.ac#26 . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.59 for OpenBSM 1.0a8. # @@ -22833,7 +22833,8 @@ -for ac_func in bzero ftruncate gettimeofday inet_ntoa memset strchr strerror strrchr strstr strtol strtoul + +for ac_func in bzero clock_gettime ftruncate gettimeofday inet_ntoa memset strchr strerror strrchr strstr strtol strtoul do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` echo "$as_me:$LINENO: checking for $ac_func" >&5 ==== //depot/projects/trustedbsd/openbsm/configure.ac#27 (text+ko) ==== @@ -3,7 +3,7 @@ AC_PREREQ(2.59) AC_INIT([OpenBSM], [1.0a8], [trustedbsd-audit@TrustesdBSD.org],[openbsm]) -AC_REVISION([$P4: //depot/projects/trustedbsd/openbsm/configure.ac#26 $]) +AC_REVISION([$P4: //depot/projects/trustedbsd/openbsm/configure.ac#27 $]) AC_CONFIG_SRCDIR([bin/auditreduce/auditreduce.c]) AC_CONFIG_AUX_DIR(config) AC_CONFIG_HEADER([config/config.h]) @@ -56,7 +56,7 @@ AC_TYPE_SIGNAL AC_FUNC_STAT AC_FUNC_STRFTIME -AC_CHECK_FUNCS([bzero ftruncate gettimeofday inet_ntoa memset strchr strerror strrchr strstr strtol strtoul]) +AC_CHECK_FUNCS([bzero clock_gettime ftruncate gettimeofday inet_ntoa memset strchr strerror strrchr strstr strtol strtoul]) # sys/queue.h exists on most systems, but its capabilities vary a great deal. # test for LIST_FIRST and TAILQ_FOREACH_SAFE, which appears to not exist in From owner-p4-projects@FreeBSD.ORG Tue Aug 15 13:31:30 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4E8DB16A4E6; Tue, 15 Aug 2006 13:31:30 +0000 (UTC) X-Original-To: perforce@FreeBSD.org 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 1047E16A4DE for ; Tue, 15 Aug 2006 13:31:30 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B9DA343D53 for ; Tue, 15 Aug 2006 13:31:29 +0000 (GMT) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7FDVTWV092311 for ; Tue, 15 Aug 2006 13:31:29 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7FDVTlU092308 for perforce@freebsd.org; Tue, 15 Aug 2006 13:31:29 GMT (envelope-from rdivacky@FreeBSD.org) Date: Tue, 15 Aug 2006 13:31:29 GMT Message-Id: <200608151331.k7FDVTlU092308@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rdivacky@FreeBSD.org using -f From: Roman Divacky To: Perforce Change Reviews Cc: Subject: PERFORCE change 104021 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Aug 2006 13:31:30 -0000 http://perforce.freebsd.org/chv.cgi?CH=104021 Change 104021 by rdivacky@rdivacky_witten on 2006/08/15 13:31:15 include opt_global.h for SMP definition. this is necessary for MPLOCKED definition. Affected files ... .. //depot/projects/soc2006/rdivacky_linuxolator/i386/i386/support.s#5 edit Differences ... ==== //depot/projects/soc2006/rdivacky_linuxolator/i386/i386/support.s#5 (text+ko) ==== @@ -37,6 +37,7 @@ #include #include +#include "opt_global.h" #include "assym.s" #define IDXSHIFT 10 From owner-p4-projects@FreeBSD.ORG Tue Aug 15 13:32:36 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9F0C216A4E7; Tue, 15 Aug 2006 13:32:36 +0000 (UTC) X-Original-To: perforce@FreeBSD.org 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 6027D16A4DE for ; Tue, 15 Aug 2006 13:32:36 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id ACD9743D73 for ; Tue, 15 Aug 2006 13:32:32 +0000 (GMT) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7FDWWhu092377 for ; Tue, 15 Aug 2006 13:32:32 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7FDWWqD092374 for perforce@freebsd.org; Tue, 15 Aug 2006 13:32:32 GMT (envelope-from rdivacky@FreeBSD.org) Date: Tue, 15 Aug 2006 13:32:32 GMT Message-Id: <200608151332.k7FDWWqD092374@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rdivacky@FreeBSD.org using -f From: Roman Divacky To: Perforce Change Reviews Cc: Subject: PERFORCE change 104022 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Aug 2006 13:32:36 -0000 http://perforce.freebsd.org/chv.cgi?CH=104022 Change 104022 by rdivacky@rdivacky_witten on 2006/08/15 13:31:49 Dont use prototypes, include linux_emul.h instead. Affected files ... .. //depot/projects/soc2006/rdivacky_linuxolator/i386/linux/linux_sysvec.c#15 edit Differences ... ==== //depot/projects/soc2006/rdivacky_linuxolator/i386/linux/linux_sysvec.c#15 (text+ko) ==== @@ -62,6 +62,7 @@ #include #include +#include #include #include #include @@ -106,9 +107,6 @@ static void exec_linux_setregs(struct thread *td, u_long entry, u_long stack, u_long ps_strings); -extern void linux_proc_exit(void *, struct proc *, struct image_params *); -extern void linux_proc_exec(void *, struct proc *, struct image_params *); -extern void linux_schedtail(void *, struct proc *); extern LIST_HEAD(futex_list, futex) futex_list; extern struct sx emul_shared_lock; extern struct sx emul_lock; From owner-p4-projects@FreeBSD.ORG Tue Aug 15 13:41:00 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2A26A16A511; Tue, 15 Aug 2006 13:41:00 +0000 (UTC) X-Original-To: perforce@FreeBSD.org 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 ECAF516A504 for ; Tue, 15 Aug 2006 13:40:59 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0A34543D4C for ; Tue, 15 Aug 2006 13:40:44 +0000 (GMT) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7FDehlY092911 for ; Tue, 15 Aug 2006 13:40:43 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7FDeh4E092906 for perforce@freebsd.org; Tue, 15 Aug 2006 13:40:43 GMT (envelope-from rdivacky@FreeBSD.org) Date: Tue, 15 Aug 2006 13:40:43 GMT Message-Id: <200608151340.k7FDeh4E092906@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rdivacky@FreeBSD.org using -f From: Roman Divacky To: Perforce Change Reviews Cc: Subject: PERFORCE change 104023 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Aug 2006 13:41:00 -0000 http://perforce.freebsd.org/chv.cgi?CH=104023 Change 104023 by rdivacky@rdivacky_witten on 2006/08/15 13:40:04 Dont include various includes in linux.h Pointed out by: jhb Affected files ... .. //depot/projects/soc2006/rdivacky_linuxolator/amd64/linux32/linux.h#4 edit .. //depot/projects/soc2006/rdivacky_linuxolator/compat/linux/linux_signal.c#6 edit .. //depot/projects/soc2006/rdivacky_linuxolator/i386/linux/linux.h#19 edit Differences ... ==== //depot/projects/soc2006/rdivacky_linuxolator/amd64/linux32/linux.h#4 (text+ko) ==== @@ -34,10 +34,6 @@ #define _AMD64_LINUX_LINUX_H_ #include /* for sigval union */ -#include -#include -#include -#include #include ==== //depot/projects/soc2006/rdivacky_linuxolator/compat/linux/linux_signal.c#6 (text+ko) ==== @@ -33,6 +33,7 @@ #include #include #include +#include #include #include #include ==== //depot/projects/soc2006/rdivacky_linuxolator/i386/linux/linux.h#19 (text+ko) ==== @@ -32,10 +32,6 @@ #define _I386_LINUX_LINUX_H_ #include /* for sigval union */ -#include -#include -#include -#include #include From owner-p4-projects@FreeBSD.ORG Tue Aug 15 13:47:56 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9ECB716A4E0; Tue, 15 Aug 2006 13:47:56 +0000 (UTC) X-Original-To: perforce@FreeBSD.org 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 64FF716A4DA for ; Tue, 15 Aug 2006 13:47:56 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D398843D70 for ; Tue, 15 Aug 2006 13:47:53 +0000 (GMT) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7FDlrvp093299 for ; Tue, 15 Aug 2006 13:47:53 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7FDlrf4093295 for perforce@freebsd.org; Tue, 15 Aug 2006 13:47:53 GMT (envelope-from rdivacky@FreeBSD.org) Date: Tue, 15 Aug 2006 13:47:53 GMT Message-Id: <200608151347.k7FDlrf4093295@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rdivacky@FreeBSD.org using -f From: Roman Divacky To: Perforce Change Reviews Cc: Subject: PERFORCE change 104025 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Aug 2006 13:47:56 -0000 http://perforce.freebsd.org/chv.cgi?CH=104025 Change 104025 by rdivacky@rdivacky_witten on 2006/08/15 13:47:13 Style fixes to comments. Affected files ... .. //depot/projects/soc2006/rdivacky_linuxolator/amd64/linux32/linux.h#5 edit .. //depot/projects/soc2006/rdivacky_linuxolator/amd64/linux32/linux32_machdep.c#7 edit .. //depot/projects/soc2006/rdivacky_linuxolator/compat/linux/linux_emul.c#6 edit .. //depot/projects/soc2006/rdivacky_linuxolator/compat/linux/linux_emul.h#3 edit .. //depot/projects/soc2006/rdivacky_linuxolator/i386/linux/linux.h#20 edit .. //depot/projects/soc2006/rdivacky_linuxolator/i386/linux/linux_machdep.c#51 edit Differences ... ==== //depot/projects/soc2006/rdivacky_linuxolator/amd64/linux32/linux.h#5 (text+ko) ==== @@ -762,7 +762,8 @@ #define LINUX_LOWERWORD 0x0000ffff -/* macros which does the same thing as those in linux include/asm-um/ldt-i386.h +/* + * macros which does the same thing as those in linux include/asm-um/ldt-i386.h * these convert linux user-space descriptor to machine one */ #define LDT_entry_a(info) \ ==== //depot/projects/soc2006/rdivacky_linuxolator/amd64/linux32/linux32_machdep.c#7 (text+ko) ==== @@ -512,7 +512,8 @@ p2->p_sigparent = exit_signal; PROC_UNLOCK(p2); td2 = FIRST_THREAD_IN_PROC(p2); - /* in a case of stack = NULL we are supposed to COW calling process stack + /* + * in a case of stack = NULL we are supposed to COW calling process stack * this is what normal fork() does so we just keep the tf_rsp arg intact */ if (args->stack) @@ -628,7 +629,8 @@ if (linux_args->flags & LINUX_MAP_GROWSDOWN) { bsd_args.flags |= MAP_STACK; - /* The linux MAP_GROWSDOWN option does not limit auto + /* + * The linux MAP_GROWSDOWN option does not limit auto * growth of the region. Linux mmap with this option * takes as addr the inital BOS, and as len, the initial * region size. It can then grow down from addr without @@ -655,7 +657,8 @@ if ((caddr_t)PTRIN(bsd_args.addr) > p->p_vmspace->vm_maxsaddr) { - /* Some linux apps will attempt to mmap + /* + * Some linux apps will attempt to mmap * thread stacks near the top of their * address space. If their TOS is greater * than vm_maxsaddr, vm_map_growstack() @@ -683,7 +686,8 @@ else bsd_args.len = STACK_SIZE - GUARD_SIZE; - /* This gives us a new BOS. If we're using VM_STACK, then + /* + * This gives us a new BOS. If we're using VM_STACK, then * mmap will just map the top SGROWSIZ bytes, and let * the stack grow down to the limit at BOS. If we're * not using VM_STACK we map the full stack, since we ==== //depot/projects/soc2006/rdivacky_linuxolator/compat/linux/linux_emul.c#6 (text+ko) ==== @@ -110,7 +110,8 @@ em->child_clear_tid = NULL; em->child_set_tid = NULL; - /* allocate the shared struct only in clone()/fork cases + /* + * allocate the shared struct only in clone()/fork cases * in the case of clone() td = calling proc and child = pid of * the newly created proc */ @@ -190,9 +191,10 @@ cup.uaddr2 = NULL; cup.val3 = 0; error = linux_sys_futex(FIRST_THREAD_IN_PROC(p), &cup); - /* this cannot happen at the moment and if this happens + /* + * this cannot happen at the moment and if this happens * it probably mean there is a userspace bug - */ + */ if (error) printf(LMSG("futex stuff in proc_exit failed.\n")); } @@ -201,7 +203,8 @@ FREE(em, M_LINUX); } -/* This is used in a case of transition from FreeBSD binary execing to linux binary +/* + * This is used in a case of transition from FreeBSD binary execing to linux binary * in this case we create linux emuldata proc entry with the pid of the currently running * process. */ @@ -256,7 +259,8 @@ em = em_find(p, EMUL_UNLOCKED); if (em == NULL) { - /* We might have been called before proc_init for this process so + /* + * We might have been called before proc_init for this process so * tsleep and be woken up by it. We use p->p_emuldata for this */ ==== //depot/projects/soc2006/rdivacky_linuxolator/compat/linux/linux_emul.h#3 (text+ko) ==== @@ -38,7 +38,8 @@ LIST_HEAD(, linux_emuldata) threads; /* head of list of linux threads */ }; -/* modeled after similar structure in NetBSD +/* + * modeled after similar structure in NetBSD * this will be extended as we need more functionality */ struct linux_emuldata { ==== //depot/projects/soc2006/rdivacky_linuxolator/i386/linux/linux.h#20 (text+ko) ==== @@ -725,7 +725,8 @@ #define LINUX_LOWERWORD 0x0000ffff -/* macros which does the same thing as those in linux include/asm-um/ldt-i386.h +/* + * macros which does the same thing as those in linux include/asm-um/ldt-i386.h * these convert linux user-space descriptor to machine one */ #define LDT_entry_a(info) \ ==== //depot/projects/soc2006/rdivacky_linuxolator/i386/linux/linux_machdep.c#51 (text+ko) ==== @@ -440,7 +440,8 @@ p2->p_sigparent = exit_signal; PROC_UNLOCK(p2); td2 = FIRST_THREAD_IN_PROC(p2); - /* in a case of stack = NULL we are supposed to COW calling process stack + /* + * in a case of stack = NULL we are supposed to COW calling process stack * this is what normal fork() does so we just keep the tf_esp arg intact */ if (args->stack) @@ -458,7 +459,8 @@ idx = info.entry_number; - /* looks like we're getting the idx we returned + /* + * looks like we're getting the idx we returned * in the set_thread_area() syscall */ if (idx != 6 && idx != 3) @@ -606,7 +608,8 @@ if (linux_args->flags & LINUX_MAP_GROWSDOWN) { bsd_args.flags |= MAP_STACK; - /* The linux MAP_GROWSDOWN option does not limit auto + /* + * The linux MAP_GROWSDOWN option does not limit auto * growth of the region. Linux mmap with this option * takes as addr the inital BOS, and as len, the initial * region size. It can then grow down from addr without @@ -631,7 +634,8 @@ bsd_args.addr = linux_args->addr + linux_args->len; if (bsd_args.addr > p->p_vmspace->vm_maxsaddr) { - /* Some linux apps will attempt to mmap + /* + * Some linux apps will attempt to mmap * thread stacks near the top of their * address space. If their TOS is greater * than vm_maxsaddr, vm_map_growstack() @@ -658,7 +662,8 @@ else bsd_args.len = STACK_SIZE - GUARD_SIZE; - /* This gives us a new BOS. If we're using VM_STACK, then + /* + * This gives us a new BOS. If we're using VM_STACK, then * mmap will just map the top SGROWSIZ bytes, and let * the stack grow down to the limit at BOS. If we're * not using VM_STACK we map the full stack, since we @@ -994,7 +999,8 @@ #endif idx = info.entry_number; - /* Semantics of linux version: every thread in the system has array + /* + * Semantics of linux version: every thread in the system has array * of 3 tls descriptors. 1st is GLIBC TLS, 2nd is WINE, 3rd unknown. This * syscall loads one of the selected tls decriptors with a value * and also loads GDT descriptors 6, 7 and 8 with the content of the per-thread @@ -1008,14 +1014,16 @@ * comment in the linux sources says wine might do that. */ - /* we support just GLIBC TLS now + /* + * we support just GLIBC TLS now * we should let 3 proceed as well because we use this segment so * if code does two subsequent calls it should succeed */ if (idx != 6 && idx != -1 && idx != 3) return (EINVAL); - /* we have to copy out the GDT entry we use + /* + * we have to copy out the GDT entry we use * FreeBSD uses GDT entry #3 for storing %gs so load that * XXX: what if userspace program doesnt check this value and tries * to use 6, 7 or 8? From owner-p4-projects@FreeBSD.ORG Tue Aug 15 13:54:03 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2B79816A4E1; Tue, 15 Aug 2006 13:54:03 +0000 (UTC) X-Original-To: perforce@FreeBSD.org 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 DBF0916A4DD for ; Tue, 15 Aug 2006 13:54:02 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6D05043D49 for ; Tue, 15 Aug 2006 13:54:02 +0000 (GMT) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7FDs2uu093619 for ; Tue, 15 Aug 2006 13:54:02 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7FDs1Vn093614 for perforce@freebsd.org; Tue, 15 Aug 2006 13:54:01 GMT (envelope-from rdivacky@FreeBSD.org) Date: Tue, 15 Aug 2006 13:54:01 GMT Message-Id: <200608151354.k7FDs1Vn093614@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rdivacky@FreeBSD.org using -f From: Roman Divacky To: Perforce Change Reviews Cc: Subject: PERFORCE change 104026 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Aug 2006 13:54:03 -0000 http://perforce.freebsd.org/chv.cgi?CH=104026 Change 104026 by rdivacky@rdivacky_witten on 2006/08/15 13:53:34 Lock the emuldata in a case we just created it. Pointed out by: jhb Affected files ... .. //depot/projects/soc2006/rdivacky_linuxolator/compat/linux/linux_emul.c#7 edit Differences ... ==== //depot/projects/soc2006/rdivacky_linuxolator/compat/linux/linux_emul.c#7 (text+ko) ==== @@ -100,6 +100,7 @@ if (p == NULL) panic("process not found in proc_init\n"); p->p_emuldata = em; + EMUL_LOCK(&emul_lock); PROC_UNLOCK(p); } else { /* lookup the old one */ @@ -129,6 +130,7 @@ if (child != 0) { + EMUL_UNLOCK(&emul_lock); EMUL_SHARED_WLOCK(&emul_shared_lock); LIST_INSERT_HEAD(&em->shared->threads, em, threads); EMUL_SHARED_WUNLOCK(&emul_shared_lock); From owner-p4-projects@FreeBSD.ORG Tue Aug 15 13:56:06 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 71EBF16A50A; Tue, 15 Aug 2006 13:56:06 +0000 (UTC) X-Original-To: perforce@FreeBSD.org 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 2025B16A500 for ; Tue, 15 Aug 2006 13:56:06 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C186443D58 for ; Tue, 15 Aug 2006 13:56:05 +0000 (GMT) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7FDu5MU093736 for ; Tue, 15 Aug 2006 13:56:05 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7FDu5BN093733 for perforce@freebsd.org; Tue, 15 Aug 2006 13:56:05 GMT (envelope-from rdivacky@FreeBSD.org) Date: Tue, 15 Aug 2006 13:56:05 GMT Message-Id: <200608151356.k7FDu5BN093733@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rdivacky@FreeBSD.org using -f From: Roman Divacky To: Perforce Change Reviews Cc: Subject: PERFORCE change 104027 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Aug 2006 13:56:06 -0000 http://perforce.freebsd.org/chv.cgi?CH=104027 Change 104027 by rdivacky@rdivacky_witten on 2006/08/15 13:55:05 Extend the coverage of PROC_LOCK to cover wakeup(&p->p_emuldata); Pointed out by: jhb Affected files ... .. //depot/projects/soc2006/rdivacky_linuxolator/compat/linux/linux_emul.c#8 edit Differences ... ==== //depot/projects/soc2006/rdivacky_linuxolator/compat/linux/linux_emul.c#8 (text+ko) ==== @@ -136,9 +136,9 @@ EMUL_SHARED_WUNLOCK(&emul_shared_lock); p = pfind(child); - PROC_UNLOCK(p); /* we might have a sleeping linux_schedtail */ wakeup(&p->p_emuldata); + PROC_UNLOCK(p); } else EMUL_UNLOCK(&emul_lock); From owner-p4-projects@FreeBSD.ORG Tue Aug 15 13:59:11 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5165216A4E0; Tue, 15 Aug 2006 13:59:11 +0000 (UTC) X-Original-To: perforce@FreeBSD.org 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 2CEE016A4DA for ; Tue, 15 Aug 2006 13:59:11 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E985243D4C for ; Tue, 15 Aug 2006 13:59:10 +0000 (GMT) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7FDxAJl093880 for ; Tue, 15 Aug 2006 13:59:10 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7FDxAZU093877 for perforce@freebsd.org; Tue, 15 Aug 2006 13:59:10 GMT (envelope-from rdivacky@FreeBSD.org) Date: Tue, 15 Aug 2006 13:59:10 GMT Message-Id: <200608151359.k7FDxAZU093877@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rdivacky@FreeBSD.org using -f From: Roman Divacky To: Perforce Change Reviews Cc: Subject: PERFORCE change 104028 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Aug 2006 13:59:11 -0000 http://perforce.freebsd.org/chv.cgi?CH=104028 Change 104028 by rdivacky@rdivacky_witten on 2006/08/15 13:58:45 MALLOC -> malloc and FREE -> free Pointed out by: jhb Affected files ... .. //depot/projects/soc2006/rdivacky_linuxolator/compat/linux/linux_emul.c#9 edit Differences ... ==== //depot/projects/soc2006/rdivacky_linuxolator/compat/linux/linux_emul.c#9 (text+ko) ==== @@ -82,14 +82,14 @@ if (child != 0) { /* non-exec call */ - MALLOC(em, struct linux_emuldata *, sizeof *em, M_LINUX, M_WAITOK | M_ZERO); + em = (struct linux_emuldata *) malloc(sizeof *em, M_LINUX, M_WAITOK | M_ZERO); em->pid = child; if (flags & CLONE_VM) { /* handled later in the code */ } else { struct linux_emuldata_shared *s; - MALLOC(s, struct linux_emuldata_shared *, sizeof *s, M_LINUX, M_WAITOK | M_ZERO); + s = (struct linux_emuldata_shared *) malloc(sizeof *s, M_LINUX, M_WAITOK | M_ZERO); em->shared = s; s->refs = 1; s->group_pid = child; @@ -174,7 +174,7 @@ em->shared->refs--; if (em->shared->refs == 0) - FREE(em->shared, M_LINUX); + free(em->shared, M_LINUX); EMUL_SHARED_WUNLOCK(&emul_shared_lock); if (child_clear_tid != NULL) { @@ -202,7 +202,7 @@ } /* clean the stuff up */ - FREE(em, M_LINUX); + free(em, M_LINUX); } /* @@ -234,10 +234,10 @@ em->shared->refs--; if (em->shared->refs == 0) - FREE(em->shared, M_LINUX); + free(em->shared, M_LINUX); EMUL_SHARED_WUNLOCK(&emul_shared_lock); - FREE(em, M_LINUX); + free(em, M_LINUX); } } From owner-p4-projects@FreeBSD.ORG Tue Aug 15 14:07:25 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 920A216A4E1; Tue, 15 Aug 2006 14:07:25 +0000 (UTC) X-Original-To: perforce@FreeBSD.org 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 6DB2016A4DF for ; Tue, 15 Aug 2006 14:07:25 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5960443D70 for ; Tue, 15 Aug 2006 14:07:22 +0000 (GMT) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7FE7M8X095570 for ; Tue, 15 Aug 2006 14:07:22 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7FE7Lj5095567 for perforce@freebsd.org; Tue, 15 Aug 2006 14:07:21 GMT (envelope-from rdivacky@FreeBSD.org) Date: Tue, 15 Aug 2006 14:07:21 GMT Message-Id: <200608151407.k7FE7Lj5095567@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rdivacky@FreeBSD.org using -f From: Roman Divacky To: Perforce Change Reviews Cc: Subject: PERFORCE change 104029 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Aug 2006 14:07:25 -0000 http://perforce.freebsd.org/chv.cgi?CH=104029 Change 104029 by rdivacky@rdivacky_witten on 2006/08/15 14:06:41 Protect against racing concurent creation in futex_get() Pointed out by: jhb Affected files ... .. //depot/projects/soc2006/rdivacky_linuxolator/compat/linux/linux_futex.c#24 edit Differences ... ==== //depot/projects/soc2006/rdivacky_linuxolator/compat/linux/linux_futex.c#24 (text+ko) ==== @@ -342,13 +342,13 @@ if (locked == FUTEX_UNLOCKED) FUTEX_UNLOCK; + if (locked == FUTEX_UNLOCKED) + FUTEX_LOCK; /* Not found, create it */ f = malloc(sizeof(*f), M_LINUX, M_WAITOK); f->f_uaddr = uaddr; f->f_refcount = 1; TAILQ_INIT(&f->f_waiting_proc); - if (locked == FUTEX_UNLOCKED) - FUTEX_LOCK; LIST_INSERT_HEAD(&futex_list, f, f_list); if (locked == FUTEX_UNLOCKED) FUTEX_UNLOCK; From owner-p4-projects@FreeBSD.ORG Tue Aug 15 14:17:36 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1EAAE16A4DF; Tue, 15 Aug 2006 14:17:36 +0000 (UTC) X-Original-To: perforce@FreeBSD.org 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 D890016A4DD for ; Tue, 15 Aug 2006 14:17:35 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A342543D45 for ; Tue, 15 Aug 2006 14:17:35 +0000 (GMT) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7FEHZiK096313 for ; Tue, 15 Aug 2006 14:17:35 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7FEHZAj096310 for perforce@freebsd.org; Tue, 15 Aug 2006 14:17:35 GMT (envelope-from rdivacky@FreeBSD.org) Date: Tue, 15 Aug 2006 14:17:35 GMT Message-Id: <200608151417.k7FEHZAj096310@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rdivacky@FreeBSD.org using -f From: Roman Divacky To: Perforce Change Reviews Cc: Subject: PERFORCE change 104030 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Aug 2006 14:17:36 -0000 http://perforce.freebsd.org/chv.cgi?CH=104030 Change 104030 by rdivacky@rdivacky_witten on 2006/08/15 14:16:35 Remove the crit section in futex_atomic_op(). The operations should be atomic itself and using crit section blows up in a case of page fault. Pointed out by: jhb Affected files ... .. //depot/projects/soc2006/rdivacky_linuxolator/compat/linux/linux_futex.c#25 edit Differences ... ==== //depot/projects/soc2006/rdivacky_linuxolator/compat/linux/linux_futex.c#25 (text+ko) ==== @@ -448,8 +448,6 @@ #endif /* XXX: linux verifies access here and returns EFAULT */ - critical_enter(); - switch (op) { case FUTEX_OP_SET: ret = futex_xchgl(oparg, uaddr, &oldval); @@ -470,8 +468,6 @@ ret = -ENOSYS; } - critical_exit(); - if (!ret) switch (cmp) { case FUTEX_OP_CMP_EQ: From owner-p4-projects@FreeBSD.ORG Tue Aug 15 14:22:44 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EC8AF16A4E0; Tue, 15 Aug 2006 14:22:43 +0000 (UTC) X-Original-To: perforce@FreeBSD.org 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 AB6B116A4DA for ; Tue, 15 Aug 2006 14:22:43 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 27A2543D46 for ; Tue, 15 Aug 2006 14:22:43 +0000 (GMT) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7FEMhNN096689 for ; Tue, 15 Aug 2006 14:22:43 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7FEMg6F096686 for perforce@freebsd.org; Tue, 15 Aug 2006 14:22:42 GMT (envelope-from rdivacky@FreeBSD.org) Date: Tue, 15 Aug 2006 14:22:42 GMT Message-Id: <200608151422.k7FEMg6F096686@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rdivacky@FreeBSD.org using -f From: Roman Divacky To: Perforce Change Reviews Cc: Subject: PERFORCE change 104032 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Aug 2006 14:22:44 -0000 http://perforce.freebsd.org/chv.cgi?CH=104032 Change 104032 by rdivacky@rdivacky_witten on 2006/08/15 14:22:00 Dont litter sources with extern struct sx bah but put this into linux_emul.h Affected files ... .. //depot/projects/soc2006/rdivacky_linuxolator/compat/linux/linux_emul.h#4 edit .. //depot/projects/soc2006/rdivacky_linuxolator/compat/linux/linux_misc.c#14 edit .. //depot/projects/soc2006/rdivacky_linuxolator/compat/linux/linux_signal.c#7 edit .. //depot/projects/soc2006/rdivacky_linuxolator/i386/linux/linux_machdep.c#52 edit .. //depot/projects/soc2006/rdivacky_linuxolator/i386/linux/linux_sysvec.c#16 edit Differences ... ==== //depot/projects/soc2006/rdivacky_linuxolator/compat/linux/linux_emul.h#4 (text+ko) ==== @@ -72,4 +72,7 @@ void linux_schedtail(void *, struct proc *); void linux_proc_exec(void *, struct proc *, struct image_params *); +extern struct sx emul_shared_lock; +extern struct sx emul_lock; + #endif /* !_LINUX_EMUL_H_ */ ==== //depot/projects/soc2006/rdivacky_linuxolator/compat/linux/linux_misc.c#14 (text+ko) ==== @@ -94,9 +94,6 @@ #define BSD_TO_LINUX_SIGNAL(sig) \ (((sig) <= LINUX_SIGTBLSZ) ? bsd_to_linux_signal[_SIG_IDX(sig)] : sig) -extern struct sx emul_shared_lock; -extern struct sx emul_lock; - static unsigned int linux_to_bsd_resource[LINUX_RLIM_NLIMITS] = { RLIMIT_CPU, RLIMIT_FSIZE, RLIMIT_DATA, RLIMIT_STACK, RLIMIT_CORE, RLIMIT_RSS, RLIMIT_NPROC, RLIMIT_NOFILE, ==== //depot/projects/soc2006/rdivacky_linuxolator/compat/linux/linux_signal.c#7 (text+ko) ==== @@ -52,9 +52,6 @@ #include #include -extern struct sx emul_shared_lock; -extern struct sx emul_lock; - void linux_to_bsd_sigset(l_sigset_t *lss, sigset_t *bss) { ==== //depot/projects/soc2006/rdivacky_linuxolator/i386/linux/linux_machdep.c#52 (text+ko) ==== @@ -67,9 +67,6 @@ #include "opt_posix.h" -extern struct sx emul_shared_lock; -extern struct sx emul_lock; - extern struct sysentvec elf32_freebsd_sysvec; /* defined in i386/i386/elf_machdep.c */ struct l_descriptor { ==== //depot/projects/soc2006/rdivacky_linuxolator/i386/linux/linux_sysvec.c#16 (text+ko) ==== @@ -108,8 +108,6 @@ u_long stack, u_long ps_strings); extern LIST_HEAD(futex_list, futex) futex_list; -extern struct sx emul_shared_lock; -extern struct sx emul_lock; extern struct mtx futex_mtx; static eventhandler_tag linux_exit_tag; From owner-p4-projects@FreeBSD.ORG Tue Aug 15 14:35:03 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8938916A501; Tue, 15 Aug 2006 14:35:03 +0000 (UTC) X-Original-To: perforce@FreeBSD.org 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 6219B16A4FD for ; Tue, 15 Aug 2006 14:35:03 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6297E43D68 for ; Tue, 15 Aug 2006 14:34:59 +0000 (GMT) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7FEYwqB097269 for ; Tue, 15 Aug 2006 14:34:58 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7FEYwHH097266 for perforce@freebsd.org; Tue, 15 Aug 2006 14:34:58 GMT (envelope-from rdivacky@FreeBSD.org) Date: Tue, 15 Aug 2006 14:34:58 GMT Message-Id: <200608151434.k7FEYwHH097266@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rdivacky@FreeBSD.org using -f From: Roman Divacky To: Perforce Change Reviews Cc: Subject: PERFORCE change 104033 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Aug 2006 14:35:03 -0000 http://perforce.freebsd.org/chv.cgi?CH=104033 Change 104033 by rdivacky@rdivacky_witten on 2006/08/15 14:34:02 Be more sane and dont UNLOCK;LOCK; just remove both. Affected files ... .. //depot/projects/soc2006/rdivacky_linuxolator/compat/linux/linux_futex.c#26 edit Differences ... ==== //depot/projects/soc2006/rdivacky_linuxolator/compat/linux/linux_futex.c#26 (text+ko) ==== @@ -339,11 +339,7 @@ return f; } } - if (locked == FUTEX_UNLOCKED) - FUTEX_UNLOCK; - if (locked == FUTEX_UNLOCKED) - FUTEX_LOCK; /* Not found, create it */ f = malloc(sizeof(*f), M_LINUX, M_WAITOK); f->f_uaddr = uaddr; From owner-p4-projects@FreeBSD.ORG Tue Aug 15 15:06:12 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7726716A641; Tue, 15 Aug 2006 15:06:11 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 3101216A57D for ; Tue, 15 Aug 2006 15:06:11 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id CC89B43DD6 for ; Tue, 15 Aug 2006 15:05:07 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7FF4f6q000299 for ; Tue, 15 Aug 2006 15:04:41 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7FF4dA2000294 for perforce@freebsd.org; Tue, 15 Aug 2006 15:04:39 GMT (envelope-from jhb@freebsd.org) Date: Tue, 15 Aug 2006 15:04:39 GMT Message-Id: <200608151504.k7FF4dA2000294@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Cc: Subject: PERFORCE change 104039 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Aug 2006 15:06:12 -0000 http://perforce.freebsd.org/chv.cgi?CH=104039 Change 104039 by jhb@jhb_mutex on 2006/08/15 15:04:07 IFC @104024. Affected files ... .. //depot/projects/smpng/sys/amd64/amd64/pmap.c#67 integrate .. //depot/projects/smpng/sys/amd64/amd64/support.S#15 integrate .. //depot/projects/smpng/sys/amd64/amd64/trap.c#54 integrate .. //depot/projects/smpng/sys/amd64/linux32/linux.h#3 integrate .. //depot/projects/smpng/sys/amd64/linux32/linux32_dummy.c#4 integrate .. //depot/projects/smpng/sys/amd64/linux32/linux32_machdep.c#11 integrate .. //depot/projects/smpng/sys/amd64/linux32/linux32_proto.h#14 integrate .. //depot/projects/smpng/sys/amd64/linux32/linux32_syscall.h#14 integrate .. //depot/projects/smpng/sys/amd64/linux32/linux32_sysent.c#14 integrate .. //depot/projects/smpng/sys/amd64/linux32/linux32_sysvec.c#18 integrate .. //depot/projects/smpng/sys/amd64/linux32/syscalls.master#20 integrate .. //depot/projects/smpng/sys/amd64/linux32/systrace_args.c#1 branch .. //depot/projects/smpng/sys/boot/forth/loader.conf#43 integrate .. //depot/projects/smpng/sys/cam/scsi/scsi_pass.c#15 integrate .. //depot/projects/smpng/sys/compat/linux/linux_emul.c#1 branch .. //depot/projects/smpng/sys/compat/linux/linux_emul.h#1 branch .. //depot/projects/smpng/sys/compat/linux/linux_futex.c#1 branch .. //depot/projects/smpng/sys/compat/linux/linux_futex.h#1 branch .. //depot/projects/smpng/sys/compat/linux/linux_misc.c#69 integrate .. //depot/projects/smpng/sys/compat/linux/linux_signal.c#21 integrate .. //depot/projects/smpng/sys/compat/linux/linux_time.c#1 branch .. //depot/projects/smpng/sys/compat/linux/linux_util.c#16 integrate .. //depot/projects/smpng/sys/conf/files#186 integrate .. //depot/projects/smpng/sys/conf/files.amd64#46 integrate .. //depot/projects/smpng/sys/conf/files.i386#101 integrate .. //depot/projects/smpng/sys/conf/kern.post.mk#56 integrate .. //depot/projects/smpng/sys/conf/kmod.mk#60 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acfreebsd.h#18 integrate .. //depot/projects/smpng/sys/dev/acpi_support/acpi_ibm.c#8 integrate .. //depot/projects/smpng/sys/dev/ata/ata-chipset.c#72 integrate .. //depot/projects/smpng/sys/dev/ata/ata-pci.h#46 integrate .. //depot/projects/smpng/sys/dev/bce/if_bce.c#5 integrate .. //depot/projects/smpng/sys/dev/em/if_em.c#72 integrate .. //depot/projects/smpng/sys/dev/em/if_em.h#34 integrate .. //depot/projects/smpng/sys/dev/exca/excareg.h#6 integrate .. //depot/projects/smpng/sys/dev/hme/if_hme.c#32 integrate .. //depot/projects/smpng/sys/dev/isp/isp.c#43 integrate .. //depot/projects/smpng/sys/dev/isp/isp_pci.c#39 integrate .. //depot/projects/smpng/sys/dev/isp/ispvar.h#31 integrate .. //depot/projects/smpng/sys/dev/mii/rgephy.c#9 integrate .. //depot/projects/smpng/sys/dev/nfe/if_nfe.c#2 integrate .. //depot/projects/smpng/sys/dev/pccbb/pccbb.c#60 integrate .. //depot/projects/smpng/sys/dev/pccbb/pccbb_pci.c#12 integrate .. //depot/projects/smpng/sys/dev/pccbb/pccbbreg.h#14 integrate .. //depot/projects/smpng/sys/dev/sk/if_sk.c#7 integrate .. //depot/projects/smpng/sys/dev/sound/pci/ich.c#45 integrate .. //depot/projects/smpng/sys/dev/stge/if_stge.c#2 integrate .. //depot/projects/smpng/sys/dev/ti/if_ti.c#4 integrate .. //depot/projects/smpng/sys/geom/label/g_label.c#13 integrate .. //depot/projects/smpng/sys/geom/label/g_label_msdosfs.c#4 integrate .. //depot/projects/smpng/sys/geom/label/g_label_msdosfs.h#1 branch .. //depot/projects/smpng/sys/i386/i386/pmap.c#107 integrate .. //depot/projects/smpng/sys/i386/i386/support.s#19 integrate .. //depot/projects/smpng/sys/i386/i386/trap.c#102 integrate .. //depot/projects/smpng/sys/i386/linux/linux.h#11 integrate .. //depot/projects/smpng/sys/i386/linux/linux_dummy.c#15 integrate .. //depot/projects/smpng/sys/i386/linux/linux_machdep.c#35 integrate .. //depot/projects/smpng/sys/i386/linux/linux_proto.h#33 integrate .. //depot/projects/smpng/sys/i386/linux/linux_syscall.h#32 integrate .. //depot/projects/smpng/sys/i386/linux/linux_sysent.c#33 integrate .. //depot/projects/smpng/sys/i386/linux/linux_sysvec.c#53 integrate .. //depot/projects/smpng/sys/i386/linux/syscalls.master#40 integrate .. //depot/projects/smpng/sys/i386/linux/systrace_args.c#1 branch .. //depot/projects/smpng/sys/kern/kern_exec.c#98 integrate .. //depot/projects/smpng/sys/kern/kern_fork.c#101 integrate .. //depot/projects/smpng/sys/kern/kern_subr.c#41 integrate .. //depot/projects/smpng/sys/kern/kern_time.c#44 integrate .. //depot/projects/smpng/sys/kern/uipc_sem.c#18 integrate .. //depot/projects/smpng/sys/kern/uipc_socket.c#92 integrate .. //depot/projects/smpng/sys/kern/uipc_usrreq.c#67 integrate .. //depot/projects/smpng/sys/kern/vfs_aio.c#73 integrate .. //depot/projects/smpng/sys/libkern/strstr.c#1 branch .. //depot/projects/smpng/sys/modules/if_ef/Makefile#6 integrate .. //depot/projects/smpng/sys/modules/if_ppp/Makefile#8 integrate .. //depot/projects/smpng/sys/modules/linprocfs/Makefile#5 integrate .. //depot/projects/smpng/sys/modules/linsysfs/Makefile#2 integrate .. //depot/projects/smpng/sys/modules/linux/Makefile#17 integrate .. //depot/projects/smpng/sys/modules/netgraph/mppc/Makefile#5 integrate .. //depot/projects/smpng/sys/modules/sound/sound/Makefile#5 integrate .. //depot/projects/smpng/sys/net/bridgestp.c#11 integrate .. //depot/projects/smpng/sys/netinet/tcp_input.c#89 integrate .. //depot/projects/smpng/sys/netinet/tcp_subr.c#82 integrate .. //depot/projects/smpng/sys/netinet/tcp_timer.c#30 integrate .. //depot/projects/smpng/sys/netinet/tcp_timer.h#11 integrate .. //depot/projects/smpng/sys/pci/if_xl.c#68 integrate .. //depot/projects/smpng/sys/sys/eventhandler.h#23 integrate .. //depot/projects/smpng/sys/sys/imgact.h#14 integrate .. //depot/projects/smpng/sys/sys/libkern.h#22 integrate .. //depot/projects/smpng/sys/sys/sysctl.h#41 integrate .. //depot/projects/smpng/sys/vm/vm_fault.c#61 integrate .. //depot/projects/smpng/sys/vm/vm_object.c#85 integrate .. //depot/projects/smpng/sys/vm/vm_page.c#82 integrate .. //depot/projects/smpng/sys/vm/vm_page.h#34 integrate Differences ... ==== //depot/projects/smpng/sys/amd64/amd64/pmap.c#67 (text+ko) ==== @@ -77,7 +77,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.570 2006/08/11 19:22:55 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.571 2006/08/14 15:39:41 jhb Exp $"); /* * Manages physical address maps. @@ -2368,10 +2368,6 @@ if (pmap == kernel_pmap) newpte |= PG_G; - /* Preserve any caching attributes. */ - /* XXX: Should this be conditional on something? */ - newpte |= (origpte & (PG_PTE_PAT | PG_NC_PCD | PG_NC_PWT)); - /* * if the mapping or permission bits are different, we need * to update the pte. ==== //depot/projects/smpng/sys/amd64/amd64/support.S#15 (text+ko) ==== @@ -27,7 +27,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/amd64/support.S,v 1.116 2005/09/27 18:32:46 peter Exp $ + * $FreeBSD: src/sys/amd64/amd64/support.S,v 1.117 2006/08/15 12:45:51 davidxu Exp $ */ #include "opt_ddb.h" @@ -412,7 +412,7 @@ ALIGN_TEXT fusufault: movq PCPU(CURPCB),%rcx - xorl %eax,%eax + xorq %rax,%rax movq %rax,PCB_ONFAULT(%rcx) decq %rax ret ==== //depot/projects/smpng/sys/amd64/amd64/trap.c#54 (text+ko) ==== @@ -38,7 +38,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/trap.c,v 1.308 2006/08/08 04:01:29 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/trap.c,v 1.310 2006/08/14 19:53:53 alc Exp $"); /* * AMD64 Trap and System call handling @@ -535,7 +535,7 @@ { vm_offset_t va; struct vmspace *vm = NULL; - vm_map_t map = 0; + vm_map_t map; int rv = 0; vm_prot_t ftype; struct thread *td = curthread; @@ -568,11 +568,11 @@ /* * PGEX_I is defined only if the execute disable bit capability is - * supported and enabled; otherwise, that bit is reserved, i.e., zero. + * supported and enabled. */ if (frame->tf_err & PGEX_W) ftype = VM_PROT_WRITE; - else if (frame->tf_err & PGEX_I) + else if ((frame->tf_err & PGEX_I) && pg_nx != 0) ftype = VM_PROT_EXECUTE; else ftype = VM_PROT_READ; ==== //depot/projects/smpng/sys/amd64/linux32/linux.h#3 (text+ko) ==== @@ -27,13 +27,17 @@ * (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/amd64/linux32/linux.h,v 1.2 2006/03/18 18:24:38 netchild Exp $ + * $FreeBSD: src/sys/amd64/linux32/linux.h,v 1.3 2006/08/15 12:54:29 netchild Exp $ */ #ifndef _AMD64_LINUX_LINUX_H_ #define _AMD64_LINUX_LINUX_H_ #include /* for sigval union */ +#include +#include +#include +#include #include @@ -495,6 +499,7 @@ extern int bsd_to_linux_signal[]; extern int linux_to_bsd_signal[]; +extern struct sysentvec elf_linux_sysvec; /* * Pluggable ioctl handlers @@ -527,6 +532,11 @@ #define LINUX_O_NDELAY LINUX_O_NONBLOCK #define LINUX_O_SYNC 010000 #define LINUX_FASYNC 020000 +#define LINUX_O_DIRECT 040000 /* direct disk access hint */ +#define LINUX_O_LARGEFILE 0100000 +#define LINUX_O_DIRECTORY 0200000 /* must be a directory */ +#define LINUX_O_NOFOLLOW 0400000 /* don't follow links */ +#define LINUX_O_NOATIME 01000000 #define LINUX_F_DUPFD 0 #define LINUX_F_GETFD 1 @@ -737,4 +747,99 @@ l_short revents; } __packed; +struct l_user_desc { + l_uint entry_number; + l_uint base_addr; + l_uint limit; + l_uint seg_32bit:1; + l_uint contents:2; + l_uint read_exec_only:1; + l_uint limit_in_pages:1; + l_uint seg_not_present:1; + l_uint useable:1; +}; + +struct l_desc_struct { + unsigned long a,b; +}; + + +#define LINUX_LOWERWORD 0x0000ffff + +/* macros which does the same thing as those in linux include/asm-um/ldt-i386.h + * these convert linux user-space descriptor to machine one + */ +#define LDT_entry_a(info) \ + ((((info)->base_addr & LINUX_LOWERWORD) << 16) | ((info)->limit & LINUX_LOWERWORD)) + +#define ENTRY_B_READ_EXEC_ONLY 9 +#define ENTRY_B_CONTENTS 10 +#define ENTRY_B_SEG_NOT_PRESENT 15 +#define ENTRY_B_BASE_ADDR 16 +#define ENTRY_B_USEABLE 20 +#define ENTRY_B_SEG32BIT 22 +#define ENTRY_B_LIMIT 23 + +#define LDT_entry_b(info) \ + (((info)->base_addr & 0xff000000) | \ + ((info)->limit & 0xf0000) | \ + ((info)->contents << ENTRY_B_CONTENTS) | \ + (((info)->seg_not_present == 0) << ENTRY_B_SEG_NOT_PRESENT) | \ + (((info)->base_addr & 0x00ff0000) >> ENTRY_B_BASE_ADDR) | \ + (((info)->read_exec_only == 0) << ENTRY_B_READ_EXEC_ONLY) | \ + ((info)->seg_32bit << ENTRY_B_SEG32BIT) | \ + ((info)->useable << ENTRY_B_USEABLE) | \ + ((info)->limit_in_pages << ENTRY_B_LIMIT) | 0x7000) + +#define LDT_empty(info) (\ + (info)->base_addr == 0 && \ + (info)->limit == 0 && \ + (info)->contents == 0 && \ + (info)->seg_not_present == 1 && \ + (info)->read_exec_only == 1 && \ + (info)->seg_32bit == 0 && \ + (info)->limit_in_pages == 0 && \ + (info)->useable == 0 ) + +/* macros for converting segments, they do the same as those in arch/i386/kernel/process.c */ +#define GET_BASE(desc) ( \ + (((desc)->a >> 16) & LINUX_LOWERWORD) | \ + (((desc)->b << 16) & 0x00ff0000) | \ + ( (desc)->b & 0xff000000) ) + +#define GET_LIMIT(desc) ( \ + ((desc)->a & LINUX_LOWERWORD) | \ + ((desc)->b & 0xf0000) ) + +#define GET_32BIT(desc) (((desc)->b >> ENTRY_B_SEG32BIT) & 1) +#define GET_CONTENTS(desc) (((desc)->b >> ENTRY_B_CONTENTS) & 3) +#define GET_WRITABLE(desc) (((desc)->b >> ENTRY_B_READ_EXEC_ONLY) & 1) +#define GET_LIMIT_PAGES(desc) (((desc)->b >> ENTRY_B_LIMIT) & 1) +#define GET_PRESENT(desc) (((desc)->b >> ENTRY_B_SEG_NOT_PRESENT) & 1) +#define GET_USEABLE(desc) (((desc)->b >> ENTRY_B_USEABLE) & 1) + +#define LINUX_CLOCK_REALTIME 0 +#define LINUX_CLOCK_MONOTONIC 1 +#define LINUX_CLOCK_PROCESS_CPUTIME_ID 2 +#define LINUX_CLOCK_THREAD_CPUTIME_ID 3 +#define LINUX_CLOCK_REALTIME_HR 4 +#define LINUX_CLOCK_MONOTONIC_HR 5 + +typedef int l_timer_t; +typedef int l_mqd_t; + +#define CLONE_VM 0x100 +#define CLONE_FS 0x200 +#define CLONE_FILES 0x400 +#define CLONE_SIGHAND 0x800 +#define CLONE_PID 0x1000 /* this flag does not exist in linux anymore */ +#define CLONE_PARENT 0x00008000 +#define CLONE_THREAD 0x10000 +#define CLONE_SETTLS 0x80000 +#define CLONE_CHILD_CLEARTID 0x00200000 +#define CLONE_CHILD_SETTID 0x01000000 +#define CLONE_PARENT_SETTID 0x00100000 + +#define THREADING_FLAGS (CLONE_VM | CLONE_FS | CLONE_FILES | CLONE_SIGHAND) + #endif /* !_AMD64_LINUX_LINUX_H_ */ ==== //depot/projects/smpng/sys/amd64/linux32/linux32_dummy.c#4 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_dummy.c,v 1.3 2006/06/21 08:45:40 netchild Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_dummy.c,v 1.4 2006/08/15 12:54:29 netchild Exp $"); #include #include @@ -72,19 +72,13 @@ DUMMY(epoll_ctl); DUMMY(epoll_wait); DUMMY(remap_file_pages); -DUMMY(set_tid_address); DUMMY(timer_create); DUMMY(timer_settime); DUMMY(timer_gettime); DUMMY(timer_getoverrun); DUMMY(timer_delete); -DUMMY(clock_settime); -DUMMY(clock_gettime); -DUMMY(clock_getres); -DUMMY(clock_nanosleep); DUMMY(statfs64); DUMMY(fstatfs64); -DUMMY(tgkill); DUMMY(utimes); DUMMY(fadvise64_64); DUMMY(mbind); ==== //depot/projects/smpng/sys/amd64/linux32/linux32_machdep.c#11 (text+ko) ==== @@ -29,12 +29,13 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_machdep.c,v 1.12 2006/03/08 20:21:53 ups Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_machdep.c,v 1.13 2006/08/15 12:54:29 netchild Exp $"); #include #include #include #include +#include #include #include #include @@ -472,12 +473,6 @@ return (0); } -#define CLONE_VM 0x100 -#define CLONE_FS 0x200 -#define CLONE_FILES 0x400 -#define CLONE_SIGHAND 0x800 -#define CLONE_PID 0x1000 - int linux_clone(struct thread *td, struct linux_clone_args *args) { @@ -491,14 +486,9 @@ printf(ARGS(clone, "flags %x, stack %x"), (unsigned int)(uintptr_t)args->flags, (unsigned int)(uintptr_t)args->stack); - if (args->flags & CLONE_PID) - printf(LMSG("CLONE_PID not yet supported")); } #endif - if (!args->stack) - return (EINVAL); - exit_signal = args->flags & 0x000000ff; if (exit_signal >= LINUX_NSIG) return (EINVAL); @@ -522,7 +512,11 @@ p2->p_sigparent = exit_signal; PROC_UNLOCK(p2); td2 = FIRST_THREAD_IN_PROC(p2); - td2->td_frame->tf_rsp = PTROUT(args->stack); + /* in a case of stack = NULL we are supposed to COW calling process stack + * this is what normal fork() does so we just keep the tf_rsp arg intact + */ + if (args->stack) + td2->td_frame->tf_rsp = PTROUT(args->stack); #ifdef DEBUG if (ldebug(clone)) ==== //depot/projects/smpng/sys/amd64/linux32/linux32_proto.h#14 (text+ko) ==== @@ -2,8 +2,8 @@ * System call prototypes. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/amd64/linux32/linux32_proto.h,v 1.19 2006/07/28 19:08:35 jhb Exp $ - * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.18 2006/07/28 19:05:26 jhb Exp + * $FreeBSD: src/sys/amd64/linux32/linux32_proto.h,v 1.20 2006/08/15 12:51:45 netchild Exp $ + * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.19 2006/08/15 12:28:14 netchild Exp */ #ifndef _LINUX_SYSPROTO_H_ @@ -11,10 +11,7 @@ #include #include -#include -#include #include - #include struct proc; @@ -197,6 +194,9 @@ char dev_l_[PADL_(l_dev_t)]; l_dev_t dev; char dev_r_[PADR_(l_dev_t)]; char ubuf_l_[PADL_(struct l_ustat *)]; struct l_ustat * ubuf; char ubuf_r_[PADR_(struct l_ustat *)]; }; +struct linux_getppid_args { + register_t dummy; +}; struct linux_sigaction_args { char sig_l_[PADL_(l_int)]; l_int sig; char sig_r_[PADR_(l_int)]; char nsa_l_[PADL_(l_osigaction_t *)]; l_osigaction_t * nsa; char nsa_r_[PADR_(l_osigaction_t *)]; @@ -368,6 +368,9 @@ struct linux_clone_args { char flags_l_[PADL_(l_int)]; l_int flags; char flags_r_[PADR_(l_int)]; char stack_l_[PADL_(void *)]; void * stack; char stack_r_[PADR_(void *)]; + char parent_tidptr_l_[PADL_(void *)]; void * parent_tidptr; char parent_tidptr_r_[PADR_(void *)]; + char dummy_l_[PADL_(int)]; int dummy; char dummy_r_[PADR_(int)]; + char child_tidptr_l_[PADL_(void *)]; void * child_tidptr; char child_tidptr_r_[PADR_(void *)]; }; struct linux_newuname_args { char buf_l_[PADL_(struct l_new_utsname *)]; struct l_new_utsname * buf; char buf_r_[PADR_(struct l_new_utsname *)]; @@ -668,6 +671,9 @@ char cmd_l_[PADL_(l_uint)]; l_uint cmd; char cmd_r_[PADR_(l_uint)]; char arg_l_[PADL_(uintptr_t)]; uintptr_t arg; char arg_r_[PADR_(uintptr_t)]; }; +struct linux_gettid_args { + register_t dummy; +}; struct linux_setxattr_args { register_t dummy; }; @@ -704,9 +710,24 @@ struct linux_fremovexattr_args { register_t dummy; }; +struct linux_tkill_args { + char tid_l_[PADL_(int)]; int tid; char tid_r_[PADR_(int)]; + char sig_l_[PADL_(int)]; int sig; char sig_r_[PADR_(int)]; +}; +struct linux_sys_futex_args { + char uaddr_l_[PADL_(void *)]; void * uaddr; char uaddr_r_[PADR_(void *)]; + char op_l_[PADL_(int)]; int op; char op_r_[PADR_(int)]; + char val_l_[PADL_(int)]; int val; char val_r_[PADR_(int)]; + char timeout_l_[PADL_(struct l_timespec *)]; struct l_timespec * timeout; char timeout_r_[PADR_(struct l_timespec *)]; + char uaddr2_l_[PADL_(void *)]; void * uaddr2; char uaddr2_r_[PADR_(void *)]; + char val3_l_[PADL_(int)]; int val3; char val3_r_[PADR_(int)]; +}; struct linux_fadvise64_args { register_t dummy; }; +struct linux_exit_group_args { + char error_code_l_[PADL_(int)]; int error_code; char error_code_r_[PADR_(int)]; +}; struct linux_lookup_dcookie_args { register_t dummy; }; @@ -723,7 +744,7 @@ register_t dummy; }; struct linux_set_tid_address_args { - register_t dummy; + char tidptr_l_[PADL_(int *)]; int * tidptr; char tidptr_r_[PADR_(int *)]; }; struct linux_timer_create_args { register_t dummy; @@ -741,16 +762,22 @@ register_t dummy; }; struct linux_clock_settime_args { - register_t dummy; + char which_l_[PADL_(clockid_t)]; clockid_t which; char which_r_[PADR_(clockid_t)]; + char tp_l_[PADL_(struct l_timespec *)]; struct l_timespec * tp; char tp_r_[PADR_(struct l_timespec *)]; }; struct linux_clock_gettime_args { - register_t dummy; + char which_l_[PADL_(clockid_t)]; clockid_t which; char which_r_[PADR_(clockid_t)]; + char tp_l_[PADL_(struct l_timespec *)]; struct l_timespec * tp; char tp_r_[PADR_(struct l_timespec *)]; }; struct linux_clock_getres_args { - register_t dummy; + char which_l_[PADL_(clockid_t)]; clockid_t which; char which_r_[PADR_(clockid_t)]; + char tp_l_[PADL_(struct l_timespec *)]; struct l_timespec * tp; char tp_r_[PADR_(struct l_timespec *)]; }; struct linux_clock_nanosleep_args { - register_t dummy; + char which_l_[PADL_(clockid_t)]; clockid_t which; char which_r_[PADR_(clockid_t)]; + char flags_l_[PADL_(int)]; int flags; char flags_r_[PADR_(int)]; + char rqtp_l_[PADL_(struct l_timespec *)]; struct l_timespec * rqtp; char rqtp_r_[PADR_(struct l_timespec *)]; + char rmtp_l_[PADL_(struct l_timespec *)]; struct l_timespec * rmtp; char rmtp_r_[PADR_(struct l_timespec *)]; }; struct linux_statfs64_args { register_t dummy; @@ -759,7 +786,9 @@ register_t dummy; }; struct linux_tgkill_args { - register_t dummy; + char tgid_l_[PADL_(int)]; int tgid; char tgid_r_[PADR_(int)]; + char pid_l_[PADL_(int)]; int pid; char pid_r_[PADR_(int)]; + char sig_l_[PADL_(int)]; int sig; char sig_r_[PADR_(int)]; }; struct linux_utimes_args { register_t dummy; @@ -919,6 +948,7 @@ int linux_fcntl(struct thread *, struct linux_fcntl_args *); int linux_olduname(struct thread *, struct linux_olduname_args *); int linux_ustat(struct thread *, struct linux_ustat_args *); +int linux_getppid(struct thread *, struct linux_getppid_args *); int linux_sigaction(struct thread *, struct linux_sigaction_args *); int linux_sgetmask(struct thread *, struct linux_sgetmask_args *); int linux_ssetmask(struct thread *, struct linux_ssetmask_args *); @@ -1033,6 +1063,7 @@ int linux_mincore(struct thread *, struct linux_mincore_args *); int linux_getdents64(struct thread *, struct linux_getdents64_args *); int linux_fcntl64(struct thread *, struct linux_fcntl64_args *); +int linux_gettid(struct thread *, struct linux_gettid_args *); int linux_setxattr(struct thread *, struct linux_setxattr_args *); int linux_lsetxattr(struct thread *, struct linux_lsetxattr_args *); int linux_fsetxattr(struct thread *, struct linux_fsetxattr_args *); @@ -1045,7 +1076,10 @@ int linux_removexattr(struct thread *, struct linux_removexattr_args *); int linux_lremovexattr(struct thread *, struct linux_lremovexattr_args *); int linux_fremovexattr(struct thread *, struct linux_fremovexattr_args *); +int linux_tkill(struct thread *, struct linux_tkill_args *); +int linux_sys_futex(struct thread *, struct linux_sys_futex_args *); int linux_fadvise64(struct thread *, struct linux_fadvise64_args *); +int linux_exit_group(struct thread *, struct linux_exit_group_args *); int linux_lookup_dcookie(struct thread *, struct linux_lookup_dcookie_args *); int linux_epoll_create(struct thread *, struct linux_epoll_create_args *); int linux_epoll_ctl(struct thread *, struct linux_epoll_ctl_args *); ==== //depot/projects/smpng/sys/amd64/linux32/linux32_syscall.h#14 (text+ko) ==== @@ -2,8 +2,8 @@ * System call numbers. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/amd64/linux32/linux32_syscall.h,v 1.19 2006/07/28 19:08:35 jhb Exp $ - * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.18 2006/07/28 19:05:26 jhb Exp + * $FreeBSD: src/sys/amd64/linux32/linux32_syscall.h,v 1.20 2006/08/15 12:51:45 netchild Exp $ + * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.19 2006/08/15 12:28:14 netchild Exp */ #define LINUX_SYS_exit 1 @@ -60,7 +60,7 @@ #define LINUX_SYS_chroot 61 #define LINUX_SYS_linux_ustat 62 #define LINUX_SYS_dup2 63 -#define LINUX_SYS_getppid 64 +#define LINUX_SYS_linux_getppid 64 #define LINUX_SYS_getpgrp 65 #define LINUX_SYS_setsid 66 #define LINUX_SYS_linux_sigaction 67 @@ -206,7 +206,7 @@ #define LINUX_SYS_madvise 219 #define LINUX_SYS_linux_getdents64 220 #define LINUX_SYS_linux_fcntl64 221 -#define LINUX_SYS_gettid 224 +#define LINUX_SYS_linux_gettid 224 #define LINUX_SYS_linux_setxattr 226 #define LINUX_SYS_linux_lsetxattr 227 #define LINUX_SYS_linux_fsetxattr 228 @@ -219,8 +219,10 @@ #define LINUX_SYS_linux_removexattr 235 #define LINUX_SYS_linux_lremovexattr 236 #define LINUX_SYS_linux_fremovexattr 237 +#define LINUX_SYS_linux_tkill 238 +#define LINUX_SYS_linux_sys_futex 240 #define LINUX_SYS_linux_fadvise64 250 -#define LINUX_SYS_exit_group 252 +#define LINUX_SYS_linux_exit_group 252 #define LINUX_SYS_linux_lookup_dcookie 253 #define LINUX_SYS_linux_epoll_create 254 #define LINUX_SYS_linux_epoll_ctl 255 ==== //depot/projects/smpng/sys/amd64/linux32/linux32_sysent.c#14 (text+ko) ==== @@ -2,8 +2,8 @@ * System call switch table. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/amd64/linux32/linux32_sysent.c,v 1.19 2006/07/28 19:08:35 jhb Exp $ - * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.18 2006/07/28 19:05:26 jhb Exp + * $FreeBSD: src/sys/amd64/linux32/linux32_sysent.c,v 1.20 2006/08/15 12:51:45 netchild Exp $ + * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.19 2006/08/15 12:28:14 netchild Exp */ #include @@ -20,315 +20,315 @@ /* The casts are bogus but will do for now. */ struct sysent linux_sysent[] = { #define nosys linux_nosys - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 0 = setup */ - { AS(sys_exit_args), (sy_call_t *)sys_exit, AUE_EXIT }, /* 1 = exit */ - { 0, (sy_call_t *)linux_fork, AUE_FORK }, /* 2 = linux_fork */ - { AS(read_args), (sy_call_t *)read, AUE_NULL }, /* 3 = read */ - { AS(write_args), (sy_call_t *)write, AUE_NULL }, /* 4 = write */ - { AS(linux_open_args), (sy_call_t *)linux_open, AUE_OPEN_RWTC }, /* 5 = linux_open */ - { AS(close_args), (sy_call_t *)close, AUE_CLOSE }, /* 6 = close */ - { AS(linux_waitpid_args), (sy_call_t *)linux_waitpid, AUE_WAIT4 }, /* 7 = linux_waitpid */ - { AS(linux_creat_args), (sy_call_t *)linux_creat, AUE_O_CREAT }, /* 8 = linux_creat */ - { AS(linux_link_args), (sy_call_t *)linux_link, AUE_LINK }, /* 9 = linux_link */ - { AS(linux_unlink_args), (sy_call_t *)linux_unlink, AUE_UNLINK }, /* 10 = linux_unlink */ - { AS(linux_execve_args), (sy_call_t *)linux_execve, AUE_EXECVE }, /* 11 = linux_execve */ - { AS(linux_chdir_args), (sy_call_t *)linux_chdir, AUE_CHDIR }, /* 12 = linux_chdir */ - { AS(linux_time_args), (sy_call_t *)linux_time, AUE_NULL }, /* 13 = linux_time */ - { AS(linux_mknod_args), (sy_call_t *)linux_mknod, AUE_MKNOD }, /* 14 = linux_mknod */ - { AS(linux_chmod_args), (sy_call_t *)linux_chmod, AUE_CHMOD }, /* 15 = linux_chmod */ - { AS(linux_lchown16_args), (sy_call_t *)linux_lchown16, AUE_LCHOWN }, /* 16 = linux_lchown16 */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 17 = break */ - { AS(linux_stat_args), (sy_call_t *)linux_stat, AUE_STAT }, /* 18 = linux_stat */ - { AS(linux_lseek_args), (sy_call_t *)linux_lseek, AUE_LSEEK }, /* 19 = linux_lseek */ - { 0, (sy_call_t *)linux_getpid, AUE_GETPID }, /* 20 = linux_getpid */ - { AS(linux_mount_args), (sy_call_t *)linux_mount, AUE_MOUNT }, /* 21 = linux_mount */ - { AS(linux_oldumount_args), (sy_call_t *)linux_oldumount, AUE_UMOUNT }, /* 22 = linux_oldumount */ - { AS(linux_setuid16_args), (sy_call_t *)linux_setuid16, AUE_SETUID }, /* 23 = linux_setuid16 */ - { 0, (sy_call_t *)linux_getuid16, AUE_GETUID }, /* 24 = linux_getuid16 */ - { 0, (sy_call_t *)linux_stime, AUE_SETTIMEOFDAY }, /* 25 = linux_stime */ - { AS(linux_ptrace_args), (sy_call_t *)linux_ptrace, AUE_PTRACE }, /* 26 = linux_ptrace */ - { AS(linux_alarm_args), (sy_call_t *)linux_alarm, AUE_NULL }, /* 27 = linux_alarm */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 28 = fstat */ - { 0, (sy_call_t *)linux_pause, AUE_NULL }, /* 29 = linux_pause */ - { AS(linux_utime_args), (sy_call_t *)linux_utime, AUE_UTIME }, /* 30 = linux_utime */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 31 = stty */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 32 = gtty */ - { AS(linux_access_args), (sy_call_t *)linux_access, AUE_ACCESS }, /* 33 = linux_access */ - { AS(linux_nice_args), (sy_call_t *)linux_nice, AUE_NICE }, /* 34 = linux_nice */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 35 = ftime */ - { 0, (sy_call_t *)sync, AUE_SYNC }, /* 36 = sync */ - { AS(linux_kill_args), (sy_call_t *)linux_kill, AUE_KILL }, /* 37 = linux_kill */ - { AS(linux_rename_args), (sy_call_t *)linux_rename, AUE_RENAME }, /* 38 = linux_rename */ - { AS(linux_mkdir_args), (sy_call_t *)linux_mkdir, AUE_MKDIR }, /* 39 = linux_mkdir */ - { AS(linux_rmdir_args), (sy_call_t *)linux_rmdir, AUE_RMDIR }, /* 40 = linux_rmdir */ - { AS(dup_args), (sy_call_t *)dup, AUE_DUP }, /* 41 = dup */ - { AS(linux_pipe_args), (sy_call_t *)linux_pipe, AUE_PIPE }, /* 42 = linux_pipe */ - { AS(linux_times_args), (sy_call_t *)linux_times, AUE_NULL }, /* 43 = linux_times */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 44 = prof */ - { AS(linux_brk_args), (sy_call_t *)linux_brk, AUE_NULL }, /* 45 = linux_brk */ - { AS(linux_setgid16_args), (sy_call_t *)linux_setgid16, AUE_SETGID }, /* 46 = linux_setgid16 */ - { 0, (sy_call_t *)linux_getgid16, AUE_GETGID }, /* 47 = linux_getgid16 */ - { AS(linux_signal_args), (sy_call_t *)linux_signal, AUE_NULL }, /* 48 = linux_signal */ - { 0, (sy_call_t *)linux_geteuid16, AUE_GETEUID }, /* 49 = linux_geteuid16 */ - { 0, (sy_call_t *)linux_getegid16, AUE_GETEGID }, /* 50 = linux_getegid16 */ - { AS(acct_args), (sy_call_t *)acct, AUE_ACCT }, /* 51 = acct */ - { AS(linux_umount_args), (sy_call_t *)linux_umount, AUE_UMOUNT }, /* 52 = linux_umount */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 53 = lock */ - { AS(linux_ioctl_args), (sy_call_t *)linux_ioctl, AUE_IOCTL }, /* 54 = linux_ioctl */ - { AS(linux_fcntl_args), (sy_call_t *)linux_fcntl, AUE_FCNTL }, /* 55 = linux_fcntl */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 56 = mpx */ - { AS(setpgid_args), (sy_call_t *)setpgid, AUE_SETPGRP }, /* 57 = setpgid */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 58 = ulimit */ - { 0, (sy_call_t *)linux_olduname, AUE_NULL }, /* 59 = linux_olduname */ - { AS(umask_args), (sy_call_t *)umask, AUE_UMASK }, /* 60 = umask */ - { AS(chroot_args), (sy_call_t *)chroot, AUE_CHROOT }, /* 61 = chroot */ - { AS(linux_ustat_args), (sy_call_t *)linux_ustat, AUE_NULL }, /* 62 = linux_ustat */ - { AS(dup2_args), (sy_call_t *)dup2, AUE_DUP2 }, /* 63 = dup2 */ - { 0, (sy_call_t *)getppid, AUE_GETPPID }, /* 64 = getppid */ - { 0, (sy_call_t *)getpgrp, AUE_GETPGRP }, /* 65 = getpgrp */ - { 0, (sy_call_t *)setsid, AUE_SETSID }, /* 66 = setsid */ - { AS(linux_sigaction_args), (sy_call_t *)linux_sigaction, AUE_NULL }, /* 67 = linux_sigaction */ - { 0, (sy_call_t *)linux_sgetmask, AUE_NULL }, /* 68 = linux_sgetmask */ - { AS(linux_ssetmask_args), (sy_call_t *)linux_ssetmask, AUE_NULL }, /* 69 = linux_ssetmask */ - { AS(linux_setreuid16_args), (sy_call_t *)linux_setreuid16, AUE_SETREUID }, /* 70 = linux_setreuid16 */ - { AS(linux_setregid16_args), (sy_call_t *)linux_setregid16, AUE_SETREGID }, /* 71 = linux_setregid16 */ - { AS(linux_sigsuspend_args), (sy_call_t *)linux_sigsuspend, AUE_NULL }, /* 72 = linux_sigsuspend */ - { AS(linux_sigpending_args), (sy_call_t *)linux_sigpending, AUE_NULL }, /* 73 = linux_sigpending */ - { AS(linux_sethostname_args), (sy_call_t *)linux_sethostname, AUE_SYSCTL }, /* 74 = linux_sethostname */ - { AS(linux_setrlimit_args), (sy_call_t *)linux_setrlimit, AUE_SETRLIMIT }, /* 75 = linux_setrlimit */ - { AS(linux_old_getrlimit_args), (sy_call_t *)linux_old_getrlimit, AUE_GETRLIMIT }, /* 76 = linux_old_getrlimit */ - { AS(linux_getrusage_args), (sy_call_t *)linux_getrusage, AUE_GETRUSAGE }, /* 77 = linux_getrusage */ - { AS(linux_gettimeofday_args), (sy_call_t *)linux_gettimeofday, AUE_NULL }, /* 78 = linux_gettimeofday */ - { AS(linux_settimeofday_args), (sy_call_t *)linux_settimeofday, AUE_SETTIMEOFDAY }, /* 79 = linux_settimeofday */ - { AS(linux_getgroups16_args), (sy_call_t *)linux_getgroups16, AUE_GETGROUPS }, /* 80 = linux_getgroups16 */ - { AS(linux_setgroups16_args), (sy_call_t *)linux_setgroups16, AUE_SETGROUPS }, /* 81 = linux_setgroups16 */ - { AS(linux_old_select_args), (sy_call_t *)linux_old_select, AUE_SELECT }, /* 82 = linux_old_select */ - { AS(linux_symlink_args), (sy_call_t *)linux_symlink, AUE_SYMLINK }, /* 83 = linux_symlink */ - { AS(linux_lstat_args), (sy_call_t *)linux_lstat, AUE_LSTAT }, /* 84 = linux_lstat */ - { AS(linux_readlink_args), (sy_call_t *)linux_readlink, AUE_READLINK }, /* 85 = linux_readlink */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 86 = linux_uselib */ - { AS(swapon_args), (sy_call_t *)swapon, AUE_SWAPON }, /* 87 = swapon */ - { AS(linux_reboot_args), (sy_call_t *)linux_reboot, AUE_REBOOT }, /* 88 = linux_reboot */ - { AS(linux_readdir_args), (sy_call_t *)linux_readdir, AUE_O_GETDENTS }, /* 89 = linux_readdir */ - { AS(linux_mmap_args), (sy_call_t *)linux_mmap, AUE_MMAP }, /* 90 = linux_mmap */ - { AS(munmap_args), (sy_call_t *)munmap, AUE_MUNMAP }, /* 91 = munmap */ - { AS(linux_truncate_args), (sy_call_t *)linux_truncate, AUE_TRUNCATE }, /* 92 = linux_truncate */ - { AS(linux_ftruncate_args), (sy_call_t *)linux_ftruncate, AUE_FTRUNCATE }, /* 93 = linux_ftruncate */ - { AS(fchmod_args), (sy_call_t *)fchmod, AUE_FCHMOD }, /* 94 = fchmod */ - { AS(fchown_args), (sy_call_t *)fchown, AUE_FCHOWN }, /* 95 = fchown */ - { AS(linux_getpriority_args), (sy_call_t *)linux_getpriority, AUE_GETPRIORITY }, /* 96 = linux_getpriority */ - { AS(setpriority_args), (sy_call_t *)setpriority, AUE_SETPRIORITY }, /* 97 = setpriority */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 98 = profil */ - { AS(linux_statfs_args), (sy_call_t *)linux_statfs, AUE_STATFS }, /* 99 = linux_statfs */ - { AS(linux_fstatfs_args), (sy_call_t *)linux_fstatfs, AUE_FSTATFS }, /* 100 = linux_fstatfs */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 101 = ioperm */ - { AS(linux_socketcall_args), (sy_call_t *)linux_socketcall, AUE_NULL }, /* 102 = linux_socketcall */ - { AS(linux_syslog_args), (sy_call_t *)linux_syslog, AUE_NULL }, /* 103 = linux_syslog */ - { AS(linux_setitimer_args), (sy_call_t *)linux_setitimer, AUE_SETITIMER }, /* 104 = linux_setitimer */ - { AS(linux_getitimer_args), (sy_call_t *)linux_getitimer, AUE_GETITIMER }, /* 105 = linux_getitimer */ - { AS(linux_newstat_args), (sy_call_t *)linux_newstat, AUE_STAT }, /* 106 = linux_newstat */ - { AS(linux_newlstat_args), (sy_call_t *)linux_newlstat, AUE_LSTAT }, /* 107 = linux_newlstat */ - { AS(linux_newfstat_args), (sy_call_t *)linux_newfstat, AUE_FSTAT }, /* 108 = linux_newfstat */ - { 0, (sy_call_t *)linux_uname, AUE_NULL }, /* 109 = linux_uname */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 110 = iopl */ - { 0, (sy_call_t *)linux_vhangup, AUE_NULL }, /* 111 = linux_vhangup */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 112 = idle */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 113 = vm86old */ - { AS(linux_wait4_args), (sy_call_t *)linux_wait4, AUE_WAIT4 }, /* 114 = linux_wait4 */ - { 0, (sy_call_t *)linux_swapoff, AUE_SWAPOFF }, /* 115 = linux_swapoff */ - { AS(linux_sysinfo_args), (sy_call_t *)linux_sysinfo, AUE_NULL }, /* 116 = linux_sysinfo */ - { AS(linux_ipc_args), (sy_call_t *)linux_ipc, AUE_NULL }, /* 117 = linux_ipc */ - { AS(fsync_args), (sy_call_t *)fsync, AUE_FSYNC }, /* 118 = fsync */ - { AS(linux_sigreturn_args), (sy_call_t *)linux_sigreturn, AUE_SIGRETURN }, /* 119 = linux_sigreturn */ - { AS(linux_clone_args), (sy_call_t *)linux_clone, AUE_RFORK }, /* 120 = linux_clone */ - { AS(setdomainname_args), (sy_call_t *)setdomainname, AUE_SYSCTL }, /* 121 = setdomainname */ - { AS(linux_newuname_args), (sy_call_t *)linux_newuname, AUE_NULL }, /* 122 = linux_newuname */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 123 = modify_ldt */ - { 0, (sy_call_t *)linux_adjtimex, AUE_ADJTIME }, /* 124 = linux_adjtimex */ - { AS(linux_mprotect_args), (sy_call_t *)linux_mprotect, AUE_MPROTECT }, /* 125 = linux_mprotect */ - { AS(linux_sigprocmask_args), (sy_call_t *)linux_sigprocmask, AUE_SIGPROCMASK }, /* 126 = linux_sigprocmask */ - { 0, (sy_call_t *)linux_create_module, AUE_NULL }, /* 127 = linux_create_module */ - { 0, (sy_call_t *)linux_init_module, AUE_NULL }, /* 128 = linux_init_module */ - { 0, (sy_call_t *)linux_delete_module, AUE_NULL }, /* 129 = linux_delete_module */ - { 0, (sy_call_t *)linux_get_kernel_syms, AUE_NULL }, /* 130 = linux_get_kernel_syms */ - { 0, (sy_call_t *)linux_quotactl, AUE_QUOTACTL }, /* 131 = linux_quotactl */ - { AS(getpgid_args), (sy_call_t *)getpgid, AUE_GETPGID }, /* 132 = getpgid */ - { AS(fchdir_args), (sy_call_t *)fchdir, AUE_FCHDIR }, /* 133 = fchdir */ - { 0, (sy_call_t *)linux_bdflush, AUE_BDFLUSH }, /* 134 = linux_bdflush */ - { AS(linux_sysfs_args), (sy_call_t *)linux_sysfs, AUE_NULL }, /* 135 = linux_sysfs */ - { AS(linux_personality_args), (sy_call_t *)linux_personality, AUE_PERSONALITY }, /* 136 = linux_personality */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 137 = afs_syscall */ - { AS(linux_setfsuid16_args), (sy_call_t *)linux_setfsuid16, AUE_SETFSUID }, /* 138 = linux_setfsuid16 */ - { AS(linux_setfsgid16_args), (sy_call_t *)linux_setfsgid16, AUE_SETFSGID }, /* 139 = linux_setfsgid16 */ - { AS(linux_llseek_args), (sy_call_t *)linux_llseek, AUE_LSEEK }, /* 140 = linux_llseek */ - { AS(linux_getdents_args), (sy_call_t *)linux_getdents, AUE_O_GETDENTS }, /* 141 = linux_getdents */ - { AS(linux_select_args), (sy_call_t *)linux_select, AUE_SELECT }, /* 142 = linux_select */ - { AS(flock_args), (sy_call_t *)flock, AUE_FLOCK }, /* 143 = flock */ - { AS(linux_msync_args), (sy_call_t *)linux_msync, AUE_MSYNC }, /* 144 = linux_msync */ - { AS(linux_readv_args), (sy_call_t *)linux_readv, AUE_READV }, /* 145 = linux_readv */ - { AS(linux_writev_args), (sy_call_t *)linux_writev, AUE_WRITEV }, /* 146 = linux_writev */ - { AS(linux_getsid_args), (sy_call_t *)linux_getsid, AUE_GETSID }, /* 147 = linux_getsid */ - { AS(linux_fdatasync_args), (sy_call_t *)linux_fdatasync, AUE_NULL }, /* 148 = linux_fdatasync */ - { AS(linux_sysctl_args), (sy_call_t *)linux_sysctl, AUE_SYSCTL }, /* 149 = linux_sysctl */ - { AS(mlock_args), (sy_call_t *)mlock, AUE_MLOCK }, /* 150 = mlock */ - { AS(munlock_args), (sy_call_t *)munlock, AUE_MUNLOCK }, /* 151 = munlock */ - { AS(mlockall_args), (sy_call_t *)mlockall, AUE_MLOCKALL }, /* 152 = mlockall */ - { 0, (sy_call_t *)munlockall, AUE_MUNLOCKALL }, /* 153 = munlockall */ - { AS(sched_setparam_args), (sy_call_t *)sched_setparam, AUE_SCHED_SETPARAM }, /* 154 = sched_setparam */ - { AS(sched_getparam_args), (sy_call_t *)sched_getparam, AUE_SCHED_GETPARAM }, /* 155 = sched_getparam */ - { AS(linux_sched_setscheduler_args), (sy_call_t *)linux_sched_setscheduler, AUE_SCHED_SETSCHEDULER }, /* 156 = linux_sched_setscheduler */ - { AS(linux_sched_getscheduler_args), (sy_call_t *)linux_sched_getscheduler, AUE_SCHED_GETSCHEDULER }, /* 157 = linux_sched_getscheduler */ - { 0, (sy_call_t *)sched_yield, AUE_NULL }, /* 158 = sched_yield */ - { AS(linux_sched_get_priority_max_args), (sy_call_t *)linux_sched_get_priority_max, AUE_SCHED_GET_PRIORITY_MAX }, /* 159 = linux_sched_get_priority_max */ - { AS(linux_sched_get_priority_min_args), (sy_call_t *)linux_sched_get_priority_min, AUE_SCHED_GET_PRIORITY_MIN }, /* 160 = linux_sched_get_priority_min */ - { AS(linux_sched_rr_get_interval_args), (sy_call_t *)linux_sched_rr_get_interval, AUE_SCHED_RR_GET_INTERVAL }, /* 161 = linux_sched_rr_get_interval */ - { AS(linux_nanosleep_args), (sy_call_t *)linux_nanosleep, AUE_NULL }, /* 162 = linux_nanosleep */ - { AS(linux_mremap_args), (sy_call_t *)linux_mremap, AUE_NULL }, /* 163 = linux_mremap */ - { AS(linux_setresuid16_args), (sy_call_t *)linux_setresuid16, AUE_SETRESUID }, /* 164 = linux_setresuid16 */ - { AS(linux_getresuid16_args), (sy_call_t *)linux_getresuid16, AUE_GETRESUID }, /* 165 = linux_getresuid16 */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 166 = vm86 */ - { 0, (sy_call_t *)linux_query_module, AUE_NULL }, /* 167 = linux_query_module */ - { AS(poll_args), (sy_call_t *)poll, AUE_POLL }, /* 168 = poll */ - { 0, (sy_call_t *)linux_nfsservctl, AUE_NULL }, /* 169 = linux_nfsservctl */ - { AS(linux_setresgid16_args), (sy_call_t *)linux_setresgid16, AUE_SETRESGID }, /* 170 = linux_setresgid16 */ - { AS(linux_getresgid16_args), (sy_call_t *)linux_getresgid16, AUE_GETRESGID }, /* 171 = linux_getresgid16 */ - { 0, (sy_call_t *)linux_prctl, AUE_PRCTL }, /* 172 = linux_prctl */ - { AS(linux_rt_sigreturn_args), (sy_call_t *)linux_rt_sigreturn, AUE_NULL }, /* 173 = linux_rt_sigreturn */ - { AS(linux_rt_sigaction_args), (sy_call_t *)linux_rt_sigaction, AUE_NULL }, /* 174 = linux_rt_sigaction */ - { AS(linux_rt_sigprocmask_args), (sy_call_t *)linux_rt_sigprocmask, AUE_NULL }, /* 175 = linux_rt_sigprocmask */ - { AS(linux_rt_sigpending_args), (sy_call_t *)linux_rt_sigpending, AUE_NULL }, /* 176 = linux_rt_sigpending */ - { 0, (sy_call_t *)linux_rt_sigtimedwait, AUE_NULL }, /* 177 = linux_rt_sigtimedwait */ - { 0, (sy_call_t *)linux_rt_sigqueueinfo, AUE_NULL }, /* 178 = linux_rt_sigqueueinfo */ - { AS(linux_rt_sigsuspend_args), (sy_call_t *)linux_rt_sigsuspend, AUE_NULL }, /* 179 = linux_rt_sigsuspend */ - { AS(linux_pread_args), (sy_call_t *)linux_pread, AUE_PREAD }, /* 180 = linux_pread */ - { AS(linux_pwrite_args), (sy_call_t *)linux_pwrite, AUE_PWRITE }, /* 181 = linux_pwrite */ - { AS(linux_chown16_args), (sy_call_t *)linux_chown16, AUE_CHOWN }, /* 182 = linux_chown16 */ - { AS(linux_getcwd_args), (sy_call_t *)linux_getcwd, AUE_GETCWD }, /* 183 = linux_getcwd */ - { 0, (sy_call_t *)linux_capget, AUE_CAPGET }, /* 184 = linux_capget */ - { 0, (sy_call_t *)linux_capset, AUE_CAPSET }, /* 185 = linux_capset */ - { AS(linux_sigaltstack_args), (sy_call_t *)linux_sigaltstack, AUE_NULL }, /* 186 = linux_sigaltstack */ - { 0, (sy_call_t *)linux_sendfile, AUE_SENDFILE }, /* 187 = linux_sendfile */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 188 = getpmsg */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 189 = putpmsg */ - { 0, (sy_call_t *)linux_vfork, AUE_VFORK }, /* 190 = linux_vfork */ - { AS(linux_getrlimit_args), (sy_call_t *)linux_getrlimit, AUE_GETRLIMIT }, /* 191 = linux_getrlimit */ - { AS(linux_mmap2_args), (sy_call_t *)linux_mmap2, AUE_MMAP }, /* 192 = linux_mmap2 */ - { AS(linux_truncate64_args), (sy_call_t *)linux_truncate64, AUE_TRUNCATE }, /* 193 = linux_truncate64 */ - { AS(linux_ftruncate64_args), (sy_call_t *)linux_ftruncate64, AUE_FTRUNCATE }, /* 194 = linux_ftruncate64 */ - { AS(linux_stat64_args), (sy_call_t *)linux_stat64, AUE_STAT }, /* 195 = linux_stat64 */ - { AS(linux_lstat64_args), (sy_call_t *)linux_lstat64, AUE_LSTAT }, /* 196 = linux_lstat64 */ - { AS(linux_fstat64_args), (sy_call_t *)linux_fstat64, AUE_FSTAT }, /* 197 = linux_fstat64 */ - { AS(linux_lchown_args), (sy_call_t *)linux_lchown, AUE_LCHOWN }, /* 198 = linux_lchown */ - { 0, (sy_call_t *)linux_getuid, AUE_GETUID }, /* 199 = linux_getuid */ - { 0, (sy_call_t *)linux_getgid, AUE_GETGID }, /* 200 = linux_getgid */ - { 0, (sy_call_t *)geteuid, AUE_GETEUID }, /* 201 = geteuid */ - { 0, (sy_call_t *)getegid, AUE_GETEGID }, /* 202 = getegid */ - { AS(setreuid_args), (sy_call_t *)setreuid, AUE_SETREUID }, /* 203 = setreuid */ - { AS(setregid_args), (sy_call_t *)setregid, AUE_SETREGID }, /* 204 = setregid */ - { AS(linux_getgroups_args), (sy_call_t *)linux_getgroups, AUE_GETGROUPS }, /* 205 = linux_getgroups */ - { AS(linux_setgroups_args), (sy_call_t *)linux_setgroups, AUE_SETGROUPS }, /* 206 = linux_setgroups */ - { AS(fchown_args), (sy_call_t *)fchown, AUE_NULL }, /* 207 = fchown */ - { AS(setresuid_args), (sy_call_t *)setresuid, AUE_SETRESUID }, /* 208 = setresuid */ - { AS(getresuid_args), (sy_call_t *)getresuid, AUE_GETRESUID }, /* 209 = getresuid */ - { AS(setresgid_args), (sy_call_t *)setresgid, AUE_SETRESGID }, /* 210 = setresgid */ - { AS(getresgid_args), (sy_call_t *)getresgid, AUE_GETRESGID }, /* 211 = getresgid */ - { AS(linux_chown_args), (sy_call_t *)linux_chown, AUE_CHOWN }, /* 212 = linux_chown */ - { AS(setuid_args), (sy_call_t *)setuid, AUE_SETUID }, /* 213 = setuid */ - { AS(setgid_args), (sy_call_t *)setgid, AUE_SETGID }, /* 214 = setgid */ - { AS(linux_setfsuid_args), (sy_call_t *)linux_setfsuid, AUE_SETFSUID }, /* 215 = linux_setfsuid */ - { AS(linux_setfsgid_args), (sy_call_t *)linux_setfsgid, AUE_SETFSGID }, /* 216 = linux_setfsgid */ - { AS(linux_pivot_root_args), (sy_call_t *)linux_pivot_root, AUE_PIVOT_ROOT }, /* 217 = linux_pivot_root */ - { AS(linux_mincore_args), (sy_call_t *)linux_mincore, AUE_MINCORE }, /* 218 = linux_mincore */ - { AS(madvise_args), (sy_call_t *)madvise, AUE_MADVISE }, /* 219 = madvise */ - { AS(linux_getdents64_args), (sy_call_t *)linux_getdents64, AUE_O_GETDENTS }, /* 220 = linux_getdents64 */ - { AS(linux_fcntl64_args), (sy_call_t *)linux_fcntl64, AUE_FCNTL }, /* 221 = linux_fcntl64 */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 222 = */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 223 = */ - { 0, (sy_call_t *)linux_getpid, AUE_NULL }, /* 224 = gettid */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 225 = linux_readahead */ - { 0, (sy_call_t *)linux_setxattr, AUE_NULL }, /* 226 = linux_setxattr */ - { 0, (sy_call_t *)linux_lsetxattr, AUE_NULL }, /* 227 = linux_lsetxattr */ - { 0, (sy_call_t *)linux_fsetxattr, AUE_NULL }, /* 228 = linux_fsetxattr */ - { 0, (sy_call_t *)linux_getxattr, AUE_NULL }, /* 229 = linux_getxattr */ - { 0, (sy_call_t *)linux_lgetxattr, AUE_NULL }, /* 230 = linux_lgetxattr */ - { 0, (sy_call_t *)linux_fgetxattr, AUE_NULL }, /* 231 = linux_fgetxattr */ - { 0, (sy_call_t *)linux_listxattr, AUE_NULL }, /* 232 = linux_listxattr */ - { 0, (sy_call_t *)linux_llistxattr, AUE_NULL }, /* 233 = linux_llistxattr */ - { 0, (sy_call_t *)linux_flistxattr, AUE_NULL }, /* 234 = linux_flistxattr */ - { 0, (sy_call_t *)linux_removexattr, AUE_NULL }, /* 235 = linux_removexattr */ - { 0, (sy_call_t *)linux_lremovexattr, AUE_NULL }, /* 236 = linux_lremovexattr */ - { 0, (sy_call_t *)linux_fremovexattr, AUE_NULL }, /* 237 = linux_fremovexattr */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 238 = linux_tkill */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 239 = linux_sendfile64 */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 240 = linux_futex */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 241 = linux_sched_setaffinity */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 242 = linux_sched_getaffinity */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 243 = linux_set_thread_area */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 244 = linux_get_thread_area */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 245 = linux_io_setup */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 246 = linux_io_destroy */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 247 = linux_io_getevents */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 248 = linux_io_submit */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 249 = linux_io_cancel */ - { 0, (sy_call_t *)linux_fadvise64, AUE_NULL }, /* 250 = linux_fadvise64 */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 251 = */ - { AS(sys_exit_args), (sy_call_t *)sys_exit, AUE_EXIT }, /* 252 = exit_group */ - { 0, (sy_call_t *)linux_lookup_dcookie, AUE_NULL }, /* 253 = linux_lookup_dcookie */ - { 0, (sy_call_t *)linux_epoll_create, AUE_NULL }, /* 254 = linux_epoll_create */ - { 0, (sy_call_t *)linux_epoll_ctl, AUE_NULL }, /* 255 = linux_epoll_ctl */ - { 0, (sy_call_t *)linux_epoll_wait, AUE_NULL }, /* 256 = linux_epoll_wait */ - { 0, (sy_call_t *)linux_remap_file_pages, AUE_NULL }, /* 257 = linux_remap_file_pages */ - { 0, (sy_call_t *)linux_set_tid_address, AUE_NULL }, /* 258 = linux_set_tid_address */ - { 0, (sy_call_t *)linux_timer_create, AUE_NULL }, /* 259 = linux_timer_create */ - { 0, (sy_call_t *)linux_timer_settime, AUE_NULL }, /* 260 = linux_timer_settime */ - { 0, (sy_call_t *)linux_timer_gettime, AUE_NULL }, /* 261 = linux_timer_gettime */ - { 0, (sy_call_t *)linux_timer_getoverrun, AUE_NULL }, /* 262 = linux_timer_getoverrun */ - { 0, (sy_call_t *)linux_timer_delete, AUE_NULL }, /* 263 = linux_timer_delete */ - { 0, (sy_call_t *)linux_clock_settime, AUE_CLOCK_SETTIME }, /* 264 = linux_clock_settime */ - { 0, (sy_call_t *)linux_clock_gettime, AUE_NULL }, /* 265 = linux_clock_gettime */ - { 0, (sy_call_t *)linux_clock_getres, AUE_NULL }, /* 266 = linux_clock_getres */ - { 0, (sy_call_t *)linux_clock_nanosleep, AUE_NULL }, /* 267 = linux_clock_nanosleep */ - { 0, (sy_call_t *)linux_statfs64, AUE_NULL }, /* 268 = linux_statfs64 */ - { 0, (sy_call_t *)linux_fstatfs64, AUE_NULL }, /* 269 = linux_fstatfs64 */ - { 0, (sy_call_t *)linux_tgkill, AUE_NULL }, /* 270 = linux_tgkill */ - { 0, (sy_call_t *)linux_utimes, AUE_NULL }, /* 271 = linux_utimes */ - { 0, (sy_call_t *)linux_fadvise64_64, AUE_NULL }, /* 272 = linux_fadvise64_64 */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 273 = */ - { 0, (sy_call_t *)linux_mbind, AUE_NULL }, /* 274 = linux_mbind */ - { 0, (sy_call_t *)linux_get_mempolicy, AUE_NULL }, /* 275 = linux_get_mempolicy */ - { 0, (sy_call_t *)linux_set_mempolicy, AUE_NULL }, /* 276 = linux_set_mempolicy */ - { 0, (sy_call_t *)linux_mq_open, AUE_NULL }, /* 277 = linux_mq_open */ - { 0, (sy_call_t *)linux_mq_unlink, AUE_NULL }, /* 278 = linux_mq_unlink */ - { 0, (sy_call_t *)linux_mq_timedsend, AUE_NULL }, /* 279 = linux_mq_timedsend */ - { 0, (sy_call_t *)linux_mq_timedreceive, AUE_NULL }, /* 280 = linux_mq_timedreceive */ - { 0, (sy_call_t *)linux_mq_notify, AUE_NULL }, /* 281 = linux_mq_notify */ - { 0, (sy_call_t *)linux_mq_getsetattr, AUE_NULL }, /* 282 = linux_mq_getsetattr */ - { 0, (sy_call_t *)linux_kexec_load, AUE_NULL }, /* 283 = linux_kexec_load */ - { 0, (sy_call_t *)linux_waitid, AUE_NULL }, /* 284 = linux_waitid */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 285 = */ - { 0, (sy_call_t *)linux_add_key, AUE_NULL }, /* 286 = linux_add_key */ - { 0, (sy_call_t *)linux_request_key, AUE_NULL }, /* 287 = linux_request_key */ - { 0, (sy_call_t *)linux_keyctl, AUE_NULL }, /* 288 = linux_keyctl */ - { 0, (sy_call_t *)linux_ioprio_set, AUE_NULL }, /* 289 = linux_ioprio_set */ - { 0, (sy_call_t *)linux_ioprio_get, AUE_NULL }, /* 290 = linux_ioprio_get */ - { 0, (sy_call_t *)linux_inotify_init, AUE_NULL }, /* 291 = linux_inotify_init */ - { 0, (sy_call_t *)linux_inotify_add_watch, AUE_NULL }, /* 292 = linux_inotify_add_watch */ - { 0, (sy_call_t *)linux_inotify_rm_watch, AUE_NULL }, /* 293 = linux_inotify_rm_watch */ - { 0, (sy_call_t *)linux_migrate_pages, AUE_NULL }, /* 294 = linux_migrate_pages */ - { 0, (sy_call_t *)linux_openat, AUE_NULL }, /* 295 = linux_openat */ - { 0, (sy_call_t *)linux_mkdirat, AUE_NULL }, /* 296 = linux_mkdirat */ - { 0, (sy_call_t *)linux_mknodat, AUE_NULL }, /* 297 = linux_mknodat */ - { 0, (sy_call_t *)linux_fchownat, AUE_NULL }, /* 298 = linux_fchownat */ - { 0, (sy_call_t *)linux_futimesat, AUE_NULL }, /* 299 = linux_futimesat */ - { 0, (sy_call_t *)linux_fstatat64, AUE_NULL }, /* 300 = linux_fstatat64 */ - { 0, (sy_call_t *)linux_unlinkat, AUE_NULL }, /* 301 = linux_unlinkat */ - { 0, (sy_call_t *)linux_renameat, AUE_NULL }, /* 302 = linux_renameat */ - { 0, (sy_call_t *)linux_linkat, AUE_NULL }, /* 303 = linux_linkat */ - { 0, (sy_call_t *)linux_symlinkat, AUE_NULL }, /* 304 = linux_symlinkat */ - { 0, (sy_call_t *)linux_readlinkat, AUE_NULL }, /* 305 = linux_readlinkat */ - { 0, (sy_call_t *)linux_fchmodat, AUE_NULL }, /* 306 = linux_fchmodat */ - { 0, (sy_call_t *)linux_faccessat, AUE_NULL }, /* 307 = linux_faccessat */ - { 0, (sy_call_t *)linux_pselect6, AUE_NULL }, /* 308 = linux_pselect6 */ - { 0, (sy_call_t *)linux_ppoll, AUE_NULL }, /* 309 = linux_ppoll */ - { 0, (sy_call_t *)linux_unshare, AUE_NULL }, /* 310 = linux_unshare */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 0 = setup */ + { AS(sys_exit_args), (sy_call_t *)sys_exit, AUE_EXIT, NULL, 0, 0 }, /* 1 = exit */ + { 0, (sy_call_t *)linux_fork, AUE_FORK, NULL, 0, 0 }, /* 2 = linux_fork */ + { AS(read_args), (sy_call_t *)read, AUE_NULL, NULL, 0, 0 }, /* 3 = read */ + { AS(write_args), (sy_call_t *)write, AUE_NULL, NULL, 0, 0 }, /* 4 = write */ + { AS(linux_open_args), (sy_call_t *)linux_open, AUE_OPEN_RWTC, NULL, 0, 0 }, /* 5 = linux_open */ + { AS(close_args), (sy_call_t *)close, AUE_CLOSE, NULL, 0, 0 }, /* 6 = close */ + { AS(linux_waitpid_args), (sy_call_t *)linux_waitpid, AUE_WAIT4, NULL, 0, 0 }, /* 7 = linux_waitpid */ + { AS(linux_creat_args), (sy_call_t *)linux_creat, AUE_O_CREAT, NULL, 0, 0 }, /* 8 = linux_creat */ + { AS(linux_link_args), (sy_call_t *)linux_link, AUE_LINK, NULL, 0, 0 }, /* 9 = linux_link */ + { AS(linux_unlink_args), (sy_call_t *)linux_unlink, AUE_UNLINK, NULL, 0, 0 }, /* 10 = linux_unlink */ + { AS(linux_execve_args), (sy_call_t *)linux_execve, AUE_EXECVE, NULL, 0, 0 }, /* 11 = linux_execve */ + { AS(linux_chdir_args), (sy_call_t *)linux_chdir, AUE_CHDIR, NULL, 0, 0 }, /* 12 = linux_chdir */ + { AS(linux_time_args), (sy_call_t *)linux_time, AUE_NULL, NULL, 0, 0 }, /* 13 = linux_time */ + { AS(linux_mknod_args), (sy_call_t *)linux_mknod, AUE_MKNOD, NULL, 0, 0 }, /* 14 = linux_mknod */ + { AS(linux_chmod_args), (sy_call_t *)linux_chmod, AUE_CHMOD, NULL, 0, 0 }, /* 15 = linux_chmod */ + { AS(linux_lchown16_args), (sy_call_t *)linux_lchown16, AUE_LCHOWN, NULL, 0, 0 }, /* 16 = linux_lchown16 */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 17 = break */ + { AS(linux_stat_args), (sy_call_t *)linux_stat, AUE_STAT, NULL, 0, 0 }, /* 18 = linux_stat */ + { AS(linux_lseek_args), (sy_call_t *)linux_lseek, AUE_LSEEK, NULL, 0, 0 }, /* 19 = linux_lseek */ + { 0, (sy_call_t *)linux_getpid, AUE_GETPID, NULL, 0, 0 }, /* 20 = linux_getpid */ + { AS(linux_mount_args), (sy_call_t *)linux_mount, AUE_MOUNT, NULL, 0, 0 }, /* 21 = linux_mount */ + { AS(linux_oldumount_args), (sy_call_t *)linux_oldumount, AUE_UMOUNT, NULL, 0, 0 }, /* 22 = linux_oldumount */ + { AS(linux_setuid16_args), (sy_call_t *)linux_setuid16, AUE_SETUID, NULL, 0, 0 }, /* 23 = linux_setuid16 */ + { 0, (sy_call_t *)linux_getuid16, AUE_GETUID, NULL, 0, 0 }, /* 24 = linux_getuid16 */ + { 0, (sy_call_t *)linux_stime, AUE_SETTIMEOFDAY, NULL, 0, 0 }, /* 25 = linux_stime */ + { AS(linux_ptrace_args), (sy_call_t *)linux_ptrace, AUE_PTRACE, NULL, 0, 0 }, /* 26 = linux_ptrace */ + { AS(linux_alarm_args), (sy_call_t *)linux_alarm, AUE_NULL, NULL, 0, 0 }, /* 27 = linux_alarm */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 28 = fstat */ + { 0, (sy_call_t *)linux_pause, AUE_NULL, NULL, 0, 0 }, /* 29 = linux_pause */ + { AS(linux_utime_args), (sy_call_t *)linux_utime, AUE_UTIME, NULL, 0, 0 }, /* 30 = linux_utime */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 31 = stty */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 32 = gtty */ + { AS(linux_access_args), (sy_call_t *)linux_access, AUE_ACCESS, NULL, 0, 0 }, /* 33 = linux_access */ + { AS(linux_nice_args), (sy_call_t *)linux_nice, AUE_NICE, NULL, 0, 0 }, /* 34 = linux_nice */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 35 = ftime */ + { 0, (sy_call_t *)sync, AUE_SYNC, NULL, 0, 0 }, /* 36 = sync */ + { AS(linux_kill_args), (sy_call_t *)linux_kill, AUE_KILL, NULL, 0, 0 }, /* 37 = linux_kill */ + { AS(linux_rename_args), (sy_call_t *)linux_rename, AUE_RENAME, NULL, 0, 0 }, /* 38 = linux_rename */ + { AS(linux_mkdir_args), (sy_call_t *)linux_mkdir, AUE_MKDIR, NULL, 0, 0 }, /* 39 = linux_mkdir */ + { AS(linux_rmdir_args), (sy_call_t *)linux_rmdir, AUE_RMDIR, NULL, 0, 0 }, /* 40 = linux_rmdir */ + { AS(dup_args), (sy_call_t *)dup, AUE_DUP, NULL, 0, 0 }, /* 41 = dup */ + { AS(linux_pipe_args), (sy_call_t *)linux_pipe, AUE_PIPE, NULL, 0, 0 }, /* 42 = linux_pipe */ + { AS(linux_times_args), (sy_call_t *)linux_times, AUE_NULL, NULL, 0, 0 }, /* 43 = linux_times */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 44 = prof */ + { AS(linux_brk_args), (sy_call_t *)linux_brk, AUE_NULL, NULL, 0, 0 }, /* 45 = linux_brk */ + { AS(linux_setgid16_args), (sy_call_t *)linux_setgid16, AUE_SETGID, NULL, 0, 0 }, /* 46 = linux_setgid16 */ + { 0, (sy_call_t *)linux_getgid16, AUE_GETGID, NULL, 0, 0 }, /* 47 = linux_getgid16 */ + { AS(linux_signal_args), (sy_call_t *)linux_signal, AUE_NULL, NULL, 0, 0 }, /* 48 = linux_signal */ + { 0, (sy_call_t *)linux_geteuid16, AUE_GETEUID, NULL, 0, 0 }, /* 49 = linux_geteuid16 */ + { 0, (sy_call_t *)linux_getegid16, AUE_GETEGID, NULL, 0, 0 }, /* 50 = linux_getegid16 */ + { AS(acct_args), (sy_call_t *)acct, AUE_ACCT, NULL, 0, 0 }, /* 51 = acct */ + { AS(linux_umount_args), (sy_call_t *)linux_umount, AUE_UMOUNT, NULL, 0, 0 }, /* 52 = linux_umount */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 53 = lock */ + { AS(linux_ioctl_args), (sy_call_t *)linux_ioctl, AUE_IOCTL, NULL, 0, 0 }, /* 54 = linux_ioctl */ + { AS(linux_fcntl_args), (sy_call_t *)linux_fcntl, AUE_FCNTL, NULL, 0, 0 }, /* 55 = linux_fcntl */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 56 = mpx */ + { AS(setpgid_args), (sy_call_t *)setpgid, AUE_SETPGRP, NULL, 0, 0 }, /* 57 = setpgid */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 58 = ulimit */ + { 0, (sy_call_t *)linux_olduname, AUE_NULL, NULL, 0, 0 }, /* 59 = linux_olduname */ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Aug 15 15:06:30 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0720316A4E0; Tue, 15 Aug 2006 15:06:30 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 D922A16A4DF for ; Tue, 15 Aug 2006 15:06:29 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id DBC5643D7C for ; Tue, 15 Aug 2006 15:05:52 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7FF5iog000476 for ; Tue, 15 Aug 2006 15:05:44 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7FF5iUx000456 for perforce@freebsd.org; Tue, 15 Aug 2006 15:05:44 GMT (envelope-from jhb@freebsd.org) Date: Tue, 15 Aug 2006 15:05:44 GMT Message-Id: <200608151505.k7FF5iUx000456@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Cc: Subject: PERFORCE change 104040 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Aug 2006 15:06:30 -0000 http://perforce.freebsd.org/chv.cgi?CH=104040 Change 104040 by jhb@jhb_mutex on 2006/08/15 15:04:53 IFC @104038. Affected files ... .. //depot/projects/smpng/sys/amd64/linux32/linux32_sysvec.c#19 integrate Differences ... ==== //depot/projects/smpng/sys/amd64/linux32/linux32_sysvec.c#19 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_sysvec.c,v 1.20 2006/08/15 12:54:29 netchild Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_sysvec.c,v 1.21 2006/08/15 14:58:15 netchild Exp $"); #include "opt_compat.h" #ifndef COMPAT_IA32 @@ -58,6 +58,7 @@ #include #include #include +#include #include #include @@ -74,6 +75,7 @@ #include #include +#include #include #include #include @@ -119,6 +121,15 @@ u_long stack, u_long ps_strings); static void linux32_fixlimits(struct proc *p); +extern LIST_HEAD(futex_list, futex) futex_list; +extern struct mtx futex_mtx; +extern struct sx emul_shared_lock; +extern struct sx emul_lock; + +static eventhandler_tag linux_exit_tag; +static eventhandler_tag linux_schedtail_tag; +static eventhandler_tag linux_exec_tag; + /* * Linux syscalls return negative errno's, we do positive and map them * Reference: @@ -1066,6 +1077,15 @@ linux_ioctl_register_handler(*lihp); SET_FOREACH(ldhp, linux_device_handler_set) linux_device_register_handler(*ldhp); + sx_init(&emul_shared_lock, "emuldata->shared lock"); + LIST_INIT(&futex_list); + mtx_init(&futex_mtx, "futex protection lock", NULL, MTX_DEF); + linux_exit_tag = EVENTHANDLER_REGISTER(process_exit, linux_proc_exit, + NULL, 1000); + linux_schedtail_tag = EVENTHANDLER_REGISTER(schedtail, linux_schedtail, + NULL, 1000); + linux_exec_tag = EVENTHANDLER_REGISTER(process_exec, linux_proc_exec, + NULL, 1000); if (bootverbose) printf("Linux ELF exec handler installed\n"); } else @@ -1087,6 +1107,12 @@ linux_ioctl_unregister_handler(*lihp); SET_FOREACH(ldhp, linux_device_handler_set) linux_device_unregister_handler(*ldhp); + sx_destroy(&emul_lock); + sx_destroy(&emul_shared_lock); + mtx_destroy(&futex_mtx); + EVENTHANDLER_DEREGISTER(process_exit, linux_exit_tag); + EVENTHANDLER_DEREGISTER(schedtail, linux_schedtail_tag); + EVENTHANDLER_DEREGISTER(process_exec, linux_exec_tag); if (bootverbose) printf("Linux ELF exec handler removed\n"); } else From owner-p4-projects@FreeBSD.ORG Tue Aug 15 15:18:02 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3C74A16A4E8; Tue, 15 Aug 2006 15:18:02 +0000 (UTC) X-Original-To: perforce@FreeBSD.org 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 1B2AB16A4E6 for ; Tue, 15 Aug 2006 15:18:02 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id EAE5443D58 for ; Tue, 15 Aug 2006 15:18:00 +0000 (GMT) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7FFI0NR002339 for ; Tue, 15 Aug 2006 15:18:00 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7FFI08c002336 for perforce@freebsd.org; Tue, 15 Aug 2006 15:18:00 GMT (envelope-from rdivacky@FreeBSD.org) Date: Tue, 15 Aug 2006 15:18:00 GMT Message-Id: <200608151518.k7FFI08c002336@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rdivacky@FreeBSD.org using -f From: Roman Divacky To: Perforce Change Reviews Cc: Subject: PERFORCE change 104041 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Aug 2006 15:18:02 -0000 http://perforce.freebsd.org/chv.cgi?CH=104041 Change 104041 by rdivacky@rdivacky_witten on 2006/08/15 15:17:23 Initialize mtx/sx/LIST in amd64. Affected files ... .. //depot/projects/soc2006/rdivacky_linuxolator/amd64/linux32/linux32_sysvec.c#7 edit Differences ... ==== //depot/projects/soc2006/rdivacky_linuxolator/amd64/linux32/linux32_sysvec.c#7 (text+ko) ==== @@ -58,6 +58,7 @@ #include #include #include +#include #include #include @@ -74,6 +75,7 @@ #include #include +#include #include #include #include @@ -121,6 +123,13 @@ u_long stack, u_long ps_strings); static void linux32_fixlimits(struct proc *p); +extern LIST_HEAD(futex_list, futex) futex_list; +extern struct mtx futex_mtx; + +static eventhandler_tag linux_exit_tag; +static eventhandler_tag linux_schedtail_tag; +static eventhandler_tag linux_exec_tag; + /* * Linux syscalls return negative errno's, we do positive and map them * Reference: @@ -1068,6 +1077,15 @@ linux_ioctl_register_handler(*lihp); SET_FOREACH(ldhp, linux_device_handler_set) linux_device_register_handler(*ldhp); + sx_init(&emul_shared_lock, "emuldata->shared lock"); + LIST_INIT(&futex_list); + mtx_init(&futex_mtx, "futex protection lock", NULL, MTX_DEF); + linux_exit_tag = EVENTHANDLER_REGISTER(process_exit, linux_proc_exit, + NULL, 1000); + linux_schedtail_tag = EVENTHANDLER_REGISTER(schedtail, linux_schedtail, + NULL, 1000); + linux_exec_tag = EVENTHANDLER_REGISTER(process_exec, linux_proc_exec, + NULL, 1000); if (bootverbose) printf("Linux ELF exec handler installed\n"); } else @@ -1089,6 +1107,12 @@ linux_ioctl_unregister_handler(*lihp); SET_FOREACH(ldhp, linux_device_handler_set) linux_device_unregister_handler(*ldhp); + sx_destroy(&emul_lock); + sx_destroy(&emul_shared_lock); + mtx_destroy(&futex_mtx); + EVENTHANDLER_DEREGISTER(process_exit, linux_exit_tag); + EVENTHANDLER_DEREGISTER(schedtail, linux_schedtail_tag); + EVENTHANDLER_DEREGISTER(process_exec, linux_exec_tag); if (bootverbose) printf("Linux ELF exec handler removed\n"); } else From owner-p4-projects@FreeBSD.ORG Tue Aug 15 15:18:28 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B1D1F16A508; Tue, 15 Aug 2006 15:18:28 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 8EFA816A4E5; Tue, 15 Aug 2006 15:18:28 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from server.baldwin.cx (66-23-211-162.clients.speedfactory.net [66.23.211.162]) by mx1.FreeBSD.org (Postfix) with ESMTP id AB81F43D70; Tue, 15 Aug 2006 15:18:27 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from localhost.corp.yahoo.com (john@localhost [127.0.0.1]) (authenticated bits=0) by server.baldwin.cx (8.13.6/8.13.6) with ESMTP id k7FFIN3V028132; Tue, 15 Aug 2006 11:18:26 -0400 (EDT) (envelope-from jhb@freebsd.org) From: John Baldwin To: Roman Divacky Date: Tue, 15 Aug 2006 11:18:23 -0400 User-Agent: KMail/1.9.1 References: <200608151331.k7FDVTlU092308@repoman.freebsd.org> In-Reply-To: <200608151331.k7FDVTlU092308@repoman.freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset="iso-8859-15" Content-Transfer-Encoding: 7bit Content-Disposition: inline Message-Id: <200608151118.23624.jhb@freebsd.org> X-Greylist: Sender succeeded SMTP AUTH authentication, not delayed by milter-greylist-2.0.2 (server.baldwin.cx [127.0.0.1]); Tue, 15 Aug 2006 11:18:26 -0400 (EDT) X-Virus-Scanned: ClamAV 0.88.3/1663/Tue Aug 15 09:08:37 2006 on server.baldwin.cx X-Virus-Status: Clean X-Spam-Status: No, score=-4.4 required=4.2 tests=ALL_TRUSTED,AWL,BAYES_00 autolearn=ham version=3.1.3 X-Spam-Checker-Version: SpamAssassin 3.1.3 (2006-06-01) on server.baldwin.cx Cc: Perforce Change Reviews , netchild@freebsd.org Subject: Re: PERFORCE change 104021 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Aug 2006 15:18:29 -0000 On Tuesday 15 August 2006 09:31, Roman Divacky wrote: > http://perforce.freebsd.org/chv.cgi?CH=104021 > > Change 104021 by rdivacky@rdivacky_witten on 2006/08/15 13:31:15 > > include opt_global.h for SMP definition. this is necessary for MPLOCKED definition. > > Affected files ... > > .. //depot/projects/soc2006/rdivacky_linuxolator/i386/i386/support.s#5 edit > > Differences ... > > ==== //depot/projects/soc2006/rdivacky_linuxolator/i386/i386/support.s#5 (text+ko) ==== > > @@ -37,6 +37,7 @@ > #include > #include > > +#include "opt_global.h" > #include "assym.s" > > #define IDXSHIFT 10 > You shouldn't need this as the Makefile for the kernel build adds '-i opt_global.h' to CFLAGS. -- John Baldwin From owner-p4-projects@FreeBSD.ORG Tue Aug 15 15:23:08 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 949B716A4DF; Tue, 15 Aug 2006 15:23:08 +0000 (UTC) X-Original-To: perforce@FreeBSD.org 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 6F42616A4DA for ; Tue, 15 Aug 2006 15:23:08 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3B6AD43D53 for ; Tue, 15 Aug 2006 15:23:08 +0000 (GMT) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7FFN8MK002739 for ; Tue, 15 Aug 2006 15:23:08 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7FFN7rN002736 for perforce@freebsd.org; Tue, 15 Aug 2006 15:23:07 GMT (envelope-from rdivacky@FreeBSD.org) Date: Tue, 15 Aug 2006 15:23:07 GMT Message-Id: <200608151523.k7FFN7rN002736@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rdivacky@FreeBSD.org using -f From: Roman Divacky To: Perforce Change Reviews Cc: Subject: PERFORCE change 104043 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Aug 2006 15:23:08 -0000 http://perforce.freebsd.org/chv.cgi?CH=104043 Change 104043 by rdivacky@rdivacky_witten on 2006/08/15 15:22:57 Grrrr. Do the locking/unlocking correctly this time. Affected files ... .. //depot/projects/soc2006/rdivacky_linuxolator/compat/linux/linux_futex.c#27 edit Differences ... ==== //depot/projects/soc2006/rdivacky_linuxolator/compat/linux/linux_futex.c#27 (text+ko) ==== @@ -339,9 +339,13 @@ return f; } } + if (locked == FUTEX_UNLOCKED) + FUTEX_UNLOCK; /* Not found, create it */ f = malloc(sizeof(*f), M_LINUX, M_WAITOK); + if (locked == FUTEX_UNLOCKED) + FUTEX_LOCK; f->f_uaddr = uaddr; f->f_refcount = 1; TAILQ_INIT(&f->f_waiting_proc); From owner-p4-projects@FreeBSD.ORG Tue Aug 15 15:30:25 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 04D8D16A4FF; Tue, 15 Aug 2006 15:30:25 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 D465116A4FD; Tue, 15 Aug 2006 15:30:24 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from server.baldwin.cx (66-23-211-162.clients.speedfactory.net [66.23.211.162]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4D8DD43D46; Tue, 15 Aug 2006 15:30:24 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from localhost.corp.yahoo.com (john@localhost [127.0.0.1]) (authenticated bits=0) by server.baldwin.cx (8.13.6/8.13.6) with ESMTP id k7FFUMxo028219; Tue, 15 Aug 2006 11:30:22 -0400 (EDT) (envelope-from jhb@freebsd.org) From: John Baldwin To: Roman Divacky Date: Tue, 15 Aug 2006 11:24:05 -0400 User-Agent: KMail/1.9.1 References: <200608151354.k7FDs1Vn093614@repoman.freebsd.org> In-Reply-To: <200608151354.k7FDs1Vn093614@repoman.freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset="iso-8859-15" Content-Transfer-Encoding: 7bit Content-Disposition: inline Message-Id: <200608151124.05472.jhb@freebsd.org> X-Greylist: Sender succeeded SMTP AUTH authentication, not delayed by milter-greylist-2.0.2 (server.baldwin.cx [127.0.0.1]); Tue, 15 Aug 2006 11:30:22 -0400 (EDT) X-Virus-Scanned: ClamAV 0.88.3/1663/Tue Aug 15 09:08:37 2006 on server.baldwin.cx X-Virus-Status: Clean X-Spam-Status: No, score=-4.4 required=4.2 tests=ALL_TRUSTED,AWL,BAYES_00 autolearn=ham version=3.1.3 X-Spam-Checker-Version: SpamAssassin 3.1.3 (2006-06-01) on server.baldwin.cx Cc: Perforce Change Reviews Subject: Re: PERFORCE change 104026 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Aug 2006 15:30:25 -0000 On Tuesday 15 August 2006 09:54, Roman Divacky wrote: > http://perforce.freebsd.org/chv.cgi?CH=104026 > > Change 104026 by rdivacky@rdivacky_witten on 2006/08/15 13:53:34 > > Lock the emuldata in a case we just created it. > > Pointed out by: jhb > > Affected files ... > > .. //depot/projects/soc2006/rdivacky_linuxolator/compat/linux/linux_emul.c#7 edit > > Differences ... > > ==== //depot/projects/soc2006/rdivacky_linuxolator/compat/linux/linux_emul.c#7 (text+ko) ==== > > @@ -100,6 +100,7 @@ > if (p == NULL) > panic("process not found in proc_init\n"); > p->p_emuldata = em; > + EMUL_LOCK(&emul_lock); > PROC_UNLOCK(p); > } else { > /* lookup the old one */ Actually, this won't be happy since emul_lock is an sx lock. Can't acquire an sx lock while holding a mutex since the sx lock might sleep. > @@ -129,6 +130,7 @@ > > > if (child != 0) { > + EMUL_UNLOCK(&emul_lock); > EMUL_SHARED_WLOCK(&emul_shared_lock); > LIST_INSERT_HEAD(&em->shared->threads, em, threads); > EMUL_SHARED_WUNLOCK(&emul_shared_lock); > -- John Baldwin From owner-p4-projects@FreeBSD.ORG Tue Aug 15 15:30:26 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4BB6C16A5F0; Tue, 15 Aug 2006 15:30:26 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 287AF16A524; Tue, 15 Aug 2006 15:30:26 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from server.baldwin.cx (66-23-211-162.clients.speedfactory.net [66.23.211.162]) by mx1.FreeBSD.org (Postfix) with ESMTP id 96A7B43D46; Tue, 15 Aug 2006 15:30:25 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from localhost.corp.yahoo.com (john@localhost [127.0.0.1]) (authenticated bits=0) by server.baldwin.cx (8.13.6/8.13.6) with ESMTP id k7FFUMxp028219; Tue, 15 Aug 2006 11:30:23 -0400 (EDT) (envelope-from jhb@freebsd.org) From: John Baldwin To: Roman Divacky Date: Tue, 15 Aug 2006 11:25:13 -0400 User-Agent: KMail/1.9.1 References: <200608151359.k7FDxAZU093877@repoman.freebsd.org> In-Reply-To: <200608151359.k7FDxAZU093877@repoman.freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset="iso-8859-15" Content-Transfer-Encoding: 7bit Content-Disposition: inline Message-Id: <200608151125.14251.jhb@freebsd.org> X-Greylist: Sender succeeded SMTP AUTH authentication, not delayed by milter-greylist-2.0.2 (server.baldwin.cx [127.0.0.1]); Tue, 15 Aug 2006 11:30:23 -0400 (EDT) X-Virus-Scanned: ClamAV 0.88.3/1663/Tue Aug 15 09:08:37 2006 on server.baldwin.cx X-Virus-Status: Clean X-Spam-Status: No, score=-4.4 required=4.2 tests=ALL_TRUSTED,AWL,BAYES_00 autolearn=ham version=3.1.3 X-Spam-Checker-Version: SpamAssassin 3.1.3 (2006-06-01) on server.baldwin.cx Cc: Perforce Change Reviews Subject: Re: PERFORCE change 104028 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Aug 2006 15:30:26 -0000 On Tuesday 15 August 2006 09:59, Roman Divacky wrote: > http://perforce.freebsd.org/chv.cgi?CH=104028 > > Change 104028 by rdivacky@rdivacky_witten on 2006/08/15 13:58:45 > > MALLOC -> malloc and FREE -> free > > Pointed out by: jhb > > Affected files ... > > .. //depot/projects/soc2006/rdivacky_linuxolator/compat/linux/linux_emul.c#9 edit > > Differences ... > > ==== //depot/projects/soc2006/rdivacky_linuxolator/compat/linux/linux_emul.c#9 (text+ko) ==== > > @@ -82,14 +82,14 @@ > > if (child != 0) { > /* non-exec call */ > - MALLOC(em, struct linux_emuldata *, sizeof *em, M_LINUX, M_WAITOK | M_ZERO); > + em = (struct linux_emuldata *) malloc(sizeof *em, M_LINUX, M_WAITOK | Note that in C you can drop the cast as C allows for void * objects to silently become a different pointer specifically so you don't have to use casts with malloc(). :) -- John Baldwin From owner-p4-projects@FreeBSD.ORG Tue Aug 15 15:30:28 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4337316A670; Tue, 15 Aug 2006 15:30:28 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 219A016A4EE; Tue, 15 Aug 2006 15:30:28 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from server.baldwin.cx (66-23-211-162.clients.speedfactory.net [66.23.211.162]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8E25A43D46; Tue, 15 Aug 2006 15:30:27 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from localhost.corp.yahoo.com (john@localhost [127.0.0.1]) (authenticated bits=0) by server.baldwin.cx (8.13.6/8.13.6) with ESMTP id k7FFUMxq028219; Tue, 15 Aug 2006 11:30:25 -0400 (EDT) (envelope-from jhb@freebsd.org) From: John Baldwin To: Roman Divacky Date: Tue, 15 Aug 2006 11:27:54 -0400 User-Agent: KMail/1.9.1 References: <200608151407.k7FE7Lj5095567@repoman.freebsd.org> In-Reply-To: <200608151407.k7FE7Lj5095567@repoman.freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset="iso-8859-15" Content-Transfer-Encoding: 7bit Content-Disposition: inline Message-Id: <200608151127.54902.jhb@freebsd.org> X-Greylist: Sender succeeded SMTP AUTH authentication, not delayed by milter-greylist-2.0.2 (server.baldwin.cx [127.0.0.1]); Tue, 15 Aug 2006 11:30:25 -0400 (EDT) X-Virus-Scanned: ClamAV 0.88.3/1663/Tue Aug 15 09:08:37 2006 on server.baldwin.cx X-Virus-Status: Clean X-Spam-Status: No, score=-4.4 required=4.2 tests=ALL_TRUSTED,AWL,BAYES_00 autolearn=ham version=3.1.3 X-Spam-Checker-Version: SpamAssassin 3.1.3 (2006-06-01) on server.baldwin.cx Cc: Perforce Change Reviews Subject: Re: PERFORCE change 104029 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Aug 2006 15:30:28 -0000 On Tuesday 15 August 2006 10:07, Roman Divacky wrote: > http://perforce.freebsd.org/chv.cgi?CH=104029 > > Change 104029 by rdivacky@rdivacky_witten on 2006/08/15 14:06:41 > > Protect against racing concurent creation in futex_get() > > Pointed out by: jhb > > Affected files ... > > .. //depot/projects/soc2006/rdivacky_linuxolator/compat/linux/linux_futex.c#24 edit > > Differences ... > > ==== //depot/projects/soc2006/rdivacky_linuxolator/compat/linux/linux_futex.c#24 (text+ko) ==== > > @@ -342,13 +342,13 @@ > if (locked == FUTEX_UNLOCKED) > FUTEX_UNLOCK; > > + if (locked == FUTEX_UNLOCKED) > + FUTEX_LOCK; Looks like you should collapse the lock/unlock. However, it's probably best to use mutexes instead of sx locks, and to instead do something like this: lock(); if (item in list) { item->ref++; unlock(); return (item); } unlock(); new_item = new_item(); lock(); if (item in list) { item->ref++; unlock(); free(new_item); return (item); } insert new_item new_item->ref++; unlock(); return (new_item) -- John Baldwin From owner-p4-projects@FreeBSD.ORG Tue Aug 15 15:30:33 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BD67516A71F; Tue, 15 Aug 2006 15:30:33 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 9B47816A71B; Tue, 15 Aug 2006 15:30:33 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from server.baldwin.cx (66-23-211-162.clients.speedfactory.net [66.23.211.162]) by mx1.FreeBSD.org (Postfix) with ESMTP id A728943D46; Tue, 15 Aug 2006 15:30:32 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from localhost.corp.yahoo.com (john@localhost [127.0.0.1]) (authenticated bits=0) by server.baldwin.cx (8.13.6/8.13.6) with ESMTP id k7FFUMxr028219; Tue, 15 Aug 2006 11:30:27 -0400 (EDT) (envelope-from jhb@freebsd.org) From: John Baldwin To: Roman Divacky Date: Tue, 15 Aug 2006 11:30:16 -0400 User-Agent: KMail/1.9.1 References: <200608151523.k7FFN7rN002736@repoman.freebsd.org> In-Reply-To: <200608151523.k7FFN7rN002736@repoman.freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset="iso-8859-15" Content-Transfer-Encoding: 7bit Content-Disposition: inline Message-Id: <200608151130.17341.jhb@freebsd.org> X-Greylist: Sender succeeded SMTP AUTH authentication, not delayed by milter-greylist-2.0.2 (server.baldwin.cx [127.0.0.1]); Tue, 15 Aug 2006 11:30:28 -0400 (EDT) X-Virus-Scanned: ClamAV 0.88.3/1663/Tue Aug 15 09:08:37 2006 on server.baldwin.cx X-Virus-Status: Clean X-Spam-Status: No, score=-4.4 required=4.2 tests=ALL_TRUSTED,AWL,BAYES_00 autolearn=ham version=3.1.3 X-Spam-Checker-Version: SpamAssassin 3.1.3 (2006-06-01) on server.baldwin.cx Cc: Perforce Change Reviews Subject: Re: PERFORCE change 104043 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Aug 2006 15:30:34 -0000 On Tuesday 15 August 2006 11:23, Roman Divacky wrote: > http://perforce.freebsd.org/chv.cgi?CH=104043 > > Change 104043 by rdivacky@rdivacky_witten on 2006/08/15 15:22:57 > > Grrrr. Do the locking/unlocking correctly this time. > > Affected files ... > > .. //depot/projects/soc2006/rdivacky_linuxolator/compat/linux/linux_futex.c#27 edit > > Differences ... > > ==== //depot/projects/soc2006/rdivacky_linuxolator/compat/linux/linux_futex.c#27 (text+ko) ==== > > @@ -339,9 +339,13 @@ > return f; > } > } > + if (locked == FUTEX_UNLOCKED) > + FUTEX_UNLOCK; > > /* Not found, create it */ > f = malloc(sizeof(*f), M_LINUX, M_WAITOK); > + if (locked == FUTEX_UNLOCKED) > + FUTEX_LOCK; > f->f_uaddr = uaddr; > f->f_refcount = 1; > TAILQ_INIT(&f->f_waiting_proc); This readds the race. :) See my other e-mail on what you have to do to handle it. -- John Baldwin From owner-p4-projects@FreeBSD.ORG Tue Aug 15 15:44:26 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0C29716A4E9; Tue, 15 Aug 2006 15:44:26 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 C267E16A4E5; Tue, 15 Aug 2006 15:44:25 +0000 (UTC) (envelope-from xdivac02@stud.fit.vutbr.cz) Received: from eva.fit.vutbr.cz (eva.fit.vutbr.cz [147.229.10.14]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8312A43D67; Tue, 15 Aug 2006 15:44:24 +0000 (GMT) (envelope-from xdivac02@stud.fit.vutbr.cz) Received: from eva.fit.vutbr.cz (localhost [127.0.0.1]) by eva.fit.vutbr.cz (envelope-from xdivac02@eva.fit.vutbr.cz) (8.13.7/8.13.7) with ESMTP id k7FFiJ4L060683 (version=TLSv1/SSLv3 cipher=EDH-RSA-DES-CBC3-SHA bits=168 verify=NO); Tue, 15 Aug 2006 17:44:19 +0200 (CEST) Received: (from xdivac02@localhost) by eva.fit.vutbr.cz (8.13.7/8.13.3/Submit) id k7FFiJZR060680; Tue, 15 Aug 2006 17:44:19 +0200 (CEST) Date: Tue, 15 Aug 2006 17:44:19 +0200 From: Divacky Roman To: John Baldwin Message-ID: <20060815154418.GA60482@stud.fit.vutbr.cz> References: <200608151523.k7FFN7rN002736@repoman.freebsd.org> <200608151130.17341.jhb@freebsd.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <200608151130.17341.jhb@freebsd.org> User-Agent: Mutt/1.4.2i X-Scanned-By: MIMEDefang 2.54 on 147.229.10.14 Cc: Roman Divacky , Perforce Change Reviews Subject: Re: PERFORCE change 104043 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Aug 2006 15:44:26 -0000 On Tue, Aug 15, 2006 at 11:30:16AM -0400, John Baldwin wrote: > On Tuesday 15 August 2006 11:23, Roman Divacky wrote: > > http://perforce.freebsd.org/chv.cgi?CH=104043 > > > > Change 104043 by rdivacky@rdivacky_witten on 2006/08/15 15:22:57 > > > > Grrrr. Do the locking/unlocking correctly this time. > > > > Affected files ... > > > > .. //depot/projects/soc2006/rdivacky_linuxolator/compat/linux/linux_futex.c#27 > edit > > > > Differences ... > > > > > ==== //depot/projects/soc2006/rdivacky_linuxolator/compat/linux/linux_futex.c#27 > (text+ko) ==== > > > > @@ -339,9 +339,13 @@ > > return f; > > } > > } > > + if (locked == FUTEX_UNLOCKED) > > + FUTEX_UNLOCK; > > > > /* Not found, create it */ > > f = malloc(sizeof(*f), M_LINUX, M_WAITOK); > > + if (locked == FUTEX_UNLOCKED) > > + FUTEX_LOCK; > > f->f_uaddr = uaddr; > > f->f_refcount = 1; > > TAILQ_INIT(&f->f_waiting_proc); > > This readds the race. :) See my other e-mail on what you have to do to handle > it. what is wrong with unprotected malloc? the memory at which f points at is nowhere referenced nowhere added etc. until protected by the lock. can you please explain me why is this wrong? I dont see any harm with two processes executing this code paralelly. thnx, roman From owner-p4-projects@FreeBSD.ORG Tue Aug 15 15:50:04 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9003F16A4EB; Tue, 15 Aug 2006 15:50:04 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 4463C16A4E6; Tue, 15 Aug 2006 15:50:04 +0000 (UTC) (envelope-from xdivac02@stud.fit.vutbr.cz) Received: from eva.fit.vutbr.cz (eva.fit.vutbr.cz [147.229.10.14]) by mx1.FreeBSD.org (Postfix) with ESMTP id 21CF643D72; Tue, 15 Aug 2006 15:50:01 +0000 (GMT) (envelope-from xdivac02@stud.fit.vutbr.cz) Received: from eva.fit.vutbr.cz (localhost [127.0.0.1]) by eva.fit.vutbr.cz (envelope-from xdivac02@eva.fit.vutbr.cz) (8.13.7/8.13.7) with ESMTP id k7FFnucc060804 (version=TLSv1/SSLv3 cipher=EDH-RSA-DES-CBC3-SHA bits=168 verify=NO); Tue, 15 Aug 2006 17:49:56 +0200 (CEST) Received: (from xdivac02@localhost) by eva.fit.vutbr.cz (8.13.7/8.13.3/Submit) id k7FFnuGB060803; Tue, 15 Aug 2006 17:49:56 +0200 (CEST) Date: Tue, 15 Aug 2006 17:49:56 +0200 From: Divacky Roman To: John Baldwin Message-ID: <20060815154956.GB60482@stud.fit.vutbr.cz> References: <200608151407.k7FE7Lj5095567@repoman.freebsd.org> <200608151127.54902.jhb@freebsd.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <200608151127.54902.jhb@freebsd.org> User-Agent: Mutt/1.4.2i X-Scanned-By: MIMEDefang 2.54 on 147.229.10.14 Cc: Roman Divacky , Perforce Change Reviews Subject: Re: PERFORCE change 104029 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Aug 2006 15:50:04 -0000 On Tue, Aug 15, 2006 at 11:27:54AM -0400, John Baldwin wrote: > On Tuesday 15 August 2006 10:07, Roman Divacky wrote: > > http://perforce.freebsd.org/chv.cgi?CH=104029 > > > > Change 104029 by rdivacky@rdivacky_witten on 2006/08/15 14:06:41 > > > > Protect against racing concurent creation in futex_get() > > > > Pointed out by: jhb > > > > Affected files ... > > > > .. //depot/projects/soc2006/rdivacky_linuxolator/compat/linux/linux_futex.c#24 > edit > > > > Differences ... > > > > > ==== //depot/projects/soc2006/rdivacky_linuxolator/compat/linux/linux_futex.c#24 > (text+ko) ==== > > > > @@ -342,13 +342,13 @@ > > if (locked == FUTEX_UNLOCKED) > > FUTEX_UNLOCK; > > > > + if (locked == FUTEX_UNLOCKED) > > + FUTEX_LOCK; > > Looks like you should collapse the lock/unlock. However, it's probably best > to use mutexes instead of sx locks, and to instead do something like this: the lock here IS a mutex... > lock(); > if (item in list) { > item->ref++; > unlock(); > return (item); > } > unlock(); > > new_item = new_item(); > > lock(); > if (item in list) { > item->ref++; > unlock(); > free(new_item); > return (item); > } > insert new_item > new_item->ref++; > unlock(); > return (new_item) isnt this exactly what I am doing in later revision? From owner-p4-projects@FreeBSD.ORG Tue Aug 15 16:02:36 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 68EE716A4E5; Tue, 15 Aug 2006 16:02:36 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 27B8316A4DA; Tue, 15 Aug 2006 16:02:36 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from server.baldwin.cx (66-23-211-162.clients.speedfactory.net [66.23.211.162]) by mx1.FreeBSD.org (Postfix) with ESMTP id 663EC43D68; Tue, 15 Aug 2006 16:02:35 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from localhost.corp.yahoo.com (john@localhost [127.0.0.1]) (authenticated bits=0) by server.baldwin.cx (8.13.6/8.13.6) with ESMTP id k7FG2Sbt028481; Tue, 15 Aug 2006 12:02:28 -0400 (EDT) (envelope-from jhb@freebsd.org) From: John Baldwin To: Divacky Roman Date: Tue, 15 Aug 2006 12:01:26 -0400 User-Agent: KMail/1.9.1 References: <200608151407.k7FE7Lj5095567@repoman.freebsd.org> <200608151127.54902.jhb@freebsd.org> <20060815154956.GB60482@stud.fit.vutbr.cz> In-Reply-To: <20060815154956.GB60482@stud.fit.vutbr.cz> MIME-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: 7bit Content-Disposition: inline Message-Id: <200608151201.27169.jhb@freebsd.org> X-Greylist: Sender succeeded SMTP AUTH authentication, not delayed by milter-greylist-2.0.2 (server.baldwin.cx [127.0.0.1]); Tue, 15 Aug 2006 12:02:28 -0400 (EDT) X-Virus-Scanned: ClamAV 0.88.3/1664/Tue Aug 15 10:28:31 2006 on server.baldwin.cx X-Virus-Status: Clean X-Spam-Status: No, score=-4.4 required=4.2 tests=ALL_TRUSTED,AWL,BAYES_00 autolearn=ham version=3.1.3 X-Spam-Checker-Version: SpamAssassin 3.1.3 (2006-06-01) on server.baldwin.cx Cc: Roman Divacky , Perforce Change Reviews Subject: Re: PERFORCE change 104029 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Aug 2006 16:02:36 -0000 On Tuesday 15 August 2006 11:49, Divacky Roman wrote: > On Tue, Aug 15, 2006 at 11:27:54AM -0400, John Baldwin wrote: > > On Tuesday 15 August 2006 10:07, Roman Divacky wrote: > > > http://perforce.freebsd.org/chv.cgi?CH=104029 > > > > > > Change 104029 by rdivacky@rdivacky_witten on 2006/08/15 14:06:41 > > > > > > Protect against racing concurent creation in futex_get() > > > > > > Pointed out by: jhb > > > > > > Affected files ... > > > > > > .. //depot/projects/soc2006/rdivacky_linuxolator/compat/linux/linux_futex.c#24 > > edit > > > > > > Differences ... > > > > > > > > ==== //depot/projects/soc2006/rdivacky_linuxolator/compat/linux/linux_futex.c#24 > > (text+ko) ==== > > > > > > @@ -342,13 +342,13 @@ > > > if (locked == FUTEX_UNLOCKED) > > > FUTEX_UNLOCK; > > > > > > + if (locked == FUTEX_UNLOCKED) > > > + FUTEX_LOCK; > > > > Looks like you should collapse the lock/unlock. However, it's probably best > > to use mutexes instead of sx locks, and to instead do something like this: > > the lock here IS a mutex... > > > lock(); > > if (item in list) { > > item->ref++; > > unlock(); > > return (item); > > } > > unlock(); > > > > new_item = new_item(); > > > > lock(); > > if (item in list) { > > item->ref++; > > unlock(); > > free(new_item); > > return (item); > > } > > insert new_item > > new_item->ref++; > > unlock(); > > return (new_item) > > isnt this exactly what I am doing in later revision? No, you aren't doing the second 'if (item in list)' test to see if some other thread already added a futex for that uaddr and if so free the one you just created and return the one in the list instead. -- John Baldwin From owner-p4-projects@FreeBSD.ORG Tue Aug 15 16:02:39 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BE04E16A4EB; Tue, 15 Aug 2006 16:02:39 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 83D9B16A4DA; Tue, 15 Aug 2006 16:02:39 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from server.baldwin.cx (66-23-211-162.clients.speedfactory.net [66.23.211.162]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8E07E43D73; Tue, 15 Aug 2006 16:02:38 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from localhost.corp.yahoo.com (john@localhost [127.0.0.1]) (authenticated bits=0) by server.baldwin.cx (8.13.6/8.13.6) with ESMTP id k7FG2Sbu028481; Tue, 15 Aug 2006 12:02:34 -0400 (EDT) (envelope-from jhb@freebsd.org) From: John Baldwin To: Divacky Roman Date: Tue, 15 Aug 2006 12:02:21 -0400 User-Agent: KMail/1.9.1 References: <200608151523.k7FFN7rN002736@repoman.freebsd.org> <200608151130.17341.jhb@freebsd.org> <20060815154418.GA60482@stud.fit.vutbr.cz> In-Reply-To: <20060815154418.GA60482@stud.fit.vutbr.cz> MIME-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: 7bit Content-Disposition: inline Message-Id: <200608151202.22197.jhb@freebsd.org> X-Greylist: Sender succeeded SMTP AUTH authentication, not delayed by milter-greylist-2.0.2 (server.baldwin.cx [127.0.0.1]); Tue, 15 Aug 2006 12:02:35 -0400 (EDT) X-Virus-Scanned: ClamAV 0.88.3/1664/Tue Aug 15 10:28:31 2006 on server.baldwin.cx X-Virus-Status: Clean X-Spam-Status: No, score=-4.4 required=4.2 tests=ALL_TRUSTED,AWL,BAYES_00 autolearn=ham version=3.1.3 X-Spam-Checker-Version: SpamAssassin 3.1.3 (2006-06-01) on server.baldwin.cx Cc: Roman Divacky , Perforce Change Reviews Subject: Re: PERFORCE change 104043 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Aug 2006 16:02:40 -0000 On Tuesday 15 August 2006 11:44, Divacky Roman wrote: > On Tue, Aug 15, 2006 at 11:30:16AM -0400, John Baldwin wrote: > > On Tuesday 15 August 2006 11:23, Roman Divacky wrote: > > > http://perforce.freebsd.org/chv.cgi?CH=104043 > > > > > > Change 104043 by rdivacky@rdivacky_witten on 2006/08/15 15:22:57 > > > > > > Grrrr. Do the locking/unlocking correctly this time. > > > > > > Affected files ... > > > > > > .. //depot/projects/soc2006/rdivacky_linuxolator/compat/linux/linux_futex.c#27 > > edit > > > > > > Differences ... > > > > > > > > ==== //depot/projects/soc2006/rdivacky_linuxolator/compat/linux/linux_futex.c#27 > > (text+ko) ==== > > > > > > @@ -339,9 +339,13 @@ > > > return f; > > > } > > > } > > > + if (locked == FUTEX_UNLOCKED) > > > + FUTEX_UNLOCK; > > > > > > /* Not found, create it */ > > > f = malloc(sizeof(*f), M_LINUX, M_WAITOK); > > > + if (locked == FUTEX_UNLOCKED) > > > + FUTEX_LOCK; > > > f->f_uaddr = uaddr; > > > f->f_refcount = 1; > > > TAILQ_INIT(&f->f_waiting_proc); > > > > This readds the race. :) See my other e-mail on what you have to do to handle > > it. > > what is wrong with unprotected malloc? the memory at which f points at is nowhere referenced > nowhere added etc. until protected by the lock. > > can you please explain me why is this wrong? I dont see any harm with two processes executing > this code paralelly. The problem is if both threads add a futex for the same address then you'll have two structures for the same futex. -- John Baldwin From owner-p4-projects@FreeBSD.ORG Tue Aug 15 16:23:31 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CCFC416A4E8; Tue, 15 Aug 2006 16:23:31 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 8EEA616A4DA for ; Tue, 15 Aug 2006 16:23:31 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 75D1243D7B for ; Tue, 15 Aug 2006 16:23:28 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7FGNSYv014284 for ; Tue, 15 Aug 2006 16:23:28 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7FGNPhp014281 for perforce@freebsd.org; Tue, 15 Aug 2006 16:23:25 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 15 Aug 2006 16:23:25 GMT Message-Id: <200608151623.k7FGNPhp014281@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 104050 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Aug 2006 16:23:32 -0000 http://perforce.freebsd.org/chv.cgi?CH=104050 Change 104050 by rwatson@rwatson_peppercorn on 2006/08/15 16:23:02 Fixes to 32-bit and 64-bit argument token output. Submitted by: Pawel Worach Affected files ... .. //depot/projects/trustedbsd/openbsm/HISTORY#21 edit .. //depot/projects/trustedbsd/openbsm/README#18 edit .. //depot/projects/trustedbsd/openbsm/libbsm/bsm_io.c#39 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/HISTORY#21 (text+ko) ==== @@ -10,6 +10,8 @@ - OpenBSM-specific events assigned numbers in the 43xxx range to avoid future collisions with Solaris. Darwin events renamed to AUE_DARWIN_foo, as they are now deprecated numberings. +- autoconf now detects clock_gettime(), which is not available on Darwin. +- praudit output fixes relating to arg32 and arg64 tokens. OpenBSM 1.0 alpha 7 @@ -188,4 +190,4 @@ to support reloading of kernel event table. - Allow comments in /etc/security configuration files. -$P4: //depot/projects/trustedbsd/openbsm/HISTORY#20 $ +$P4: //depot/projects/trustedbsd/openbsm/HISTORY#21 $ ==== //depot/projects/trustedbsd/openbsm/README#18 (text+ko) ==== @@ -74,6 +74,7 @@ Olivier Houchard Christian Peron Martin Fong + Pawel Worach In addition, Coverity, Inc.'s Prevent(tm) static analysis tool and Gimpel Software's FlexeLint tool were used to identify a number of bugs in the @@ -95,4 +96,4 @@ http://www.TrustedBSD.org/ -$P4: //depot/projects/trustedbsd/openbsm/README#17 $ +$P4: //depot/projects/trustedbsd/openbsm/README#18 $ ==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_io.c#39 (text+ko) ==== @@ -31,7 +31,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_io.c#38 $ + * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_io.c#39 $ */ #include @@ -820,7 +820,7 @@ print_delim(fp, del); print_1_byte(fp, tok->tt.arg32.no, "%u"); print_delim(fp, del); - print_4_bytes(fp, tok->tt.arg32.val, "%#x"); + print_4_bytes(fp, tok->tt.arg32.val, "0x%x"); print_delim(fp, del); print_string(fp, tok->tt.arg32.text, tok->tt.arg32.len); } @@ -859,7 +859,7 @@ print_delim(fp, del); print_1_byte(fp, tok->tt.arg64.no, "%u"); print_delim(fp, del); - print_8_bytes(fp, tok->tt.arg64.val, "%#llx"); + print_8_bytes(fp, tok->tt.arg64.val, "0x%llx"); print_delim(fp, del); print_string(fp, tok->tt.arg64.text, tok->tt.arg64.len); } From owner-p4-projects@FreeBSD.ORG Tue Aug 15 16:38:25 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0E5C416A4E0; Tue, 15 Aug 2006 16:38:25 +0000 (UTC) X-Original-To: perforce@FreeBSD.org 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 CB6CD16A4DF for ; Tue, 15 Aug 2006 16:38:24 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 723C643D9F for ; Tue, 15 Aug 2006 16:36:45 +0000 (GMT) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7FGajfP015067 for ; Tue, 15 Aug 2006 16:36:45 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7FGajUp015064 for perforce@freebsd.org; Tue, 15 Aug 2006 16:36:45 GMT (envelope-from rdivacky@FreeBSD.org) Date: Tue, 15 Aug 2006 16:36:45 GMT Message-Id: <200608151636.k7FGajUp015064@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rdivacky@FreeBSD.org using -f From: Roman Divacky To: Perforce Change Reviews Cc: Subject: PERFORCE change 104051 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Aug 2006 16:38:25 -0000 http://perforce.freebsd.org/chv.cgi?CH=104051 Change 104051 by rdivacky@rdivacky_witten on 2006/08/15 16:35:44 reverse the order of locking Affected files ... .. //depot/projects/soc2006/rdivacky_linuxolator/compat/linux/linux_emul.c#10 edit Differences ... ==== //depot/projects/soc2006/rdivacky_linuxolator/compat/linux/linux_emul.c#10 (text+ko) ==== @@ -100,8 +100,8 @@ if (p == NULL) panic("process not found in proc_init\n"); p->p_emuldata = em; + PROC_UNLOCK(p); EMUL_LOCK(&emul_lock); - PROC_UNLOCK(p); } else { /* lookup the old one */ em = em_find(td->td_proc, EMUL_UNLOCKED); From owner-p4-projects@FreeBSD.ORG Tue Aug 15 17:21:48 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7219C16A4E1; Tue, 15 Aug 2006 17:21:48 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 3286216A4DA for ; Tue, 15 Aug 2006 17:21:48 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B2F3F43D6D for ; Tue, 15 Aug 2006 17:21:47 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7FHLlhO033518 for ; Tue, 15 Aug 2006 17:21:47 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7FHLlmv033515 for perforce@freebsd.org; Tue, 15 Aug 2006 17:21:47 GMT (envelope-from millert@freebsd.org) Date: Tue, 15 Aug 2006 17:21:47 GMT Message-Id: <200608151721.k7FHLlmv033515@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 104061 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Aug 2006 17:21:48 -0000 http://perforce.freebsd.org/chv.cgi?CH=104061 Change 104061 by millert@millert_g4tower on 2006/08/15 17:20:46 Add missing break in switch() Affected files ... .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/sebsd_syscall.c#2 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/sebsd_syscall.c#2 (text+ko) ==== @@ -158,6 +158,7 @@ security_get_bool(str, &active, &pending); gb.val = active | (pending << 1); error = copyout(&gb, args, sizeof(gb)); + break; } case SEBSDCALL_SET_BOOL: From owner-p4-projects@FreeBSD.ORG Tue Aug 15 17:30:02 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C683C16A5BF; Tue, 15 Aug 2006 17:30:02 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 A1C3016A5BD for ; Tue, 15 Aug 2006 17:30:02 +0000 (UTC) (envelope-from bushman@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 91E0F43D6B for ; Tue, 15 Aug 2006 17:29:58 +0000 (GMT) (envelope-from bushman@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7FHTwZ8034019 for ; Tue, 15 Aug 2006 17:29:58 GMT (envelope-from bushman@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7FHTwqp034016 for perforce@freebsd.org; Tue, 15 Aug 2006 17:29:58 GMT (envelope-from bushman@freebsd.org) Date: Tue, 15 Aug 2006 17:29:58 GMT Message-Id: <200608151729.k7FHTwqp034016@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bushman@freebsd.org using -f From: Michael Bushkov To: Perforce Change Reviews Cc: Subject: PERFORCE change 104063 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Aug 2006 17:30:03 -0000 http://perforce.freebsd.org/chv.cgi?CH=104063 Change 104063 by bushman@bushman_nss_ldap_cached on 2006/08/15 17:29:28 nss_ldap's Makefile updated to properly support compilation options. Manual page was shamefully taken from PADL's nss_ldap. Would be rewritten ASAP. Affected files ... .. //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_ldap/Makefile#11 edit .. //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_ldap/ldapconn.h#11 edit .. //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_ldap/nss_ldap.5#1 add Differences ... ==== //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_ldap/Makefile#11 (text+ko) ==== @@ -9,14 +9,19 @@ SRCS= nss_ldap.c ldap_group.c ldap_passwd.c ldap_serv.c ldapconn.c\ ldapconf.c ldapschema.c ldapsearch.c ldaptls.c ldaputil.c -CFLAGS+=-I${.CURDIR}/../libnssutil -I/usr/local/include + CFLAGS+=-DINET6 -CFLAGS+=-g +LDADD+= -lldap + +.if ${MK_OPENSSL} != "no" +CFLAGS+= -DNSS_LDAP_START_TLS_ENABLED -DNSS_LDAP_SSL_ENABLED +.endif -LDADD+= -lnssutil -lldap -lsasl2 -LDFLAGS+= -L${.OBJDIR}/../libnssutil -L/usr/local/lib +CFLAGS+= ${OPENLDAP_CFLAGS} +LDFLAGS+= ${OPENLDAP_LDFLAGS} +LDADD+= ${OPENLDAP_LDADD} -INCS= -MAN= +INCS= +MAN= nss_ldap.5 .include ==== //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_ldap/ldapconn.h#11 (text+ko) ==== @@ -30,10 +30,10 @@ #define _LDAPCONN_H_ /* TODO: remove in release */ -#define NSS_LDAP_START_TLS_ENABLED -#define NSS_LDAP_SSL_ENABLED #define NSS_LDAP_SIMPLE_AUTH_ENABLED +#ifdef SASL #define NSS_LDAP_SASL_AUTH_ENABLED +#endif #define NSS_LDAP_MAX_ERR_DESC_SIZE 256 /* TODO: is this correct? */ From owner-p4-projects@FreeBSD.ORG Tue Aug 15 17:36:08 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C543416A4DF; Tue, 15 Aug 2006 17:36:08 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 88F4316A4DD for ; Tue, 15 Aug 2006 17:36:08 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E9A6543D6D for ; Tue, 15 Aug 2006 17:36:07 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7FHa7hp034506 for ; Tue, 15 Aug 2006 17:36:07 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7FHa7nh034503 for perforce@freebsd.org; Tue, 15 Aug 2006 17:36:07 GMT (envelope-from millert@freebsd.org) Date: Tue, 15 Aug 2006 17:36:07 GMT Message-Id: <200608151736.k7FHa7nh034503@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 104066 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Aug 2006 17:36:09 -0000 http://perforce.freebsd.org/chv.cgi?CH=104066 Change 104066 by millert@millert_g4tower on 2006/08/15 17:35:16 Add missing mac_get_peer() prototype. Affected files ... .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac.h#2 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac.h#2 (text+ko) ==== @@ -86,6 +86,7 @@ int mac_get_lcid(pid_t _lcid, mac_t _label); int mac_get_lctx(mac_t _label); int mac_get_link(const char *_path, mac_t _label); +int mac_get_peer(int fd, struct mac *label); int mac_get_pid(pid_t _pid, mac_t _label); int mac_get_proc(mac_t _label); int mac_is_present(const char *_policyname); From owner-p4-projects@FreeBSD.ORG Tue Aug 15 17:41:22 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0D94916A605; Tue, 15 Aug 2006 17:41:22 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 B10E616A5F3 for ; Tue, 15 Aug 2006 17:41:21 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 83E1443D8A for ; Tue, 15 Aug 2006 17:41:15 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7FHfFhH035208 for ; Tue, 15 Aug 2006 17:41:15 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7FHfFZB035205 for perforce@freebsd.org; Tue, 15 Aug 2006 17:41:15 GMT (envelope-from millert@freebsd.org) Date: Tue, 15 Aug 2006 17:41:15 GMT Message-Id: <200608151741.k7FHfFZB035205@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 104068 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Aug 2006 17:41:22 -0000 http://perforce.freebsd.org/chv.cgi?CH=104068 Change 104068 by millert@millert_macbook on 2006/08/15 17:40:36 Remove file mistakenly submitted in sedarwin8 import. Affected files ... .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/programs/loadpolicy/loadpolicy#2 delete Differences ... From owner-p4-projects@FreeBSD.ORG Tue Aug 15 17:42:18 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3A00B16A510; Tue, 15 Aug 2006 17:42:18 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 D41BB16A4DA for ; Tue, 15 Aug 2006 17:42:17 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4C9AA43D70 for ; Tue, 15 Aug 2006 17:42:17 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7FHgH15035306 for ; Tue, 15 Aug 2006 17:42:17 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7FHgGXX035303 for perforce@freebsd.org; Tue, 15 Aug 2006 17:42:16 GMT (envelope-from millert@freebsd.org) Date: Tue, 15 Aug 2006 17:42:16 GMT Message-Id: <200608151742.k7FHgGXX035303@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 104069 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Aug 2006 17:42:18 -0000 http://perforce.freebsd.org/chv.cgi?CH=104069 Change 104069 by millert@millert_macbook on 2006/08/15 17:41:25 load_policy belongs in /usr/sbin Affected files ... .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/programs/load_policy/Makefile#2 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/programs/load_policy/Makefile#2 (text+ko) ==== @@ -19,7 +19,7 @@ $(CC) $(CFLAGS) -o $@ $^ $(LDADD) install: - install -m 555 $(PROG) $(DESTDIR)/usr/bin + install -m 555 $(PROG) $(DESTDIR)/usr/sbin install -m 444 $(MAN8) $(DESTDIR)/usr/share/man/man8 clean: From owner-p4-projects@FreeBSD.ORG Tue Aug 15 17:44:21 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 594E016A4E0; Tue, 15 Aug 2006 17:44:21 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 306B016A4DA for ; Tue, 15 Aug 2006 17:44:21 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4EA7E43D6B for ; Tue, 15 Aug 2006 17:44:20 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7FHiKUu035486 for ; Tue, 15 Aug 2006 17:44:20 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7FHiJdB035483 for perforce@freebsd.org; Tue, 15 Aug 2006 17:44:19 GMT (envelope-from millert@freebsd.org) Date: Tue, 15 Aug 2006 17:44:19 GMT Message-Id: <200608151744.k7FHiJdB035483@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 104070 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Aug 2006 17:44:21 -0000 http://perforce.freebsd.org/chv.cgi?CH=104070 Change 104070 by millert@millert_macbook on 2006/08/15 17:44:17 Add security.mac.sebsd.compute.create, security.mac.sebsd.compute.member, and security.mac.sebsd.canon.context sysctls for use by libselinux. Affected files ... .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/sebsd_sysctl.c#2 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/sebsd_sysctl.c#2 (text+ko) ==== @@ -366,7 +366,169 @@ return (error); } +/* + * Sysctl handler for security.mac.sebsd.canon_context. + * Check sid validity, returns canonical name of context. + */ +static int +sysctl_canon_context SYSCTL_HANDLER_ARGS +{ + u_int32_t sid, len; + char *context, *canon; + int error; + +#ifdef SECURITY__COMPUTE_CHECK + error = cred_has_security(kauth_cred_get(), SECURITY__COMPUTE_CHECK); + if (error) + return (error); +#endif + + if (req->newlen < 2) + return (EINVAL); + if (req->newlen > 512) /* arbitrary */ + return (ENAMETOOLONG); + context = sebsd_malloc(req->newlen, M_SEBSD, M_WAITOK); + error = SYSCTL_IN(req, context, req->newlen); + if (error) + goto out; + if (context[req->newlen - 1] != '\0') { + error = EINVAL; + goto out; + } + /* + * XXX We need POLICY_RDLOCK here, but it's not exported! + */ + error = security_context_to_sid(context, strlen(context) + 1, &sid); + if (error) + goto out; + + error = security_sid_to_context(sid, &canon, &len); + if (error == 0) { + error = SYSCTL_OUT(req, canon, len); + sebsd_free(canon, M_SEBSD); + } +out: + sebsd_free(context, M_SEBSD); + return (error); +} + +/* + * Sysctl handler for security.mac.sebsd.compute_create. Create new sid + * given input "scontext\0tcontext\0", tclass. + */ +static int +sysctl_compute_create SYSCTL_HANDLER_ARGS +{ + u_int32_t sid, tsid, newsid, len; + u_int16_t tclass; + char *scontext, *tcontext, *newcontext; + int error; + + error = cred_has_security(kauth_cred_get(), SECURITY__COMPUTE_CREATE); + if (error) + return (error); + + if (req->newlen < 4 + sizeof(tclass)) + return (EINVAL); + if (req->newlen > 512) /* arbitrary */ + return (ENAMETOOLONG); + scontext = sebsd_malloc(req->newlen, M_SEBSD, 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(&tcontext[strlen(tcontext) + 1], &tclass, sizeof(tclass)); + /* + * XXX We need POLICY_RDLOCK here, but it's not exported! + */ + 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_transition_sid(sid, tsid, tclass, &newsid); + if (error) + goto out; + + error = security_sid_to_context(newsid, &newcontext, &len); + if (error == 0) { + error = SYSCTL_OUT(req, newcontext, len); + sebsd_free(newcontext, M_SEBSD); + } +out: + sebsd_free(scontext, M_SEBSD); + return (error); +} + +/* + * Sysctl handler for security.mac.sebsd.compute_member. Compute member sid + * given input "scontext\0tcontext\0", tclass. + */ static int +sysctl_compute_member SYSCTL_HANDLER_ARGS +{ + u_int32_t sid, tsid, newsid, len; + u_int16_t tclass; + char *scontext, *tcontext, *newcontext; + int error; + + error = cred_has_security(kauth_cred_get(), SECURITY__COMPUTE_MEMBER); + if (error) + return (error); + + if (req->newlen < 4 + sizeof(tclass)) + return (EINVAL); + if (req->newlen > 512) /* arbitrary */ + return (ENAMETOOLONG); + scontext = sebsd_malloc(req->newlen, M_SEBSD, 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(&tcontext[strlen(tcontext) + 1], &tclass, sizeof(tclass)); + /* + * XXX We need POLICY_RDLOCK here, but it's not exported! + */ + 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_member_sid(sid, tsid, tclass, &newsid); + if (error) + goto out; + + error = security_sid_to_context(newsid, &newcontext, &len); + if (error == 0) { + error = SYSCTL_OUT(req, newcontext, len); + sebsd_free(newcontext, M_SEBSD); + } +out: + sebsd_free(scontext, M_SEBSD); + return (error); +} + +static int sysctl_sebsd_policypath SYSCTL_HANDLER_ARGS { void *path; @@ -412,6 +574,15 @@ SYSCTL_PROC(_security_mac_sebsd, OID_AUTO, compute_av, CTLTYPE_STRING | CTLFLAG_RW | CTLFLAG_ANYBODY, NULL, 0, sysctl_compute_av, "A", "SEBSD access vector decision query"); +SYSCTL_PROC(_security_mac_sebsd, OID_AUTO, canon_context, CTLTYPE_STRING | + CTLFLAG_RW | CTLFLAG_ANYBODY, NULL, 0, sysctl_canon_context, "A", + "SEBSD context verification query"); +SYSCTL_PROC(_security_mac_sebsd, OID_AUTO, compute_create, CTLTYPE_STRING | + CTLFLAG_RW | CTLFLAG_ANYBODY, NULL, 0, sysctl_compute_create, "A", + "SEBSD context computation query"); +SYSCTL_PROC(_security_mac_sebsd, OID_AUTO, compute_member, CTLTYPE_STRING | + CTLFLAG_RW | CTLFLAG_ANYBODY, NULL, 0, sysctl_compute_member, "A", + "SEBSD context member query"); SYSCTL_PROC(_security_mac_sebsd, OID_AUTO, auditing, CTLTYPE_INT | CTLFLAG_RW, NULL, 0, sysctl_sebsd_auditing, "I", "SEBSD avc auditing"); SYSCTL_PROC(_security_mac_sebsd, OID_AUTO, enforcing, CTLTYPE_INT | @@ -436,6 +607,9 @@ sysctl_register_oid(&sysctl__security_mac_sebsd_file_sids); sysctl_register_oid(&sysctl__security_mac_sebsd_change_sid); sysctl_register_oid(&sysctl__security_mac_sebsd_compute_av); + sysctl_register_oid(&sysctl__security_mac_sebsd_compute_create); + sysctl_register_oid(&sysctl__security_mac_sebsd_compute_member); + sysctl_register_oid(&sysctl__security_mac_sebsd_canon_context); sysctl_register_oid(&sysctl__security_mac_sebsd_auditing); sysctl_register_oid(&sysctl__security_mac_sebsd_enforcing); sysctl_register_oid(&sysctl__security_mac_sebsd_policyvers); From owner-p4-projects@FreeBSD.ORG Tue Aug 15 17:51:53 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CE79216A647; Tue, 15 Aug 2006 17:51:52 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 82D3F16A641 for ; Tue, 15 Aug 2006 17:51:52 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2069043DE9 for ; Tue, 15 Aug 2006 17:51:35 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7FHpVvp036229 for ; Tue, 15 Aug 2006 17:51:31 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7FHpVqb036226 for perforce@freebsd.org; Tue, 15 Aug 2006 17:51:31 GMT (envelope-from millert@freebsd.org) Date: Tue, 15 Aug 2006 17:51:31 GMT Message-Id: <200608151751.k7FHpVqb036226@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 104073 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Aug 2006 17:51:53 -0000 http://perforce.freebsd.org/chv.cgi?CH=104073 Change 104073 by millert@millert_macbook on 2006/08/15 17:51:17 Fall back on fslabel if the label in the exattr is invalid. Affected files ... .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/sebsd.c#3 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/sebsd.c#3 (text+ko) ==== @@ -671,6 +671,7 @@ struct vnode *vp, struct label *vlabel) { struct vnode_security_struct *vsec; + struct mount_fs_security_struct *fssec; /* * TBD: static buffers aren't a good idea, and SELinux contexts * aren't restricted in length. @@ -684,32 +685,37 @@ error = mac_vnop_getxattr(vp, SEBSD_MAC_EXTATTR_NAME, context, sizeof(context), &context_len); - if (error == ENOATTR || error == ENOTSUP || error == EPERM) { - /* XXX - use fslabel sid instead */ - vsec->sid = SECINITSID_UNLABELED; /* Use the default label */ - - goto dosclass; - } if (error) { + if (error == ENOATTR || error == ENOTSUP || error == EPERM) + goto dosclass; printf("%s: ERROR %d returned by mac_vnop_getxattr()\n", __func__, error); - return (error); /* Fail closed */ + return (error); /* Fail closed */ } if (p == NULL || vp == NULL || vp->v_op == NULL || - vp->v_tag != VT_HFS || vp->v_data == NULL) + vp->v_tag != VT_HFS || vp->v_data == NULL) { + error = EINVAL; goto dosclass; + } error = security_context_to_sid(context, context_len, &vsec->sid); - if (error) { + if (error) printf("%s: ERROR mapping context to sid: %.*s\n", __func__, context_len, context); - return (0); /* TBD bad, bad, bad */ - } dosclass: vsec->sclass = vnode_type_to_security_class(vp->v_type); + /* Fall back to the filesystem label on error */ + if (error) { + if (fslabel) { + fssec = SLOT(fslabel); + vsec->sid = fssec->sid; + } else + vsec->sid = SECINITSID_UNLABELED; + } + return (0); } @@ -746,10 +752,13 @@ __func__, context_len, context); } - /* Fall back on the filesystem label on error */ + /* Fall back to the filesystem label on error */ if (error) { - fssec = SLOT(fslabel); - vsec->sid = fssec->sid; + if (fslabel) { + fssec = SLOT(fslabel); + vsec->sid = fssec->sid; + } else + vsec->sid = SECINITSID_UNLABELED; } } From owner-p4-projects@FreeBSD.ORG Tue Aug 15 17:51:53 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3D8EE16A6B1; Tue, 15 Aug 2006 17:51:53 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 022FC16A666 for ; Tue, 15 Aug 2006 17:51:52 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4A7CD43D69 for ; Tue, 15 Aug 2006 17:51:34 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7FHpUEb036223 for ; Tue, 15 Aug 2006 17:51:30 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7FHpUpN036220 for perforce@freebsd.org; Tue, 15 Aug 2006 17:51:30 GMT (envelope-from millert@freebsd.org) Date: Tue, 15 Aug 2006 17:51:30 GMT Message-Id: <200608151751.k7FHpUpN036220@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 104072 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Aug 2006 17:51:53 -0000 http://perforce.freebsd.org/chv.cgi?CH=104072 Change 104072 by millert@millert_macbook on 2006/08/15 17:50:45 Use __func__ in error message instead of hard-coding the wrong thing (cut & pasto). Also replace an instance of __FUNCTION__ (old gccism) with __func__ (c99). Affected files ... .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/sebsd.c#2 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/sebsd.c#2 (text+ko) ==== @@ -691,8 +691,8 @@ goto dosclass; } if (error) { - printf("sebsd_update_vnode_from_extattr: ERROR %d returned " - " by mac_vnop_getxattr()\n", error); + printf("%s: ERROR %d returned by mac_vnop_getxattr()\n", + __func__, error); return (error); /* Fail closed */ } @@ -702,8 +702,8 @@ error = security_context_to_sid(context, context_len, &vsec->sid); if (error) { - printf("sebsd_update_vnode_from_extattr: ERROR mapping " - "context to sid: %.*s\n", context_len, context); + printf("%s: ERROR mapping context to sid: %.*s\n", + __func__, context_len, context); return (0); /* TBD bad, bad, bad */ } @@ -1256,7 +1256,7 @@ break; default: printf("%s: security_fs_use(%s) returned unrecognized " - "behavior %d\n", __FUNCTION__, mp->mnt_vtable->vfc_name, + "behavior %d\n", __func__, mp->mnt_vtable->vfc_name, behavior); behavior = SECURITY_FS_USE_NONE; break; From owner-p4-projects@FreeBSD.ORG Tue Aug 15 17:53:13 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B190B16A4E0; Tue, 15 Aug 2006 17:53:13 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 8A3B416A4DD for ; Tue, 15 Aug 2006 17:53:13 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 020C343D62 for ; Tue, 15 Aug 2006 17:53:06 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7FHqWhe036340 for ; Tue, 15 Aug 2006 17:52:32 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7FHqWRC036337 for perforce@freebsd.org; Tue, 15 Aug 2006 17:52:32 GMT (envelope-from millert@freebsd.org) Date: Tue, 15 Aug 2006 17:52:32 GMT Message-Id: <200608151752.k7FHqWRC036337@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 104074 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Aug 2006 17:53:14 -0000 http://perforce.freebsd.org/chv.cgi?CH=104074 Change 104074 by millert@millert_macbook on 2006/08/15 17:52:14 Rename slot -> sebsd_slot sebsd_slot is initialized by MAC_POLICY_SET so update comment Affected files ... .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/sebsd.c#4 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/sebsd.c#4 (text+ko) ==== @@ -97,8 +97,8 @@ static zone_t vnode_security_zone; static zone_t ipc_security_zone; -static int slot = 1; /* TBD, dynamic */ -#define SLOT(l) ((void *)LABEL_TO_SLOT((l), slot).l_ptr) +static int sebsd_slot; /* set by framework */ +#define SLOT(l) ((void *)LABEL_TO_SLOT((l), sebsd_slot).l_ptr) extern struct mac_policy_conf sebsd_mac_policy_conf; @@ -3705,4 +3705,4 @@ {SEBSD_MAC_LABEL_NAMESPACES}; MAC_POLICY_SET(&sebsd_ops, sebsd, POLICY_DESC, labelnamespaces, - SEBSD_MAC_LABEL_NAME_COUNT, &slot, MPC_LOADTIME_FLAG_NOTLATE, 0); + SEBSD_MAC_LABEL_NAME_COUNT, &sebsd_slot, MPC_LOADTIME_FLAG_NOTLATE, 0); From owner-p4-projects@FreeBSD.ORG Tue Aug 15 17:54:38 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2091E16A4E6; Tue, 15 Aug 2006 17:54:38 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 D2B1A16A4DF for ; Tue, 15 Aug 2006 17:54:37 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 605CD43D8D for ; Tue, 15 Aug 2006 17:53:58 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7FHrYqZ036444 for ; Tue, 15 Aug 2006 17:53:34 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7FHrYEF036441 for perforce@freebsd.org; Tue, 15 Aug 2006 17:53:34 GMT (envelope-from millert@freebsd.org) Date: Tue, 15 Aug 2006 17:53:34 GMT Message-Id: <200608151753.k7FHrYEF036441@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 104075 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Aug 2006 17:54:38 -0000 http://perforce.freebsd.org/chv.cgi?CH=104075 Change 104075 by millert@millert_macbook on 2006/08/15 17:53:18 Add sebsd_prev label namespace for getting at the previous sid. Will be used by getprevcon() in libselinux. Affected files ... .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/sebsd.c#5 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/sebsd.h#2 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/sebsd.c#5 (text+ko) ==== @@ -2936,9 +2936,6 @@ u_int32_t context_len; int error; - if (strcmp("sebsd", element_name) != 0) - return (0); - error = security_sid_to_context(sid, &context, &context_len); if (error) return (error); @@ -2949,16 +2946,35 @@ return (error); } -#define SEBSD_EXTERNALIZE_LABEL(n1,n2) \ +#define SEBSD_EXTERNALIZE_LABEL(n1,n2) \ static int sebsd_externalize_##n1##_label(struct label *label, \ char *element_name, struct sbuf *sb) \ { \ struct n2##_security_struct *lsec; \ + \ + if (strcmp("sebsd", element_name) != 0) \ + return (0); \ + \ lsec = SLOT(label); \ return (sebsd_externalize_sid(lsec->sid, element_name, sb)); \ } -SEBSD_EXTERNALIZE_LABEL(cred,task) +static int sebsd_externalize_cred_label(struct label *label, + char *element_name, struct sbuf *sb) +{ + struct task_security_struct *tsec; + u_int32_t sid; + + tsec = SLOT(label); + if (strcmp("sebsd_prev", element_name) == 0) + sid = tsec->osid; + else if (strcmp("sebsd", element_name) == 0) + sid = tsec->sid; + else + return (0); + return (sebsd_externalize_sid(sid, element_name, sb)); +} + SEBSD_EXTERNALIZE_LABEL(network,network) SEBSD_EXTERNALIZE_LABEL(vnode,vnode) SEBSD_EXTERNALIZE_LABEL(mount_fs,mount_fs) ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/sebsd.h#2 (text+ko) ==== @@ -41,8 +41,8 @@ #define SEBSD_ID_STRING "sebsd" #define SEBSD_MAC_EXTATTR_NAME "sebsd" #define SEBSD_MAC_EXTATTR_NAMESPACE EXTATTR_NAMESPACE_SYSTEM -#define SEBSD_MAC_LABEL_NAMESPACES "sebsd" -#define SEBSD_MAC_LABEL_NAME_COUNT 1 +#define SEBSD_MAC_LABEL_NAMESPACES "sebsd","sebsd_prev" +#define SEBSD_MAC_LABEL_NAME_COUNT 2 extern int sebsd_find_data(const char *key, void **valp, size_t *sizep); #define sebsd_find_data(k, v, s) mac_find_module_data("sebsd", k, v, s) From owner-p4-projects@FreeBSD.ORG Tue Aug 15 18:00:44 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 81E1B16A4E1; Tue, 15 Aug 2006 18:00:44 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 58FEC16A4DA for ; Tue, 15 Aug 2006 18:00:44 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1610743D73 for ; Tue, 15 Aug 2006 18:00:44 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7FI0hse037079 for ; Tue, 15 Aug 2006 18:00:43 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7FI0hcr037071 for perforce@freebsd.org; Tue, 15 Aug 2006 18:00:43 GMT (envelope-from millert@freebsd.org) Date: Tue, 15 Aug 2006 18:00:43 GMT Message-Id: <200608151800.k7FI0hcr037071@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 104076 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Aug 2006 18:00:44 -0000 http://perforce.freebsd.org/chv.cgi?CH=104076 Change 104076 by millert@millert_macbook on 2006/08/15 18:00:26 Use BSD-stye bit types in sebsd headers. Add commented out fscreate and exec sids in task_security_struct for future use/reference. Affected files ... .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/sebsd_labels.h#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/sebsd_syscalls.h#2 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/sebsd_labels.h#2 (text+ko) ==== @@ -1,5 +1,6 @@ /*- * Copyright (c) 2002 Networks Associates Technology, Inc. + * Copyright (c) 2005-2006 SPARTA, Inc. * All rights reserved. * * This software was developed for the FreeBSD Project by NAI Labs, the @@ -7,6 +8,9 @@ * DARPA/SPAWAR contract N66001-01-C-8035 ("CBOSS"), as part of the DARPA * CHATS research program. * + * This software was enhanced by SPARTA ISSO under SPAWAR contract + * N66001-04-C-6019 ("SEFOS"). + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: @@ -42,32 +46,36 @@ #include struct task_security_struct { - u32 osid; - u32 sid; + u_int32_t osid; + u_int32_t sid; +#if 0 + u_int32_t exec_sid; /* exec SID */ + u_int32_t create_sid; /* fscreate SID */ +#endif }; struct file_security_struct { - u32 sid; + u_int32_t sid; }; struct vnode_security_struct { - u32 task_sid; - u32 sid; - u16 sclass; + u_int32_t task_sid; + u_int32_t sid; + u_int16_t sclass; }; struct network_security_struct { - u32 sid; - u32 task_sid; + u_int32_t sid; + u_int32_t task_sid; }; struct ipc_security_struct { - u32 sid; - u16 sclass; + u_int32_t sid; + u_int16_t sclass; }; struct mount_security_struct { - u32 sid; /* SID of file system */ + u_int32_t sid; /* SID of file system */ #ifndef __FreeBSD__ struct psidtab *psidtab; /* persistent SID mapping */ #endif @@ -82,6 +90,6 @@ }; struct mount_fs_security_struct { - u32 sid; /* default object SID of file system */ + u_int32_t sid; /* default object SID of file system */ }; #endif /* _SYS_SECURITY_SEBSD_LABELS_H */ ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/sebsd_syscalls.h#2 (text+ko) ==== @@ -1,3 +1,43 @@ +/*- + * Copyright (c) 2002 Networks Associates Technology, Inc. + * Copyright (c) 2005-2006 SPARTA, Inc. + * All rights reserved. + * + * This software was developed for the FreeBSD Project by NAI Labs, the + * Security Research Division of Network Associates, Inc. under + * DARPA/SPAWAR contract N66001-01-C-8035 ("CBOSS"), as part of the DARPA + * CHATS research program. + * + * This software was enhanced by SPARTA ISSO under SPAWAR contract + * N66001-04-C-6019 ("SEFOS"). + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. The names of the authors may not be used to endorse or promote + * products derived from this software without specific prior written + * permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (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$ + */ + #ifndef _SEBSD_SYSCALLS_H_ #define _SEBSD_SYSCALLS_H_ @@ -17,19 +57,19 @@ /* Structure definitions for compute_av call. */ struct security_query { - char *scontext; - char *tcontext; - u16 tclass; - u32 requested; + char *scontext; + char *tcontext; + u_int16_t tclass; + u_int32_t requested; }; struct security_response { - u32 allowed; - u32 decided; - u32 auditallow; - u32 auditdeny; - u32 notify; - u32 seqno; + u_int32_t allowed; + u_int32_t decided; + u_int32_t auditallow; + u_int32_t auditdeny; + u_int32_t notify; + u_int32_t seqno; }; struct sebsd_get_bools { From owner-p4-projects@FreeBSD.ORG Tue Aug 15 18:04:07 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E61E416A4DA; Tue, 15 Aug 2006 18:04:06 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 C164616A4E0 for ; Tue, 15 Aug 2006 18:04:06 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9512543DA2 for ; Tue, 15 Aug 2006 18:02:47 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7FI2lDo037324 for ; Tue, 15 Aug 2006 18:02:47 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7FI2lgf037321 for perforce@freebsd.org; Tue, 15 Aug 2006 18:02:47 GMT (envelope-from millert@freebsd.org) Date: Tue, 15 Aug 2006 18:02:47 GMT Message-Id: <200608151802.k7FI2lgf037321@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 104078 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Aug 2006 18:04:07 -0000 http://perforce.freebsd.org/chv.cgi?CH=104078 Change 104078 by millert@millert_macbook on 2006/08/15 18:01:55 If the message number is bad, only return failure if we are in enforcing mode. Fix some whitespace here too. Affected files ... .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/ss/mach_av.c#2 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/ss/mach_av.c#2 (text+ko) ==== @@ -129,8 +129,8 @@ sebsd_check_ipc_method1(int subj, int obj, int msgid) { struct msgid_classinfo *mcl; - u32 perms; - int cl; + u32 perms; + int cl; /* * Return allowed for messages in an unknown subsystem. @@ -142,10 +142,14 @@ return 0; cl = (msgid - mcl->baseid) / (8 * sizeof(u32)); - if (cl >= mcl->nclasses) - return (1); /* bad message, access denied */ + if (cl >= mcl->nclasses) { + /* bad message */ + if (selinux_enforcing) + return (EACCES); + else + return (0); + } - perms = (u32)1 << - (msgid - mcl->baseid - (cl * 8 * sizeof(u32))); + perms = (u32)1 << (msgid - mcl->baseid - (cl * 8 * sizeof(u32))); return avc_has_perm(subj, obj, mcl->classes[cl], perms, NULL); } From owner-p4-projects@FreeBSD.ORG Tue Aug 15 18:04:59 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 03B0416A4E5; Tue, 15 Aug 2006 18:04:58 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 6AEEC16A51A for ; Tue, 15 Aug 2006 18:04:58 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id BFC8F43D92 for ; Tue, 15 Aug 2006 18:04:50 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7FI4oN7038700 for ; Tue, 15 Aug 2006 18:04:50 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7FI4oZV038697 for perforce@freebsd.org; Tue, 15 Aug 2006 18:04:50 GMT (envelope-from millert@freebsd.org) Date: Tue, 15 Aug 2006 18:04:50 GMT Message-Id: <200608151804.k7FI4oZV038697@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 104079 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Aug 2006 18:04:59 -0000 http://perforce.freebsd.org/chv.cgi?CH=104079 Change 104079 by millert@millert_macbook on 2006/08/15 18:04:30 Simpler Makefile Affected files ... .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsecompat/Makefile#2 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsecompat/Makefile#2 (text+ko) ==== @@ -1,25 +1,25 @@ include ../../../Makeconfig -# Installation directories. -PREFIX = $(DESTDIR)/usr -LIBDIR = $(PREFIX)/lib -SHLIBDIR = $(DESTDIR)/lib +LIB = secompat +OBJS = getline.o strndup.o -LIBVERSION = 1 +CFLAGS += -Wall -SRCS= getline.c strndup.c +AR = ar cq +RANLIB = ranlib +INSTALL = install -LIBA=libsecompat.a -OBJS= $(patsubst %.c,%.o,$(SRCS)) +all: lib$(LIB).a -all: $(LIBA) +install: all + $(INSTALL) -o $(LIBOWN) -g $(LIBGRP) -m 0644 lib$(LIB).a \ + $(DESTDIR)/usr/lib + $(RANLIB) $(DESTDIR)/usr/lib/lib$(LIB).a -$(LIBA): $(OBJS) - libtool -static -c -o $@ $^ +clean: + rm -f lib$(LIB).a $(OBJS) -install: - -clean: - rm -f $(OBJS) $(LIBA) $(TARGET) - -.PHONY: install +lib$(LIB).a:: $(OBJS) + rm -f lib$(LIB).a + $(AR) lib$(LIB).a `lorder $(OBJS) | tsort -q` + $(RANLIB) lib$(LIB).a From owner-p4-projects@FreeBSD.ORG Tue Aug 15 18:05:54 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 908D616A4E5; Tue, 15 Aug 2006 18:05:54 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 5493B16A4DF for ; Tue, 15 Aug 2006 18:05:54 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9EB7E43D67 for ; Tue, 15 Aug 2006 18:05:53 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7FI5rtT038898 for ; Tue, 15 Aug 2006 18:05:53 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7FI5q5U038894 for perforce@freebsd.org; Tue, 15 Aug 2006 18:05:52 GMT (envelope-from jhb@freebsd.org) Date: Tue, 15 Aug 2006 18:05:52 GMT Message-Id: <200608151805.k7FI5q5U038894@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Cc: Subject: PERFORCE change 104080 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Aug 2006 18:05:54 -0000 http://perforce.freebsd.org/chv.cgi?CH=104080 Change 104080 by jhb@jhb_mutex on 2006/08/15 18:05:37 IFC @104071. Affected files ... .. //depot/projects/smpng/sys/amd64/linux32/linux32_proto.h#15 integrate .. //depot/projects/smpng/sys/amd64/linux32/linux32_syscall.h#15 integrate .. //depot/projects/smpng/sys/amd64/linux32/linux32_sysent.c#15 integrate .. //depot/projects/smpng/sys/amd64/linux32/syscalls.conf#2 integrate .. //depot/projects/smpng/sys/amd64/linux32/systrace_args.c#2 delete .. //depot/projects/smpng/sys/arm/arm/mem.c#4 integrate .. //depot/projects/smpng/sys/compat/freebsd32/freebsd32_proto.h#32 integrate .. //depot/projects/smpng/sys/compat/freebsd32/freebsd32_syscall.h#32 integrate .. //depot/projects/smpng/sys/compat/freebsd32/freebsd32_syscalls.c#32 integrate .. //depot/projects/smpng/sys/compat/freebsd32/freebsd32_sysent.c#32 integrate .. //depot/projects/smpng/sys/compat/freebsd32/syscalls.conf#3 integrate .. //depot/projects/smpng/sys/compat/linux/linux_misc.c#70 integrate .. //depot/projects/smpng/sys/compat/svr4/svr4_proto.h#18 integrate .. //depot/projects/smpng/sys/compat/svr4/svr4_syscall.h#17 integrate .. //depot/projects/smpng/sys/compat/svr4/svr4_syscallnames.c#17 integrate .. //depot/projects/smpng/sys/compat/svr4/svr4_sysent.c#17 integrate .. //depot/projects/smpng/sys/compat/svr4/syscalls.conf#3 integrate .. //depot/projects/smpng/sys/i386/i386/support.s#20 integrate .. //depot/projects/smpng/sys/i386/ibcs2/ibcs2_isc_syscall.h#9 integrate .. //depot/projects/smpng/sys/i386/ibcs2/ibcs2_isc_sysent.c#10 integrate .. //depot/projects/smpng/sys/i386/ibcs2/ibcs2_proto.h#17 integrate .. //depot/projects/smpng/sys/i386/ibcs2/ibcs2_syscall.h#16 integrate .. //depot/projects/smpng/sys/i386/ibcs2/ibcs2_sysent.c#18 integrate .. //depot/projects/smpng/sys/i386/ibcs2/ibcs2_xenix.h#12 integrate .. //depot/projects/smpng/sys/i386/ibcs2/ibcs2_xenix_syscall.h#11 integrate .. //depot/projects/smpng/sys/i386/ibcs2/ibcs2_xenix_sysent.c#12 integrate .. //depot/projects/smpng/sys/i386/ibcs2/syscalls.conf#3 integrate .. //depot/projects/smpng/sys/i386/ibcs2/syscalls.isc.conf#3 integrate .. //depot/projects/smpng/sys/i386/ibcs2/syscalls.xenix.conf#3 integrate .. //depot/projects/smpng/sys/i386/linux/linux_proto.h#34 integrate .. //depot/projects/smpng/sys/i386/linux/linux_syscall.h#33 integrate .. //depot/projects/smpng/sys/i386/linux/linux_sysent.c#34 integrate .. //depot/projects/smpng/sys/i386/linux/syscalls.conf#3 integrate .. //depot/projects/smpng/sys/i386/linux/systrace_args.c#2 delete .. //depot/projects/smpng/sys/i386/xbox/xbox.c#3 integrate .. //depot/projects/smpng/sys/kern/init_sysent.c#75 integrate .. //depot/projects/smpng/sys/kern/kern_lock.c#52 integrate .. //depot/projects/smpng/sys/kern/makesyscalls.sh#22 integrate .. //depot/projects/smpng/sys/kern/subr_turnstile.c#32 integrate .. //depot/projects/smpng/sys/kern/syscalls.c#75 integrate .. //depot/projects/smpng/sys/kern/syscalls.master#82 integrate .. //depot/projects/smpng/sys/kern/systrace_args.c#2 integrate .. //depot/projects/smpng/sys/net/if_vlan.c#53 integrate .. //depot/projects/smpng/sys/sys/syscall.h#74 integrate .. //depot/projects/smpng/sys/sys/syscall.mk#74 integrate .. //depot/projects/smpng/sys/sys/sysent.h#22 integrate .. //depot/projects/smpng/sys/sys/sysproto.h#78 integrate Differences ... ==== //depot/projects/smpng/sys/amd64/linux32/linux32_proto.h#15 (text+ko) ==== @@ -2,7 +2,7 @@ * System call prototypes. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/amd64/linux32/linux32_proto.h,v 1.20 2006/08/15 12:51:45 netchild Exp $ + * $FreeBSD: src/sys/amd64/linux32/linux32_proto.h,v 1.21 2006/08/15 17:36:58 jhb Exp $ * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.19 2006/08/15 12:28:14 netchild Exp */ @@ -14,6 +14,8 @@ #include #include +#include + struct proc; struct thread; @@ -1150,6 +1152,238 @@ #endif /* COMPAT_FREEBSD4 */ +#define LINUX_SYS_AUE_linux_fork AUE_FORK +#define LINUX_SYS_AUE_linux_open AUE_OPEN_RWTC +#define LINUX_SYS_AUE_linux_waitpid AUE_WAIT4 +#define LINUX_SYS_AUE_linux_creat AUE_O_CREAT +#define LINUX_SYS_AUE_linux_link AUE_LINK +#define LINUX_SYS_AUE_linux_unlink AUE_UNLINK +#define LINUX_SYS_AUE_linux_execve AUE_EXECVE +#define LINUX_SYS_AUE_linux_chdir AUE_CHDIR +#define LINUX_SYS_AUE_linux_time AUE_NULL +#define LINUX_SYS_AUE_linux_mknod AUE_MKNOD +#define LINUX_SYS_AUE_linux_chmod AUE_CHMOD +#define LINUX_SYS_AUE_linux_lchown16 AUE_LCHOWN +#define LINUX_SYS_AUE_linux_stat AUE_STAT +#define LINUX_SYS_AUE_linux_lseek AUE_LSEEK +#define LINUX_SYS_AUE_linux_getpid AUE_GETPID +#define LINUX_SYS_AUE_linux_mount AUE_MOUNT +#define LINUX_SYS_AUE_linux_oldumount AUE_UMOUNT +#define LINUX_SYS_AUE_linux_setuid16 AUE_SETUID +#define LINUX_SYS_AUE_linux_getuid16 AUE_GETUID +#define LINUX_SYS_AUE_linux_stime AUE_SETTIMEOFDAY +#define LINUX_SYS_AUE_linux_ptrace AUE_PTRACE +#define LINUX_SYS_AUE_linux_alarm AUE_NULL +#define LINUX_SYS_AUE_linux_pause AUE_NULL +#define LINUX_SYS_AUE_linux_utime AUE_UTIME +#define LINUX_SYS_AUE_linux_access AUE_ACCESS +#define LINUX_SYS_AUE_linux_nice AUE_NICE +#define LINUX_SYS_AUE_linux_kill AUE_KILL +#define LINUX_SYS_AUE_linux_rename AUE_RENAME +#define LINUX_SYS_AUE_linux_mkdir AUE_MKDIR +#define LINUX_SYS_AUE_linux_rmdir AUE_RMDIR +#define LINUX_SYS_AUE_linux_pipe AUE_PIPE +#define LINUX_SYS_AUE_linux_times AUE_NULL +#define LINUX_SYS_AUE_linux_brk AUE_NULL +#define LINUX_SYS_AUE_linux_setgid16 AUE_SETGID +#define LINUX_SYS_AUE_linux_getgid16 AUE_GETGID +#define LINUX_SYS_AUE_linux_signal AUE_NULL +#define LINUX_SYS_AUE_linux_geteuid16 AUE_GETEUID +#define LINUX_SYS_AUE_linux_getegid16 AUE_GETEGID +#define LINUX_SYS_AUE_linux_umount AUE_UMOUNT +#define LINUX_SYS_AUE_linux_ioctl AUE_IOCTL +#define LINUX_SYS_AUE_linux_fcntl AUE_FCNTL +#define LINUX_SYS_AUE_linux_olduname AUE_NULL +#define LINUX_SYS_AUE_linux_ustat AUE_NULL +#define LINUX_SYS_AUE_linux_getppid AUE_GETPPID +#define LINUX_SYS_AUE_linux_sigaction AUE_NULL +#define LINUX_SYS_AUE_linux_sgetmask AUE_NULL +#define LINUX_SYS_AUE_linux_ssetmask AUE_NULL +#define LINUX_SYS_AUE_linux_setreuid16 AUE_SETREUID +#define LINUX_SYS_AUE_linux_setregid16 AUE_SETREGID +#define LINUX_SYS_AUE_linux_sigsuspend AUE_NULL +#define LINUX_SYS_AUE_linux_sigpending AUE_NULL +#define LINUX_SYS_AUE_linux_sethostname AUE_SYSCTL +#define LINUX_SYS_AUE_linux_setrlimit AUE_SETRLIMIT +#define LINUX_SYS_AUE_linux_old_getrlimit AUE_GETRLIMIT +#define LINUX_SYS_AUE_linux_getrusage AUE_GETRUSAGE +#define LINUX_SYS_AUE_linux_gettimeofday AUE_NULL +#define LINUX_SYS_AUE_linux_settimeofday AUE_SETTIMEOFDAY +#define LINUX_SYS_AUE_linux_getgroups16 AUE_GETGROUPS +#define LINUX_SYS_AUE_linux_setgroups16 AUE_SETGROUPS +#define LINUX_SYS_AUE_linux_old_select AUE_SELECT +#define LINUX_SYS_AUE_linux_symlink AUE_SYMLINK +#define LINUX_SYS_AUE_linux_lstat AUE_LSTAT +#define LINUX_SYS_AUE_linux_readlink AUE_READLINK +#define LINUX_SYS_AUE_linux_reboot AUE_REBOOT +#define LINUX_SYS_AUE_linux_readdir AUE_O_GETDENTS +#define LINUX_SYS_AUE_linux_mmap AUE_MMAP +#define LINUX_SYS_AUE_linux_truncate AUE_TRUNCATE +#define LINUX_SYS_AUE_linux_ftruncate AUE_FTRUNCATE +#define LINUX_SYS_AUE_linux_getpriority AUE_GETPRIORITY +#define LINUX_SYS_AUE_linux_statfs AUE_STATFS +#define LINUX_SYS_AUE_linux_fstatfs AUE_FSTATFS +#define LINUX_SYS_AUE_linux_socketcall AUE_NULL +#define LINUX_SYS_AUE_linux_syslog AUE_NULL +#define LINUX_SYS_AUE_linux_setitimer AUE_SETITIMER +#define LINUX_SYS_AUE_linux_getitimer AUE_GETITIMER +#define LINUX_SYS_AUE_linux_newstat AUE_STAT +#define LINUX_SYS_AUE_linux_newlstat AUE_LSTAT +#define LINUX_SYS_AUE_linux_newfstat AUE_FSTAT +#define LINUX_SYS_AUE_linux_uname AUE_NULL +#define LINUX_SYS_AUE_linux_vhangup AUE_NULL +#define LINUX_SYS_AUE_linux_wait4 AUE_WAIT4 +#define LINUX_SYS_AUE_linux_swapoff AUE_SWAPOFF +#define LINUX_SYS_AUE_linux_sysinfo AUE_NULL +#define LINUX_SYS_AUE_linux_ipc AUE_NULL +#define LINUX_SYS_AUE_linux_sigreturn AUE_SIGRETURN +#define LINUX_SYS_AUE_linux_clone AUE_RFORK +#define LINUX_SYS_AUE_linux_newuname AUE_NULL +#define LINUX_SYS_AUE_linux_adjtimex AUE_ADJTIME +#define LINUX_SYS_AUE_linux_mprotect AUE_MPROTECT +#define LINUX_SYS_AUE_linux_sigprocmask AUE_SIGPROCMASK +#define LINUX_SYS_AUE_linux_create_module AUE_NULL +#define LINUX_SYS_AUE_linux_init_module AUE_NULL +#define LINUX_SYS_AUE_linux_delete_module AUE_NULL +#define LINUX_SYS_AUE_linux_get_kernel_syms AUE_NULL +#define LINUX_SYS_AUE_linux_quotactl AUE_QUOTACTL +#define LINUX_SYS_AUE_linux_bdflush AUE_BDFLUSH +#define LINUX_SYS_AUE_linux_sysfs AUE_NULL +#define LINUX_SYS_AUE_linux_personality AUE_PERSONALITY +#define LINUX_SYS_AUE_linux_setfsuid16 AUE_SETFSUID +#define LINUX_SYS_AUE_linux_setfsgid16 AUE_SETFSGID +#define LINUX_SYS_AUE_linux_llseek AUE_LSEEK +#define LINUX_SYS_AUE_linux_getdents AUE_O_GETDENTS +#define LINUX_SYS_AUE_linux_select AUE_SELECT +#define LINUX_SYS_AUE_linux_msync AUE_MSYNC +#define LINUX_SYS_AUE_linux_readv AUE_READV +#define LINUX_SYS_AUE_linux_writev AUE_WRITEV +#define LINUX_SYS_AUE_linux_getsid AUE_GETSID +#define LINUX_SYS_AUE_linux_fdatasync AUE_NULL +#define LINUX_SYS_AUE_linux_sysctl AUE_SYSCTL +#define LINUX_SYS_AUE_linux_sched_setscheduler AUE_SCHED_SETSCHEDULER +#define LINUX_SYS_AUE_linux_sched_getscheduler AUE_SCHED_GETSCHEDULER +#define LINUX_SYS_AUE_linux_sched_get_priority_max AUE_SCHED_GET_PRIORITY_MAX +#define LINUX_SYS_AUE_linux_sched_get_priority_min AUE_SCHED_GET_PRIORITY_MIN +#define LINUX_SYS_AUE_linux_sched_rr_get_interval AUE_SCHED_RR_GET_INTERVAL +#define LINUX_SYS_AUE_linux_nanosleep AUE_NULL +#define LINUX_SYS_AUE_linux_mremap AUE_NULL +#define LINUX_SYS_AUE_linux_setresuid16 AUE_SETRESUID +#define LINUX_SYS_AUE_linux_getresuid16 AUE_GETRESUID +#define LINUX_SYS_AUE_linux_query_module AUE_NULL +#define LINUX_SYS_AUE_linux_nfsservctl AUE_NULL +#define LINUX_SYS_AUE_linux_setresgid16 AUE_SETRESGID +#define LINUX_SYS_AUE_linux_getresgid16 AUE_GETRESGID +#define LINUX_SYS_AUE_linux_prctl AUE_PRCTL +#define LINUX_SYS_AUE_linux_rt_sigreturn AUE_NULL +#define LINUX_SYS_AUE_linux_rt_sigaction AUE_NULL +#define LINUX_SYS_AUE_linux_rt_sigprocmask AUE_NULL +#define LINUX_SYS_AUE_linux_rt_sigpending AUE_NULL +#define LINUX_SYS_AUE_linux_rt_sigtimedwait AUE_NULL +#define LINUX_SYS_AUE_linux_rt_sigqueueinfo AUE_NULL +#define LINUX_SYS_AUE_linux_rt_sigsuspend AUE_NULL +#define LINUX_SYS_AUE_linux_pread AUE_PREAD +#define LINUX_SYS_AUE_linux_pwrite AUE_PWRITE +#define LINUX_SYS_AUE_linux_chown16 AUE_CHOWN +#define LINUX_SYS_AUE_linux_getcwd AUE_GETCWD +#define LINUX_SYS_AUE_linux_capget AUE_CAPGET +#define LINUX_SYS_AUE_linux_capset AUE_CAPSET +#define LINUX_SYS_AUE_linux_sigaltstack AUE_NULL +#define LINUX_SYS_AUE_linux_sendfile AUE_SENDFILE +#define LINUX_SYS_AUE_linux_vfork AUE_VFORK +#define LINUX_SYS_AUE_linux_getrlimit AUE_GETRLIMIT +#define LINUX_SYS_AUE_linux_mmap2 AUE_MMAP +#define LINUX_SYS_AUE_linux_truncate64 AUE_TRUNCATE +#define LINUX_SYS_AUE_linux_ftruncate64 AUE_FTRUNCATE +#define LINUX_SYS_AUE_linux_stat64 AUE_STAT +#define LINUX_SYS_AUE_linux_lstat64 AUE_LSTAT +#define LINUX_SYS_AUE_linux_fstat64 AUE_FSTAT +#define LINUX_SYS_AUE_linux_lchown AUE_LCHOWN +#define LINUX_SYS_AUE_linux_getuid AUE_GETUID +#define LINUX_SYS_AUE_linux_getgid AUE_GETGID +#define LINUX_SYS_AUE_linux_getgroups AUE_GETGROUPS +#define LINUX_SYS_AUE_linux_setgroups AUE_SETGROUPS +#define LINUX_SYS_AUE_linux_chown AUE_CHOWN +#define LINUX_SYS_AUE_linux_setfsuid AUE_SETFSUID +#define LINUX_SYS_AUE_linux_setfsgid AUE_SETFSGID +#define LINUX_SYS_AUE_linux_pivot_root AUE_PIVOT_ROOT +#define LINUX_SYS_AUE_linux_mincore AUE_MINCORE +#define LINUX_SYS_AUE_linux_getdents64 AUE_O_GETDENTS +#define LINUX_SYS_AUE_linux_fcntl64 AUE_FCNTL +#define LINUX_SYS_AUE_linux_gettid AUE_NULL +#define LINUX_SYS_AUE_linux_setxattr AUE_NULL +#define LINUX_SYS_AUE_linux_lsetxattr AUE_NULL +#define LINUX_SYS_AUE_linux_fsetxattr AUE_NULL +#define LINUX_SYS_AUE_linux_getxattr AUE_NULL +#define LINUX_SYS_AUE_linux_lgetxattr AUE_NULL +#define LINUX_SYS_AUE_linux_fgetxattr AUE_NULL +#define LINUX_SYS_AUE_linux_listxattr AUE_NULL +#define LINUX_SYS_AUE_linux_llistxattr AUE_NULL +#define LINUX_SYS_AUE_linux_flistxattr AUE_NULL +#define LINUX_SYS_AUE_linux_removexattr AUE_NULL +#define LINUX_SYS_AUE_linux_lremovexattr AUE_NULL +#define LINUX_SYS_AUE_linux_fremovexattr AUE_NULL +#define LINUX_SYS_AUE_linux_tkill AUE_NULL +#define LINUX_SYS_AUE_linux_sys_futex AUE_NULL +#define LINUX_SYS_AUE_linux_fadvise64 AUE_NULL +#define LINUX_SYS_AUE_linux_exit_group AUE_EXIT +#define LINUX_SYS_AUE_linux_lookup_dcookie AUE_NULL +#define LINUX_SYS_AUE_linux_epoll_create AUE_NULL +#define LINUX_SYS_AUE_linux_epoll_ctl AUE_NULL +#define LINUX_SYS_AUE_linux_epoll_wait AUE_NULL +#define LINUX_SYS_AUE_linux_remap_file_pages AUE_NULL +#define LINUX_SYS_AUE_linux_set_tid_address AUE_NULL +#define LINUX_SYS_AUE_linux_timer_create AUE_NULL +#define LINUX_SYS_AUE_linux_timer_settime AUE_NULL +#define LINUX_SYS_AUE_linux_timer_gettime AUE_NULL +#define LINUX_SYS_AUE_linux_timer_getoverrun AUE_NULL +#define LINUX_SYS_AUE_linux_timer_delete AUE_NULL +#define LINUX_SYS_AUE_linux_clock_settime AUE_CLOCK_SETTIME +#define LINUX_SYS_AUE_linux_clock_gettime AUE_NULL +#define LINUX_SYS_AUE_linux_clock_getres AUE_NULL +#define LINUX_SYS_AUE_linux_clock_nanosleep AUE_NULL +#define LINUX_SYS_AUE_linux_statfs64 AUE_NULL +#define LINUX_SYS_AUE_linux_fstatfs64 AUE_NULL +#define LINUX_SYS_AUE_linux_tgkill AUE_NULL +#define LINUX_SYS_AUE_linux_utimes AUE_NULL +#define LINUX_SYS_AUE_linux_fadvise64_64 AUE_NULL +#define LINUX_SYS_AUE_linux_mbind AUE_NULL +#define LINUX_SYS_AUE_linux_get_mempolicy AUE_NULL +#define LINUX_SYS_AUE_linux_set_mempolicy AUE_NULL +#define LINUX_SYS_AUE_linux_mq_open AUE_NULL +#define LINUX_SYS_AUE_linux_mq_unlink AUE_NULL +#define LINUX_SYS_AUE_linux_mq_timedsend AUE_NULL +#define LINUX_SYS_AUE_linux_mq_timedreceive AUE_NULL +#define LINUX_SYS_AUE_linux_mq_notify AUE_NULL +#define LINUX_SYS_AUE_linux_mq_getsetattr AUE_NULL +#define LINUX_SYS_AUE_linux_kexec_load AUE_NULL +#define LINUX_SYS_AUE_linux_waitid AUE_NULL +#define LINUX_SYS_AUE_linux_add_key AUE_NULL +#define LINUX_SYS_AUE_linux_request_key AUE_NULL +#define LINUX_SYS_AUE_linux_keyctl AUE_NULL +#define LINUX_SYS_AUE_linux_ioprio_set AUE_NULL +#define LINUX_SYS_AUE_linux_ioprio_get AUE_NULL +#define LINUX_SYS_AUE_linux_inotify_init AUE_NULL +#define LINUX_SYS_AUE_linux_inotify_add_watch AUE_NULL +#define LINUX_SYS_AUE_linux_inotify_rm_watch AUE_NULL +#define LINUX_SYS_AUE_linux_migrate_pages AUE_NULL +#define LINUX_SYS_AUE_linux_openat AUE_NULL +#define LINUX_SYS_AUE_linux_mkdirat AUE_NULL +#define LINUX_SYS_AUE_linux_mknodat AUE_NULL +#define LINUX_SYS_AUE_linux_fchownat AUE_NULL +#define LINUX_SYS_AUE_linux_futimesat AUE_NULL +#define LINUX_SYS_AUE_linux_fstatat64 AUE_NULL +#define LINUX_SYS_AUE_linux_unlinkat AUE_NULL +#define LINUX_SYS_AUE_linux_renameat AUE_NULL +#define LINUX_SYS_AUE_linux_linkat AUE_NULL +#define LINUX_SYS_AUE_linux_symlinkat AUE_NULL +#define LINUX_SYS_AUE_linux_readlinkat AUE_NULL +#define LINUX_SYS_AUE_linux_fchmodat AUE_NULL +#define LINUX_SYS_AUE_linux_faccessat AUE_NULL +#define LINUX_SYS_AUE_linux_pselect6 AUE_NULL +#define LINUX_SYS_AUE_linux_ppoll AUE_NULL +#define LINUX_SYS_AUE_linux_unshare AUE_NULL + #undef PAD_ #undef PADL_ #undef PADR_ ==== //depot/projects/smpng/sys/amd64/linux32/linux32_syscall.h#15 (text+ko) ==== @@ -2,7 +2,7 @@ * System call numbers. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/amd64/linux32/linux32_syscall.h,v 1.20 2006/08/15 12:51:45 netchild Exp $ + * $FreeBSD: src/sys/amd64/linux32/linux32_syscall.h,v 1.21 2006/08/15 17:36:58 jhb Exp $ * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.19 2006/08/15 12:28:14 netchild Exp */ ==== //depot/projects/smpng/sys/amd64/linux32/linux32_sysent.c#15 (text+ko) ==== @@ -2,7 +2,7 @@ * System call switch table. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/amd64/linux32/linux32_sysent.c,v 1.20 2006/08/15 12:51:45 netchild Exp $ + * $FreeBSD: src/sys/amd64/linux32/linux32_sysent.c,v 1.21 2006/08/15 17:36:58 jhb Exp $ * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.19 2006/08/15 12:28:14 netchild Exp */ ==== //depot/projects/smpng/sys/amd64/linux32/syscalls.conf#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/amd64/linux32/syscalls.conf,v 1.1 2004/08/16 07:55:06 tjr Exp $ +# $FreeBSD: src/sys/amd64/linux32/syscalls.conf,v 1.2 2006/08/15 17:25:54 jhb Exp $ sysnames="/dev/null" sysproto="linux32_proto.h" sysproto_h=_LINUX_SYSPROTO_H_ @@ -8,4 +8,4 @@ syscallprefix="LINUX_SYS_" switchname="linux_sysent" namesname="linux_syscallnames" -sysvec="\n" +systrace="/dev/null" ==== //depot/projects/smpng/sys/arm/arm/mem.c#4 (text+ko) ==== @@ -37,7 +37,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/arm/mem.c,v 1.3 2006/08/08 20:59:38 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/mem.c,v 1.4 2006/08/15 16:43:07 cognet Exp $"); /* * Memory special file @@ -63,8 +63,7 @@ #include #include - -#include "opt_global.h" +#include /* * Used in /dev/mem drivers and elsewhere ==== //depot/projects/smpng/sys/compat/freebsd32/freebsd32_proto.h#32 (text+ko) ==== @@ -2,7 +2,7 @@ * System call prototypes. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/freebsd32/freebsd32_proto.h,v 1.57 2006/07/28 19:08:35 jhb Exp $ + * $FreeBSD: src/sys/compat/freebsd32/freebsd32_proto.h,v 1.58 2006/08/15 17:36:59 jhb Exp $ * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.70 2006/07/28 19:05:26 jhb Exp */ @@ -11,11 +11,10 @@ #include #include -#include -#include #include +#include -#include +#include struct proc; @@ -416,6 +415,53 @@ #endif /* COMPAT_FREEBSD4 */ +#define FREEBSD32_SYS_AUE_freebsd32_wait4 AUE_WAIT4 +#define FREEBSD32_SYS_AUE_freebsd32_recvmsg AUE_RECVMSG +#define FREEBSD32_SYS_AUE_freebsd32_sendmsg AUE_SENDMSG +#define FREEBSD32_SYS_AUE_freebsd32_recvfrom AUE_RECVFROM +#define FREEBSD32_SYS_AUE_freebsd32_sigaltstack AUE_SIGPENDING +#define FREEBSD32_SYS_AUE_freebsd32_execve AUE_EXECVE +#define FREEBSD32_SYS_AUE_freebsd32_setitimer AUE_SETITIMER +#define FREEBSD32_SYS_AUE_freebsd32_getitimer AUE_GETITIMER +#define FREEBSD32_SYS_AUE_freebsd32_select AUE_SELECT +#define FREEBSD32_SYS_AUE_freebsd32_gettimeofday AUE_GETTIMEOFDAY +#define FREEBSD32_SYS_AUE_freebsd32_getrusage AUE_GETRUSAGE +#define FREEBSD32_SYS_AUE_freebsd32_readv AUE_READV +#define FREEBSD32_SYS_AUE_freebsd32_writev AUE_WRITEV +#define FREEBSD32_SYS_AUE_freebsd32_settimeofday AUE_SETTIMEOFDAY +#define FREEBSD32_SYS_AUE_freebsd32_utimes AUE_UTIMES +#define FREEBSD32_SYS_AUE_freebsd32_adjtime AUE_ADJTIME +#define FREEBSD32_SYS_AUE_freebsd32_semsys AUE_SEMSYS +#define FREEBSD32_SYS_AUE_freebsd32_msgsys AUE_MSGSYS +#define FREEBSD32_SYS_AUE_freebsd32_shmsys AUE_SHMSYS +#define FREEBSD32_SYS_AUE_freebsd32_pread AUE_PREAD +#define FREEBSD32_SYS_AUE_freebsd32_pwrite AUE_PWRITE +#define FREEBSD32_SYS_AUE_freebsd32_stat AUE_STAT +#define FREEBSD32_SYS_AUE_freebsd32_fstat AUE_FSTAT +#define FREEBSD32_SYS_AUE_freebsd32_lstat AUE_LSTAT +#define FREEBSD32_SYS_AUE_freebsd32_mmap AUE_MMAP +#define FREEBSD32_SYS_AUE_freebsd32_lseek AUE_LSEEK +#define FREEBSD32_SYS_AUE_freebsd32_truncate AUE_TRUNCATE +#define FREEBSD32_SYS_AUE_freebsd32_ftruncate AUE_FTRUNCATE +#define FREEBSD32_SYS_AUE_freebsd32_sysctl AUE_SYSCTL +#define FREEBSD32_SYS_AUE_freebsd32_futimes AUE_FUTIMES +#define FREEBSD32_SYS_AUE_freebsd32_shmctl AUE_SHMCTL +#define FREEBSD32_SYS_AUE_freebsd32_clock_gettime AUE_NULL +#define FREEBSD32_SYS_AUE_freebsd32_clock_settime AUE_CLOCK_SETTIME +#define FREEBSD32_SYS_AUE_freebsd32_clock_getres AUE_NULL +#define FREEBSD32_SYS_AUE_freebsd32_nanosleep AUE_NULL +#define FREEBSD32_SYS_AUE_freebsd32_lutimes AUE_LUTIMES +#define FREEBSD32_SYS_AUE_freebsd32_preadv AUE_PREADV +#define FREEBSD32_SYS_AUE_freebsd32_pwritev AUE_PWRITEV +#define FREEBSD32_SYS_AUE_freebsd32_modstat AUE_NULL +#define FREEBSD32_SYS_AUE_freebsd32_kevent AUE_NULL +#define FREEBSD32_SYS_AUE_freebsd32_sendfile AUE_NULL +#define FREEBSD32_SYS_AUE_freebsd32_sigaction AUE_SIGACTION +#define FREEBSD32_SYS_AUE_freebsd32_sigreturn AUE_SIGRETURN +#define FREEBSD32_SYS_AUE_freebsd32_getcontext AUE_NULL +#define FREEBSD32_SYS_AUE_freebsd32_setcontext AUE_NULL +#define FREEBSD32_SYS_AUE_freebsd32_swapcontext AUE_NULL + #undef PAD_ #undef PADL_ #undef PADR_ ==== //depot/projects/smpng/sys/compat/freebsd32/freebsd32_syscall.h#32 (text+ko) ==== @@ -2,7 +2,7 @@ * System call numbers. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscall.h,v 1.55 2006/07/28 19:08:35 jhb Exp $ + * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscall.h,v 1.56 2006/08/15 17:36:59 jhb Exp $ * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.70 2006/07/28 19:05:26 jhb Exp */ ==== //depot/projects/smpng/sys/compat/freebsd32/freebsd32_syscalls.c#32 (text+ko) ==== @@ -2,7 +2,7 @@ * System call names. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscalls.c,v 1.46 2006/07/28 19:08:35 jhb Exp $ + * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscalls.c,v 1.47 2006/08/15 17:36:59 jhb Exp $ * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.70 2006/07/28 19:05:26 jhb Exp */ ==== //depot/projects/smpng/sys/compat/freebsd32/freebsd32_sysent.c#32 (text+ko) ==== @@ -2,7 +2,7 @@ * System call switch table. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/freebsd32/freebsd32_sysent.c,v 1.56 2006/07/28 19:08:35 jhb Exp $ + * $FreeBSD: src/sys/compat/freebsd32/freebsd32_sysent.c,v 1.57 2006/08/15 17:36:59 jhb Exp $ * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.70 2006/07/28 19:05:26 jhb Exp */ @@ -32,473 +32,473 @@ /* The casts are bogus but will do for now. */ struct sysent freebsd32_sysent[] = { - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 0 = syscall */ - { AS(sys_exit_args), (sy_call_t *)sys_exit, AUE_EXIT }, /* 1 = exit */ - { 0, (sy_call_t *)fork, AUE_FORK }, /* 2 = fork */ - { AS(read_args), (sy_call_t *)read, AUE_READ }, /* 3 = read */ - { AS(write_args), (sy_call_t *)write, AUE_WRITE }, /* 4 = write */ - { AS(open_args), (sy_call_t *)open, AUE_OPEN_RWTC }, /* 5 = open */ - { AS(close_args), (sy_call_t *)close, AUE_CLOSE }, /* 6 = close */ - { AS(freebsd32_wait4_args), (sy_call_t *)freebsd32_wait4, AUE_WAIT4 }, /* 7 = freebsd32_wait4 */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 8 = obsolete old creat */ - { AS(link_args), (sy_call_t *)link, AUE_LINK }, /* 9 = link */ - { AS(unlink_args), (sy_call_t *)unlink, AUE_UNLINK }, /* 10 = unlink */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 11 = obsolete execv */ - { AS(chdir_args), (sy_call_t *)chdir, AUE_CHDIR }, /* 12 = chdir */ - { AS(fchdir_args), (sy_call_t *)fchdir, AUE_FCHDIR }, /* 13 = fchdir */ - { AS(mknod_args), (sy_call_t *)mknod, AUE_MKNOD }, /* 14 = mknod */ - { AS(chmod_args), (sy_call_t *)chmod, AUE_CHMOD }, /* 15 = chmod */ - { AS(chown_args), (sy_call_t *)chown, AUE_CHOWN }, /* 16 = chown */ - { AS(obreak_args), (sy_call_t *)obreak, AUE_NULL }, /* 17 = break */ - { compat4(AS(freebsd4_freebsd32_getfsstat_args),freebsd32_getfsstat), AUE_GETFSSTAT }, /* 18 = old freebsd32_getfsstat */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 19 = obsolete olseek */ - { 0, (sy_call_t *)getpid, AUE_GETPID }, /* 20 = getpid */ - { AS(mount_args), (sy_call_t *)mount, AUE_MOUNT }, /* 21 = mount */ - { AS(unmount_args), (sy_call_t *)unmount, AUE_UMOUNT }, /* 22 = unmount */ - { AS(setuid_args), (sy_call_t *)setuid, AUE_SETUID }, /* 23 = setuid */ - { 0, (sy_call_t *)getuid, AUE_GETUID }, /* 24 = getuid */ - { 0, (sy_call_t *)geteuid, AUE_GETEUID }, /* 25 = geteuid */ - { AS(ptrace_args), (sy_call_t *)ptrace, AUE_PTRACE }, /* 26 = ptrace */ - { AS(freebsd32_recvmsg_args), (sy_call_t *)freebsd32_recvmsg, AUE_RECVMSG }, /* 27 = freebsd32_recvmsg */ - { AS(freebsd32_sendmsg_args), (sy_call_t *)freebsd32_sendmsg, AUE_SENDMSG }, /* 28 = freebsd32_sendmsg */ - { AS(freebsd32_recvfrom_args), (sy_call_t *)freebsd32_recvfrom, AUE_RECVFROM }, /* 29 = freebsd32_recvfrom */ - { AS(accept_args), (sy_call_t *)accept, AUE_ACCEPT }, /* 30 = accept */ - { AS(getpeername_args), (sy_call_t *)getpeername, AUE_GETPEERNAME }, /* 31 = getpeername */ - { AS(getsockname_args), (sy_call_t *)getsockname, AUE_GETSOCKNAME }, /* 32 = getsockname */ - { AS(access_args), (sy_call_t *)access, AUE_ACCESS }, /* 33 = access */ - { AS(chflags_args), (sy_call_t *)chflags, AUE_CHFLAGS }, /* 34 = chflags */ - { AS(fchflags_args), (sy_call_t *)fchflags, AUE_FCHFLAGS }, /* 35 = fchflags */ - { 0, (sy_call_t *)sync, AUE_SYNC }, /* 36 = sync */ - { AS(kill_args), (sy_call_t *)kill, AUE_KILL }, /* 37 = kill */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 38 = ostat */ - { 0, (sy_call_t *)getppid, AUE_GETPPID }, /* 39 = getppid */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 40 = olstat */ - { AS(dup_args), (sy_call_t *)dup, AUE_DUP }, /* 41 = dup */ - { 0, (sy_call_t *)pipe, AUE_PIPE }, /* 42 = pipe */ - { 0, (sy_call_t *)getegid, AUE_GETEGID }, /* 43 = getegid */ - { AS(profil_args), (sy_call_t *)profil, AUE_PROFILE }, /* 44 = profil */ - { AS(ktrace_args), (sy_call_t *)ktrace, AUE_KTRACE }, /* 45 = ktrace */ - { compat(AS(ofreebsd32_sigaction_args),freebsd32_sigaction), AUE_SIGACTION }, /* 46 = old freebsd32_sigaction */ - { 0, (sy_call_t *)getgid, AUE_GETGID }, /* 47 = getgid */ - { compat(AS(ofreebsd32_sigprocmask_args),freebsd32_sigprocmask), AUE_SIGPROCMASK }, /* 48 = old freebsd32_sigprocmask */ - { AS(getlogin_args), (sy_call_t *)getlogin, AUE_GETLOGIN }, /* 49 = getlogin */ - { AS(setlogin_args), (sy_call_t *)setlogin, AUE_SETLOGIN }, /* 50 = setlogin */ - { AS(acct_args), (sy_call_t *)acct, AUE_ACCT }, /* 51 = acct */ - { compat(0,freebsd32_sigpending), AUE_SIGPENDING }, /* 52 = old freebsd32_sigpending */ - { AS(freebsd32_sigaltstack_args), (sy_call_t *)freebsd32_sigaltstack, AUE_SIGPENDING }, /* 53 = freebsd32_sigaltstack */ - { AS(ioctl_args), (sy_call_t *)ioctl, AUE_IOCTL }, /* 54 = ioctl */ - { AS(reboot_args), (sy_call_t *)reboot, AUE_REBOOT }, /* 55 = reboot */ - { AS(revoke_args), (sy_call_t *)revoke, AUE_REVOKE }, /* 56 = revoke */ - { AS(symlink_args), (sy_call_t *)symlink, AUE_SYMLINK }, /* 57 = symlink */ - { AS(readlink_args), (sy_call_t *)readlink, AUE_READLINK }, /* 58 = readlink */ - { AS(freebsd32_execve_args), (sy_call_t *)freebsd32_execve, AUE_EXECVE }, /* 59 = freebsd32_execve */ - { AS(umask_args), (sy_call_t *)umask, AUE_UMASK }, /* 60 = umask */ - { AS(chroot_args), (sy_call_t *)chroot, AUE_CHROOT }, /* 61 = chroot */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 62 = obsolete ofstat */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 63 = obsolete ogetkerninfo */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 64 = obsolete ogetpagesize */ - { AS(msync_args), (sy_call_t *)msync, AUE_MSYNC }, /* 65 = msync */ - { 0, (sy_call_t *)vfork, AUE_VFORK }, /* 66 = vfork */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 67 = obsolete vread */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 68 = obsolete vwrite */ - { AS(sbrk_args), (sy_call_t *)sbrk, AUE_SBRK }, /* 69 = sbrk */ - { AS(sstk_args), (sy_call_t *)sstk, AUE_SSTK }, /* 70 = sstk */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 71 = obsolete ommap */ - { AS(ovadvise_args), (sy_call_t *)ovadvise, AUE_O_VADVISE }, /* 72 = vadvise */ - { AS(munmap_args), (sy_call_t *)munmap, AUE_MUNMAP }, /* 73 = munmap */ - { AS(mprotect_args), (sy_call_t *)mprotect, AUE_MPROTECT }, /* 74 = mprotect */ - { AS(madvise_args), (sy_call_t *)madvise, AUE_MADVISE }, /* 75 = madvise */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 76 = obsolete vhangup */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 77 = obsolete vlimit */ - { AS(mincore_args), (sy_call_t *)mincore, AUE_MINCORE }, /* 78 = mincore */ - { AS(getgroups_args), (sy_call_t *)getgroups, AUE_GETGROUPS }, /* 79 = getgroups */ - { AS(setgroups_args), (sy_call_t *)setgroups, AUE_SETGROUPS }, /* 80 = setgroups */ - { 0, (sy_call_t *)getpgrp, AUE_GETPGRP }, /* 81 = getpgrp */ - { AS(setpgid_args), (sy_call_t *)setpgid, AUE_SETPGRP }, /* 82 = setpgid */ - { AS(freebsd32_setitimer_args), (sy_call_t *)freebsd32_setitimer, AUE_SETITIMER }, /* 83 = freebsd32_setitimer */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 84 = obsolete owait */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 85 = obsolete oswapon */ - { AS(freebsd32_getitimer_args), (sy_call_t *)freebsd32_getitimer, AUE_GETITIMER }, /* 86 = freebsd32_getitimer */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 87 = obsolete ogethostname */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 88 = obsolete osethostname */ - { 0, (sy_call_t *)getdtablesize, AUE_GETDTABLESIZE }, /* 89 = getdtablesize */ - { AS(dup2_args), (sy_call_t *)dup2, AUE_DUP2 }, /* 90 = dup2 */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 91 = getdopt */ - { AS(fcntl_args), (sy_call_t *)fcntl, AUE_FCNTL }, /* 92 = fcntl */ - { AS(freebsd32_select_args), (sy_call_t *)freebsd32_select, AUE_SELECT }, /* 93 = freebsd32_select */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 94 = setdopt */ - { AS(fsync_args), (sy_call_t *)fsync, AUE_FSYNC }, /* 95 = fsync */ - { AS(setpriority_args), (sy_call_t *)setpriority, AUE_SETPRIORITY }, /* 96 = setpriority */ - { AS(socket_args), (sy_call_t *)socket, AUE_SOCKET }, /* 97 = socket */ - { AS(connect_args), (sy_call_t *)connect, AUE_CONNECT }, /* 98 = connect */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 99 = obsolete oaccept */ - { AS(getpriority_args), (sy_call_t *)getpriority, AUE_GETPRIORITY }, /* 100 = getpriority */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 101 = obsolete osend */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 102 = obsolete orecv */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 103 = obsolete osigreturn */ - { AS(bind_args), (sy_call_t *)bind, AUE_BIND }, /* 104 = bind */ - { AS(setsockopt_args), (sy_call_t *)setsockopt, AUE_SETSOCKOPT }, /* 105 = setsockopt */ - { AS(listen_args), (sy_call_t *)listen, AUE_LISTEN }, /* 106 = listen */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 107 = obsolete vtimes */ - { compat(AS(ofreebsd32_sigvec_args),freebsd32_sigvec), AUE_O_SIGVEC }, /* 108 = old freebsd32_sigvec */ - { compat(AS(ofreebsd32_sigblock_args),freebsd32_sigblock), AUE_O_SIGBLOCK }, /* 109 = old freebsd32_sigblock */ - { compat(AS(ofreebsd32_sigsetmask_args),freebsd32_sigsetmask), AUE_O_SIGSETMASK }, /* 110 = old freebsd32_sigsetmask */ - { compat(AS(ofreebsd32_sigsuspend_args),freebsd32_sigsuspend), AUE_SIGSUSPEND }, /* 111 = old freebsd32_sigsuspend */ - { compat(AS(ofreebsd32_sigstack_args),freebsd32_sigstack), AUE_O_SIGSTACK }, /* 112 = old freebsd32_sigstack */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 113 = obsolete orecvmsg */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 114 = obsolete osendmsg */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 115 = obsolete vtrace */ - { AS(freebsd32_gettimeofday_args), (sy_call_t *)freebsd32_gettimeofday, AUE_GETTIMEOFDAY }, /* 116 = freebsd32_gettimeofday */ - { AS(freebsd32_getrusage_args), (sy_call_t *)freebsd32_getrusage, AUE_GETRUSAGE }, /* 117 = freebsd32_getrusage */ - { AS(getsockopt_args), (sy_call_t *)getsockopt, AUE_GETSOCKOPT }, /* 118 = getsockopt */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 119 = resuba */ - { AS(freebsd32_readv_args), (sy_call_t *)freebsd32_readv, AUE_READV }, /* 120 = freebsd32_readv */ - { AS(freebsd32_writev_args), (sy_call_t *)freebsd32_writev, AUE_WRITEV }, /* 121 = freebsd32_writev */ - { AS(freebsd32_settimeofday_args), (sy_call_t *)freebsd32_settimeofday, AUE_SETTIMEOFDAY }, /* 122 = freebsd32_settimeofday */ - { AS(fchown_args), (sy_call_t *)fchown, AUE_FCHOWN }, /* 123 = fchown */ - { AS(fchmod_args), (sy_call_t *)fchmod, AUE_FCHMOD }, /* 124 = fchmod */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 125 = obsolete orecvfrom */ - { AS(setreuid_args), (sy_call_t *)setreuid, AUE_SETREUID }, /* 126 = setreuid */ - { AS(setregid_args), (sy_call_t *)setregid, AUE_SETREGID }, /* 127 = setregid */ - { AS(rename_args), (sy_call_t *)rename, AUE_RENAME }, /* 128 = rename */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 129 = obsolete otruncate */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 130 = obsolete ftruncate */ - { AS(flock_args), (sy_call_t *)flock, AUE_FLOCK }, /* 131 = flock */ - { AS(mkfifo_args), (sy_call_t *)mkfifo, AUE_MKFIFO }, /* 132 = mkfifo */ - { AS(sendto_args), (sy_call_t *)sendto, AUE_SENDTO }, /* 133 = sendto */ - { AS(shutdown_args), (sy_call_t *)shutdown, AUE_SHUTDOWN }, /* 134 = shutdown */ - { AS(socketpair_args), (sy_call_t *)socketpair, AUE_SOCKETPAIR }, /* 135 = socketpair */ - { AS(mkdir_args), (sy_call_t *)mkdir, AUE_MKDIR }, /* 136 = mkdir */ - { AS(rmdir_args), (sy_call_t *)rmdir, AUE_RMDIR }, /* 137 = rmdir */ - { AS(freebsd32_utimes_args), (sy_call_t *)freebsd32_utimes, AUE_UTIMES }, /* 138 = freebsd32_utimes */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 139 = obsolete 4.2 sigreturn */ - { AS(freebsd32_adjtime_args), (sy_call_t *)freebsd32_adjtime, AUE_ADJTIME }, /* 140 = freebsd32_adjtime */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 141 = obsolete ogetpeername */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 142 = obsolete ogethostid */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 143 = obsolete sethostid */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 144 = obsolete getrlimit */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 145 = obsolete setrlimit */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 146 = obsolete killpg */ - { 0, (sy_call_t *)setsid, AUE_SETSID }, /* 147 = setsid */ - { AS(quotactl_args), (sy_call_t *)quotactl, AUE_QUOTACTL }, /* 148 = quotactl */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 149 = obsolete oquota */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 150 = obsolete ogetsockname */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 151 = sem_lock */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 152 = sem_wakeup */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 153 = asyncdaemon */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 154 = nosys */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 155 = nfssvc */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 156 = obsolete ogetdirentries */ - { compat4(AS(freebsd4_freebsd32_statfs_args),freebsd32_statfs), AUE_STATFS }, /* 157 = old freebsd32_statfs */ - { compat4(AS(freebsd4_freebsd32_fstatfs_args),freebsd32_fstatfs), AUE_FSTATFS }, /* 158 = old freebsd32_fstatfs */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 159 = nosys */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 160 = nosys */ - { AS(getfh_args), (sy_call_t *)getfh, AUE_NFS_GETFH }, /* 161 = getfh */ - { AS(getdomainname_args), (sy_call_t *)getdomainname, AUE_O_GETDOMAINNAME }, /* 162 = getdomainname */ - { AS(setdomainname_args), (sy_call_t *)setdomainname, AUE_O_SETDOMAINNAME }, /* 163 = setdomainname */ - { AS(uname_args), (sy_call_t *)uname, AUE_NULL }, /* 164 = uname */ - { AS(sysarch_args), (sy_call_t *)sysarch, AUE_NULL }, /* 165 = sysarch */ - { AS(rtprio_args), (sy_call_t *)rtprio, AUE_NULL }, /* 166 = rtprio */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 167 = nosys */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 168 = nosys */ - { AS(freebsd32_semsys_args), (sy_call_t *)freebsd32_semsys, AUE_SEMSYS }, /* 169 = freebsd32_semsys */ - { AS(freebsd32_msgsys_args), (sy_call_t *)freebsd32_msgsys, AUE_MSGSYS }, /* 170 = freebsd32_msgsys */ - { AS(freebsd32_shmsys_args), (sy_call_t *)freebsd32_shmsys, AUE_SHMSYS }, /* 171 = freebsd32_shmsys */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 172 = nosys */ - { AS(freebsd32_pread_args), (sy_call_t *)freebsd32_pread, AUE_PREAD }, /* 173 = freebsd32_pread */ - { AS(freebsd32_pwrite_args), (sy_call_t *)freebsd32_pwrite, AUE_PWRITE }, /* 174 = freebsd32_pwrite */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 175 = nosys */ - { AS(ntp_adjtime_args), (sy_call_t *)ntp_adjtime, AUE_ADJTIME }, /* 176 = ntp_adjtime */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 177 = sfork */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 178 = getdescriptor */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 179 = setdescriptor */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 180 = nosys */ - { AS(setgid_args), (sy_call_t *)setgid, AUE_SETGID }, /* 181 = setgid */ - { AS(setegid_args), (sy_call_t *)setegid, AUE_SETEGID }, /* 182 = setegid */ - { AS(seteuid_args), (sy_call_t *)seteuid, AUE_SETEUID }, /* 183 = seteuid */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 184 = lfs_bmapv */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 185 = lfs_markv */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 186 = lfs_segclean */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 187 = lfs_segwait */ - { AS(freebsd32_stat_args), (sy_call_t *)freebsd32_stat, AUE_STAT }, /* 188 = freebsd32_stat */ - { AS(freebsd32_fstat_args), (sy_call_t *)freebsd32_fstat, AUE_FSTAT }, /* 189 = freebsd32_fstat */ - { AS(freebsd32_lstat_args), (sy_call_t *)freebsd32_lstat, AUE_LSTAT }, /* 190 = freebsd32_lstat */ - { AS(pathconf_args), (sy_call_t *)pathconf, AUE_PATHCONF }, /* 191 = pathconf */ - { AS(fpathconf_args), (sy_call_t *)fpathconf, AUE_FPATHCONF }, /* 192 = fpathconf */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 193 = nosys */ - { AS(__getrlimit_args), (sy_call_t *)getrlimit, AUE_GETRLIMIT }, /* 194 = getrlimit */ - { AS(__setrlimit_args), (sy_call_t *)setrlimit, AUE_SETRLIMIT }, /* 195 = setrlimit */ - { AS(getdirentries_args), (sy_call_t *)getdirentries, AUE_GETDIRENTRIES }, /* 196 = getdirentries */ - { AS(freebsd32_mmap_args), (sy_call_t *)freebsd32_mmap, AUE_MMAP }, /* 197 = freebsd32_mmap */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 198 = __syscall */ - { AS(freebsd32_lseek_args), (sy_call_t *)freebsd32_lseek, AUE_LSEEK }, /* 199 = freebsd32_lseek */ - { AS(freebsd32_truncate_args), (sy_call_t *)freebsd32_truncate, AUE_TRUNCATE }, /* 200 = freebsd32_truncate */ - { AS(freebsd32_ftruncate_args), (sy_call_t *)freebsd32_ftruncate, AUE_FTRUNCATE }, /* 201 = freebsd32_ftruncate */ - { AS(freebsd32_sysctl_args), (sy_call_t *)freebsd32_sysctl, AUE_SYSCTL }, /* 202 = freebsd32_sysctl */ - { AS(mlock_args), (sy_call_t *)mlock, AUE_MLOCK }, /* 203 = mlock */ - { AS(munlock_args), (sy_call_t *)munlock, AUE_MUNLOCK }, /* 204 = munlock */ - { AS(undelete_args), (sy_call_t *)undelete, AUE_UNDELETE }, /* 205 = undelete */ - { AS(freebsd32_futimes_args), (sy_call_t *)freebsd32_futimes, AUE_FUTIMES }, /* 206 = freebsd32_futimes */ - { AS(getpgid_args), (sy_call_t *)getpgid, AUE_GETPGID }, /* 207 = getpgid */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 208 = newreboot */ - { AS(poll_args), (sy_call_t *)poll, AUE_POLL }, /* 209 = poll */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 210 = */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 211 = */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 212 = */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 213 = */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 214 = */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 215 = */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 216 = */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 217 = */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 218 = */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 219 = */ - { AS(__semctl_args), (sy_call_t *)__semctl, AUE_SEMCTL }, /* 220 = __semctl */ - { AS(semget_args), (sy_call_t *)semget, AUE_SEMGET }, /* 221 = semget */ - { AS(semop_args), (sy_call_t *)semop, AUE_SEMOP }, /* 222 = semop */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 223 = semconfig */ - { AS(msgctl_args), (sy_call_t *)msgctl, AUE_MSGCTL }, /* 224 = msgctl */ - { AS(msgget_args), (sy_call_t *)msgget, AUE_MSGGET }, /* 225 = msgget */ - { AS(msgsnd_args), (sy_call_t *)msgsnd, AUE_MSGSND }, /* 226 = msgsnd */ - { AS(msgrcv_args), (sy_call_t *)msgrcv, AUE_MSGRCV }, /* 227 = msgrcv */ - { AS(shmat_args), (sy_call_t *)shmat, AUE_SHMAT }, /* 228 = shmat */ - { AS(freebsd32_shmctl_args), (sy_call_t *)freebsd32_shmctl, AUE_SHMCTL }, /* 229 = freebsd32_shmctl */ - { AS(shmdt_args), (sy_call_t *)shmdt, AUE_SHMDT }, /* 230 = shmdt */ - { AS(shmget_args), (sy_call_t *)shmget, AUE_SHMGET }, /* 231 = shmget */ - { AS(freebsd32_clock_gettime_args), (sy_call_t *)freebsd32_clock_gettime, AUE_NULL }, /* 232 = freebsd32_clock_gettime */ - { AS(freebsd32_clock_settime_args), (sy_call_t *)freebsd32_clock_settime, AUE_CLOCK_SETTIME }, /* 233 = freebsd32_clock_settime */ - { AS(freebsd32_clock_getres_args), (sy_call_t *)freebsd32_clock_getres, AUE_NULL }, /* 234 = freebsd32_clock_getres */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 235 = timer_create */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 236 = timer_delete */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 237 = timer_settime */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 238 = timer_gettime */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 239 = timer_getoverrun */ - { AS(freebsd32_nanosleep_args), (sy_call_t *)freebsd32_nanosleep, AUE_NULL }, /* 240 = freebsd32_nanosleep */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 241 = nosys */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 242 = nosys */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 243 = nosys */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 244 = nosys */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 245 = nosys */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 246 = nosys */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 247 = nosys */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 248 = ntp_gettime */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 249 = nosys */ - { AS(minherit_args), (sy_call_t *)minherit, AUE_MINHERIT }, /* 250 = minherit */ - { AS(rfork_args), (sy_call_t *)rfork, AUE_RFORK }, /* 251 = rfork */ - { AS(openbsd_poll_args), (sy_call_t *)openbsd_poll, AUE_POLL }, /* 252 = openbsd_poll */ - { 0, (sy_call_t *)issetugid, AUE_ISSETUGID }, /* 253 = issetugid */ - { AS(lchown_args), (sy_call_t *)lchown, AUE_LCHOWN }, /* 254 = lchown */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 255 = nosys */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 256 = nosys */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 257 = nosys */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 258 = nosys */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 259 = nosys */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 260 = nosys */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 261 = nosys */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 262 = nosys */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 263 = nosys */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 264 = nosys */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 265 = nosys */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 266 = nosys */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 267 = nosys */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 268 = nosys */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 269 = nosys */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 270 = nosys */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 271 = nosys */ - { AS(getdents_args), (sy_call_t *)getdents, AUE_O_GETDENTS }, /* 272 = getdents */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 273 = nosys */ - { AS(lchmod_args), (sy_call_t *)lchmod, AUE_LCHMOD }, /* 274 = lchmod */ - { AS(lchown_args), (sy_call_t *)lchown, AUE_LCHOWN }, /* 275 = netbsd_lchown */ - { AS(freebsd32_lutimes_args), (sy_call_t *)freebsd32_lutimes, AUE_LUTIMES }, /* 276 = freebsd32_lutimes */ - { AS(msync_args), (sy_call_t *)msync, AUE_MSYNC }, /* 277 = netbsd_msync */ - { AS(nstat_args), (sy_call_t *)nstat, AUE_STAT }, /* 278 = nstat */ - { AS(nfstat_args), (sy_call_t *)nfstat, AUE_FSTAT }, /* 279 = nfstat */ - { AS(nlstat_args), (sy_call_t *)nlstat, AUE_LSTAT }, /* 280 = nlstat */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 281 = nosys */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 282 = nosys */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 283 = nosys */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 284 = nosys */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 285 = nosys */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 286 = nosys */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 287 = nosys */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 288 = nosys */ - { AS(freebsd32_preadv_args), (sy_call_t *)freebsd32_preadv, AUE_PREADV }, /* 289 = freebsd32_preadv */ - { AS(freebsd32_pwritev_args), (sy_call_t *)freebsd32_pwritev, AUE_PWRITEV }, /* 290 = freebsd32_pwritev */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 291 = nosys */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 292 = nosys */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 293 = nosys */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 294 = nosys */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 295 = nosys */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 296 = nosys */ - { compat4(AS(freebsd4_freebsd32_fhstatfs_args),freebsd32_fhstatfs), AUE_FHSTATFS }, /* 297 = old freebsd32_fhstatfs */ - { AS(fhopen_args), (sy_call_t *)fhopen, AUE_FHOPEN }, /* 298 = fhopen */ - { AS(fhstat_args), (sy_call_t *)fhstat, AUE_FHSTAT }, /* 299 = fhstat */ - { AS(modnext_args), (sy_call_t *)modnext, AUE_NULL }, /* 300 = modnext */ - { AS(freebsd32_modstat_args), (sy_call_t *)freebsd32_modstat, AUE_NULL }, /* 301 = freebsd32_modstat */ - { AS(modfnext_args), (sy_call_t *)modfnext, AUE_NULL }, /* 302 = modfnext */ - { AS(modfind_args), (sy_call_t *)modfind, AUE_NULL }, /* 303 = modfind */ - { AS(kldload_args), (sy_call_t *)kldload, AUE_MODLOAD }, /* 304 = kldload */ - { AS(kldunload_args), (sy_call_t *)kldunload, AUE_MODUNLOAD }, /* 305 = kldunload */ - { AS(kldfind_args), (sy_call_t *)kldfind, AUE_NULL }, /* 306 = kldfind */ - { AS(kldnext_args), (sy_call_t *)kldnext, AUE_NULL }, /* 307 = kldnext */ - { AS(kldstat_args), (sy_call_t *)kldstat, AUE_NULL }, /* 308 = kldstat */ - { AS(kldfirstmod_args), (sy_call_t *)kldfirstmod, AUE_NULL }, /* 309 = kldfirstmod */ - { AS(getsid_args), (sy_call_t *)getsid, AUE_GETSID }, /* 310 = getsid */ - { AS(setresuid_args), (sy_call_t *)setresuid, AUE_SETRESUID }, /* 311 = setresuid */ - { AS(setresgid_args), (sy_call_t *)setresgid, AUE_SETRESGID }, /* 312 = setresgid */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 313 = obsolete signanosleep */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 314 = aio_return */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 315 = aio_suspend */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 316 = aio_cancel */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 317 = aio_error */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 318 = aio_read */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 319 = aio_write */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 320 = lio_listio */ - { 0, (sy_call_t *)yield, AUE_NULL }, /* 321 = yield */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 322 = obsolete thr_sleep */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 323 = obsolete thr_wakeup */ - { AS(mlockall_args), (sy_call_t *)mlockall, AUE_MLOCKALL }, /* 324 = mlockall */ - { 0, (sy_call_t *)munlockall, AUE_MUNLOCKALL }, /* 325 = munlockall */ - { AS(__getcwd_args), (sy_call_t *)__getcwd, AUE_NULL }, /* 326 = __getcwd */ - { AS(sched_setparam_args), (sy_call_t *)sched_setparam, AUE_NULL }, /* 327 = sched_setparam */ - { AS(sched_getparam_args), (sy_call_t *)sched_getparam, AUE_NULL }, /* 328 = sched_getparam */ - { AS(sched_setscheduler_args), (sy_call_t *)sched_setscheduler, AUE_NULL }, /* 329 = sched_setscheduler */ - { AS(sched_getscheduler_args), (sy_call_t *)sched_getscheduler, AUE_NULL }, /* 330 = sched_getscheduler */ - { 0, (sy_call_t *)sched_yield, AUE_NULL }, /* 331 = sched_yield */ - { AS(sched_get_priority_max_args), (sy_call_t *)sched_get_priority_max, AUE_NULL }, /* 332 = sched_get_priority_max */ - { AS(sched_get_priority_min_args), (sy_call_t *)sched_get_priority_min, AUE_NULL }, /* 333 = sched_get_priority_min */ - { AS(sched_rr_get_interval_args), (sy_call_t *)sched_rr_get_interval, AUE_NULL }, /* 334 = sched_rr_get_interval */ - { AS(utrace_args), (sy_call_t *)utrace, AUE_NULL }, /* 335 = utrace */ - { compat4(AS(freebsd4_freebsd32_sendfile_args),freebsd32_sendfile), AUE_SENDFILE }, /* 336 = old freebsd32_sendfile */ - { AS(kldsym_args), (sy_call_t *)kldsym, AUE_NULL }, /* 337 = kldsym */ - { AS(jail_args), (sy_call_t *)jail, AUE_NULL }, /* 338 = jail */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 339 = pioctl */ - { AS(sigprocmask_args), (sy_call_t *)sigprocmask, AUE_SIGPROCMASK }, /* 340 = sigprocmask */ - { AS(sigsuspend_args), (sy_call_t *)sigsuspend, AUE_SIGSUSPEND }, /* 341 = sigsuspend */ - { compat4(AS(freebsd4_freebsd32_sigaction_args),freebsd32_sigaction), AUE_SIGACTION }, /* 342 = old freebsd32_sigaction */ - { AS(sigpending_args), (sy_call_t *)sigpending, AUE_SIGPENDING }, /* 343 = sigpending */ - { compat4(AS(freebsd4_freebsd32_sigreturn_args),freebsd32_sigreturn), AUE_SIGRETURN }, /* 344 = old freebsd32_sigreturn */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 345 = sigtimedwait */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 346 = sigwaitinfo */ - { AS(__acl_get_file_args), (sy_call_t *)__acl_get_file, AUE_JAIL }, /* 347 = __acl_get_file */ - { AS(__acl_set_file_args), (sy_call_t *)__acl_set_file, AUE_NULL }, /* 348 = __acl_set_file */ - { AS(__acl_get_fd_args), (sy_call_t *)__acl_get_fd, AUE_NULL }, /* 349 = __acl_get_fd */ - { AS(__acl_set_fd_args), (sy_call_t *)__acl_set_fd, AUE_NULL }, /* 350 = __acl_set_fd */ - { AS(__acl_delete_file_args), (sy_call_t *)__acl_delete_file, AUE_NULL }, /* 351 = __acl_delete_file */ - { AS(__acl_delete_fd_args), (sy_call_t *)__acl_delete_fd, AUE_NULL }, /* 352 = __acl_delete_fd */ - { AS(__acl_aclcheck_file_args), (sy_call_t *)__acl_aclcheck_file, AUE_NULL }, /* 353 = __acl_aclcheck_file */ - { AS(__acl_aclcheck_fd_args), (sy_call_t *)__acl_aclcheck_fd, AUE_NULL }, /* 354 = __acl_aclcheck_fd */ - { AS(extattrctl_args), (sy_call_t *)extattrctl, AUE_NULL }, /* 355 = extattrctl */ - { AS(extattr_set_file_args), (sy_call_t *)extattr_set_file, AUE_NULL }, /* 356 = extattr_set_file */ - { AS(extattr_get_file_args), (sy_call_t *)extattr_get_file, AUE_NULL }, /* 357 = extattr_get_file */ - { AS(extattr_delete_file_args), (sy_call_t *)extattr_delete_file, AUE_NULL }, /* 358 = extattr_delete_file */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 359 = aio_waitcomplete */ - { AS(getresuid_args), (sy_call_t *)getresuid, AUE_NULL }, /* 360 = getresuid */ - { AS(getresgid_args), (sy_call_t *)getresgid, AUE_NULL }, /* 361 = getresgid */ - { 0, (sy_call_t *)kqueue, AUE_NULL }, /* 362 = kqueue */ - { AS(freebsd32_kevent_args), (sy_call_t *)freebsd32_kevent, AUE_NULL }, /* 363 = freebsd32_kevent */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 364 = __cap_get_proc */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 365 = __cap_set_proc */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 366 = __cap_get_fd */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 367 = __cap_get_file */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 368 = __cap_set_fd */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 369 = __cap_set_file */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 370 = lkmressys */ - { AS(extattr_set_fd_args), (sy_call_t *)extattr_set_fd, AUE_NULL }, /* 371 = extattr_set_fd */ - { AS(extattr_get_fd_args), (sy_call_t *)extattr_get_fd, AUE_NULL }, /* 372 = extattr_get_fd */ - { AS(extattr_delete_fd_args), (sy_call_t *)extattr_delete_fd, AUE_NULL }, /* 373 = extattr_delete_fd */ - { AS(__setugid_args), (sy_call_t *)__setugid, AUE_NULL }, /* 374 = __setugid */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 375 = nfsclnt */ - { AS(eaccess_args), (sy_call_t *)eaccess, AUE_NULL }, /* 376 = eaccess */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 377 = afs_syscall */ - { AS(nmount_args), (sy_call_t *)nmount, AUE_NULL }, /* 378 = nmount */ - { 0, (sy_call_t *)kse_exit, AUE_NULL }, /* 379 = kse_exit */ - { AS(kse_wakeup_args), (sy_call_t *)kse_wakeup, AUE_NULL }, /* 380 = kse_wakeup */ - { AS(kse_create_args), (sy_call_t *)kse_create, AUE_NULL }, /* 381 = kse_create */ - { AS(kse_thr_interrupt_args), (sy_call_t *)kse_thr_interrupt, AUE_NULL }, /* 382 = kse_thr_interrupt */ - { 0, (sy_call_t *)kse_release, AUE_NULL }, /* 383 = kse_release */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 384 = __mac_get_proc */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 385 = __mac_set_proc */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 386 = __mac_get_fd */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 387 = __mac_get_file */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 388 = __mac_set_fd */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 389 = __mac_set_file */ - { AS(kenv_args), (sy_call_t *)kenv, AUE_NULL }, /* 390 = kenv */ - { AS(lchflags_args), (sy_call_t *)lchflags, AUE_LCHFLAGS }, /* 391 = lchflags */ - { AS(uuidgen_args), (sy_call_t *)uuidgen, AUE_NULL }, /* 392 = uuidgen */ - { AS(freebsd32_sendfile_args), (sy_call_t *)freebsd32_sendfile, AUE_NULL }, /* 393 = freebsd32_sendfile */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 394 = mac_syscall */ - { AS(getfsstat_args), (sy_call_t *)getfsstat, AUE_GETFSSTAT }, /* 395 = getfsstat */ - { AS(statfs_args), (sy_call_t *)statfs, AUE_STATFS }, /* 396 = statfs */ - { AS(fstatfs_args), (sy_call_t *)fstatfs, AUE_FSTATFS }, /* 397 = fstatfs */ - { AS(fhstatfs_args), (sy_call_t *)fhstatfs, AUE_NULL }, /* 398 = fhstatfs */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 399 = nosys */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 400 = ksem_close */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 401 = ksem_post */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 402 = ksem_wait */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 403 = ksem_trywait */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 404 = ksem_init */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 405 = ksem_open */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 406 = ksem_unlink */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 407 = ksem_getvalue */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 408 = ksem_destroy */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 409 = __mac_get_pid */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 410 = __mac_get_link */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 411 = __mac_set_link */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 412 = extattr_set_link */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 413 = extattr_get_link */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 414 = extattr_delete_link */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 415 = __mac_execve */ - { AS(freebsd32_sigaction_args), (sy_call_t *)freebsd32_sigaction, AUE_SIGACTION }, /* 416 = freebsd32_sigaction */ - { AS(freebsd32_sigreturn_args), (sy_call_t *)freebsd32_sigreturn, AUE_SIGRETURN }, /* 417 = freebsd32_sigreturn */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 418 = __xstat */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 419 = __xfstat */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 420 = __xlstat */ - { AS(freebsd32_getcontext_args), (sy_call_t *)freebsd32_getcontext, AUE_NULL }, /* 421 = freebsd32_getcontext */ - { AS(freebsd32_setcontext_args), (sy_call_t *)freebsd32_setcontext, AUE_NULL }, /* 422 = freebsd32_setcontext */ - { AS(freebsd32_swapcontext_args), (sy_call_t *)freebsd32_swapcontext, AUE_NULL }, /* 423 = freebsd32_swapcontext */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 424 = swapoff */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 425 = __acl_get_link */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 426 = __acl_set_link */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 427 = __acl_delete_link */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 428 = __acl_aclcheck_link */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 429 = sigwait */ - { AS(thr_create_args), (sy_call_t *)thr_create, AUE_NULL }, /* 430 = thr_create */ - { AS(thr_exit_args), (sy_call_t *)thr_exit, AUE_NULL }, /* 431 = thr_exit */ - { AS(thr_self_args), (sy_call_t *)thr_self, AUE_NULL }, /* 432 = thr_self */ - { AS(thr_kill_args), (sy_call_t *)thr_kill, AUE_NULL }, /* 433 = thr_kill */ - { AS(_umtx_lock_args), (sy_call_t *)_umtx_lock, AUE_NULL }, /* 434 = _umtx_lock */ - { AS(_umtx_unlock_args), (sy_call_t *)_umtx_unlock, AUE_NULL }, /* 435 = _umtx_unlock */ - { AS(jail_attach_args), (sy_call_t *)jail_attach, AUE_NULL }, /* 436 = jail_attach */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 437 = extattr_list_fd */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 438 = extattr_list_file */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 439 = extattr_list_link */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 440 = kse_switchin */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 441 = ksem_timedwait */ - { AS(thr_suspend_args), (sy_call_t *)thr_suspend, AUE_NULL }, /* 442 = thr_suspend */ - { AS(thr_wake_args), (sy_call_t *)thr_wake, AUE_NULL }, /* 443 = thr_wake */ - { AS(kldunloadf_args), (sy_call_t *)kldunloadf, AUE_NULL }, /* 444 = kldunloadf */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 445 = audit */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 446 = auditon */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 447 = getauid */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 448 = setauid */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 449 = getaudit */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 450 = setaudit */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 451 = getaudit_addr */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 452 = setaudit_addr */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 453 = auditctl */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 454 = _umtx_op */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 455 = thr_new */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 456 = sigqueue */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 457 = kmq_open */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 458 = kmq_setattr */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 459 = kmq_timedreceive */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 460 = kmq_timedsend */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 461 = kmq_notify */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 462 = kmq_unlink */ - { AS(abort2_args), (sy_call_t *)abort2, AUE_NULL }, /* 463 = abort2 */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 464 = thr_set_name */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 465 = aio_fsync */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 466 = thr_setscheduler */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 467 = thr_getscheduler */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 468 = thr_setschedparam */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 0 = syscall */ + { AS(sys_exit_args), (sy_call_t *)sys_exit, AUE_EXIT, NULL, 0, 0 }, /* 1 = exit */ + { 0, (sy_call_t *)fork, AUE_FORK, NULL, 0, 0 }, /* 2 = fork */ + { AS(read_args), (sy_call_t *)read, AUE_READ, NULL, 0, 0 }, /* 3 = read */ + { AS(write_args), (sy_call_t *)write, AUE_WRITE, NULL, 0, 0 }, /* 4 = write */ + { AS(open_args), (sy_call_t *)open, AUE_OPEN_RWTC, NULL, 0, 0 }, /* 5 = open */ + { AS(close_args), (sy_call_t *)close, AUE_CLOSE, NULL, 0, 0 }, /* 6 = close */ + { AS(freebsd32_wait4_args), (sy_call_t *)freebsd32_wait4, AUE_WAIT4, NULL, 0, 0 }, /* 7 = freebsd32_wait4 */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 8 = obsolete old creat */ + { AS(link_args), (sy_call_t *)link, AUE_LINK, NULL, 0, 0 }, /* 9 = link */ + { AS(unlink_args), (sy_call_t *)unlink, AUE_UNLINK, NULL, 0, 0 }, /* 10 = unlink */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 11 = obsolete execv */ + { AS(chdir_args), (sy_call_t *)chdir, AUE_CHDIR, NULL, 0, 0 }, /* 12 = chdir */ + { AS(fchdir_args), (sy_call_t *)fchdir, AUE_FCHDIR, NULL, 0, 0 }, /* 13 = fchdir */ + { AS(mknod_args), (sy_call_t *)mknod, AUE_MKNOD, NULL, 0, 0 }, /* 14 = mknod */ + { AS(chmod_args), (sy_call_t *)chmod, AUE_CHMOD, NULL, 0, 0 }, /* 15 = chmod */ + { AS(chown_args), (sy_call_t *)chown, AUE_CHOWN, NULL, 0, 0 }, /* 16 = chown */ + { AS(obreak_args), (sy_call_t *)obreak, AUE_NULL, NULL, 0, 0 }, /* 17 = break */ + { compat4(AS(freebsd4_freebsd32_getfsstat_args),freebsd32_getfsstat), AUE_GETFSSTAT, NULL, 0, 0 }, /* 18 = old freebsd32_getfsstat */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 19 = obsolete olseek */ + { 0, (sy_call_t *)getpid, AUE_GETPID, NULL, 0, 0 }, /* 20 = getpid */ + { AS(mount_args), (sy_call_t *)mount, AUE_MOUNT, NULL, 0, 0 }, /* 21 = mount */ + { AS(unmount_args), (sy_call_t *)unmount, AUE_UMOUNT, NULL, 0, 0 }, /* 22 = unmount */ + { AS(setuid_args), (sy_call_t *)setuid, AUE_SETUID, NULL, 0, 0 }, /* 23 = setuid */ + { 0, (sy_call_t *)getuid, AUE_GETUID, NULL, 0, 0 }, /* 24 = getuid */ + { 0, (sy_call_t *)geteuid, AUE_GETEUID, NULL, 0, 0 }, /* 25 = geteuid */ + { AS(ptrace_args), (sy_call_t *)ptrace, AUE_PTRACE, NULL, 0, 0 }, /* 26 = ptrace */ + { AS(freebsd32_recvmsg_args), (sy_call_t *)freebsd32_recvmsg, AUE_RECVMSG, NULL, 0, 0 }, /* 27 = freebsd32_recvmsg */ + { AS(freebsd32_sendmsg_args), (sy_call_t *)freebsd32_sendmsg, AUE_SENDMSG, NULL, 0, 0 }, /* 28 = freebsd32_sendmsg */ + { AS(freebsd32_recvfrom_args), (sy_call_t *)freebsd32_recvfrom, AUE_RECVFROM, NULL, 0, 0 }, /* 29 = freebsd32_recvfrom */ + { AS(accept_args), (sy_call_t *)accept, AUE_ACCEPT, NULL, 0, 0 }, /* 30 = accept */ + { AS(getpeername_args), (sy_call_t *)getpeername, AUE_GETPEERNAME, NULL, 0, 0 }, /* 31 = getpeername */ + { AS(getsockname_args), (sy_call_t *)getsockname, AUE_GETSOCKNAME, NULL, 0, 0 }, /* 32 = getsockname */ + { AS(access_args), (sy_call_t *)access, AUE_ACCESS, NULL, 0, 0 }, /* 33 = access */ + { AS(chflags_args), (sy_call_t *)chflags, AUE_CHFLAGS, NULL, 0, 0 }, /* 34 = chflags */ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Aug 15 18:06:56 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0630E16A4E8; Tue, 15 Aug 2006 18:06:56 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 B12DD16A4E6 for ; Tue, 15 Aug 2006 18:06:55 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 68A6443D46 for ; Tue, 15 Aug 2006 18:06:55 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7FI6tdc039018 for ; Tue, 15 Aug 2006 18:06:55 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7FI6tDF039013 for perforce@freebsd.org; Tue, 15 Aug 2006 18:06:55 GMT (envelope-from millert@freebsd.org) Date: Tue, 15 Aug 2006 18:06:55 GMT Message-Id: <200608151806.k7FI6tDF039013@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 104081 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Aug 2006 18:06:56 -0000 http://perforce.freebsd.org/chv.cgi?CH=104081 Change 104081 by millert@millert_macbook on 2006/08/15 18:06:09 Remove old Makefile Affected files ... .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/src/Makefile.old#2 delete Differences ... From owner-p4-projects@FreeBSD.ORG Tue Aug 15 18:17:15 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 180B316A54C; Tue, 15 Aug 2006 18:17:15 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 C683516A4E0 for ; Tue, 15 Aug 2006 18:17:14 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D40C343D4C for ; Tue, 15 Aug 2006 18:17:08 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7FIH8sL040089 for ; Tue, 15 Aug 2006 18:17:08 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7FIH8Ca040086 for perforce@freebsd.org; Tue, 15 Aug 2006 18:17:08 GMT (envelope-from jhb@freebsd.org) Date: Tue, 15 Aug 2006 18:17:08 GMT Message-Id: <200608151817.k7FIH8Ca040086@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Cc: Subject: PERFORCE change 104083 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Aug 2006 18:17:15 -0000 http://perforce.freebsd.org/chv.cgi?CH=104083 Change 104083 by jhb@jhb_mutex on 2006/08/15 18:16:58 We know td != NULL. Affected files ... .. //depot/projects/smpng/sys/kern/kern_mutex.c#135 edit Differences ... ==== //depot/projects/smpng/sys/kern/kern_mutex.c#135 (text+ko) ==== @@ -642,8 +642,7 @@ continue; printf( "spin lock %p (%s) held by %p (tid %d) too long\n", - m, m->mtx_object.lo_name, td, - td ? td->td_tid : -1); + m, m->mtx_object.lo_name, td, td->td_tid); #ifdef WITNESS witness_display_spinlock(&m->mtx_object, td); #endif From owner-p4-projects@FreeBSD.ORG Tue Aug 15 18:19:18 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 19D9E16A4E1; Tue, 15 Aug 2006 18:19:18 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 C7CE716A4DA for ; Tue, 15 Aug 2006 18:19:17 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E961E43D76 for ; Tue, 15 Aug 2006 18:19:11 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7FIJBWO040230 for ; Tue, 15 Aug 2006 18:19:11 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7FIJBXf040227 for perforce@freebsd.org; Tue, 15 Aug 2006 18:19:11 GMT (envelope-from jhb@freebsd.org) Date: Tue, 15 Aug 2006 18:19:11 GMT Message-Id: <200608151819.k7FIJBXf040227@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Cc: Subject: PERFORCE change 104084 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Aug 2006 18:19:18 -0000 http://perforce.freebsd.org/chv.cgi?CH=104084 Change 104084 by jhb@jhb_mutex on 2006/08/15 18:18:33 Mismerge. Affected files ... .. //depot/projects/smpng/sys/kern/kern_lock.c#53 edit Differences ... ==== //depot/projects/smpng/sys/kern/kern_lock.c#53 (text+ko) ==== @@ -45,8 +45,6 @@ #include "opt_ddb.h" -#include "opt_ddb.h" - #include #include #include From owner-p4-projects@FreeBSD.ORG Tue Aug 15 18:21:17 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3BAAB16A4DF; Tue, 15 Aug 2006 18:21:17 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 17BFB16A4DA for ; Tue, 15 Aug 2006 18:21:17 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C372343D53 for ; Tue, 15 Aug 2006 18:21:16 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7FILGcC040610 for ; Tue, 15 Aug 2006 18:21:16 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7FILGtM040604 for perforce@freebsd.org; Tue, 15 Aug 2006 18:21:16 GMT (envelope-from jhb@freebsd.org) Date: Tue, 15 Aug 2006 18:21:16 GMT Message-Id: <200608151821.k7FILGtM040604@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Cc: Subject: PERFORCE change 104086 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Aug 2006 18:21:17 -0000 http://perforce.freebsd.org/chv.cgi?CH=104086 Change 104086 by jhb@jhb_mutex on 2006/08/15 18:20:57 Whitespace. Affected files ... .. //depot/projects/smpng/sys/kern/subr_turnstile.c#33 edit Differences ... ==== //depot/projects/smpng/sys/kern/subr_turnstile.c#33 (text+ko) ==== @@ -1122,7 +1122,6 @@ } } - /* * Show all the threads a particular thread is waiting on based on * sleepable locks. From owner-p4-projects@FreeBSD.ORG Tue Aug 15 18:21:19 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EBADC16A4EC; Tue, 15 Aug 2006 18:21:18 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 9730216A541 for ; Tue, 15 Aug 2006 18:21:18 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7050243D49 for ; Tue, 15 Aug 2006 18:21:16 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7FILGGw040598 for ; Tue, 15 Aug 2006 18:21:16 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7FILEsd040559 for perforce@freebsd.org; Tue, 15 Aug 2006 18:21:14 GMT (envelope-from millert@freebsd.org) Date: Tue, 15 Aug 2006 18:21:14 GMT Message-Id: <200608151821.k7FILEsd040559@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 104085 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Aug 2006 18:21:19 -0000 http://perforce.freebsd.org/chv.cgi?CH=104085 Change 104085 by millert@millert_macbook on 2006/08/15 18:20:43 Update to libsepol 1.12.23 Affected files ... .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/ChangeLog#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/Makefile#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/VERSION#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/include/sepol/boolean_record.h#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/include/sepol/booleans.h#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/include/sepol/context.h#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/include/sepol/context_record.h#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/include/sepol/debug.h#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/include/sepol/iface_record.h#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/include/sepol/interfaces.h#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/include/sepol/module.h#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/include/sepol/node_record.h#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/include/sepol/nodes.h#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/include/sepol/policydb.h#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/include/sepol/policydb/avrule_block.h#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/include/sepol/policydb/avtab.h#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/include/sepol/policydb/conditional.h#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/include/sepol/policydb/constraint.h#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/include/sepol/policydb/context.h#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/include/sepol/policydb/ebitmap.h#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/include/sepol/policydb/expand.h#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/include/sepol/policydb/flask_types.h#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/include/sepol/policydb/hashtab.h#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/include/sepol/policydb/hierarchy.h#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/include/sepol/policydb/link.h#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/include/sepol/policydb/mls_types.h#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/include/sepol/policydb/module.h#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/include/sepol/policydb/policydb.h#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/include/sepol/policydb/services.h#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/include/sepol/policydb/sidtab.h#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/include/sepol/policydb/symtab.h#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/include/sepol/policydb/util.h#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/include/sepol/port_record.h#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/include/sepol/ports.h#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/include/sepol/roles.h#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/include/sepol/sepol.h#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/include/sepol/user_record.h#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/include/sepol/users.h#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/src/Makefile#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/src/assertion.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/src/avrule_block.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/src/avtab.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/src/boolean_internal.h#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/src/boolean_record.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/src/booleans.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/src/conditional.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/src/constraint.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/src/context.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/src/context.h#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/src/context_internal.h#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/src/context_record.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/src/debug.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/src/debug.h#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/src/ebitmap.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/src/expand.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/src/genbools.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/src/genusers.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/src/handle.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/src/handle.h#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/src/hashtab.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/src/hierarchy.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/src/iface_internal.h#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/src/iface_record.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/src/interfaces.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/src/link.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/src/mls.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/src/mls.h#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/src/module.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/src/module_internal.h#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/src/node_internal.h#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/src/node_record.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/src/nodes.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/src/policydb.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/src/policydb_convert.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/src/policydb_internal.h#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/src/policydb_public.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/src/port_internal.h#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/src/port_record.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/src/ports.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/src/private.h#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/src/roles.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/src/services.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/src/sidtab.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/src/symtab.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/src/user_internal.h#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/src/user_record.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/src/users.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/src/util.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/src/write.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/tests/Makefile#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/tests/libsepol-tests.c#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/tests/policies/refpolicy-base.conf#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/tests/test-cond.c#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/tests/test-cond.h#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/utils/chkcon.c#2 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/ChangeLog#2 (text+ko) ==== @@ -1,3 +1,69 @@ +1.12.23 2006-08-03 + * Merged symtab datum patch from Karl MacMillan. + +1.12.22 2006-08-03 + * Merged netfilter contexts support from Chris PeBenito. + +1.12.21 2006-07-28 + * Merged helpful hierarchy check errors patch from Joshua Brindle. + +1.12.20 2006-07-25 + * Merged semodule_deps patch from Karl MacMillan. + This adds source module names to the avrule decls. + +1.12.19 2006-06-29 + * Lindent. + +1.12.18 2006-06-26 + * Merged optionals in base take 2 patch set from Joshua Brindle. + +1.12.17 2006-05-30 + * Revert 1.12.16. + +1.12.16 2006-05-30 + * Merged cleaner fix for bool_ids overflow from Karl MacMillan, + replacing the prior patch. + +1.12.15 2006-05-30 + * Merged fixes for several memory leaks in the error paths during + policy read from Serge Hallyn. + +1.12.14 2006-05-25 + * Fixed bool_ids overflow bug in cond_node_find and cond_copy_list, + based on bug report and suggested fix by Cedric Roux. + +1.12.13 2006-05-24 + * Merged sens_copy_callback, check_role_hierarchy_callback, + and node_from_record fixes from Serge Hallyn. + +1.12.12 2006-05-22 + * Added sepol_policydb_compat_net() interface for testing whether + a policy requires the compatibility support for network checks + to be enabled in the kernel. + +1.12.11 2006-05-17 + * Merged patch to initialize sym_val_to_name arrays from Kevin Carr. + Reworked to use calloc in the first place, and converted some other + malloc/memset pairs to calloc calls. + +1.12.10 2006-05-08 + * Merged patch to revert role/user decl upgrade from Karl MacMillan. + +1.12.9 2006-05-08 + * Dropped tests from all Makefile target. + +1.12.8 2006-05-05 + * Merged fix warnings patch from Karl MacMillan. + +1.12.7 2006-05-05 + * Merged libsepol test framework patch from Karl MacMillan. + +1.12.6 2006-04-28 + * Fixed cond_normalize to traverse the entire cond list at link time. + +1.12.5 2006-04-03 + * Merged fix for leak of optional package sections from Ivan Gyurdiev. + 1.12.4 2006-03-29 * Generalize test for bitmap overflow in ebitmap_set_bit. ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/Makefile#2 (text+ko) ==== @@ -14,4 +14,8 @@ clean: $(MAKE) -C src clean $(MAKE) -C utils clean + $(MAKE) -C tests clean + +test: + $(MAKE) -C tests test ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/VERSION#2 (text+ko) ==== @@ -1,1 +1,1 @@ -1.12.4 +1.12.23 ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/include/sepol/boolean_record.h#2 (text+ko) ==== @@ -10,59 +10,42 @@ typedef struct sepol_bool_key sepol_bool_key_t; /* Key */ -extern int sepol_bool_key_create( - sepol_handle_t* handle, - const char* name, - sepol_bool_key_t** key); +extern int sepol_bool_key_create(sepol_handle_t * handle, + const char *name, sepol_bool_key_t ** key); + +extern void sepol_bool_key_unpack(const sepol_bool_key_t * key, + const char **name); -extern void sepol_bool_key_unpack( - const sepol_bool_key_t* key, - const char** name); +extern int sepol_bool_key_extract(sepol_handle_t * handle, + const sepol_bool_t * boolean, + sepol_bool_key_t ** key_ptr); -extern int sepol_bool_key_extract( - sepol_handle_t* handle, - const sepol_bool_t* boolean, - sepol_bool_key_t** key_ptr); +extern void sepol_bool_key_free(sepol_bool_key_t * key); -extern void sepol_bool_key_free( - sepol_bool_key_t* key); +extern int sepol_bool_compare(const sepol_bool_t * boolean, + const sepol_bool_key_t * key); -extern int sepol_bool_compare( - const sepol_bool_t* boolean, - const sepol_bool_key_t* key); +extern int sepol_bool_compare2(const sepol_bool_t * boolean, + const sepol_bool_t * boolean2); -extern int sepol_bool_compare2( - const sepol_bool_t* boolean, - const sepol_bool_t* boolean2); - /* Name */ -extern const char* sepol_bool_get_name( - const sepol_bool_t* boolean); +extern const char *sepol_bool_get_name(const sepol_bool_t * boolean); -extern int sepol_bool_set_name( - sepol_handle_t* handle, - sepol_bool_t* boolean, - const char* name); +extern int sepol_bool_set_name(sepol_handle_t * handle, + sepol_bool_t * boolean, const char *name); /* Value */ -extern int sepol_bool_get_value( - const sepol_bool_t* boolean); +extern int sepol_bool_get_value(const sepol_bool_t * boolean); -extern void sepol_bool_set_value( - sepol_bool_t* boolean, - int value); +extern void sepol_bool_set_value(sepol_bool_t * boolean, int value); /* Create/Clone/Destroy */ -extern int sepol_bool_create( - sepol_handle_t* handle, - sepol_bool_t** bool_ptr); +extern int sepol_bool_create(sepol_handle_t * handle, sepol_bool_t ** bool_ptr); -extern int sepol_bool_clone( - sepol_handle_t* handle, - const sepol_bool_t* boolean, - sepol_bool_t** bool_ptr); +extern int sepol_bool_clone(sepol_handle_t * handle, + const sepol_bool_t * boolean, + sepol_bool_t ** bool_ptr); -extern void sepol_bool_free( - sepol_bool_t* boolean); +extern void sepol_bool_free(sepol_bool_t * boolean); #endif ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/include/sepol/booleans.h#2 (text+ko) ==== @@ -13,47 +13,37 @@ policy for the boolean settings in the boolean configuration file. The binary policy is rewritten in place in memory. Returns 0 upon success, or -1 otherwise. */ -extern int sepol_genbools( - void *data, size_t len, - char *boolpath); +extern int sepol_genbools(void *data, size_t len, char *boolpath); /* Given an existing binary policy (starting at 'data', with length 'len') and boolean settings specified by the parallel arrays ('names', 'values') with 'nel' elements, rewrite the binary policy for the boolean settings. The binary policy is rewritten in place in memory. Returns 0 upon success or -1 otherwise. */ -extern int sepol_genbools_array( - void *data, size_t len, - char **names, int *values, - int nel); +extern int sepol_genbools_array(void *data, size_t len, + char **names, int *values, int nel); /*---------------end compatbility------------*/ /* Set the specified boolean */ -extern int sepol_bool_set ( - sepol_handle_t* handle, - sepol_policydb_t* policydb, - const sepol_bool_key_t* key, - const sepol_bool_t* data); +extern int sepol_bool_set(sepol_handle_t * handle, + sepol_policydb_t * policydb, + const sepol_bool_key_t * key, + const sepol_bool_t * data); /* Return the number of booleans */ -extern int sepol_bool_count( - sepol_handle_t* handle, - const sepol_policydb_t* p, - unsigned int* response); +extern int sepol_bool_count(sepol_handle_t * handle, + const sepol_policydb_t * p, unsigned int *response); /* Check if the specified boolean exists */ -extern int sepol_bool_exists( - sepol_handle_t* handle, - const sepol_policydb_t* policydb, - const sepol_bool_key_t* key, - int* response); +extern int sepol_bool_exists(sepol_handle_t * handle, + const sepol_policydb_t * policydb, + const sepol_bool_key_t * key, int *response); /* Query a boolean - returns the boolean, or NULL if not found */ -extern int sepol_bool_query( - sepol_handle_t* handle, - const sepol_policydb_t* p, - const sepol_bool_key_t* key, - sepol_bool_t** response); +extern int sepol_bool_query(sepol_handle_t * handle, + const sepol_policydb_t * p, + const sepol_bool_key_t * key, + sepol_bool_t ** response); /* Iterate the booleans * The handler may return: @@ -61,12 +51,9 @@ * 1 to signal successful exit * 0 to signal continue */ -extern int sepol_bool_iterate( - sepol_handle_t* handle, - const sepol_policydb_t* policydb, - int (*fn)( - const sepol_bool_t* boolean, - void* fn_arg), - void* arg); +extern int sepol_bool_iterate(sepol_handle_t * handle, + const sepol_policydb_t * policydb, + int (*fn) (const sepol_bool_t * boolean, + void *fn_arg), void *arg); #endif ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/include/sepol/context.h#2 (text+ko) ==== @@ -7,25 +7,19 @@ /* -- Deprecated -- */ -extern int sepol_check_context( - const char *context); +extern int sepol_check_context(const char *context); /* -- End deprecated -- */ -extern int sepol_context_check( - sepol_handle_t* handle, - const sepol_policydb_t* policydb, - const sepol_context_t* context); +extern int sepol_context_check(sepol_handle_t * handle, + const sepol_policydb_t * policydb, + const sepol_context_t * context); -extern int sepol_mls_contains( - sepol_handle_t* handle, - const sepol_policydb_t* policydb, - const char* mls1, - const char* mls2, - int* response); +extern int sepol_mls_contains(sepol_handle_t * handle, + const sepol_policydb_t * policydb, + const char *mls1, + const char *mls2, int *response); -extern int sepol_mls_check( - sepol_handle_t* handle, - const sepol_policydb_t* policydb, - const char* mls); +extern int sepol_mls_check(sepol_handle_t * handle, + const sepol_policydb_t * policydb, const char *mls); #endif ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/include/sepol/context_record.h#2 (text+ko) ==== @@ -1,5 +1,5 @@ #ifndef _SEPOL_CONTEXT_RECORD_H_ -#define _SEPOL_CONTEXT_RECORD_H_ +#define _SEPOL_CONTEXT_RECORD_H_ #include @@ -10,63 +10,44 @@ * in a data collection by itself */ /* User */ -extern const char* sepol_context_get_user( - const sepol_context_t* con); +extern const char *sepol_context_get_user(const sepol_context_t * con); -extern int sepol_context_set_user( - sepol_handle_t* handle, - sepol_context_t* con, - const char* user); +extern int sepol_context_set_user(sepol_handle_t * handle, + sepol_context_t * con, const char *user); /* Role */ -extern const char* sepol_context_get_role( - const sepol_context_t* con); +extern const char *sepol_context_get_role(const sepol_context_t * con); -extern int sepol_context_set_role( - sepol_handle_t* handle, - sepol_context_t* con, - const char* role); +extern int sepol_context_set_role(sepol_handle_t * handle, + sepol_context_t * con, const char *role); /* Type */ -extern const char* sepol_context_get_type( - const sepol_context_t* con); +extern const char *sepol_context_get_type(const sepol_context_t * con); -extern int sepol_context_set_type( - sepol_handle_t* handle, - sepol_context_t* con, - const char* type); +extern int sepol_context_set_type(sepol_handle_t * handle, + sepol_context_t * con, const char *type); /* MLS */ -extern const char* sepol_context_get_mls( - const sepol_context_t* con); +extern const char *sepol_context_get_mls(const sepol_context_t * con); -extern int sepol_context_set_mls( - sepol_handle_t* handle, - sepol_context_t* con, - const char* mls_range); +extern int sepol_context_set_mls(sepol_handle_t * handle, + sepol_context_t * con, const char *mls_range); /* Create/Clone/Destroy */ -extern int sepol_context_create( - sepol_handle_t* handle, - sepol_context_t** con_ptr); +extern int sepol_context_create(sepol_handle_t * handle, + sepol_context_t ** con_ptr); -extern int sepol_context_clone( - sepol_handle_t* handle, - const sepol_context_t* con, - sepol_context_t** con_ptr); +extern int sepol_context_clone(sepol_handle_t * handle, + const sepol_context_t * con, + sepol_context_t ** con_ptr); -extern void sepol_context_free( - sepol_context_t* con); +extern void sepol_context_free(sepol_context_t * con); /* Parse to/from string */ -extern int sepol_context_from_string( - sepol_handle_t* handle, - const char* str, - sepol_context_t** con); +extern int sepol_context_from_string(sepol_handle_t * handle, + const char *str, sepol_context_t ** con); -extern int sepol_context_to_string( - sepol_handle_t* handle, - const sepol_context_t* con, - char** str_ptr); +extern int sepol_context_to_string(sepol_handle_t * handle, + const sepol_context_t * con, char **str_ptr); -#endif +#endif ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/include/sepol/debug.h#2 (text+ko) ==== @@ -11,29 +11,24 @@ #define SEPOL_MSG_WARN 2 #define SEPOL_MSG_INFO 3 -extern int sepol_msg_get_level( - sepol_handle_t* handle); +extern int sepol_msg_get_level(sepol_handle_t * handle); -extern const char* sepol_msg_get_channel( - sepol_handle_t* handle); +extern const char *sepol_msg_get_channel(sepol_handle_t * handle); -extern const char* sepol_msg_get_fname( - sepol_handle_t* handle); +extern const char *sepol_msg_get_fname(sepol_handle_t * handle); /* Set the messaging callback. * By the default, the callback will print * the message on standard output, in a * particular format. Passing NULL here * indicates that messaging should be suppressed */ -extern void sepol_msg_set_callback( - sepol_handle_t* handle, +extern void sepol_msg_set_callback(sepol_handle_t * handle, #ifdef __GNUC__ - __attribute__ ((format (printf, 3, 4))) + __attribute__ ((format(printf, 3, 4))) +#endif + void (*msg_callback) (void *varg, + sepol_handle_t * + handle, + const char *fmt, ...), + void *msg_callback_arg); #endif - void (*msg_callback) ( - void* varg, - sepol_handle_t* handle, - const char* fmt, - ...), - void* msg_callback_arg); -#endif ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/include/sepol/iface_record.h#2 (text+ko) ==== @@ -1,5 +1,5 @@ #ifndef _SEPOL_IFACE_RECORD_H_ -#define _SEPOL_IFACE_RECORD_H_ +#define _SEPOL_IFACE_RECORD_H_ #include #include @@ -10,68 +10,50 @@ typedef struct sepol_iface_key sepol_iface_key_t; /* Key */ -extern int sepol_iface_compare( - const sepol_iface_t* iface, - const sepol_iface_key_t* key); +extern int sepol_iface_compare(const sepol_iface_t * iface, + const sepol_iface_key_t * key); -extern int sepol_iface_compare2( - const sepol_iface_t* iface, - const sepol_iface_t* iface2); +extern int sepol_iface_compare2(const sepol_iface_t * iface, + const sepol_iface_t * iface2); -extern void sepol_iface_key_unpack( - const sepol_iface_key_t* key, - const char** name); +extern void sepol_iface_key_unpack(const sepol_iface_key_t * key, + const char **name); -extern int sepol_iface_key_create( - sepol_handle_t* handle, - const char* name, - sepol_iface_key_t** key_ptr); +extern int sepol_iface_key_create(sepol_handle_t * handle, + const char *name, + sepol_iface_key_t ** key_ptr); -extern int sepol_iface_key_extract( - sepol_handle_t* handle, - const sepol_iface_t* iface, - sepol_iface_key_t** key_ptr); +extern int sepol_iface_key_extract(sepol_handle_t * handle, + const sepol_iface_t * iface, + sepol_iface_key_t ** key_ptr); -extern void sepol_iface_key_free( - sepol_iface_key_t* key); +extern void sepol_iface_key_free(sepol_iface_key_t * key); /* Name */ -extern const char* sepol_iface_get_name( - const sepol_iface_t* iface); +extern const char *sepol_iface_get_name(const sepol_iface_t * iface); -extern int sepol_iface_set_name( - sepol_handle_t* handle, - sepol_iface_t* iface, - const char* name); +extern int sepol_iface_set_name(sepol_handle_t * handle, + sepol_iface_t * iface, const char *name); /* Context */ -extern sepol_context_t* sepol_iface_get_ifcon( - const sepol_iface_t* iface); +extern sepol_context_t *sepol_iface_get_ifcon(const sepol_iface_t * iface); -extern int sepol_iface_set_ifcon( - sepol_handle_t* handle, - sepol_iface_t* iface, - sepol_context_t* con); +extern int sepol_iface_set_ifcon(sepol_handle_t * handle, + sepol_iface_t * iface, sepol_context_t * con); -extern sepol_context_t* sepol_iface_get_msgcon( - const sepol_iface_t* iface); +extern sepol_context_t *sepol_iface_get_msgcon(const sepol_iface_t * iface); -extern int sepol_iface_set_msgcon( - sepol_handle_t* handle, - sepol_iface_t* iface, - sepol_context_t* con); +extern int sepol_iface_set_msgcon(sepol_handle_t * handle, + sepol_iface_t * iface, sepol_context_t * con); /* Create/Clone/Destroy */ -extern int sepol_iface_create( - sepol_handle_t* handle, - sepol_iface_t** iface_ptr); +extern int sepol_iface_create(sepol_handle_t * handle, + sepol_iface_t ** iface_ptr); -extern int sepol_iface_clone( - sepol_handle_t* handle, - const sepol_iface_t* iface, - sepol_iface_t** iface_ptr); +extern int sepol_iface_clone(sepol_handle_t * handle, + const sepol_iface_t * iface, + sepol_iface_t ** iface_ptr); -extern void sepol_iface_free( - sepol_iface_t* iface); +extern void sepol_iface_free(sepol_iface_t * iface); #endif ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/include/sepol/interfaces.h#2 (text+ko) ==== @@ -6,33 +6,28 @@ #include /* Return the number of interfaces */ -extern int sepol_iface_count( - sepol_handle_t* handle, - const sepol_policydb_t* policydb, - unsigned int* response); +extern int sepol_iface_count(sepol_handle_t * handle, + const sepol_policydb_t * policydb, + unsigned int *response); /* Check if an interface exists */ -extern int sepol_iface_exists( - sepol_handle_t* handle, - const sepol_policydb_t* policydb, - const sepol_iface_key_t* key, - int* response); +extern int sepol_iface_exists(sepol_handle_t * handle, + const sepol_policydb_t * policydb, + const sepol_iface_key_t * key, int *response); /* Query an interface - returns the interface, * or NULL if not found */ -extern int sepol_iface_query( - sepol_handle_t* handle, - const sepol_policydb_t* policydb, - const sepol_iface_key_t* key, - sepol_iface_t** response); +extern int sepol_iface_query(sepol_handle_t * handle, + const sepol_policydb_t * policydb, + const sepol_iface_key_t * key, + sepol_iface_t ** response); /* Modify an interface, or add it, if the key * is not found */ -extern int sepol_iface_modify( - sepol_handle_t* handle, - sepol_policydb_t* policydb, - const sepol_iface_key_t* key, - const sepol_iface_t* data); +extern int sepol_iface_modify(sepol_handle_t * handle, + sepol_policydb_t * policydb, + const sepol_iface_key_t * key, + const sepol_iface_t * data); /* Iterate the interfaces * The handler may return: @@ -40,12 +35,9 @@ * 1 to signal successful exit * 0 to signal continue */ -extern int sepol_iface_iterate( - sepol_handle_t* handle, - const sepol_policydb_t* policydb, - int (*fn)( - const sepol_iface_t* iface, - void* fn_arg), - void* arg); +extern int sepol_iface_iterate(sepol_handle_t * handle, + const sepol_policydb_t * policydb, + int (*fn) (const sepol_iface_t * iface, + void *fn_arg), void *arg); #endif ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/include/sepol/module.h#2 (text+ko) ==== @@ -6,73 +6,77 @@ #include #include -#include +#include struct sepol_module_package; typedef struct sepol_module_package sepol_module_package_t; /* Module package public interfaces. */ -extern int sepol_module_package_create(sepol_module_package_t **p); +extern int sepol_module_package_create(sepol_module_package_t ** p); + +extern void sepol_module_package_free(sepol_module_package_t * p); + +extern char *sepol_module_package_get_file_contexts(sepol_module_package_t * p); -extern void sepol_module_package_free(sepol_module_package_t *p); +extern size_t sepol_module_package_get_file_contexts_len(sepol_module_package_t + * p); -extern char *sepol_module_package_get_file_contexts(sepol_module_package_t *p); +extern int sepol_module_package_set_file_contexts(sepol_module_package_t * p, + char *data, size_t len); -extern size_t sepol_module_package_get_file_contexts_len(sepol_module_package_t *p); +extern char *sepol_module_package_get_seusers(sepol_module_package_t * p); -extern int sepol_module_package_set_file_contexts(sepol_module_package_t *p, - char *data, - size_t len); +extern size_t sepol_module_package_get_seusers_len(sepol_module_package_t * p); -extern char *sepol_module_package_get_seusers(sepol_module_package_t *p); +extern int sepol_module_package_set_seusers(sepol_module_package_t * p, + char *data, size_t len); -extern size_t sepol_module_package_get_seusers_len(sepol_module_package_t *p); +extern char *sepol_module_package_get_user_extra(sepol_module_package_t * p); -extern int sepol_module_package_set_seusers(sepol_module_package_t *p, - char *data, - size_t len); +extern size_t sepol_module_package_get_user_extra_len(sepol_module_package_t * + p); -extern char *sepol_module_package_get_user_extra(sepol_module_package_t *p); +extern int sepol_module_package_set_user_extra(sepol_module_package_t * p, + char *data, size_t len); -extern size_t sepol_module_package_get_user_extra_len(sepol_module_package_t *p); +extern char *sepol_module_package_get_netfilter_contexts(sepol_module_package_t + * p); -extern int sepol_module_package_set_user_extra(sepol_module_package_t *p, - char *data, - size_t len); +extern size_t +sepol_module_package_get_netfilter_contexts_len(sepol_module_package_t * p); +extern int sepol_module_package_set_netfilter_contexts(sepol_module_package_t * + p, char *data, + size_t len); -extern sepol_policydb_t *sepol_module_package_get_policy(sepol_module_package_t *p); +extern sepol_policydb_t *sepol_module_package_get_policy(sepol_module_package_t + * p); -extern int sepol_link_packages(sepol_handle_t *handle, - sepol_module_package_t *base, - sepol_module_package_t **modules, - int num_modules, - int verbose); +extern int sepol_link_packages(sepol_handle_t * handle, + sepol_module_package_t * base, + sepol_module_package_t ** modules, + int num_modules, int verbose); -extern int sepol_module_package_read(sepol_module_package_t *mod, - struct sepol_policy_file *file, +extern int sepol_module_package_read(sepol_module_package_t * mod, + struct sepol_policy_file *file, int verbose); -extern int sepol_module_package_info(struct sepol_policy_file *file, +extern int sepol_module_package_info(struct sepol_policy_file *file, int *type, char **name, char **version); -extern int sepol_module_package_write(sepol_module_package_t *p, +extern int sepol_module_package_write(sepol_module_package_t * p, struct sepol_policy_file *file); /* Module linking/expanding public interfaces. */ -extern int sepol_link_modules(sepol_handle_t *handle, - sepol_policydb_t *base, - sepol_policydb_t **modules, - size_t len, - int verbose); +extern int sepol_link_modules(sepol_handle_t * handle, + sepol_policydb_t * base, + sepol_policydb_t ** modules, + size_t len, int verbose); -extern int sepol_expand_module(sepol_handle_t *handle, - sepol_policydb_t *base, - sepol_policydb_t *out, - int verbose, - int check); +extern int sepol_expand_module(sepol_handle_t * handle, + sepol_policydb_t * base, + sepol_policydb_t * out, int verbose, int check); #endif - ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsepol/include/sepol/node_record.h#2 (text+ko) ==== @@ -1,5 +1,5 @@ #ifndef _SEPOL_NODE_RECORD_H_ -#define _SEPOL_NODE_RECORD_H_ +#define _SEPOL_NODE_RECORD_H_ #include #include @@ -14,114 +14,79 @@ #define SEPOL_PROTO_IP6 1 /* Key */ -extern int sepol_node_compare( - const sepol_node_t* node, - const sepol_node_key_t* key); +extern int sepol_node_compare(const sepol_node_t * node, + const sepol_node_key_t * key); -extern int sepol_node_compare2( - const sepol_node_t* node, - const sepol_node_t* node2); +extern int sepol_node_compare2(const sepol_node_t * node, + const sepol_node_t * node2); -extern int sepol_node_key_create( - sepol_handle_t* handle, - const char* addr, - const char* mask, - int proto, - sepol_node_key_t** key_ptr); +extern int sepol_node_key_create(sepol_handle_t * handle, + const char *addr, + const char *mask, + int proto, sepol_node_key_t ** key_ptr); -extern void sepol_node_key_unpack( - const sepol_node_key_t* key, - const char** addr, - const char** mask, - int* proto); +extern void sepol_node_key_unpack(const sepol_node_key_t * key, + const char **addr, + const char **mask, int *proto); -extern int sepol_node_key_extract( - sepol_handle_t* handle, - const sepol_node_t* node, - sepol_node_key_t** key_ptr); +extern int sepol_node_key_extract(sepol_handle_t * handle, + const sepol_node_t * node, + sepol_node_key_t ** key_ptr); -extern void sepol_node_key_free( - sepol_node_key_t* key); +extern void sepol_node_key_free(sepol_node_key_t * key); /* Address */ -extern int sepol_node_get_addr( - sepol_handle_t* handle, - const sepol_node_t* node, - char** addr); +extern int sepol_node_get_addr(sepol_handle_t * handle, + const sepol_node_t * node, char **addr); -extern int sepol_node_get_addr_bytes( - sepol_handle_t* handle, - const sepol_node_t* node, - char** addr, - size_t* addr_sz); +extern int sepol_node_get_addr_bytes(sepol_handle_t * handle, + const sepol_node_t * node, + char **addr, size_t * addr_sz); -extern int sepol_node_set_addr( - sepol_handle_t* handle, - sepol_node_t* node, - int proto, - const char* addr); +extern int sepol_node_set_addr(sepol_handle_t * handle, + sepol_node_t * node, + int proto, const char *addr); -extern int sepol_node_set_addr_bytes( - sepol_handle_t* handle, - sepol_node_t* node, - const char* addr, - size_t addr_sz); +extern int sepol_node_set_addr_bytes(sepol_handle_t * handle, + sepol_node_t * node, + const char *addr, size_t addr_sz); /* Netmask */ -extern int sepol_node_get_mask( - sepol_handle_t* handle, - const sepol_node_t* node, - char** mask); +extern int sepol_node_get_mask(sepol_handle_t * handle, + const sepol_node_t * node, char **mask); -extern int sepol_node_get_mask_bytes( - sepol_handle_t* handle, - const sepol_node_t* node, - char** mask, - size_t* mask_sz); +extern int sepol_node_get_mask_bytes(sepol_handle_t * handle, + const sepol_node_t * node, + char **mask, size_t * mask_sz); -extern int sepol_node_set_mask( - sepol_handle_t* handle, - sepol_node_t* node, - int proto, - const char* mask); +extern int sepol_node_set_mask(sepol_handle_t * handle, + sepol_node_t * node, + int proto, const char *mask); -extern int sepol_node_set_mask_bytes( - sepol_handle_t* handle, - sepol_node_t* node, - const char* mask, - size_t mask_sz); +extern int sepol_node_set_mask_bytes(sepol_handle_t * handle, + sepol_node_t * node, + const char *mask, size_t mask_sz); /* Protocol */ -extern int sepol_node_get_proto( - const sepol_node_t* node); +extern int sepol_node_get_proto(const sepol_node_t * node); -extern void sepol_node_set_proto( - sepol_node_t* node, - int proto); +extern void sepol_node_set_proto(sepol_node_t * node, int proto); -extern const char* sepol_node_get_proto_str( - int proto); +extern const char *sepol_node_get_proto_str(int proto); /* Context */ -extern sepol_context_t* sepol_node_get_con( - const sepol_node_t* node); +extern sepol_context_t *sepol_node_get_con(const sepol_node_t * node); -extern int sepol_node_set_con( - sepol_handle_t* handle, - sepol_node_t* node, - sepol_context_t* con); +extern int sepol_node_set_con(sepol_handle_t * handle, + sepol_node_t * node, sepol_context_t * con); /* Create/Clone/Destroy */ -extern int sepol_node_create( - sepol_handle_t* handle, - sepol_node_t** node_ptr); +extern int sepol_node_create(sepol_handle_t * handle, sepol_node_t ** node_ptr); -extern int sepol_node_clone( >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Aug 15 18:24:24 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 56A9D16A4E1; Tue, 15 Aug 2006 18:24:24 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 1959D16A4DA for ; Tue, 15 Aug 2006 18:24:24 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9EFCE43D76 for ; Tue, 15 Aug 2006 18:24:21 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7FIOLsM041125 for ; Tue, 15 Aug 2006 18:24:21 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7FIOLYd041122 for perforce@freebsd.org; Tue, 15 Aug 2006 18:24:21 GMT (envelope-from jhb@freebsd.org) Date: Tue, 15 Aug 2006 18:24:21 GMT Message-Id: <200608151824.k7FIOLYd041122@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Cc: Subject: PERFORCE change 104087 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Aug 2006 18:24:24 -0000 http://perforce.freebsd.org/chv.cgi?CH=104087 Change 104087 by jhb@jhb_mutex on 2006/08/15 18:24:16 Tweak. Affected files ... .. //depot/projects/smpng/sys/kern/kern_sx.c#37 edit Differences ... ==== //depot/projects/smpng/sys/kern/kern_sx.c#37 (text+ko) ==== @@ -426,7 +426,7 @@ /* * Second, see if it looks like td is blocked on the shared - * condvar. + * condition variable. */ sx = (struct sx *)((char *)cv - offsetof(struct sx, sx_shrd_cv)); if (LOCK_CLASS(&sx->sx_object) == &lock_class_sx && From owner-p4-projects@FreeBSD.ORG Tue Aug 15 18:26:30 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1955116A5EE; Tue, 15 Aug 2006 18:26:30 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 E5E8F16A5E5 for ; Tue, 15 Aug 2006 18:26:29 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7082C43D58 for ; Tue, 15 Aug 2006 18:26:26 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7FIQQLT041752 for ; Tue, 15 Aug 2006 18:26:26 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7FIQOcI041744 for perforce@freebsd.org; Tue, 15 Aug 2006 18:26:24 GMT (envelope-from millert@freebsd.org) Date: Tue, 15 Aug 2006 18:26:24 GMT Message-Id: <200608151826.k7FIQOcI041744@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 104088 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Aug 2006 18:26:30 -0000 http://perforce.freebsd.org/chv.cgi?CH=104088 Change 104088 by millert@millert_macbook on 2006/08/15 18:25:27 Update to libselinux 1.30.22 from sourceforge Affected files ... .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/ChangeLog#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/Makefile#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/VERSION#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/include/selinux/av_permissions.h#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/include/selinux/avc.h#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/include/selinux/context.h#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/include/selinux/flask.h#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/include/selinux/get_context_list.h#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/include/selinux/get_default_type.h#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/include/selinux/selinux.h#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/man/man3/getfscreatecon.3#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/man/man3/matchpathcon.3#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/man/man8/booleans.8#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/man/man8/matchpathcon.8#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/src/Makefile#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/src/av_inherit.h#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/src/av_perm_to_string.h#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/src/avc.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/src/avc_internal.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/src/avc_internal.h#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/src/avc_sidtab.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/src/avc_sidtab.h#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/src/booleans.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/src/canonicalize_context.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/src/checkAccess.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/src/check_context.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/src/class_to_string.h#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/src/common_perm_to_string.h#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/src/compat_file_path.h#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/src/compute_av.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/src/compute_create.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/src/compute_member.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/src/compute_relabel.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/src/compute_user.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/src/context.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/src/context_internal.h#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/src/disable.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/src/enabled.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/src/fgetfilecon.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/src/file_path_suffixes.h#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/src/freecon.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/src/freeconary.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/src/fsetfilecon.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/src/get_context_list.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/src/get_context_list_internal.h#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/src/get_default_type.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/src/get_file_contexts.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/src/getcon.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/src/getenforce.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/src/getexeccon.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/src/getfilecon.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/src/getfscreatecon.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/src/getkeycreatecon.c#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/src/getpeercon.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/src/getpidcon.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/src/getprevcon.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/src/getprocattrcon.c#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/src/init.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/src/is_customizable_type.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/src/lgetfilecon.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/src/load_migscs.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/src/load_policy.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/src/lsetfilecon.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/src/matchmediacon.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/src/matchpathcon.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/src/policy.h#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/src/policyvers.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/src/query_user_context.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/src/rpm.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/src/sedarwin_config.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/src/selinux.py#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/src/selinux_config.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/src/selinux_internal.h#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/src/selinux_netlink.h#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/src/selinuxswig.i#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/src/selinuxswig_wrap.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/src/setcon.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/src/setenforce.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/src/setexeccon.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/src/setfilecon.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/src/setfscreatecon.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/src/setkeycreatecon.c#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/src/setprocattrcon.c#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/src/setrans_client.c#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/src/setrans_internal.h#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/src/seusers.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/src/trans.c#2 delete .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/utils/Makefile#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/utils/avcstat.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/utils/compute_av.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/utils/compute_create.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/utils/compute_member.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/utils/compute_relabel.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/utils/compute_user.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/utils/getcon.c#2 delete .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/utils/getconlist.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/utils/getenforce.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/utils/getfilecon.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/utils/getpidcon.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/utils/getsebool.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/utils/getseuser.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/utils/matchpathcon.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/utils/policyvers.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/utils/selinuxenabled.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/utils/setenforce.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/utils/setfilecon.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/utils/setsebool.c#2 delete .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/utils/togglesebool.c#2 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/ChangeLog#2 (text+ko) ==== @@ -1,3 +1,90 @@ +1.30.22 2006-08-03 + * Merged no-tls-direct-seg-refs patch from Jeremy Katz. + +1.30.21 2006-08-03 + * Merged netfilter_contexts support patch from Chris PeBenito. + +1.30.20 2006-08-01 + * Merged context_*_set errno patch from Jim Meyering. + +1.30.19 2006-06-29 + * Lindent. + +1.30.18 2006-06-27 + * Merged {get,set}procattrcon patch set from Eric Paris. + * Merged re-base of keycreate patch originally by Michael LeMay from Eric Paris. + +1.30.17 2006-06-27 + * Regenerated Flask headers from refpolicy. + +1.30.16 2006-06-26 + * Merged patch from Dan Walsh with: + - Added selinux_file_context_{cmp,verify}. + - Added selinux_lsetfilecon_default. + - Delay translation of contexts in matchpathcon. + +1.30.15 2006-06-16 + * Merged patch from Dan Walsh with: + * Added selinux_getpolicytype() function. + * Modified setrans code to skip processing if !mls_enabled. + +1.30.14 2006-06-16 + * Set errno in the !selinux_mnt case. + +1.30.13 2006-06-02 + * Allocate large buffers from the heap, not on stack. + Affects is_context_customizable, selinux_init_load_policy, + and selinux_getenforcemode. + +1.30.12 2006-06-02 + * Merged !selinux_mnt checks from Ian Kent. + +1.30.11 2006-05-24 + * Merged matchmediacon and trans_to_raw_context fixes from + Serge Hallyn. + +1.30.10 2006-05-22 + * Merged simple setrans client cache from Dan Walsh. + Merged avcstat patch from Russell Coker. + +1.30.9 2006-05-22 + * Modified selinux_mkload_policy() to also set /selinux/compat_net + appropriately for the loaded policy. + +1.30.8 2006-05-17 + * Added matchpathcon_fini() function to free memory allocated by + matchpathcon_init(). + +1.30.7 2006-05-16 + * Merged setrans client cleanup patch from Steve Grubb. + +1.30.6 2006-05-08 + * Merged getfscreatecon man page fix from Dan Walsh. + * Updated booleans(8) man page to drop references to the old + booleans file and to note that setsebool can be used to set + the boot-time defaults via -P. + +1.30.5 2006-05-05 + * Merged fix warnings patch from Karl MacMillan. + +1.30.4 2006-05-05 + * Merged setrans client support from Dan Walsh. + This removes use of libsetrans. + * Merged patch to eliminate use of PAGE_SIZE constant from Dan Walsh. + * Merged swig typemap fixes from Glauber de Oliveira Costa. + +1.30.3 2006-04-12 + * Added distclean target to Makefile. + * Regenerated swig files. + +1.30.2 2006-04-11 + * Changed matchpathcon_init to verify that the spec file is + a regular file. + * Merged python binding t_output_helper removal patch from Dan Walsh. + +1.30.1 2006-03-20 + * Merged Makefile PYLIBVER definition patch from Dan Walsh. + 1.30 2006-03-14 * Updated version for release. ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/Makefile#2 (text+ko) ==== @@ -17,7 +17,8 @@ relabel: $(MAKE) -C src relabel -clean: - $(MAKE) -C src clean +clean distclean: + $(MAKE) -C src $@ $(MAKE) -C utils clean +test: ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/VERSION#2 (text+ko) ==== @@ -1,1 +1,1 @@ -1.30 +1.30.22 ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/include/selinux/av_permissions.h#2 (text+ko) ==== @@ -253,6 +253,7 @@ #define TCP_SOCKET__NEWCONN 0x00800000UL #define TCP_SOCKET__ACCEPTFROM 0x01000000UL #define TCP_SOCKET__NODE_BIND 0x02000000UL +#define TCP_SOCKET__NAME_CONNECT 0x04000000UL #define UDP_SOCKET__IOCTL 0x00000001UL #define UDP_SOCKET__READ 0x00000002UL @@ -464,6 +465,9 @@ #define PROCESS__DYNTRANSITION 0x00800000UL #define PROCESS__SETCURRENT 0x01000000UL #define PROCESS__EXECMEM 0x02000000UL +#define PROCESS__EXECSTACK 0x04000000UL +#define PROCESS__EXECHEAP 0x08000000UL +#define PROCESS__SETKEYCREATE 0x10000000UL #define IPC__CREATE 0x00000001UL #define IPC__DESTROY 0x00000002UL @@ -522,6 +526,7 @@ #define SECURITY__SETENFORCE 0x00000080UL #define SECURITY__SETBOOL 0x00000100UL #define SECURITY__SETSECPARAM 0x00000200UL +#define SECURITY__SETCHECKREQPROT 0x00000400UL #define SYSTEM__IPC_INFO 0x00000001UL #define SYSTEM__SYSLOG_READ 0x00000002UL @@ -838,6 +843,8 @@ #define NETLINK_AUDIT_SOCKET__NLMSG_READ 0x00400000UL #define NETLINK_AUDIT_SOCKET__NLMSG_WRITE 0x00800000UL +#define NETLINK_AUDIT_SOCKET__NLMSG_RELAY 0x01000000UL +#define NETLINK_AUDIT_SOCKET__NLMSG_READPRIV 0x02000000UL #define NETLINK_IP6FW_SOCKET__IOCTL 0x00000001UL #define NETLINK_IP6FW_SOCKET__READ 0x00000002UL @@ -902,4 +909,62 @@ #define ASSOCIATION__SENDTO 0x00000001UL #define ASSOCIATION__RECVFROM 0x00000002UL +#define ASSOCIATION__SETCONTEXT 0x00000004UL +#define NETLINK_KOBJECT_UEVENT_SOCKET__IOCTL 0x00000001UL +#define NETLINK_KOBJECT_UEVENT_SOCKET__READ 0x00000002UL +#define NETLINK_KOBJECT_UEVENT_SOCKET__WRITE 0x00000004UL +#define NETLINK_KOBJECT_UEVENT_SOCKET__CREATE 0x00000008UL +#define NETLINK_KOBJECT_UEVENT_SOCKET__GETATTR 0x00000010UL +#define NETLINK_KOBJECT_UEVENT_SOCKET__SETATTR 0x00000020UL +#define NETLINK_KOBJECT_UEVENT_SOCKET__LOCK 0x00000040UL +#define NETLINK_KOBJECT_UEVENT_SOCKET__RELABELFROM 0x00000080UL +#define NETLINK_KOBJECT_UEVENT_SOCKET__RELABELTO 0x00000100UL +#define NETLINK_KOBJECT_UEVENT_SOCKET__APPEND 0x00000200UL +#define NETLINK_KOBJECT_UEVENT_SOCKET__BIND 0x00000400UL +#define NETLINK_KOBJECT_UEVENT_SOCKET__CONNECT 0x00000800UL +#define NETLINK_KOBJECT_UEVENT_SOCKET__LISTEN 0x00001000UL +#define NETLINK_KOBJECT_UEVENT_SOCKET__ACCEPT 0x00002000UL +#define NETLINK_KOBJECT_UEVENT_SOCKET__GETOPT 0x00004000UL +#define NETLINK_KOBJECT_UEVENT_SOCKET__SETOPT 0x00008000UL +#define NETLINK_KOBJECT_UEVENT_SOCKET__SHUTDOWN 0x00010000UL +#define NETLINK_KOBJECT_UEVENT_SOCKET__RECVFROM 0x00020000UL +#define NETLINK_KOBJECT_UEVENT_SOCKET__SENDTO 0x00040000UL +#define NETLINK_KOBJECT_UEVENT_SOCKET__RECV_MSG 0x00080000UL +#define NETLINK_KOBJECT_UEVENT_SOCKET__SEND_MSG 0x00100000UL +#define NETLINK_KOBJECT_UEVENT_SOCKET__NAME_BIND 0x00200000UL + +#define APPLETALK_SOCKET__IOCTL 0x00000001UL +#define APPLETALK_SOCKET__READ 0x00000002UL +#define APPLETALK_SOCKET__WRITE 0x00000004UL +#define APPLETALK_SOCKET__CREATE 0x00000008UL +#define APPLETALK_SOCKET__GETATTR 0x00000010UL +#define APPLETALK_SOCKET__SETATTR 0x00000020UL +#define APPLETALK_SOCKET__LOCK 0x00000040UL +#define APPLETALK_SOCKET__RELABELFROM 0x00000080UL +#define APPLETALK_SOCKET__RELABELTO 0x00000100UL +#define APPLETALK_SOCKET__APPEND 0x00000200UL +#define APPLETALK_SOCKET__BIND 0x00000400UL +#define APPLETALK_SOCKET__CONNECT 0x00000800UL +#define APPLETALK_SOCKET__LISTEN 0x00001000UL +#define APPLETALK_SOCKET__ACCEPT 0x00002000UL +#define APPLETALK_SOCKET__GETOPT 0x00004000UL +#define APPLETALK_SOCKET__SETOPT 0x00008000UL +#define APPLETALK_SOCKET__SHUTDOWN 0x00010000UL +#define APPLETALK_SOCKET__RECVFROM 0x00020000UL +#define APPLETALK_SOCKET__SENDTO 0x00040000UL +#define APPLETALK_SOCKET__RECV_MSG 0x00080000UL +#define APPLETALK_SOCKET__SEND_MSG 0x00100000UL +#define APPLETALK_SOCKET__NAME_BIND 0x00200000UL + +#define PACKET__SEND 0x00000001UL +#define PACKET__RECV 0x00000002UL +#define PACKET__RELABELTO 0x00000004UL + +#define KEY__VIEW 0x00000001UL +#define KEY__READ 0x00000002UL +#define KEY__WRITE 0x00000004UL +#define KEY__SEARCH 0x00000008UL +#define KEY__LINK 0x00000010UL +#define KEY__SETATTR 0x00000020UL +#define KEY__CREATE 0x00000040UL ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/include/selinux/avc.h#2 (text+ko) ==== @@ -12,20 +12,19 @@ #include #ifdef __cplusplus -extern "C" -{ +extern "C" { #endif /* * SID format and operations */ -struct security_id { - security_context_t ctx; - unsigned int refcnt; -}; -typedef struct security_id *security_id_t; + struct security_id { + security_context_t ctx; + unsigned int refcnt; + }; + typedef struct security_id *security_id_t; -#define SECSID_WILD (security_id_t)NULL /* unspecified SID */ +#define SECSID_WILD (security_id_t)NULL /* unspecified SID */ /** * avc_sid_to_context - get copy of context corresponding to SID. @@ -38,7 +37,7 @@ * failure, with @errno set to %ENOMEM if insufficient memory was * available to make the copy, or %EINVAL if the input SID is invalid. */ -int avc_sid_to_context(security_id_t sid, security_context_t *ctx); + int avc_sid_to_context(security_id_t sid, security_context_t * ctx); /** * avc_context_to_sid - get SID for context. @@ -51,7 +50,7 @@ * to the SID structure into the memory referenced by @sid, * returning %0 on success or -%1 on error with @errno set. */ -int avc_context_to_sid(security_context_t ctx, security_id_t *sid); + int avc_context_to_sid(security_context_t ctx, security_id_t * sid); /** * sidget - increment SID reference counter. @@ -63,7 +62,7 @@ * reference count). Note that avc_context_to_sid() also * increments reference counts. */ -int sidget(security_id_t sid); + int sidget(security_id_t sid); /** * sidput - decrement SID reference counter. @@ -75,16 +74,15 @@ * zero, the SID is invalid, and avc_context_to_sid() must * be called to obtain a new SID for the security context. */ -int sidput(security_id_t sid); - + int sidput(security_id_t sid); /* * AVC entry */ -struct avc_entry; -struct avc_entry_ref { - struct avc_entry *ae; -}; + struct avc_entry; + struct avc_entry_ref { + struct avc_entry *ae; + }; /** * avc_entry_ref_init - initialize an AVC entry reference. @@ -108,43 +106,42 @@ * listening thread won't be started for kernel policy change messages. * If no locking callbacks are passed, no locking will take place. */ -struct avc_memory_callback { - /* malloc() equivalent. */ - void *(*func_malloc)(size_t size); - /* free() equivalent. */ - void (*func_free) (void *ptr); - /* Note that these functions should set errno on failure. - If not, some avc routines may return -1 without errno set. */ -}; + struct avc_memory_callback { + /* malloc() equivalent. */ + void *(*func_malloc) (size_t size); + /* free() equivalent. */ + void (*func_free) (void *ptr); + /* Note that these functions should set errno on failure. + If not, some avc routines may return -1 without errno set. */ + }; -struct avc_log_callback { - /* log the printf-style format and arguments. */ - void (*func_log)(const char *fmt, ...); - /* store a string representation of auditdata (corresponding - to the given security class) into msgbuf. */ - void (*func_audit)(void *auditdata, security_class_t class, - char *msgbuf, size_t msgbufsize); -}; + struct avc_log_callback { + /* log the printf-style format and arguments. */ + void (*func_log) (const char *fmt, ...); + /* store a string representation of auditdata (corresponding + to the given security class) into msgbuf. */ + void (*func_audit) (void *auditdata, security_class_t class, + char *msgbuf, size_t msgbufsize); + }; -struct avc_thread_callback { - /* create and start a thread, returning an opaque pointer to it; - the thread should run the given function. */ - void *(*func_create_thread)(void (*run)(void)); - /* cancel a given thread and free its resources. */ - void (*func_stop_thread)(void *thread); -}; + struct avc_thread_callback { + /* create and start a thread, returning an opaque pointer to it; + the thread should run the given function. */ + void *(*func_create_thread) (void (*run) (void)); + /* cancel a given thread and free its resources. */ + void (*func_stop_thread) (void *thread); + }; -struct avc_lock_callback { - /* create a lock and return an opaque pointer to it. */ - void *(*func_alloc_lock)(void); - /* obtain a given lock, blocking if necessary. */ - void (*func_get_lock)(void *lock); - /* release a given lock. */ - void (*func_release_lock)(void *lock); - /* destroy a given lock (free memory, etc.) */ - void (*func_free_lock)(void *lock); -}; - + struct avc_lock_callback { + /* create a lock and return an opaque pointer to it. */ + void *(*func_alloc_lock) (void); + /* obtain a given lock, blocking if necessary. */ + void (*func_get_lock) (void *lock); + /* release a given lock. */ + void (*func_release_lock) (void *lock); + /* destroy a given lock (free memory, etc.) */ + void (*func_free_lock) (void *lock); + }; /* * AVC operations @@ -165,11 +162,11 @@ * for those callbacks (see the definition of the callback * structures above). */ -int avc_init(const char *msgprefix, - const struct avc_memory_callback *mem_callbacks, - const struct avc_log_callback *log_callbacks, - const struct avc_thread_callback *thread_callbacks, - const struct avc_lock_callback *lock_callbacks); + int avc_init(const char *msgprefix, + const struct avc_memory_callback *mem_callbacks, + const struct avc_log_callback *log_callbacks, + const struct avc_thread_callback *thread_callbacks, + const struct avc_lock_callback *lock_callbacks); /** * avc_cleanup - Remove unused SIDs and AVC entries. @@ -179,7 +176,7 @@ * AVC entries that reference them. This can be used * to return memory to the system. */ -void avc_cleanup(void); + void avc_cleanup(void); /** * avc_reset - Flush the cache and reset statistics. @@ -189,7 +186,7 @@ * The SID mapping is not affected. Return %0 on success, * -%1 with @errno set on error. */ -int avc_reset(void); + int avc_reset(void); /** * avc_destroy - Free all AVC structures. @@ -200,7 +197,7 @@ * callbacks will not. All SID's will be invalidated. * User must call avc_init() if further use of AVC is desired. */ -void avc_destroy(void); + void avc_destroy(void); /** * avc_has_perm_noaudit - Check permissions but perform no auditing. @@ -223,12 +220,12 @@ * auditing, e.g. in cases where a lock must be held for the check but * should be released for the auditing. */ -int avc_has_perm_noaudit(security_id_t ssid, - security_id_t tsid, - security_class_t tclass, - access_vector_t requested, - struct avc_entry_ref *aeref, - struct av_decision *avd); + int avc_has_perm_noaudit(security_id_t ssid, + security_id_t tsid, + security_class_t tclass, + access_vector_t requested, + struct avc_entry_ref *aeref, + struct av_decision *avd); /** * avc_has_perm - Check permissions and perform any appropriate auditing. @@ -248,9 +245,9 @@ * permissions are granted, -%1 with @errno set to %EACCES if any permissions * are denied or to another value upon other errors. */ -int avc_has_perm(security_id_t ssid, security_id_t tsid, - security_class_t tclass, access_vector_t requested, - struct avc_entry_ref *aeref, void *auditdata); + int avc_has_perm(security_id_t ssid, security_id_t tsid, + security_class_t tclass, access_vector_t requested, + struct avc_entry_ref *aeref, void *auditdata); /** * avc_audit - Audit the granting or denial of permissions. @@ -271,11 +268,9 @@ * be performed under a lock, to allow the lock to be released * before calling the auditing code. */ -void avc_audit(security_id_t ssid, security_id_t tsid, - security_class_t tclass, access_vector_t requested, - struct av_decision *avd, int result, void *auditdata); - - + void avc_audit(security_id_t ssid, security_id_t tsid, + security_class_t tclass, access_vector_t requested, + struct av_decision *avd, int result, void *auditdata); /* * security event callback facility @@ -306,16 +301,14 @@ * @perms based on @tclass. Returns %0 on success or * -%1 if insufficient memory exists to add the callback. */ -int avc_add_callback(int (*callback)(u_int32_t event, security_id_t ssid, - security_id_t tsid, - security_class_t tclass, - access_vector_t perms, - access_vector_t *out_retained), - u_int32_t events, security_id_t ssid, - security_id_t tsid, - security_class_t tclass, access_vector_t perms); - - + int avc_add_callback(int (*callback) + (u_int32_t event, security_id_t ssid, + security_id_t tsid, security_class_t tclass, + access_vector_t perms, + access_vector_t * out_retained), + u_int32_t events, security_id_t ssid, + security_id_t tsid, security_class_t tclass, + access_vector_t perms); /* * AVC statistics @@ -326,16 +319,16 @@ */ #define AVC_CACHE_STATS 1 -struct avc_cache_stats { - unsigned entry_lookups; - unsigned entry_hits; - unsigned entry_misses; - unsigned entry_discards; - unsigned cav_lookups; - unsigned cav_hits; - unsigned cav_probes; - unsigned cav_misses; -}; + struct avc_cache_stats { + unsigned entry_lookups; + unsigned entry_hits; + unsigned entry_misses; + unsigned entry_discards; + unsigned cav_lookups; + unsigned cav_hits; + unsigned cav_probes; + unsigned cav_misses; + }; /** * avc_cache_stats - get cache access statistics. @@ -346,7 +339,7 @@ * avc_reset(). See the structure definition for * details. */ -void avc_cache_stats(struct avc_cache_stats *stats); + void avc_cache_stats(struct avc_cache_stats *stats); /** * avc_av_stats - log av table statistics. @@ -355,7 +348,7 @@ * distribution of the access vector table. The audit * callback is used to print the message. */ -void avc_av_stats(void); + void avc_av_stats(void); /** * avc_sid_stats - log SID table statistics. @@ -364,10 +357,9 @@ * distribution of the SID table. The audit callback * is used to print the message. */ -void avc_sid_stats(void); + void avc_sid_stats(void); #ifdef __cplusplus } #endif - -#endif /* _SELINUX_AVC_H_ */ +#endif /* _SELINUX_AVC_H_ */ ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/include/selinux/context.h#2 (text+ko) ==== @@ -2,23 +2,22 @@ #define _SELINUX_CONTEXT_H_ #ifdef __cplusplus -extern "C" -{ +extern "C" { #endif /* * Functions to deal with security contexts in user space. */ -typedef struct { - void * ptr; -} context_s_t; + typedef struct { + void *ptr; + } context_s_t; -typedef context_s_t *context_t; + typedef context_s_t *context_t; /* Return a new context initialized to a context string */ -extern context_t context_new(const char *); + extern context_t context_new(const char *); /* * Return a pointer to the string value of the context_t @@ -26,27 +25,26 @@ * for the same context_t* */ -extern char* context_str(context_t); + extern char *context_str(context_t); /* Free the storage used by a context */ -extern void context_free(context_t); + extern void context_free(context_t); /* Get a pointer to the string value of a context component */ -extern const char* context_type_get(context_t); -extern const char* context_range_get(context_t); -extern const char* context_role_get(context_t); -extern const char* context_user_get(context_t); + extern const char *context_type_get(context_t); + extern const char *context_range_get(context_t); + extern const char *context_role_get(context_t); + extern const char *context_user_get(context_t); /* Set a context component. Returns nonzero if unsuccessful */ -extern int context_type_set(context_t,const char*); -extern int context_range_set(context_t,const char*); -extern int context_role_set(context_t,const char*); -extern int context_user_set(context_t,const char*); + extern int context_type_set(context_t, const char *); + extern int context_range_set(context_t, const char *); + extern int context_role_set(context_t, const char *); + extern int context_user_set(context_t, const char *); #ifdef __cplusplus } #endif - #endif ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/include/selinux/flask.h#2 (text+ko) ==== @@ -59,6 +59,10 @@ #define SECCLASS_DBUS 52 #define SECCLASS_NSCD 53 #define SECCLASS_ASSOCIATION 54 +#define SECCLASS_NETLINK_KOBJECT_UEVENT_SOCKET 55 +#define SECCLASS_APPLETALK_SOCKET 56 +#define SECCLASS_PACKET 57 +#define SECCLASS_KEY 58 /* * Security identifier indices for initial entities ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/include/selinux/get_context_list.h#2 (text+ko) ==== @@ -4,8 +4,7 @@ #include #ifdef __cplusplus -extern "C" -{ +extern "C" { #endif #define SELINUX_DEFAULTUSER "user_u" @@ -17,16 +16,16 @@ customizable preferences. Returns number of entries in *conary. If 'fromcon' is NULL, defaults to current context. Caller must free via freeconary. */ -extern int get_ordered_context_list(const char *user, - security_context_t fromcon, - security_context_t **list); + extern int get_ordered_context_list(const char *user, + security_context_t fromcon, + security_context_t ** list); /* As above, but use the provided MLS level rather than the default level for the user. */ -int get_ordered_context_list_with_level (const char *user, - const char *level, - security_context_t fromcon, - security_context_t **list); + int get_ordered_context_list_with_level(const char *user, + const char *level, + security_context_t fromcon, + security_context_t ** list); /* Get the default security context for a user session for 'user' spawned by 'fromcon' and set *newcon to refer to it. The context @@ -35,50 +34,49 @@ If 'fromcon' is NULL, defaults to current context. Returns 0 on success or -1 otherwise. Caller must free via freecon. */ -extern int get_default_context(const char* user, - security_context_t fromcon, - security_context_t *newcon); + extern int get_default_context(const char *user, + security_context_t fromcon, + security_context_t * newcon); /* As above, but use the provided MLS level rather than the default level for the user. */ -int get_default_context_with_level(const char *user, - const char *level, - security_context_t fromcon, - security_context_t *newcon); + int get_default_context_with_level(const char *user, + const char *level, + security_context_t fromcon, + security_context_t * newcon); /* Same as get_default_context, but only return a context that has the specified role. If no reachable context exists for the user with that role, then return -1. */ -int get_default_context_with_role(const char* user, - const char *role, - security_context_t fromcon, - security_context_t *newcon); + int get_default_context_with_role(const char *user, + const char *role, + security_context_t fromcon, + security_context_t * newcon); /* Same as get_default_context, but only return a context that has the specified role and level. If no reachable context exists for the user with that role, then return -1. */ -int get_default_context_with_rolelevel(const char* user, - const char *level, - const char *role, - security_context_t fromcon, - security_context_t *newcon); + int get_default_context_with_rolelevel(const char *user, + const char *level, + const char *role, + security_context_t fromcon, + security_context_t * newcon); /* Given a list of authorized security contexts for the user, query the user to select one and set *newcon to refer to it. Caller must free via freecon. Returns 0 on sucess or -1 otherwise. */ -extern int query_user_context(security_context_t *list, - security_context_t *newcon); + extern int query_user_context(security_context_t * list, + security_context_t * newcon); /* Allow the user to manually enter a context as a fallback if a list of authorized contexts could not be obtained. Caller must free via freecon. Returns 0 on success or -1 otherwise. */ -extern int manual_user_enter_context(const char *user, - security_context_t *newcon); + extern int manual_user_enter_context(const char *user, + security_context_t * newcon); #ifdef __cplusplus } #endif - #endif ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/include/selinux/get_default_type.h#2 (text+ko) ==== @@ -6,20 +6,18 @@ #define _SELINUX_GET_DEFAULT_TYPE_H_ #ifdef __cplusplus -extern "C" -{ +extern "C" { #endif /* Return path to default type file. */ -const char *selinux_default_type_path(void); + const char *selinux_default_type_path(void); /* Get the default type (domain) for 'role' and set 'type' to refer to it. Caller must free via free(). Return 0 on success or -1 otherwise. */ -int get_default_type (const char* role, char** type); + int get_default_type(const char *role, char **type); #ifdef __cplusplus } #endif - -#endif /* ifndef _GET_DEFAULT_TYPE_H_ */ +#endif /* ifndef _GET_DEFAULT_TYPE_H_ */ ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/include/selinux/selinux.h#2 (text+ko) ==== @@ -5,29 +5,28 @@ #include #ifdef __cplusplus -extern "C" -{ +extern "C" { #endif /* Return 1 if we are running on a SELinux kernel, or 0 if not or -1 if we get an error. */ -extern int is_selinux_enabled(void); + extern int is_selinux_enabled(void); /* Return 1 if we are running on a SELinux MLS kernel, or 0 otherwise. */ -extern int is_selinux_mls_enabled(void); + extern int is_selinux_mls_enabled(void); -typedef char* security_context_t; + typedef char *security_context_t; /* Free the memory allocated for a context by any of the below get* calls. */ -extern void freecon(security_context_t con); + extern void freecon(security_context_t con); /* Free the memory allocated for a context array by security_compute_user. */ -extern void freeconary(security_context_t *con); + extern void freeconary(security_context_t * con); /* Wrappers for the /proc/pid/attr API. */ /* Get current context, and set *con to refer to it. Caller must free via freecon. */ -extern int getcon(security_context_t *con); -extern int getcon_raw(security_context_t *con); + extern int getcon(security_context_t * con); + extern int getcon_raw(security_context_t * con); /* Set the current security context to con. Note that use of this function requires that the entire application @@ -37,142 +36,151 @@ instead. Note that the application may lose access to its open descriptors as a result of a setcon() unless policy allows it to use descriptors opened by the old context. */ -extern int setcon(security_context_t con); -extern int setcon_raw(security_context_t con); + extern int setcon(security_context_t con); + extern int setcon_raw(security_context_t con); /* Get context of process identified by pid, and set *con to refer to it. Caller must free via freecon. This has not been ported to SEBSD yet. */ -//extern int getpidcon(pid_t pid, security_context_t *con); -//extern int getpidcon_raw(pid_t pid, security_context_t *con); +// extern int getpidcon(pid_t pid, security_context_t * con); +// extern int getpidcon_raw(pid_t pid, security_context_t * con); /* Get previous context (prior to last exec), and set *con to refer to it. - Caller must free via freecon. + Caller must free via freecon. This has not been ported to SEBSD yet.*/ -//extern int getprevcon(security_context_t *con); -//extern int getprevcon_raw(security_context_t *con); +// extern int getprevcon(security_context_t * con); +// extern int getprevcon_raw(security_context_t * con); /* Get exec context, and set *con to refer to it. Sets *con to NULL if no exec context has been set, i.e. using default. If non-NULL, caller must free via freecon. */ -extern int getexeccon(security_context_t *con); -extern int getexeccon_raw(security_context_t *con); + extern int getexeccon(security_context_t * con); + extern int getexeccon_raw(security_context_t * con); /* Set exec security context for the next execve. - Call with NULL if you want to reset to the default. + Call with NULL if you want to reset to the default. This is not yet supported by SEBSD. */ -//extern int setexeccon(security_context_t con); -//extern int setexeccon_raw(security_context_t con); +// extern int setexeccon(security_context_t con); +// extern int setexeccon_raw(security_context_t con); /* Get fscreate context, and set *con to refer to it. Sets *con to NULL if no fs create context has been set, i.e. using default. - If non-NULL, caller must free via freecon. + If non-NULL, caller must free via freecon. This has not been ported to SEBSD yet. */ -//extern int getfscreatecon(security_context_t *con); -//extern int getfscreatecon_raw(security_context_t *con); +// extern int getfscreatecon(security_context_t * con); +// extern int getfscreatecon_raw(security_context_t * con); /* Set the fscreate security context for subsequent file creations. - Call with NULL if you want to reset to the default. + Call with NULL if you want to reset to the default. This has not been ported to SEBSD yet. */ -//extern int setfscreatecon(security_context_t context); -//extern int setfscreatecon_raw(security_context_t context); +// extern int setfscreatecon(security_context_t context); +// extern int setfscreatecon_raw(security_context_t context); + +/* Get keycreate context, and set *con to refer to it. + Sets *con to NULL if no key create context has been set, i.e. using default. + If non-NULL, caller must free via freecon. */ + extern int getkeycreatecon(security_context_t * con); + extern int getkeycreatecon_raw(security_context_t * con); +/* Set the keycreate security context for subsequent key creations. + Call with NULL if you want to reset to the default. */ + extern int setkeycreatecon(security_context_t context); + extern int setkeycreatecon_raw(security_context_t context); /* Wrappers for the xattr API. */ /* Get file context, and set *con to refer to it. Caller must free via freecon. */ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Aug 15 18:34:02 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 10F3216A4E0; Tue, 15 Aug 2006 18:34:02 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 DB54116A4DD for ; Tue, 15 Aug 2006 18:34:01 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 135CA43D95 for ; Tue, 15 Aug 2006 18:33:45 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7FIXiwN043189 for ; Tue, 15 Aug 2006 18:33:44 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7FIXbo9043172 for perforce@freebsd.org; Tue, 15 Aug 2006 18:33:37 GMT (envelope-from millert@freebsd.org) Date: Tue, 15 Aug 2006 18:33:37 GMT Message-Id: <200608151833.k7FIXbo9043172@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 104091 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Aug 2006 18:34:02 -0000 http://perforce.freebsd.org/chv.cgi?CH=104091 Change 104091 by millert@millert_macbook on 2006/08/15 18:33:03 Update to libsemanage 1.6.13 from sourceforge Affected files ... .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/ChangeLog#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/Makefile#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/VERSION#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/include/semanage/boolean_record.h#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/include/semanage/booleans_active.h#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/include/semanage/booleans_local.h#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/include/semanage/booleans_policy.h#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/include/semanage/context_record.h#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/include/semanage/debug.h#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/include/semanage/fcontext_record.h#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/include/semanage/fcontexts_local.h#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/include/semanage/fcontexts_policy.h#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/include/semanage/handle.h#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/include/semanage/iface_record.h#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/include/semanage/interfaces_local.h#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/include/semanage/interfaces_policy.h#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/include/semanage/modules.h#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/include/semanage/node_record.h#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/include/semanage/nodes_local.h#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/include/semanage/nodes_policy.h#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/include/semanage/port_record.h#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/include/semanage/ports_local.h#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/include/semanage/ports_policy.h#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/include/semanage/seuser_record.h#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/include/semanage/seusers_local.h#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/include/semanage/seusers_policy.h#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/include/semanage/user_record.h#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/include/semanage/users_local.h#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/include/semanage/users_policy.h#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/man/man3/semanage_bool.3#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/man/man3/semanage_bool_count.3#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/man/man3/semanage_bool_count_active.3#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/man/man3/semanage_bool_count_local.3#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/man/man3/semanage_bool_del_local.3#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/man/man3/semanage_bool_exists.3#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/man/man3/semanage_bool_exists_active.3#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/man/man3/semanage_bool_exists_local.3#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/man/man3/semanage_bool_iterate.3#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/man/man3/semanage_bool_iterate_active.3#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/man/man3/semanage_bool_iterate_local.3#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/man/man3/semanage_bool_list.3#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/man/man3/semanage_bool_list_active.3#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/man/man3/semanage_bool_list_local.3#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/man/man3/semanage_bool_modify_local.3#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/man/man3/semanage_bool_query.3#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/man/man3/semanage_bool_query_active.3#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/man/man3/semanage_bool_query_local.3#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/man/man3/semanage_bool_set_active.3#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/man/man3/semanage_count.3#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/man/man3/semanage_del.3#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/man/man3/semanage_exists.3#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/man/man3/semanage_fcontext.3#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/man/man3/semanage_fcontext_count.3#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/man/man3/semanage_fcontext_count_local.3#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/man/man3/semanage_fcontext_del_local.3#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/man/man3/semanage_fcontext_exists.3#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/man/man3/semanage_fcontext_exists_local.3#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/man/man3/semanage_fcontext_iterate.3#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/man/man3/semanage_fcontext_iterate_local.3#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/man/man3/semanage_fcontext_list.3#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/man/man3/semanage_fcontext_list_local.3#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/man/man3/semanage_fcontext_modify_local.3#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/man/man3/semanage_fcontext_query.3#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/man/man3/semanage_fcontext_query_local.3#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/man/man3/semanage_iface.3#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/man/man3/semanage_iface_count.3#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/man/man3/semanage_iface_count_local.3#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/man/man3/semanage_iface_del_local.3#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/man/man3/semanage_iface_exists.3#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/man/man3/semanage_iface_exists_local.3#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/man/man3/semanage_iface_iterate.3#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/man/man3/semanage_iface_iterate_local.3#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/man/man3/semanage_iface_list.3#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/man/man3/semanage_iface_list_local.3#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/man/man3/semanage_iface_modify_local.3#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/man/man3/semanage_iface_query.3#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/man/man3/semanage_iface_query_local.3#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/man/man3/semanage_iterate.3#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/man/man3/semanage_list.3#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/man/man3/semanage_modify.3#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/man/man3/semanage_node.3#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/man/man3/semanage_node_count.3#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/man/man3/semanage_node_count_local.3#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/man/man3/semanage_node_del_local.3#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/man/man3/semanage_node_exists.3#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/man/man3/semanage_node_exists_local.3#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/man/man3/semanage_node_iterate.3#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/man/man3/semanage_node_iterate_local.3#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/man/man3/semanage_node_list.3#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/man/man3/semanage_node_list_local.3#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/man/man3/semanage_node_modify_local.3#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/man/man3/semanage_node_query.3#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/man/man3/semanage_node_query_local.3#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/man/man3/semanage_port.3#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/man/man3/semanage_port_count.3#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/man/man3/semanage_port_count_local.3#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/man/man3/semanage_port_del_local.3#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/man/man3/semanage_port_exists.3#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/man/man3/semanage_port_exists_local.3#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/man/man3/semanage_port_iterate.3#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/man/man3/semanage_port_iterate_local.3#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/man/man3/semanage_port_list.3#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/man/man3/semanage_port_list_local.3#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/man/man3/semanage_port_modify_local.3#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/man/man3/semanage_port_query.3#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/man/man3/semanage_port_query_local.3#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/man/man3/semanage_query.3#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/man/man3/semanage_seuser.3#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/man/man3/semanage_seuser_count.3#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/man/man3/semanage_seuser_count_local.3#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/man/man3/semanage_seuser_del_local.3#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/man/man3/semanage_seuser_exists.3#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/man/man3/semanage_seuser_exists_local.3#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/man/man3/semanage_seuser_iterate.3#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/man/man3/semanage_seuser_iterate_local.3#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/man/man3/semanage_seuser_list.3#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/man/man3/semanage_seuser_list_local.3#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/man/man3/semanage_seuser_modify_local.3#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/man/man3/semanage_seuser_query.3#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/man/man3/semanage_seuser_query_local.3#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/man/man3/semanage_user.3#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/man/man3/semanage_user_count.3#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/man/man3/semanage_user_count_local.3#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/man/man3/semanage_user_del_local.3#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/man/man3/semanage_user_exists.3#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/man/man3/semanage_user_exists_local.3#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/man/man3/semanage_user_iterate.3#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/man/man3/semanage_user_iterate_local.3#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/man/man3/semanage_user_list.3#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/man/man3/semanage_user_list_local.3#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/man/man3/semanage_user_modify_local.3#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/man/man3/semanage_user_query.3#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/man/man3/semanage_user_query_local.3#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/src/Makefile#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/src/boolean_internal.h#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/src/boolean_record.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/src/booleans_active.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/src/booleans_activedb.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/src/booleans_file.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/src/booleans_local.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/src/booleans_policy.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/src/booleans_policydb.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/src/conf-parse.y#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/src/conf-scan.l#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/src/context_internal.h#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/src/context_record.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/src/database.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/src/database.h#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/src/database_activedb.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/src/database_activedb.h#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/src/database_file.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/src/database_file.h#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/src/database_join.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/src/database_join.h#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/src/database_llist.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/src/database_llist.h#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/src/database_policydb.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/src/database_policydb.h#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/src/debug.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/src/debug.h#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/src/direct_api.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/src/direct_api.h#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/src/fcontext_internal.h#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/src/fcontext_record.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/src/fcontexts_file.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/src/fcontexts_local.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/src/fcontexts_policy.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/src/handle.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/src/handle.h#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/src/handle_internal.h#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/src/iface_internal.h#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/src/iface_record.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/src/interfaces_file.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/src/interfaces_local.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/src/interfaces_policy.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/src/interfaces_policydb.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/src/module_internal.h#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/src/modules.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/src/modules.h#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/src/node_internal.h#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/src/node_record.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/src/nodes_file.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/src/nodes_local.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/src/nodes_policy.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/src/nodes_policydb.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/src/parse_utils.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/src/parse_utils.h#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/src/policy.h#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/src/policy_components.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/src/port_internal.h#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/src/port_record.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/src/ports_file.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/src/ports_local.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/src/ports_policy.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/src/ports_policydb.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/src/private.h#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/src/semanage.py#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/src/semanage_conf.h#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/src/semanage_store.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/src/semanage_store.h#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/src/semanageswig_python.i#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/src/semanageswig_wrap.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/src/seuser_internal.h#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/src/seuser_record.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/src/seusers_file.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/src/seusers_local.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/src/seusers_policy.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/src/user_base_record.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/src/user_extra_record.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/src/user_internal.h#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/src/user_record.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/src/users_base_file.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/src/users_base_policydb.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/src/users_extra_file.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/src/users_join.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/src/users_local.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/src/users_policy.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/tests/Makefile#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/tests/README#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/tests/libsemanage-tests.c#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/tests/nc_sort_malformed#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/tests/nc_sort_sorted#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/tests/nc_sort_unsorted#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/tests/test_semanage_store.c#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/tests/test_semanage_store.h#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/tests/utilities.c#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/tests/utilities.h#1 add Differences ... ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/ChangeLog#2 (text+ko) ==== @@ -1,3 +1,55 @@ +1.6.13 2006-08-03 + * Merged netfilter contexts support from Chris PeBenito. + +1.6.12 2006-07-11 + * Merged support for read operations on read-only fs from + Caleb Case (Tresys Technology). + +1.6.11 2006-06-29 + * Lindent. + +1.6.10 2006-06-26 + * Merged setfiles location check patch from Dan Walsh. + +1.6.9 2006-06-16 + * Merged several fixes from Serge Hallyn: + dbase_file_cache: deref of uninit data on error path. + dbase_policydb_cache: clear fp to avoid double fclose + semanage_fc_sort: destroy temp on error paths + +1.6.8 2006-06-02 + * Updated default location for setfiles to /sbin to + match policycoreutils. This can also be adjusted via + semanage.conf using the syntax: + [setfiles] + path = /path/to/setfiles + args = -q -c $@ $< + [end] + +1.6.7 2006-05-05 + * Merged fix warnings patch from Karl MacMillan. + +1.6.6 2006-04-14 + * Merged updated file context sorting patch from Christopher + Ashworth, with bug fix for escaped character flag. + +1.6.5 2006-04-13 + * Merged file context sorting code from Christopher Ashworth + (Tresys Technology), based on fc_sort.c code in refpolicy. + +1.6.4 2006-04-12 + * Merged python binding t_output_helper removal patch from Dan Walsh. + * Regenerated swig files. + +1.6.3 2006-03-30 + * Merged corrected fix for descriptor leak from Dan Walsh. + +1.6.2 2006-03-20 + * Merged Makefile PYLIBVER definition patch from Dan Walsh. + +1.6.1 2006-03-20 + * Merged man page reorganization from Ivan Gyurdiev. + 1.6 2006-03-14 * Updated version for release. ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/Makefile#2 (text+ko) ==== @@ -17,4 +17,6 @@ clean distclean: $(MAKE) -C src $@ + $(MAKE) -C tests $@ +test: ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/VERSION#2 (text+ko) ==== @@ -1,1 +1,1 @@ -1.6 +1.6.13 ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/include/semanage/boolean_record.h#2 (text+ko) ==== @@ -6,7 +6,7 @@ #include #ifndef _SEMANAGE_BOOL_DEFINED_ -struct semanage_bool; +struct semanage_bool; struct semanage_bool_key; typedef struct semanage_bool semanage_bool_t; typedef struct semanage_bool_key semanage_bool_key_t; @@ -14,55 +14,41 @@ #endif /* Key */ -extern int semanage_bool_key_create( - semanage_handle_t* handle, - const char* name, - semanage_bool_key_t** key); +extern int semanage_bool_key_create(semanage_handle_t * handle, + const char *name, + semanage_bool_key_t ** key); + +extern int semanage_bool_key_extract(semanage_handle_t * handle, + const semanage_bool_t * boolean, + semanage_bool_key_t ** key); -extern int semanage_bool_key_extract( - semanage_handle_t* handle, - const semanage_bool_t* boolean, - semanage_bool_key_t** key); +extern void semanage_bool_key_free(semanage_bool_key_t * key); -extern void semanage_bool_key_free( - semanage_bool_key_t* key); +extern int semanage_bool_compare(const semanage_bool_t * boolean, + const semanage_bool_key_t * key); -extern int semanage_bool_compare( - const semanage_bool_t* boolean, - const semanage_bool_key_t* key); +extern int semanage_bool_compare2(const semanage_bool_t * boolean, + const semanage_bool_t * boolean2); -extern int semanage_bool_compare2( - const semanage_bool_t* boolean, - const semanage_bool_t* boolean2); - /* Name */ -extern const char* semanage_bool_get_name( - const semanage_bool_t* boolean); +extern const char *semanage_bool_get_name(const semanage_bool_t * boolean); -extern int semanage_bool_set_name( - semanage_handle_t* handle, - semanage_bool_t* boolean, - const char* name); +extern int semanage_bool_set_name(semanage_handle_t * handle, + semanage_bool_t * boolean, const char *name); /* Value */ -extern int semanage_bool_get_value( - const semanage_bool_t* boolean); +extern int semanage_bool_get_value(const semanage_bool_t * boolean); -extern void semanage_bool_set_value( - semanage_bool_t* boolean, - int value); +extern void semanage_bool_set_value(semanage_bool_t * boolean, int value); /* Create/Clone/Destroy */ -extern int semanage_bool_create( - semanage_handle_t* handle, - semanage_bool_t** bool_ptr); +extern int semanage_bool_create(semanage_handle_t * handle, + semanage_bool_t ** bool_ptr); -extern int semanage_bool_clone( - semanage_handle_t* handle, - const semanage_bool_t* boolean, - semanage_bool_t** bool_ptr); +extern int semanage_bool_clone(semanage_handle_t * handle, + const semanage_bool_t * boolean, + semanage_bool_t ** bool_ptr); -extern void semanage_bool_free( - semanage_bool_t* boolean); +extern void semanage_bool_free(semanage_bool_t * boolean); #endif ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/include/semanage/booleans_active.h#2 (text+ko) ==== @@ -6,35 +6,28 @@ #include #include -extern int semanage_bool_set_active( - semanage_handle_t* handle, - const semanage_bool_key_t* key, - const semanage_bool_t* data); +extern int semanage_bool_set_active(semanage_handle_t * handle, + const semanage_bool_key_t * key, + const semanage_bool_t * data); -extern int semanage_bool_query_active( - semanage_handle_t* handle, - const semanage_bool_key_t* key, - semanage_bool_t** response); +extern int semanage_bool_query_active(semanage_handle_t * handle, + const semanage_bool_key_t * key, + semanage_bool_t ** response); -extern int semanage_bool_exists_active( - semanage_handle_t* handle, - const semanage_bool_key_t* key, - int* response); +extern int semanage_bool_exists_active(semanage_handle_t * handle, + const semanage_bool_key_t * key, + int *response); -extern int semanage_bool_count_active( - semanage_handle_t* handle, - unsigned int* response); +extern int semanage_bool_count_active(semanage_handle_t * handle, + unsigned int *response); -extern int semanage_bool_iterate_active( - semanage_handle_t* handle, - int (*handler) ( - const semanage_bool_t* record, - void* varg), - void* handler_arg); +extern int semanage_bool_iterate_active(semanage_handle_t * handle, + int (*handler) (const semanage_bool_t * + record, void *varg), + void *handler_arg); -extern int semanage_bool_list_active( - semanage_handle_t* handle, - semanage_bool_t*** records, - unsigned int* count); +extern int semanage_bool_list_active(semanage_handle_t * handle, + semanage_bool_t *** records, + unsigned int *count); -#endif +#endif ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/include/semanage/booleans_local.h#2 (text+ko) ==== @@ -6,39 +6,31 @@ #include #include -extern int semanage_bool_modify_local( - semanage_handle_t* handle, - const semanage_bool_key_t* key, - const semanage_bool_t* data); +extern int semanage_bool_modify_local(semanage_handle_t * handle, + const semanage_bool_key_t * key, + const semanage_bool_t * data); -extern int semanage_bool_del_local( - semanage_handle_t* handle, - const semanage_bool_key_t* key); +extern int semanage_bool_del_local(semanage_handle_t * handle, + const semanage_bool_key_t * key); -extern int semanage_bool_query_local( - semanage_handle_t* handle, - const semanage_bool_key_t* key, - semanage_bool_t** response); +extern int semanage_bool_query_local(semanage_handle_t * handle, + const semanage_bool_key_t * key, + semanage_bool_t ** response); -extern int semanage_bool_exists_local( - semanage_handle_t* handle, - const semanage_bool_key_t* key, - int* response); +extern int semanage_bool_exists_local(semanage_handle_t * handle, + const semanage_bool_key_t * key, + int *response); -extern int semanage_bool_count_local( - semanage_handle_t* handle, - unsigned int* response); +extern int semanage_bool_count_local(semanage_handle_t * handle, + unsigned int *response); -extern int semanage_bool_iterate_local( - semanage_handle_t* handle, - int (*handler) ( - const semanage_bool_t* record, - void* varg), - void* handler_arg); +extern int semanage_bool_iterate_local(semanage_handle_t * handle, + int (*handler) (const semanage_bool_t * + record, void *varg), + void *handler_arg); -extern int semanage_bool_list_local( - semanage_handle_t* handle, - semanage_bool_t*** records, - unsigned int* count); +extern int semanage_bool_list_local(semanage_handle_t * handle, + semanage_bool_t *** records, + unsigned int *count); -#endif +#endif ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/include/semanage/booleans_policy.h#2 (text+ko) ==== @@ -3,33 +3,25 @@ #ifndef _SEMANAGE_BOOLEANS_POLICY_H_ #define _SEMANAGE_BOOLEANS_POLICY_H_ -#include +#include #include -extern int semanage_bool_query( - semanage_handle_t* handle, - const semanage_bool_key_t* key, - semanage_bool_t** response); +extern int semanage_bool_query(semanage_handle_t * handle, + const semanage_bool_key_t * key, + semanage_bool_t ** response); -extern int semanage_bool_exists( - semanage_handle_t* handle, - const semanage_bool_key_t* key, - int* response); +extern int semanage_bool_exists(semanage_handle_t * handle, + const semanage_bool_key_t * key, int *response); -extern int semanage_bool_count( - semanage_handle_t* handle, - unsigned int* response); +extern int semanage_bool_count(semanage_handle_t * handle, + unsigned int *response); -extern int semanage_bool_iterate( - semanage_handle_t* handle, - int (*handler) ( - const semanage_bool_t* record, - void* varg), - void* handler_arg); +extern int semanage_bool_iterate(semanage_handle_t * handle, + int (*handler) (const semanage_bool_t * record, + void *varg), + void *handler_arg); -extern int semanage_bool_list( - semanage_handle_t* handle, - semanage_bool_t*** records, - unsigned int* count); +extern int semanage_bool_list(semanage_handle_t * handle, + semanage_bool_t *** records, unsigned int *count); #endif ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/include/semanage/context_record.h#2 (text+ko) ==== @@ -1,7 +1,7 @@ /* Copyright (C) 2005 Red Hat, Inc. */ #ifndef _SEMANAGE_CONTEXT_RECORD_H_ -#define _SEMANAGE_CONTEXT_RECORD_H_ +#define _SEMANAGE_CONTEXT_RECORD_H_ #include @@ -12,63 +12,50 @@ #endif /* User */ -extern const char* semanage_context_get_user( - const semanage_context_t* con); +extern const char *semanage_context_get_user(const semanage_context_t * con); -extern int semanage_context_set_user( - semanage_handle_t* handle, - semanage_context_t* con, - const char* user); +extern int semanage_context_set_user(semanage_handle_t * handle, + semanage_context_t * con, + const char *user); /* Role */ -extern const char* semanage_context_get_role( - const semanage_context_t* con); +extern const char *semanage_context_get_role(const semanage_context_t * con); -extern int semanage_context_set_role( - semanage_handle_t* handle, - semanage_context_t* con, - const char* role); +extern int semanage_context_set_role(semanage_handle_t * handle, + semanage_context_t * con, + const char *role); /* Type */ -extern const char* semanage_context_get_type( - const semanage_context_t* con); +extern const char *semanage_context_get_type(const semanage_context_t * con); -extern int semanage_context_set_type( - semanage_handle_t* handle, - semanage_context_t* con, - const char* type); +extern int semanage_context_set_type(semanage_handle_t * handle, + semanage_context_t * con, + const char *type); /* MLS */ -extern const char* semanage_context_get_mls( - const semanage_context_t* con); +extern const char *semanage_context_get_mls(const semanage_context_t * con); -extern int semanage_context_set_mls( - semanage_handle_t* handle, - semanage_context_t* con, - const char* mls_range); +extern int semanage_context_set_mls(semanage_handle_t * handle, + semanage_context_t * con, + const char *mls_range); /* Create/Clone/Destroy */ -extern int semanage_context_create( - semanage_handle_t* handle, - semanage_context_t** con_ptr); +extern int semanage_context_create(semanage_handle_t * handle, + semanage_context_t ** con_ptr); + +extern int semanage_context_clone(semanage_handle_t * handle, + const semanage_context_t * con, + semanage_context_t ** con_ptr); -extern int semanage_context_clone( - semanage_handle_t* handle, - const semanage_context_t* con, - semanage_context_t** con_ptr); +extern void semanage_context_free(semanage_context_t * con); -extern void semanage_context_free( - semanage_context_t* con); - /* Parse to/from string */ -extern int semanage_context_from_string( - semanage_handle_t* handle, - const char* str, - semanage_context_t** con); +extern int semanage_context_from_string(semanage_handle_t * handle, + const char *str, + semanage_context_t ** con); -extern int semanage_context_to_string( - semanage_handle_t* handle, - const semanage_context_t* con, - char** str_ptr); +extern int semanage_context_to_string(semanage_handle_t * handle, + const semanage_context_t * con, + char **str_ptr); -#endif +#endif ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/include/semanage/debug.h#2 (text+ko) ==== @@ -29,30 +29,26 @@ #define SEMANAGE_MSG_WARN 2 #define SEMANAGE_MSG_INFO 3 -extern int semanage_msg_get_level( - semanage_handle_t* handle); +extern int semanage_msg_get_level(semanage_handle_t * handle); -extern const char* semanage_msg_get_channel( - semanage_handle_t* handle); +extern const char *semanage_msg_get_channel(semanage_handle_t * handle); -extern const char* semanage_msg_get_fname( - semanage_handle_t* handle); +extern const char *semanage_msg_get_fname(semanage_handle_t * handle); /* Set the messaging callback. * By the default, the callback will print * the message on standard output, in a * particular format. Passing NULL here * indicates that messaging should be suppressed */ -extern void semanage_msg_set_callback( - semanage_handle_t* handle, +extern void semanage_msg_set_callback(semanage_handle_t * handle, #ifdef __GNUC__ - __attribute__ ((format (printf, 3, 4))) + __attribute__ ((format(printf, 3, 4))) #endif - void (*msg_callback) ( - void* varg, - semanage_handle_t* handle, - const char* fmt, - ...), - void* msg_callback_arg); + void (*msg_callback) (void *varg, + semanage_handle_t * + handle, + const char *fmt, + ...), + void *msg_callback_arg); -#endif +#endif ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/include/semanage/fcontext_record.h#2 (text+ko) ==== @@ -1,7 +1,7 @@ /* Copyright (C) 2005 Red Hat, Inc. */ #ifndef _SEMANAGE_FCONTEXT_RECORD_H_ -#define _SEMANAGE_FCONTEXT_RECORD_H_ +#define _SEMANAGE_FCONTEXT_RECORD_H_ #include #include @@ -15,36 +15,30 @@ #endif /* Key */ -extern int semanage_fcontext_compare( - const semanage_fcontext_t* fcontext, - const semanage_fcontext_key_t* key); +extern int semanage_fcontext_compare(const semanage_fcontext_t * fcontext, + const semanage_fcontext_key_t * key); -extern int semanage_fcontext_compare2( - const semanage_fcontext_t* fcontext, - const semanage_fcontext_t* fcontext2); +extern int semanage_fcontext_compare2(const semanage_fcontext_t * fcontext, + const semanage_fcontext_t * fcontext2); -extern int semanage_fcontext_key_create( - semanage_handle_t* handle, - const char* expr, - int type, - semanage_fcontext_key_t** key_ptr); +extern int semanage_fcontext_key_create(semanage_handle_t * handle, + const char *expr, + int type, + semanage_fcontext_key_t ** key_ptr); -extern int semanage_fcontext_key_extract( - semanage_handle_t* handle, - const semanage_fcontext_t* fcontext, - semanage_fcontext_key_t** key_ptr); +extern int semanage_fcontext_key_extract(semanage_handle_t * handle, + const semanage_fcontext_t * fcontext, + semanage_fcontext_key_t ** key_ptr); -extern void semanage_fcontext_key_free( - semanage_fcontext_key_t* key); +extern void semanage_fcontext_key_free(semanage_fcontext_key_t * key); /* Regexp */ -extern const char* semanage_fcontext_get_expr( - const semanage_fcontext_t* fcontext); +extern const char *semanage_fcontext_get_expr(const semanage_fcontext_t * + fcontext); -extern int semanage_fcontext_set_expr( - semanage_handle_t* handle, - semanage_fcontext_t* fcontext, - const char* expr); +extern int semanage_fcontext_set_expr(semanage_handle_t * handle, + semanage_fcontext_t * fcontext, + const char *expr); /* Type */ #define SEMANAGE_FCONTEXT_ALL 0 @@ -56,36 +50,29 @@ #define SEMANAGE_FCONTEXT_LINK 6 #define SEMANAGE_FCONTEXT_PIPE 7 -extern int semanage_fcontext_get_type( - const semanage_fcontext_t* fcontext); +extern int semanage_fcontext_get_type(const semanage_fcontext_t * fcontext); -extern const char* semanage_fcontext_get_type_str( - int type); +extern const char *semanage_fcontext_get_type_str(int type); -extern void semanage_fcontext_set_type( - semanage_fcontext_t* fcontext, - int type); +extern void semanage_fcontext_set_type(semanage_fcontext_t * fcontext, + int type); /* Context */ -extern semanage_context_t* semanage_fcontext_get_con( - const semanage_fcontext_t* fcontext); +extern semanage_context_t *semanage_fcontext_get_con(const semanage_fcontext_t * + fcontext); -extern int semanage_fcontext_set_con( - semanage_handle_t* handle, - semanage_fcontext_t* fcontext, - semanage_context_t* con); +extern int semanage_fcontext_set_con(semanage_handle_t * handle, + semanage_fcontext_t * fcontext, + semanage_context_t * con); /* Create/Clone/Destroy */ -extern int semanage_fcontext_create( - semanage_handle_t* handle, - semanage_fcontext_t** fcontext_ptr); +extern int semanage_fcontext_create(semanage_handle_t * handle, + semanage_fcontext_t ** fcontext_ptr); -extern int semanage_fcontext_clone( - semanage_handle_t* handle, - const semanage_fcontext_t* fcontext, - semanage_fcontext_t** fcontext_ptr); +extern int semanage_fcontext_clone(semanage_handle_t * handle, + const semanage_fcontext_t * fcontext, + semanage_fcontext_t ** fcontext_ptr); -extern void semanage_fcontext_free( - semanage_fcontext_t* fcontext); +extern void semanage_fcontext_free(semanage_fcontext_t * fcontext); #endif ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/include/semanage/fcontexts_local.h#2 (text+ko) ==== @@ -6,39 +6,32 @@ #include #include -extern int semanage_fcontext_modify_local( - semanage_handle_t* handle, - const semanage_fcontext_key_t* key, - const semanage_fcontext_t* data); +extern int semanage_fcontext_modify_local(semanage_handle_t * handle, + const semanage_fcontext_key_t * key, + const semanage_fcontext_t * data); -extern int semanage_fcontext_del_local( - semanage_handle_t* handle, - const semanage_fcontext_key_t* key); +extern int semanage_fcontext_del_local(semanage_handle_t * handle, + const semanage_fcontext_key_t * key); -extern int semanage_fcontext_query_local( - semanage_handle_t* handle, - const semanage_fcontext_key_t* key, - semanage_fcontext_t** response); +extern int semanage_fcontext_query_local(semanage_handle_t * handle, + const semanage_fcontext_key_t * key, + semanage_fcontext_t ** response); -extern int semanage_fcontext_exists_local( - semanage_handle_t* handle, - const semanage_fcontext_key_t* key, - int* response); +extern int semanage_fcontext_exists_local(semanage_handle_t * handle, + const semanage_fcontext_key_t * key, + int *response); -extern int semanage_fcontext_count_local( - semanage_handle_t* handle, - unsigned int* response); +extern int semanage_fcontext_count_local(semanage_handle_t * handle, + unsigned int *response); -extern int semanage_fcontext_iterate_local( - semanage_handle_t* handle, - int (*handler) ( - const semanage_fcontext_t* record, - void* varg), - void* handler_arg); +extern int semanage_fcontext_iterate_local(semanage_handle_t * handle, + int (*handler) (const + semanage_fcontext_t * + record, void *varg), + void *handler_arg); -extern int semanage_fcontext_list_local( - semanage_handle_t* handle, - semanage_fcontext_t*** records, - unsigned int* count); +extern int semanage_fcontext_list_local(semanage_handle_t * handle, + semanage_fcontext_t *** records, + unsigned int *count); -#endif +#endif ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/include/semanage/fcontexts_policy.h#2 (text+ko) ==== @@ -6,30 +6,24 @@ #include #include -extern int semanage_fcontext_query( - semanage_handle_t* handle, - const semanage_fcontext_key_t* key, - semanage_fcontext_t** response); +extern int semanage_fcontext_query(semanage_handle_t * handle, + const semanage_fcontext_key_t * key, + semanage_fcontext_t ** response); -extern int semanage_fcontext_exists( - semanage_handle_t* handle, - const semanage_fcontext_key_t* key, - int* response); +extern int semanage_fcontext_exists(semanage_handle_t * handle, + const semanage_fcontext_key_t * key, + int *response); -extern int semanage_fcontext_count( - semanage_handle_t* handle, - unsigned int* response); +extern int semanage_fcontext_count(semanage_handle_t * handle, + unsigned int *response); -extern int semanage_fcontext_iterate( - semanage_handle_t* handle, - int (*handler) ( - const semanage_fcontext_t* record, - void* varg), - void* handler_arg); +extern int semanage_fcontext_iterate(semanage_handle_t * handle, + int (*handler) (const semanage_fcontext_t * + record, void *varg), + void *handler_arg); -extern int semanage_fcontext_list( - semanage_handle_t* handle, - semanage_fcontext_t*** records, - unsigned int* count); +extern int semanage_fcontext_list(semanage_handle_t * handle, + semanage_fcontext_t *** records, + unsigned int *count); -#endif +#endif ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/include/semanage/handle.h#2 (text+ko) ==== @@ -41,33 +41,33 @@ /* This is the type of connection to the store, for now only * direct is supported */ enum semanage_connect_type { - SEMANAGE_CON_INVALID = 0, SEMANAGE_CON_DIRECT, - SEMANAGE_CON_POLSERV_LOCAL, SEMANAGE_CON_POLSERV_REMOTE + SEMANAGE_CON_INVALID = 0, SEMANAGE_CON_DIRECT, + SEMANAGE_CON_POLSERV_LOCAL, SEMANAGE_CON_POLSERV_REMOTE }; /* This function allows you to specify the store to connect to. * It must be called after semanage_handle_create but before * semanage_connect. The argument should be the full path to the store. */ -void semanage_select_store(semanage_handle_t *handle, char *path, - enum semanage_connect_type storetype); +void semanage_select_store(semanage_handle_t * handle, char *path, + enum semanage_connect_type storetype); /* Just reload the policy */ -int semanage_reload_policy(semanage_handle_t *handle); +int semanage_reload_policy(semanage_handle_t * handle); /* set whether to reload the policy or not after a commit, * 1 for yes (default), 0 for no */ -void semanage_set_reload(semanage_handle_t *handle, int do_reload); +void semanage_set_reload(semanage_handle_t * handle, int do_reload); /* set whether to rebuild the policy on commit, even if no * changes were performed. * 1 for yes, 0 for no (default) */ -void semanage_set_rebuild(semanage_handle_t *handle, int do_rebuild); +void semanage_set_rebuild(semanage_handle_t * handle, int do_rebuild); /* create the store if it does not exist, this only has an effect on * direct connections and must be called before semanage_connect * 1 for yes, 0 for no (default) */ -void semanage_set_create_store(semanage_handle_t *handle, int create_store); >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Aug 15 18:36:59 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 270BD16A4DF; Tue, 15 Aug 2006 18:36:59 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 008B616A4DD for ; Tue, 15 Aug 2006 18:36:59 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2F49E43D5E for ; Tue, 15 Aug 2006 18:36:50 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7FIaoOJ043483 for ; Tue, 15 Aug 2006 18:36:50 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7FIamTm043480 for perforce@freebsd.org; Tue, 15 Aug 2006 18:36:49 GMT (envelope-from millert@freebsd.org) Date: Tue, 15 Aug 2006 18:36:49 GMT Message-Id: <200608151836.k7FIamTm043480@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 104092 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Aug 2006 18:36:59 -0000 http://perforce.freebsd.org/chv.cgi?CH=104092 Change 104092 by millert@millert_macbook on 2006/08/15 18:36:39 Update to policycoreutils 1.30.25 from sourceforge Affected files ... .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/ChangeLog#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/Makefile#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/VERSION#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/audit2allow/Makefile#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/audit2allow/audit2allow#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/audit2allow/audit2allow.1#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/audit2allow/avc.py#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/audit2why/audit2why.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/load_policy/load_policy.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/newrole/newrole.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/po/Makefile#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/po/POTFILES#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/po/POTFILES.in#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/po/af.po#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/po/am.po#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/po/ar.po#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/po/be.po#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/po/bg.po#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/po/bn.po#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/po/bn_IN.po#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/po/ca.po#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/po/cs.po#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/po/cy.po#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/po/da.po#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/po/de.po#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/po/el.po#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/po/en_GB.po#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/po/es.po#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/po/et.po#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/po/eu_ES.po#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/po/fa.po#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/po/fi.po#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/po/fr.po#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/po/gl.po#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/po/gu.po#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/po/he.po#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/po/hi.po#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/po/hr.po#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/po/hu.po#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/po/hy.po#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/po/id.po#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/po/is.po#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/po/it.po#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/po/ja.po#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/po/ka.po#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/po/kn.po#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/po/ko.po#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/po/ku.po#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/po/lo.po#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/po/lt.po#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/po/lv.po#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/po/mk.po#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/po/ml.po#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/po/mr.po#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/po/ms.po#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/po/my.po#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/po/nb.po#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/po/nl.po#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/po/nn.po#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/po/no.po#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/po/nso.po#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/po/or.po#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/po/pa.po#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/po/pl.po#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/po/policycoreutils.pot#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/po/pt.po#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/po/pt_BR.po#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/po/ro.po#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/po/ru.po#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/po/si.po#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/po/sk.po#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/po/sl.po#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/po/sq.po#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/po/sr.po#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/po/sv.po#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/po/ta.po#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/po/te.po#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/po/th.po#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/po/tr.po#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/po/uk.po#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/po/ur.po#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/po/vi.po#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/po/zh_CN.po#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/po/zh_TW.po#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/po/zu.po#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/restorecon/restorecon.8#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/restorecon/restorecon.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/restorecond/Makefile#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/restorecond/restorecond.8#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/restorecond/restorecond.c#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/restorecond/restorecond.conf#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/restorecond/restorecond.h#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/restorecond/restorecond.init#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/restorecond/stringslist.c#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/restorecond/stringslist.h#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/restorecond/utmpwatcher.c#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/restorecond/utmpwatcher.h#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/run_init/open_init_pty.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/run_init/run_init.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/scripts/chcat#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/scripts/fixfiles#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/scripts/genhomedircon#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/secon/Makefile#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/secon/secon.1#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/secon/secon.c#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/semanage/semanage#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/semanage/semanage.8#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/semanage/seobject.py#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/semodule/semodule.8#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/semodule/semodule.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/semodule_deps/Makefile#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/semodule_deps/semodule_deps.8#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/semodule_deps/semodule_deps.c#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/semodule_expand/semodule_expand.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/semodule_link/semodule_link.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/semodule_package/semodule_package.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/sestatus/sestatus.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/setfiles/Makefile#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/setfiles/setfiles.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/setsebool/setsebool.8#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/setsebool/setsebool.c#2 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/ChangeLog#2 (text+ko) ==== @@ -1,3 +1,106 @@ +1.30.25 2006-08-03 + * Merged patch from Dan Walsh with: + * audit2allow: process MAC_POLICY_LOAD events + * newrole: run shell with - prefix to start a login shell + * po: po file updates + * restorecond: bail if SELinux not enabled + * fixfiles: omit -q + * genhomedircon: fix exit code if non-root + * semodule_deps: install man page + +1.30.24 2006-08-03 + * Merged secon Makefile fix from Joshua Brindle. + +1.30.23 2006-08-03 + * Merged netfilter contexts support patch from Chris PeBenito. + +1.30.22 2006-07-28 + * Merged restorecond size_t fix from Joshua Brindle. + +1.30.21 2006-07-28 + * Merged secon keycreate patch from Michael LeMay. + +1.30.20 2006-07-26 + * Merged restorecond fixes from Dan Walsh. + Merged updated po files from Dan Walsh. + +1.30.19 2006-07-26 + * Merged python gettext patch from Stephen Bennett. + +1.30.18 2006-07-25 + * Merged semodule_deps from Karl MacMillan. + +1.30.17 2006-06-29 + * Lindent. + +1.30.16 2006-06-26 + * Merged patch from Dan Walsh with: + * -p option (progress) for setfiles and restorecon. + * disable context translation for setfiles and restorecon. + * on/off values for setsebool. + +1.30.15 2006-06-26 + * Merged setfiles and semodule_link fixes from Joshua Brindle. + +1.30.14 2006-06-16 + * Merged fix for setsebool error path from Serge Hallyn. + +1.30.13 2006-06-16 + * Merged patch from Dan Walsh with: + * Updated po files. + * Fixes for genhomedircon and seobject. + * Audit message for mass relabel by setfiles. + +1.30.12 2006-06-02 + * Updated fixfiles script for new setfiles location in /sbin. + +1.30.11 2006-05-26 + * Merged more translations from Dan Walsh. + * Merged patch to relocate setfiles to /sbin for early relabel + when /usr might not be mounted from Dan Walsh. + * Merged semanage/seobject patch to preserve fcontext ordering in list. + * Merged secon patch from James Antill. + +1.30.10 2006-05-22 + * Merged patch with updates to audit2allow, secon, genhomedircon, + and semanage from Dan Walsh. + +1.30.9 2006-05-08 + * Fixed audit2allow and po Makefiles for DESTDIR= builds. + * Merged .po file patch from Dan Walsh. + * Merged bug fix for genhomedircon. + +1.30.8 2006-05-08 + * Merged patch from Dan Walsh. + This includes audit2allow changes for analysis plugins, + internationalization support for several additional programs + and added po files, some fixes for semanage, and several cleanups. + It also adds a new secon utility. + +1.30.7 2006-05-05 + * Merged fix warnings patch from Karl MacMillan. + +1.30.6 2006-04-14 + * Merged semanage prefix support from Russell Coker. + +1.30.5 2006-04-11 + * Added a test to setfiles to check that the spec file is + a regular file. + +1.30.4 2006-03-29 + * Merged audit2allow fixes for refpolicy from Dan Walsh. + * Merged fixfiles patch from Dan Walsh. + * Merged restorecond daemon from Dan Walsh. + +1.30.3 2006-03-29 + * Merged semanage non-MLS fixes from Chris PeBenito. + +1.30.2 2006-03-29 + * Merged semanage and semodule man page examples from Thomas Bleher. + +1.30.1 2006-03-20 + * Merged semanage labeling prefix patch from Ivan Gyurdiev. + 1.30 2006-03-14 * Updated version for release. ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/Makefile#2 (text+ko) ==== @@ -1,7 +1,8 @@ -SUBDIRS=setfiles semanage load_policy newrole run_init restorecon audit2allow audit2why scripts sestatus semodule_package semodule semodule_link semodule_expand setsebool po +SUBDIRS=setfiles semanage load_policy newrole run_init restorecon restorecond secon audit2allow audit2why scripts sestatus semodule_package semodule semodule_link semodule_expand semodule_deps setsebool po all install relabel clean: @for subdir in $(SUBDIRS); do \ (cd $$subdir && $(MAKE) $@) || exit 1; \ done +test: ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/VERSION#2 (text+ko) ==== @@ -1,1 +1,1 @@ -1.30 +1.30.25 ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/audit2allow/Makefile#2 (text+ko) ==== @@ -1,8 +1,11 @@ # Installation directories. PREFIX ?= ${DESTDIR}/usr BINDIR ?= $(PREFIX)/bin +LIBDIR ?= $(PREFIX)/lib MANDIR ?= $(PREFIX)/share/man LOCALEDIR ?= /usr/share/locale +PYLIBVER ?= python2.4 +PYTHONLIBDIR ?= $(LIBDIR)/$(PYLIBVER) TARGETS=audit2allow @@ -13,6 +16,8 @@ install -m 755 $(TARGETS) $(BINDIR) -mkdir -p $(MANDIR)/man1 install -m 644 audit2allow.1 $(MANDIR)/man1/ + test -d $(PYTHONLIBDIR)/site-packages || install -m 755 -d $(PYTHONLIBDIR)/site-packages + install -m 755 avc.py $(PYTHONLIBDIR)/site-packages clean: ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/audit2allow/audit2allow#2 (text+ko) ==== @@ -24,438 +24,23 @@ # 02111-1307 USA # # -import commands, sys, os, pwd, string, getopt, re, selinux - -obj="(\{[^\}]*\}|[^ \t:]*)" -allow_regexp="allow[ \t]+%s[ \t]*%s[ \t]*:[ \t]*%s[ \t]*%s" % (obj, obj, obj, obj) - -awk_script='/^[[:blank:]]*interface[[:blank:]]*\(/ {\n\ - IFACEFILE=FILENAME\n\ - IFACENAME = gensub("^[[:blank:]]*interface[[:blank:]]*\\\\(\`?","","g",$0);\n\ - IFACENAME = gensub("\'?,.*$","","g",IFACENAME);\n\ -}\n\ -\n\ -/^[[:blank:]]*allow[[:blank:]]+.*;[[:blank:]]*$/ {\n\ -\n\ - if ((length(IFACENAME) > 0) && (IFACEFILE == FILENAME)){\n\ - ALLOW = gensub("^[[:blank:]]*","","g",$0)\n\ - ALLOW = gensub(";[[:blank:]]*$","","g",$0)\n\ - print FILENAME "\\t" IFACENAME "\\t" ALLOW;\n\ - }\n\ -}\ -' - -class accessTrans: - def __init__(self): - self.dict={} - try: - fd=open("/usr/share/selinux/devel/include/support/obj_perm_sets.spt") - except IOError, error: - raise IOError("Reference policy generation requires the policy development package.\n%s" % error) - records=fd.read().split("\n") - regexp="^define *\(`([^']*)' *, *` *\{([^}]*)}'" - for r in records: - m=re.match(regexp,r) - if m!=None: - self.dict[m.groups()[0]] = m.groups()[1].split() - fd.close() - def get(self, var): - l=[] - for v in var: - if v in self.dict.keys(): - l += self.dict[v] - else: - if v not in ("{", "}"): - l.append(v) - return l - -class interfaces: - def __init__(self): - self.dict={} - trans=accessTrans() - (input, output) = os.popen2("awk -f - /usr/share/selinux/devel/include/*/*.if 2> /dev/null") - input.write(awk_script) - input.close() - records=output.read().split("\n") - input.close() - if len(records) > 0: - regexp="([^ \t]*)[ \t]+([^ \t]*)[ \t]+%s" % allow_regexp - for r in records: - m=re.match(regexp,r) - if m==None: - continue - else: - val=m.groups() - file=os.path.basename(val[0]).split(".")[0] - iface=val[1] - Scon=val[2].split() - Tcon=val[3].split() - Class=val[4].split() - Access=trans.get(val[5].split()) - for s in Scon: - for t in Tcon: - for c in Class: - if (s, t, c) not in self.dict.keys(): - self.dict[(s, t, c)]=[] - self.dict[(s, t, c)].append((Access, file, iface)) - def out(self): - keys=self.dict.keys() - keys.sort() - for k in keys: - print k - for i in self.dict[k]: - print "\t", i - - def match(self, Scon, Tcon, Class, Access): - keys=self.dict.keys() - ret=[] - if (Scon, Tcon, Class) in keys: - for i in self.dict[(Scon, Tcon, Class)]: - if Access in i[0]: - if i[2].find(Access) >= 0: - ret.insert(0, i) - else: - ret.append(i) - return ret - if ("$1", Tcon, Class) in keys: - for i in self.dict[("$1", Tcon, Class)]: - if Access in i[0]: - if i[2].find(Access) >= 0: - ret.insert(0, i) - else: - ret.append(i) - return ret - if (Scon, "$1", Class) in keys: - for i in self.dict[(Scon, "$1", Class)]: - if Access in i[0]: - if i[2].find(Access) >= 0: - ret.insert(0, i) - else: - ret.append(i) - return ret - else: - return ret - - -class serule: - def __init__(self, type, source, target, seclass): - self.type=type - self.source=source - self.target=target - self.seclass=seclass - self.avcinfo={} - self.iface=None - - def add(self, avc): - for a in avc[0]: - if a not in self.avcinfo.keys(): - self.avcinfo[a]=[] - - self.avcinfo[a].append(avc[1:]) - - def getAccess(self): - if len(self.avcinfo.keys()) == 1: - for i in self.avcinfo.keys(): - return i - else: - keys=self.avcinfo.keys() - keys.sort() - ret="{" - for i in keys: - ret=ret + " " + i - ret=ret+" }" - return ret - def out(self, verbose=0): - ret="" - ret=ret+"%s %s %s:%s %s;" % (self.type, self.source, self.gettarget(), self.seclass, self.getAccess()) - if verbose: - keys=self.avcinfo.keys() - keys.sort() - for i in keys: - for x in self.avcinfo[i]: - ret=ret+"\n\t#TYPE=AVC MSG=%s " % x[0] - if len(x[1]): - ret=ret+"COMM=%s " % x[1] - if len(x[2]): - ret=ret+"NAME=%s " % x[2] - ret=ret + " : " + i - return ret - - def gen_reference_policy(self, iface): - ret="" - Scon=self.source - Tcon=self.gettarget() - Class=self.seclass - Access=self.getAccess() - m=iface.match(Scon,Tcon,Class,Access) - if len(m)==0: - return self.out() - else: - file=m[0][1] - ret="\n#%s\n"% self.out() - ret += "optional_policy(`%s', `\n" % m[0][1] - first=True - for i in m: - if file != i[1]: - ret += "')\ngen_require(`%s', `\n" % i[1] - file = i[1] - first=True - if first: - ret += "\t%s(%s)\n" % (i[2], Scon) - first=False - else: - ret += "#\t%s(%s)\n" % (i[2], Scon) - ret += "');" - return ret - - def gettarget(self): - if self.source == self.target: - return "self" - else: - return self.target - -class seruleRecords: - def __init__(self, input, last_reload=0, verbose=0, te_ind=0): - self.last_reload=last_reload - self.seRules={} - self.seclasses={} - self.types=[] - self.roles=[] - self.load(input, te_ind) - self.gen_ref_policy = False - - def gen_reference_policy(self): - self.gen_ref_policy = True - self.iface=interfaces() - - def warning(self, error): - sys.stderr.write("%s: " % sys.argv[0]) - sys.stderr.write("%s\n" % error) - sys.stderr.flush() - - def load(self, input, te_ind=0): - VALID_CMDS=("allow", "dontaudit", "auditallow", "role") - - avc=[] - found=0 - line = input.readline() - if te_ind: - while line: - rec=line.split() - if len(rec) and rec[0] in VALID_CMDS: - self.add_terule(line) - line = input.readline() - - else: - while line: - rec=line.split() - for i in rec: - if i=="avc:" or i=="message=avc:" or i=="msg='avc:": - - found=1 - else: - avc.append(i) - if found: - self.add(avc) - found=0 - avc=[] - line = input.readline() - - - def get_target(self, i, rule): - target=[] - if rule[i][0] == "{": - for t in rule[i].split("{"): - if len(t): - target.append(t) - i=i+1 - for s in rule[i:]: - if s.find("}") >= 0: - for s1 in s.split("}"): - if len(s1): - target.append(s1) - i=i+1 - return (i, target) - - target.append(s) - i=i+1 - else: - if rule[i].find(";") >= 0: - for s1 in rule[i].split(";"): - if len(s1): - target.append(s1) - else: - target.append(rule[i]) - - i=i+1 - return (i, target) - - def rules_split(self, rules): - (idx, target ) = self.get_target(0, rules) - (idx, subject) = self.get_target(idx, rules) - return (target, subject) - - def add_terule(self, rule): - rc = rule.split(":") - rules=rc[0].split() - type=rules[0] - if type == "role": - print type - (sources, targets) = self.rules_split(rules[1:]) - rules=rc[1].split() - (seclasses, access) = self.rules_split(rules) - for scon in sources: - for tcon in targets: - for seclass in seclasses: - self.add_rule(type, scon, tcon, seclass,access) - - def add_rule(self, rule_type, scon, tcon, seclass, access, msg="", comm="", name=""): - self.add_seclass(seclass, access) - self.add_type(tcon) - self.add_type(scon) - if (rule_type, scon, tcon, seclass) not in self.seRules.keys(): - self.seRules[(rule_type, scon, tcon, seclass)]=serule(rule_type, scon, tcon, seclass) - - self.seRules[(rule_type, scon, tcon, seclass)].add((access, msg, comm, name )) - - def add(self,avc): - scon="" - tcon="" - seclass="" - comm="" - name="" - msg="" - access=[] - if "security_compute_sid" in avc: - return - - if "load_policy" in avc and self.last_reload: - self.seRules={} - - if "granted" in avc: - return - try: - for i in range (0, len(avc)): - if avc[i]=="{": - i=i+1 - while i 0: - for i in self.roles: - rec += "\trole %s; \n" % i - rec += "\n" - - for i in keys: - access=self.seclasses[i] - if len(access) > 1: - access.sort() - rec += "\tclass %s {" % i - for a in access: - rec += " %s" % a - rec += " }; \n" - else: - rec += "\tclass %s %s;\n" % (i, access[0]) - - rec += "\n" - - for i in self.types: - rec += "\ttype %s; \n" % i - rec += " };\n\n\n" - return rec - - def out(self, require=0, module=""): - rec="" - if len(self.seRules.keys())==0: - raise(ValueError("No AVC messages found.")) - if module != "": - rec += self.gen_module(module) - rec += self.gen_requires() - else: - if requires: - rec+=self.gen_requires() - - keys=self.seRules.keys() - keys.sort() - for i in keys: - if self.gen_ref_policy: - rec += self.seRules[i].gen_reference_policy(self.iface)+"\n" - else: - rec += self.seRules[i].out(verbose)+"\n" - return rec - if __name__ == '__main__': - + import commands, sys, os, getopt, selinux + import gettext + try: + gettext.install('policycoreutils') + except: + pass def get_mls_flag(): if selinux.is_selinux_mls_enabled(): return "-M" else: return "" - def usage(msg=""): - print 'audit2allow [-adhilrv] [-t file ] [ -f fcfile ] [-i ] [[-m|-M] ] [-o ]\n\ + def usage(msg = ""): + print _('audit2allow [-adhilrv] [-t file ] [ -f fcfile ] [-i ] [[-m|-M] ] [-o ]\n\ -a, --all read input from audit and message log, conflicts with -i\n\ -d, --dmesg read input from output of /bin/dmesg\n\ -h, --help display this message\n\ @@ -465,10 +50,11 @@ -M generate loadable module package, conflicts with -o\n\ -o, --output append output to , conflicts with -M\n\ -r, --requires generate require output \n\ - -t, --tefile Indicates input is Existing Type Enforcement file\n\ + -t, --tefile Add input from Existing Type Enforcement file\n\ -f, --fcfile Existing Type Enforcement file, requires -M\n\ -v, --verbose verbose output\n\ - ' + -A, --analyze Analyze output\n\ + ') if msg != "": print msg sys.exit(1) @@ -483,24 +69,26 @@ # # try: - last_reload=0 - input=sys.stdin - output=sys.stdout - module="" - requires=0 - verbose=0 - auditlogs=0 - buildPP=0 - input_ind=0 - output_ind=0 - ref_ind=False - te_ind=0 + last_reload = 0 + inputfd = sys.stdin + output = sys.stdout + module = "" + requires = 0 + verbose = 0 + auditlogs = 0 + buildPP = 0 + input_ind = 0 + output_ind = 0 + ref_ind = False + analyze = False + te_inputs = [] - fc_file="" + fc_file = "" gopts, cmds = getopt.getopt(sys.argv[1:], - 'adf:hi:lm:M:o:rtvR', + 'Aadf:hi:lm:M:o:rt:vR', ['all', - 'dmesg', + 'analyze', + 'dmesg', 'fcfile=', 'help', 'input=', @@ -509,57 +97,61 @@ 'output=', 'requires', 'reference', - 'tefile', + 'tefile=', 'verbose' ]) for o,a in gopts: if o == "-a" or o == "--all": - if input_ind or te_ind: + if input_ind: usage() - input=open("/var/log/messages", "r") - auditlogs=1 + inputfd = open("/var/log/messages", "r") + auditlogs = 1 if o == "-d" or o == "--dmesg": - input=os.popen("/bin/dmesg", "r") + inputfd = os.popen("/bin/dmesg", "r") if o == "-f" or o == "--fcfile": - if a[0]=="-": + if a[0] == "-": usage() - fc_file=a + fc_file = a if o == "-h" or o == "--help": usage() if o == "-i"or o == "--input": - if auditlogs or a[0]=="-": + if auditlogs or a[0] == "-": usage() - input_ind=1 - input=open(a, "r") + input_ind = 1 + inputfd = open(a, "r") if o == '--lastreload' or o == "-l": - last_reload=1 + last_reload = 1 if o == "-m" or o == "--module": - if module != "" or a[0]=="-": + if module != "" or a[0] == "-": usage() - module=a + module = a if o == "-M": - if module != "" or output_ind or a[0]=="-": + if module != "" or output_ind or a[0] == "-": usage() - module=a - outfile=a+".te" - buildPP=1 - output=open(outfile, "w") + module = a + outfile = a+".te" + buildPP = 1 + if not os.path.exists("/usr/bin/checkmodule"): + errorExit("-M Requires the checkmodule command, you need to install the checkpolicy rpm package") + output = open(outfile, "w") if o == "-r" or o == "--requires": - requires=1 + requires = 1 if o == "-t" or o == "--tefile": - if auditlogs: - usage() - te_ind=1 + te_inputs.append(open(a, "r")) + if o == "-R" or o == "--reference": - ref_ind=True + ref_ind = True if o == "-o" or o == "--output": - if module != "" or a[0]=="-": + if module != "" or a[0] == "-": usage() - output=open(a, "a") - output_ind=1 + output = open(a, "a") + output_ind = 1 if o == "-v" or o == "--verbose": - verbose=1 + verbose = 1 + + if o == "-A" or o == "--analyze": + analyze = True if len(cmds) != 0: usage() @@ -567,42 +159,52 @@ if fc_file != "" and not buildPP: usage("Error %s: Option -fc requires -M" % sys.argv[0]) - out=seruleRecords(input, last_reload, verbose, te_ind) + serules = SERules(last_reload, verbose) + + for i in te_inputs: + te = TERules(serules) + te.load(i) + + serules.load(inputfd) if ref_ind: - out.gen_reference_policy() + serules.gen_reference_policy() + + if analyze: + serules.analyze() + sys.exit(0) - if auditlogs: - input=os.popen("ausearch -m avc") - out.load(input) + if auditlogs and os.path.exists("/var/log/audit/audit.log"): + inputfd = os.popen("ausearch -m avc,MAC_POLICY_LOAD") + serules.load(inputfd) if buildPP: - print ("Generating type enforcment file: %s.te" % module) - output.write(out.out(requires, module)) + print (_("Generating type enforcment file: %s.te") % module) + output.write(serules.out(requires, module)) output.flush() if buildPP: - cmd="checkmodule %s -m -o %s.mod %s.te" % (get_mls_flag(), module, module) - print "Compiling policy" + cmd = "checkmodule %s -m -o %s.mod %s.te" % (get_mls_flag(), module, module) + print _("Compiling policy") print cmd - rc=commands.getstatusoutput(cmd) - if rc[0]==0: - cmd="semodule_package -o %s.pp -m %s.mod" % (module, module) + rc = commands.getstatusoutput(cmd) + if rc[0] == 0: + cmd = "semodule_package -o %s.pp -m %s.mod" % (module, module) if fc_file != "": cmd = "%s -f %s" % (cmd, fc_file) print cmd - rc=commands.getstatusoutput(cmd) - if rc[0]==0: - print ("\n******************** IMPORTANT ***********************\n") - print ("In order to load this newly created policy package into the kernel,\nyou are required to execute \n\nsemodule -i %s.pp\n\n" % module) + rc = commands.getstatusoutput(cmd) + if rc[0] == 0: + print _("\n******************** IMPORTANT ***********************\n") + print (_("In order to load this newly created policy package into the kernel,\nyou are required to execute \n\nsemodule -i %s.pp\n\n") % module) else: errorExit(rc[1]) else: errorExit(rc[1]) except getopt.error, error: - errorExit("Options Error " + error.msg) + errorExit(_("Options Error: %s ") % error.msg) except ValueError, error: errorExit(error.args[0]) except IOError, error: ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/audit2allow/audit2allow.1#2 (text+ko) ==== @@ -66,7 +66,7 @@ Generate require output syntax for loadable modules. .TP .B "\-R" | "\-\-reference" -Generate reference policy using installed macros +Generate reference policy using installed macros. Requires the selinux-policy-devel package. .TP .B "\-t " | "\-\-tefile" Indicates input file is a te (type enforcement) file. This can be used to translate old te format to new policy format. @@ -98,6 +98,11 @@ .PP .SH EXAMPLE .nf +.B NOTE: These examples are for systems using the audit package. If you do +.B not use the audit package, the AVC messages will be in /var/log/messages. +.B Please substitute /var/log/messages for /var/log/audit/audit.log in the +.B examples. +.PP .B Using audit2allow to generate monolithic (non-module) policy $ cd /etc/selinux/$SELINUXTYPE/src/policy $ cat /var/log/audit/audit.log | audit2allow >> domains/misc/local.te ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/audit2why/audit2why.c#2 (text+ko) ==== @@ -15,13 +15,14 @@ #define TCONTEXT "tcontext=" #define TCLASS "tclass=" -void usage(char *progname, int rc) +void usage(char *progname, int rc) { - fprintf(stderr, "usage: %s [-p policy] < /var/log/audit/audit.log\n", progname); + fprintf(stderr, "usage: %s [-p policy] < /var/log/audit/audit.log\n", + progname); exit(rc); } -int main(int argc, char **argv) +int main(int argc, char **argv) { char path[PATH_MAX]; char *buffer = NULL, *bufcopy = NULL; @@ -62,25 +63,30 @@ if (!set_path) { if (!is_selinux_enabled()) { - fprintf(stderr, "%s: Must specify -p policy on non-SELinux systems\n", argv[0]); + fprintf(stderr, + "%s: Must specify -p policy on non-SELinux systems\n", >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Aug 15 18:41:02 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E2FFC16A4E8; Tue, 15 Aug 2006 18:41:01 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 C18A816A4DA for ; Tue, 15 Aug 2006 18:41:01 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 78ED743D69 for ; Tue, 15 Aug 2006 18:40:56 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7FIeug9043803 for ; Tue, 15 Aug 2006 18:40:56 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7FIeuIl043800 for perforce@freebsd.org; Tue, 15 Aug 2006 18:40:56 GMT (envelope-from millert@freebsd.org) Date: Tue, 15 Aug 2006 18:40:56 GMT Message-Id: <200608151840.k7FIeuIl043800@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 104094 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Aug 2006 18:41:02 -0000 http://perforce.freebsd.org/chv.cgi?CH=104094 Change 104094 by millert@millert_macbook on 2006/08/15 18:40:51 Remove extra Makefiles Affected files ... .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/programs/checkpolicy/Makefile.new#2 delete .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/programs/checkpolicy/Makefile.old#2 delete Differences ... From owner-p4-projects@FreeBSD.ORG Tue Aug 15 18:45:08 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C0D0C16A4EA; Tue, 15 Aug 2006 18:45:08 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 73B6316A4E8 for ; Tue, 15 Aug 2006 18:45:08 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8C7A443D78 for ; Tue, 15 Aug 2006 18:45:02 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7FIj2cu045823 for ; Tue, 15 Aug 2006 18:45:02 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7FIj1ai045820 for perforce@freebsd.org; Tue, 15 Aug 2006 18:45:01 GMT (envelope-from jhb@freebsd.org) Date: Tue, 15 Aug 2006 18:45:01 GMT Message-Id: <200608151845.k7FIj1ai045820@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Cc: Subject: PERFORCE change 104095 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Aug 2006 18:45:09 -0000 http://perforce.freebsd.org/chv.cgi?CH=104095 Change 104095 by jhb@jhb_mutex on 2006/08/15 18:44:37 IFC @104093 - loopback. Affected files ... .. //depot/projects/smpng/sys/arm/arm/elf_trampoline.c#10 integrate .. //depot/projects/smpng/sys/kern/kern_lock.c#54 integrate .. //depot/projects/smpng/sys/kern/kern_mutex.c#136 integrate .. //depot/projects/smpng/sys/kern/kern_sx.c#38 integrate .. //depot/projects/smpng/sys/kern/subr_turnstile.c#34 integrate .. //depot/projects/smpng/sys/sys/lockmgr.h#17 integrate .. //depot/projects/smpng/sys/sys/sx.h#21 integrate Differences ... ==== //depot/projects/smpng/sys/arm/arm/elf_trampoline.c#10 (text+ko) ==== @@ -23,7 +23,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/arm/elf_trampoline.c,v 1.11 2006/06/23 22:45:35 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/elf_trampoline.c,v 1.12 2006/08/15 18:11:25 imp Exp $"); #include #include #include @@ -36,6 +36,10 @@ #include +/* + * Since we are compiled outside of the normal kernel build process, we + * need to include opt_global.h manually. + */ #include "opt_global.h" #include "opt_kernname.h" ==== //depot/projects/smpng/sys/kern/kern_lock.c#54 (text+ko) ==== @@ -41,7 +41,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/kern_lock.c,v 1.98 2006/08/15 16:42:16 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_lock.c,v 1.99 2006/08/15 18:29:01 jhb Exp $"); #include "opt_ddb.h" ==== //depot/projects/smpng/sys/kern/kern_mutex.c#136 (text+ko) ==== @@ -34,7 +34,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/kern_mutex.c,v 1.175 2006/07/27 21:45:55 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_mutex.c,v 1.176 2006/08/15 18:26:12 jhb Exp $"); #include "opt_adaptive_mutexes.h" #include "opt_ddb.h" ==== //depot/projects/smpng/sys/kern/kern_sx.c#38 (text+ko) ==== @@ -34,7 +34,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/kern_sx.c,v 1.29 2006/07/27 21:45:55 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_sx.c,v 1.30 2006/08/15 18:29:01 jhb Exp $"); #include "opt_ddb.h" ==== //depot/projects/smpng/sys/kern/subr_turnstile.c#34 (text+ko) ==== @@ -57,7 +57,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/subr_turnstile.c,v 1.162 2006/08/15 16:44:18 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/subr_turnstile.c,v 1.163 2006/08/15 18:29:01 jhb Exp $"); #include "opt_ddb.h" #include "opt_turnstile_profiling.h" ==== //depot/projects/smpng/sys/sys/lockmgr.h#17 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)lock.h 8.12 (Berkeley) 5/19/95 - * $FreeBSD: src/sys/sys/lockmgr.h,v 1.49 2005/08/03 04:59:07 jeff Exp $ + * $FreeBSD: src/sys/sys/lockmgr.h,v 1.50 2006/08/15 18:29:01 jhb Exp $ */ #ifndef _SYS_LOCKMGR_H_ ==== //depot/projects/smpng/sys/sys/sx.h#21 (text+ko) ==== @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH * DAMAGE. * - * $FreeBSD: src/sys/sys/sx.h,v 1.24 2006/06/21 20:38:29 jhb Exp $ + * $FreeBSD: src/sys/sys/sx.h,v 1.25 2006/08/15 18:29:01 jhb Exp $ */ #ifndef _SYS_SX_H_ From owner-p4-projects@FreeBSD.ORG Tue Aug 15 18:46:11 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D2F1716A518; Tue, 15 Aug 2006 18:46:10 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 92B0916A501 for ; Tue, 15 Aug 2006 18:46:10 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7D3B343D72 for ; Tue, 15 Aug 2006 18:46:05 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7FIk5Pd045906 for ; Tue, 15 Aug 2006 18:46:05 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7FIk4OT045895 for perforce@freebsd.org; Tue, 15 Aug 2006 18:46:04 GMT (envelope-from millert@freebsd.org) Date: Tue, 15 Aug 2006 18:46:04 GMT Message-Id: <200608151846.k7FIk4OT045895@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 104096 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Aug 2006 18:46:11 -0000 http://perforce.freebsd.org/chv.cgi?CH=104096 Change 104096 by millert@millert_macbook on 2006/08/15 18:45:13 Update to checkpolicy 1.30.10 from sourceforge Affected files ... .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/programs/checkpolicy/ChangeLog#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/programs/checkpolicy/Makefile#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/programs/checkpolicy/VERSION#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/programs/checkpolicy/checkmodule.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/programs/checkpolicy/checkpolicy.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/programs/checkpolicy/checkpolicy.h#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/programs/checkpolicy/module_compiler.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/programs/checkpolicy/module_compiler.h#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/programs/checkpolicy/parse_util.c#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/programs/checkpolicy/parse_util.h#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/programs/checkpolicy/policy_parse.y#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/programs/checkpolicy/policy_scan.l#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/programs/checkpolicy/queue.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/programs/checkpolicy/queue.h#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/programs/checkpolicy/test/dismod.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/programs/checkpolicy/test/dispol.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/programs/checkpolicy/write.c#2 delete Differences ... ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/programs/checkpolicy/ChangeLog#2 (text+ko) ==== @@ -1,3 +1,30 @@ +1.30.10 2006-08-03 + * Merged symtab datum patch from Karl MacMillan. + +1.30.9 2006-06-29 + * Lindent. + +1.30.8 2006-06-29 + * Merged patch to remove TE rule conflict checking from the parser + from Joshua Brindle. This can only be done properly by the + expander. + +1.30.7 2006-06-27 + * Merged patch to make checkpolicy/checkmodule handling of + duplicate/conflicting TE rules the same as the expander + from Joshua Brindle. + +1.30.6 2006-06-26 + * Merged optionals in base take 2 patch set from Joshua Brindle. + +1.30.5 2006-05-05 + * Merged compiler cleanup patch from Karl MacMillan. + * Merged fix warnings patch from Karl MacMillan. + +1.30.4 2006-04-05 + * Changed require_class to reject permissions that have not been + declared if building a base module. + 1.30.3 2006-03-28 * Fixed checkmodule to call link_modules prior to expand_module to handle optionals. ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/programs/checkpolicy/Makefile#2 (text+ko) ==== @@ -2,7 +2,8 @@ PROG= checkpolicy -OBJS = checkpolicy.o y.tab.o policy_scan.o queue.o module_compiler.o +OBJS = checkpolicy.o y.tab.o policy_scan.o queue.o module_compiler.o \ + parse_util.o CFLAGS+= -I../../libselinux/include -I../../libsepol/include LDADD+= -L../../libselinux/src -L../../libsepol/src -L../../libsecompat ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/programs/checkpolicy/VERSION#2 (text+ko) ==== @@ -1,1 +1,1 @@ -1.30.3 +1.30.10 ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/programs/checkpolicy/checkmodule.c#2 (text+ko) ==== @@ -27,174 +27,124 @@ #include #include #include +#include #include "queue.h" #include "checkpolicy.h" +#include "parse_util.h" extern char *optarg; extern int optind; static sidtab_t sidtab; -extern policydb_t *policydbp; -extern queue_t id_queue; -extern unsigned int policydb_errors; -extern unsigned long policydb_lineno; -extern char source_file[]; extern int mlspol; -extern FILE *yyin; -extern void init_parser(int); -extern int yyparse(void); -extern void yyrestart(FILE *); - static char *txtfile = "policy.conf"; static char *binfile = "policy"; unsigned int policy_type = POLICY_BASE; unsigned int policyvers = MOD_POLICYDB_VERSION_MAX; -static int read_binary_policy(policydb_t *p, char *file, char *progname) +static int read_binary_policy(policydb_t * p, char *file, char *progname) { - int fd; + int fd; struct stat sb; - void *map; + void *map; struct policy_file f, *fp; - - fd = open(file, O_RDONLY); - if (fd < 0) { - fprintf(stderr, "Can't open '%s': %s\n", - file, strerror(errno)); - return -1; - } - if (fstat(fd, &sb) < 0) { - fprintf(stderr, "Can't stat '%s': %s\n", - file, strerror(errno)); - return -1; - } - map = mmap(NULL, sb.st_size, PROT_READ | PROT_WRITE, MAP_PRIVATE, fd, 0); - if (map == MAP_FAILED) { - fprintf(stderr, "Can't map '%s': %s\n", - file, strerror(errno)); - return -1; - } - f.type = PF_USE_MEMORY; - f.data = map; - f.len = sb.st_size; - fp = &f; + + fd = open(file, O_RDONLY); + if (fd < 0) { + fprintf(stderr, "Can't open '%s': %s\n", + file, strerror(errno)); + return -1; + } + if (fstat(fd, &sb) < 0) { + fprintf(stderr, "Can't stat '%s': %s\n", + file, strerror(errno)); + return -1; + } + map = + mmap(NULL, sb.st_size, PROT_READ | PROT_WRITE, MAP_PRIVATE, fd, 0); + if (map == MAP_FAILED) { + fprintf(stderr, "Can't map '%s': %s\n", file, strerror(errno)); + return -1; + } + f.type = PF_USE_MEMORY; + f.data = map; + f.len = sb.st_size; + fp = &f; if (policydb_init(p)) { - fprintf(stderr, "%s: policydb_init: Out of memory!\n", progname); + fprintf(stderr, "%s: policydb_init: Out of memory!\n", + progname); + return -1; + } + if (policydb_read(p, fp, 1)) { + fprintf(stderr, + "%s: error(s) encountered while parsing configuration\n", + progname); return -1; - } - if (policydb_read(p, fp, 1)) { - fprintf(stderr, "%s: error(s) encountered while parsing configuration\n", progname); - return -1; - } - - /* Check Policy Consistency */ - if (p->mls) { - if (!mlspol) { - fprintf(stderr,"%s: MLS policy, but non-MLS" - " is specified\n", progname); - return -1; - } - } else { - if (mlspol) { - fprintf(stderr,"%s: non-MLS policy, but MLS" - " is specified\n", progname); - return -1; - } - } - return 0; + } + + /* Check Policy Consistency */ + if (p->mls) { + if (!mlspol) { + fprintf(stderr, "%s: MLS policy, but non-MLS" + " is specified\n", progname); + return -1; + } + } else { + if (mlspol) { + fprintf(stderr, "%s: non-MLS policy, but MLS" + " is specified\n", progname); + return -1; + } + } + return 0; } -static int read_source_policy(policydb_t *p, char *file, char *progname) +static int write_binary_policy(policydb_t * p, char *file, char *progname) { - yyin = fopen(file, "r"); - if (!yyin) { - fprintf(stderr, "%s: unable to open %s\n", progname, - file); - return -1; - } - - if (policydb_init(p) || - ((id_queue = queue_create()) == NULL)) { - fprintf(stderr, "%s: out of memory!\n", progname); - return -1; - } + FILE *outfp = NULL; + struct policy_file pf; + int ret; - p->policy_type = policy_type; - p->mls = mlspol; + printf("%s: writing binary representation (version %d) to %s\n", + progname, policyvers, file); - init_parser(1); - if (yyparse() || policydb_errors) { - fprintf(stderr, "%s: error(s) encountered while parsing configuration\n", progname); - return -1; - } - rewind(yyin); - init_parser(2); - source_file[0] = '\0'; - yyrestart(yyin); - if (yyparse() || policydb_errors) { - fprintf(stderr, "%s: error(s) encountered while parsing configuration\n", progname); - return -1; - } - queue_destroy(id_queue); - - if (hierarchy_check_constraints(NULL, p)) { - return -1; - } - - if (policydb_errors) - return -1; + outfp = fopen(file, "w"); + if (!outfp) { + perror(file); + exit(1); + } - fclose(yyin); - return 0; -} - -static int write_binary_policy(policydb_t *p, char *file, char *progname) -{ - FILE *outfp = NULL; - struct policy_file pf; - int ret; - - printf("%s: writing binary representation (version %d) to %s\n", - progname, policyvers, file); - - outfp = fopen(file, "w"); - if (!outfp) { - perror(file); - exit(1); - } - p->policy_type = policy_type; p->policyvers = policyvers; - - pf.type = PF_USE_STDIO; - pf.fp = outfp; - ret = policydb_write(p, &pf); - if (ret) { - fprintf(stderr, "%s: error writing %s\n", - progname, file); - return -1; - } - fclose(outfp); - return 0; + + pf.type = PF_USE_STDIO; + pf.fp = outfp; + ret = policydb_write(p, &pf); + if (ret) { + fprintf(stderr, "%s: error writing %s\n", progname, file); + return -1; + } + fclose(outfp); + return 0; } static void usage(char *progname) { - printf("usage: %s [-V] [-b] [-m] [-M] [-o FILE] [INPUT]\n", - progname); - printf("Build base and policy modules.\n"); - printf("Options:\n"); - printf(" INPUT build module from INPUT (else read from \"%s\")\n", txtfile); - printf(" -V show policy versions created by this program\n"); - printf(" -b treat input as a binary policy file\n"); - printf(" -m build a policy module instead of a base module\n"); - printf(" -M enable MLS policy\n"); - printf(" -o FILE write module to FILE (else just check syntax)\n"); + printf("usage: %s [-V] [-b] [-m] [-M] [-o FILE] [INPUT]\n", progname); + printf("Build base and policy modules.\n"); + printf("Options:\n"); + printf(" INPUT build module from INPUT (else read from \"%s\")\n", + txtfile); + printf(" -V show policy versions created by this program\n"); + printf(" -b treat input as a binary policy file\n"); + printf(" -m build a policy module instead of a base module\n"); + printf(" -M enable MLS policy\n"); + printf(" -o FILE write module to FILE (else just check syntax)\n"); exit(1); } @@ -204,13 +154,13 @@ unsigned int binary = 0; int ch; int show_version = 0; - policydb_t modpolicydb; + policydb_t modpolicydb; while ((ch = getopt(argc, argv, "ho:dbVmM")) != EOF) { switch (ch) { - case 'h': - usage (argv [0]); - break; + case 'h': + usage(argv[0]); + break; case 'o': outfile = optarg; break; @@ -223,9 +173,9 @@ break; case 'm': policy_type = POLICY_MOD; - policyvers = MOD_POLICYDB_VERSION_MAX; + policyvers = MOD_POLICYDB_VERSION_MAX; break; - case 'M': + case 'M': mlspol = 1; break; default: @@ -234,8 +184,8 @@ } if (show_version) { - printf("Module versions %d-%d\n", - MOD_POLICYDB_VERSION_MIN, MOD_POLICYDB_VERSION_MAX); + printf("Module versions %d-%d\n", + MOD_POLICYDB_VERSION_MIN, MOD_POLICYDB_VERSION_MAX); exit(0); } @@ -244,27 +194,37 @@ if (optind != argc) usage(argv[0]); } - printf("%s: loading policy configuration from %s\n", argv[0], - file); + printf("%s: loading policy configuration from %s\n", argv[0], file); - /* Set policydb and sidtab used by libsepol service functions - to my structures, so that I can directly populate and - manipulate them. */ - sepol_set_policydb(&modpolicydb); - sepol_set_sidtab(&sidtab); + /* Set policydb and sidtab used by libsepol service functions + to my structures, so that I can directly populate and + manipulate them. */ + sepol_set_policydb(&modpolicydb); + sepol_set_sidtab(&sidtab); - policydbp = &modpolicydb; if (binary) { - if (read_binary_policy(policydbp, file, argv[0]) == -1) { - exit(1); - } + if (read_binary_policy(&modpolicydb, file, argv[0]) == -1) { + exit(1); + } } else { - if (read_source_policy(policydbp, file, argv[0]) == -1) { - exit(1); - } - } + if (policydb_init(&modpolicydb)) { + fprintf(stderr, "%s: out of memory!\n", argv[0]); + return -1; + } + + modpolicydb.policy_type = policy_type; + modpolicydb.mls = mlspol; + + if (read_source_policy(&modpolicydb, file, argv[0]) == -1) { + exit(1); + } + + if (hierarchy_check_constraints(NULL, &modpolicydb)) { + return -1; + } + } - if (policydbp->policy_type == POLICY_BASE) { + if (modpolicydb.policy_type == POLICY_BASE) { /* Verify that we can successfully expand the base module. */ policydb_t kernpolicydb; @@ -272,28 +232,31 @@ fprintf(stderr, "%s: policydb_init failed\n", argv[0]); exit(1); } - if (link_modules(NULL, policydbp, NULL, 0, 0)) { + if (link_modules(NULL, &modpolicydb, NULL, 0, 0)) { fprintf(stderr, "%s: link modules failed\n", argv[0]); exit(1); } - if (expand_module(NULL, policydbp, &kernpolicydb, 0, 1)) { + if (expand_module(NULL, &modpolicydb, &kernpolicydb, 0, 1)) { fprintf(stderr, "%s: expand module failed\n", argv[0]); exit(1); } policydb_destroy(&kernpolicydb); } - if (policydb_load_isids(policydbp, &sidtab)) + if (policydb_load_isids(&modpolicydb, &sidtab)) exit(1); + sepol_sidtab_destroy(&sidtab); + printf("%s: policy configuration loaded\n", argv[0]); if (outfile && - write_binary_policy(policydbp, outfile, argv[0]) == -1) { - exit(1); - } + write_binary_policy(&modpolicydb, outfile, argv[0]) == -1) { + exit(1); + } + policydb_destroy(&modpolicydb); + return 0; } /* FLASK */ - ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/programs/checkpolicy/checkpolicy.c#2 (text+ko) ==== @@ -80,6 +80,7 @@ #include "queue.h" #include "checkpolicy.h" +#include "parse_util.h" extern char *optarg; extern int optind; @@ -88,17 +89,8 @@ static sidtab_t sidtab; extern policydb_t *policydbp; -extern queue_t id_queue; -extern unsigned int policydb_errors; -extern unsigned long policydb_lineno; -extern char source_file[]; extern int mlspol; -extern FILE *yyin; -extern void init_parser(int); -extern int yyparse(void); -extern void yyrestart(FILE *); - static char *txtfile = "policy.conf"; static char *binfile = "policy"; @@ -106,8 +98,9 @@ void usage(char *progname) { - printf("usage: %s [-b] [-d] [-M] [-c policyvers (%d-%d)] [-o output_file] [input_file]\n", - progname, POLICYDB_VERSION_MIN, POLICYDB_VERSION_MAX); + printf + ("usage: %s [-b] [-d] [-M] [-c policyvers (%d-%d)] [-o output_file] [input_file]\n", + progname, POLICYDB_VERSION_MIN, POLICYDB_VERSION_MAX); exit(1); } @@ -118,7 +111,9 @@ exit(1);\ } static int print_sid(sepol_security_id_t sid, - context_struct_t * context __attribute__ ((unused)), void *data __attribute__ ((unused))) + context_struct_t * context + __attribute__ ((unused)), void *data + __attribute__ ((unused))) { sepol_security_context_t scontext; size_t scontext_len; @@ -146,7 +141,7 @@ perdatum = (perm_datum_t *) datum; - if (v->val == perdatum->value) { + if (v->val == perdatum->s.value) { v->name = key; return 1; } @@ -155,7 +150,7 @@ } #ifdef EQUIVTYPES -static int insert_type_rule(avtab_key_t *k, avtab_datum_t *d, +static int insert_type_rule(avtab_key_t * k, avtab_datum_t * d, struct avtab_node *type_rules) { struct avtab_node *p, *c, *n; @@ -168,10 +163,10 @@ */ if (k->source_type < c->key.source_type) break; - if (k->source_type == c->key.source_type && + if (k->source_type == c->key.source_type && k->target_type < c->key.target_type) break; - if (k->source_type == c->key.source_type && + if (k->source_type == c->key.source_type && k->target_type == c->key.target_type && k->target_class < c->key.target_class) break; @@ -191,7 +186,7 @@ return 0; } -static int create_type_rules(avtab_key_t *k, avtab_datum_t *d, void *args) +static int create_type_rules(avtab_key_t * k, avtab_datum_t * d, void *args) { struct avtab_node *type_rules = args; @@ -200,8 +195,10 @@ * Insert the rule into the lists for both * the source type and the target type. */ - if (insert_type_rule(k, d, &type_rules[k->source_type-1])) return -1; - if (insert_type_rule(k, d, &type_rules[k->target_type-1])) return -1; + if (insert_type_rule(k, d, &type_rules[k->source_type - 1])) + return -1; + if (insert_type_rule(k, d, &type_rules[k->target_type - 1])) + return -1; } return 0; @@ -218,24 +215,24 @@ } } -static int identify_equiv_types(void) +static int identify_equiv_types(void) { - struct avtab_node *type_rules, *l1, *l2; + struct avtab_node *type_rules, *l1, *l2; int i, j; /* * Create a list of access vector rules for each type * from the access vector table. */ - type_rules = malloc(sizeof(struct avtab_node)*policydb.p_types.nprim); + type_rules = malloc(sizeof(struct avtab_node) * policydb.p_types.nprim); if (!type_rules) { fprintf(stderr, "out of memory\n"); exit(1); } - memset(type_rules, 0, sizeof(struct avtab_node)*policydb.p_types.nprim); + memset(type_rules, 0, + sizeof(struct avtab_node) * policydb.p_types.nprim); if (avtab_map(&policydb.te_avtab, create_type_rules, type_rules)) exit(1); - /* * Compare the type lists and identify equivalent types. @@ -244,27 +241,29 @@ if (!type_rules[i].next) continue; for (j = i + 1; j < policydb.p_types.nprim; j++) { - for (l1 = type_rules[i].next, l2 = type_rules[j].next; l1 && l2; - l1 = l1->next, l2 = l2->next) { - if (l2->key.source_type == (j+1)) { - if (l1->key.source_type != (i+1)) + for (l1 = type_rules[i].next, l2 = type_rules[j].next; + l1 && l2; l1 = l1->next, l2 = l2->next) { + if (l2->key.source_type == (j + 1)) { + if (l1->key.source_type != (i + 1)) break; } else { - if (l1->key.source_type != l2->key.source_type) + if (l1->key.source_type != + l2->key.source_type) break; } - if (l2->key.target_type == (j+1)) { - if (l1->key.target_type != (i+1)) + if (l2->key.target_type == (j + 1)) { + if (l1->key.target_type != (i + 1)) break; } else { - if (l1->key.target_type != l2->key.target_type) + if (l1->key.target_type != + l2->key.target_type) break; } - if (l1->key.target_class != l2->key.target_class || - l1->datum.allowed != l2->datum.allowed) + if (l1->key.target_class != l2->key.target_class + || l1->datum.allowed != l2->datum.allowed) break; } - if (l1 || l2) + if (l1 || l2) continue; free_type_rules(type_rules[j].next); type_rules[j].next = NULL; @@ -272,37 +271,37 @@ policydb.p_type_val_to_name[i], policydb.p_type_val_to_name[j]); } - free_type_rules(type_rules[i].next); + free_type_rules(type_rules[i].next); type_rules[i].next = NULL; } - free(type_rules); + free(type_rules); return 0; } -#endif +#endif extern char *av_to_string(uint32_t tclass, sepol_access_vector_t av); - int display_bools() { int i; for (i = 0; i < policydbp->p_bools.nprim; i++) { printf("%s : %d\n", policydbp->p_bool_val_to_name[i], - policydbp->bool_val_to_struct[i]->state); + policydbp->bool_val_to_struct[i]->state); } return 0; } -void display_expr(cond_expr_t *exp) +void display_expr(cond_expr_t * exp) { cond_expr_t *cur; for (cur = exp; cur != NULL; cur = cur->next) { switch (cur->expr_type) { case COND_BOOL: - printf("%s ", policydbp->p_bool_val_to_name[cur->bool - 1]); + printf("%s ", + policydbp->p_bool_val_to_name[cur->bool - 1]); break; case COND_NOT: printf("! "); @@ -360,7 +359,9 @@ level_datum_t *levdatum = (level_datum_t *) datum; if (!levdatum->isalias && !levdatum->defined) { - fprintf(stderr, "Error: sensitivity %s was not used in a level definition!\n", key); + fprintf(stderr, + "Error: sensitivity %s was not used in a level definition!\n", + key); return -1; } return 0; @@ -389,7 +390,6 @@ int show_version = 0; struct policy_file pf; - while ((ch = getopt(argc, argv, "o:dbMVc:")) != EOF) { switch (ch) { case 'o': @@ -408,30 +408,36 @@ case 'M': mlspol = 1; break; - case 'c': { - long int n = strtol(optarg, NULL, 10); - if (errno) { - fprintf(stderr, "Invalid policyvers specified: %s\n", optarg); - usage(argv[0]); - exit(1); + case 'c':{ + long int n = strtol(optarg, NULL, 10); + if (errno) { + fprintf(stderr, + "Invalid policyvers specified: %s\n", + optarg); + usage(argv[0]); + exit(1); + } + if (n < POLICYDB_VERSION_MIN + || n > POLICYDB_VERSION_MAX) { + fprintf(stderr, + "policyvers value %ld not in range %d-%d\n", + n, POLICYDB_VERSION_MIN, + POLICYDB_VERSION_MAX); + usage(argv[0]); + exit(1); + } + if (policyvers != n) + policyvers = n; + break; } - if (n < POLICYDB_VERSION_MIN || n > POLICYDB_VERSION_MAX) { - fprintf(stderr, "policyvers value %ld not in range %d-%d\n", - n, POLICYDB_VERSION_MIN, POLICYDB_VERSION_MAX); - usage(argv[0]); - exit(1); - } - if (policyvers != n) - policyvers = n; - break; - } default: usage(argv[0]); } } if (show_version) { - printf("%d (compatibility range %d-%d)\n", policyvers, POLICYDB_VERSION_MAX, POLICYDB_VERSION_MIN); + printf("%d (compatibility range %d-%d)\n", policyvers, + POLICYDB_VERSION_MAX, POLICYDB_VERSION_MIN); exit(0); } @@ -440,8 +446,7 @@ if (optind != argc) usage(argv[0]); } - printf("%s: loading policy configuration from %s\n", argv[0], - file); + printf("%s: loading policy configuration from %s\n", argv[0], file); /* Set policydb and sidtab used by libsepol service functions to my structures, so that I can directly populate and @@ -461,7 +466,9 @@ file, strerror(errno)); exit(1); } - map = mmap(NULL, sb.st_size, PROT_READ | PROT_WRITE, MAP_PRIVATE, fd, 0); + map = + mmap(NULL, sb.st_size, PROT_READ | PROT_WRITE, MAP_PRIVATE, + fd, 0); if (map == MAP_FAILED) { fprintf(stderr, "Can't map '%s': %s\n", file, strerror(errno)); @@ -471,12 +478,15 @@ pf.data = map; pf.len = sb.st_size; if (policydb_init(&policydb)) { - fprintf(stderr, "%s: policydb_init: Out of memory!\n", argv[0]); + fprintf(stderr, "%s: policydb_init: Out of memory!\n", + argv[0]); exit(1); } ret = policydb_read(&policydb, &pf, 1); if (ret) { - fprintf(stderr, "%s: error(s) encountered while parsing configuration\n", argv[0]); + fprintf(stderr, + "%s: error(s) encountered while parsing configuration\n", + argv[0]); exit(1); } policydbp = &policydb; @@ -484,27 +494,20 @@ /* Check Policy Consistency */ if (policydbp->mls) { if (!mlspol) { - fprintf(stderr,"%s: MLS policy, but non-MLS" - " is specified\n", argv[0]); + fprintf(stderr, "%s: MLS policy, but non-MLS" + " is specified\n", argv[0]); exit(1); } } else { if (mlspol) { - fprintf(stderr,"%s: non-MLS policy, but MLS" - " is specified\n", argv[0]); + fprintf(stderr, "%s: non-MLS policy, but MLS" + " is specified\n", argv[0]); exit(1); } } } else { - policydb_t parse_policy; + policydb_t parse_policy; - yyin = fopen(file, "r"); - if (!yyin) { - fprintf(stderr, "%s: unable to open %s\n", argv[0], - file); - exit(1); - } - if (policydb_init(&parse_policy)) exit(1); /* We build this as a base policy first since that is all the parser understands */ @@ -513,28 +516,9 @@ /* Let sepol know if we are dealing with MLS support */ parse_policy.mls = mlspol; - id_queue = queue_create(); - if (!id_queue) { - fprintf(stderr, "%s: out of memory\n", argv[0]); - exit(1); - } policydbp = &parse_policy; - init_parser(1); - if (yyparse() || policydb_errors) { - fprintf(stderr, "%s: error(s) encountered while parsing configuration\n", argv[0]); - exit(1); - } - rewind(yyin); - init_parser(2); - source_file[0] = '\0'; - yyrestart(yyin); - if (yyparse() || policydb_errors) { - fprintf(stderr, "%s: error(s) encountered while parsing configuration\n", argv[0]); - exit(1); - } - queue_destroy(id_queue); - if (policydb_errors) + if (read_source_policy(policydbp, file, "checkpolicy") < 0) exit(1); if (hashtab_map(policydbp->p_levels.table, check_level, NULL)) @@ -546,18 +530,17 @@ } /* Linking takes care of optional avrule blocks */ - if (link_modules(NULL, &parse_policy, NULL, 0, 0)) { + if (link_modules(NULL, &parse_policy, NULL, 0, 0)) { fprintf(stderr, "Error while resolving optionals\n"); exit(1); } if (expand_module(NULL, &parse_policy, &policydb, 0, 1)) { - fprintf(stderr, "Error while expanding policy\n"); + fprintf(stderr, "Error while expanding policy\n"); exit(1); - } + } policydb_destroy(&parse_policy); policydbp = &policydb; - fclose(yyin); } if (policydb_load_isids(&policydb, &sidtab)) @@ -566,8 +549,9 @@ printf("%s: policy configuration loaded\n", argv[0]); if (outfile) { - printf("%s: writing binary representation (version %d) to %s\n", - argv[0], policyvers, outfile); + printf + ("%s: writing binary representation (version %d) to %s\n", + argv[0], policyvers, outfile); outfp = fopen(outfile, "w"); if (!outfp) { perror(outfile); @@ -634,39 +618,51 @@ FGETS(ans, sizeof(ans), stdin); if (isdigit(ans[0])) { tclass = atoi(ans); - if (!tclass || tclass > policydb.p_classes.nprim) { + if (!tclass + || tclass > policydb.p_classes.nprim) { printf("\nNo such class.\n"); break; } - cladatum = policydb.class_val_to_struct[tclass - 1]; + cladatum = + policydb.class_val_to_struct[tclass - 1]; } else { ans[strlen(ans) - 1] = 0; - cladatum = (class_datum_t *) hashtab_search(policydb.p_classes.table, - ans); + cladatum = + (class_datum_t *) hashtab_search(policydb. + p_classes. + table, + ans); if (!cladatum) { printf("\nNo such class\n"); break; } - tclass = cladatum->value; + tclass = cladatum->s.value; } if (!cladatum->comdatum && !cladatum->permissions.nprim) { - printf("\nNo access vector definition for that class\n"); + printf + ("\nNo access vector definition for that class\n"); break; } - ret = sepol_compute_av(ssid, tsid, tclass, 0, - &avd); + ret = sepol_compute_av(ssid, tsid, tclass, 0, &avd); switch (ret) { case 0: printf("\nallowed {"); for (i = 1; i <= sizeof(avd.allowed) * 8; i++) { if (avd.allowed & (1 << (i - 1))) { v.val = i; - ret = hashtab_map(cladatum->permissions.table, - find_perm, &v); + ret = + hashtab_map(cladatum-> + permissions. + table, + find_perm, &v); if (!ret && cladatum->comdatum) { - ret = hashtab_map(cladatum->comdatum->permissions.table, - find_perm, &v); + ret = + hashtab_map + (cladatum-> + comdatum-> + permissions.table, + find_perm, &v); } if (ret) printf(" %s", v.name); @@ -686,7 +682,7 @@ FGETS(ans, sizeof(ans), stdin); ssid = atoi(ans); ret = sepol_sid_to_context(ssid, - &scontext, &scontext_len); + &scontext, &scontext_len); switch (ret) { case 0: printf("\nscontext %s\n", scontext); @@ -707,8 +703,7 @@ FGETS(ans, sizeof(ans), stdin); scontext_len = strlen(ans); ans[scontext_len - 1] = 0; - ret = sepol_context_to_sid(ans, scontext_len, - &ssid); + ret = sepol_context_to_sid(ans, scontext_len, &ssid); switch (ret) { case 0: printf("\nsid %d\n", ssid); @@ -739,27 +734,35 @@ FGETS(ans, sizeof(ans), stdin); if (isdigit(ans[0])) { tclass = atoi(ans); - if (!tclass || tclass > policydb.p_classes.nprim) { + if (!tclass + || tclass > policydb.p_classes.nprim) { printf("\nNo such class.\n"); break; } } else { ans[strlen(ans) - 1] = 0; - cladatum = (class_datum_t *) hashtab_search(policydb.p_classes.table, - ans); >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Aug 15 18:53:16 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 647EA16A4E5; Tue, 15 Aug 2006 18:53:16 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 3FD7716A4DA for ; Tue, 15 Aug 2006 18:53:16 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7683943D6E for ; Tue, 15 Aug 2006 18:53:15 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7FIrFEg046713 for ; Tue, 15 Aug 2006 18:53:15 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7FIrFCm046710 for perforce@freebsd.org; Tue, 15 Aug 2006 18:53:15 GMT (envelope-from millert@freebsd.org) Date: Tue, 15 Aug 2006 18:53:15 GMT Message-Id: <200608151853.k7FIrFCm046710@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 104098 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Aug 2006 18:53:16 -0000 http://perforce.freebsd.org/chv.cgi?CH=104098 Change 104098 by millert@millert_macbook on 2006/08/15 18:52:24 Install binary policy files in /etc/sedarwin/policy Affected files ... .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policy/Makefile#2 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policy/Makefile#2 (text+ko) ==== @@ -36,8 +36,8 @@ install: ./update_plist --policy=$(POLICY) --migscs=sebsd_migscs ../sedarwin/mac_sedarwin.kext/Contents/Info.plist && make -C ../sedarwin mac_sedarwin.kext.tar install - $(INSTALL) -o ${BINOWN} -g ${BINGRP} -m 644 ${POLICY} ${DESTDIR} - $(INSTALL) -o ${BINOWN} -g ${BINGRP} -m 644 sebsd_migscs ${DESTDIR} + $(INSTALL) -o ${BINOWN} -g ${BINGRP} -m 644 ${POLICY} ${DESTDIR}/private/etc/sedarwin/policy + $(INSTALL) -o ${BINOWN} -g ${BINGRP} -m 644 sebsd_migscs ${DESTDIR}/private/etc/sedarwin/policy $(INSTALL) -o ${BINOWN} -g ${BINGRP} -m 644 failsafe_context ${DESTDIR}/private/etc/sedarwin/contexts $(INSTALL) -o ${BINOWN} -g ${BINGRP} -m 700 ${SCRIPTS} ${DESTDIR}/private/etc/sedarwin (cd $(CURDIR)/.. && tar -X policy/excludes -cf - policy) | (cd $(DESTDIR)/private/etc/sedarwin/ && tar -xf -) From owner-p4-projects@FreeBSD.ORG Tue Aug 15 18:54:18 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4B95716A4DF; Tue, 15 Aug 2006 18:54:18 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 E735616A4E2 for ; Tue, 15 Aug 2006 18:54:17 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8B9B943D5A for ; Tue, 15 Aug 2006 18:54:17 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7FIsH2W046779 for ; Tue, 15 Aug 2006 18:54:17 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7FIsHTu046776 for perforce@freebsd.org; Tue, 15 Aug 2006 18:54:17 GMT (envelope-from millert@freebsd.org) Date: Tue, 15 Aug 2006 18:54:17 GMT Message-Id: <200608151854.k7FIsHTu046776@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 104099 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Aug 2006 18:54:18 -0000 http://perforce.freebsd.org/chv.cgi?CH=104099 Change 104099 by millert@millert_macbook on 2006/08/15 18:53:16 Send kextd SIGHUP after updating policy data in the plist file Affected files ... .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policy/Makefile.install#2 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policy/Makefile.install#2 (text+ko) ==== @@ -22,3 +22,4 @@ install: ./update_plist --policy=$(POLICY) --migscs=sebsd_migscs ../../../../System/Library/Extensions/mac_sedarwin.kext/Contents/Info.plist touch /System/Library/Extensions /System/Library/Extensions/mac_sedarwin.kext + killall -HUP kextd From owner-p4-projects@FreeBSD.ORG Tue Aug 15 19:24:57 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 56D7916A4E1; Tue, 15 Aug 2006 19:24:57 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 33A5A16A4DA for ; Tue, 15 Aug 2006 19:24:57 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E14D043D46 for ; Tue, 15 Aug 2006 19:24:56 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7FJOudr049502 for ; Tue, 15 Aug 2006 19:24:56 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7FJOuN0049499 for perforce@freebsd.org; Tue, 15 Aug 2006 19:24:56 GMT (envelope-from millert@freebsd.org) Date: Tue, 15 Aug 2006 19:24:56 GMT Message-Id: <200608151924.k7FJOuN0049499@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 104102 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Aug 2006 19:24:57 -0000 http://perforce.freebsd.org/chv.cgi?CH=104102 Change 104102 by millert@millert_g4tower on 2006/08/15 19:24:18 Set execute bit Affected files ... .. //depot/projects/trustedbsd/sedarwin8/darwin/build/mkPolicyInfoPlist.sh#2 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/config/newvers.pl#2 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/darwin/build/mkPolicyInfoPlist.sh#2 (xtext/text+ko) ==== ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/config/newvers.pl#2 (xtext/text+ko) ==== From owner-p4-projects@FreeBSD.ORG Tue Aug 15 19:42:19 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2814D16A4DF; Tue, 15 Aug 2006 19:42:19 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 00AC516A4DA for ; Tue, 15 Aug 2006 19:42:19 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C110B43D67 for ; Tue, 15 Aug 2006 19:42:18 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7FJgIvi050388 for ; Tue, 15 Aug 2006 19:42:18 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7FJgIBG050385 for perforce@freebsd.org; Tue, 15 Aug 2006 19:42:18 GMT (envelope-from millert@freebsd.org) Date: Tue, 15 Aug 2006 19:42:18 GMT Message-Id: <200608151942.k7FJgIBG050385@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 104103 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Aug 2006 19:42:19 -0000 http://perforce.freebsd.org/chv.cgi?CH=104103 Change 104103 by millert@millert_g4tower on 2006/08/15 19:41:52 Process yacc and lex input files correctly. Affected files ... .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/src/Makefile#3 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libsemanage/src/Makefile#3 (text+ko) ==== @@ -2,6 +2,9 @@ CFLAGS += -Wall -I../include -I../../libselinux/include -I../../libsepol/include +LFLAGS = -s +YFLAGS = -d + LIB = semanage OBJS = boolean_record.o booleans_active.o booleans_activedb.o \ booleans_file.o booleans_local.o booleans_policy.o \ @@ -24,7 +27,15 @@ RANLIB = ranlib INSTALL = install -all: lib$(LIB).a +all: conf-scan.c conf-parse.c lib$(LIB).a + +conf-scan.c: conf-scan.l conf-parse.h + $(LEX) $(LFLAGS) -o$@ $< + +conf-parse.h: conf-parse.c + +conf-parse.c: conf-parse.y + $(YACC) $(YFLAGS) -psemanage_ -o$@ $< install: all $(INSTALL) -o $(LIBOWN) -g $(LIBGRP) -m 0644 lib$(LIB).a \ From owner-p4-projects@FreeBSD.ORG Tue Aug 15 20:11:19 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 30D9616A556; Tue, 15 Aug 2006 20:11:18 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 E12F616A536 for ; Tue, 15 Aug 2006 20:11:17 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8387043D90 for ; Tue, 15 Aug 2006 20:10:56 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7FKAumX053033 for ; Tue, 15 Aug 2006 20:10:56 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7FKAtgJ053030 for perforce@freebsd.org; Tue, 15 Aug 2006 20:10:55 GMT (envelope-from jb@freebsd.org) Date: Tue, 15 Aug 2006 20:10:55 GMT Message-Id: <200608152010.k7FKAtgJ053030@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 104106 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Aug 2006 20:11:19 -0000 http://perforce.freebsd.org/chv.cgi?CH=104106 Change 104106 by jb@jb_freebsd2 on 2006/08/15 20:10:07 Remove some residual 'alpha' arch code. Affected files ... .. //depot/projects/dtrace/src/usr.bin/truss/alpha-fbsd.c#4 delete .. //depot/projects/dtrace/src/usr.bin/truss/extern.h#4 edit .. //depot/projects/dtrace/src/usr.bin/truss/main.c#6 edit Differences ... ==== //depot/projects/dtrace/src/usr.bin/truss/extern.h#4 (text+ko) ==== @@ -37,10 +37,6 @@ extern void waitevent(struct trussinfo *); extern const char *ioctlname(register_t val); extern char *strsig(int sig); -#ifdef __alpha__ -extern void alpha_syscall_entry(struct trussinfo *, int); -extern long alpha_syscall_exit(struct trussinfo *, int); -#endif #ifdef __amd64__ extern void amd64_syscall_entry(struct trussinfo *, int); extern long amd64_syscall_exit(struct trussinfo *, int); ==== //depot/projects/dtrace/src/usr.bin/truss/main.c#6 (text+ko) ==== @@ -78,9 +78,6 @@ void (*enter_syscall)(struct trussinfo *, int); long (*exit_syscall)(struct trussinfo *, int); } ex_types[] = { -#ifdef __alpha__ - { "FreeBSD ELF", alpha_syscall_entry, alpha_syscall_exit }, -#endif #ifdef __amd64__ { "FreeBSD ELF64", amd64_syscall_entry, amd64_syscall_exit }, #endif From owner-p4-projects@FreeBSD.ORG Tue Aug 15 20:16:04 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id ABFFE16A4E5; Tue, 15 Aug 2006 20:16:04 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 8615416A4E0 for ; Tue, 15 Aug 2006 20:16:04 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1486243D58 for ; Tue, 15 Aug 2006 20:16:04 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7FKG3Ub053329 for ; Tue, 15 Aug 2006 20:16:03 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7FKG3Ns053326 for perforce@freebsd.org; Tue, 15 Aug 2006 20:16:03 GMT (envelope-from jb@freebsd.org) Date: Tue, 15 Aug 2006 20:16:03 GMT Message-Id: <200608152016.k7FKG3Ns053326@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 104108 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Aug 2006 20:16:04 -0000 http://perforce.freebsd.org/chv.cgi?CH=104108 Change 104108 by jb@jb_freebsd2 on 2006/08/15 20:15:51 Use the correct variable type for the size. Affected files ... .. //depot/projects/dtrace/src/usr.bin/truss/main.c#7 edit Differences ... ==== //depot/projects/dtrace/src/usr.bin/truss/main.c#7 (text+ko) ==== @@ -111,7 +111,7 @@ { struct ex_types *funcs; char progt[32]; - int len = sizeof(progt); + size_t len = sizeof(progt); int mib[4]; int error; From owner-p4-projects@FreeBSD.ORG Tue Aug 15 20:38:47 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 622CC16A4EE; Tue, 15 Aug 2006 20:38:47 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 2407916A4EC for ; Tue, 15 Aug 2006 20:38:47 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C89C043D7C for ; Tue, 15 Aug 2006 20:38:37 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7FKcbjG054631 for ; Tue, 15 Aug 2006 20:38:37 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7FKcbP0054628 for perforce@freebsd.org; Tue, 15 Aug 2006 20:38:37 GMT (envelope-from jb@freebsd.org) Date: Tue, 15 Aug 2006 20:38:37 GMT Message-Id: <200608152038.k7FKcbP0054628@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 104119 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Aug 2006 20:38:47 -0000 http://perforce.freebsd.org/chv.cgi?CH=104119 Change 104119 by jb@jb_freebsd2 on 2006/08/15 20:38:00 IFlibbsdelf Affected files ... .. //depot/projects/dtrace/src/lib/libelf/Makefile#6 integrate .. //depot/projects/dtrace/src/lib/libelf/elf_getarhdr.3#1 branch .. //depot/projects/dtrace/src/lib/libelf/elf_getarsym.3#1 branch .. //depot/projects/dtrace/src/lib/libelf/elf_next.c#5 integrate .. //depot/projects/dtrace/src/lib/libelf/libelf_convert.m4#5 integrate Differences ... ==== //depot/projects/dtrace/src/lib/libelf/Makefile#6 (text+ko) ==== @@ -59,6 +59,8 @@ elf_end.3 elf_errmsg.3 \ elf_fill.3 \ elf_flagdata.3 \ + elf_getarhdr.3 \ + elf_getarsym.3 \ elf_getbase.3 \ elf_getident.3 \ elf_hash.3 \ @@ -104,8 +106,6 @@ elf_flagdata.3 elf_flagphdr.3 \ elf_flagdata.3 elf_flagscn.3 \ elf_flagdata.3 elf_flagshdr.3 \ - elf.3 elf_getarhdr.3 \ - elf.3 elf_getarsym.3 \ elf.3 elf_getdata.3 \ elf.3 elf_getscn.3 \ elf.3 elf_ndxscn.3 \ ==== //depot/projects/dtrace/src/lib/libelf/elf_next.c#5 (text+ko) ==== ==== //depot/projects/dtrace/src/lib/libelf/libelf_convert.m4#5 (text+ko) ==== @@ -152,7 +152,7 @@ (X) = _t; \ } while (0) #define READ_WORD(P,X) do { \ - uint32_t _t; \ + uint16_t _t; \ unsigned char *const _q = (unsigned char *) &_t; \ const unsigned char *const _p = \ (const unsigned char *) (P); \ @@ -167,7 +167,7 @@ #define READ_OFF32(P,X) READ_WORD(P,X) #define READ_SWORD(P,X) READ_WORD(P,X) #define READ_WORD64(P,X) do { \ - uint64_t _t; \ + uint16_t _t; \ unsigned char *const _q = (unsigned char *) &_t; \ const unsigned char *const _p = \ (const unsigned char *) (P); \ @@ -188,7 +188,6 @@ #define READ_XWORD(P,X) READ_WORD64(P,X) #define READ_IDENT(P,X) do { \ (void) memcpy((X), (P), sizeof((X))); \ - (P) = (P) + sizeof((X)); \ } while (0) divert(-1) @@ -202,9 +201,16 @@ * casting to work as expected. On the other hand the `file' * representation of an ELF data structure could be packed tighter * than its `in-memory' representation, and could be of a differing - * byte order. An additinal complication is that `ar' only pads data + * byte order. An additional complication is that `ar' only pads data * to even addresses and so ELF archive member data being read from * inside an `ar' archive could end up at misaligned memory addresses. + * + * Consequently, casting the `char *' pointers that point to memory + * representations (i.e., source pointers for the *_tof() functions + * and the destination pointers for the *_tom() functions), is safe, + * as these pointers should be correctly aligned for the memory type + * already. However, pointers to file representations have to be + * treated as being potentially unaligned and no casting can be done. */ include(SRCDIR`/elf_types.m4') @@ -251,20 +257,19 @@ static void libelf_cvt_$1$3_tof(char *dst, char *src, int count, int byteswap) { - Elf64_$2 t; + Elf64_$2 t, *s = (Elf64_$2 *) (uintptr_t) src; int c; if (dst == src && !byteswap) return; if (!byteswap) { - (void) memcpy(dst, src, count * sizeof(t)); + (void) memcpy(dst, src, count * sizeof(*s)); return; } for (c = 0; c < count; c++) { - memcpy(&t, src, sizeof(t)); - src += sizeof(t); + t = *s++; SWAP_$1$3(t); WRITE_$1$3(dst,t); } @@ -275,22 +280,21 @@ static void libelf_cvt_$1$3_tom(char *dst, char *src, int count, int byteswap) { - Elf64_$2 t; + Elf64_$2 t, *d = (Elf64_$2 *) (uintptr_t) dst; int c; if (dst == src && !byteswap) return; if (!byteswap) { - (void) memcpy(dst, src, count * sizeof(t)); + (void) memcpy(dst, src, count * sizeof(*d)); return; } for (c = 0; c < count; c++) { READ_$1$3(src,t); SWAP_$1$3(t); - memcpy(dst, &t, sizeof(t)); - dst += sizeof(t); + *d++ = t; } } ') @@ -366,12 +370,12 @@ static void libelf_cvt$3_$1_tof(char *dst, char *src, int count, int byteswap) { - Elf$3_$2 t; + Elf$3_$2 t, *s; int c; + s = (Elf$3_$2 *) (uintptr_t) src; for (c = 0; c < count; c++) { - memcpy(&t, src, sizeof(t)); - src += sizeof(t); + t = *s++; if (byteswap) { SWAP_STRUCT($2,$3) } @@ -385,22 +389,21 @@ static void libelf_cvt$3_$1_tom(char *dst, char *src, int count, int byteswap) { - Elf$3_$2 t; - unsigned char *s; - int i; + Elf$3_$2 t, *d; + unsigned char *s,*s0; size_t fsz; fsz = elf$3_fsize(ELF_T_$1, 1, EV_CURRENT); + d = ((Elf$3_$2 *) (uintptr_t) dst) + (count - 1); + s0 = (unsigned char *) src + (count - 1) * fsz; - for (i = 0; i < count; i++) { - s = (unsigned char *) src; + while (count--) { + s = s0; READ_STRUCT($2,$3) if (byteswap) { SWAP_STRUCT($2,$3) } - memcpy(dst, &t, sizeof(t)); - dst += sizeof(t); - src += fsz; + *d-- = t; s0 -= fsz; } } ')') From owner-p4-projects@FreeBSD.ORG Tue Aug 15 21:08:15 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3957516A4E0; Tue, 15 Aug 2006 21:08:15 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 1593416A4DD for ; Tue, 15 Aug 2006 21:08:15 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id DA1E643D45 for ; Tue, 15 Aug 2006 21:08:14 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7FL8Ehv064962 for ; Tue, 15 Aug 2006 21:08:14 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7FL8E4w064959 for perforce@freebsd.org; Tue, 15 Aug 2006 21:08:14 GMT (envelope-from millert@freebsd.org) Date: Tue, 15 Aug 2006 21:08:14 GMT Message-Id: <200608152108.k7FL8E4w064959@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 104120 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Aug 2006 21:08:15 -0000 http://perforce.freebsd.org/chv.cgi?CH=104120 Change 104120 by millert@millert_g4tower on 2006/08/15 21:07:15 Policies shouldn't need to include mac.h - the entire policy interface should be in mac_policy.h Affected files ... .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/avc/avc.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/sebsd.c#6 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/sebsd_alloc.c#2 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/avc/avc.c#2 (text+ko) ==== @@ -40,7 +40,6 @@ #include -#include #include #include ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/sebsd.c#6 (text+ko) ==== @@ -73,7 +73,6 @@ #include #include -#include #include #include #include ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/sedarwin/sebsd_alloc.c#2 (text+ko) ==== @@ -32,7 +32,6 @@ #include #include -#include #include #include From owner-p4-projects@FreeBSD.ORG Tue Aug 15 21:13:23 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D4CA316A4DF; Tue, 15 Aug 2006 21:13:22 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 7B71516A4DA for ; Tue, 15 Aug 2006 21:13:22 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id F3D3D43D76 for ; Tue, 15 Aug 2006 21:13:21 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7FLDL4G065305 for ; Tue, 15 Aug 2006 21:13:21 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7FLDLvf065302 for perforce@freebsd.org; Tue, 15 Aug 2006 21:13:21 GMT (envelope-from millert@freebsd.org) Date: Tue, 15 Aug 2006 21:13:21 GMT Message-Id: <200608152113.k7FLDLvf065302@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 104121 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Aug 2006 21:13:23 -0000 http://perforce.freebsd.org/chv.cgi?CH=104121 Change 104121 by millert@millert_g4tower on 2006/08/15 21:12:23 Boolean function cansignal() must return value FALSE rather than an error code. Affected files ... .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/kern/kern_sig.c#2 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/kern/kern_sig.c#2 (text+ko) ==== @@ -286,7 +286,7 @@ error = mac_check_proc_signal(uc, q, signum); if (error) - return (error); + return (0); #endif /* you can signal yourself */ if (p == q) From owner-p4-projects@FreeBSD.ORG Tue Aug 15 21:18:30 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CBAFF16A4DF; Tue, 15 Aug 2006 21:18:29 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 A832A16A4DA for ; Tue, 15 Aug 2006 21:18:29 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3DE3143D5D for ; Tue, 15 Aug 2006 21:18:29 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7FLISkR065711 for ; Tue, 15 Aug 2006 21:18:28 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7FLISpj065708 for perforce@freebsd.org; Tue, 15 Aug 2006 21:18:28 GMT (envelope-from millert@freebsd.org) Date: Tue, 15 Aug 2006 21:18:28 GMT Message-Id: <200608152118.k7FLISpj065708@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 104122 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Aug 2006 21:18:30 -0000 http://perforce.freebsd.org/chv.cgi?CH=104122 Change 104122 by millert@millert_g4tower on 2006/08/15 21:17:27 Add explicit int return value for mac_check_ipc_method() Affected files ... .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_port.c#2 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_port.c#2 (text+ko) ==== @@ -241,6 +241,7 @@ return (error); } +int mac_check_ipc_method(struct label *task, struct label *port, int msgid) { int error; From owner-p4-projects@FreeBSD.ORG Tue Aug 15 21:19:44 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 803A416A4EA; Tue, 15 Aug 2006 21:19:44 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 3AE0E16A4E8 for ; Tue, 15 Aug 2006 21:19:44 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D94AC43D9A for ; Tue, 15 Aug 2006 21:19:31 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7FLJUZB065774 for ; Tue, 15 Aug 2006 21:19:30 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7FLJU0F065771 for perforce@freebsd.org; Tue, 15 Aug 2006 21:19:30 GMT (envelope-from millert@freebsd.org) Date: Tue, 15 Aug 2006 21:19:30 GMT Message-Id: <200608152119.k7FLJU0F065771@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 104123 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Aug 2006 21:19:44 -0000 http://perforce.freebsd.org/chv.cgi?CH=104123 Change 104123 by millert@millert_g4tower on 2006/08/15 21:19:08 Add extattr_test policy. Affected files ... .. //depot/projects/trustedbsd/sedarwin8/policies/Makefile#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/extattr_test/Makefile#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/extattr_test/README#1 add .. //depot/projects/trustedbsd/sedarwin8/policies/extattr_test/mac_extattr_test.c#1 add Differences ... ==== //depot/projects/trustedbsd/sedarwin8/policies/Makefile#2 (text+ko) ==== @@ -1,5 +1,5 @@ SUBDIR= basetest color console count fwinteg ipctrace mls none \ - readonly stacktrace stub test vanity xattr + readonly stacktrace stub test vanity xattr extattr_test SUBDIR+= sedarwin include mk/subdir.mk From owner-p4-projects@FreeBSD.ORG Tue Aug 15 21:22:38 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C3CF616A4DD; Tue, 15 Aug 2006 21:22:37 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 9DF0E16A4DF for ; Tue, 15 Aug 2006 21:22:37 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id DBA2943DA2 for ; Tue, 15 Aug 2006 21:21:43 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7FLLYmi066013 for ; Tue, 15 Aug 2006 21:21:34 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7FLLXMd066010 for perforce@freebsd.org; Tue, 15 Aug 2006 21:21:33 GMT (envelope-from millert@freebsd.org) Date: Tue, 15 Aug 2006 21:21:33 GMT Message-Id: <200608152121.k7FLLXMd066010@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 104124 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Aug 2006 21:22:38 -0000 http://perforce.freebsd.org/chv.cgi?CH=104124 Change 104124 by millert@millert_g4tower on 2006/08/15 21:20:37 Cruft removal: Remove unused reserved fields in struct label. Remove bogus definitions for atomic operations. Remove code for debugging inconsist vnode labels. Remove unneeded include of mac.h in policy modules. Remove MAC_DEBUG. Affected files ... .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/conf/MASTER#2 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/kern/sysv_msg.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/kern/sysv_sem.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/kern/sysv_shm.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/_label.h#2 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/conf/MASTER#2 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_base.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_internal.h#2 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_label.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_net.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_pipe.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_posix_sem.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_posix_shm.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_process.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_socket.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_sysv_sem.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_sysv_shm.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_vfs.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/basetest/mac_basetest.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/fwinteg/mac_fwinteg.c#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/mls/mac_mls.c#2 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/conf/MASTER#2 (text+ko) ==== @@ -94,7 +94,6 @@ options HW_FOOTPRINT # Cache footprint support # options MAC # Mandatory ACcess Control options MAC_SOCKET # MAC socket labels -#options MAC_DEBUG options LCTX # Login Context options MACH # Standard Mach features # options MACH_ASSERT # Compile in assertions # ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/kern/sysv_msg.c#2 (text+ko) ==== @@ -66,13 +66,6 @@ #define MSG_DEBUG #undef MSG_DEBUG_OK -/* Uncomment this line to see MAC debugging output. */ -/* #define MAC_DEBUG */ -#ifdef MAC_DEBUG -#define MPRINTF(a) printf(a) -#else -#define MPRINTF(a) -#endif static void msg_freehdr(struct msg *msghdr); typedef int sy_call_t(struct proc *, void *, int *); ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/kern/sysv_sem.c#2 (text+ko) ==== @@ -34,7 +34,7 @@ * support for mandatory and extensible security protections. This notice * is included in support of clause 2.2 (b) of the Apple Public License, * Version 2.0. - * Copyright (c) 2005 SPARTA, Inc. + * Copyright (c) 2005-2006 SPARTA, Inc. */ #include @@ -62,14 +62,6 @@ /* Uncomment this line to see the debugging output */ /* #define SEM_DEBUG */ -/* Uncomment this line to see MAC debugging output. */ -/* #define MAC_DEBUG */ -#ifdef MAC_DEBUG -#define MPRINTF(a) printf(a) -#else -#define MPRINTF(a) -#endif - #define M_SYSVSEM M_TEMP ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/kern/sysv_shm.c#2 (text+ko) ==== @@ -55,7 +55,7 @@ * support for mandatory and extensible security protections. This notice * is included in support of clause 2.2 (b) of the Apple Public License, * Version 2.0. - * Copyright (c) 2005 SPARTA, Inc. + * Copyright (c) 2005-2006 SPARTA, Inc. */ @@ -91,14 +91,6 @@ #include -/* Uncomment this line to see MAC debugging output. */ -/* #define MAC_DEBUG */ -#ifdef MAC_DEBUG -#define MPRINTF(a) printf a -#else -#define MPRINTF(a) -#endif - static void shminit(void *); #if 0 SYSINIT(sysv_shm, SI_SUB_SYSV_SHM, SI_ORDER_FIRST, shminit, NULL) ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/_label.h#2 (text+ko) ==== @@ -45,8 +45,6 @@ #define MAC_MAX_SLOTS 8 #define MAC_FLAG_INITIALIZED 0x0000001 /* Is initialized for use. */ -#define MAC_FLAG_CLEAN 0x0000002 /* Is cleaned for re-use. */ -#define MAC_FLAG_ASSOC 0x0000004 /* */ struct label { int l_flags; @@ -54,9 +52,6 @@ void *l_ptr; long l_long; } l_perpolicy[MAC_MAX_SLOTS]; - void *reserved1; - void *reserved2; - void *reserved3; }; #endif /* !_SECURITY_LABEL_H_ */ ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/conf/MASTER#2 (text+ko) ==== @@ -55,5 +55,4 @@ options AUDIT # Security event auditing options MAC # Mandatory Access Controls options MAC_ALWAYS_LABEL_MBUF -#options MAC_DEBUG options LCTX # Login Context ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_base.c#2 (text+ko) ==== @@ -152,51 +152,6 @@ &mac_mmap_revocation_via_cow, 0, "Revoke mmap access to files via " "copy-on-write semantics, or by removing all write access"); -#ifdef MAC_DEBUG -SYSCTL_NODE(_security_mac, OID_AUTO, debug, CTLFLAG_RW, 0, - "TrustedBSD MAC debug info"); - -static int mac_debug_label_fallback = 0; -SYSCTL_INT(_security_mac_debug, OID_AUTO, label_fallback, CTLFLAG_RW, - &mac_debug_label_fallback, 0, "Filesystems should fall back to fs label" - "when label is corrupted."); -TUNABLE_INT("security.mac.debug_label_fallback", - &mac_debug_label_fallback); - -SYSCTL_NODE(_security_mac_debug, OID_AUTO, counters, CTLFLAG_RW, 0, - "TrustedBSD MAC object counters"); - -u_int nmaccreds=0, nmacmounts=0, nmactemp=0, nmacvnodes=0, - nmacdevfsdirents=0, nmacprocs=0, nmac_psem=0, nmac_pshm=0, - nmacsockets=0, - nmacsysvsemas=0, nmacsysvshms=0, nmacmbufs=0; - -SYSCTL_UINT(_security_mac_debug_counters, OID_AUTO, creds, CTLFLAG_RD, - &nmaccreds, 0, "number of ucreds in use"); -SYSCTL_UINT(_security_mac_debug_counters, OID_AUTO, procs, CTLFLAG_RD, - &nmacprocs, 0, "number of procs in use"); -SYSCTL_UINT(_security_mac_debug_counters, OID_AUTO, mounts, CTLFLAG_RD, - &nmacmounts, 0, "number of mounts in use"); -SYSCTL_UINT(_security_mac_debug_counters, OID_AUTO, temp, CTLFLAG_RD, - &nmactemp, 0, "number of temporary labels in use"); -SYSCTL_UINT(_security_mac_debug_counters, OID_AUTO, vnodes, CTLFLAG_RD, - &nmacvnodes, 0, "number of vnodes in use"); -SYSCTL_UINT(_security_mac_debug_counters, OID_AUTO, sockets, CTLFLAG_RD, - &nmacsockets, 0, "number of sockets in use"); -SYSCTL_UINT(_security_mac_debug_counters, OID_AUTO, devfsdirents, CTLFLAG_RD, - &nmacdevfsdirents, 0, "number of devfs dirents inuse"); -SYSCTL_UINT(_security_mac_debug_counters, OID_AUTO, posix_sem, CTLFLAG_RD, - &nmac_psem, 0, "number of posix semaphore identifiers in use"); -SYSCTL_UINT(_security_mac_debug_counters, OID_AUTO, posix_shm, CTLFLAG_RD, - &nmac_pshm, 0, "number of posix shared memory identifiers in use"); -SYSCTL_UINT(_security_mac_debug_counters, OID_AUTO, sysv_sems, CTLFLAG_RD, - &nmacsysvsemas, 0, "number of sysv ipc semaphore identifiers inuse"); -SYSCTL_UINT(_security_mac_debug_counters, OID_AUTO, sysv_shms, CTLFLAG_RD, - &nmacsysvsemas, 0, "number of sysv shared memory identifiers inuse"); -SYSCTL_UINT(_security_mac_debug_counters, OID_AUTO, mbufs, CTLFLAG_RD, - &nmacmbufs, 0, "number of mbuf identifiers inuse"); -#endif - /* * mac_static_base_mpc holds a pointer to the single instance of the base * policy MAC configuration structure. This pointer must be set at boot, @@ -488,22 +443,6 @@ sysctl_register_oid(&sysctl__security_mac_enforce_vm); sysctl_register_oid(&sysctl__security_mac_mmap_revocation); sysctl_register_oid(&sysctl__security_mac_mmap_revocation_via_cow); -#ifdef MAC_DEBUG - sysctl_register_oid(&sysctl__security_mac_debug); - sysctl_register_oid(&sysctl__security_mac_debug_label_fallback); - sysctl_register_oid(&sysctl__security_mac_debug_counters); - sysctl_register_oid(&sysctl__security_mac_debug_counters_creds); - sysctl_register_oid(&sysctl__security_mac_debug_counters_procs); - sysctl_register_oid(&sysctl__security_mac_debug_counters_mounts); - sysctl_register_oid(&sysctl__security_mac_debug_counters_temp); - sysctl_register_oid(&sysctl__security_mac_debug_counters_vnodes); - sysctl_register_oid(&sysctl__security_mac_debug_counters_devfsdirents); - sysctl_register_oid(&sysctl__security_mac_debug_counters_posix_sem); - sysctl_register_oid(&sysctl__security_mac_debug_counters_posix_shm); - sysctl_register_oid(&sysctl__security_mac_debug_counters_sysv_sems); - sysctl_register_oid(&sysctl__security_mac_debug_counters_sysv_shms); - sysctl_register_oid(&sysctl__security_mac_debug_counters_mbufs); -#endif printf("MAC Framework successfully initialized\n"); /* Call bsd init functions of already loaded policies */ ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_internal.h#2 (text+ko) ==== @@ -66,20 +66,6 @@ SYSCTL_DECL(_security); SYSCTL_DECL(_security_mac); -#ifdef MAC_DEBUG -SYSCTL_DECL(_security_mac_debug); -SYSCTL_DECL(_security_mac_debug_counters); - -#define MAC_DEBUG_COUNTER_INC(x) atomic_add_int(x, 1); -#define MAC_DEBUG_COUNTER_DEC(x) atomic_subtract_int(x, 1); - -#else - -#define MAC_DEBUG_COUNTER_INC(x) -#define MAC_DEBUG_COUNTER_DEC(x) - -#endif /* MAC_DEBUG */ - extern int mac_late; LIST_HEAD(mac_policy_list_t, mac_policy_conf); @@ -164,8 +150,6 @@ void mac_labelzone_init(void); struct label *mac_labelzone_alloc(int flags); void mac_labelzone_free(struct label *label); -void mac_labelzone_clean(struct label *label); -void mac_labelzone_associate(struct label *label); void mac_init_label(struct label *label); void mac_destroy_label(struct label *label); @@ -540,9 +524,6 @@ #define ASSERT_VOP_LOCKED(vp,msg) -#define atomic_add_int(P, V) (*(u_int*)(P) += (V)) -#define atomic_subtract_int(P, V) (*(u_int*)(P) -= (V)) - struct __mac_get_pid_args; struct __mac_get_proc_args; struct __mac_set_proc_args; ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_label.c#2 (text+ko) ==== @@ -58,10 +58,11 @@ l = (struct label *) zalloc_noblock(zone_label); if (l == NULL) return (NULL); - } else + } else { l = (struct label *) zalloc(zone_label); + } bzero(l, sizeof(struct label)); - l->l_flags = MAC_FLAG_INITIALIZED | MAC_FLAG_CLEAN; + l->l_flags = MAC_FLAG_INITIALIZED; return (l); } @@ -77,42 +78,3 @@ bzero(l, sizeof(struct label)); zfree(zone_label, l); } - -void -mac_labelzone_clean(struct label *l) -{ - - if (l == NULL) - panic("Clean of NULL MAC label\n"); - - if ((l->l_flags & MAC_FLAG_INITIALIZED) == 0) - panic("Clean of uninitialized label\n"); - -#if 0 - /* This case is probably OK */ - if (l->l_flags & MAC_FLAG_CLEAN) { - printf("Clean of already clean label, flags=%d\n", l->l_flags); - return; - } -#endif - - l->l_flags |= MAC_FLAG_CLEAN; - l->l_flags &= ~MAC_FLAG_ASSOC; -} - -void -mac_labelzone_associate(struct label *l) -{ - - if (l == NULL) - panic("Associate of NULL MAC label\n"); - - if ((l->l_flags & MAC_FLAG_INITIALIZED) == 0) - panic("Associate of uninitialized label\n"); - - if (l->l_flags & MAC_FLAG_ASSOC) - printf("Associate of already associated label\n"); - - l->l_flags &= ~MAC_FLAG_CLEAN; - l->l_flags |= MAC_FLAG_ASSOC; -} ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_net.c#2 (text+ko) ==== @@ -40,12 +40,8 @@ #include -#ifdef MAC_DEBUG -extern u_int nmacmbufs; -#endif +int mac_label_mbufs = 1; /* Exported via sysctl in mac_base.c */ -int mac_label_mbufs = 1; - struct label * mac_mbuf_to_label(struct mbuf *mbuf) { @@ -86,7 +82,7 @@ MAC_CHECK(init_mbuf_label, label, flag); if (error) printf("%s(): mpo_init_mbuf_label() failed!\n", __func__); - MAC_DEBUG_COUNTER_INC(&nmacmbufs); + return (error); } @@ -98,7 +94,6 @@ label = (struct label *)(tag + 1); MAC_PERFORM(destroy_mbuf_label, label); mac_destroy_label(label); - MAC_DEBUG_COUNTER_DEC(&nmacmbufs); return; } ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_pipe.c#2 (text+ko) ==== @@ -49,12 +49,6 @@ &mac_enforce_pipe, 0, "Enforce MAC policy on pipe operations"); TUNABLE_INT("security.mac.enforce_pipe", &mac_enforce_pipe); -#ifdef MAC_DEBUG -static unsigned int nmacpipes; -SYSCTL_UINT(_security_mac_debug_counters, OID_AUTO, pipes, CTLFLAG_RD, - &nmacpipes, 0, "number of pipes in use"); -#endif - /* Define this to PIPE_LOCK_ASSERT(x, y) if mutex assertions are desired. */ #define MAC_PIPE_LOCK_ASSERT(x, y) @@ -65,7 +59,6 @@ label = mac_labelzone_alloc(M_WAITOK); MAC_PERFORM(init_pipe_label, label); - MAC_DEBUG_COUNTER_INC(&nmacpipes); return (label); } @@ -82,7 +75,6 @@ MAC_PERFORM(destroy_pipe_label, label); mac_labelzone_free(label); - MAC_DEBUG_COUNTER_DEC(&nmacpipes); } void ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_posix_sem.c#2 (text+ko) ==== @@ -46,10 +46,6 @@ &mac_enforce_posix_sem, 0, "Enforce MAC policy on Posix Semaphores"); TUNABLE_INT("security.mac.enforce_posix_sem", &mac_enforce_posix_sem); -#ifdef MAC_DEBUG -extern u_int nmac_psem; -#endif - static struct label * mac_posix_sem_label_alloc(void) { @@ -57,7 +53,6 @@ label = mac_labelzone_alloc(MAC_WAITOK); MAC_PERFORM(init_posix_sem_label, label); - MAC_DEBUG_COUNTER_INC(&nmac_psem); return (label); } @@ -74,7 +69,6 @@ MAC_PERFORM(destroy_posix_sem_label, label); mac_labelzone_free(label); - MAC_DEBUG_COUNTER_DEC(&nmac_psem); } void ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_posix_shm.c#2 (text+ko) ==== @@ -46,10 +46,6 @@ &mac_enforce_pshm, 0, "Enforce MAC policy on Posix Shared memory"); TUNABLE_INT("security.mac.enforce_posix_shm", &mac_enforce_posix_shm); -#ifdef MAC_DEBUG -extern u_int nmac_pshm; -#endif - static struct label * mac_posix_shm_label_alloc(void) { @@ -57,7 +53,6 @@ label = mac_labelzone_alloc(MAC_WAITOK); MAC_PERFORM(init_posix_shm_label, label); - MAC_DEBUG_COUNTER_INC(&nmac_pshm); return (label); } @@ -74,7 +69,6 @@ MAC_PERFORM(destroy_posix_shm_label, label); mac_labelzone_free(label); - MAC_DEBUG_COUNTER_DEC(&nmac_pshm); } void ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_process.c#2 (text+ko) ==== @@ -47,10 +47,6 @@ #include -#ifdef MAC_DEBUG -extern u_int nmaccreds, nmacprocs; -#endif - struct label * mac_cred_label_alloc(void) { @@ -58,7 +54,6 @@ label = mac_labelzone_alloc(MAC_WAITOK); MAC_PERFORM(init_cred_label, label); - MAC_DEBUG_COUNTER_INC(&nmaccreds); return (label); } @@ -76,7 +71,6 @@ label = mac_labelzone_alloc(MAC_WAITOK); MAC_PERFORM(init_proc_label, label); - MAC_DEBUG_COUNTER_INC(&nmacprocs); return (label); } @@ -92,7 +86,6 @@ { MAC_PERFORM(destroy_cred_label, label); - MAC_DEBUG_COUNTER_DEC(&nmaccreds); mac_labelzone_free(label); } @@ -125,7 +118,6 @@ { MAC_PERFORM(destroy_proc_label, label); - MAC_DEBUG_COUNTER_DEC(&nmacprocs); mac_labelzone_free(label); } ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_socket.c#2 (text+ko) ==== @@ -64,9 +64,6 @@ extern int mac_enforce_socket; -#ifdef MAC_DEBUG -extern u_int nmacsockets; -#endif struct label * mac_socket_label_alloc(int flag) @@ -84,7 +81,7 @@ mac_labelzone_free(label); return (NULL); } - MAC_DEBUG_COUNTER_INC(&nmacsockets); + return (label); } @@ -104,7 +101,7 @@ mac_labelzone_free(label); return (NULL); } - MAC_DEBUG_COUNTER_INC(&nmacsockets); + return (label); } @@ -130,7 +127,6 @@ MAC_PERFORM(destroy_socket_label, label); mac_labelzone_free(label); - MAC_DEBUG_COUNTER_DEC(&nmacsockets); } static void @@ -139,7 +135,6 @@ MAC_PERFORM(destroy_socket_peer_label, label); mac_labelzone_free(label); - MAC_DEBUG_COUNTER_DEC(&nmacsockets); } void ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_sysv_sem.c#2 (text+ko) ==== @@ -52,10 +52,6 @@ &mac_enforce_sysv_sem, 0, "Enforce MAC policy on System V IPC Semaphores"); TUNABLE_INT("security.mac.enforce_sysv_sem", &mac_enforce_sysv_sem); -#ifdef MAC_DEBUG -extern u_int nmacsysvsemas; -#endif - static struct label * mac_sysv_sem_label_alloc(void) { @@ -63,7 +59,6 @@ label = mac_labelzone_alloc(MAC_WAITOK); MAC_PERFORM(init_sysv_sem_label, label); - MAC_DEBUG_COUNTER_INC(&nmacsysvsemas); return (label); } @@ -80,7 +75,6 @@ MAC_PERFORM(destroy_sysv_sem_label, label); mac_labelzone_free(label); - MAC_DEBUG_COUNTER_DEC(&nmacsysvsemas); } void ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_sysv_shm.c#2 (text+ko) ==== @@ -55,10 +55,6 @@ "Enforce MAC policy on System V IPC shared memory"); TUNABLE_INT("security.mac.enforce_sysv", &mac_enforce_sysv_shm); -#ifdef MAC_DEBUG -extern u_int nmacsysvshms; -#endif - static struct label * mac_sysv_shm_label_alloc(void) { @@ -66,7 +62,6 @@ label = mac_labelzone_alloc(MAC_WAITOK); MAC_PERFORM(init_sysv_shm_label, label); - MAC_DEBUG_COUNTER_INC(&nmacsysvshms); return (label); } @@ -83,7 +78,6 @@ MAC_PERFORM(destroy_sysv_shm_label, label); mac_labelzone_free(label); - MAC_DEBUG_COUNTER_DEC(&nmacsysvshms); } void ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_vfs.c#2 (text+ko) ==== @@ -48,15 +48,7 @@ #include -#ifdef MAC_DEBUG -extern u_int nmacmounts, nmacvnodes, nmaccleanvnodes, nmacassocvnodes, - nmacdevfsdirents; - -extern u_int nmacassocsingle, nmacassocxattr, nmacassoccreate, nmacassoccopy, - nmacassocdevfs; -#endif - static struct label * mac_devfsdirent_label_alloc(void) { @@ -64,7 +56,6 @@ label = mac_labelzone_alloc(MAC_WAITOK); MAC_PERFORM(init_devfsdirent_label, label); - MAC_DEBUG_COUNTER_INC(&nmacdevfsdirents); return (label); } @@ -82,7 +73,6 @@ label = mac_labelzone_alloc(MAC_WAITOK); MAC_PERFORM(init_mount_label, label); - MAC_DEBUG_COUNTER_INC(&nmacmounts); return (label); } @@ -93,7 +83,6 @@ label = mac_labelzone_alloc(MAC_WAITOK); MAC_PERFORM(init_mount_fs_label, label); - MAC_DEBUG_COUNTER_INC(&nmacmounts); return (label); } @@ -120,7 +109,6 @@ { vp->v_label = mac_vnode_label_alloc(); - MAC_DEBUG_COUNTER_INC(&nmacvnodes); } /* @@ -132,18 +120,7 @@ mac_cleanup_vnode(vnode_t vp) { - if ((vp->v_label->l_flags & MAC_FLAG_CLEAN) && - ((vp->v_flag & VSYSTEM) == 0)) { - vprint("Second clean", vp); - printf(", vp=%x, vid=%d mp=%p fs=%s\n", - vp, vp->v_id, vp->v_mount, - vp->v_mount ? vp->v_mount->mnt_vfsstat.f_mntonname : "none" - ); - } - MAC_PERFORM(cleanup_vnode_label, vp->v_label); - mac_labelzone_clean(vp->v_label); - MAC_DEBUG_COUNTER_INC(&nmaccleanvnodes); } static void @@ -152,7 +129,6 @@ MAC_PERFORM(destroy_devfsdirent_label, label); mac_labelzone_free(label); - MAC_DEBUG_COUNTER_DEC(&nmacdevfsdirents); } void @@ -169,7 +145,6 @@ MAC_PERFORM(destroy_mount_label, label); mac_labelzone_free(label); - MAC_DEBUG_COUNTER_DEC(&nmacmounts); } static void @@ -178,7 +153,6 @@ MAC_PERFORM(destroy_mount_fs_label, label); mac_labelzone_free(label); - MAC_DEBUG_COUNTER_DEC(&nmacmounts); } void @@ -202,7 +176,6 @@ MAC_PERFORM(destroy_vnode_label, label); mac_labelzone_free(label); - MAC_DEBUG_COUNTER_DEC(&nmacvnodes); } void @@ -211,7 +184,6 @@ mac_vnode_label_free(vp->v_label); vp->v_label = NULL; - MAC_DEBUG_COUNTER_DEC(&nmacvnodes); } void @@ -219,8 +191,6 @@ { MAC_PERFORM(copy_vnode_label, src, dest); - mac_labelzone_associate(dest); - MAC_DEBUG_COUNTER_INC(&nmacassoccopy); } @@ -261,7 +231,6 @@ int error; MAC_INTERNALIZE_LIST(vnode, label, string); - mac_labelzone_associate(label); return (error); } @@ -272,7 +241,6 @@ int error; MAC_INTERNALIZE_LIST(mount_fs, label, string); - mac_labelzone_associate(label); return (error); } @@ -315,9 +283,6 @@ struct vnode *vp) { - mac_labelzone_associate(vp->v_label); - MAC_DEBUG_COUNTER_INC(&nmacassocdevfs); - MAC_PERFORM(associate_vnode_devfs, mp, mp ? mp->mnt_fslabel : NULL, de, de->dn_label, vp, vp->v_label); } @@ -332,10 +297,6 @@ MAC_CHECK(associate_vnode_extattr, mp, mp->mnt_fslabel, vp, vp->v_label); - mac_labelzone_associate(vp->v_label); - MAC_DEBUG_COUNTER_INC(&nmacassocxattr); - MAC_DEBUG_COUNTER_DEC(&nmaccleanvnodes); - return (error); } @@ -343,13 +304,8 @@ mac_associate_vnode_singlelabel(struct mount *mp, struct vnode *vp) { - MAC_PERFORM(associate_vnode_singlelabel, mp, mp->mnt_fslabel, vp, - vp->v_label); - - mac_labelzone_associate(vp->v_label); - MAC_DEBUG_COUNTER_INC(&nmacassocvnodes); - MAC_DEBUG_COUNTER_DEC(&nmaccleanvnodes); - MAC_DEBUG_COUNTER_INC(&nmacassocsingle); + MAC_PERFORM(associate_vnode_singlelabel, mp, + mp ? mp->mnt_fslabel : NULL, vp, vp->v_label); } int @@ -361,10 +317,6 @@ ASSERT_VOP_LOCKED(dvp, __func__); ASSERT_VOP_LOCKED(vp, __func__); - mac_labelzone_associate(vp->v_label); - MAC_DEBUG_COUNTER_INC(&nmacassoccreate); - MAC_DEBUG_COUNTER_DEC(&nmaccleanvnodes); - MAC_CHECK(create_vnode_extattr, cred, mp, mp->mnt_fslabel, dvp, dvp->v_label, vp, vp->v_label, cnp); ==== //depot/projects/trustedbsd/sedarwin8/policies/basetest/mac_basetest.c#2 (text+ko) ==== @@ -34,7 +34,6 @@ #include #include -#include #include #include ==== //depot/projects/trustedbsd/sedarwin8/policies/fwinteg/mac_fwinteg.c#2 (text+ko) ==== @@ -36,7 +36,6 @@ #include #include -#include #include #include ==== //depot/projects/trustedbsd/sedarwin8/policies/mls/mac_mls.c#2 (text+ko) ==== @@ -119,8 +119,6 @@ #ifdef APPLE #define TUNABLE_INT(x, y) -#define atomic_add_int(P, V) (*(u_int*)(P) += (V)) -#define atomic_subtract_int(P, V) (*(u_int*)(P) -= (V)) #endif /* APPLE */ #define SLOT(l) ((struct mac_mls *)LABEL_TO_SLOT((l), mac_mls_slot).l_ptr) @@ -147,10 +145,6 @@ &mac_mls_enabled, 0, "Enforce MAC/MLS policy"); TUNABLE_INT("security.mac.mls.enabled", &mac_mls_enabled); -static int destroyed_not_inited; -SYSCTL_INT(_security_mac_mls, OID_AUTO, destroyed_not_inited, CTLFLAG_RD, - &destroyed_not_inited, 0, "Count of labels destroyed but not inited"); - static int ptys_equal = 0; SYSCTL_INT(_security_mac_mls, OID_AUTO, ptys_equal, CTLFLAG_RW, &ptys_equal, 0, "Label pty devices as mls/equal on create"); @@ -200,7 +194,7 @@ if (mac_mls != NULL) mac_zfree(zone_mls, (void *)mac_mls); else - atomic_add_int(&destroyed_not_inited, 1); + panic("Mac MLS Module: mls_free called on NULL label"); } static int @@ -561,7 +555,6 @@ sysctl_register_oid(&sysctl__security_mac_mls); sysctl_register_oid(&sysctl__security_mac_mls_label_size); sysctl_register_oid(&sysctl__security_mac_mls_enabled); - sysctl_register_oid(&sysctl__security_mac_mls_destroyed_not_inited); sysctl_register_oid(&sysctl__security_mac_mls_ptys_equal); sysctl_register_oid(&sysctl__security_mac_mls_revocation_enabled); sysctl_register_oid(&sysctl__security_mac_mls_max_compartments); @@ -1925,26 +1918,6 @@ return (MAC_AUDIT_DEFAULT); } -#ifdef LATER -static int -mac_mls_check_bpfdesc_receive(struct bpf_d *bpf_d, struct label *bpflabel, - struct ifnet *ifnet, struct label *ifnetlabel) -{ - struct mac_mls *a, *b; - - if (!mac_mls_enabled) - return (0); - - a = SLOT(bpflabel); - b = SLOT(ifnetlabel); - - if (mac_mls_equal_effective(a, b)) - return (0); - - MLS_RETURN (EACCES); -} -#endif /* LATER */ - static int mac_mls_request_object_label (struct label *subj, struct label *obj, const char *serv, struct label *out) @@ -2705,6 +2678,15 @@ return (0); } +/* + * All System V shared memory operations modify struct shmid_ds. + * The MLS policy must require both read and write access for all operations. + */ + +/* + * shmat() modifies shmid_ds.shm_atime (last shmat() time) + * shmat() modifies shmid_ds.shm_nattch (# of current attaches) + */ static int mac_mls_check_sysv_shmat(struct ucred *cred, struct shmid_kernel *shmsegptr, struct label *shmseglabel, int shmflg) @@ -2717,15 +2699,13 @@ subj = SLOT(cred->cr_label); obj = SLOT(shmseglabel); - if (!mac_mls_dominate_effective(subj, obj)) - MLS_RETURN (EACCES); - if ((shmflg & SHM_RDONLY) == 0) - if (!mac_mls_dominate_effective(obj, subj)) - MLS_RETURN (EACCES); - - return (0); + MLS_RETURN_CHECK(MLS_CHECK_EQUAL); } +/* + * shmctl() modifies shmid_ds.shm_ctime (last change by shmctl()) + * shmctl() modifies shmid_ds.shm_lpid (pid of last shm op) + */ static int mac_mls_check_sysv_shmctl(struct ucred *cred, struct shmid_kernel *shmsegptr, struct label *shmseglabel, int cmd) @@ -2738,28 +2718,12 @@ subj = SLOT(cred->cr_label); obj = SLOT(shmseglabel); - switch(cmd) { - case IPC_RMID: - case IPC_SET: - if (!mac_mls_dominate_effective(obj, subj)) - MLS_RETURN (EACCES); - break; - - case IPC_STAT: - if (!mac_mls_dominate_effective(subj, obj)) - MLS_RETURN (EACCES); - break; - default: - MLS_RETURN (EACCES); - } - - return (0); + MLS_RETURN_CHECK(MLS_CHECK_EQUAL); } /* - * TODO: Do we check the integrity of the implicit write access caused - * by the bookkeeping tasks associated with the shmdt call, which may - * modify/delete the shmseg meta-data and/or the shared segment itself? + * shmdt() modifies shmid_ds.shm_dtime (last shmdt() time) + * shmdt() modifies shmid_ds.shm_nattch (# of current attaches) */ static int mac_mls_check_sysv_shmdt(struct ucred *cred, struct shmid_kernel *shmsegptr, @@ -2773,12 +2737,12 @@ subj = SLOT(cred->cr_label); obj = SLOT(shmseglabel); - if (!mac_mls_dominate_effective(obj, subj)) - return (EACCES); - - return (0); + MLS_RETURN_CHECK(MLS_CHECK_EQUAL); } +/* + * shmget() modifies shmid_ds.shm_lpid (pid of last shm op) + */ static int mac_mls_check_sysv_shmget(struct ucred *cred, struct shmid_kernel *shmsegptr, struct label *shmseglabel, int shmflg) @@ -2791,10 +2755,7 @@ subj = SLOT(cred->cr_label); obj = SLOT(shmseglabel); - if (!mac_mls_dominate_effective(subj, obj)) - MLS_RETURN (EACCES); - - return (0); + MLS_RETURN_CHECK(MLS_CHECK_EQUAL); } static int @@ -3180,18 +3141,26 @@ struct label *vlabel) { struct mac_mls *subj, *obj; + int error; if (!mac_mls_enabled) return (0); - /* XXXMAC: should we ever deny permission to turn accounting off? */ - if (vlabel == NULL) - return (0); + subj = SLOT(cred->cr_label); + error = mac_mls_subject_privileged(subj); - subj = SLOT(cred->cr_label); - obj = SLOT(vlabel); + if (error == 0) { + if (vlabel == NULL) { + KASSERT((vp == NULL), + ("mac_mls_check_system_acct: no label for vp")); + } else { + obj = SLOT(vlabel); >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Aug 15 21:26:19 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B87DA16A4E9; Tue, 15 Aug 2006 21:26:19 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 93E6816A4DE for ; Tue, 15 Aug 2006 21:26:19 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 35E7543DC5 for ; Tue, 15 Aug 2006 21:25:44 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7FLPdfn066410 for ; Tue, 15 Aug 2006 21:25:39 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7FLPdq0066407 for perforce@freebsd.org; Tue, 15 Aug 2006 21:25:39 GMT (envelope-from jb@freebsd.org) Date: Tue, 15 Aug 2006 21:25:39 GMT Message-Id: <200608152125.k7FLPdq0066407@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 104125 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Aug 2006 21:26:19 -0000 http://perforce.freebsd.org/chv.cgi?CH=104125 Change 104125 by jb@jb_freebsd2 on 2006/08/15 21:25:37 Add missing variables. Affected files ... .. //depot/projects/dtrace/src/usr.bin/truss/powerpc-fbsd.c#4 edit .. //depot/projects/dtrace/src/usr.bin/truss/sparc64-fbsd.c#5 edit Differences ... ==== //depot/projects/dtrace/src/usr.bin/truss/powerpc-fbsd.c#4 (text+ko) ==== @@ -116,6 +116,7 @@ int i; unsigned int regargs; struct syscall *sc; + struct ptrace_io_desc iorequest; cpid = trussinfo->tid; ==== //depot/projects/dtrace/src/usr.bin/truss/sparc64-fbsd.c#5 (text+ko) ==== @@ -120,6 +120,7 @@ int syscall_num; int i; struct syscall *sc; + struct ptrace_io_desc iorequest; int indir = 0; /* indirect system call */ cpid = trussinfo->tid; From owner-p4-projects@FreeBSD.ORG Tue Aug 15 21:30:48 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DFEEE16A4F0; Tue, 15 Aug 2006 21:30:47 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 941D516A4DF for ; Tue, 15 Aug 2006 21:30:47 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5B32E43DC0 for ; Tue, 15 Aug 2006 21:28:52 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7FLSiWK066578 for ; Tue, 15 Aug 2006 21:28:44 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7FLShQX066575 for perforce@freebsd.org; Tue, 15 Aug 2006 21:28:43 GMT (envelope-from jb@freebsd.org) Date: Tue, 15 Aug 2006 21:28:43 GMT Message-Id: <200608152128.k7FLShQX066575@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 104126 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Aug 2006 21:30:48 -0000 http://perforce.freebsd.org/chv.cgi?CH=104126 Change 104126 by jb@jb_freebsd2 on 2006/08/15 21:28:18 This file may have started out automatically generated, but we customise it to suit all FreeBSD arches. Use the system headers to determine if big endian. It would be nice if this library could handle both endians and variable sizes. Affected files ... .. //depot/projects/dtrace/src/gnu/lib/libdwarf/config.h#6 edit Differences ... ==== //depot/projects/dtrace/src/gnu/lib/libdwarf/config.h#6 (text+ko) ==== @@ -1,5 +1,7 @@ -/* config.h. Generated by configure. */ -/* config.h.in. Generated from configure.in by autoheader. */ +/* + * $FreeBSD$ + */ +#include /* Define to 1 if you have the header file. */ /* #undef HAVE_ALLOCA_H */ @@ -24,14 +26,10 @@ #define HAVE_INTTYPES_H 1 /* Define to 1 if you have the header file. */ -#ifdef __i386__ #define HAVE_LIBELF_H 1 -#endif /* Define to 1 if you have the header file. */ -#ifdef __sparc64__ -#define HAVE_LIBELF_LIBELF_H 1 -#endif +/* #undef HAVE_LIBELF_LIBELF_H */ /* Define to 1 if you have the header file. */ #define HAVE_MEMORY_H 1 @@ -105,6 +103,6 @@ /* Define to 1 if your processor stores words with the most significant byte first (like Motorola and SPARC, unlike Intel and VAX). */ -#ifdef __sparc64__ +#if _BYTE_ORDER == _BIG_ENDIAN #define WORDS_BIGENDIAN 1 #endif From owner-p4-projects@FreeBSD.ORG Tue Aug 15 21:31:15 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D192016A4E8; Tue, 15 Aug 2006 21:31:14 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 AF24E16A4E2 for ; Tue, 15 Aug 2006 21:31:14 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6082643DA7 for ; Tue, 15 Aug 2006 21:29:55 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7FLTk2e066647 for ; Tue, 15 Aug 2006 21:29:46 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7FLTk9r066644 for perforce@freebsd.org; Tue, 15 Aug 2006 21:29:46 GMT (envelope-from jb@freebsd.org) Date: Tue, 15 Aug 2006 21:29:46 GMT Message-Id: <200608152129.k7FLTk9r066644@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 104127 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Aug 2006 21:31:15 -0000 http://perforce.freebsd.org/chv.cgi?CH=104127 Change 104127 by jb@jb_freebsd2 on 2006/08/15 21:29:06 Make an argument match the format type. Affected files ... .. //depot/projects/dtrace/src/contrib/opensolaris/cmd/sgs/tools/common/sgsmsg.c#4 edit Differences ... ==== //depot/projects/dtrace/src/contrib/opensolaris/cmd/sgs/tools/common/sgsmsg.c#4 (text) ==== @@ -553,7 +553,7 @@ return (1); } if (fddefs && fprintf(fddefs, "#define\t%s_SIZE\t%d\n", - msg->ms_defn, strlen(msg->ms_message)) < 0) { + msg->ms_defn, (int) strlen(msg->ms_message)) < 0) { (void) fprintf(stderr, Errmsg_wrte, fldefs, strerror(errno)); return (1); From owner-p4-projects@FreeBSD.ORG Tue Aug 15 21:33:06 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D465616A4F1; Tue, 15 Aug 2006 21:33:05 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 9957416A4E6 for ; Tue, 15 Aug 2006 21:33:05 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 007BD43DD8 for ; Tue, 15 Aug 2006 21:30:52 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7FLUmVf066820 for ; Tue, 15 Aug 2006 21:30:48 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7FLUm6Q066816 for perforce@freebsd.org; Tue, 15 Aug 2006 21:30:48 GMT (envelope-from jb@freebsd.org) Date: Tue, 15 Aug 2006 21:30:48 GMT Message-Id: <200608152130.k7FLUm6Q066816@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 104128 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Aug 2006 21:33:06 -0000 http://perforce.freebsd.org/chv.cgi?CH=104128 Change 104128 by jb@jb_freebsd2 on 2006/08/15 21:29:50 Add a missing prototype. Affected files ... .. //depot/projects/dtrace/src/contrib/opensolaris/tools/ctf/cvt/alist.h#2 edit Differences ... ==== //depot/projects/dtrace/src/contrib/opensolaris/tools/ctf/cvt/alist.h#2 (text) ==== @@ -48,6 +48,7 @@ int alist_find(alist_t *, void *, void **); int alist_iter(alist_t *, int (*)(void *, void *, void *), void *); void alist_stats(alist_t *, int); +int alist_dump(alist_t *, int (*)(void *, void *)); #ifdef __cplusplus } From owner-p4-projects@FreeBSD.ORG Tue Aug 15 21:34:41 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DEAA916A4E6; Tue, 15 Aug 2006 21:34:40 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 9562F16A4E2 for ; Tue, 15 Aug 2006 21:34:40 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 82CC243E71 for ; Tue, 15 Aug 2006 21:31:50 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7FLVour066957 for ; Tue, 15 Aug 2006 21:31:50 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7FLVoUn066954 for perforce@freebsd.org; Tue, 15 Aug 2006 21:31:50 GMT (envelope-from jb@freebsd.org) Date: Tue, 15 Aug 2006 21:31:50 GMT Message-Id: <200608152131.k7FLVoUn066954@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 104130 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Aug 2006 21:34:41 -0000 http://perforce.freebsd.org/chv.cgi?CH=104130 Change 104130 by jb@jb_freebsd2 on 2006/08/15 21:31:44 Use FreeBSD's libelf on all archs now. Affected files ... .. //depot/projects/dtrace/src/gnu/lib/libdwarf/Makefile#4 edit Differences ... ==== //depot/projects/dtrace/src/gnu/lib/libdwarf/Makefile#4 (text+ko) ==== @@ -22,16 +22,14 @@ CFLAGS+= -I${.CURDIR} \ -I${DWARF_DISTDIR} -.if ${MACHINE_ARCH} != "i386" -CFLAGS+= -I/usr/local/include -.else CFLAGS+= -I${.CURDIR}/../../../sys \ -I${.CURDIR}/../../../sys/contrib \ -I${OPENSOLARIS_USR_DISTDIR}/head \ -I${OPENSOLARIS_SYS_DISTDIR}/uts/common CFLAGS+= -D_SOLARIS_C_SOURCE -.endif + +IGNORE_PRAGMA= 1 .PATH: ${DWARF_DISTDIR} From owner-p4-projects@FreeBSD.ORG Tue Aug 15 21:35:28 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C8FB316A4E0; Tue, 15 Aug 2006 21:35:28 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 8FDE516A4DD for ; Tue, 15 Aug 2006 21:35:28 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5197543DFE for ; Tue, 15 Aug 2006 21:32:52 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7FLWqVI067059 for ; Tue, 15 Aug 2006 21:32:52 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7FLWqwQ067056 for perforce@freebsd.org; Tue, 15 Aug 2006 21:32:52 GMT (envelope-from jb@freebsd.org) Date: Tue, 15 Aug 2006 21:32:52 GMT Message-Id: <200608152132.k7FLWqwQ067056@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 104133 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Aug 2006 21:35:29 -0000 http://perforce.freebsd.org/chv.cgi?CH=104133 Change 104133 by jb@jb_freebsd2 on 2006/08/15 21:32:43 Add libelf to the prebuild libraries. Affected files ... .. //depot/projects/dtrace/src/Makefile.inc1#16 edit Differences ... ==== //depot/projects/dtrace/src/Makefile.inc1#16 (text+ko) ==== @@ -1004,7 +1004,7 @@ _startup_libs+= lib/csu/${MACHINE_ARCH} .endif -_prebuild_libs= +_prebuild_libs= lib/libelf _generic_libs= gnu/lib From owner-p4-projects@FreeBSD.ORG Tue Aug 15 21:36:23 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9BBA316A556; Tue, 15 Aug 2006 21:36:23 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 5A20216A543 for ; Tue, 15 Aug 2006 21:36:23 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5C80A43DEF for ; Tue, 15 Aug 2006 21:34:56 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7FLYuOw067236 for ; Tue, 15 Aug 2006 21:34:56 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7FLYuTq067233 for perforce@freebsd.org; Tue, 15 Aug 2006 21:34:56 GMT (envelope-from jb@freebsd.org) Date: Tue, 15 Aug 2006 21:34:56 GMT Message-Id: <200608152134.k7FLYuTq067233@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 104135 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Aug 2006 21:36:23 -0000 http://perforce.freebsd.org/chv.cgi?CH=104135 Change 104135 by jb@jb_freebsd2 on 2006/08/15 21:33:59 Use FreeBSD's libelf now. Also ignore those Solaris #pragma ident statements that I am so fond of. Affected files ... .. //depot/projects/dtrace/src/cddl/usr.sbin/dtrace/Makefile#6 edit Differences ... ==== //depot/projects/dtrace/src/cddl/usr.sbin/dtrace/Makefile#6 (text+ko) ==== @@ -8,7 +8,7 @@ SRCS= dtrace.c -WARNS?= 1 +WARNS= 1 CFLAGS+= -I${.CURDIR}/../../../contrib \ -I${.CURDIR}/../../../sys/contrib \ @@ -26,15 +26,10 @@ -L${.OBJDIR}/../../lib/libdtrace \ -L${.OBJDIR}/../../lib/libproc \ -L${.OBJDIR}/../../lib/libctf \ - -L${.OBJDIR}/../../lib/libelf + -L${.OBJDIR}/../../../lib/libelf LDADD+= -ldtrace -ly -ll -lproc -lctf -lelf -lz -.if ${MACHINE_ARCH} != "i386" -LDFLAGS+= -L/usr/local/lib -LDADD+= -lintl -liconv -.endif - #DPADD+= ${LIBDTRACE} ${LIBPTHREAD} ${LIBL} ${LIBY} ${LIBZ} NO_MAN= From owner-p4-projects@FreeBSD.ORG Tue Aug 15 21:38:28 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EE56616A4F1; Tue, 15 Aug 2006 21:38:27 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 B44F116A4E9 for ; Tue, 15 Aug 2006 21:38:27 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id EAA7C43D88 for ; Tue, 15 Aug 2006 21:36:59 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7FLax4d067417 for ; Tue, 15 Aug 2006 21:36:59 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7FLax7a067414 for perforce@freebsd.org; Tue, 15 Aug 2006 21:36:59 GMT (envelope-from jb@freebsd.org) Date: Tue, 15 Aug 2006 21:36:59 GMT Message-Id: <200608152136.k7FLax7a067414@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 104139 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Aug 2006 21:38:28 -0000 http://perforce.freebsd.org/chv.cgi?CH=104139 Change 104139 by jb@jb_freebsd2 on 2006/08/15 21:36:31 Jacking up the WARNS level was a bit premature. Affected files ... .. //depot/projects/dtrace/src/cddl/usr.bin/ctfconvert/Makefile#7 edit .. //depot/projects/dtrace/src/cddl/usr.bin/ctfdump/Makefile#4 edit .. //depot/projects/dtrace/src/cddl/usr.bin/ctfmerge/Makefile#7 edit Differences ... ==== //depot/projects/dtrace/src/cddl/usr.bin/ctfconvert/Makefile#7 (text+ko) ==== @@ -4,6 +4,8 @@ .include "../../Makefile.inc" +WARNS= 1 + PROG= ctfconvert SRCS= alist.c \ ==== //depot/projects/dtrace/src/cddl/usr.bin/ctfdump/Makefile#4 (text+ko) ==== @@ -8,7 +8,7 @@ dump.c \ symbol.c -WARNS?= 1 +WARNS= 1 CFLAGS+= -I${OPENSOLARIS_USR_DISTDIR} \ -I${OPENSOLARIS_SYS_DISTDIR} \ ==== //depot/projects/dtrace/src/cddl/usr.bin/ctfmerge/Makefile#7 (text+ko) ==== @@ -4,6 +4,8 @@ .include "../../Makefile.inc" +WARNS= 1 + PROG= ctfmerge SRCS= alist.c \ From owner-p4-projects@FreeBSD.ORG Wed Aug 16 00:43:17 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DCF2A16A4E1; Wed, 16 Aug 2006 00:43:16 +0000 (UTC) X-Original-To: perforce@FreeBSD.org 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 9C9B116A4DD for ; Wed, 16 Aug 2006 00:43:16 +0000 (UTC) (envelope-from ryanb@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7AC4C43D46 for ; Wed, 16 Aug 2006 00:43:15 +0000 (GMT) (envelope-from ryanb@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7G0hFdF082979 for ; Wed, 16 Aug 2006 00:43:15 GMT (envelope-from ryanb@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7G0h4Ux082976 for perforce@freebsd.org; Wed, 16 Aug 2006 00:43:04 GMT (envelope-from ryanb@FreeBSD.org) Date: Wed, 16 Aug 2006 00:43:04 GMT Message-Id: <200608160043.k7G0h4Ux082976@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to ryanb@FreeBSD.org using -f From: Ryan Beasley To: Perforce Change Reviews Cc: Subject: PERFORCE change 104164 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 16 Aug 2006 00:43:17 -0000 http://perforce.freebsd.org/chv.cgi?CH=104164 Change 104164 by ryanb@ryanb_yuki on 2006/08/16 00:42:37 IFC. Affected files ... .. //depot/projects/soc2006/rbeasley_sound/sys/Makefile#4 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/amd64/acpica/madt.c#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/amd64/amd64/db_trace.c#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/amd64/amd64/identcpu.c#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/amd64/amd64/intr_machdep.c#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/amd64/amd64/local_apic.c#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/amd64/amd64/machdep.c#3 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/amd64/amd64/pmap.c#4 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/amd64/amd64/support.S#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/amd64/amd64/trap.c#3 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/amd64/amd64/vm_machdep.c#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/amd64/conf/GENERIC#4 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/amd64/conf/NOTES#4 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/amd64/ia32/ia32_syscall.c#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/amd64/include/pmap.h#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/amd64/include/specialreg.h#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/amd64/linux32/linux.h#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/amd64/linux32/linux32_dummy.c#3 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/amd64/linux32/linux32_machdep.c#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/amd64/linux32/linux32_proto.h#4 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/amd64/linux32/linux32_syscall.h#4 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/amd64/linux32/linux32_sysent.c#4 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/amd64/linux32/linux32_sysvec.c#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/amd64/linux32/syscalls.conf#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/amd64/linux32/syscalls.master#4 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/arm/arm/db_trace.c#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/arm/arm/elf_trampoline.c#4 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/arm/arm/gdb_machdep.c#1 branch .. //depot/projects/soc2006/rbeasley_sound/sys/arm/arm/in_cksum.c#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/arm/arm/mem.c#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/arm/arm/pmap.c#3 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/arm/arm/trap.c#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/arm/arm/vm_machdep.c#3 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/arm/at91/at91_pio.c#3 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/arm/at91/at91_piovar.h#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/arm/at91/at91_pmc.c#3 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/arm/at91/at91_rtc.c#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/arm/at91/at91_rtcreg.h#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/arm/at91/at91_spi.c#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/arm/at91/at91_spiio.h#2 delete .. //depot/projects/soc2006/rbeasley_sound/sys/arm/at91/at91_spireg.h#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/arm/at91/at91_ssc.c#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/arm/at91/at91_st.c#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/arm/at91/at91_twi.c#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/arm/at91/files.at91#3 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/arm/at91/if_ate.c#3 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/arm/at91/kb920x_machdep.c#4 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/arm/at91/std.at91#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/arm/at91/std.kb920x#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/arm/at91/uart_dev_at91usart.c#3 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/arm/conf/KB920X#3 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/arm/include/db_machdep.h#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/arm/include/gdb_machdep.h#1 branch .. //depot/projects/soc2006/rbeasley_sound/sys/arm/include/pmap.h#3 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/arm/include/sf_buf.h#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/arm/include/vmparam.h#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/arm/sa11x0/assabet_machdep.c#3 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/arm/xscale/i80321/i80321.c#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/arm/xscale/i80321/i80321_timer.c#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/arm/xscale/i80321/iq31244_machdep.c#3 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/arm/xscale/i80321/iq80321.c#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/boot/Makefile#3 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/boot/arm/Makefile#1 branch .. //depot/projects/soc2006/rbeasley_sound/sys/boot/arm/at91/Makefile.inc#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/boot/arm/at91/bootiic/Makefile#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/boot/arm/at91/bootiic/arm_init.S#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/boot/arm/at91/bootiic/env_vars.c#1 branch .. //depot/projects/soc2006/rbeasley_sound/sys/boot/arm/at91/bootiic/env_vars.h#1 branch .. //depot/projects/soc2006/rbeasley_sound/sys/boot/arm/at91/bootiic/loader_prompt.c#1 branch .. //depot/projects/soc2006/rbeasley_sound/sys/boot/arm/at91/bootiic/loader_prompt.h#1 branch .. //depot/projects/soc2006/rbeasley_sound/sys/boot/arm/at91/bootiic/main.c#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/boot/arm/at91/libat91/Makefile#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/boot/arm/at91/libat91/at91rm9200.h#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/boot/arm/at91/libat91/at91rm9200_lowlevel.h#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/boot/arm/at91/libat91/eeprom.c#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/boot/arm/at91/libat91/eeprom.h#2 delete .. //depot/projects/soc2006/rbeasley_sound/sys/boot/arm/at91/libat91/emac.c#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/boot/arm/at91/libat91/emac.h#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/boot/arm/at91/libat91/env_vars.c#2 delete .. //depot/projects/soc2006/rbeasley_sound/sys/boot/arm/at91/libat91/env_vars.h#2 delete .. //depot/projects/soc2006/rbeasley_sound/sys/boot/arm/at91/libat91/lib.h#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/boot/arm/at91/libat91/loader_prompt.c#2 delete .. //depot/projects/soc2006/rbeasley_sound/sys/boot/arm/at91/libat91/loader_prompt.h#2 delete .. //depot/projects/soc2006/rbeasley_sound/sys/boot/arm/at91/libat91/p_string.c#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/boot/arm/at91/libat91/p_string.h#2 delete .. //depot/projects/soc2006/rbeasley_sound/sys/boot/arm/at91/libat91/spi_flash.c#1 branch .. //depot/projects/soc2006/rbeasley_sound/sys/boot/arm/at91/libat91/spi_flash.h#1 branch .. //depot/projects/soc2006/rbeasley_sound/sys/boot/arm/at91/libat91/xmodem.c#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/boot/forth/loader.conf#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/boot/i386/loader/main.c#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/boot/pc98/loader/main.c#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/cam/scsi/scsi_cd.c#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/cam/scsi/scsi_da.c#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/cam/scsi/scsi_pass.c#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/compat/freebsd32/freebsd32_misc.c#3 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/compat/freebsd32/freebsd32_proto.h#3 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/compat/freebsd32/freebsd32_syscall.h#3 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/compat/freebsd32/freebsd32_syscalls.c#3 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/compat/freebsd32/freebsd32_sysent.c#3 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/compat/freebsd32/syscalls.conf#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/compat/freebsd32/syscalls.master#3 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/compat/linprocfs/linprocfs.c#4 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/compat/linux/linux_emul.c#1 branch .. //depot/projects/soc2006/rbeasley_sound/sys/compat/linux/linux_emul.h#1 branch .. //depot/projects/soc2006/rbeasley_sound/sys/compat/linux/linux_file.c#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/compat/linux/linux_futex.c#1 branch .. //depot/projects/soc2006/rbeasley_sound/sys/compat/linux/linux_futex.h#1 branch .. //depot/projects/soc2006/rbeasley_sound/sys/compat/linux/linux_ioctl.c#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/compat/linux/linux_ipc.c#3 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/compat/linux/linux_misc.c#3 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/compat/linux/linux_signal.c#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/compat/linux/linux_socket.c#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/compat/linux/linux_time.c#1 branch .. //depot/projects/soc2006/rbeasley_sound/sys/compat/linux/linux_util.c#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/compat/svr4/svr4_ipc.c#3 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/compat/svr4/svr4_misc.c#3 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/compat/svr4/svr4_proto.h#3 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/compat/svr4/svr4_socket.c#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/compat/svr4/svr4_socket.h#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/compat/svr4/svr4_sockio.c#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/compat/svr4/svr4_stream.c#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/compat/svr4/svr4_stropts.h#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/compat/svr4/svr4_syscall.h#3 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/compat/svr4/svr4_syscallnames.c#3 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/compat/svr4/svr4_sysent.c#3 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/compat/svr4/svr4_sysvec.c#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/compat/svr4/svr4_util.h#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/compat/svr4/syscalls.conf#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/compat/svr4/syscalls.master#3 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/conf/Makefile.arm#4 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/conf/NOTES#4 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/conf/files#5 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/conf/files.amd64#3 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/conf/files.arm#3 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/conf/files.i386#3 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/conf/files.ia64#3 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/conf/files.pc98#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/conf/files.powerpc#3 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/conf/kern.post.mk#4 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/conf/kern.pre.mk#3 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/conf/kmod.mk#4 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/conf/options#4 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/conf/options.amd64#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/conf/options.arm#3 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/conf/options.i386#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/conf/options.pc98#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/contrib/dev/acpica/acfreebsd.h#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/contrib/ia64/libuwx/src.diff#2 delete .. //depot/projects/soc2006/rbeasley_sound/sys/contrib/ia64/libuwx/src/Makefile#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/contrib/ia64/libuwx/src/uwx.h#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/contrib/ia64/libuwx/src/uwx_bstream.c#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/contrib/ia64/libuwx/src/uwx_bstream.h#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/contrib/ia64/libuwx/src/uwx_context.c#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/contrib/ia64/libuwx/src/uwx_context.h#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/contrib/ia64/libuwx/src/uwx_env.c#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/contrib/ia64/libuwx/src/uwx_env.h#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/contrib/ia64/libuwx/src/uwx_scoreboard.c#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/contrib/ia64/libuwx/src/uwx_scoreboard.h#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/contrib/ia64/libuwx/src/uwx_self-new.c#2 delete .. //depot/projects/soc2006/rbeasley_sound/sys/contrib/ia64/libuwx/src/uwx_self.c#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/contrib/ia64/libuwx/src/uwx_self.h#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/contrib/ia64/libuwx/src/uwx_self_context.s#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/contrib/ia64/libuwx/src/uwx_self_info.h#1 branch .. //depot/projects/soc2006/rbeasley_sound/sys/contrib/ia64/libuwx/src/uwx_step.c#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/contrib/ia64/libuwx/src/uwx_step.h#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/contrib/ia64/libuwx/src/uwx_str.c#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/contrib/ia64/libuwx/src/uwx_str.h#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/contrib/ia64/libuwx/src/uwx_swap.c#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/contrib/ia64/libuwx/src/uwx_swap.h#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/contrib/ia64/libuwx/src/uwx_symbols.c#1 branch .. //depot/projects/soc2006/rbeasley_sound/sys/contrib/ia64/libuwx/src/uwx_symbols.h#1 branch .. //depot/projects/soc2006/rbeasley_sound/sys/contrib/ia64/libuwx/src/uwx_trace.c#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/contrib/ia64/libuwx/src/uwx_trace.h#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/contrib/ia64/libuwx/src/uwx_ttrace.c#2 delete .. //depot/projects/soc2006/rbeasley_sound/sys/contrib/ia64/libuwx/src/uwx_ttrace.h#2 delete .. //depot/projects/soc2006/rbeasley_sound/sys/contrib/ia64/libuwx/src/uwx_uinfo.c#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/contrib/ia64/libuwx/src/uwx_uinfo.h#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/contrib/ia64/libuwx/src/uwx_utable.c#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/contrib/ia64/libuwx/src/uwx_utable.h#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/contrib/pf/net/if_pflog.c#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/contrib/pf/net/if_pfsync.c#3 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/contrib/pf/net/pf_ioctl.c#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/crypto/via/padlock.c#3 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/crypto/via/padlock.h#1 branch .. //depot/projects/soc2006/rbeasley_sound/sys/crypto/via/padlock_cipher.c#1 branch .. //depot/projects/soc2006/rbeasley_sound/sys/crypto/via/padlock_hash.c#1 branch .. //depot/projects/soc2006/rbeasley_sound/sys/ddb/db_command.c#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/ddb/db_output.c#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/ddb/db_output.h#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/ddb/db_ps.c#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/ddb/db_thread.c#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/ddb/ddb.h#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/dev/aac/aac_cam.c#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/dev/acpi_support/acpi_ibm.c#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/dev/acpica/Osd/OsdMemory.c#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/dev/acpica/acpi.c#3 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/dev/acpica/acpi_dock.c#3 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/dev/acpica/acpi_hpet.c#3 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/dev/acpica/acpi_pci_link.c#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/dev/acpica/acpi_perf.c#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/dev/acpica/acpi_thermal.c#3 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/dev/acpica/acpi_video.c#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/dev/acpica/acpivar.h#3 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/dev/amr/amr.c#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/dev/asr/MAINTAINER#2 delete .. //depot/projects/soc2006/rbeasley_sound/sys/dev/ata/ata-chipset.c#3 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/dev/ata/ata-disk.c#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/dev/ata/ata-pci.h#3 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/dev/ata/ata-queue.c#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/dev/ath/ath_rate/sample/sample.h#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/dev/ath/if_ath.c#4 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/dev/ath/if_athioctl.h#3 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/dev/bce/if_bce.c#3 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/dev/bge/if_bge.c#4 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/dev/bge/if_bgereg.h#4 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/dev/bktr/CHANGELOG.TXT#3 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/dev/dc/dcphy.c#3 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/dev/dc/pnphy.c#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/dev/dpt/dpt_scsi.c#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/dev/em/README#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/dev/em/if_em.c#3 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/dev/em/if_em.h#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/dev/em/if_em_hw.c#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/dev/em/if_em_hw.h#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/dev/em/if_em_osdep.h#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/dev/exca/excareg.h#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/dev/fdc/fdc.c#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/dev/fe/if_fe.c#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/dev/hme/if_hme.c#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/dev/ic/nec765.h#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/dev/iicbus/iic.c#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/dev/iicbus/iic.h#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/dev/iicbus/iicbus.c#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/dev/iicbus/iicbus.h#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/dev/iicbus/iicbus_if.m#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/dev/iicbus/iiconf.c#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/dev/iicbus/iiconf.h#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/dev/isp/isp.c#3 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/dev/isp/isp_freebsd.c#3 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/dev/isp/isp_freebsd.h#3 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/dev/isp/isp_ioctl.h#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/dev/isp/isp_library.c#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/dev/isp/isp_pci.c#3 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/dev/isp/isp_sbus.c#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/dev/isp/isp_target.c#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/dev/isp/isp_target.h#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/dev/isp/isp_tpublic.h#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/dev/isp/ispvar.h#3 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/dev/ispfw/asm_1040.h#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/dev/ispfw/asm_1080.h#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/dev/ispfw/asm_12160.h#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/dev/ispfw/ispfw.c#3 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/dev/iwi/if_iwi.c#3 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/dev/ixgb/if_ixgb.c#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/dev/kbdmux/kbdmux.c#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/dev/lmc/if_lmc.c#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/dev/lmc/if_lmc.h#3 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/dev/mii/gentbi.c#1 branch .. //depot/projects/soc2006/rbeasley_sound/sys/dev/mii/ip1000phy.c#1 branch .. //depot/projects/soc2006/rbeasley_sound/sys/dev/mii/ip1000phyreg.h#1 branch .. //depot/projects/soc2006/rbeasley_sound/sys/dev/mii/miidevs#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/dev/mii/rgephy.c#3 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/dev/mpt/mpt.c#5 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/dev/mpt/mpt.h#5 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/dev/mpt/mpt_cam.c#5 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/dev/mpt/mpt_debug.c#3 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/dev/mpt/mpt_pci.c#5 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/dev/mpt/mpt_raid.c#4 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/dev/mpt/mpt_raid.h#4 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/dev/mxge/if_mxge.c#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/dev/ncv/ncr53c500_pccard.c#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/dev/nfe/if_nfe.c#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/dev/patm/if_patm_intr.c#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/dev/pccard/pccard_cis.c#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/dev/pccard/pccarddevs#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/dev/pccbb/pccbb.c#3 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/dev/pccbb/pccbb_pci.c#3 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/dev/pccbb/pccbbreg.h#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/dev/pci/pci.c#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/dev/pci/pcivar.h#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/dev/powermac_nvram/powermac_nvram.c#1 branch .. //depot/projects/soc2006/rbeasley_sound/sys/dev/powermac_nvram/powermac_nvramvar.h#1 branch .. //depot/projects/soc2006/rbeasley_sound/sys/dev/ral/rt2560.c#3 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/dev/random/probe.c#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/dev/re/if_re.c#3 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/dev/scc/scc_core.c#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/dev/scc/scc_dev_z8530.c#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/dev/sio/sio.c#3 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/dev/sk/if_sk.c#3 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/dev/sk/if_skreg.h#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/dev/sound/driver.c#3 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/dev/sound/midi/sequencer.c#4 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/dev/sound/pci/cmi.c#4 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/dev/sound/pci/emu10k1.c#3 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/dev/sound/pci/emu10kx-midi.c#1 branch .. //depot/projects/soc2006/rbeasley_sound/sys/dev/sound/pci/emu10kx-pcm.c#1 branch .. //depot/projects/soc2006/rbeasley_sound/sys/dev/sound/pci/emu10kx.c#1 branch .. //depot/projects/soc2006/rbeasley_sound/sys/dev/sound/pci/emu10kx.h#1 branch .. //depot/projects/soc2006/rbeasley_sound/sys/dev/sound/pci/envy24.c#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/dev/sound/pci/ich.c#3 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/dev/sound/pci/solo.c#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/dev/sound/pcm/buffer.c#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/dev/sound/pcm/buffer.h#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/dev/sound/pcm/mixer.h#5 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/dev/sound/pcm/sound.c#10 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/dev/sound/pcm/sound.h#4 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/dev/spibus/spi.h#1 branch .. //depot/projects/soc2006/rbeasley_sound/sys/dev/spibus/spibus.c#1 branch .. //depot/projects/soc2006/rbeasley_sound/sys/dev/spibus/spibus_if.m#1 branch .. //depot/projects/soc2006/rbeasley_sound/sys/dev/spibus/spibusvar.h#1 branch .. //depot/projects/soc2006/rbeasley_sound/sys/dev/stg/tmc18c30_subr.c#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/dev/stge/if_stge.c#1 branch .. //depot/projects/soc2006/rbeasley_sound/sys/dev/stge/if_stgereg.h#1 branch .. //depot/projects/soc2006/rbeasley_sound/sys/dev/streams/streams.c#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/dev/sym/sym_fw1.h#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/dev/sym/sym_fw2.h#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/dev/ti/if_ti.c#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/dev/uart/uart_cpu_powerpc.c#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/dev/uart/uart_dev_z8530.c#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/dev/uart/uart_tty.c#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/dev/ubsec/ubsec.c#3 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/dev/usb/if_aue.c#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/dev/usb/if_ural.c#4 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/dev/usb/uplcom.c#3 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/dev/usb/usbdevs#3 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/dev/usb/uscanner.c#3 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/dev/wi/if_wavelan_ieee.h#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/dev/wi/if_wi.c#3 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/dev/wi/if_wireg.h#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/doc/Doxyfile#2 delete .. //depot/projects/soc2006/rbeasley_sound/sys/doc/Makefile#2 delete .. //depot/projects/soc2006/rbeasley_sound/sys/doc/subsys/Dependencies#2 delete .. //depot/projects/soc2006/rbeasley_sound/sys/doc/subsys/Doxyfile-cam#3 delete .. //depot/projects/soc2006/rbeasley_sound/sys/doc/subsys/Doxyfile-crypto#3 delete .. //depot/projects/soc2006/rbeasley_sound/sys/doc/subsys/Doxyfile-dev_pci#3 delete .. //depot/projects/soc2006/rbeasley_sound/sys/doc/subsys/Doxyfile-dev_sound#3 delete .. //depot/projects/soc2006/rbeasley_sound/sys/doc/subsys/Doxyfile-dev_usb#3 delete .. //depot/projects/soc2006/rbeasley_sound/sys/doc/subsys/Doxyfile-geom#3 delete .. //depot/projects/soc2006/rbeasley_sound/sys/doc/subsys/Doxyfile-i4b#3 delete .. //depot/projects/soc2006/rbeasley_sound/sys/doc/subsys/Doxyfile-kern#3 delete .. //depot/projects/soc2006/rbeasley_sound/sys/doc/subsys/Doxyfile-libkern#3 delete .. //depot/projects/soc2006/rbeasley_sound/sys/doc/subsys/Doxyfile-linux#3 delete .. //depot/projects/soc2006/rbeasley_sound/sys/doc/subsys/Doxyfile-net80211#3 delete .. //depot/projects/soc2006/rbeasley_sound/sys/doc/subsys/Doxyfile-netgraph#3 delete .. //depot/projects/soc2006/rbeasley_sound/sys/doc/subsys/Doxyfile-netinet#3 delete .. //depot/projects/soc2006/rbeasley_sound/sys/doc/subsys/Doxyfile-netinet6#3 delete .. //depot/projects/soc2006/rbeasley_sound/sys/doc/subsys/Doxyfile-netipsec#3 delete .. //depot/projects/soc2006/rbeasley_sound/sys/doc/subsys/Doxyfile-opencrypto#3 delete .. //depot/projects/soc2006/rbeasley_sound/sys/doc/subsys/Doxyfile-vm#3 delete .. //depot/projects/soc2006/rbeasley_sound/sys/doc/subsys/Makefile#3 delete .. //depot/projects/soc2006/rbeasley_sound/sys/doc/subsys/README#2 delete .. //depot/projects/soc2006/rbeasley_sound/sys/doc/subsys/common-Doxyfile#2 delete .. //depot/projects/soc2006/rbeasley_sound/sys/doc/subsys/notreviewed.dox#2 delete .. //depot/projects/soc2006/rbeasley_sound/sys/fs/devfs/devfs_devs.c#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/fs/devfs/devfs_rule.c#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/fs/devfs/devfs_vfsops.c#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/fs/devfs/devfs_vnops.c#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/fs/hpfs/hpfs.h#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/fs/msdosfs/msdosfs_vfsops.c#3 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/fs/nwfs/nwfs_io.c#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/fs/portalfs/portal_vnops.c#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/fs/smbfs/smbfs_io.c#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/fs/smbfs/smbfs_vfsops.c#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/fs/udf/ecma167-udf.h#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/fs/udf/udf_vfsops.c#3 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/fs/unionfs/union_vnops.c#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/geom/bde/g_bde_work.c#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/geom/eli/g_eli.c#3 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/geom/eli/g_eli.h#3 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/geom/eli/g_eli_ctl.c#3 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/geom/eli/g_eli_integrity.c#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/geom/geom.h#3 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/geom/geom_gpt.c#4 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/geom/label/g_label.c#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/geom/label/g_label_msdosfs.c#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/geom/label/g_label_msdosfs.h#1 branch .. //depot/projects/soc2006/rbeasley_sound/sys/geom/mirror/g_mirror.c#3 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/geom/mirror/g_mirror_ctl.c#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/geom/raid3/g_raid3.c#3 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/geom/raid3/g_raid3_ctl.c#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/gnu/dev/sound/pci/emu10k1-ac97.h#2 delete .. //depot/projects/soc2006/rbeasley_sound/sys/gnu/dev/sound/pci/emu10k1-alsa.h#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/gnu/dev/sound/pci/emu10k1.h#2 delete .. //depot/projects/soc2006/rbeasley_sound/sys/gnu/dev/sound/pci/p16v-alsa.h#1 branch .. //depot/projects/soc2006/rbeasley_sound/sys/gnu/dev/sound/pci/p17v-alsa.h#1 branch .. //depot/projects/soc2006/rbeasley_sound/sys/i386/acpica/acpi_machdep.c#3 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/i386/acpica/acpi_wakeup.c#3 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/i386/acpica/madt.c#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/i386/conf/GENERIC#4 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/i386/conf/NOTES#4 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/i386/conf/PAE#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/i386/conf/XBOX#4 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/i386/i386/db_trace.c#3 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/i386/i386/identcpu.c#3 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/i386/i386/initcpu.c#3 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/i386/i386/intr_machdep.c#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/i386/i386/local_apic.c#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/i386/i386/machdep.c#4 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/i386/i386/pmap.c#4 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/i386/i386/support.s#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/i386/i386/trap.c#4 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/i386/i386/tsc.c#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/i386/ibcs2/ibcs2_ipc.c#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/i386/ibcs2/ibcs2_ipc.h#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/i386/ibcs2/ibcs2_isc.c#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/i386/ibcs2/ibcs2_isc_syscall.h#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/i386/ibcs2/ibcs2_isc_sysent.c#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/i386/ibcs2/ibcs2_misc.c#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/i386/ibcs2/ibcs2_msg.c#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/i386/ibcs2/ibcs2_other.c#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/i386/ibcs2/ibcs2_poll.h#2 delete .. //depot/projects/soc2006/rbeasley_sound/sys/i386/ibcs2/ibcs2_proto.h#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/i386/ibcs2/ibcs2_syscall.h#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/i386/ibcs2/ibcs2_sysent.c#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/i386/ibcs2/ibcs2_util.h#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/i386/ibcs2/ibcs2_xenix.c#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/i386/ibcs2/ibcs2_xenix.h#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/i386/ibcs2/ibcs2_xenix_syscall.h#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/i386/ibcs2/ibcs2_xenix_sysent.c#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/i386/ibcs2/imgact_coff.c#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/i386/ibcs2/syscalls.conf#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/i386/ibcs2/syscalls.isc#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/i386/ibcs2/syscalls.isc.conf#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/i386/ibcs2/syscalls.master#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/i386/ibcs2/syscalls.xenix#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/i386/ibcs2/syscalls.xenix.conf#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/i386/include/i4b_ioctl.h#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/i386/include/md_var.h#3 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/i386/include/pmap.h#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/i386/include/specialreg.h#3 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/i386/isa/clock.c#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/i386/linux/linux.h#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/i386/linux/linux_dummy.c#3 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/i386/linux/linux_machdep.c#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/i386/linux/linux_proto.h#4 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/i386/linux/linux_syscall.h#4 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/i386/linux/linux_sysent.c#4 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/i386/linux/linux_sysvec.c#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/i386/linux/syscalls.conf#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/i386/linux/syscalls.master#4 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/i386/xbox/xbox.c#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/i4b/layer4/i4b_l4mgmt.c#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/ia64/conf/DEFAULTS#3 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/ia64/conf/GENERIC#4 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/ia64/conf/NOTES#3 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/ia64/ia32/ia32_trap.c#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/ia64/ia64/db_machdep.c#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/ia64/ia64/pmap.c#4 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/ia64/ia64/trap.c#3 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/ia64/include/ieeefp.h#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/ia64/include/pmap.h#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/isa/isahint.c#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/kern/Makefile#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/kern/bus_if.m#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/kern/init_sysent.c#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/kern/kern_acl.c#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/kern/kern_descrip.c#3 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/kern/kern_environment.c#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/kern/kern_exec.c#3 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/kern/kern_fork.c#3 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/kern/kern_intr.c#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/kern/kern_ktr.c#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/kern/kern_ktrace.c#3 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/kern/kern_linker.c#4 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/kern/kern_lock.c#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/kern/kern_mac.c#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/kern/kern_malloc.c#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/kern/kern_mutex.c#3 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/kern/kern_prot.c#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/kern/kern_resource.c#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/kern/kern_rwlock.c#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/kern/kern_subr.c#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/kern/kern_sx.c#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/kern/kern_syscalls.c#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/kern/kern_tc.c#3 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/kern/kern_thr.c#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/kern/kern_time.c#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/kern/kern_uuid.c#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/kern/link_elf.c#3 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/kern/makesyscalls.sh#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/kern/subr_acl_posix1e.c#1 branch .. //depot/projects/soc2006/rbeasley_sound/sys/kern/subr_autoconf.c#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/kern/subr_bus.c#3 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/kern/subr_hints.c#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/kern/subr_prf.c#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/kern/subr_rman.c#3 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/kern/subr_turnstile.c#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/kern/sys_generic.c#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/kern/sys_socket.c#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/kern/syscalls.c#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/kern/syscalls.master#3 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/kern/systrace_args.c#1 branch .. //depot/projects/soc2006/rbeasley_sound/sys/kern/sysv_sem.c#4 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/kern/uipc_domain.c#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/kern/uipc_proto.c#2 delete .. //depot/projects/soc2006/rbeasley_sound/sys/kern/uipc_sem.c#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/kern/uipc_sockbuf.c#1 branch .. //depot/projects/soc2006/rbeasley_sound/sys/kern/uipc_socket.c#4 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/kern/uipc_socket2.c#3 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/kern/uipc_syscalls.c#4 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/kern/uipc_usrreq.c#4 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/kern/vfs_aio.c#3 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/kern/vfs_bio.c#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/kern/vfs_lookup.c#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/kern/vfs_subr.c#4 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/kern/vfs_syscalls.c#3 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/libkern/strstr.c#1 branch .. //depot/projects/soc2006/rbeasley_sound/sys/modules/Makefile#4 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/modules/agp/Makefile#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/modules/asr/Makefile#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/modules/bridgestp/Makefile#1 branch .. //depot/projects/soc2006/rbeasley_sound/sys/modules/hwpmc/Makefile#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/modules/if_bridge/Makefile#3 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/modules/if_ef/Makefile#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/modules/if_ppp/Makefile#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/modules/ispfw/Makefile#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/modules/ispfw/isp_1000/Makefile#1 branch .. //depot/projects/soc2006/rbeasley_sound/sys/modules/ispfw/isp_1040/Makefile#1 branch .. //depot/projects/soc2006/rbeasley_sound/sys/modules/ispfw/isp_1040_it/Makefile#1 branch .. //depot/projects/soc2006/rbeasley_sound/sys/modules/ispfw/isp_1080/Makefile#1 branch .. //depot/projects/soc2006/rbeasley_sound/sys/modules/ispfw/isp_1080_it/Makefile#1 branch .. //depot/projects/soc2006/rbeasley_sound/sys/modules/ispfw/isp_12160/Makefile#1 branch .. //depot/projects/soc2006/rbeasley_sound/sys/modules/ispfw/isp_12160_it/Makefile#1 branch .. //depot/projects/soc2006/rbeasley_sound/sys/modules/ispfw/isp_2100/Makefile#1 branch .. //depot/projects/soc2006/rbeasley_sound/sys/modules/ispfw/isp_2200/Makefile#1 branch .. //depot/projects/soc2006/rbeasley_sound/sys/modules/ispfw/isp_2300/Makefile#1 branch .. //depot/projects/soc2006/rbeasley_sound/sys/modules/ispfw/isp_2322/Makefile#1 branch .. //depot/projects/soc2006/rbeasley_sound/sys/modules/ispfw/ispfw/Makefile#1 branch .. //depot/projects/soc2006/rbeasley_sound/sys/modules/linprocfs/Makefile#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/modules/linsysfs/Makefile#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/modules/linux/Makefile#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/modules/mii/Makefile#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/modules/netgraph/mppc/Makefile#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/modules/osf1/Makefile#2 delete .. //depot/projects/soc2006/rbeasley_sound/sys/modules/padlock/Makefile#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/modules/powermac_nvram/Makefile#1 branch .. //depot/projects/soc2006/rbeasley_sound/sys/modules/sound/driver/Makefile#3 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/modules/sound/driver/emu10kx/Makefile#1 branch .. //depot/projects/soc2006/rbeasley_sound/sys/modules/sound/sound/Makefile#3 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/modules/stge/Makefile#1 branch .. //depot/projects/soc2006/rbeasley_sound/sys/net/bpf.c#4 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/net/bridgestp.c#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/net/bridgestp.h#1 branch .. //depot/projects/soc2006/rbeasley_sound/sys/net/if.c#4 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/net/if_bridge.c#4 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/net/if_bridgevar.h#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/net/if_clone.c#3 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/net/if_clone.h#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/net/if_disc.c#3 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/net/if_enc.c#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/net/if_ethersubr.c#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/net/if_faith.c#3 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/net/if_gif.c#4 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/net/if_gre.c#3 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/net/if_loop.c#3 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/net/if_ppp.c#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/net/if_spppsubr.c#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/net/if_stf.c#4 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/net/if_tap.c#3 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/net/if_tun.c#4 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/net/if_var.h#3 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/net/if_vlan.c#3 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/net/net_osdep.h#2 delete .. //depot/projects/soc2006/rbeasley_sound/sys/net/raw_usrreq.c#3 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/net/rtsock.c#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/net80211/ieee80211.c#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/net80211/ieee80211.h#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/net80211/ieee80211_freebsd.h#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/net80211/ieee80211_input.c#3 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/net80211/ieee80211_ioctl.c#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/net80211/ieee80211_ioctl.h#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/net80211/ieee80211_output.c#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/net80211/ieee80211_proto.c#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/net80211/ieee80211_proto.h#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/net80211/ieee80211_var.h#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/netatalk/ddp_pcb.c#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/netatalk/ddp_usrreq.c#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/netatm/atm_aal5.c#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/netatm/atm_usrreq.c#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/netgraph/bluetooth/drivers/bt3c/ng_bt3c_pccard.c#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/netgraph/bluetooth/drivers/bt3c/ng_bt3c_var.h#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/netgraph/bluetooth/include/ng_btsocket_hci_raw.h#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/netgraph/bluetooth/include/ng_btsocket_l2cap.h#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/netgraph/bluetooth/include/ng_btsocket_rfcomm.h#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/netgraph/bluetooth/socket/ng_btsocket.c#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/netgraph/bluetooth/socket/ng_btsocket_hci_raw.c#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap_raw.c#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/netgraph/ng_ether.c#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/netgraph/ng_ksocket.c#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/netgraph/ng_pppoe.c#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/netgraph/ng_pppoe.h#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/netgraph/ng_socket.c#3 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/netinet/in_gif.c#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/netinet/in_pcb.c#4 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/netinet/in_pcb.h#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/netinet/in_rmx.c#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/netinet/ip_carp.c#3 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/netinet/ip_divert.c#3 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/netinet/ip_encap.c#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/netinet/ip_fw2.c#4 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/netinet/ip_ipsec.c#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/netinet/raw_ip.c#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/netinet/tcp_input.c#4 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/netinet/tcp_subr.c#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/netinet/tcp_timer.c#3 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/netinet/tcp_timer.h#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/netinet/tcp_usrreq.c#4 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/netinet/udp_usrreq.c#3 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/netinet6/README#2 delete .. //depot/projects/soc2006/rbeasley_sound/sys/netinet6/ah_aesxcbcmac.c#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/netinet6/ah_core.c#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/netinet6/ah_input.c#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/netinet6/ah_output.c#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/netinet6/esp_aesctr.c#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/netinet6/esp_core.c#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/netinet6/esp_input.c#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/netinet6/esp_output.c#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/netinet6/esp_rijndael.c#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/netinet6/frag6.c#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/netinet6/icmp6.c#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/netinet6/in6.c#4 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/netinet6/in6_cksum.c#3 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/netinet6/in6_gif.c#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/netinet6/in6_ifattach.c#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/netinet6/in6_pcb.c#3 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/netinet6/in6_proto.c#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/netinet6/in6_rmx.c#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/netinet6/in6_src.c#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/netinet6/ip6_forward.c#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/netinet6/ip6_input.c#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/netinet6/ip6_mroute.c#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/netinet6/ip6_output.c#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/netinet6/ipcomp_core.c#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/netinet6/ipcomp_input.c#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/netinet6/ipcomp_output.c#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/netinet6/ipsec.c#3 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/netinet6/mld6.c#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/netinet6/nd6.c#3 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/netinet6/nd6_nbr.c#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/netinet6/nd6_rtr.c#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/netinet6/raw_ip6.c#3 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/netinet6/udp6_output.c#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/netinet6/udp6_usrreq.c#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/netipsec/keysock.c#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/netipx/ipx_usrreq.c#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/netipx/spx_usrreq.c#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/netkey/key.c#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/netkey/keydb.c#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/netkey/keysock.c#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/netnatm/natm.c#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/netncp/ncp_sock.c#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/netsmb/smb_conn.c#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/netsmb/smb_trantcp.c#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/nfs4client/nfs4_vnops.c#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/nfsclient/nfs_bio.c#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/nfsclient/nfs_socket.c#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/nfsclient/nfs_vfsops.c#3 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/nfsclient/nfs_vnops.c#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/nfsserver/nfs.h#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/nfsserver/nfs_srvcache.c#3 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/nfsserver/nfs_srvsock.c#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/nfsserver/nfs_srvsubs.c#3 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/nfsserver/nfs_syscalls.c#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/pc98/conf/GENERIC#4 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/pc98/conf/NOTES#3 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/pc98/include/md_var.h#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/pc98/pc98/machdep.c#3 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/pc98/pc98/pc98_machdep.c#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/pci/agp.c#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/pci/if_rlreg.h#3 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/pci/if_xl.c#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/pci/ncr.c#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/posix4/ksched.c#3 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/posix4/p1003_1b.c#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/posix4/posix4.h#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/powerpc/conf/GENERIC#4 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/powerpc/conf/NOTES#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/powerpc/include/md_var.h#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/powerpc/include/ofw_machdep.h#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/powerpc/include/pcb.h#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/powerpc/powerpc/clock.c#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/powerpc/powerpc/db_trace.c#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/powerpc/powerpc/intr_machdep.c#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/powerpc/powerpc/machdep.c#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/powerpc/powerpc/mem.c#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/powerpc/powerpc/mmu_if.m#3 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/powerpc/powerpc/mmu_oea.c#4 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/powerpc/powerpc/ofw_machdep.c#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/powerpc/powerpc/pmap_dispatch.c#3 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/powerpc/powerpc/trap.c#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/powerpc/psim/sio_iobus.c#2 delete .. //depot/projects/soc2006/rbeasley_sound/sys/powerpc/psim/uart_iobus.c#1 branch .. //depot/projects/soc2006/rbeasley_sound/sys/security/audit/audit_bsm.c#3 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/security/mac/mac_vfs.c#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/security/mac_biba/mac_biba.c#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/sparc64/conf/GENERIC#4 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/sparc64/conf/NOTES#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/sparc64/include/pmap.h#3 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/sparc64/sparc64/db_trace.c#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/sparc64/sparc64/pmap.c#3 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/sparc64/sparc64/trap.c#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/sys/_label.h#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/sys/bufobj.h#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/sys/bus.h#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/sys/domain.h#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/sys/eventhandler.h#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/sys/extattr.h#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/sys/imgact.h#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/sys/kernel.h#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/sys/libkern.h#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/sys/lockmgr.h#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/sys/mac_policy.h#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/sys/mbuf.h#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/sys/mutex.h#3 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/sys/param.h#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/sys/protosw.h#3 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/sys/socket.h#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/sys/socketvar.h#3 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/sys/sockio.h#3 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/sys/stat.h#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/sys/sx.h#3 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/sys/syscall.h#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/sys/syscall.mk#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/sys/syscallsubr.h#4 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/sys/sysctl.h#3 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/sys/sysent.h#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/sys/sysproto.h#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/sys/systm.h#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/sys/thr.h#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/sys/time.h#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/sys/types.h#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/sys/unpcb.h#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/ufs/ffs/ffs_alloc.c#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/ufs/ffs/ffs_vfsops.c#3 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/ufs/ufs/ufs_lookup.c#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/vm/device_pager.c#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/vm/pmap.h#3 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/vm/swap_pager.c#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/vm/uma_core.c#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/vm/vm.h#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/vm/vm_fault.c#3 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/vm/vm_map.c#3 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/vm/vm_meter.c#3 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/vm/vm_object.c#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/vm/vm_object.h#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/vm/vm_page.c#4 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/vm/vm_page.h#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/vm/vm_pageout.c#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/vm/vnode_pager.c#2 integrate Differences ... ==== //depot/projects/soc2006/rbeasley_sound/sys/Makefile#4 (text+ko) ==== @@ -1,13 +1,11 @@ -# $FreeBSD: src/sys/Makefile,v 1.37 2006/07/04 14:14:16 maxim Exp $ +# $FreeBSD: src/sys/Makefile,v 1.38 2006/08/10 06:29:43 imp Exp $ .include # The boot loader .if ${MK_BOOT} != "no" -.if ${MACHINE_ARCH} != "arm" SUBDIR= boot .endif -.endif # Directories to include in cscope name file and TAGS. CSCOPEDIRS= coda compat conf contrib crypto ddb dev fs geom gnu i4b isa \ ==== //depot/projects/soc2006/rbeasley_sound/sys/amd64/acpica/madt.c#2 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/acpica/madt.c,v 1.20 2006/03/27 15:59:48 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/acpica/madt.c,v 1.21 2006/08/11 19:22:55 jhb Exp $"); #include #include @@ -203,15 +203,15 @@ /* * Map in the RSDP. Since ACPI uses AcpiOsMapMemory() which in turn - * calls pmap_mapdev() to find the RSDP, we assume that we can use - * pmap_mapdev() to map the RSDP. + * calls pmap_mapbios() to find the RSDP, we assume that we can use + * pmap_mapbios() to map the RSDP. */ if (AcpiOsGetRootPointer(ACPI_LOGICAL_ADDRESSING, &rsdp_ptr) != AE_OK) return (ENXIO); #ifdef __i386__ KASSERT(rsdp_ptr.Pointer.Physical < KERNLOAD, ("RSDP too high")); #endif - rsdp = pmap_mapdev(rsdp_ptr.Pointer.Physical, sizeof(RSDP_DESCRIPTOR)); + rsdp = pmap_mapbios(rsdp_ptr.Pointer.Physical, sizeof(RSDP_DESCRIPTOR)); if (rsdp == NULL) { if (bootverbose) printf("MADT: Failed to map RSDP\n"); @@ -261,7 +261,7 @@ break; madt_unmap_table(rsdt); } - pmap_unmapdev((vm_offset_t)rsdp, sizeof(RSDP_DESCRIPTOR)); + pmap_unmapbios((vm_offset_t)rsdp, sizeof(RSDP_DESCRIPTOR)); if (madt_physaddr == 0) { if (bootverbose) printf("MADT: No MADT table found\n"); @@ -335,7 +335,7 @@ madt_setup_local(void) { - madt = pmap_mapdev(madt_physaddr, madt_length); + madt = pmap_mapbios(madt_physaddr, madt_length); lapic_init((uintptr_t)madt->LocalApicAddress); printf("ACPI APIC Table: <%.*s %.*s>\n", (int)sizeof(madt->OemId), madt->OemId, ==== //depot/projects/soc2006/rbeasley_sound/sys/amd64/amd64/db_trace.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/db_trace.c,v 1.74 2006/03/13 23:56:44 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/db_trace.c,v 1.75 2006/07/12 21:22:42 jhb Exp $"); #include #include @@ -390,16 +390,14 @@ long *argp; db_expr_t offset; c_db_sym_t sym; - int narg, quit; + int narg; boolean_t first; if (count == -1) count = 1024; first = TRUE; - quit = 0; - db_setup_paging(db_simple_pager, &quit, db_lines_per_page); - while (count-- && !quit) { + while (count-- && !db_pager_quit) { sym = db_search_symbol(pc, DB_STGY_ANY, &offset); db_symbol_values(sym, &name, NULL); ==== //depot/projects/soc2006/rbeasley_sound/sys/amd64/amd64/identcpu.c#2 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/identcpu.c,v 1.146 2006/04/24 22:56:57 jkim Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/identcpu.c,v 1.148 2006/08/01 01:23:39 obrien Exp $"); #include "opt_cpu.h" @@ -296,8 +296,8 @@ "\034RDTSCP" /* RDTSCP */ "\035" /* Undefined */ "\036LM" /* 64 bit long mode */ - "\0373DNow+" /* AMD 3DNow! Extensions */ - "\0403DNow" /* AMD 3DNow! */ + "\0373DNow!+" /* AMD 3DNow! Extensions */ + "\0403DNow!" /* AMD 3DNow! */ ); } @@ -306,8 +306,8 @@ "\020" "\001LAHF" /* LAHF/SAHF in long mode */ "\002CMP" /* CMP legacy */ - "\003" - "\004" + "\003SVM" /* Secure Virtual Mode */ + "\004ExtAPIC" /* Extended APIC register */ "\005CR8" /* CR8 in legacy mode */ "\006" "\007" ==== //depot/projects/soc2006/rbeasley_sound/sys/amd64/amd64/intr_machdep.c#2 (text+ko) ==== @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/amd64/intr_machdep.c,v 1.19 2006/02/28 22:24:54 jhb Exp $ + * $FreeBSD: src/sys/amd64/amd64/intr_machdep.c,v 1.20 2006/07/12 21:22:42 jhb Exp $ */ /* @@ -338,16 +338,14 @@ DB_SHOW_COMMAND(irqs, db_show_irqs) { struct intsrc **isrc; - int i, quit, verbose; + int i, verbose; - quit = 0; if (strcmp(modif, "v") == 0) verbose = 1; else verbose = 0; isrc = interrupt_sources; - db_setup_paging(db_simple_pager, &quit, db_lines_per_page); - for (i = 0; i < NUM_IO_INTS && !quit; i++, isrc++) + for (i = 0; i < NUM_IO_INTS && !db_pager_quit; i++, isrc++) if (*isrc != NULL) db_dump_intr_event((*isrc)->is_event, verbose); } ==== //depot/projects/soc2006/rbeasley_sound/sys/amd64/amd64/local_apic.c#2 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/local_apic.c,v 1.25 2006/03/20 19:39:07 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/local_apic.c,v 1.26 2006/07/12 21:22:42 jhb Exp $"); #include "opt_hwpmc_hooks.h" @@ -755,18 +755,16 @@ DB_SHOW_COMMAND(apic, db_show_apic) { struct intsrc *isrc; - int quit, i, verbose; + int i, verbose; u_int irq; - quit = 0; if (strcmp(modif, "vv") == 0) verbose = 2; else if (strcmp(modif, "v") == 0) verbose = 1; else verbose = 0; - db_setup_paging(db_simple_pager, &quit, db_lines_per_page); - for (i = 0; i < APIC_NUM_IOINTS + 1 && !quit; i++) { + for (i = 0; i < APIC_NUM_IOINTS + 1 && !db_pager_quit; i++) { irq = ioint_irqs[i]; if (irq != 0 && irq != IRQ_SYSCALL) { db_printf("vec 0x%2x -> ", i + APIC_IO_INTS); ==== //depot/projects/soc2006/rbeasley_sound/sys/amd64/amd64/machdep.c#3 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.650 2006/06/19 22:36:01 davidxu Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.651 2006/07/27 19:47:22 jhb Exp $"); #include "opt_atalk.h" #include "opt_atpic.h" @@ -947,17 +947,17 @@ if (TUNABLE_ULONG_FETCH("hw.physmem", &physmem_tunable)) Maxmem = atop(physmem_tunable); + /* + * Don't allow MAXMEM or hw.physmem to extend the amount of memory + * in the system. + */ + if (Maxmem > atop(physmap[physmap_idx + 1])) + Maxmem = atop(physmap[physmap_idx + 1]); + if (atop(physmap[physmap_idx + 1]) != Maxmem && (boothowto & RB_VERBOSE)) printf("Physical memory use set to %ldK\n", Maxmem * 4); - /* - * If Maxmem has been increased beyond what the system has detected, - * extend the last memory segment to the new limit. - */ - if (atop(physmap[physmap_idx + 1]) < Maxmem) - physmap[physmap_idx + 1] = ptoa((vm_paddr_t)Maxmem); - /* call pmap initialization to make new kernel address space */ pmap_bootstrap(&first); ==== //depot/projects/soc2006/rbeasley_sound/sys/amd64/amd64/pmap.c#4 (text+ko) ==== @@ -77,7 +77,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.563 2006/07/02 18:22:46 alc Exp $"); >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Aug 16 00:51:27 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 54CE716A4DF; Wed, 16 Aug 2006 00:51:27 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 16F3B16A4DD for ; Wed, 16 Aug 2006 00:51:27 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B93D743D53 for ; Wed, 16 Aug 2006 00:51:26 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7G0pQdM091178 for ; Wed, 16 Aug 2006 00:51:26 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7G0pQv0091175 for perforce@freebsd.org; Wed, 16 Aug 2006 00:51:26 GMT (envelope-from jb@freebsd.org) Date: Wed, 16 Aug 2006 00:51:26 GMT Message-Id: <200608160051.k7G0pQv0091175@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 104165 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 16 Aug 2006 00:51:27 -0000 http://perforce.freebsd.org/chv.cgi?CH=104165 Change 104165 by jb@jb_freebsd2 on 2006/08/16 00:50:56 Replace the current elfdump code with a simple wrapper for the thread-safe function in libelf. Affected files ... .. //depot/projects/dtrace/src/usr.bin/elfdump/elfdump.c#3 edit Differences ... ==== //depot/projects/dtrace/src/usr.bin/elfdump/elfdump.c#3 (text+ko) ==== @@ -1,6 +1,5 @@ /*- - * Copyright (c) 2003 David O'Brien. All rights reserved. - * Copyright (c) 2001 Jake Burkholder + * Copyright (c) 2006 John Birrell jb@freebsd.org * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -26,1085 +25,13 @@ */ #include -__FBSDID("$FreeBSD: src/usr.bin/elfdump/elfdump.c,v 1.14 2006/01/28 17:58:22 marcel Exp $"); +__FBSDID("$FreeBSD$"); -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#define ED_DYN (1<<0) -#define ED_EHDR (1<<1) -#define ED_GOT (1<<2) -#define ED_HASH (1<<3) -#define ED_INTERP (1<<4) -#define ED_NOTE (1<<5) -#define ED_PHDR (1<<6) -#define ED_REL (1<<7) -#define ED_SHDR (1<<8) -#define ED_SYMTAB (1<<9) -#define ED_ALL ((1<<10)-1) - -#define elf_get_addr elf_get_quad -#define elf_get_off elf_get_quad -#define elf_get_size elf_get_quad - -enum elf_member { - D_TAG = 1, D_PTR, D_VAL, - - E_CLASS, E_DATA, E_OSABI, E_TYPE, E_MACHINE, E_VERSION, E_ENTRY, - E_PHOFF, E_SHOFF, E_FLAGS, E_EHSIZE, E_PHENTSIZE, E_PHNUM, E_SHENTSIZE, - E_SHNUM, E_SHSTRNDX, - - N_NAMESZ, N_DESCSZ, N_TYPE, - - P_TYPE, P_OFFSET, P_VADDR, P_PADDR, P_FILESZ, P_MEMSZ, P_FLAGS, - P_ALIGN, - - SH_NAME, SH_TYPE, SH_FLAGS, SH_ADDR, SH_OFFSET, SH_SIZE, SH_LINK, - SH_INFO, SH_ADDRALIGN, SH_ENTSIZE, - - ST_NAME, ST_VALUE, ST_SIZE, ST_INFO, ST_SHNDX, - - R_OFFSET, R_INFO, - - RA_OFFSET, RA_INFO, RA_ADDEND -}; - -typedef enum elf_member elf_member_t; - -int elf32_offsets[] = { - 0, - - offsetof(Elf32_Dyn, d_tag), offsetof(Elf32_Dyn, d_un.d_ptr), - offsetof(Elf32_Dyn, d_un.d_val), - - offsetof(Elf32_Ehdr, e_ident[EI_CLASS]), - offsetof(Elf32_Ehdr, e_ident[EI_DATA]), - offsetof(Elf32_Ehdr, e_ident[EI_OSABI]), - offsetof(Elf32_Ehdr, e_type), offsetof(Elf32_Ehdr, e_machine), - offsetof(Elf32_Ehdr, e_version), offsetof(Elf32_Ehdr, e_entry), - offsetof(Elf32_Ehdr, e_phoff), offsetof(Elf32_Ehdr, e_shoff), - offsetof(Elf32_Ehdr, e_flags), offsetof(Elf32_Ehdr, e_ehsize), - offsetof(Elf32_Ehdr, e_phentsize), offsetof(Elf32_Ehdr, e_phnum), - offsetof(Elf32_Ehdr, e_shentsize), offsetof(Elf32_Ehdr, e_shnum), - offsetof(Elf32_Ehdr, e_shstrndx), - - offsetof(Elf_Note, n_namesz), offsetof(Elf_Note, n_descsz), - offsetof(Elf_Note, n_type), - - offsetof(Elf32_Phdr, p_type), offsetof(Elf32_Phdr, p_offset), - offsetof(Elf32_Phdr, p_vaddr), offsetof(Elf32_Phdr, p_paddr), - offsetof(Elf32_Phdr, p_filesz), offsetof(Elf32_Phdr, p_memsz), - offsetof(Elf32_Phdr, p_flags), offsetof(Elf32_Phdr, p_align), - - offsetof(Elf32_Shdr, sh_name), offsetof(Elf32_Shdr, sh_type), - offsetof(Elf32_Shdr, sh_flags), offsetof(Elf32_Shdr, sh_addr), - offsetof(Elf32_Shdr, sh_offset), offsetof(Elf32_Shdr, sh_size), - offsetof(Elf32_Shdr, sh_link), offsetof(Elf32_Shdr, sh_info), - offsetof(Elf32_Shdr, sh_addralign), offsetof(Elf32_Shdr, sh_entsize), - - offsetof(Elf32_Sym, st_name), offsetof(Elf32_Sym, st_value), - offsetof(Elf32_Sym, st_size), offsetof(Elf32_Sym, st_info), - offsetof(Elf32_Sym, st_shndx), - - offsetof(Elf32_Rel, r_offset), offsetof(Elf32_Rel, r_info), - - offsetof(Elf32_Rela, r_offset), offsetof(Elf32_Rela, r_info), - offsetof(Elf32_Rela, r_addend) -}; - -int elf64_offsets[] = { - 0, - - offsetof(Elf64_Dyn, d_tag), offsetof(Elf64_Dyn, d_un.d_ptr), - offsetof(Elf64_Dyn, d_un.d_val), - - offsetof(Elf32_Ehdr, e_ident[EI_CLASS]), - offsetof(Elf32_Ehdr, e_ident[EI_DATA]), - offsetof(Elf32_Ehdr, e_ident[EI_OSABI]), - offsetof(Elf64_Ehdr, e_type), offsetof(Elf64_Ehdr, e_machine), - offsetof(Elf64_Ehdr, e_version), offsetof(Elf64_Ehdr, e_entry), - offsetof(Elf64_Ehdr, e_phoff), offsetof(Elf64_Ehdr, e_shoff), - offsetof(Elf64_Ehdr, e_flags), offsetof(Elf64_Ehdr, e_ehsize), - offsetof(Elf64_Ehdr, e_phentsize), offsetof(Elf64_Ehdr, e_phnum), - offsetof(Elf64_Ehdr, e_shentsize), offsetof(Elf64_Ehdr, e_shnum), - offsetof(Elf64_Ehdr, e_shstrndx), - - offsetof(Elf_Note, n_namesz), offsetof(Elf_Note, n_descsz), - offsetof(Elf_Note, n_type), - - offsetof(Elf64_Phdr, p_type), offsetof(Elf64_Phdr, p_offset), - offsetof(Elf64_Phdr, p_vaddr), offsetof(Elf64_Phdr, p_paddr), - offsetof(Elf64_Phdr, p_filesz), offsetof(Elf64_Phdr, p_memsz), - offsetof(Elf64_Phdr, p_flags), offsetof(Elf64_Phdr, p_align), - - offsetof(Elf64_Shdr, sh_name), offsetof(Elf64_Shdr, sh_type), - offsetof(Elf64_Shdr, sh_flags), offsetof(Elf64_Shdr, sh_addr), - offsetof(Elf64_Shdr, sh_offset), offsetof(Elf64_Shdr, sh_size), - offsetof(Elf64_Shdr, sh_link), offsetof(Elf64_Shdr, sh_info), - offsetof(Elf64_Shdr, sh_addralign), offsetof(Elf64_Shdr, sh_entsize), - - offsetof(Elf64_Sym, st_name), offsetof(Elf64_Sym, st_value), - offsetof(Elf64_Sym, st_size), offsetof(Elf64_Sym, st_info), - offsetof(Elf64_Sym, st_shndx), - - offsetof(Elf64_Rel, r_offset), offsetof(Elf64_Rel, r_info), - - offsetof(Elf64_Rela, r_offset), offsetof(Elf64_Rela, r_info), - offsetof(Elf64_Rela, r_addend) -}; - -/* http://www.sco.com/developers/gabi/latest/ch5.dynamic.html#tag_encodings */ -static const char * -d_tags(u_int64_t tag) { - switch (tag) { - case 0: return "DT_NULL"; - case 1: return "DT_NEEDED"; - case 2: return "DT_PLTRELSZ"; - case 3: return "DT_PLTGOT"; - case 4: return "DT_HASH"; - case 5: return "DT_STRTAB"; - case 6: return "DT_SYMTAB"; - case 7: return "DT_RELA"; - case 8: return "DT_RELASZ"; - case 9: return "DT_RELAENT"; - case 10: return "DT_STRSZ"; - case 11: return "DT_SYMENT"; - case 12: return "DT_INIT"; - case 13: return "DT_FINI"; - case 14: return "DT_SONAME"; - case 15: return "DT_RPATH"; - case 16: return "DT_SYMBOLIC"; - case 17: return "DT_REL"; - case 18: return "DT_RELSZ"; - case 19: return "DT_RELENT"; - case 20: return "DT_PLTREL"; - case 21: return "DT_DEBUG"; - case 22: return "DT_TEXTREL"; - case 23: return "DT_JMPREL"; - case 24: return "DT_BIND_NOW"; - case 25: return "DT_INIT_ARRAY"; - case 26: return "DT_FINI_ARRAY"; - case 27: return "DT_INIT_ARRAYSZ"; - case 28: return "DT_FINI_ARRAYSZ"; - case 29: return "DT_RUNPATH"; - case 30: return "DT_FLAGS"; - case 32: return "DT_PREINIT_ARRAY"; /* XXX: DT_ENCODING */ - case 33: return "DT_PREINIT_ARRAYSZ"; - /* 0x6000000D - 0x6ffff000 operating system-specific semantics */ - case 0x6ffffdf5: return "DT_GNU_PRELINKED"; - case 0x6ffffdf6: return "DT_GNU_CONFLICTSZ"; - case 0x6ffffdf7: return "DT_GNU_LIBLISTSZ"; - case 0x6ffffdf8: return "DT_SUNW_CHECKSUM"; - case 0x6ffffdf9: return "DT_PLTPADSZ"; - case 0x6ffffdfa: return "DT_MOVEENT"; - case 0x6ffffdfb: return "DT_MOVESZ"; - case 0x6ffffdfc: return "DT_FEATURE"; - case 0x6ffffdfd: return "DT_POSFLAG_1"; - case 0x6ffffdfe: return "DT_SYMINSZ"; - case 0x6ffffdff: return "DT_SYMINENT (DT_VALRNGHI)"; - case 0x6ffffe00: return "DT_ADDRRNGLO"; - case 0x6ffffef8: return "DT_GNU_CONFLICT"; - case 0x6ffffef9: return "DT_GNU_LIBLIST"; - case 0x6ffffefa: return "DT_SUNW_CONFIG"; - case 0x6ffffefb: return "DT_SUNW_DEPAUDIT"; - case 0x6ffffefc: return "DT_SUNW_AUDIT"; - case 0x6ffffefd: return "DT_SUNW_PLTPAD"; - case 0x6ffffefe: return "DT_SUNW_MOVETAB"; - case 0x6ffffeff: return "DT_SYMINFO (DT_ADDRRNGHI)"; - case 0x6ffffff9: return "DT_RELACOUNT"; - case 0x6ffffffa: return "DT_RELCOUNT"; - case 0x6ffffffb: return "DT_FLAGS_1"; - case 0x6ffffffc: return "DT_VERDEF"; - case 0x6ffffffd: return "DT_VERDEFNUM"; - case 0x6ffffffe: return "DT_VERNEED"; - case 0x6fffffff: return "DT_VERNEEDNUM"; - case 0x6ffffff0: return "DT_GNU_VERSYM"; - /* 0x70000000 - 0x7fffffff processor-specific semantics */ - case 0x70000000: return "DT_IA_64_PLT_RESERVE"; - case 0x7ffffffd: return "DT_SUNW_AUXILIARY"; - case 0x7ffffffe: return "DT_SUNW_USED"; - case 0x7fffffff: return "DT_SUNW_FILTER"; - default: return "ERROR: TAG NOT DEFINED"; - } -} - -static const char * -e_machines(u_int mach) -{ - static char machdesc[64]; - - switch (mach) { - case EM_NONE: return "EM_NONE"; - case EM_M32: return "EM_M32"; - case EM_SPARC: return "EM_SPARC"; - case EM_386: return "EM_386"; - case EM_68K: return "EM_68K"; - case EM_88K: return "EM_88K"; - case EM_860: return "EM_860"; - case EM_MIPS: return "EM_MIPS"; - case EM_PPC: return "EM_PPC"; - case EM_ARM: return "EM_ARM"; - case EM_ALPHA: return "EM_ALPHA (legacy)"; - case EM_SPARCV9:return "EM_SPARCV9"; - case EM_IA_64: return "EM_IA_64"; - case EM_X86_64: return "EM_X86_64"; - } - snprintf(machdesc, sizeof(machdesc), - "(unknown machine) -- type 0x%x", mach); - return (machdesc); -} - -const char *e_types[] = { - "ET_NONE", "ET_REL", "ET_EXEC", "ET_DYN", "ET_CORE" -}; - -const char *ei_versions[] = { - "EV_NONE", "EV_CURRENT" -}; - -const char *ei_classes[] = { - "ELFCLASSNONE", "ELFCLASS32", "ELFCLASS64" -}; - -const char *ei_data[] = { - "ELFDATANONE", "ELFDATA2LSB", "ELFDATA2MSB" -}; - -const char *ei_abis[] = { - "ELFOSABI_SYSV", "ELFOSABI_HPUX", "ELFOSABI_NETBSD", "ELFOSABI_LINUX", - "ELFOSABI_HURD", "ELFOSABI_86OPEN", "ELFOSABI_SOLARIS", - "ELFOSABI_MONTEREY", "ELFOSABI_IRIX", "ELFOSABI_FREEBSD", - "ELFOSABI_TRU64", "ELFOSABI_MODESTO", "ELFOSABI_OPENBSD" -}; - -const char *p_types[] = { - "PT_NULL", "PT_LOAD", "PT_DYNAMIC", "PT_INTERP", "PT_NOTE", - "PT_SHLIB", "PT_PHDR", "PT_TLS" -}; +#include -const char *p_flags[] = { - "", "PF_X", "PF_W", "PF_X|PF_W", "PF_R", "PF_X|PF_R", "PF_W|PF_R", - "PF_X|PF_W|PF_R" -}; - -/* http://www.sco.com/developers/gabi/latest/ch4.sheader.html#sh_type */ -static const char * -sh_types(u_int64_t sht) { - switch (sht) { - case 0: return "SHT_NULL"; - case 1: return "SHT_PROGBITS"; - case 2: return "SHT_SYMTAB"; - case 3: return "SHT_STRTAB"; - case 4: return "SHT_RELA"; - case 5: return "SHT_HASH"; - case 6: return "SHT_DYNAMIC"; - case 7: return "SHT_NOTE"; - case 8: return "SHT_NOBITS"; - case 9: return "SHT_REL"; - case 10: return "SHT_SHLIB"; - case 11: return "SHT_DYNSYM"; - case 14: return "SHT_INIT_ARRAY"; - case 15: return "SHT_FINI_ARRAY"; - case 16: return "SHT_PREINIT_ARRAY"; - case 17: return "SHT_GROUP"; - case 18: return "SHT_SYMTAB_SHNDX"; - /* 0x60000000 - 0x6fffffff operating system-specific semantics */ - case 0x6ffffff0: return "XXX:VERSYM"; - case 0x6ffffff7: return "SHT_GNU_LIBLIST"; - case 0x6ffffffc: return "XXX:VERDEF"; - case 0x6ffffffd: return "SHT_SUNW(GNU)_verdef"; - case 0x6ffffffe: return "SHT_SUNW(GNU)_verneed"; - case 0x6fffffff: return "SHT_SUNW(GNU)_versym"; - /* 0x70000000 - 0x7fffffff processor-specific semantics */ - case 0x70000000: return "SHT_IA_64_EXT"; - case 0x70000001: return "SHT_IA_64_UNWIND"; - case 0x7ffffffd: return "XXX:AUXILIARY"; - case 0x7fffffff: return "XXX:FILTER"; - /* 0x80000000 - 0xffffffff application programs */ - default: return "ERROR: SHT NOT DEFINED"; - } -} - -const char *sh_flags[] = { - "", "SHF_WRITE", "SHF_ALLOC", "SHF_WRITE|SHF_ALLOC", "SHF_EXECINSTR", - "SHF_WRITE|SHF_EXECINSTR", "SHF_ALLOC|SHF_EXECINSTR", - "SHF_WRITE|SHF_ALLOC|SHF_EXECINSTR" -}; - -const char *st_types[] = { - "STT_NOTYPE", "STT_OBJECT", "STT_FUNC", "STT_SECTION", "STT_FILE" -}; - -const char *st_bindings[] = { - "STB_LOCAL", "STB_GLOBAL", "STB_WEAK" -}; - -char *dynstr; -char *shstrtab; -char *strtab; -FILE *out; - -u_int64_t elf_get_byte(Elf32_Ehdr *e, void *base, elf_member_t member); -u_int64_t elf_get_quarter(Elf32_Ehdr *e, void *base, elf_member_t member); -u_int64_t elf_get_half(Elf32_Ehdr *e, void *base, elf_member_t member); -u_int64_t elf_get_word(Elf32_Ehdr *e, void *base, elf_member_t member); -u_int64_t elf_get_quad(Elf32_Ehdr *e, void *base, elf_member_t member); - -void elf_print_ehdr(Elf32_Ehdr *e); -void elf_print_phdr(Elf32_Ehdr *e, void *p); -void elf_print_shdr(Elf32_Ehdr *e, void *sh); -void elf_print_symtab(Elf32_Ehdr *e, void *sh, char *str); -void elf_print_dynamic(Elf32_Ehdr *e, void *sh); -void elf_print_rel(Elf32_Ehdr *e, void *r); -void elf_print_rela(Elf32_Ehdr *e, void *ra); -void elf_print_interp(Elf32_Ehdr *e, void *p); -void elf_print_got(Elf32_Ehdr *e, void *sh); -void elf_print_hash(Elf32_Ehdr *e, void *sh); -void elf_print_note(Elf32_Ehdr *e, void *sh); - -void usage(void); - int -main(int ac, char **av) +main(int argc, char **argv) { - u_int64_t phoff; - u_int64_t shoff; - u_int64_t phentsize; - u_int64_t phnum; - u_int64_t shentsize; - u_int64_t shnum; - u_int64_t shstrndx; - u_int64_t offset; - u_int64_t name; - u_int64_t type; - struct stat sb; - u_int flags; - Elf32_Ehdr *e; - void *p; - void *sh; - void *v; - int fd; - int ch; - int i; - - out = stdout; - flags = 0; - while ((ch = getopt(ac, av, "acdeiGhnprsw:")) != -1) - switch (ch) { - case 'a': - flags = ED_ALL; - break; - case 'c': - flags |= ED_SHDR; - break; - case 'd': - flags |= ED_DYN; - break; - case 'e': - flags |= ED_EHDR; - break; - case 'i': - flags |= ED_INTERP; - break; - case 'G': - flags |= ED_GOT; - break; - case 'h': - flags |= ED_HASH; - break; - case 'n': - flags |= ED_NOTE; - break; - case 'p': - flags |= ED_PHDR; - break; - case 'r': - flags |= ED_REL; - break; - case 's': - flags |= ED_SYMTAB; - break; - case 'w': - if ((out = fopen(optarg, "w")) == NULL) - err(1, "%s", optarg); - break; - case '?': - default: - usage(); - } - ac -= optind; - av += optind; - if (ac == 0 || flags == 0) - usage(); - if ((fd = open(*av, O_RDONLY)) < 0 || - fstat(fd, &sb) < 0) - err(1, "%s", *av); - e = mmap(NULL, sb.st_size, PROT_READ, MAP_SHARED, fd, 0); - if (e == MAP_FAILED) - err(1, NULL); - if (!IS_ELF(*(Elf32_Ehdr *)e)) - errx(1, "not an elf file"); - phoff = elf_get_off(e, e, E_PHOFF); - shoff = elf_get_off(e, e, E_SHOFF); - phentsize = elf_get_quarter(e, e, E_PHENTSIZE); - phnum = elf_get_quarter(e, e, E_PHNUM); - shentsize = elf_get_quarter(e, e, E_SHENTSIZE); - shnum = elf_get_quarter(e, e, E_SHNUM); - shstrndx = elf_get_quarter(e, e, E_SHSTRNDX); - p = (char *)e + phoff; - sh = (char *)e + shoff; - offset = elf_get_off(e, (char *)sh + shstrndx * shentsize, SH_OFFSET); - shstrtab = (char *)e + offset; - for (i = 0; (u_int64_t)i < shnum; i++) { - name = elf_get_word(e, (char *)sh + i * shentsize, SH_NAME); - offset = elf_get_off(e, (char *)sh + i * shentsize, SH_OFFSET); - if (strcmp(shstrtab + name, ".strtab") == 0) - strtab = (char *)e + offset; - if (strcmp(shstrtab + name, ".dynstr") == 0) - dynstr = (char *)e + offset; - } - if (flags & ED_EHDR) - elf_print_ehdr(e); - if (flags & ED_PHDR) - elf_print_phdr(e, p); - if (flags & ED_SHDR) - elf_print_shdr(e, sh); - for (i = 0; (u_int64_t)i < phnum; i++) { - v = (char *)p + i * phentsize; - type = elf_get_word(e, v, P_TYPE); - switch (type) { - case PT_INTERP: - if (flags & ED_INTERP) - elf_print_interp(e, v); - break; - case PT_NULL: - case PT_LOAD: - case PT_DYNAMIC: - case PT_NOTE: - case PT_SHLIB: - case PT_PHDR: - break; - } - } - for (i = 0; (u_int64_t)i < shnum; i++) { - v = (char *)sh + i * shentsize; - type = elf_get_word(e, v, SH_TYPE); - switch (type) { - case SHT_SYMTAB: - if (flags & ED_SYMTAB) - elf_print_symtab(e, v, strtab); - break; - case SHT_DYNAMIC: - if (flags & ED_DYN) - elf_print_dynamic(e, v); - break; - case SHT_RELA: - if (flags & ED_REL) - elf_print_rela(e, v); - break; - case SHT_REL: - if (flags & ED_REL) - elf_print_rel(e, v); - break; - case SHT_NOTE: - name = elf_get_word(e, v, SH_NAME); - if (flags & ED_NOTE && - strcmp(shstrtab + name, ".note.ABI-tag") == 0) - elf_print_note(e, v); - break; - case SHT_DYNSYM: - if (flags & ED_SYMTAB) - elf_print_symtab(e, v, dynstr); - break; - case SHT_PROGBITS: - name = elf_get_word(e, v, SH_NAME); - if (flags & ED_GOT && - strcmp(shstrtab + name, ".got") == 0) - elf_print_got(e, v); - break; - case SHT_HASH: - if (flags & ED_HASH) - elf_print_hash(e, v); - break; - case SHT_NULL: - case SHT_STRTAB: - case SHT_NOBITS: - case SHT_SHLIB: - break; - } - } - - return 0; + return (elf_dump_argv(argc, argv)); } -void -elf_print_ehdr(Elf32_Ehdr *e) -{ - u_int64_t class; - u_int64_t data; - u_int64_t osabi; - u_int64_t type; - u_int64_t machine; - u_int64_t version; - u_int64_t entry; - u_int64_t phoff; - u_int64_t shoff; - u_int64_t flags; - u_int64_t ehsize; - u_int64_t phentsize; - u_int64_t phnum; - u_int64_t shentsize; - u_int64_t shnum; - u_int64_t shstrndx; - - class = elf_get_byte(e, e, E_CLASS); - data = elf_get_byte(e, e, E_DATA); - osabi = elf_get_byte(e, e, E_OSABI); - type = elf_get_quarter(e, e, E_TYPE); - machine = elf_get_quarter(e, e, E_MACHINE); - version = elf_get_word(e, e, E_VERSION); - entry = elf_get_addr(e, e, E_ENTRY); - phoff = elf_get_off(e, e, E_PHOFF); - shoff = elf_get_off(e, e, E_SHOFF); - flags = elf_get_word(e, e, E_FLAGS); - ehsize = elf_get_quarter(e, e, E_EHSIZE); - phentsize = elf_get_quarter(e, e, E_PHENTSIZE); - phnum = elf_get_quarter(e, e, E_PHNUM); - shentsize = elf_get_quarter(e, e, E_SHENTSIZE); - shnum = elf_get_quarter(e, e, E_SHNUM); - shstrndx = elf_get_quarter(e, e, E_SHSTRNDX); - fprintf(out, "\nelf header:\n"); - fprintf(out, "\n"); - fprintf(out, "\te_ident: %s %s %s\n", ei_classes[class], ei_data[data], - ei_abis[osabi]); - fprintf(out, "\te_type: %s\n", e_types[type]); - fprintf(out, "\te_machine: %s\n", e_machines(machine)); - fprintf(out, "\te_version: %s\n", ei_versions[version]); - fprintf(out, "\te_entry: %#jx\n", (intmax_t)entry); - fprintf(out, "\te_phoff: %jd\n", (intmax_t)phoff); - fprintf(out, "\te_shoff: %jd\n", (intmax_t)shoff); - fprintf(out, "\te_flags: %jd\n", (intmax_t)flags); - fprintf(out, "\te_ehsize: %jd\n", (intmax_t)ehsize); - fprintf(out, "\te_phentsize: %jd\n", (intmax_t)phentsize); - fprintf(out, "\te_phnum: %jd\n", (intmax_t)phnum); - fprintf(out, "\te_shentsize: %jd\n", (intmax_t)shentsize); - fprintf(out, "\te_shnum: %jd\n", (intmax_t)shnum); - fprintf(out, "\te_shstrndx: %jd\n", (intmax_t)shstrndx); -} - -void -elf_print_phdr(Elf32_Ehdr *e, void *p) -{ - u_int64_t phentsize; - u_int64_t phnum; - u_int64_t type; - u_int64_t offset; - u_int64_t vaddr; - u_int64_t paddr; - u_int64_t filesz; - u_int64_t memsz; - u_int64_t flags; - u_int64_t align; - void *v; - int i; - - phentsize = elf_get_quarter(e, e, E_PHENTSIZE); - phnum = elf_get_quarter(e, e, E_PHNUM); - fprintf(out, "\nprogram header:\n"); - for (i = 0; (u_int64_t)i < phnum; i++) { - v = (char *)p + i * phentsize; - type = elf_get_word(e, v, P_TYPE); - offset = elf_get_off(e, v, P_OFFSET); - vaddr = elf_get_addr(e, v, P_VADDR); - paddr = elf_get_addr(e, v, P_PADDR); - filesz = elf_get_size(e, v, P_FILESZ); - memsz = elf_get_size(e, v, P_MEMSZ); - flags = elf_get_word(e, v, P_FLAGS); - align = elf_get_size(e, v, P_ALIGN); - fprintf(out, "\n"); - fprintf(out, "entry: %d\n", i); - fprintf(out, "\tp_type: %s\n", p_types[type & 0x7]); - fprintf(out, "\tp_offset: %jd\n", (intmax_t)offset); - fprintf(out, "\tp_vaddr: %#jx\n", (intmax_t)vaddr); - fprintf(out, "\tp_paddr: %#jx\n", (intmax_t)paddr); - fprintf(out, "\tp_filesz: %jd\n", (intmax_t)filesz); - fprintf(out, "\tp_memsz: %jd\n", (intmax_t)memsz); - fprintf(out, "\tp_flags: %s\n", p_flags[flags]); - fprintf(out, "\tp_align: %jd\n", (intmax_t)align); - } -} - -void -elf_print_shdr(Elf32_Ehdr *e, void *sh) -{ - u_int64_t shentsize; - u_int64_t shnum; - u_int64_t name; - u_int64_t type; - u_int64_t flags; - u_int64_t addr; - u_int64_t offset; - u_int64_t size; - u_int64_t shlink; - u_int64_t info; - u_int64_t addralign; - u_int64_t entsize; - void *v; - int i; - - shentsize = elf_get_quarter(e, e, E_SHENTSIZE); - shnum = elf_get_quarter(e, e, E_SHNUM); - fprintf(out, "\nsection header:\n"); - for (i = 0; (u_int64_t)i < shnum; i++) { - v = (char *)sh + i * shentsize; - name = elf_get_word(e, v, SH_NAME); - type = elf_get_word(e, v, SH_TYPE); - flags = elf_get_word(e, v, SH_FLAGS); - addr = elf_get_addr(e, v, SH_ADDR); - offset = elf_get_off(e, v, SH_OFFSET); - size = elf_get_size(e, v, SH_SIZE); - shlink = elf_get_word(e, v, SH_LINK); - info = elf_get_word(e, v, SH_INFO); - addralign = elf_get_size(e, v, SH_ADDRALIGN); - entsize = elf_get_size(e, v, SH_ENTSIZE); - fprintf(out, "\n"); - fprintf(out, "entry: %d\n", i); - fprintf(out, "\tsh_name: %s\n", shstrtab + name); - fprintf(out, "\tsh_type: %s\n", sh_types(type)); - fprintf(out, "\tsh_flags: %s\n", sh_flags[flags & 0x7]); - fprintf(out, "\tsh_addr: %#jx\n", addr); - fprintf(out, "\tsh_offset: %jd\n", (intmax_t)offset); - fprintf(out, "\tsh_size: %jd\n", (intmax_t)size); - fprintf(out, "\tsh_link: %jd\n", (intmax_t)shlink); - fprintf(out, "\tsh_info: %jd\n", (intmax_t)info); - fprintf(out, "\tsh_addralign: %jd\n", (intmax_t)addralign); - fprintf(out, "\tsh_entsize: %jd\n", (intmax_t)entsize); - } -} - -void -elf_print_symtab(Elf32_Ehdr *e, void *sh, char *str) -{ - u_int64_t offset; - u_int64_t entsize; - u_int64_t size; - u_int64_t name; - u_int64_t value; - u_int64_t info; - u_int64_t shndx; - void *st; - int len; - int i; - - offset = elf_get_off(e, sh, SH_OFFSET); - entsize = elf_get_size(e, sh, SH_ENTSIZE); - size = elf_get_size(e, sh, SH_SIZE); - name = elf_get_word(e, sh, SH_NAME); - len = size / entsize; - fprintf(out, "\nsymbol table (%s):\n", shstrtab + name); - for (i = 0; i < len; i++) { - st = (char *)e + offset + i * entsize; - name = elf_get_word(e, st, ST_NAME); - value = elf_get_addr(e, st, ST_VALUE); - size = elf_get_size(e, st, ST_SIZE); - info = elf_get_byte(e, st, ST_INFO); - shndx = elf_get_quarter(e, st, ST_SHNDX); - fprintf(out, "\n"); - fprintf(out, "entry: %d\n", i); - fprintf(out, "\tst_name: %s\n", str + name); - fprintf(out, "\tst_value: %#jx\n", value); - fprintf(out, "\tst_size: %jd\n", (intmax_t)size); - fprintf(out, "\tst_info: %s %s\n", - st_types[ELF32_ST_TYPE(info)], - st_bindings[ELF32_ST_BIND(info)]); - fprintf(out, "\tst_shndx: %jd\n", (intmax_t)shndx); - } -} - -void -elf_print_dynamic(Elf32_Ehdr *e, void *sh) -{ - u_int64_t offset; - u_int64_t entsize; - u_int64_t size; - int64_t tag; - u_int64_t ptr; - u_int64_t val; - void *d; - int i; - - offset = elf_get_off(e, sh, SH_OFFSET); - entsize = elf_get_size(e, sh, SH_ENTSIZE); - size = elf_get_size(e, sh, SH_SIZE); - fprintf(out, "\ndynamic:\n"); - for (i = 0; (u_int64_t)i < size / entsize; i++) { - d = (char *)e + offset + i * entsize; - tag = elf_get_size(e, d, D_TAG); - ptr = elf_get_size(e, d, D_PTR); - val = elf_get_addr(e, d, D_VAL); - fprintf(out, "\n"); - fprintf(out, "entry: %d\n", i); - fprintf(out, "\td_tag: %s\n", d_tags(tag)); - switch (tag) { - case DT_NEEDED: - case DT_SONAME: - case DT_RPATH: - fprintf(out, "\td_val: %s\n", dynstr + val); - break; - case DT_PLTRELSZ: - case DT_RELA: - case DT_RELASZ: - case DT_RELAENT: - case DT_STRSZ: - case DT_SYMENT: - case DT_RELSZ: - case DT_RELENT: - case DT_PLTREL: - fprintf(out, "\td_val: %jd\n", (intmax_t)val); - break; - case DT_PLTGOT: - case DT_HASH: - case DT_STRTAB: - case DT_SYMTAB: - case DT_INIT: - case DT_FINI: - case DT_REL: - case DT_JMPREL: - fprintf(out, "\td_ptr: %#jx\n", ptr); - break; - case DT_NULL: - case DT_SYMBOLIC: - case DT_DEBUG: - case DT_TEXTREL: - break; - } - } -} - -void -elf_print_rela(Elf32_Ehdr *e, void *sh) -{ - u_int64_t offset; - u_int64_t entsize; - u_int64_t size; - u_int64_t name; - u_int64_t info; - int64_t addend; - void *ra; - void *v; - int i; - - offset = elf_get_off(e, sh, SH_OFFSET); - entsize = elf_get_size(e, sh, SH_ENTSIZE); - size = elf_get_size(e, sh, SH_SIZE); - name = elf_get_word(e, sh, SH_NAME); - v = (char *)e + offset; - fprintf(out, "\nrelocation with addend (%s):\n", shstrtab + name); - for (i = 0; (u_int64_t)i < size / entsize; i++) { - ra = (char *)v + i * entsize; - offset = elf_get_addr(e, ra, RA_OFFSET); - info = elf_get_word(e, ra, RA_INFO); - addend = elf_get_off(e, ra, RA_ADDEND); - fprintf(out, "\n"); - fprintf(out, "entry: %d\n", i); - fprintf(out, "\tr_offset: %#jx\n", offset); - fprintf(out, "\tr_info: %jd\n", (intmax_t)info); - fprintf(out, "\tr_addend: %jd\n", (intmax_t)addend); - } -} - -void -elf_print_rel(Elf32_Ehdr *e, void *sh) -{ - u_int64_t offset; - u_int64_t entsize; - u_int64_t size; - u_int64_t name; - u_int64_t info; - void *r; - void *v; - int i; - - offset = elf_get_off(e, sh, SH_OFFSET); - entsize = elf_get_size(e, sh, SH_ENTSIZE); - size = elf_get_size(e, sh, SH_SIZE); - name = elf_get_word(e, sh, SH_NAME); - v = (char *)e + offset; - fprintf(out, "\nrelocation (%s):\n", shstrtab + name); - for (i = 0; (u_int64_t)i < size / entsize; i++) { - r = (char *)v + i * entsize; - offset = elf_get_addr(e, r, R_OFFSET); - info = elf_get_word(e, r, R_INFO); - fprintf(out, "\n"); - fprintf(out, "entry: %d\n", i); - fprintf(out, "\tr_offset: %#jx\n", offset); - fprintf(out, "\tr_info: %jd\n", (intmax_t)info); - } -} - -void -elf_print_interp(Elf32_Ehdr *e, void *p) -{ - u_int64_t offset; - char *s; - - offset = elf_get_off(e, p, P_OFFSET); - s = (char *)e + offset; - fprintf(out, "\ninterp:\n"); - fprintf(out, "\t%s\n", s); -} - -void -elf_print_got(Elf32_Ehdr *e, void *sh) -{ - u_int64_t offset; - u_int64_t addralign; - u_int64_t size; - u_int64_t addr; - void *v; - int i; - - offset = elf_get_off(e, sh, SH_OFFSET); - addralign = elf_get_size(e, sh, SH_ADDRALIGN); - size = elf_get_size(e, sh, SH_SIZE); - v = (char *)e + offset; - fprintf(out, "\nglobal offset table:\n"); - for (i = 0; (u_int64_t)i < size / addralign; i++) { - addr = elf_get_addr(e, (char *)v + i * addralign, 0); - fprintf(out, "\n"); - fprintf(out, "entry: %d\n", i); - fprintf(out, "\t%#jx\n", addr); - } -} - -void -elf_print_hash(Elf32_Ehdr *e __unused, void *sh __unused) -{ -} - -void -elf_print_note(Elf32_Ehdr *e, void *sh) -{ - u_int64_t offset; - u_int64_t size; - u_int64_t name; - u_int32_t namesz; - u_int32_t descsz; - u_int32_t type; - u_int32_t desc; - char *n, *s; - - offset = elf_get_off(e, sh, SH_OFFSET); - size = elf_get_size(e, sh, SH_SIZE); - name = elf_get_word(e, sh, SH_NAME); - n = (char *)e + offset; - fprintf(out, "\nnote (%s):\n", shstrtab + name); - while (n < ((char *)e + offset + size)) { - namesz = elf_get_word(e, n, N_NAMESZ); - descsz = elf_get_word(e, n, N_DESCSZ); - type = elf_get_word(e, n, N_TYPE); - s = n + sizeof(Elf_Note); - desc = elf_get_word(e, n + sizeof(Elf_Note) + namesz, 0); - fprintf(out, "\t%s %d\n", s, desc); - n += sizeof(Elf_Note) + namesz + descsz; - } -} - -u_int64_t -elf_get_byte(Elf32_Ehdr *e, void *base, elf_member_t member) -{ - u_int64_t val; - - val = 0; - switch (e->e_ident[EI_CLASS]) { - case ELFCLASS32: - val = ((char *)base)[elf32_offsets[member]]; - break; - case ELFCLASS64: - val = ((char *)base)[elf64_offsets[member]]; - break; - case ELFCLASSNONE: - errx(1, "invalid class"); - } - - return val; -} - -u_int64_t -elf_get_quarter(Elf32_Ehdr *e, void *base, elf_member_t member) -{ - u_int64_t val; - - val = 0; - switch (e->e_ident[EI_CLASS]) { - case ELFCLASS32: - base = (char *)base + elf32_offsets[member]; - switch (e->e_ident[EI_DATA]) { - case ELFDATA2MSB: - val = be16dec(base); - break; - case ELFDATA2LSB: - val = le16dec(base); - break; - case ELFDATANONE: - errx(1, "invalid data format"); - } - break; - case ELFCLASS64: - base = (char *)base + elf64_offsets[member]; - switch (e->e_ident[EI_DATA]) { - case ELFDATA2MSB: - val = be16dec(base); - break; - case ELFDATA2LSB: - val = le16dec(base); - break; - case ELFDATANONE: - errx(1, "invalid data format"); - } - break; - case ELFCLASSNONE: - errx(1, "invalid class"); - } - - return val; -} - -u_int64_t -elf_get_half(Elf32_Ehdr *e, void *base, elf_member_t member) -{ - u_int64_t val; - - val = 0; - switch (e->e_ident[EI_CLASS]) { - case ELFCLASS32: - base = (char *)base + elf32_offsets[member]; - switch (e->e_ident[EI_DATA]) { - case ELFDATA2MSB: - val = be16dec(base); - break; - case ELFDATA2LSB: - val = le16dec(base); >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Aug 16 00:52:29 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2D0BE16A4E0; Wed, 16 Aug 2006 00:52:29 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 0C26B16A4DE for ; Wed, 16 Aug 2006 00:52:29 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8258843D5A for ; Wed, 16 Aug 2006 00:52:28 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7G0qShB091265 for ; Wed, 16 Aug 2006 00:52:28 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7G0qSW5091262 for perforce@freebsd.org; Wed, 16 Aug 2006 00:52:28 GMT (envelope-from jb@freebsd.org) Date: Wed, 16 Aug 2006 00:52:28 GMT Message-Id: <200608160052.k7G0qSW5091262@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 104166 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 16 Aug 2006 00:52:29 -0000 http://perforce.freebsd.org/chv.cgi?CH=104166 Change 104166 by jb@jb_freebsd2 on 2006/08/16 00:52:01 Use the new FreeBSD libelf to do the heavy lifting. Affected files ... .. //depot/projects/dtrace/src/usr.bin/elfdump/Makefile#3 edit Differences ... ==== //depot/projects/dtrace/src/usr.bin/elfdump/Makefile#3 (text+ko) ==== @@ -1,6 +1,8 @@ # $FreeBSD: src/usr.bin/elfdump/Makefile,v 1.4 2003/02/03 01:59:27 obrien Exp $ PROG= elfdump -WARNS?= 5 +WARNS?= 9 + +LDADD+= -lelf .include From owner-p4-projects@FreeBSD.ORG Wed Aug 16 01:31:19 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 482AB16A4E0; Wed, 16 Aug 2006 01:31:19 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 2384B16A4DE for ; Wed, 16 Aug 2006 01:31:19 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E145543D5C for ; Wed, 16 Aug 2006 01:31:17 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7G1VHPv094572 for ; Wed, 16 Aug 2006 01:31:17 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7G1VHNC094569 for perforce@freebsd.org; Wed, 16 Aug 2006 01:31:17 GMT (envelope-from jb@freebsd.org) Date: Wed, 16 Aug 2006 01:31:17 GMT Message-Id: <200608160131.k7G1VHNC094569@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 104167 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 16 Aug 2006 01:31:19 -0000 http://perforce.freebsd.org/chv.cgi?CH=104167 Change 104167 by jb@jb_freebsd2 on 2006/08/16 01:30:34 Revert back to using my memcpy version of this file which works on sun4v. Revision 5 certainly stopped the compiler warnings about alignment, but the compiler was doing the right thing. Adding another cast to avoid the warning just masked the problem. Affected files ... .. //depot/projects/dtrace/src/lib/libelf/libelf_convert.m4#6 edit Differences ... ==== //depot/projects/dtrace/src/lib/libelf/libelf_convert.m4#6 (text+ko) ==== @@ -1,3 +1,4 @@ +//depot/projects/dtrace/src/lib/libelf/libelf_convert.m4#4 - edit change 103978 (text+ko) /*- * Copyright (c) 2006 Joseph Koshy * All rights reserved. @@ -152,7 +153,7 @@ (X) = _t; \ } while (0) #define READ_WORD(P,X) do { \ - uint16_t _t; \ + uint32_t _t; \ unsigned char *const _q = (unsigned char *) &_t; \ const unsigned char *const _p = \ (const unsigned char *) (P); \ @@ -167,7 +168,7 @@ #define READ_OFF32(P,X) READ_WORD(P,X) #define READ_SWORD(P,X) READ_WORD(P,X) #define READ_WORD64(P,X) do { \ - uint16_t _t; \ + uint64_t _t; \ unsigned char *const _q = (unsigned char *) &_t; \ const unsigned char *const _p = \ (const unsigned char *) (P); \ @@ -188,6 +189,7 @@ #define READ_XWORD(P,X) READ_WORD64(P,X) #define READ_IDENT(P,X) do { \ (void) memcpy((X), (P), sizeof((X))); \ + (P) = (P) + sizeof((X)); \ } while (0) divert(-1) @@ -201,16 +203,9 @@ * casting to work as expected. On the other hand the `file' * representation of an ELF data structure could be packed tighter * than its `in-memory' representation, and could be of a differing - * byte order. An additional complication is that `ar' only pads data + * byte order. An additinal complication is that `ar' only pads data * to even addresses and so ELF archive member data being read from * inside an `ar' archive could end up at misaligned memory addresses. - * - * Consequently, casting the `char *' pointers that point to memory - * representations (i.e., source pointers for the *_tof() functions - * and the destination pointers for the *_tom() functions), is safe, - * as these pointers should be correctly aligned for the memory type - * already. However, pointers to file representations have to be - * treated as being potentially unaligned and no casting can be done. */ include(SRCDIR`/elf_types.m4') @@ -257,19 +252,20 @@ static void libelf_cvt_$1$3_tof(char *dst, char *src, int count, int byteswap) { - Elf64_$2 t, *s = (Elf64_$2 *) (uintptr_t) src; + Elf64_$2 t; int c; if (dst == src && !byteswap) return; if (!byteswap) { - (void) memcpy(dst, src, count * sizeof(*s)); + (void) memcpy(dst, src, count * sizeof(t)); return; } for (c = 0; c < count; c++) { - t = *s++; + memcpy(&t, src, sizeof(t)); + src += sizeof(t); SWAP_$1$3(t); WRITE_$1$3(dst,t); } @@ -280,21 +276,22 @@ static void libelf_cvt_$1$3_tom(char *dst, char *src, int count, int byteswap) { - Elf64_$2 t, *d = (Elf64_$2 *) (uintptr_t) dst; + Elf64_$2 t; int c; if (dst == src && !byteswap) return; if (!byteswap) { - (void) memcpy(dst, src, count * sizeof(*d)); + (void) memcpy(dst, src, count * sizeof(t)); return; } for (c = 0; c < count; c++) { READ_$1$3(src,t); SWAP_$1$3(t); - *d++ = t; + memcpy(dst, &t, sizeof(t)); + dst += sizeof(t); } } ') @@ -370,12 +367,12 @@ static void libelf_cvt$3_$1_tof(char *dst, char *src, int count, int byteswap) { - Elf$3_$2 t, *s; + Elf$3_$2 t; int c; - s = (Elf$3_$2 *) (uintptr_t) src; for (c = 0; c < count; c++) { - t = *s++; + memcpy(&t, src, sizeof(t)); + src += sizeof(t); if (byteswap) { SWAP_STRUCT($2,$3) } @@ -389,21 +386,22 @@ static void libelf_cvt$3_$1_tom(char *dst, char *src, int count, int byteswap) { - Elf$3_$2 t, *d; - unsigned char *s,*s0; + Elf$3_$2 t; + unsigned char *s; + int i; size_t fsz; fsz = elf$3_fsize(ELF_T_$1, 1, EV_CURRENT); - d = ((Elf$3_$2 *) (uintptr_t) dst) + (count - 1); - s0 = (unsigned char *) src + (count - 1) * fsz; - while (count--) { - s = s0; + for (i = 0; i < count; i++) { + s = (unsigned char *) src; READ_STRUCT($2,$3) if (byteswap) { SWAP_STRUCT($2,$3) } - *d-- = t; s0 -= fsz; + memcpy(dst, &t, sizeof(t)); + dst += sizeof(t); + src += fsz; } } ')') From owner-p4-projects@FreeBSD.ORG Wed Aug 16 01:32:20 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5633216A4E1; Wed, 16 Aug 2006 01:32:20 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 3515116A4DE for ; Wed, 16 Aug 2006 01:32:20 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D87A143D46 for ; Wed, 16 Aug 2006 01:32:19 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7G1WJEP094621 for ; Wed, 16 Aug 2006 01:32:19 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7G1WJkq094618 for perforce@freebsd.org; Wed, 16 Aug 2006 01:32:19 GMT (envelope-from jb@freebsd.org) Date: Wed, 16 Aug 2006 01:32:19 GMT Message-Id: <200608160132.k7G1WJkq094618@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 104168 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 16 Aug 2006 01:32:20 -0000 http://perforce.freebsd.org/chv.cgi?CH=104168 Change 104168 by jb@jb_freebsd2 on 2006/08/16 01:31:26 Report ELF class, data type and OS ABI. Affected files ... .. //depot/projects/dtrace/src/lib/libelf/elf_dump.c#2 edit .. //depot/projects/dtrace/src/lib/libelf/libelf_dump.c#2 edit Differences ... ==== //depot/projects/dtrace/src/lib/libelf/elf_dump.c#2 (text+ko) ==== @@ -37,6 +37,53 @@ #include "_libelf.h" static const char * +ei_class_str(u_int ei_class) +{ + switch (ei_class) { + case ELFCLASSNONE: return("ELFCLASSNONE"); + case ELFCLASS32: return("ELFCLASS32"); + case ELFCLASS64: return("ELFCLASS64"); + default: return (NULL); + } +} + +static const char * +ei_data_str(u_int ei_data) +{ + switch (ei_data) { + case ELFDATANONE: return("ELFDATANONE"); + case ELFDATA2LSB: return("ELFDATA2LSB"); + case ELFDATA2MSB: return("ELFDATA2MSB"); + default: return (NULL); + } +} + +static const char * +ei_osabi_str(u_int ei_osabi) +{ + switch (ei_osabi) { + case ELFOSABI_NONE: return("ELFOSABI_NONE"); + case ELFOSABI_86OPEN: return("ELFOSABI_86OPEN"); + case ELFOSABI_AIX: return("ELFOSABI_AIX"); + case ELFOSABI_ARM: return("ELFOSABI_ARM"); + case ELFOSABI_FREEBSD: return("ELFOSABI_FREEBSD"); + case ELFOSABI_HPUX: return("ELFOSABI_HPUX"); + case ELFOSABI_HURD: return("ELFOSABI_HURD"); + case ELFOSABI_IRIX: return("ELFOSABI_IRIX"); + case ELFOSABI_LINUX: return("ELFOSABI_LINUX"); + case ELFOSABI_MODESTO: return("ELFOSABI_MODESTO"); + case ELFOSABI_NETBSD: return("ELFOSABI_NETBSD"); + case ELFOSABI_NSK: return("ELFOSABI_NSK"); + case ELFOSABI_OPENBSD: return("ELFOSABI_OPENBSD"); + case ELFOSABI_OPENVMS: return("ELFOSABI_OPENVMS"); + case ELFOSABI_SOLARIS: return("ELFOSABI_SOLARIS"); + case ELFOSABI_STANDALONE: return("ELFOSABI_STANDALONE"); + case ELFOSABI_TRU64: return("ELFOSABI_TRU64"); + default: return (NULL); + } +} + +static const char * et_str(u_int e_type) { switch (e_type) { ==== //depot/projects/dtrace/src/lib/libelf/libelf_dump.c#2 (text+ko) ==== @@ -48,12 +48,27 @@ if ((flags & ELF_DUMP_EHDR) != 0) { printf("\nelf header:\n\n"); - printf("\te_ident: "); + printf("\te_ident:"); + if ((s = ei_class_str(ehdr->e_ident[EI_CLASS])) == NULL) { + snprintf(s1, sizeof(s1), "%u", ehdr->e_ident[EI_CLASS]); + s = s1; + } + printf(" %s", s); + if ((s = ei_data_str(ehdr->e_ident[EI_DATA])) == NULL) { + snprintf(s1, sizeof(s1), "%u", ehdr->e_ident[EI_DATA]); + s = s1; + } + printf(" %s", s); + if ((s = ei_osabi_str(ehdr->e_ident[EI_OSABI])) == NULL) { + snprintf(s1, sizeof(s1), "%u", ehdr->e_ident[EI_OSABI]); + s = s1; + } + printf(" %s\n", s); if ((s = et_str(ehdr->e_type)) == NULL) { snprintf(s1, sizeof(s1), "%hu", ehdr->e_type); s = s1; } - printf("\n\te_type: %s\n", s); + printf("\te_type: %s\n", s); if ((s = em_str(ehdr->e_machine)) == NULL) { snprintf(s1, sizeof(s1), "%hu", ehdr->e_machine); s = s1; From owner-p4-projects@FreeBSD.ORG Wed Aug 16 01:36:27 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DD3B516A4E1; Wed, 16 Aug 2006 01:36:26 +0000 (UTC) X-Original-To: perforce@FreeBSD.org 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 98D6116A4DD for ; Wed, 16 Aug 2006 01:36:26 +0000 (UTC) (envelope-from ryanb@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4247D43D4C for ; Wed, 16 Aug 2006 01:36:26 +0000 (GMT) (envelope-from ryanb@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7G1aQXC094889 for ; Wed, 16 Aug 2006 01:36:26 GMT (envelope-from ryanb@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7G1aPtI094886 for perforce@freebsd.org; Wed, 16 Aug 2006 01:36:25 GMT (envelope-from ryanb@FreeBSD.org) Date: Wed, 16 Aug 2006 01:36:25 GMT Message-Id: <200608160136.k7G1aPtI094886@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to ryanb@FreeBSD.org using -f From: Ryan Beasley To: Perforce Change Reviews Cc: Subject: PERFORCE change 104169 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 16 Aug 2006 01:36:27 -0000 http://perforce.freebsd.org/chv.cgi?CH=104169 Change 104169 by ryanb@ryanb_yuki on 2006/08/16 01:35:27 Integrate from user branch. Affected files ... .. //depot/projects/soc2006/rbeasley_sound/sys/dev/sound/pcm/buffer.c#3 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/dev/sound/pcm/buffer.h#3 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/dev/sound/pcm/channel.c#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/dev/sound/pcm/channel.h#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/dev/sound/pcm/channel_if.m#2 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/dev/sound/pcm/dsp.c#11 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/dev/sound/pcm/dsp.h#4 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/dev/sound/pcm/mixer.c#7 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/dev/sound/pcm/mixer.h#6 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/dev/sound/pcm/sound.c#11 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/dev/sound/pcm/sound.h#5 integrate .. //depot/projects/soc2006/rbeasley_sound/sys/sys/soundcard.h#7 integrate Differences ... ==== //depot/projects/soc2006/rbeasley_sound/sys/dev/sound/pcm/buffer.c#3 (text+ko) ==== @@ -117,6 +117,11 @@ free(b->tmpbuf, M_DEVBUF); b->tmpbuf = NULL; + if (b->shadbuf) + free(b->shadbuf, M_DEVBUF); + b->shadbuf = NULL; + b->sl = 0; + if (b->dmamap) bus_dmamap_unload(b->dmatag, b->dmamap); @@ -168,6 +173,7 @@ sndbuf_remalloc(struct snd_dbuf *b, unsigned int blkcnt, unsigned int blksz) { u_int8_t *buf, *tmpbuf, *f1, *f2; + u_int8_t *shadbuf, *f3; unsigned int bufsize; int ret; @@ -189,6 +195,15 @@ ret = ENOMEM; goto out; } + + shadbuf = malloc(bufsize, M_DEVBUF, M_WAITOK); + if (shadbuf == NULL) { + free(buf, M_DEVBUF); + free(tmpbuf, M_DEVBUF); + ret = ENOMEM; + goto out; + } + chn_lock(b->channel); b->blkcnt = blkcnt; @@ -199,6 +214,9 @@ f2 = b->tmpbuf; b->buf = buf; b->tmpbuf = tmpbuf; + f3 = b->shadbuf; + b->shadbuf = shadbuf; + b->sl = bufsize; sndbuf_reset(b); @@ -207,6 +225,8 @@ free(f1, M_DEVBUF); if (f2) free(f2, M_DEVBUF); + if (f3) + free(f3, M_DEVBUF); ret = 0; out: @@ -214,6 +234,15 @@ return ret; } +/** + * @brief Zero out space in buffer free area + * + * This function clears a chunk of @c length bytes in the buffer free area + * (i.e., where the next write will be placed). + * + * @param b buffer context + * @param length number of bytes to blank + */ void sndbuf_clear(struct snd_dbuf *b, unsigned int length) { @@ -241,6 +270,11 @@ } } +/** + * @brief Zap buffer contents, resetting "ready area" fields + * + * @param b buffer context + */ void sndbuf_fillsilence(struct snd_dbuf *b) { @@ -260,7 +294,24 @@ b->rl = b->bufsize; } +/** + * @brief Reset buffer w/o flushing statistics + * + * This function just zeroes out buffer contents and sets the "ready length" + * to zero. This was originally to facilitate minimal playback interruption + * (i.e., dropped samples) in SNDCTL_DSP_SILENCE/SKIP ioctls. + * + * @param b buffer context + */ void +sndbuf_softreset(struct snd_dbuf *b) +{ + b->rl = 0; + if (b->buf && b->bufsize > 0) + sndbuf_clear(b, b->bufsize); +} + +void sndbuf_reset(struct snd_dbuf *b) { b->hp = 0; @@ -272,6 +323,7 @@ b->xrun = 0; if (b->buf && b->bufsize > 0) sndbuf_clear(b, b->bufsize); + sndbuf_clearshadow(b); } u_int32_t @@ -493,6 +545,19 @@ /************************************************************/ +/** + * @brief Acquire buffer space to extend ready area + * + * This function extends the ready area length by @c count bytes, and may + * optionally copy samples from another location stored in @c from. The + * counter @c snd_dbuf::total is also incremented by @c count bytes. + * + * @param b audio buffer + * @param from sample source (optional) + * @param count number of bytes to acquire + * + * @retval 0 Unconditional + */ int sndbuf_acquire(struct snd_dbuf *b, u_int8_t *from, unsigned int count) { @@ -516,6 +581,20 @@ return 0; } +/** + * @brief Dispose samples from channel buffer, increasing size of ready area + * + * This function discards samples from the supplied buffer by advancing the + * ready area start pointer and decrementing the ready area length. If + * @c to is not NULL, then the discard samples will be copied to the location + * it points to. + * + * @param b PCM channel sound buffer + * @param to destination buffer (optional) + * @param count number of bytes to discard + * + * @returns 0 unconditionally + */ int sndbuf_dispose(struct snd_dbuf *b, u_int8_t *to, unsigned int count) { @@ -592,3 +671,49 @@ b->flags |= flags; } +/** + * @brief Clear the shadow buffer by filling with samples equal to zero. + * + * @param b buffer to clear + */ +void +sndbuf_clearshadow(struct snd_dbuf *b) +{ + KASSERT(b != NULL, ("b is a null pointer")); + KASSERT(b->sl >= 0, ("illegal shadow length")); + + if ((b->shadbuf != NULL) && (b->sl > 0)) { + if (b->fmt & AFMT_SIGNED) + memset(b->shadbuf, 0x00, b->sl); + else + memset(b->shadbuf, 0x80, b->sl); + } +} + +#ifdef OSSV4_EXPERIMENT +/** + * @brief Return peak value from samples in buffer ready area. + * + * Peak ranges from 0-32767. If channel is monaural, most significant 16 + * bits will be zero. For now, only expects to work with 1-2 channel + * buffers. + * + * @note Currently only operates with linear PCM formats. + * + * @param b buffer to analyze + * @param lpeak pointer to store left peak value + * @param rpeak pointer to store right peak value + */ +void +sndbuf_getpeaks(struct snd_dbuf *b, int *lp, int *rp) +{ + u_int32_t lpeak, rpeak; + + lpeak = 0; + rpeak = 0; + + /** + * @todo fill this in later + */ +} +#endif ==== //depot/projects/soc2006/rbeasley_sound/sys/dev/sound/pcm/buffer.h#3 (text+ko) ==== @@ -38,6 +38,8 @@ struct snd_dbuf { device_t dev; u_int8_t *buf, *tmpbuf; + u_int8_t *shadbuf; /**< shadow buffer used w/ S_D_SILENCE/SKIP */ + volatile int sl; /**< shadbuf ready length in # of bytes */ unsigned int bufsize, maxsize; volatile int dl; /* transfer size */ volatile int rp; /* pointers to the ready area */ @@ -70,6 +72,8 @@ void sndbuf_reset(struct snd_dbuf *b); void sndbuf_clear(struct snd_dbuf *b, unsigned int length); void sndbuf_fillsilence(struct snd_dbuf *b); +void sndbuf_softreset(struct snd_dbuf *b); +void sndbuf_clearshadow(struct snd_dbuf *b); u_int32_t sndbuf_getfmt(struct snd_dbuf *b); int sndbuf_setfmt(struct snd_dbuf *b, u_int32_t fmt); @@ -117,3 +121,7 @@ void sndbuf_dma(struct snd_dbuf *b, int go); int sndbuf_dmaptr(struct snd_dbuf *b); void sndbuf_dmabounce(struct snd_dbuf *b); + +#ifdef OSSV4_EXPERIMENT +void sndbuf_getpeaks(struct snd_dbuf *b, int *lp, int *rp); +#endif ==== //depot/projects/soc2006/rbeasley_sound/sys/dev/sound/pcm/channel.c#2 (text+ko) ==== @@ -68,6 +68,18 @@ SYSCTL_INT(_hw_snd, OID_AUTO, report_soft_formats, CTLFLAG_RW, &report_soft_formats, 1, "report software-emulated formats"); +/** + * @brief Channel sync group lock + * + * Clients should acquire this lock @b without holding any channel locks + * before touching syncgroups or the main syncgroup list. + * + * @todo rename? + */ +struct mtx snd_pcm_syncgroups_mtx; +MTX_SYSINIT(pcm_syncgroup, &snd_pcm_syncgroups_mtx, "PCM channel sync group lock", MTX_DEF); +struct pcm_synclist snd_pcm_syncgroups = SLIST_HEAD_INITIALIZER(head); + static int chn_buildfeeder(struct pcm_channel *c); static void @@ -87,14 +99,23 @@ c->lock = snd_mtxcreate(c->name, "pcm fake channel"); break; } + + cv_init(&c->cv, c->name); } static void chn_lockdestroy(struct pcm_channel *c) { snd_mtxfree(c->lock); + cv_destroy(&c->cv); } +/** + * @brief Determine channel is ready for I/O + * + * @retval 1 = ready for I/O + * @retval 0 = not ready for I/O + */ static int chn_polltrigger(struct pcm_channel *c) { @@ -112,8 +133,8 @@ #if 0 lim = (c->flags & CHN_F_HAS_SIZE)? sndbuf_getblksz(bs) : 1; #endif - lim = 1; - return (amt >= lim)? 1 : 0; + lim = c->lw; + return (amt >= lim) ? 1 : 0; } return 0; } @@ -310,12 +331,25 @@ ret = 0; count = hz; + while (!ret && (buf->uio_resid > 0) && (count > 0)) { sz = sndbuf_getfree(bs); if (sz == 0) { if (c->flags & CHN_F_NBIO) ret = EWOULDBLOCK; - else { + else if (c->flags & CHN_F_NOTRIGGER) { + /** + * @todo Evaluate whether EAGAIN is truly desirable. + * 4Front drivers behave like this, but I'm + * not sure if it at all violates the "write + * should be allowed to block" model. + * + * The idea is that, while set with CHN_F_NOTRIGGER, + * a channel isn't playing, *but* without this we + * end up with "interrupt timeout / channel dead". + */ + ret = EAGAIN; + } else { timeout = (hz * sndbuf_getblksz(bs)) / (sndbuf_getspd(bs) * sndbuf_getbps(bs)); if (timeout < 1) timeout = 1; @@ -783,6 +817,7 @@ chn_resetbuf(c); r = CHANNEL_RESETDONE(c->methods, c->devinfo); } + chn_syncdestroy(c); return r; } @@ -830,6 +865,17 @@ c->flags = 0; c->feederflags = 0; + /* + * OSSv4 docs: "By default OSS will set the low water level equal + * to the fragment size which is optimal in most cases." + * + * @todo So what happens if user requests a new block size? Should + * this value be updated? (Will mail 4Front with a list of + * questions as project continues.) + */ + c->lw = sndbuf_getblksz(bs); + c->sm = NULL; + ret = ENODEV; CHN_UNLOCK(c); /* XXX - Unlock for CHANNEL_INIT() malloc() call */ c->devinfo = CHANNEL_INIT(c->methods, devinfo, b, c, direction); @@ -853,6 +899,19 @@ if (ret) goto out; + /** + * @todo Should this be moved somewhere else? The primary buffer + * is allocated by the driver or via DMA map setup, and tmpbuf + * seems to only come into existence in sndbuf_resize(). + */ + if (c->direction == PCMDIR_PLAY) { + bs->sl = sndbuf_getmaxsize(bs); + bs->shadbuf = malloc(bs->sl, M_DEVBUF, M_NOWAIT); + if (bs->shadbuf == NULL) { + ret = ENOMEM; + goto out; + } + } out: CHN_UNLOCK(c); @@ -888,6 +947,7 @@ c->flags |= CHN_F_DEAD; sndbuf_destroy(bs); sndbuf_destroy(b); + chn_syncdestroy(c); chn_lockdestroy(c); return 0; } @@ -1243,6 +1303,17 @@ return ret; } +/** + * @brief Queries sound driver for sample-aligned hardware buffer pointer index + * + * This function obtains the hardware pointer location, then aligns it to + * the current bytes-per-sample value before returning. (E.g., a channel + * running in 16 bit stereo mode would require 4 bytes per sample, so a + * hwptr value ranging from 32-35 would be returned as 32.) + * + * @param c PCM channel context + * @returns sample-aligned hardware buffer pointer index + */ int chn_getptr(struct pcm_channel *c) { @@ -1501,6 +1572,60 @@ return 0; } +/** + * @brief Fetch array of supported discrete sample rates + * + * Wrapper for CHANNEL_GETRATES. Please see channel_if.m:getrates() for + * detailed information. + * + * @note If the operation isn't supported, this function will just return 0 + * (no rates in the array), and *rates will be set to NULL. Callers + * should examine rates @b only if this function returns non-zero. + * + * @param c pcm channel to examine + * @param rates pointer to array of integers; rate table will be recorded here + * + * @return number of rates in the array pointed to be @c rates + */ +int +chn_getrates(struct pcm_channel *c, int **rates) +{ + KASSERT(rates != NULL, ("rates is null")); + CHN_LOCKASSERT(c); + return CHANNEL_GETRATES(c->methods, c->devinfo, rates); +} + +/** + * @brief Remove channel from a sync group, if there is one. + * + * This is meant to be called before destroying the channel. + * + * @param c channel facing imminent destruction + */ +void +chn_syncdestroy(struct pcm_channel *c) +{ + struct pcmchan_syncmember *sm; + struct pcmchan_syncgroup *sg; + + if (c->sm == NULL) + return; + + sm = c->sm; + sg = sm->parent; + c->sm = NULL; + + KASSERT(sg != NULL, ("syncmember has null parent")); + + SLIST_REMOVE(&sg->members, sm, pcmchan_syncmember, link); + free(sm, M_DEVBUF); + + if (SLIST_EMPTY(&sg->members)) { + SLIST_REMOVE(&snd_pcm_syncgroups, sg, pcmchan_syncgroup, link); + free(sg, M_DEVBUF); + } +} + void chn_lock(struct pcm_channel *c) { @@ -1512,3 +1637,12 @@ { CHN_UNLOCK(c); } + +#ifdef OSSV4_EXPERIMENT +int +chn_getpeaks(struct pcm_channel *c, int *lpeak, int *rpeak) +{ + CHN_LOCKASSERT(c); + return CHANNEL_GETPEAKS(c->methods, c->devinfo, lpeak, rpeak); +} +#endif ==== //depot/projects/soc2006/rbeasley_sound/sys/dev/sound/pcm/channel.h#2 (text+ko) ==== @@ -37,6 +37,36 @@ u_int32_t caps; }; +/* Forward declarations */ +struct pcm_channel; +struct pcmchan_syncgroup; +struct pcmchan_syncmember; + +extern struct mtx snd_pcm_syncgroups_mtx; +extern SLIST_HEAD(pcm_synclist, pcmchan_syncgroup) snd_pcm_syncgroups; + +#define PCM_SG_LOCK() mtx_lock(&snd_pcm_syncgroups_mtx) +#define PCM_SG_TRYLOCK() mtx_trylock(&snd_pcm_syncgroups_mtx) +#define PCM_SG_UNLOCK() mtx_unlock(&snd_pcm_syncgroups_mtx) + +/** + * @brief Specifies an audio device sync group + */ +struct pcmchan_syncgroup { + SLIST_ENTRY(pcmchan_syncgroup) link; + SLIST_HEAD(, pcmchan_syncmember) members; + int id; /**< Group identifier; set to address of group. */ +}; + +/** + * @brief Specifies a container for members of a sync group + */ +struct pcmchan_syncmember { + SLIST_ENTRY(pcmchan_syncmember) link; + struct pcmchan_syncgroup *parent; /**< group head */ + struct pcm_channel *ch; +}; + #define CHN_NAMELEN 32 struct pcm_channel { kobj_t methods; @@ -63,6 +93,26 @@ device_t dev; char name[CHN_NAMELEN]; struct mtx *lock; + /** + * Increment,decrement this around operations that temporarily yield + * lock. + */ + unsigned int inprog; + /** + * Special channel operations should examine @c inprog after acquiring + * lock. If zero, operations may continue. Else, thread should + * wait on this cv for previous operation to finish. + */ + struct cv cv; + unsigned int lw; /**< select()/poll() low water mark */ + /** + * If part of a sync group, this will point to the syncmember + * container. + */ + struct pcmchan_syncmember *sm; +#ifdef OSSV4_EXPERIMENT + u_int16_t lpeak, rpeak; /**< Peak value from 0-32767. */ +#endif SLIST_HEAD(, pcmchan_children) children; }; @@ -102,13 +152,22 @@ void chn_lock(struct pcm_channel *c); void chn_unlock(struct pcm_channel *c); +int chn_getrates(struct pcm_channel *c, int **rates); +void chn_syncdestroy(struct pcm_channel *c); + +#ifdef OSSV4_EXPERIMENT +int chn_getpeaks(struct pcm_channel *c, int *lpeak, int *rpeak); +#endif + #ifdef USING_MUTEX #define CHN_LOCK(c) mtx_lock((struct mtx *)((c)->lock)) #define CHN_UNLOCK(c) mtx_unlock((struct mtx *)((c)->lock)) +#define CHN_TRYLOCK(c) mtx_trylock((struct mtx *)((c)->lock)) #define CHN_LOCKASSERT(c) mtx_assert((struct mtx *)((c)->lock), MA_OWNED) #else #define CHN_LOCK(c) #define CHN_UNLOCK(c) +#define CHN_TRYLOCK(c) #define CHN_LOCKASSERT(c) #endif ==== //depot/projects/soc2006/rbeasley_sound/sys/dev/sound/pcm/channel_if.m#2 (text+ko) ==== @@ -70,6 +70,19 @@ return 0; } + static int + channel_nogetpeaks(kobj_t obj, void *data, int *lpeak, int *rpeak) + { + return -1; + } + + static int + channel_nogetrates(kobj_t obj, void *data, int **rates) + { + *rates = NULL; + return 0; + } + }; METHOD void* init { @@ -140,3 +153,55 @@ void *data; u_int32_t changed; } DEFAULT channel_nonotify; + +/** + * @brief Retrieve channel peak values + * + * This function is intended to obtain peak volume values for samples + * played/recorded on a channel. Values are on a linear scale from 0 to + * 32767. If the channel is monaural, a single value should be recorded + * in @c lpeak. + * + * If hardware support isn't available, the SNDCTL_DSP_GET[IO]PEAKS + * operation should return EINVAL. However, we may opt to provide + * software support that the user may toggle via sysctl/mixext. + * + * @param obj standard kobj object (usually @c channel->methods) + * @param data driver-specific data (usually @c channel->devinfo) + * @param lpeak pointer to store left peak level + * @param rpeak pointer to store right peak level + * + * @retval -1 Error; usually operation isn't supported. + * @retval 0 success + */ +METHOD int getpeaks { + kobj_t obj; + void *data; + int *lpeak; + int *rpeak; +} DEFAULT channel_nogetpeaks; + +/** + * @brief Retrieve discrete supported sample rates + * + * Some cards operate at fixed rates, and this call is intended to retrieve + * those rates primarily for when in-kernel rate adjustment is undesirable + * (e.g., application wants direct DMA access after setting a channel to run + * "uncooked"). + * + * @todo Once 4Front docs for SNDCTL_AUDIOINFO are back, double check to + * make sure that such tables are truly static. I'm wondering if it's + * possible for a driver's supported rates to change depending on the + * card's operating mode. + * + * @param obj standard kobj object (usually @c channel->methods) + * @param data driver-specific data (usually @c channel->devinfo) + * @param rates if successful, will point to static array of supported rates + * + * @return Number of rates in the array + */ +METHOD int getrates { + kobj_t obj; + void *data; + int **rates; +} DEFAULT channel_nogetrates; ==== //depot/projects/soc2006/rbeasley_sound/sys/dev/sound/pcm/dsp.c#11 (text+ko) ==== @@ -58,6 +58,20 @@ static eventhandler_tag dsp_ehtag; #endif +static int dsp_oss_syncgroup(struct pcm_channel *wrch, struct pcm_channel *rdch, oss_syncgroup *group); +static int dsp_oss_syncstart(int sg_id); +static int dsp_oss_policy(struct pcm_channel *wrch, struct pcm_channel *rdch, int policy); +#ifdef OSSV4_EXPERIMENT +static int dsp_oss_cookedmode(struct pcm_channel *wrch, struct pcm_channel *rdch, int enabled); +static int dsp_oss_getchnorder(struct pcm_channel *wrch, struct pcm_channel *rdch, unsigned long long *map); +static int dsp_oss_setchnorder(struct pcm_channel *wrch, struct pcm_channel *rdch, unsigned long long *map); +static int dsp_oss_getlabel(struct pcm_channel *wrch, struct pcm_channel *rdch, oss_label_t *label); +static int dsp_oss_setlabel(struct pcm_channel *wrch, struct pcm_channel *rdch, oss_label_t *label); +static int dsp_oss_getsong(struct pcm_channel *wrch, struct pcm_channel *rdch, oss_longname_t *song); +static int dsp_oss_setsong(struct pcm_channel *wrch, struct pcm_channel *rdch, oss_longname_t *song); +static int dsp_oss_setname(struct pcm_channel *wrch, struct pcm_channel *rdch, oss_longname_t *name); +#endif + static struct snddev_info * dsp_get_info(struct cdev *dev) { @@ -394,7 +408,17 @@ } if (!(wrch->flags & CHN_F_RUNNING)) wrch->flags |= CHN_F_RUNNING; + + /* + * Chn_write() must give up channel lock in order to copy bytes from + * userland, so up the "in progress" counter to make sure someone + * else doesn't come along and muss up the buffer. + */ + ++wrch->inprog; ret = chn_write(wrch, buf); + --wrch->inprog; + cv_signal(&wrch->cv); + relchns(i_dev, rdch, wrch, SD_F_PRIO_WR); return ret; @@ -407,12 +431,9 @@ struct snddev_info *d; int kill; int ret = 0, *arg_i = (int *)arg, tmp; -#ifdef OSSV4_EXPERIMENT - oss_mixer_enuminfo *ei; int xcmd; xcmd = 0; -#endif /* * this is an evil hack to allow broken apps to perform mixer ioctls @@ -1038,7 +1059,6 @@ dsp_set_flags(i_dev, dsp_get_flags(i_dev)^SD_F_SIMPLEX); break; -#ifdef OSSV4_EXPERIMENT case SNDCTL_SYSINFO: sound_oss_sysinfo((oss_sysinfo *)arg); break; @@ -1091,18 +1111,22 @@ * the wrch bound to this cdev). */ case SNDCTL_DSP_GET_PLAYTGT_NAMES: - ei = (oss_mixer_enuminfo *)arg; - ei->dev = 0; - ei->ctrl = 0; - ei->version = 0; /* static for now */ - ei->strindex[0] = 0; + { + oss_mixer_enuminfo *ei; + ei = (oss_mixer_enuminfo *)arg; + ei->dev = 0; + ei->ctrl = 0; + ei->version = 0; /* static for now */ + ei->strindex[0] = 0; - if (wrch != NULL) { - ei->nvalues = 1; - strlcpy(ei->strings, wrch->name, sizeof(ei->strings)); - } else { - ei->nvalues = 0; - ei->strings[0] = '\0'; + if (wrch != NULL) { + ei->nvalues = 1; + strlcpy(ei->strings, wrch->name, + sizeof(ei->strings)); + } else { + ei->nvalues = 0; + ei->strings[0] = '\0'; + } } break; case SNDCTL_DSP_GET_PLAYTGT: @@ -1119,6 +1143,235 @@ ret = EINVAL; break; + case SNDCTL_DSP_SILENCE: + /* + * Flush the software (pre-feed) buffer, but try to minimize playback + * interruption. (I.e., record unplayed samples with intent to + * restore by SNDCTL_DSP_SKIP.) Intended for application "pause" + * functionality. + */ + if (wrch == NULL) + ret = EINVAL; + else { + struct snd_dbuf *bs; + CHN_LOCK(wrch); + while (wrch->inprog != 0) + cv_wait(&wrch->cv, wrch->lock); + bs = wrch->bufsoft; + if ((bs->shadbuf != NULL) && (sndbuf_getready(bs) > 0)) { + bs->sl = sndbuf_getready(bs); + sndbuf_dispose(bs, bs->shadbuf, sndbuf_getready(bs)); + sndbuf_fillsilence(bs); + chn_start(wrch, 0); + } + CHN_UNLOCK(wrch); + } + break; + + case SNDCTL_DSP_SKIP: + /* + * OSSv4 docs: "This ioctl call discards all unplayed samples in the + * playback buffer by moving the current write position immediately + * before the point where the device is currently reading the samples." + */ + if (wrch == NULL) + ret = EINVAL; + else { + struct snd_dbuf *bs; + CHN_LOCK(wrch); + while (wrch->inprog != 0) + cv_wait(&wrch->cv, wrch->lock); + bs = wrch->bufsoft; + if ((bs->shadbuf != NULL) && (bs->sl > 0)) { + sndbuf_softreset(bs); + sndbuf_acquire(bs, bs->shadbuf, bs->sl); + bs->sl = 0; + chn_start(wrch, 0); + } + CHN_UNLOCK(wrch); + } + break; + + case SNDCTL_DSP_CURRENT_OPTR: + case SNDCTL_DSP_CURRENT_IPTR: + /** + * @note Changing formats resets the buffer counters, which differs + * from the 4Front drivers. However, I don't expect this to be + * much of a problem. + * + * @todo In a test where this ioctl is called immediately after write + * returns, this driver is about 32K samples behind whereas + * 4Front's is about 8K samples behind. Must determine source + * of discrepancy. + * + * @todo Actually test SNDCTL_DSP_CURRENT_IPTR. + */ + chn = (cmd == SNDCTL_DSP_CURRENT_OPTR) ? wrch : rdch; + if (chn == NULL) + ret = EINVAL; + else { + struct snd_dbuf *bs; + /* int tmp; */ + + oss_count_t *oc = (oss_count_t *)arg; + + CHN_LOCK(chn); + bs = chn->bufsoft; +#if 0 + tmp = (sndbuf_getsize(b) + chn_getptr(chn) - sndbuf_gethwptr(b)) % sndbuf_getsize(b); + oc->samples = (sndbuf_gettotal(b) + tmp) / sndbuf_getbps(b); + oc->fifo_samples = (sndbuf_getready(b) - tmp) / sndbuf_getbps(b); +#else + oc->samples = sndbuf_gettotal(bs) / sndbuf_getbps(bs); + oc->fifo_samples = sndbuf_getready(bs) / sndbuf_getbps(bs); +#endif + CHN_UNLOCK(chn); + } + break; + + case SNDCTL_DSP_HALT_OUTPUT: + case SNDCTL_DSP_HALT_INPUT: + chn = (cmd == SNDCTL_DSP_HALT_OUTPUT) ? wrch : rdch; + if (chn == NULL) + ret = EINVAL; + else { + CHN_LOCK(chn); + chn_abort(chn); + CHN_UNLOCK(chn); + } + break; + + case SNDCTL_DSP_LOW_WATER: + /* + * Set the number of bytes required to attract attention by + * select/poll. + */ + if (wrch != NULL) { + CHN_LOCK(wrch); + wrch->lw = (*arg_i > 1) ? *arg_i : 1; + CHN_UNLOCK(wrch); + } + if (rdch != NULL) { + CHN_LOCK(rdch); + rdch->lw = (*arg_i > 1) ? *arg_i : 1; + CHN_UNLOCK(rdch); + } + break; + + case SNDCTL_DSP_GETERROR: + /* + * OSSv4 docs: "All errors and counters will automatically be + * cleared to zeroes after the call so each call will return only + * the errors that occurred after the previous invocation. ... The + * play_underruns and rec_overrun fields are the only usefull fields + * returned by OSS 4.0." + */ + { + audio_errinfo *ei = (audio_errinfo *)arg; + + bzero((void *)ei, sizeof(*ei)); + + if (wrch != NULL) { + CHN_LOCK(wrch); + ei->play_underruns = wrch->xruns; + wrch->xruns = 0; + CHN_UNLOCK(wrch); + } + if (rdch != NULL) { + CHN_LOCK(rdch); + ei->rec_overruns = rdch->xruns; + rdch->xruns = 0; + CHN_UNLOCK(rdch); + } + } + break; + + case SNDCTL_DSP_SYNCGROUP: + ret = dsp_oss_syncgroup(wrch, rdch, (oss_syncgroup *)arg); + break; + + case SNDCTL_DSP_SYNCSTART: + ret = dsp_oss_syncstart(*arg_i); + break; + + case SNDCTL_DSP_POLICY: + ret = dsp_oss_policy(wrch, rdch, *arg_i); + break; + +#ifdef OSSV4_EXPERIMENT + /* + * XXX The following ioctls are not yet supported and just return + * EINVAL. + */ + case SNDCTL_DSP_GETOPEAKS: + case SNDCTL_DSP_GETIPEAKS: + chn = (cmd == SNDCTL_DSP_GETOPEAKS) ? wrch : rdch; + if (chn == NULL) + ret = EINVAL; + else { + oss_peaks_t *op = (oss_peaks_t *)arg; + int lpeak, rpeak; + + CHN_LOCK(chn); + ret = chn_getpeaks(chn, &lpeak, &rpeak); + if (ret == -1) + ret = EINVAL; + else { + (*op)[0] = lpeak; + (*op)[1] = rpeak; + } + CHN_UNLOCK(chn); + } + break; + + case SNDCTL_DSP_COOKEDMODE: + ret = dsp_oss_cookedmode(wrch, rdch, *arg_i); + break; + case SNDCTL_DSP_GET_CHNORDER: + ret = dsp_oss_getchnorder(wrch, rdch, (unsigned long long *)arg); + break; + case SNDCTL_DSP_SET_CHNORDER: + ret = dsp_oss_setchnorder(wrch, rdch, (unsigned long long *)arg); + break; + case SNDCTL_GETLABEL: + ret = dsp_oss_getlabel(wrch, rdch, (oss_label_t *)arg); + break; + case SNDCTL_SETLABEL: + ret = dsp_oss_setlabel(wrch, rdch, (oss_label_t *)arg); + break; + case SNDCTL_GETSONG: + ret = dsp_oss_getsong(wrch, rdch, (oss_longname_t *)arg); + break; + case SNDCTL_SETSONG: + ret = dsp_oss_setsong(wrch, rdch, (oss_longname_t *)arg); + break; + case SNDCTL_SETNAME: + ret = dsp_oss_setname(wrch, rdch, (oss_longname_t *)arg); + break; +#if 0 + /** + * @note The SNDCTL_CARDINFO ioctl was omitted per 4Front developer + * documentation. "The usability of this call is very limited. It's + * provided only for completeness of the API. OSS API doesn't have + * any concept of card. Any information returned by this ioctl calld + * is reserved exclusively for the utility programs included in the + * OSS package. Applications should not try to use for this + * information in any ways." + */ + case SNDCTL_CARDINFO: + ret = EINVAL; + break; + /** + * @note The S/PDIF interface ioctls, @c SNDCTL_DSP_READCTL and + * @c SNDCTL_DSP_WRITECTL have been omitted at the suggestion of + * 4Front Technologies. + */ + case SNDCTL_DSP_READCTL: + case SNDCTL_DSP_WRITECTL: + ret = EINVAL; + break; +#endif /* !0 (explicitly omitted ioctls) */ + #endif /* !OSSV4_EXPERIMENT */ case SNDCTL_DSP_MAPINBUF: case SNDCTL_DSP_MAPOUTBUF: @@ -1294,7 +1547,6 @@ SYSUNINIT(dsp_sysuninit, SI_SUB_DRIVERS, SI_ORDER_MIDDLE, dsp_sysuninit, NULL); #endif -#ifdef OSSV4_EXPERIMENT /** * @brief Handler for SNDCTL_AUDIOINFO. * @@ -1339,7 +1591,7 @@ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Aug 16 01:54:50 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9107B16A4E0; Wed, 16 Aug 2006 01:54:50 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 5411A16A4DE for ; Wed, 16 Aug 2006 01:54:50 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0997743D46 for ; Wed, 16 Aug 2006 01:54:50 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7G1snpo095685 for ; Wed, 16 Aug 2006 01:54:49 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7G1sn6f095682 for perforce@freebsd.org; Wed, 16 Aug 2006 01:54:49 GMT (envelope-from jb@freebsd.org) Date: Wed, 16 Aug 2006 01:54:49 GMT Message-Id: <200608160154.k7G1sn6f095682@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 104170 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 16 Aug 2006 01:54:50 -0000 http://perforce.freebsd.org/chv.cgi?CH=104170 Change 104170 by jb@jb_freebsd2 on 2006/08/16 01:54:35 Zero the allocated memory to reset everything to a known default. Then it is only necessary to set the variables that aren't zero by default. Affected files ... .. //depot/projects/dtrace/src/lib/libelf/elf_allocate.c#3 edit Differences ... ==== //depot/projects/dtrace/src/lib/libelf/elf_allocate.c#3 (text+ko) ==== @@ -49,6 +49,8 @@ return NULL; } + memset(e, 0, sizeof(*e)); + e->e_kind = ELF_K_NONE; e->e_class = ELFCLASSNONE; e->e_cmd = ELF_C_NULL; From owner-p4-projects@FreeBSD.ORG Wed Aug 16 02:09:08 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 35E2B16A4E1; Wed, 16 Aug 2006 02:09:08 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 127E716A4DF for ; Wed, 16 Aug 2006 02:09:08 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id CEE1543D49 for ; Wed, 16 Aug 2006 02:09:07 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7G297MF098146 for ; Wed, 16 Aug 2006 02:09:07 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7G297G8098143 for perforce@freebsd.org; Wed, 16 Aug 2006 02:09:07 GMT (envelope-from jb@freebsd.org) Date: Wed, 16 Aug 2006 02:09:07 GMT Message-Id: <200608160209.k7G297G8098143@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 104171 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 16 Aug 2006 02:09:08 -0000 http://perforce.freebsd.org/chv.cgi?CH=104171 Change 104171 by jb@jb_freebsd2 on 2006/08/16 02:08:07 Add pointers for a place to hang copies of the program and section header arrays cached in host endian format. Note that the host ELF format may differ from the target one, so the choice of the 32- or 64-bit versions depends on the target data type. However the variables in the cached arrays are in host endian order so that they can be accessed directly. Free allocated memory when freeing the allocated ELF structure. Affected files ... .. //depot/projects/dtrace/src/lib/libelf/_libelf.h#3 edit .. //depot/projects/dtrace/src/lib/libelf/elf_allocate.c#4 edit Differences ... ==== //depot/projects/dtrace/src/lib/libelf/_libelf.h#3 (text+ko) ==== @@ -83,8 +83,17 @@ size_t e_rawsize; /* size of uninterpreted bytes */ unsigned int e_version; /* file version */ + /* + * Cached data in host byte order. Pointers are to malloc'ed + * memory and the dimensions of the arrays are in the relevant + * header. + */ Elf32_Ehdr e_eh32; /* 32-bit ELF header */ Elf64_Ehdr e_eh64; /* 64-bit ELF header */ + Elf32_Phdr *e_ph32; /* Ptr to the 32-bit program header array */ + Elf64_Phdr *e_ph64; /* Ptr to the 64-bit program header array */ + Elf32_Shdr *e_sh32; /* Ptr to the 32-bit section header array */ + Elf64_Shdr *e_sh64; /* Ptr to the 64-bit section header array */ union { struct { /* ar(1) archives */ ==== //depot/projects/dtrace/src/lib/libelf/elf_allocate.c#4 (text+ko) ==== @@ -36,6 +36,7 @@ #include #include #include +#include #include "_libelf.h" @@ -69,5 +70,13 @@ void _libelf_release_elf(Elf *e) { + if (e->e_ph32 != NULL) + free(e->e_ph32); + if (e->e_ph64 != NULL) + free(e->e_ph64); + if (e->e_sh32 != NULL) + free(e->e_sh32); + if (e->e_sh64 != NULL) + free(e->e_sh64); free(e); } From owner-p4-projects@FreeBSD.ORG Wed Aug 16 02:28:33 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2AB5316A4FC; Wed, 16 Aug 2006 02:28:33 +0000 (UTC) X-Original-To: perforce@FreeBSD.org 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 B3D8216A4F8 for ; Wed, 16 Aug 2006 02:28:32 +0000 (UTC) (envelope-from swhitman@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6639443D46 for ; Wed, 16 Aug 2006 02:28:32 +0000 (GMT) (envelope-from swhitman@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7G2SWZh099004 for ; Wed, 16 Aug 2006 02:28:32 GMT (envelope-from swhitman@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7G2SWFv099000 for perforce@freebsd.org; Wed, 16 Aug 2006 02:28:32 GMT (envelope-from swhitman@FreeBSD.org) Date: Wed, 16 Aug 2006 02:28:32 GMT Message-Id: <200608160228.k7G2SWFv099000@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to swhitman@FreeBSD.org using -f From: Spencer Whitman To: Perforce Change Reviews Cc: Subject: PERFORCE change 104173 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 16 Aug 2006 02:28:33 -0000 http://perforce.freebsd.org/chv.cgi?CH=104173 Change 104173 by swhitman@swhitman_joethecat on 2006/08/16 02:28:08 Work on macro replacment and macro argument replacment. Fixed a bug with adding macro arguments. Affected files ... .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/k/cpp.c#17 edit Differences ... ==== //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/k/cpp.c#17 (text+ko) ==== @@ -45,45 +45,48 @@ }; -/* XXX This should be optimized, but works for now */ -struct macro_arg { - const char *name; /* Argument name */ - int length; /* Length of the arg name */ - int *offsets; /* Offset list */ - TAILQ_ENTRY(macro_arg) list; /* Entry into the argument list */ -}; +/* XXX This should be optimized, but works for now */ +struct macro_arg { + const char *name; /* Argument name */ + const char *value; /* Current value to replace arg with */ + int name_length; /* Length of the arg name */ + int val_length; /* Length of current value for arg */ + int *offsets; /* Offset list */ + TAILQ_ENTRY(macro_arg) list; /* Entry into the argument list */ +}; + +#define OBJ_MAC_TYPE 0/* For object like macros (no paraens, no arguments) */ +#define FUNC_MAC_TYPE 1/* For function like macros (paraens and arguments) */ +#define NONE_MAC_TYPE -1/* Inital value. Indecates type was not set */ -#define OBJ_MAC_TYPE 0/* For object like macros (no paraens, no arguments) */ -#define FUNC_MAC_TYPE 1/* For function like macros (paraens and arguments) */ -#define NONE_MAC_TYPE -1/* Inital value. Indecates type was not set */ -struct define { - const char *name; /* Name of the macro */ - int mac_type; /* Object or function like macro */ - TAILQ_HEAD(,macro_arg) args; /* Head of argument list */ - const char *value; /* Value of the macro */ - int length; /* Length of the macro value */ - TAILQ_ENTRY(define) list; /* Link to list of macros */ -}; +struct define { + const char *name; /* Name of the macro */ + int mac_type; /* Object or function like macro */ + TAILQ_HEAD(,macro_arg) args; /* Head of argument list */ + const char *value; /* Value of the macro */ + int length; /* Length of the macro value */ + TAILQ_ENTRY(define) list; /* Link to list of macros */ +}; -/* XXX Free const char * name value? */ +/* XXX Free const char * name? */ #define FREE_ARG_LIST(DEF) \ - do { \ - struct macro_arg * tmpvar = NULL; \ - for(; !TAILQ_EMPTY(&(DEF)->args); tmpvar = TAILQ_FIRST(&(DEF)->args)) { \ - TAILQ_REMOVE(&(DEF)->args, tmpvar, list); \ - free(tmpvar->offsets); \ - free(tmpvar); \ - } \ - } while(0) +do { \ + struct macro_arg * tmpvar = NULL; \ + for(; !TAILQ_EMPTY(&(DEF)->args); tmpvar = TAILQ_FIRST(&(DEF)->args)) { \ + TAILQ_REMOVE(&(DEF)->args, tmpvar, list); \ + free(tmpvar->offsets); \ + free(tmpvar); \ + } \ + } while(0) -/* XXX Free const char * name value? */ -/* XXX Free const char * value value? */ +/* XXX Free const char * name? */ +/* XXX Free const char * value? */ #define FREE_DEF(DEF) \ do { \ TAILQ_REMOVE(&define,(DEF),list); \ FREE_ARG_LIST((DEF)); \ free((DEF)); \ - }while(0) + }while(0) static TAILQ_HEAD(,iarg) iarg = TAILQ_HEAD_INITIALIZER(iarg); @@ -189,6 +192,21 @@ } #if 0 + +static const char * +replace_word(const char * word) { + + struct define * tmp; + + TAILQ_FOREACH(tmp, &define, list) { + if (String(word,NULL) == (tmp->name)) { + return (tmp->value); + } + } + return word; +} + + static const char * expand_macro(struct define * mac, struct arg_ind * head) { @@ -196,12 +214,24 @@ static const char * -expand_string(char * word) { - /* Search the macro list to match word. If word matches a macro, return a - * pointer to the expanded macro, otherwise return word - */ +get_name(const char * word) { + const char e = strstr(word,"("); + if(e == NULL) + return word; + + return String(word,e); +} + +static const char * +get_arg(const char * word) { + const char e = NULL; +} + +static const char * +expand_string(const char * str) { } + #endif /* -------------------------------------------------------------------*/ @@ -303,6 +333,34 @@ { assert(mac->value != NULL); assert(mac->length > 0); + + struct macro_arg * curr; + int macLength = mac->length; + int * tmpOffs = calloc((sizeof(int)* macLength),1); + int count = 0; + + TAILQ_FOREACH(curr, &mac->args, list) { + char * t; + + printf("Looking for arg %V\n",curr->name); + + for(t = strnstr(mac->value,curr->name,macLength); t != NULL; + t = strnstr(t,curr->name,(macLength - (t - mac->value)))) { + if (t == NULL) + break; + tmpOffs[count] = t - mac->value; + count++; + t += curr->name_length; + printf("Adding offset at %i\n",tmpOffs[count-1]); + } + + if(count > 0) { + curr->offsets = calloc((sizeof(int)* count),1); + memcpy(curr->offsets,tmpOffs,(sizeof(int)*count)); + } else + printf("Arg %V did not appear in macro value %V\n",curr->name,mac->value); + } + free(tmpOffs); } @@ -320,19 +378,26 @@ printf("adding macro arg: %V\n",new_arg->name); - TAILQ_FOREACH(tmp, &mac->args, list) { - if(tmp == NULL) { - printf("tmp == null; inserting into tail\n"); - TAILQ_INSERT_TAIL(&mac->args,new_arg,list); - } - - if(tmp->name == new_arg->name) { - free(new_arg); - errx(1, "duplicate macro parameter \"%V\"",tmp->name); + /* Make sure something's in the arg list to begin with */ + if(TAILQ_FIRST(&mac->args) == NULL) { + printf("tmp == null; inserting into tail\n"); + TAILQ_INSERT_TAIL(&mac->args,new_arg,list); + } + else { + TAILQ_FOREACH(tmp, &mac->args, list) { + if(tmp == NULL) { + printf("tmp == null; inserting into tail\n"); + TAILQ_INSERT_TAIL(&mac->args,new_arg,list); + } + + if(tmp->name == new_arg->name) { + free(new_arg); + errx(1, "duplicate macro parameter \"%V\"",tmp->name); + } } } - - new_arg->length = strlen(new_arg->name); + + new_arg->name_length = strlen(new_arg->name); printf("added argument named: <%V> to macro named <%V>\n",new_arg->name, mac->name); @@ -394,6 +459,8 @@ printf("2Defining object macro name %V\n", p); mac->mac_type = OBJ_MAC_TYPE; } + + TAILQ_INIT(&mac->args); switch (mac->mac_type) { @@ -406,8 +473,6 @@ { const char * arg_beg = skipspace(cfs,name_e+1,e); - TAILQ_INIT(&mac->args); - /* Insert each argument name. Error if list does not end with a ')' */ /* XXX Should this detect empty arguments and non-ID like arguments? */ for(p = arg_beg; p < e; p++) { @@ -464,7 +529,8 @@ TAILQ_FOREACH(tmp, &define, list) { if(tmp->name == name) { printf("Removing macro %s\n",name); - FREE_DEF(tmp); + /* XXX Fix freeing */ + //FREE_DEF(tmp); /* XXX Could there still be more #defines with the same name in the list? */ break; From owner-p4-projects@FreeBSD.ORG Wed Aug 16 05:29:28 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 29A0B16A4E6; Wed, 16 Aug 2006 05:29:28 +0000 (UTC) X-Original-To: perforce@FreeBSD.org 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 E904716A4E2 for ; Wed, 16 Aug 2006 05:29:27 +0000 (UTC) (envelope-from cdjones@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B328143D45 for ; Wed, 16 Aug 2006 05:29:27 +0000 (GMT) (envelope-from cdjones@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7G5TROv020513 for ; Wed, 16 Aug 2006 05:29:27 GMT (envelope-from cdjones@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7G5TRoC020509 for perforce@freebsd.org; Wed, 16 Aug 2006 05:29:27 GMT (envelope-from cdjones@FreeBSD.org) Date: Wed, 16 Aug 2006 05:29:27 GMT Message-Id: <200608160529.k7G5TRoC020509@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to cdjones@FreeBSD.org using -f From: Chris Jones To: Perforce Change Reviews Cc: Subject: PERFORCE change 104180 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 16 Aug 2006 05:29:28 -0000 http://perforce.freebsd.org/chv.cgi?CH=104180 Change 104180 by cdjones@cdjones-impulse on 2006/08/16 05:28:54 Fix silly error in total sched share calculation, add some debugging. Affected files ... .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/sched_hier.c#9 edit Differences ... ==== //depot/projects/soc2006/cdjones_jail/src/sys/kern/sched_hier.c#9 (text+ko) ==== @@ -557,9 +557,12 @@ * when jail CPU shares are added / changed, rather than * doing it every second. */ + nShares = 0; LIST_FOREACH(pr, &allprison, pr_list) { + printf("schedcpu_thread: prison %p\n", &pr); nShares += pr->pr_sched_shares; } + printf("schedcpu_thread: %d CPU shares total\n", nShares); total_jail_sched_shares = nShares; schedcpu(); @@ -613,7 +616,10 @@ * soft limits available. Also, the amount of CPU time * reserved to unjailed processes really should be sysctl'd. */ + printf("resetpriority: reset KSE %p priority\n", &kg); newpriority *= pr->pr_sched_shares; + KASSERT(0 != total_jail_sched_shares, + "no jail sched shares when a jail exists?!"); newpriority /= 2*total_jail_sched_shares; } newpriority = min(max(newpriority, PRI_MIN_TIMESHARE), From owner-p4-projects@FreeBSD.ORG Wed Aug 16 05:34:35 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CD8CC16A4DF; Wed, 16 Aug 2006 05:34:34 +0000 (UTC) X-Original-To: perforce@FreeBSD.org 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 AAF6216A4DD for ; Wed, 16 Aug 2006 05:34:34 +0000 (UTC) (envelope-from cdjones@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 621D943D45 for ; Wed, 16 Aug 2006 05:34:34 +0000 (GMT) (envelope-from cdjones@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7G5YYqY020812 for ; Wed, 16 Aug 2006 05:34:34 GMT (envelope-from cdjones@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7G5YYed020809 for perforce@freebsd.org; Wed, 16 Aug 2006 05:34:34 GMT (envelope-from cdjones@FreeBSD.org) Date: Wed, 16 Aug 2006 05:34:34 GMT Message-Id: <200608160534.k7G5YYed020809@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to cdjones@FreeBSD.org using -f From: Chris Jones To: Perforce Change Reviews Cc: Subject: PERFORCE change 104181 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 16 Aug 2006 05:34:35 -0000 http://perforce.freebsd.org/chv.cgi?CH=104181 Change 104181 by cdjones@cdjones-impulse on 2006/08/16 05:34:04 Trivial program to chew CPU. Affected files ... .. //depot/projects/soc2006/cdjones_jail/test/useCpu.c#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Wed Aug 16 06:00:07 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 470F416A4E0; Wed, 16 Aug 2006 06:00:07 +0000 (UTC) X-Original-To: perforce@FreeBSD.org 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 E640D16A4DD for ; Wed, 16 Aug 2006 06:00:06 +0000 (UTC) (envelope-from cdjones@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 90E9B43D49 for ; Wed, 16 Aug 2006 06:00:06 +0000 (GMT) (envelope-from cdjones@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7G606NR022118 for ; Wed, 16 Aug 2006 06:00:06 GMT (envelope-from cdjones@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7G60677022115 for perforce@freebsd.org; Wed, 16 Aug 2006 06:00:06 GMT (envelope-from cdjones@FreeBSD.org) Date: Wed, 16 Aug 2006 06:00:06 GMT Message-Id: <200608160600.k7G60677022115@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to cdjones@FreeBSD.org using -f From: Chris Jones To: Perforce Change Reviews Cc: Subject: PERFORCE change 104183 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 16 Aug 2006 06:00:07 -0000 http://perforce.freebsd.org/chv.cgi?CH=104183 Change 104183 by cdjones@cdjones-impulse on 2006/08/16 06:00:03 Add some useful options for chewing through CPU. Affected files ... .. //depot/projects/soc2006/cdjones_jail/test/useCpu.c#2 edit Differences ... ==== //depot/projects/soc2006/cdjones_jail/test/useCpu.c#2 (text+ko) ==== @@ -6,11 +6,48 @@ #include #include +static void usage(void); +extern char **environ; + int main(int argc, char **argv) { + int ch; + unsigned int repeats = 0; + unsigned int verbose = 0; + unsigned int interval = 1000; int a; - while (1) - a = 1 + 2; + while ((ch = getopt(argc, argv, "vn:i:")) != -1) { + switch (ch) { + case 'n': + repeats = atoi(optarg); + break; + case 'i': + interval = atoi(optarg); + break; + case 'v': + verbose = 1; + break; + default: + usage(); + } + } + argc -= optind; + argv += optind; + + while (repeats) { + a = (0xdeadbeef * 2) + -1; + if (verbose && 0 == (repeats % interval)) + printf("repeat: %d\n", repeats); + repeats--; + } + exit(0); +} + +static void +usage(void) +{ + (void) fprintf(stderr, "%s\n", + "usage: useCpu [-v] [-i interval] [-n count]"); } From owner-p4-projects@FreeBSD.ORG Wed Aug 16 08:40:32 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 705A416A4E9; Wed, 16 Aug 2006 08:40:32 +0000 (UTC) X-Original-To: perforce@FreeBSD.org 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 15FC416A4E7 for ; Wed, 16 Aug 2006 08:40:32 +0000 (UTC) (envelope-from cdjones@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 40F5C43D70 for ; Wed, 16 Aug 2006 08:40:29 +0000 (GMT) (envelope-from cdjones@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7G8eTJN033214 for ; Wed, 16 Aug 2006 08:40:29 GMT (envelope-from cdjones@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7G8eSsY033211 for perforce@freebsd.org; Wed, 16 Aug 2006 08:40:28 GMT (envelope-from cdjones@FreeBSD.org) Date: Wed, 16 Aug 2006 08:40:28 GMT Message-Id: <200608160840.k7G8eSsY033211@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to cdjones@FreeBSD.org using -f From: Chris Jones To: Perforce Change Reviews Cc: Subject: PERFORCE change 104192 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 16 Aug 2006 08:40:32 -0000 http://perforce.freebsd.org/chv.cgi?CH=104192 Change 104192 by cdjones@cdjones-impulse on 2006/08/16 08:39:53 Keep track of CPU usage per jail. NOTE: this crashes hard in schedcpu. Affected files ... .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/sched_hier.c#10 edit .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/jail.h#17 edit Differences ... ==== //depot/projects/soc2006/cdjones_jail/src/sys/kern/sched_hier.c#10 (text+ko) ==== @@ -178,6 +178,8 @@ #endif static uint32_t total_jail_sched_shares; +extern struct mtx allprison_mtx; +extern int prisoncount; static struct kproc_desc sched_kp = { "schedcpu", @@ -438,9 +440,22 @@ struct proc *p; struct kse *ke; struct ksegrp *kg; + struct prison *pr; int awake, realstathz; realstathz = stathz ? stathz : hz; + /* + * Need to acquire each jail's mutex and hold throughout to keep + * everything out while we recalculate per-jail CPU usage. + * TODO: this is excessively icky. + */ + mtx_lock(&allprison_mtx); + if (prisoncount) { + LIST_FOREACH(pr, &allprison, pr_list) { + mtx_lock(&pr->pr_mtx); + pr->pr_estcpu = 0; + } + } sx_slock(&allproc_lock); FOREACH_PROC_IN_SYSTEM(p) { /* @@ -526,6 +541,7 @@ if (kg->kg_slptime > 1) continue; kg->kg_estcpu = decay_cpu(loadfac, kg->kg_estcpu); + kg->kg_proc->p_ucred->cr_prison->pr_estcpu += kg->kg_estcpu; resetpriority(kg); FOREACH_THREAD_IN_GROUP(kg, td) { resetpriority_thread(td, kg); @@ -534,6 +550,12 @@ mtx_unlock_spin(&sched_lock); } /* end of process loop */ sx_sunlock(&allproc_lock); + if (prisoncount) { + LIST_FOREACH(pr, &allprison, pr_list) { + mtx_unlock(&pr->pr_mtx); + } + } + mtx_unlock(&allprison_mtx); } /* @@ -545,6 +567,7 @@ int nowake; struct prison *pr; u_int32_t nShares = 0; + u_int nCpu = 0; for (;;) { /* @@ -558,11 +581,13 @@ * doing it every second. */ nShares = 0; + nCpu = 0; LIST_FOREACH(pr, &allprison, pr_list) { - printf("schedcpu_thread: prison %p\n", &pr); - nShares += pr->pr_sched_shares; + printf("schedcpu_thread: prison %p\n", &pr); + nShares += pr->pr_sched_shares; + nCpu += pr->pr_estcpu; } - printf("schedcpu_thread: %d CPU shares total\n", nShares); + printf("schedcpu_thread: %d CPU shares total, %d CPU est. usage\n", nShares, nCpu); total_jail_sched_shares = nShares; schedcpu(); @@ -616,11 +641,13 @@ * soft limits available. Also, the amount of CPU time * reserved to unjailed processes really should be sysctl'd. */ - printf("resetpriority: reset KSE %p priority\n", &kg); + register unsigned int np = newpriority; newpriority *= pr->pr_sched_shares; KASSERT(0 != total_jail_sched_shares, "no jail sched shares when a jail exists?!"); newpriority /= 2*total_jail_sched_shares; + printf("resetpriority: reset KSE %p from %d to %d\n", + &kg, np, newpriority); } newpriority = min(max(newpriority, PRI_MIN_TIMESHARE), PRI_MAX_TIMESHARE); ==== //depot/projects/soc2006/cdjones_jail/src/sys/sys/jail.h#17 (text+ko) ==== @@ -100,6 +100,7 @@ struct task pr_task; /* (d) destroy task */ struct mtx pr_mtx; u_int32_t pr_sched_shares; /* (p) jail priority */ + u_int pr_estcpu; /* (p) est. cpu of jail */ struct proc *pr_scheduler; /* (c) scheduler pid */ int *pr_scheduler_flags_ptr; /* (p) communication to scheduler */ struct proc *pr_pager; /* (c) pager pid */ From owner-p4-projects@FreeBSD.ORG Wed Aug 16 12:36:00 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 51A4216A4DF; Wed, 16 Aug 2006 12:36:00 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 1596316A4DD for ; Wed, 16 Aug 2006 12:36:00 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 57DE443EC2 for ; Wed, 16 Aug 2006 12:32:25 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7GCWPF8057256 for ; Wed, 16 Aug 2006 12:32:25 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7GCWPv7057253 for perforce@freebsd.org; Wed, 16 Aug 2006 12:32:25 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Wed, 16 Aug 2006 12:32:25 GMT Message-Id: <200608161232.k7GCWPv7057253@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 104209 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 16 Aug 2006 12:36:00 -0000 http://perforce.freebsd.org/chv.cgi?CH=104209 Change 104209 by rwatson@rwatson_zoo on 2006/08/16 12:31:56 Comment no longer needed, values confirmed in OpenSolaris. Annotate meaning of constants. Affected files ... .. //depot/projects/trustedbsd/openbsm/bsm/libbsm.h#22 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/bsm/libbsm.h#22 (text+ko) ==== @@ -26,7 +26,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/bsm/libbsm.h#21 $ + * $P4: //depot/projects/trustedbsd/openbsm/bsm/libbsm.h#22 $ */ #ifndef _LIBBSM_H_ @@ -82,11 +82,10 @@ #define BSM_TEXTBUFSZ MAX_AUDITSTRING_LEN /* OpenSSH compatibility */ /* - * These are referenced in Solaris 9 au_open(3BSM); values are guesses. - * Provided for OpenSSH compatibility. + * Arguments to au_close(3). */ -#define AU_TO_NO_WRITE 0 -#define AU_TO_WRITE 1 +#define AU_TO_NO_WRITE 0 /* Abandon audit record. */ +#define AU_TO_WRITE 1 /* Commit audit record. */ __BEGIN_DECLS struct au_event_ent { From owner-p4-projects@FreeBSD.ORG Wed Aug 16 12:37:38 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9812516A4F4; Wed, 16 Aug 2006 12:37:37 +0000 (UTC) X-Original-To: perforce@FreeBSD.org 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 5988A16A567 for ; Wed, 16 Aug 2006 12:37:37 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2ED3F43F04 for ; Wed, 16 Aug 2006 12:33:27 +0000 (GMT) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7GCXRmh057441 for ; Wed, 16 Aug 2006 12:33:27 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7GCXQvt057438 for perforce@freebsd.org; Wed, 16 Aug 2006 12:33:26 GMT (envelope-from rdivacky@FreeBSD.org) Date: Wed, 16 Aug 2006 12:33:26 GMT Message-Id: <200608161233.k7GCXQvt057438@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rdivacky@FreeBSD.org using -f From: Roman Divacky To: Perforce Change Reviews Cc: Subject: PERFORCE change 104210 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 16 Aug 2006 12:37:38 -0000 http://perforce.freebsd.org/chv.cgi?CH=104210 Change 104210 by rdivacky@rdivacky_witten on 2006/08/16 12:33:05 Make it buildable. exec <-> exit Affected files ... .. //depot/projects/soc2006/rdivacky_linuxolator/kern/uipc_sem.c#4 edit Differences ... ==== //depot/projects/soc2006/rdivacky_linuxolator/kern/uipc_sem.c#4 (text+ko) ==== @@ -920,13 +920,13 @@ } static void -sem_exithook(void *arg, struct proc *p, struct image_params *imgp __unused) +sem_exechook(void *arg, struct proc *p, struct image_params *imgp __unused) { - sem_exechook(arg, p); + sem_exithook(arg, p); } static void -sem_exechook(void *arg, struct proc *p) +sem_exithook(void *arg, struct proc *p) { struct ksem *ks, *ksnext; @@ -958,7 +958,7 @@ p31b_setcfg(CTL_P1003_1B_SEM_VALUE_MAX, SEM_VALUE_MAX); sem_exit_tag = EVENTHANDLER_REGISTER(process_exit, sem_exithook, NULL, EVENTHANDLER_PRI_ANY); - sem_exec_tag = EVENTHANDLER_REGISTER(process_exec, sem_exithook, + sem_exec_tag = EVENTHANDLER_REGISTER(process_exec, sem_exechook, NULL, EVENTHANDLER_PRI_ANY); sem_fork_tag = EVENTHANDLER_REGISTER(process_fork, sem_forkhook, NULL, EVENTHANDLER_PRI_ANY); break; From owner-p4-projects@FreeBSD.ORG Wed Aug 16 12:38:51 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9516816A513; Wed, 16 Aug 2006 12:38:51 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 4A5B816A510 for ; Wed, 16 Aug 2006 12:38:51 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 895D343E0F for ; Wed, 16 Aug 2006 12:34:34 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7GCYUvm057467 for ; Wed, 16 Aug 2006 12:34:30 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7GCYSAu057464 for perforce@freebsd.org; Wed, 16 Aug 2006 12:34:28 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Wed, 16 Aug 2006 12:34:28 GMT Message-Id: <200608161234.k7GCYSAu057464@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 104211 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 16 Aug 2006 12:38:52 -0000 http://perforce.freebsd.org/chv.cgi?CH=104211 Change 104211 by rwatson@rwatson_zoo on 2006/08/16 12:33:42 Rename MAX_ARGS and MAX_ENV by inserting BSM_ in front, in order to reduce the chances of a name space collision. Affected files ... .. //depot/projects/trustedbsd/openbsm/bsm/libbsm.h#23 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/bsm/libbsm.h#23 (text+ko) ==== @@ -26,7 +26,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/bsm/libbsm.h#22 $ + * $P4: //depot/projects/trustedbsd/openbsm/bsm/libbsm.h#23 $ */ #ifndef _LIBBSM_H_ @@ -37,8 +37,8 @@ * solely to allow OpenSSH to compile; Darwin/Apple code should not use them. */ -#define MAX_ARGS 10 -#define MAX_ENV 10 +#define BSM_MAX_ARGS 10 +#define BSM_MAX_ENV 10 #include #include @@ -227,7 +227,7 @@ */ typedef struct { u_int32_t count; - char *text[MAX_ARGS]; + char *text[BSM_MAX_ARGS]; } au_execarg_t; /* @@ -236,7 +236,7 @@ */ typedef struct { u_int32_t count; - char *text[MAX_ENV]; + char *text[BSM_MAX_ENV]; } au_execenv_t; /* From owner-p4-projects@FreeBSD.ORG Wed Aug 16 12:44:31 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B817916A4FB; Wed, 16 Aug 2006 12:44:31 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 79A7F16A4DE for ; Wed, 16 Aug 2006 12:44:31 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B8B0E43DC4 for ; Wed, 16 Aug 2006 12:43:43 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7GChhnr057959 for ; Wed, 16 Aug 2006 12:43:43 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7GChhD1057956 for perforce@freebsd.org; Wed, 16 Aug 2006 12:43:43 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Wed, 16 Aug 2006 12:43:43 GMT Message-Id: <200608161243.k7GChhD1057956@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 104212 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 16 Aug 2006 12:44:32 -0000 http://perforce.freebsd.org/chv.cgi?CH=104212 Change 104212 by rwatson@rwatson_zoo on 2006/08/16 12:42:40 Remove unused data type. Affected files ... .. //depot/projects/trustedbsd/openbsm/bsm/libbsm.h#24 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/bsm/libbsm.h#24 (text+ko) ==== @@ -26,7 +26,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/bsm/libbsm.h#23 $ + * $P4: //depot/projects/trustedbsd/openbsm/bsm/libbsm.h#24 $ */ #ifndef _LIBBSM_H_ @@ -38,7 +38,7 @@ */ #define BSM_MAX_ARGS 10 -#define BSM_MAX_ENV 10 +#define BSM_MAX_ENV 10 #include #include @@ -137,15 +137,6 @@ __BEGIN_DECLS -/* - * Internal representation of audit user in libnsl. - */ -typedef struct au_user_str_s { - char *au_name; - char *au_always; - char *au_never; -} au_user_str_t; - typedef struct au_tid32 { u_int32_t port; u_int32_t addr; From owner-p4-projects@FreeBSD.ORG Wed Aug 16 12:45:11 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C1CD816A4E6; Wed, 16 Aug 2006 12:45:11 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 8879216A4DA for ; Wed, 16 Aug 2006 12:45:11 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 99DD543D58 for ; Wed, 16 Aug 2006 12:44:55 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7GCij7K057998 for ; Wed, 16 Aug 2006 12:44:45 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7GCijNS057995 for perforce@freebsd.org; Wed, 16 Aug 2006 12:44:45 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Wed, 16 Aug 2006 12:44:45 GMT Message-Id: <200608161244.k7GCijNS057995@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 104213 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 16 Aug 2006 12:45:12 -0000 http://perforce.freebsd.org/chv.cgi?CH=104213 Change 104213 by rwatson@rwatson_zoo on 2006/08/16 12:43:52 Update comment: yes it does. Affected files ... .. //depot/projects/trustedbsd/openbsm/bsm/libbsm.h#25 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/bsm/libbsm.h#25 (text+ko) ==== @@ -26,7 +26,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/bsm/libbsm.h#24 $ + * $P4: //depot/projects/trustedbsd/openbsm/bsm/libbsm.h#25 $ */ #ifndef _LIBBSM_H_ @@ -719,8 +719,6 @@ /* * Functions relating to querying audit event information. - * - * XXXRW: getauevnonam() has no _r version? */ void setauevent(void); void endauevent(void); From owner-p4-projects@FreeBSD.ORG Wed Aug 16 12:48:51 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AE72B16A4DF; Wed, 16 Aug 2006 12:48:51 +0000 (UTC) X-Original-To: perforce@FreeBSD.org 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 56B0516A4DD for ; Wed, 16 Aug 2006 12:48:51 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1AA6A43D45 for ; Wed, 16 Aug 2006 12:48:51 +0000 (GMT) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7GCmopg065951 for ; Wed, 16 Aug 2006 12:48:50 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7GCmod7065948 for perforce@freebsd.org; Wed, 16 Aug 2006 12:48:50 GMT (envelope-from rdivacky@FreeBSD.org) Date: Wed, 16 Aug 2006 12:48:50 GMT Message-Id: <200608161248.k7GCmod7065948@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rdivacky@FreeBSD.org using -f From: Roman Divacky To: Perforce Change Reviews Cc: Subject: PERFORCE change 104214 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 16 Aug 2006 12:48:51 -0000 http://perforce.freebsd.org/chv.cgi?CH=104214 Change 104214 by rdivacky@rdivacky_witten on 2006/08/16 12:48:16 Change futex lock from mutex to sx. Make futex_get atomic (protected by the futex lock). Affected files ... .. //depot/projects/soc2006/rdivacky_linuxolator/amd64/linux32/linux32_sysvec.c#8 edit .. //depot/projects/soc2006/rdivacky_linuxolator/compat/linux/linux_futex.c#28 edit .. //depot/projects/soc2006/rdivacky_linuxolator/i386/linux/linux_sysvec.c#17 edit Differences ... ==== //depot/projects/soc2006/rdivacky_linuxolator/amd64/linux32/linux32_sysvec.c#8 (text+ko) ==== @@ -124,7 +124,7 @@ static void linux32_fixlimits(struct proc *p); extern LIST_HEAD(futex_list, futex) futex_list; -extern struct mtx futex_mtx; +extern struct sx futex_sx; static eventhandler_tag linux_exit_tag; static eventhandler_tag linux_schedtail_tag; @@ -1079,7 +1079,7 @@ linux_device_register_handler(*ldhp); sx_init(&emul_shared_lock, "emuldata->shared lock"); LIST_INIT(&futex_list); - mtx_init(&futex_mtx, "futex protection lock", NULL, MTX_DEF); + sx_init(&futex_sx, "futex protection lock"); linux_exit_tag = EVENTHANDLER_REGISTER(process_exit, linux_proc_exit, NULL, 1000); linux_schedtail_tag = EVENTHANDLER_REGISTER(schedtail, linux_schedtail, @@ -1109,7 +1109,7 @@ linux_device_unregister_handler(*ldhp); sx_destroy(&emul_lock); sx_destroy(&emul_shared_lock); - mtx_destroy(&futex_mtx); + sx_destroy(&futex_sx); EVENTHANDLER_DEREGISTER(process_exit, linux_exit_tag); EVENTHANDLER_DEREGISTER(schedtail, linux_schedtail_tag); EVENTHANDLER_DEREGISTER(process_exec, linux_exec_tag); ==== //depot/projects/soc2006/rdivacky_linuxolator/compat/linux/linux_futex.c#28 (text+ko) ==== @@ -47,6 +47,7 @@ #include #include #include +#include #include #ifdef COMPAT_LINUX32 @@ -73,10 +74,10 @@ }; LIST_HEAD(futex_list, futex) futex_list; -struct mtx futex_mtx; /* this protects the LIST of futexes */ +struct sx futex_sx; /* this protects the LIST of futexes */ -#define FUTEX_LOCK mtx_lock(&futex_mtx) -#define FUTEX_UNLOCK mtx_unlock(&futex_mtx) +#define FUTEX_LOCK sx_xlock(&futex_sx) +#define FUTEX_UNLOCK sx_xunlock(&futex_sx) #define FUTEX_LOCKED 1 #define FUTEX_UNLOCKED 0 @@ -339,13 +340,8 @@ return f; } } - if (locked == FUTEX_UNLOCKED) - FUTEX_UNLOCK; - /* Not found, create it */ f = malloc(sizeof(*f), M_LINUX, M_WAITOK); - if (locked == FUTEX_UNLOCKED) - FUTEX_LOCK; f->f_uaddr = uaddr; f->f_refcount = 1; TAILQ_INIT(&f->f_waiting_proc); ==== //depot/projects/soc2006/rdivacky_linuxolator/i386/linux/linux_sysvec.c#17 (text+ko) ==== @@ -108,7 +108,7 @@ u_long stack, u_long ps_strings); extern LIST_HEAD(futex_list, futex) futex_list; -extern struct mtx futex_mtx; +extern struct sx futex_sx; static eventhandler_tag linux_exit_tag; static eventhandler_tag linux_schedtail_tag; @@ -920,7 +920,7 @@ sx_init(&emul_lock, "emuldata lock"); sx_init(&emul_shared_lock, "emuldata->shared lock"); LIST_INIT(&futex_list); - mtx_init(&futex_mtx, "futex protection lock", NULL, MTX_DEF); + sx_init(&futex_sx, "futex protection lock"); linux_exit_tag = EVENTHANDLER_REGISTER(process_exit, linux_proc_exit, NULL, 1000); linux_schedtail_tag = EVENTHANDLER_REGISTER(schedtail, linux_schedtail, @@ -950,7 +950,7 @@ linux_device_unregister_handler(*ldhp); sx_destroy(&emul_lock); sx_destroy(&emul_shared_lock); - mtx_destroy(&futex_mtx); + sx_destroy(&futex_sx); EVENTHANDLER_DEREGISTER(process_exit, linux_exit_tag); EVENTHANDLER_DEREGISTER(schedtail, linux_schedtail_tag); EVENTHANDLER_DEREGISTER(process_exec, linux_exec_tag); From owner-p4-projects@FreeBSD.ORG Wed Aug 16 12:50:55 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DCC6A16A4E2; Wed, 16 Aug 2006 12:50:54 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 B080E16A4DA for ; Wed, 16 Aug 2006 12:50:54 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7ADE143D49 for ; Wed, 16 Aug 2006 12:50:54 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7GCosP0066115 for ; Wed, 16 Aug 2006 12:50:54 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7GCosTX066109 for perforce@freebsd.org; Wed, 16 Aug 2006 12:50:54 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Wed, 16 Aug 2006 12:50:54 GMT Message-Id: <200608161250.k7GCosTX066109@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 104215 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 16 Aug 2006 12:50:55 -0000 http://perforce.freebsd.org/chv.cgi?CH=104215 Change 104215 by rwatson@rwatson_zoo on 2006/08/16 12:50:19 Improve annotation of Apple-specific APIs. Affected files ... .. //depot/projects/trustedbsd/openbsm/bsm/libbsm.h#26 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/bsm/libbsm.h#26 (text+ko) ==== @@ -26,7 +26,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/bsm/libbsm.h#25 $ + * $P4: //depot/projects/trustedbsd/openbsm/bsm/libbsm.h#26 $ */ #ifndef _LIBBSM_H_ @@ -758,6 +758,11 @@ char *del, char raw, char sfrm); __END_DECLS +/* + * The remaining APIs are associated with Apple's BSM implementation, in + * particular as relates to Mach IPC auditing and triggers passed via Mach + * IPC. + */ #ifdef __APPLE__ #include From owner-p4-projects@FreeBSD.ORG Wed Aug 16 13:09:20 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7DD3516A4E1; Wed, 16 Aug 2006 13:09:20 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 56DB716A4DE for ; Wed, 16 Aug 2006 13:09:20 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A4EBC43D55 for ; Wed, 16 Aug 2006 13:09:19 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7GD9JXX068300 for ; Wed, 16 Aug 2006 13:09:19 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7GD9JFg068296 for perforce@freebsd.org; Wed, 16 Aug 2006 13:09:19 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Wed, 16 Aug 2006 13:09:19 GMT Message-Id: <200608161309.k7GD9JFg068296@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 104216 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 16 Aug 2006 13:09:20 -0000 http://perforce.freebsd.org/chv.cgi?CH=104216 Change 104216 by rwatson@rwatson_zoo on 2006/08/16 13:09:12 When operating in record generation mode, generate records and not tokens. This change must have gotten lost somewhere between keyboard and perforce. Add record generation for a few more types. Affected files ... .. //depot/projects/trustedbsd/openbsm/test/bsm/generate.c#5 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/test/bsm/generate.c#5 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/test/bsm/generate.c#4 $ + * $P4: //depot/projects/trustedbsd/openbsm/test/bsm/generate.c#5 $ */ /* @@ -144,6 +144,17 @@ write_token(directory, token_filename, file_token); } +static void +generate_file_record(const char *directory, const char *record_filename) +{ + token_t *file_token; + + file_token = au_to_file("test", file_token_timeval); + if (file_token == NULL) + err(EX_UNAVAILABLE, "au_to_file"); + write_record(directory, record_filename, file_token, AUE_NULL); +} + /* * AUT_OHEADER */ @@ -326,6 +337,32 @@ write_token(directory, buf, subject32ex_token); } +static void +generate_subject32ex_record(const char *directory, const char *record_filename, + u_int32_t type) +{ + token_t *subject32ex_token; + char *buf; + + buf = (char *)malloc(strlen(record_filename) + 6); + if (type == AU_IPv6) { + inet_pton(AF_INET6, "fe80::1", subject32_tid_addr.at_addr); + subject32_tid_addr.at_type = AU_IPv6; + sprintf(buf, "%s%s", record_filename, "-IPv6"); + } else { + subject32_tid_addr.at_addr[0] = inet_addr("127.0.0.1"); + subject32_tid_addr.at_type = AU_IPv4; + sprintf(buf, "%s%s", record_filename, "-IPv4"); + } + + subject32ex_token = au_to_subject32_ex(subject32_auid, subject32_euid, + subject32_egid, subject32_ruid, subject32_rgid, subject32_pid, + subject32_sid, &subject32_tid_addr); + if (subject32ex_token == NULL) + err(EX_UNAVAILABLE, "au_to_subject32_ex"); + write_record(directory, record_filename, subject32ex_token, AUE_NULL); +} + static au_id_t process32_auid = 0x12345678; static uid_t process32_euid = 0x01234567; static gid_t process32_egid = 0x23456789; @@ -382,6 +419,22 @@ write_token(directory, token_filename, process32ex_token); } +static void +generate_process32ex_record(const char *directory, const char *record_filename) +{ + token_t *process32ex_token; + + process32_tid_addr.at_addr[0] = inet_addr("127.0.0.1"); + process32_tid_addr.at_type = AU_IPv4; + + process32ex_token = au_to_process32_ex(process32_auid, process32_euid, + process32_egid, process32_ruid, process32_rgid, process32_pid, + process32_sid, &process32_tid_addr); + if (process32ex_token == NULL) + err(EX_UNAVAILABLE, "au_to_process32_ex"); + write_record(directory, record_filename, process32ex_token, AUE_NULL); +} + static char return32_status = 0xd7; static uint32_t return32_ret = 0x12345678; @@ -777,29 +830,29 @@ } if (do_records) { - generate_file_token(directory, "file_token"); - generate_trailer_token(directory, "trailer_token"); - generate_header32_token(directory, "header32_token"); - generate_data_token(directory, "data_record"); - generate_ipc_token(directory, "ipc_record"); - generate_path_token(directory, "path_record"); - generate_subject32_token(directory, "subject32_record"); - generate_subject32ex_token(directory, "subject32ex_record", AU_IPv4); - generate_subject32ex_token(directory, "subject32ex_record", AU_IPv6); - generate_process32_token(directory, "process32_record"); - generate_process32ex_token(directory, "process32ex_token"); - generate_return32_token(directory, "return32_record"); - generate_text_token(directory, "text_record"); - generate_opaque_token(directory, "opaque_record"); - generate_in_addr_token(directory, "in_addr_record"); - generate_ip_token(directory, "ip_record"); - generate_iport_token(directory, "iport_record"); - generate_arg32_token(directory, "arg32_record"); - generate_seq_token(directory, "seq_record"); - generate_attr_token(directory, "attr_record"); - generate_ipc_perm_token(directory, "ipc_perm_record"); - generate_groups_token(directory, "groups_record"); - generate_attr32_token(directory, "attr32_record"); + generate_file_record(directory, "file_record"); + generate_data_record(directory, "data_record"); + generate_ipc_record(directory, "ipc_record"); + generate_path_record(directory, "path_record"); + generate_subject32_record(directory, "subject32_record"); + generate_subject32ex_record(directory, "subject32ex_record", + AU_IPv4); + generate_subject32ex_record(directory, "subject32ex_record", + AU_IPv6); + generate_process32_record(directory, "process32_record"); + generate_process32ex_record(directory, "process32ex_record"); + generate_return32_record(directory, "return32_record"); + generate_text_record(directory, "text_record"); + generate_opaque_record(directory, "opaque_record"); + generate_in_addr_record(directory, "in_addr_record"); + generate_ip_record(directory, "ip_record"); + generate_iport_record(directory, "iport_record"); + generate_arg32_record(directory, "arg32_record"); + generate_seq_record(directory, "seq_record"); + generate_attr_record(directory, "attr_record"); + generate_ipc_perm_record(directory, "ipc_perm_record"); + generate_groups_record(directory, "groups_record"); + generate_attr32_record(directory, "attr32_record"); } return (0); From owner-p4-projects@FreeBSD.ORG Wed Aug 16 13:10:21 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B88C316A4E7; Wed, 16 Aug 2006 13:10:21 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 9270716A4FA for ; Wed, 16 Aug 2006 13:10:21 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5B9CE43D45 for ; Wed, 16 Aug 2006 13:10:21 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7GDALKV068439 for ; Wed, 16 Aug 2006 13:10:21 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7GDALB1068436 for perforce@freebsd.org; Wed, 16 Aug 2006 13:10:21 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Wed, 16 Aug 2006 13:10:21 GMT Message-Id: <200608161310.k7GDALB1068436@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 104217 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 16 Aug 2006 13:10:22 -0000 http://perforce.freebsd.org/chv.cgi?CH=104217 Change 104217 by rwatson@rwatson_zoo on 2006/08/16 13:09:57 Provide MAXAUDITATA constant, as documented in audit.2, and use it in preference in the include file. Bump the maximum record limit up to OpenSolaris's default, as argument/environmental data can be quite large. Affected files ... .. //depot/projects/trustedbsd/openbsm/bsm/audit.h#18 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/bsm/audit.h#18 (text+ko) ==== @@ -30,7 +30,7 @@ * * @APPLE_BSD_LICENSE_HEADER_END@ * - * $P4: //depot/projects/trustedbsd/openbsm/bsm/audit.h#17 $ + * $P4: //depot/projects/trustedbsd/openbsm/bsm/audit.h#18 $ */ #ifndef _BSM_AUDIT_H @@ -38,7 +38,8 @@ #define AUDIT_RECORD_MAGIC 0x828a0f1b #define MAX_AUDIT_RECORDS 20 -#define MAX_AUDIT_RECORD_SIZE 4096 +#define MAXAUDITDATA (0x8000 - 1) +#define MAX_AUDIT_RECORD_SIZE MAXAUDITDATA #define MIN_AUDIT_FILE_SIZE (512 * 1024) /* From owner-p4-projects@FreeBSD.ORG Wed Aug 16 13:14:27 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8D53A16A4DF; Wed, 16 Aug 2006 13:14:27 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 62BF216A4DA for ; Wed, 16 Aug 2006 13:14:27 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 127CF43D46 for ; Wed, 16 Aug 2006 13:14:27 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7GDEQOA068735 for ; Wed, 16 Aug 2006 13:14:26 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7GDEQQx068732 for perforce@freebsd.org; Wed, 16 Aug 2006 13:14:26 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Wed, 16 Aug 2006 13:14:26 GMT Message-Id: <200608161314.k7GDEQQx068732@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 104218 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 16 Aug 2006 13:14:27 -0000 http://perforce.freebsd.org/chv.cgi?CH=104218 Change 104218 by rwatson@rwatson_zoo on 2006/08/16 13:13:52 Clean up audit.h some more: expand/fix comments, remove old world order flags. Affected files ... .. //depot/projects/trustedbsd/openbsm/bsm/audit.h#19 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/bsm/audit.h#19 (text+ko) ==== @@ -30,7 +30,7 @@ * * @APPLE_BSD_LICENSE_HEADER_END@ * - * $P4: //depot/projects/trustedbsd/openbsm/bsm/audit.h#18 $ + * $P4: //depot/projects/trustedbsd/openbsm/bsm/audit.h#19 $ */ #ifndef _BSM_AUDIT_H @@ -43,7 +43,7 @@ #define MIN_AUDIT_FILE_SIZE (512 * 1024) /* - * Triggers for the audit daemon + * Triggers for the audit daemon. */ #define AUDIT_TRIGGER_MIN 1 #define AUDIT_TRIGGER_LOW_SPACE 1 @@ -54,7 +54,8 @@ #define AUDIT_TRIGGER_MAX 5 /* - * File that will be read for trigger events from the kernel + * Special file that will be read for trigger events from the kernel + * (FreeBSD). */ #define AUDIT_TRIGGER_FILE "/dev/audit" @@ -102,7 +103,7 @@ #define AU_ALL 0xffffffff /* - * IPC types + * IPC types. */ #define AT_IPC_MSG ((u_char)1) /* Message IPC id. */ #define AT_IPC_SEM ((u_char)2) /* Semaphore IPC id. */ @@ -147,23 +148,10 @@ /* * Audit policy controls. */ -#ifdef OLD_WORLD_ORDER #define AUDIT_CNT 0x0001 #define AUDIT_AHLT 0x0002 #define AUDIT_ARGV 0x0004 #define AUDIT_ARGE 0x0008 -#define AUDIT_PASSWD 0x0010 -#define AUDIT_SEQ 0x0020 -#define AUDIT_WINDATA 0x0040 -#define AUDIT_USER 0x0080 -#define AUDIT_GROUP 0x0100 -#define AUDIT_TRAIL 0x0200 -#define AUDIT_PATH 0x0400 -#else /* !OLD_WORLD_ORDER */ -#define AUDIT_CNT 0x0001 -#define AUDIT_AHLT 0x0002 -#define AUDIT_ARGV 0x0004 -#define AUDIT_ARGE 0x0008 #define AUDIT_SEQ 0x0010 #define AUDIT_WINDATA 0x0020 #define AUDIT_USER 0x0040 @@ -174,10 +162,9 @@ #define AUDIT_PUBLIC 0x0800 #define AUDIT_ZONENAME 0x1000 #define AUDIT_PERZONE 0x2000 -#endif /* !OLD_WORLD_ORDER */ /* - * Audit queue control parameters + * Audit queue control parameters. */ #define AQ_HIWATER 100 #define AQ_MAXHIGH 10000 From owner-p4-projects@FreeBSD.ORG Wed Aug 16 13:30:49 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 276C116A4E6; Wed, 16 Aug 2006 13:30:49 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 DDF1C16A4E2 for ; Wed, 16 Aug 2006 13:30:48 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id ECFA143D4C for ; Wed, 16 Aug 2006 13:30:47 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7GDUlOU069629 for ; Wed, 16 Aug 2006 13:30:47 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7GDUls2069626 for perforce@freebsd.org; Wed, 16 Aug 2006 13:30:47 GMT (envelope-from millert@freebsd.org) Date: Wed, 16 Aug 2006 13:30:47 GMT Message-Id: <200608161330.k7GDUls2069626@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 104219 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 16 Aug 2006 13:30:49 -0000 http://perforce.freebsd.org/chv.cgi?CH=104219 Change 104219 by millert@millert_macbook on 2006/08/16 13:30:07 Introduce a reference count to struct mac_label_element so that we don't have to loop through every policy in mac_policy_removefrom_labellist() to tell whether or not another policy is interested in the label namespace. Affected files ... .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_base.c#3 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_internal.h#3 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_base.c#3 (text+ko) ==== @@ -518,6 +518,7 @@ LIST_FOREACH(mle, &mac_static_label_element_list, mle_list) { if (strcmp(name, mle->mle_name) == 0) { + /* ref count unused for static list */ found = TRUE; break; } @@ -526,12 +527,14 @@ LIST_FOREACH(mle, &mac_label_element_list, mle_list) { if (strcmp(name, mle->mle_name) == 0) { + mle->mle_refs++; found = TRUE; break; } } if (!found) { strcpy(new_mles[midx]->mle_name, name); + new_mles[midx]->mle_refs = 1; LIST_INSERT_HEAD(list, new_mles[midx], mle_list); midx++; @@ -556,10 +559,8 @@ mac_policy_removefrom_labellist(struct mac_policy_conf *mpc) { struct mac_label_element *mle; - struct mac_policy_conf *lmpc; - const char *name, *name2; - u_int idx, idx2; - int found; + const char *name; + u_int idx; if (mpc->mpc_labelnames == NULL) return; @@ -567,7 +568,8 @@ if (mpc->mpc_labelname_count == 0) return; - /* Check each label namespace managed by the policy and remove + /* + * Check each label namespace managed by the policy and remove * it from the non-static list only if no other policy is interested * in that label namespace. */ @@ -575,33 +577,15 @@ mac_policy_grab_exclusive(); for (idx = 0; idx < mpc->mpc_labelname_count; idx++) { name = mpc->mpc_labelnames[idx]; - found = FALSE; - LIST_FOREACH(lmpc, &mac_static_policy_list, mpc_list) - for (idx2 = 0; idx2 < lmpc->mpc_labelname_count; - idx2++) { - name2 = lmpc->mpc_labelnames[idx2]; - if (strcmp(name, name2) == 0) { - found = TRUE; - break; - } - } - if (!found) /* No 'static' policy manages the namespace */ - LIST_FOREACH(lmpc, &mac_policy_list, mpc_list) - for (idx2 = 0; idx2 < lmpc->mpc_labelname_count; - idx2++) { - name2 = lmpc->mpc_labelnames[idx2]; - if (strcmp(name, name2) == 0) { - found = TRUE; - break; - } - } - - if (!found) /* No policy manages this namespace */ - LIST_FOREACH(mle, &mac_label_element_list, mle_list) - if (strcmp(name, mle->mle_name) == 0) { + LIST_FOREACH(mle, &mac_label_element_list, mle_list) { + if (strcmp(name, mle->mle_name) == 0) { + if (--mle->mle_refs == 0) { LIST_REMOVE(mle, mle_list); FREE(mle, M_MACTEMP); } + break; + } + } } if (mac_late) mac_policy_release_exclusive(); ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_internal.h#3 (text+ko) ==== @@ -80,6 +80,7 @@ * Type of list used to manage label namespace names. */ struct mac_label_element { + int mle_refs; char mle_name[MAC_MAX_LABEL_ELEMENT_NAME]; LIST_ENTRY(mac_label_element) mle_list; }; From owner-p4-projects@FreeBSD.ORG Wed Aug 16 13:34:22 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6BA6716A4E8; Wed, 16 Aug 2006 13:34:22 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 43B6116A53A for ; Wed, 16 Aug 2006 13:34:22 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3592D43DCD for ; Wed, 16 Aug 2006 13:34:08 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7GDXqXJ069897 for ; Wed, 16 Aug 2006 13:33:52 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7GDXqEA069894 for perforce@freebsd.org; Wed, 16 Aug 2006 13:33:52 GMT (envelope-from millert@freebsd.org) Date: Wed, 16 Aug 2006 13:33:52 GMT Message-Id: <200608161333.k7GDXqEA069894@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 104220 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 16 Aug 2006 13:34:23 -0000 http://perforce.freebsd.org/chv.cgi?CH=104220 Change 104220 by millert@millert_macbook on 2006/08/16 13:33:44 Include userspace avc in libselinux Affected files ... .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/src/Makefile#3 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/src/avc.c#3 edit .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/src/avc_internal.c#3 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/src/Makefile#3 (text+ko) ==== @@ -4,21 +4,20 @@ -I../include -I../../libsepol/include -I../../libsecompat -Wall LIB = selinux -OBJS = booleans.o canonicalize_context.o checkAccess.o check_context.o \ - compute_av.o compute_create.o compute_member.o compute_relabel.o \ - compute_user.o context.o disable.o enabled.o fgetfilecon.o freecon.o \ - freeconary.o fsetfilecon.o get_context_list.o get_default_type.o \ - get_file_contexts.o getcon.o getenforce.o getexeccon.o getfilecon.o \ - getpeercon.o getpidcon.o getprevcon.o init.o is_customizable_type.o \ - lgetfilecon.o load_migscs.o load_policy.o lsetfilecon.o \ - matchmediacon.o matchpathcon.o policyvers.o query_user_context.o \ - sedarwin_config.o setcon.o setenforce.o setfilecon.o \ - setrans_client.o seusers.o +OBJS = + avc.o avc_internal.o avc_sidtab.o booleans.o canonicalize_context.o \ + checkAccess.o check_context.o compute_av.o compute_create.o \ + compute_member.o compute_relabel.o compute_user.o context.o \ + disable.o enabled.o fgetfilecon.o freecon.o freeconary.o \ + fsetfilecon.o get_context_list.o get_default_type.o \ + get_file_contexts.o getcon.o getenforce.o getexeccon.o \ + getfilecon.o getpeercon.o getpidcon.o getprevcon.o init.o \ + is_customizable_type.o lgetfilecon.o load_migscs.o load_policy.o \ + lsetfilecon.o matchmediacon.o matchpathcon.o policyvers.o \ + query_user_context.o sedarwin_config.o setcon.o setenforce.o \ + setfilecon.o setrans_client.o seusers.o -# The user-space AVC is not currently built -#OBJS += avc.o avc_internal.o avc_sidtab.o - -# The following require support for fs and exec contexts +# The following require kernel support for fs and exec contexts #OBJS += getfscreatecon.o setfscreatecon.o setexeccon.o # The following are Linux-specific ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/src/avc.c#3 (text+ko) ==== @@ -186,7 +186,9 @@ struct avc_callback_node *next; }; +#ifdef __linux__ static void *avc_netlink_thread = NULL; +#endif static void *avc_lock = NULL; static void *avc_log_lock = NULL; static struct avc_node *avc_node_freelist = NULL; @@ -306,6 +308,7 @@ } avc_enforcing = rc; +#ifdef __linux__ rc = avc_netlink_open(avc_using_threads); if (rc < 0) { avc_log("%s: can't open netlink socket: %d (%s)\n", avc_prefix, @@ -316,6 +319,7 @@ avc_netlink_thread = avc_create_thread(&avc_netlink_loop); avc_netlink_trouble = 0; } +#endif out: return rc; } @@ -672,9 +676,11 @@ avc_get_lock(avc_lock); +#ifdef __linux__ if (avc_using_threads) avc_stop_thread(avc_netlink_thread); avc_netlink_close(); +#endif for (i = 0; i < AVC_CACHE_SLOTS; i++) { node = avc_cache.slots[i]; @@ -901,9 +907,11 @@ access_vector_t denied; struct avc_entry_ref ref; +#ifdef __linux__ if (!avc_using_threads) { (void)avc_netlink_check_nb(); } +#endif if (!aeref) { avc_entry_ref_init(&ref); ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/src/avc_internal.c#3 (text+ko) ==== @@ -16,9 +16,11 @@ #include #include #include -//#include +#ifdef __linux__ +#include #include #include "selinux_netlink.h" +#endif #include "avc_internal.h" #ifndef NETLINK_SELINUX @@ -44,6 +46,8 @@ /* message prefix string and avc enforcing mode */ char avc_prefix[AVC_PREFIX_SIZE] = "uavc"; int avc_enforcing = 1; + +#ifdef __linux__ int avc_netlink_trouble = 0; /* netlink socket code */ @@ -294,3 +298,4 @@ avc_log("%s: netlink thread: errors encountered, terminating\n", avc_prefix); } +#endif /* __linux__ */ From owner-p4-projects@FreeBSD.ORG Wed Aug 16 13:34:54 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8380A16A4EB; Wed, 16 Aug 2006 13:34:54 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 617DD16A4E1 for ; Wed, 16 Aug 2006 13:34:54 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 23C6C43D4C for ; Wed, 16 Aug 2006 13:34:54 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7GDYsU5069960 for ; Wed, 16 Aug 2006 13:34:54 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7GDYr5d069957 for perforce@freebsd.org; Wed, 16 Aug 2006 13:34:53 GMT (envelope-from millert@freebsd.org) Date: Wed, 16 Aug 2006 13:34:53 GMT Message-Id: <200608161334.k7GDYr5d069957@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 104221 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 16 Aug 2006 13:34:54 -0000 http://perforce.freebsd.org/chv.cgi?CH=104221 Change 104221 by millert@millert_macbook on 2006/08/16 13:34:52 asort() is a gawk extension, use the qsort() function from the awk book instead. Affected files ... .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/flask/mkaccess_vector.sh#2 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/refpolicy/policy/flask/mkaccess_vector.sh#2 (text+ko) ==== @@ -15,6 +15,23 @@ av_perm_to_string="av_perm_to_string.h" cat $* | $awk " + # Quicksort function for awk arrays, from The AWK Programming + # Language, by Aho, Kernighan and Weinberger. + # Call qsort(array, smallestindex, largestindex) + function qsort(a,left,right, i,last) { + if (left >= right) return + swap(a, left, left + int((right-left+1)*rand())) + last = left + for (i=left+1; i<=right; i++) + if (a[i] < a[left]) swap(a, ++last, i) + swap(a, left, last) + qsort(a, left, last-1) + qsort(a, last+1, right) + } + function swap(a,i,j, t) { + t = a[i]; a[i] = a[j]; a[j] = t; + } + BEGIN { outfile = \"$av_permissions\" inheritfile = \"$av_inherit\" @@ -102,12 +119,12 @@ } } - j = 1; + n = 0; for (i in inherited_perms) { - ind[j] = i + 0; - j++; + n++; + ind[n] = i + 0; } - n = asort(ind); + qsort(ind, 1, n); for (i = 1; i <= n; i++) { perm = inherited_perms[ind[i]]; printf("#define %s__%s", toupper(tclass), toupper(perm)) > outfile; From owner-p4-projects@FreeBSD.ORG Wed Aug 16 13:36:59 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D818316A4DF; Wed, 16 Aug 2006 13:36:58 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 9A54B16A4DD for ; Wed, 16 Aug 2006 13:36:58 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 341D443D49 for ; Wed, 16 Aug 2006 13:36:57 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7GDavv2070116 for ; Wed, 16 Aug 2006 13:36:57 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7GDauim070113 for perforce@freebsd.org; Wed, 16 Aug 2006 13:36:56 GMT (envelope-from millert@freebsd.org) Date: Wed, 16 Aug 2006 13:36:56 GMT Message-Id: <200608161336.k7GDauim070113@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 104222 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 16 Aug 2006 13:36:59 -0000 http://perforce.freebsd.org/chv.cgi?CH=104222 Change 104222 by millert@millert_macbook on 2006/08/16 13:36:47 Do not assume that all typedefs in mac_policy.h refer to entrypoints. Affected files ... .. //depot/projects/trustedbsd/sedarwin8/policies/count/Makefile#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/stacktrace/module/Makefile#2 edit .. //depot/projects/trustedbsd/sedarwin8/policies/stub/Makefile#2 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/policies/count/Makefile#2 (text+ko) ==== @@ -16,7 +16,7 @@ policy.in: $(EXPORT_HDRS)/security/security/mac_policy.h @cpp $(DARWIN_HDRS) -P $< \ | grep -v ^\$ \ - | awk 'RS=";" { if ($$1 == "typedef") { print $$0";" } }' \ + | awk 'RS=";" { if ($$1 == "typedef" && $$0 ~ /\(/) { print $$0";" } }' \ | tr -d "\n\t" \ | tr ";" "\n" \ | sed -e 's/typedef //g' \ ==== //depot/projects/trustedbsd/sedarwin8/policies/stacktrace/module/Makefile#2 (text+ko) ==== @@ -18,7 +18,7 @@ policy.in: $(EXPORT_HDRS)/security/security/mac_policy.h @cpp $(DARWIN_HDRS) -P $< \ | grep -v ^\$ \ - | awk 'RS=";" { if ($$1 == "typedef") { print $$0";" } }' \ + | awk 'RS=";" { if ($$1 == "typedef" && $$0 ~ /\(/) { print $$0";" } }' \ | tr -d "\n\t" \ | tr ";" "\n" \ | sed -e 's/typedef //g' \ ==== //depot/projects/trustedbsd/sedarwin8/policies/stub/Makefile#2 (text+ko) ==== @@ -15,7 +15,7 @@ policy.in: $(EXPORT_HDRS)/security/security/mac_policy.h @cpp $(DARWIN_HDRS) -P $< \ | grep -v ^\$ \ - | awk 'RS=";" { if ($$1 == "typedef") { print $$0";" } }' \ + | awk 'RS=";" { if ($$1 == "typedef" && $$0 ~ /\(/) { print $$0";" } }' \ | tr -d "\n\t" \ | tr ";" "\n" \ | sed -e 's/typedef //g' \ From owner-p4-projects@FreeBSD.ORG Wed Aug 16 14:12:43 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7420416A505; Wed, 16 Aug 2006 14:12:43 +0000 (UTC) X-Original-To: perforce@FreeBSD.org 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 1D3A816A4E8 for ; Wed, 16 Aug 2006 14:12:43 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id AAD2243D46 for ; Wed, 16 Aug 2006 14:12:42 +0000 (GMT) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7GECgeZ073352 for ; Wed, 16 Aug 2006 14:12:42 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7GECg5V073349 for perforce@freebsd.org; Wed, 16 Aug 2006 14:12:42 GMT (envelope-from rdivacky@FreeBSD.org) Date: Wed, 16 Aug 2006 14:12:42 GMT Message-Id: <200608161412.k7GECg5V073349@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rdivacky@FreeBSD.org using -f From: Roman Divacky To: Perforce Change Reviews Cc: Subject: PERFORCE change 104225 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 16 Aug 2006 14:12:43 -0000 http://perforce.freebsd.org/chv.cgi?CH=104225 Change 104225 by rdivacky@rdivacky_witten on 2006/08/16 14:12:23 Let 2.4.x emulation work. My assumption that its ok to let getpid/getppid/exit_group as it is was false. Affected files ... .. //depot/projects/soc2006/rdivacky_linuxolator/compat/linux/linux_misc.c#15 edit Differences ... ==== //depot/projects/soc2006/rdivacky_linuxolator/compat/linux/linux_misc.c#15 (text+ko) ==== @@ -1332,12 +1332,17 @@ linux_getpid(struct thread *td, struct linux_getpid_args *args) { struct linux_emuldata *em; + char osrel[LINUX_MAX_UTSNAME]; em = em_find(td->td_proc, EMUL_UNLOCKED); KASSERT(em != NULL, ("getpid: emuldata not found.\n")); - td->td_retval[0] = em->shared->group_pid; + linux_get_osrelease(td, osrel); + if (strlen(osrel) >= 3 && osrel[2] == '6') + td->td_retval[0] = em->shared->group_pid; + else + td->td_retval[0] = td->td_proc->p_pid; EMUL_UNLOCK(&emul_lock); return (0); } @@ -1360,6 +1365,7 @@ { struct linux_emuldata *em; struct proc *p, *pp; + char osrel[LINUX_MAX_UTSNAME]; em = em_find(td->td_proc, EMUL_UNLOCKED); @@ -1384,7 +1390,12 @@ em = em_find(pp, EMUL_LOCKED); KASSERT(em != NULL, ("getppid: parent emuldata not found.\n")); - td->td_retval[0] = em->shared->group_pid; + linux_get_osrelease(td, osrel); + if (strlen(osrel) >= 3 && osrel[2] == '6') + td->td_retval[0] = em->shared->group_pid; + else + td->td_retval[0] = pp->p_pid; + printf("getppid: group_pid: %i\n, pid: %i\n", pp->p_pid, em->shared->group_pid); } else td->td_retval[0] = pp->p_pid; @@ -1458,6 +1469,7 @@ { struct linux_emuldata *em, *td_em, *tmp_em; struct proc *sp; + char osrel[LINUX_MAX_UTSNAME]; #ifdef DEBUG if (ldebug(exit_group)) @@ -1468,20 +1480,25 @@ KASSERT(td_em != NULL, ("exit_group: emuldata not found.\n")); - EMUL_SHARED_RLOCK(&emul_shared_lock); - LIST_FOREACH_SAFE(em, &td_em->shared->threads, threads, tmp_em) { - if (em->pid == td_em->pid) - continue; + linux_get_osrelease(td, osrel); + if (strlen(osrel) >= 3 && osrel[2] == '6') { + + EMUL_SHARED_RLOCK(&emul_shared_lock); + LIST_FOREACH_SAFE(em, &td_em->shared->threads, threads, tmp_em) { + printf("em->pid: %i, td_em->pid: %i\n", em->pid, td_em->pid); + if (em->pid == td_em->pid) + continue; - sp = pfind(em->pid); - psignal(sp, SIGKILL); - PROC_UNLOCK(sp); + sp = pfind(em->pid); + psignal(sp, SIGKILL); + PROC_UNLOCK(sp); #ifdef DEBUG - printf(LMSG("linux_sys_exit_group: kill PID %d\n"), em->pid); + printf(LMSG("linux_sys_exit_group: kill PID %d\n"), em->pid); #endif + } + + EMUL_SHARED_RUNLOCK(&emul_shared_lock); } - - EMUL_SHARED_RUNLOCK(&emul_shared_lock); EMUL_UNLOCK(&emul_lock); exit1(td, W_EXITCODE(args->error_code,0)); From owner-p4-projects@FreeBSD.ORG Wed Aug 16 14:12:44 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E883216A588; Wed, 16 Aug 2006 14:12:43 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 C5DF916A4DF for ; Wed, 16 Aug 2006 14:12:43 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2521A43D46 for ; Wed, 16 Aug 2006 14:12:43 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7GEChpj073359 for ; Wed, 16 Aug 2006 14:12:43 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7GECg4F073355 for perforce@freebsd.org; Wed, 16 Aug 2006 14:12:42 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Wed, 16 Aug 2006 14:12:42 GMT Message-Id: <200608161412.k7GECg4F073355@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 104227 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 16 Aug 2006 14:12:44 -0000 http://perforce.freebsd.org/chv.cgi?CH=104227 Change 104227 by rwatson@rwatson_zoo on 2006/08/16 14:12:28 sync to millert's cleanups in sedarwin: remove MAC_DEBUG -- this was originally added when doing early labeling work as part of the MAC Framework implementation, and has basically not been used since. Creating a policy module to do the same thing is trivial. Affected files ... .. //depot/projects/trustedbsd/mac2/sys/conf/NOTES#3 edit .. //depot/projects/trustedbsd/mac2/sys/conf/options#3 edit .. //depot/projects/trustedbsd/mac2/sys/kern/kern_mac.c#5 edit .. //depot/projects/trustedbsd/mac2/sys/security/mac/mac_inet.c#3 edit .. //depot/projects/trustedbsd/mac2/sys/security/mac/mac_internal.h#5 edit .. //depot/projects/trustedbsd/mac2/sys/security/mac/mac_label.c#3 edit .. //depot/projects/trustedbsd/mac2/sys/security/mac/mac_net.c#4 edit .. //depot/projects/trustedbsd/mac2/sys/security/mac/mac_pipe.c#3 edit .. //depot/projects/trustedbsd/mac2/sys/security/mac/mac_posix_sem.c#3 edit .. //depot/projects/trustedbsd/mac2/sys/security/mac/mac_process.c#4 edit .. //depot/projects/trustedbsd/mac2/sys/security/mac/mac_socket.c#4 edit .. //depot/projects/trustedbsd/mac2/sys/security/mac/mac_system.c#3 edit .. //depot/projects/trustedbsd/mac2/sys/security/mac/mac_sysv_msg.c#3 edit .. //depot/projects/trustedbsd/mac2/sys/security/mac/mac_sysv_sem.c#3 edit .. //depot/projects/trustedbsd/mac2/sys/security/mac/mac_sysv_shm.c#3 edit .. //depot/projects/trustedbsd/mac2/sys/security/mac/mac_vfs.c#5 edit Differences ... ==== //depot/projects/trustedbsd/mac2/sys/conf/NOTES#3 (text+ko) ==== @@ -998,7 +998,6 @@ options MAC options MAC_BIBA options MAC_BSDEXTENDED -options MAC_DEBUG options MAC_IFOFF options MAC_LOMAC options MAC_MLS ==== //depot/projects/trustedbsd/mac2/sys/conf/options#3 (text+ko) ==== @@ -103,7 +103,6 @@ MAC_ALWAYS_LABEL_MBUF opt_mac.h MAC_BIBA opt_dontuse.h MAC_BSDEXTENDED opt_dontuse.h -MAC_DEBUG opt_mac.h MAC_IFOFF opt_dontuse.h MAC_LOMAC opt_dontuse.h MAC_MLS opt_dontuse.h ==== //depot/projects/trustedbsd/mac2/sys/kern/kern_mac.c#5 (text+ko) ==== @@ -137,17 +137,6 @@ int mac_labelmbufs = 0; #endif -#ifdef MAC_DEBUG -SYSCTL_NODE(_security_mac, OID_AUTO, debug, CTLFLAG_RW, 0, - "TrustedBSD MAC debug info"); -SYSCTL_NODE(_security_mac_debug, OID_AUTO, counters, CTLFLAG_RW, 0, - "TrustedBSD MAC object counters"); - -static unsigned int nmactemp; -SYSCTL_UINT(_security_mac_debug_counters, OID_AUTO, temp, CTLFLAG_RD, - &nmactemp, 0, "number of temporary labels in use"); -#endif - static int mac_policy_register(struct mac_policy_conf *mpc); static int mac_policy_unregister(struct mac_policy_conf *mpc); ==== //depot/projects/trustedbsd/mac2/sys/security/mac/mac_inet.c#3 (text+ko) ==== @@ -70,15 +70,6 @@ #include -#ifdef MAC_DEBUG -static unsigned int nmacinpcbs, nmacipqs; - -SYSCTL_UINT(_security_mac_debug_counters, OID_AUTO, inpcbs, CTLFLAG_RD, - &nmacinpcbs, 0, "number of inpcbs in use"); -SYSCTL_UINT(_security_mac_debug_counters, OID_AUTO, ipqs, CTLFLAG_RD, - &nmacipqs, 0, "number of ipqs in use"); -#endif - static struct label * mac_inpcb_label_alloc(int flag) { @@ -94,7 +85,6 @@ mac_labelzone_free(label); return (NULL); } - MAC_DEBUG_COUNTER_INC(&nmacinpcbs); return (label); } @@ -124,7 +114,6 @@ mac_labelzone_free(label); return (NULL); } - MAC_DEBUG_COUNTER_INC(&nmacipqs); return (label); } @@ -144,7 +133,6 @@ MAC_PERFORM(inpcb_destroy_label, label); mac_labelzone_free(label); - MAC_DEBUG_COUNTER_DEC(&nmacinpcbs); } void @@ -161,7 +149,6 @@ MAC_PERFORM(ipq_destroy_label, label); mac_labelzone_free(label); - MAC_DEBUG_COUNTER_DEC(&nmacipqs); } void ==== //depot/projects/trustedbsd/mac2/sys/security/mac/mac_internal.h#5 (text+ko) ==== @@ -46,10 +46,6 @@ #ifdef SYSCTL_DECL SYSCTL_DECL(_security); SYSCTL_DECL(_security_mac); -#ifdef MAC_DEBUG -SYSCTL_DECL(_security_mac_debug); -SYSCTL_DECL(_security_mac_debug_counters); -#endif #endif /* SYSCTL_DECL */ /* @@ -75,18 +71,6 @@ #endif /* - * MAC Framework object/access counter primitives, conditionally - * compiled. - */ -#ifdef MAC_DEBUG -#define MAC_DEBUG_COUNTER_INC(x) atomic_add_int(x, 1); -#define MAC_DEBUG_COUNTER_DEC(x) atomic_subtract_int(x, 1); -#else -#define MAC_DEBUG_COUNTER_INC(x) -#define MAC_DEBUG_COUNTER_DEC(x) -#endif - -/* * MAC Framework infrastructure functions. */ int mac_error_select(int error1, int error2); ==== //depot/projects/trustedbsd/mac2/sys/security/mac/mac_label.c#3 (text+ko) ==== ==== //depot/projects/trustedbsd/mac2/sys/security/mac/mac_net.c#4 (text+ko) ==== @@ -77,17 +77,6 @@ &mac_enforce_network, 0, "Enforce MAC policy on network packets"); TUNABLE_INT("security.mac.enforce_network", &mac_enforce_network); -#ifdef MAC_DEBUG -static unsigned int nmacbpfdescs, nmacifnets, nmacmbufs; - -SYSCTL_UINT(_security_mac_debug_counters, OID_AUTO, bpfdescs, CTLFLAG_RD, - &nmacbpfdescs, 0, "number of bpfdescs in use"); -SYSCTL_UINT(_security_mac_debug_counters, OID_AUTO, ifnets, CTLFLAG_RD, - &nmacifnets, 0, "number of ifnets in use"); -SYSCTL_UINT(_security_mac_debug_counters, OID_AUTO, mbufs, CTLFLAG_RD, - &nmacmbufs, 0, "number of mbufs in use"); -#endif - /* * XXXRW: struct ifnet locking is incomplete in the network code, so we * use our own global mutex for struct ifnet. Non-ideal, but should help @@ -120,7 +109,6 @@ label = mac_labelzone_alloc(M_WAITOK); MAC_PERFORM(bpfdesc_init_label, label); - MAC_DEBUG_COUNTER_INC(&nmacbpfdescs); return (label); } @@ -138,7 +126,6 @@ label = mac_labelzone_alloc(M_WAITOK); MAC_PERFORM(ifnet_init_label, label); - MAC_DEBUG_COUNTER_INC(&nmacifnets); return (label); } @@ -162,8 +149,6 @@ if (error) { MAC_PERFORM(mbuf_destroy_label, label); mac_destroy_label(label); - } else { - MAC_DEBUG_COUNTER_INC(&nmacmbufs); } return (error); } @@ -203,7 +188,6 @@ MAC_PERFORM(bpfdesc_destroy_label, label); mac_labelzone_free(label); - MAC_DEBUG_COUNTER_DEC(&nmacbpfdescs); } void @@ -220,7 +204,6 @@ MAC_PERFORM(ifnet_destroy_label, label); mac_labelzone_free(label); - MAC_DEBUG_COUNTER_DEC(&nmacifnets); } void @@ -240,7 +223,6 @@ MAC_PERFORM(mbuf_destroy_label, label); mac_destroy_label(label); - MAC_DEBUG_COUNTER_DEC(&nmacmbufs); } void ==== //depot/projects/trustedbsd/mac2/sys/security/mac/mac_pipe.c#3 (text+ko) ==== @@ -61,12 +61,6 @@ &mac_enforce_pipe, 0, "Enforce MAC policy on pipe operations"); TUNABLE_INT("security.mac.enforce_pipe", &mac_enforce_pipe); -#ifdef MAC_DEBUG -static unsigned int nmacpipes; -SYSCTL_UINT(_security_mac_debug_counters, OID_AUTO, pipes, CTLFLAG_RD, - &nmacpipes, 0, "number of pipes in use"); -#endif - struct label * mac_pipe_label_alloc(void) { @@ -74,7 +68,6 @@ label = mac_labelzone_alloc(M_WAITOK); MAC_PERFORM(pipe_init_label, label); - MAC_DEBUG_COUNTER_INC(&nmacpipes); return (label); } @@ -91,7 +84,6 @@ MAC_PERFORM(pipe_destroy_label, label); mac_labelzone_free(label); - MAC_DEBUG_COUNTER_DEC(&nmacpipes); } void ==== //depot/projects/trustedbsd/mac2/sys/security/mac/mac_posix_sem.c#3 (text+ko) ==== @@ -54,12 +54,6 @@ &mac_enforce_posix_sem, 0, "Enforce MAC policy on global POSIX semaphores"); TUNABLE_INT("security.mac.enforce_posix_sem", &mac_enforce_posix_sem); -#ifdef MAC_DEBUG -static unsigned int nmacposixsems; -SYSCTL_UINT(_security_mac_debug_counters, OID_AUTO, posix_sems, CTLFLAG_RD, - &nmacposixsems, 0, "number of posix global semaphores inuse"); -#endif - static struct label * mac_posix_sem_label_alloc(void) { @@ -67,7 +61,6 @@ label = mac_labelzone_alloc(M_WAITOK); MAC_PERFORM(posix_sem_init_label, label); - MAC_DEBUG_COUNTER_INC(&nmacposixsems); return (label); } @@ -83,7 +76,6 @@ { MAC_PERFORM(posix_sem_destroy_label, label); - MAC_DEBUG_COUNTER_DEC(&nmacposixsems); } void ==== //depot/projects/trustedbsd/mac2/sys/security/mac/mac_process.c#4 (text+ko) ==== @@ -96,14 +96,6 @@ &mac_enforce_suid, 0, "Enforce MAC policy on suid/sgid operations"); TUNABLE_INT("security.mac.enforce_suid", &mac_enforce_suid); -#ifdef MAC_DEBUG -static unsigned int nmaccreds, nmacprocs; -SYSCTL_UINT(_security_mac_debug_counters, OID_AUTO, creds, CTLFLAG_RD, - &nmaccreds, 0, "number of ucreds in use"); -SYSCTL_UINT(_security_mac_debug_counters, OID_AUTO, procs, CTLFLAG_RD, - &nmacprocs, 0, "number of procs in use"); -#endif - static void mac_cred_mmapped_drop_perms_recurse(struct thread *td, struct ucred *cred, struct vm_map *map); @@ -114,7 +106,6 @@ label = mac_labelzone_alloc(M_WAITOK); MAC_PERFORM(cred_init_label, label); - MAC_DEBUG_COUNTER_INC(&nmaccreds); return (label); } @@ -132,7 +123,6 @@ label = mac_labelzone_alloc(M_WAITOK); MAC_PERFORM(proc_init_label, label); - MAC_DEBUG_COUNTER_INC(&nmacprocs); return (label); } @@ -149,7 +139,6 @@ MAC_PERFORM(cred_destroy_label, label); mac_labelzone_free(label); - MAC_DEBUG_COUNTER_DEC(&nmaccreds); } void @@ -166,7 +155,6 @@ MAC_PERFORM(proc_destroy_label, label); mac_labelzone_free(label); - MAC_DEBUG_COUNTER_DEC(&nmacprocs); } void ==== //depot/projects/trustedbsd/mac2/sys/security/mac/mac_socket.c#4 (text+ko) ==== @@ -81,13 +81,6 @@ &mac_enforce_socket, 0, "Enforce MAC policy on socket operations"); TUNABLE_INT("security.mac.enforce_socket", &mac_enforce_socket); -#ifdef MAC_DEBUG -static unsigned int nmacsockets; - -SYSCTL_UINT(_security_mac_debug_counters, OID_AUTO, sockets, CTLFLAG_RD, - &nmacsockets, 0, "number of sockets in use"); -#endif - struct label * mac_socket_label_alloc(int flag) { @@ -104,7 +97,6 @@ mac_labelzone_free(label); return (NULL); } - MAC_DEBUG_COUNTER_INC(&nmacsockets); return (label); } @@ -124,7 +116,6 @@ mac_labelzone_free(label); return (NULL); } - MAC_DEBUG_COUNTER_INC(&nmacsockets); return (label); } @@ -150,7 +141,6 @@ MAC_PERFORM(socket_destroy_label, label); mac_labelzone_free(label); - MAC_DEBUG_COUNTER_DEC(&nmacsockets); } static void @@ -159,7 +149,6 @@ MAC_PERFORM(socket_peer_destroy_label, label); mac_labelzone_free(label); - MAC_DEBUG_COUNTER_DEC(&nmacsockets); } void ==== //depot/projects/trustedbsd/mac2/sys/security/mac/mac_system.c#3 (text+ko) ==== ==== //depot/projects/trustedbsd/mac2/sys/security/mac/mac_sysv_msg.c#3 (text+ko) ==== @@ -63,14 +63,6 @@ "Enforce MAC policy on System V IPC Message Queues"); TUNABLE_INT("security.mac.enforce_sysv_msg", &mac_enforce_sysv_msg); -#ifdef MAC_DEBUG -static unsigned int nmacipcmsgs, nmacipcmsqs; -SYSCTL_UINT(_security_mac_debug_counters, OID_AUTO, ipc_msgs, CTLFLAG_RD, - &nmacipcmsgs, 0, "number of sysv ipc messages inuse"); -SYSCTL_UINT(_security_mac_debug_counters, OID_AUTO, ipc_msqs, CTLFLAG_RD, - &nmacipcmsqs, 0, "number of sysv ipc message queue identifiers inuse"); -#endif - static struct label * mac_sysvmsg_label_alloc(void) { @@ -78,7 +70,6 @@ label = mac_labelzone_alloc(M_WAITOK); MAC_PERFORM(sysvmsg_init_label, label); - MAC_DEBUG_COUNTER_INC(&nmacipcmsgs); return (label); } @@ -96,7 +87,6 @@ label = mac_labelzone_alloc(M_WAITOK); MAC_PERFORM(sysvmsq_init_label, label); - MAC_DEBUG_COUNTER_INC(&nmacipcmsqs); return (label); } @@ -113,7 +103,6 @@ MAC_PERFORM(sysvmsg_destroy_label, label); mac_labelzone_free(label); - MAC_DEBUG_COUNTER_DEC(&nmacipcmsgs); } void @@ -130,7 +119,6 @@ MAC_PERFORM(sysvmsq_destroy_label, label); mac_labelzone_free(label); - MAC_DEBUG_COUNTER_DEC(&nmacipcmsqs); } void ==== //depot/projects/trustedbsd/mac2/sys/security/mac/mac_sysv_sem.c#3 (text+ko) ==== @@ -62,12 +62,6 @@ &mac_enforce_sysv_sem, 0, "Enforce MAC policy on System V IPC Semaphores"); TUNABLE_INT("security.mac.enforce_sysv", &mac_enforce_sysv_sem); -#ifdef MAC_DEBUG -static unsigned int nmacipcsemas; -SYSCTL_UINT(_security_mac_debug_counters, OID_AUTO, ipc_semas, CTLFLAG_RD, - &nmacipcsemas, 0, "number of sysv ipc semaphore identifiers inuse"); -#endif - static struct label * mac_sysvsem_label_alloc(void) { @@ -75,7 +69,6 @@ label = mac_labelzone_alloc(M_WAITOK); MAC_PERFORM(sysvsem_init_label, label); - MAC_DEBUG_COUNTER_INC(&nmacipcsemas); return (label); } @@ -92,7 +85,6 @@ MAC_PERFORM(sysvsem_destroy_label, label); mac_labelzone_free(label); - MAC_DEBUG_COUNTER_DEC(&nmacipcsemas); } void ==== //depot/projects/trustedbsd/mac2/sys/security/mac/mac_sysv_shm.c#3 (text+ko) ==== @@ -63,12 +63,6 @@ "Enforce MAC policy on System V IPC shared memory"); TUNABLE_INT("security.mac.enforce_sysv", &mac_enforce_sysv_shm); -#ifdef MAC_DEBUG -static unsigned int nmacipcshms; -SYSCTL_UINT(_security_mac_debug_counters, OID_AUTO, ipc_shms, CTLFLAG_RD, - &nmacipcshms, 0, "number of sysv ipc shm identifiers inuse"); -#endif - static struct label * mac_sysvshm_label_alloc(void) { @@ -76,7 +70,6 @@ label = mac_labelzone_alloc(M_WAITOK); MAC_PERFORM(sysvshm_init_label, label); - MAC_DEBUG_COUNTER_INC(&nmacipcshms); return (label); } @@ -93,7 +86,6 @@ MAC_PERFORM(sysvshm_destroy_label, label); mac_labelzone_free(label); - MAC_DEBUG_COUNTER_DEC(&nmacipcshms); } void ==== //depot/projects/trustedbsd/mac2/sys/security/mac/mac_vfs.c#5 (text+ko) ==== @@ -83,23 +83,6 @@ &mac_enforce_fs, 0, "Enforce MAC policy on file system objects"); TUNABLE_INT("security.mac.enforce_fs", &mac_enforce_fs); -#ifdef MAC_DEBUG -static int mac_debug_label_fallback = 0; -SYSCTL_INT(_security_mac_debug, OID_AUTO, label_fallback, CTLFLAG_RW, - &mac_debug_label_fallback, 0, "Filesystems should fall back to fs label" - "when label is corrupted."); -TUNABLE_INT("security.mac.debug_label_fallback", - &mac_debug_label_fallback); - -static unsigned int nmacmounts, nmacvnodes, nmacdevfsdirents; -SYSCTL_UINT(_security_mac_debug_counters, OID_AUTO, mounts, CTLFLAG_RD, - &nmacmounts, 0, "number of mounts in use"); -SYSCTL_UINT(_security_mac_debug_counters, OID_AUTO, vnodes, CTLFLAG_RD, - &nmacvnodes, 0, "number of vnodes in use"); -SYSCTL_UINT(_security_mac_debug_counters, OID_AUTO, devfsdirents, CTLFLAG_RD, - &nmacdevfsdirents, 0, "number of devfs dirents inuse"); -#endif - static int mac_vnode_setlabel_extattr(struct ucred *cred, struct vnode *vp, struct label *intlabel); @@ -110,7 +93,6 @@ label = mac_labelzone_alloc(M_WAITOK); MAC_PERFORM(devfs_init_label, label); - MAC_DEBUG_COUNTER_INC(&nmacdevfsdirents); return (label); } @@ -128,7 +110,6 @@ label = mac_labelzone_alloc(M_WAITOK); MAC_PERFORM(mount_init_label, label); - MAC_DEBUG_COUNTER_INC(&nmacmounts); return (label); } @@ -146,7 +127,6 @@ label = mac_labelzone_alloc(M_WAITOK); MAC_PERFORM(vnode_init_label, label); - MAC_DEBUG_COUNTER_INC(&nmacvnodes); return (label); } @@ -163,7 +143,6 @@ MAC_PERFORM(devfs_destroy_label, label); mac_labelzone_free(label); - MAC_DEBUG_COUNTER_DEC(&nmacdevfsdirents); } void @@ -180,7 +159,6 @@ MAC_PERFORM(mount_destroy_label, label); mac_labelzone_free(label); - MAC_DEBUG_COUNTER_DEC(&nmacmounts); } void @@ -197,7 +175,6 @@ MAC_PERFORM(vnode_destroy_label, label); mac_labelzone_free(label); - MAC_DEBUG_COUNTER_DEC(&nmacvnodes); } void From owner-p4-projects@FreeBSD.ORG Wed Aug 16 14:12:52 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CF3F516A601; Wed, 16 Aug 2006 14:12:51 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 AB11D16A4F8 for ; Wed, 16 Aug 2006 14:12:51 +0000 (UTC) (envelope-from glebius@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1FDA543D45 for ; Wed, 16 Aug 2006 14:12:51 +0000 (GMT) (envelope-from glebius@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7GECpPw073367 for ; Wed, 16 Aug 2006 14:12:51 GMT (envelope-from glebius@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7GEChaA073362 for perforce@freebsd.org; Wed, 16 Aug 2006 14:12:43 GMT (envelope-from glebius@freebsd.org) Date: Wed, 16 Aug 2006 14:12:43 GMT Message-Id: <200608161412.k7GEChaA073362@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to glebius@freebsd.org using -f From: Gleb Smirnoff To: Perforce Change Reviews Cc: Subject: PERFORCE change 104228 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 16 Aug 2006 14:12:52 -0000 http://perforce.freebsd.org/chv.cgi?CH=104228 Change 104228 by glebius@glebius_behemoth on 2006/08/16 14:12:28 I hope, I am doing a correct IFC. Affected files ... .. //depot/projects/soc2005/libalias/Makefile.inc1#2 integrate .. //depot/projects/soc2005/libalias/ObsoleteFiles.inc#3 integrate .. //depot/projects/soc2005/libalias/bin/sh/histedit.c#2 integrate .. //depot/projects/soc2005/libalias/bin/sh/parser.c#2 integrate .. //depot/projects/soc2005/libalias/bin/test/test.1#3 integrate .. //depot/projects/soc2005/libalias/contrib/smbfs/smbutil/print.c#2 integrate .. //depot/projects/soc2005/libalias/contrib/smbfs/smbutil/view.c#2 integrate .. //depot/projects/soc2005/libalias/doc/Makefile#1 branch .. //depot/projects/soc2005/libalias/doc/README#1 branch .. //depot/projects/soc2005/libalias/doc/bn_BD.ISO10646-1/Makefile#1 branch .. //depot/projects/soc2005/libalias/doc/bn_BD.ISO10646-1/articles/Makefile#1 branch .. //depot/projects/soc2005/libalias/doc/bn_BD.ISO10646-1/articles/Makefile.inc#1 branch .. //depot/projects/soc2005/libalias/doc/bn_BD.ISO10646-1/articles/explaining-bsd/Makefile#1 branch .. //depot/projects/soc2005/libalias/doc/bn_BD.ISO10646-1/articles/explaining-bsd/article.sgml#1 branch .. //depot/projects/soc2005/libalias/doc/bn_BD.ISO10646-1/articles/new-users/Makefile#1 branch .. //depot/projects/soc2005/libalias/doc/bn_BD.ISO10646-1/articles/new-users/article.sgml#1 branch .. //depot/projects/soc2005/libalias/doc/da_DK.ISO8859-1/Makefile#1 branch .. //depot/projects/soc2005/libalias/doc/da_DK.ISO8859-1/articles/Makefile#1 branch .. //depot/projects/soc2005/libalias/doc/da_DK.ISO8859-1/articles/Makefile.inc#1 branch .. //depot/projects/soc2005/libalias/doc/da_DK.ISO8859-1/articles/euro/Makefile#1 branch .. //depot/projects/soc2005/libalias/doc/da_DK.ISO8859-1/articles/euro/article.sgml#1 branch .. //depot/projects/soc2005/libalias/doc/da_DK.ISO8859-1/articles/ipsec-must/Makefile#1 branch .. //depot/projects/soc2005/libalias/doc/da_DK.ISO8859-1/articles/ipsec-must/article.sgml#1 branch .. //depot/projects/soc2005/libalias/doc/da_DK.ISO8859-1/articles/pxe/Makefile#1 branch .. //depot/projects/soc2005/libalias/doc/da_DK.ISO8859-1/articles/pxe/article.sgml#1 branch .. //depot/projects/soc2005/libalias/doc/da_DK.ISO8859-1/articles/pxe/dhcpd.conf#1 branch .. //depot/projects/soc2005/libalias/doc/da_DK.ISO8859-1/articles/pxe/install.cfg#1 branch .. //depot/projects/soc2005/libalias/doc/da_DK.ISO8859-1/articles/pxe/loader.rc#1 branch .. //depot/projects/soc2005/libalias/doc/da_DK.ISO8859-1/articles/pxe/pkgmaker.sh#1 branch .. //depot/projects/soc2005/libalias/doc/da_DK.ISO8859-1/articles/pxe/post#1 branch .. //depot/projects/soc2005/libalias/doc/da_DK.ISO8859-1/articles/pxe/pre#1 branch .. //depot/projects/soc2005/libalias/doc/da_DK.ISO8859-1/share/sgml/authors.ent#1 branch .. //depot/projects/soc2005/libalias/doc/da_DK.ISO8859-1/share/sgml/bookinfo.ent#1 branch .. //depot/projects/soc2005/libalias/doc/da_DK.ISO8859-1/share/sgml/catalog#1 branch .. //depot/projects/soc2005/libalias/doc/da_DK.ISO8859-1/share/sgml/disclaimer.sgml#1 branch .. //depot/projects/soc2005/libalias/doc/da_DK.ISO8859-1/share/sgml/freebsd.dsl#1 branch .. //depot/projects/soc2005/libalias/doc/da_DK.ISO8859-1/share/sgml/l10n.ent#1 branch .. //depot/projects/soc2005/libalias/doc/da_DK.ISO8859-1/share/sgml/legalnotice.sgml#1 branch .. //depot/projects/soc2005/libalias/doc/da_DK.ISO8859-1/share/sgml/license.sgml#1 branch .. //depot/projects/soc2005/libalias/doc/da_DK.ISO8859-1/share/sgml/mailing-lists.ent#1 branch .. //depot/projects/soc2005/libalias/doc/da_DK.ISO8859-1/share/sgml/newsgroups.ent#1 branch .. //depot/projects/soc2005/libalias/doc/da_DK.ISO8859-1/share/sgml/teams.ent#1 branch .. //depot/projects/soc2005/libalias/doc/da_DK.ISO8859-1/share/sgml/translators.ent#1 branch .. //depot/projects/soc2005/libalias/doc/de_DE.ISO8859-1/Makefile#1 branch .. //depot/projects/soc2005/libalias/doc/de_DE.ISO8859-1/articles/Makefile#1 branch .. //depot/projects/soc2005/libalias/doc/de_DE.ISO8859-1/articles/Makefile.inc#1 branch .. //depot/projects/soc2005/libalias/doc/de_DE.ISO8859-1/articles/contributing/Makefile#1 branch .. //depot/projects/soc2005/libalias/doc/de_DE.ISO8859-1/articles/contributing/article.sgml#1 branch .. //depot/projects/soc2005/libalias/doc/de_DE.ISO8859-1/articles/explaining-bsd/Makefile#1 branch .. //depot/projects/soc2005/libalias/doc/de_DE.ISO8859-1/articles/explaining-bsd/article.sgml#1 branch .. //depot/projects/soc2005/libalias/doc/de_DE.ISO8859-1/articles/laptop/Makefile#1 branch .. //depot/projects/soc2005/libalias/doc/de_DE.ISO8859-1/articles/laptop/article.sgml#1 branch .. //depot/projects/soc2005/libalias/doc/de_DE.ISO8859-1/articles/new-users/Makefile#1 branch .. //depot/projects/soc2005/libalias/doc/de_DE.ISO8859-1/articles/new-users/article.sgml#1 branch .. //depot/projects/soc2005/libalias/doc/de_DE.ISO8859-1/articles/version-guide/Makefile#1 branch .. //depot/projects/soc2005/libalias/doc/de_DE.ISO8859-1/articles/version-guide/article.sgml#1 branch .. //depot/projects/soc2005/libalias/doc/de_DE.ISO8859-1/books/Makefile#1 branch .. //depot/projects/soc2005/libalias/doc/de_DE.ISO8859-1/books/Makefile.inc#1 branch .. //depot/projects/soc2005/libalias/doc/de_DE.ISO8859-1/books/faq/Makefile#1 branch .. //depot/projects/soc2005/libalias/doc/de_DE.ISO8859-1/books/faq/book.sgml#1 branch .. //depot/projects/soc2005/libalias/doc/de_DE.ISO8859-1/books/fdp-primer/Makefile#1 branch .. //depot/projects/soc2005/libalias/doc/de_DE.ISO8859-1/books/fdp-primer/book.sgml#1 branch .. //depot/projects/soc2005/libalias/doc/de_DE.ISO8859-1/books/fdp-primer/chapter.decl#1 branch .. //depot/projects/soc2005/libalias/doc/de_DE.ISO8859-1/books/fdp-primer/chapters.ent#1 branch .. //depot/projects/soc2005/libalias/doc/de_DE.ISO8859-1/books/fdp-primer/doc-build/chapter.sgml#1 branch .. //depot/projects/soc2005/libalias/doc/de_DE.ISO8859-1/books/fdp-primer/examples/appendix.sgml#1 branch .. //depot/projects/soc2005/libalias/doc/de_DE.ISO8859-1/books/fdp-primer/overview/chapter.sgml#1 branch .. //depot/projects/soc2005/libalias/doc/de_DE.ISO8859-1/books/fdp-primer/psgml-mode/chapter.sgml#1 branch .. //depot/projects/soc2005/libalias/doc/de_DE.ISO8859-1/books/fdp-primer/see-also/chapter.sgml#1 branch .. //depot/projects/soc2005/libalias/doc/de_DE.ISO8859-1/books/fdp-primer/sgml-markup/chapter.sgml#1 branch .. //depot/projects/soc2005/libalias/doc/de_DE.ISO8859-1/books/fdp-primer/sgml-primer/chapter.sgml#1 branch .. //depot/projects/soc2005/libalias/doc/de_DE.ISO8859-1/books/fdp-primer/structure/chapter.sgml#1 branch .. //depot/projects/soc2005/libalias/doc/de_DE.ISO8859-1/books/fdp-primer/stylesheets/chapter.sgml#1 branch .. //depot/projects/soc2005/libalias/doc/de_DE.ISO8859-1/books/fdp-primer/the-website/chapter.sgml#1 branch .. //depot/projects/soc2005/libalias/doc/de_DE.ISO8859-1/books/fdp-primer/tools/chapter.sgml#1 branch .. //depot/projects/soc2005/libalias/doc/de_DE.ISO8859-1/books/fdp-primer/translations/chapter.sgml#1 branch .. //depot/projects/soc2005/libalias/doc/de_DE.ISO8859-1/books/fdp-primer/writing-style/chapter.sgml#1 branch .. //depot/projects/soc2005/libalias/doc/de_DE.ISO8859-1/books/handbook/Makefile#1 branch .. //depot/projects/soc2005/libalias/doc/de_DE.ISO8859-1/books/handbook/advanced-networking/chapter.sgml#1 branch .. //depot/projects/soc2005/libalias/doc/de_DE.ISO8859-1/books/handbook/appendix.decl#1 branch .. //depot/projects/soc2005/libalias/doc/de_DE.ISO8859-1/books/handbook/audit/chapter.sgml#1 branch .. //depot/projects/soc2005/libalias/doc/de_DE.ISO8859-1/books/handbook/basics/chapter.sgml#1 branch .. //depot/projects/soc2005/libalias/doc/de_DE.ISO8859-1/books/handbook/bibliography/chapter.sgml#1 branch .. //depot/projects/soc2005/libalias/doc/de_DE.ISO8859-1/books/handbook/book.sgml#1 branch .. //depot/projects/soc2005/libalias/doc/de_DE.ISO8859-1/books/handbook/boot/chapter.sgml#1 branch .. //depot/projects/soc2005/libalias/doc/de_DE.ISO8859-1/books/handbook/chapter.decl#1 branch .. //depot/projects/soc2005/libalias/doc/de_DE.ISO8859-1/books/handbook/chapters.ent#1 branch .. //depot/projects/soc2005/libalias/doc/de_DE.ISO8859-1/books/handbook/colophon.sgml#1 branch .. //depot/projects/soc2005/libalias/doc/de_DE.ISO8859-1/books/handbook/config/chapter.sgml#1 branch .. //depot/projects/soc2005/libalias/doc/de_DE.ISO8859-1/books/handbook/cutting-edge/chapter.sgml#1 branch .. //depot/projects/soc2005/libalias/doc/de_DE.ISO8859-1/books/handbook/desktop/chapter.sgml#1 branch .. //depot/projects/soc2005/libalias/etc/defaults/rc.conf#3 integrate .. //depot/projects/soc2005/libalias/etc/mtree/BSD.include.dist#2 integrate .. //depot/projects/soc2005/libalias/etc/mtree/BSD.local.dist#2 integrate .. //depot/projects/soc2005/libalias/etc/mtree/BSD.usr.dist#3 integrate .. //depot/projects/soc2005/libalias/etc/rc.d/Makefile#2 integrate .. //depot/projects/soc2005/libalias/games/fortune/datfiles/fortunes#3 integrate .. //depot/projects/soc2005/libalias/gnu/usr.bin/binutils/libbfd/Makefile.arm#2 integrate .. //depot/projects/soc2005/libalias/gnu/usr.bin/groff/contrib/mm/Makefile#2 integrate .. //depot/projects/soc2005/libalias/gnu/usr.bin/groff/tmac/Makefile#2 integrate .. //depot/projects/soc2005/libalias/gnu/usr.bin/groff/tmac/mdoc.local#2 integrate .. //depot/projects/soc2005/libalias/include/Makefile#2 integrate .. //depot/projects/soc2005/libalias/lib/Makefile#2 integrate .. //depot/projects/soc2005/libalias/lib/libarchive/archive_write.c#2 integrate .. //depot/projects/soc2005/libalias/lib/libc/gen/msgctl.3#2 integrate .. //depot/projects/soc2005/libalias/lib/libc/gen/syslog.c#2 integrate .. //depot/projects/soc2005/libalias/lib/libc/resolv/res_init.c#2 integrate .. //depot/projects/soc2005/libalias/lib/libc/resolv/res_send.c#2 integrate .. //depot/projects/soc2005/libalias/lib/libc/stdlib/malloc.c#5 integrate .. //depot/projects/soc2005/libalias/lib/libc/string/strcoll.3#2 integrate .. //depot/projects/soc2005/libalias/lib/libc/sys/connect.2#2 integrate .. //depot/projects/soc2005/libalias/lib/libc/sys/getfsstat.2#2 integrate .. //depot/projects/soc2005/libalias/lib/libc/sys/kse.2#2 integrate .. //depot/projects/soc2005/libalias/lib/libc/uuid/uuid_compare.c#2 integrate .. //depot/projects/soc2005/libalias/lib/libdisk/write_ia64_disk.c#2 integrate .. //depot/projects/soc2005/libalias/lib/libpam/modules/pam_lastlog/pam_lastlog.c#2 integrate .. //depot/projects/soc2005/libalias/lib/libtelnet/Makefile#2 integrate .. //depot/projects/soc2005/libalias/lib/libthr/thread/thr_init.c#3 integrate .. //depot/projects/soc2005/libalias/lib/libthr/thread/thr_mutex.c#3 integrate .. //depot/projects/soc2005/libalias/lib/libthr/thread/thr_private.h#3 integrate .. //depot/projects/soc2005/libalias/lib/libthr/thread/thr_pspinlock.c#2 integrate .. //depot/projects/soc2005/libalias/lib/libthread_db/arch/powerpc/libc_r_md.c#1 branch .. //depot/projects/soc2005/libalias/lib/libthread_db/arch/powerpc/libpthread_md.c#1 branch .. //depot/projects/soc2005/libalias/libexec/rtld-elf/rtld.c#2 integrate .. //depot/projects/soc2005/libalias/libexec/telnetd/Makefile#3 integrate .. //depot/projects/soc2005/libalias/libexec/tftpd/tftpd.8#2 integrate .. //depot/projects/soc2005/libalias/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#3 integrate .. //depot/projects/soc2005/libalias/release/doc/fr_FR.ISO8859-1/hardware/alpha/proc-alpha.sgml#2 integrate .. //depot/projects/soc2005/libalias/release/doc/share/misc/dev.archlist.txt#3 integrate .. //depot/projects/soc2005/libalias/sbin/dump/main.c#2 integrate .. //depot/projects/soc2005/libalias/sbin/dump/optr.c#2 integrate .. //depot/projects/soc2005/libalias/sbin/geom/class/eli/geli.8#2 integrate .. //depot/projects/soc2005/libalias/sbin/geom/class/eli/geom_eli.c#2 integrate .. //depot/projects/soc2005/libalias/sbin/ifconfig/ifclone.c#3 integrate .. //depot/projects/soc2005/libalias/sbin/ifconfig/ifieee80211.c#3 integrate .. //depot/projects/soc2005/libalias/sbin/ipfw/ipfw2.c#3 integrate .. //depot/projects/soc2005/libalias/sbin/ping/ping.c#2 integrate .. //depot/projects/soc2005/libalias/sbin/reboot/reboot.c#2 integrate .. //depot/projects/soc2005/libalias/sbin/sysctl/sysctl.c#3 integrate .. //depot/projects/soc2005/libalias/share/doc/papers/timecounter/timecounter.ms#2 integrate .. //depot/projects/soc2005/libalias/share/examples/drivers/make_device_driver.sh#2 integrate .. //depot/projects/soc2005/libalias/share/examples/drivers/make_pseudo_driver.sh#2 integrate .. //depot/projects/soc2005/libalias/share/man/man4/acpi.4#3 integrate .. //depot/projects/soc2005/libalias/share/man/man4/ata.4#3 integrate .. //depot/projects/soc2005/libalias/share/man/man4/devctl.4#2 integrate .. //depot/projects/soc2005/libalias/share/man/man4/if_bridge.4#2 integrate .. //depot/projects/soc2005/libalias/share/man/man4/man4.powerpc/Makefile#1 branch .. //depot/projects/soc2005/libalias/share/man/man4/man4.powerpc/powermac_nvram.4#1 branch .. //depot/projects/soc2005/libalias/share/man/man4/ng_ether.4#2 integrate .. //depot/projects/soc2005/libalias/share/man/man4/ng_pppoe.4#2 integrate .. //depot/projects/soc2005/libalias/share/man/man4/uscanner.4#2 integrate .. //depot/projects/soc2005/libalias/share/man/man4/vlan.4#3 integrate .. //depot/projects/soc2005/libalias/share/man/man5/src.conf.5#2 integrate .. //depot/projects/soc2005/libalias/share/man/man7/hier.7#3 integrate .. //depot/projects/soc2005/libalias/share/man/man7/release.7#2 integrate .. //depot/projects/soc2005/libalias/share/man/man9/sysctl.9#2 integrate .. //depot/projects/soc2005/libalias/share/misc/bsd-family-tree#3 integrate .. //depot/projects/soc2005/libalias/share/mk/bsd.cpu.mk#3 integrate .. //depot/projects/soc2005/libalias/share/mk/bsd.sys.mk#2 integrate .. //depot/projects/soc2005/libalias/sys/Makefile#3 integrate .. //depot/projects/soc2005/libalias/sys/amd64/acpica/madt.c#2 integrate .. //depot/projects/soc2005/libalias/sys/amd64/amd64/identcpu.c#3 integrate .. //depot/projects/soc2005/libalias/sys/amd64/amd64/pmap.c#3 integrate .. //depot/projects/soc2005/libalias/sys/amd64/amd64/support.S#2 integrate .. //depot/projects/soc2005/libalias/sys/amd64/amd64/trap.c#3 integrate .. //depot/projects/soc2005/libalias/sys/amd64/include/pmap.h#2 integrate .. //depot/projects/soc2005/libalias/sys/amd64/linux32/linux.h#2 integrate .. //depot/projects/soc2005/libalias/sys/amd64/linux32/linux32_dummy.c#2 integrate .. //depot/projects/soc2005/libalias/sys/amd64/linux32/linux32_machdep.c#2 integrate .. //depot/projects/soc2005/libalias/sys/amd64/linux32/linux32_proto.h#4 integrate .. //depot/projects/soc2005/libalias/sys/amd64/linux32/linux32_syscall.h#4 integrate .. //depot/projects/soc2005/libalias/sys/amd64/linux32/linux32_sysent.c#4 integrate .. //depot/projects/soc2005/libalias/sys/amd64/linux32/linux32_sysvec.c#2 integrate .. //depot/projects/soc2005/libalias/sys/amd64/linux32/syscalls.conf#2 integrate .. //depot/projects/soc2005/libalias/sys/amd64/linux32/syscalls.master#4 integrate .. //depot/projects/soc2005/libalias/sys/arm/arm/elf_trampoline.c#2 integrate .. //depot/projects/soc2005/libalias/sys/arm/arm/mem.c#2 integrate .. //depot/projects/soc2005/libalias/sys/arm/arm/pmap.c#3 integrate .. //depot/projects/soc2005/libalias/sys/arm/arm/vm_machdep.c#3 integrate .. //depot/projects/soc2005/libalias/sys/arm/at91/at91_st.c#3 integrate .. //depot/projects/soc2005/libalias/sys/arm/at91/kb920x_machdep.c#3 integrate .. //depot/projects/soc2005/libalias/sys/arm/include/pmap.h#2 integrate .. //depot/projects/soc2005/libalias/sys/arm/include/sf_buf.h#2 integrate .. //depot/projects/soc2005/libalias/sys/arm/include/vmparam.h#2 integrate .. //depot/projects/soc2005/libalias/sys/arm/sa11x0/assabet_machdep.c#2 integrate .. //depot/projects/soc2005/libalias/sys/arm/xscale/i80321/iq31244_machdep.c#2 integrate .. //depot/projects/soc2005/libalias/sys/boot/Makefile#2 integrate .. //depot/projects/soc2005/libalias/sys/boot/arm/Makefile#1 branch .. //depot/projects/soc2005/libalias/sys/boot/arm/at91/Makefile.inc#2 integrate .. //depot/projects/soc2005/libalias/sys/boot/arm/at91/bootiic/Makefile#2 integrate .. //depot/projects/soc2005/libalias/sys/boot/arm/at91/bootiic/arm_init.S#2 integrate .. //depot/projects/soc2005/libalias/sys/boot/arm/at91/bootiic/env_vars.c#1 branch .. //depot/projects/soc2005/libalias/sys/boot/arm/at91/bootiic/env_vars.h#1 branch .. //depot/projects/soc2005/libalias/sys/boot/arm/at91/bootiic/loader_prompt.c#1 branch .. //depot/projects/soc2005/libalias/sys/boot/arm/at91/bootiic/loader_prompt.h#1 branch .. //depot/projects/soc2005/libalias/sys/boot/arm/at91/bootiic/main.c#2 integrate .. //depot/projects/soc2005/libalias/sys/boot/arm/at91/libat91/Makefile#2 integrate .. //depot/projects/soc2005/libalias/sys/boot/arm/at91/libat91/at91rm9200.h#2 integrate .. //depot/projects/soc2005/libalias/sys/boot/arm/at91/libat91/at91rm9200_lowlevel.h#2 integrate .. //depot/projects/soc2005/libalias/sys/boot/arm/at91/libat91/eeprom.c#2 integrate .. //depot/projects/soc2005/libalias/sys/boot/arm/at91/libat91/eeprom.h#2 delete .. //depot/projects/soc2005/libalias/sys/boot/arm/at91/libat91/emac.c#2 integrate .. //depot/projects/soc2005/libalias/sys/boot/arm/at91/libat91/emac.h#2 integrate .. //depot/projects/soc2005/libalias/sys/boot/arm/at91/libat91/env_vars.c#2 delete .. //depot/projects/soc2005/libalias/sys/boot/arm/at91/libat91/env_vars.h#2 delete .. //depot/projects/soc2005/libalias/sys/boot/arm/at91/libat91/lib.h#2 integrate .. //depot/projects/soc2005/libalias/sys/boot/arm/at91/libat91/loader_prompt.c#2 delete .. //depot/projects/soc2005/libalias/sys/boot/arm/at91/libat91/loader_prompt.h#2 delete .. //depot/projects/soc2005/libalias/sys/boot/arm/at91/libat91/p_string.c#2 integrate .. //depot/projects/soc2005/libalias/sys/boot/arm/at91/libat91/p_string.h#2 delete .. //depot/projects/soc2005/libalias/sys/boot/arm/at91/libat91/spi_flash.c#1 branch .. //depot/projects/soc2005/libalias/sys/boot/arm/at91/libat91/spi_flash.h#1 branch .. //depot/projects/soc2005/libalias/sys/boot/arm/at91/libat91/xmodem.c#2 integrate .. //depot/projects/soc2005/libalias/sys/boot/forth/loader.conf#3 integrate .. //depot/projects/soc2005/libalias/sys/boot/i386/loader/main.c#2 integrate .. //depot/projects/soc2005/libalias/sys/boot/pc98/loader/main.c#2 integrate .. //depot/projects/soc2005/libalias/sys/cam/scsi/scsi_pass.c#2 integrate .. //depot/projects/soc2005/libalias/sys/compat/freebsd32/freebsd32_misc.c#3 integrate .. //depot/projects/soc2005/libalias/sys/compat/freebsd32/freebsd32_proto.h#4 integrate .. //depot/projects/soc2005/libalias/sys/compat/freebsd32/freebsd32_syscall.h#4 integrate .. //depot/projects/soc2005/libalias/sys/compat/freebsd32/freebsd32_syscalls.c#4 integrate .. //depot/projects/soc2005/libalias/sys/compat/freebsd32/freebsd32_sysent.c#4 integrate .. //depot/projects/soc2005/libalias/sys/compat/freebsd32/syscalls.conf#2 integrate .. //depot/projects/soc2005/libalias/sys/compat/linprocfs/linprocfs.c#3 integrate .. //depot/projects/soc2005/libalias/sys/compat/linux/linux_emul.c#1 branch .. //depot/projects/soc2005/libalias/sys/compat/linux/linux_emul.h#1 branch .. //depot/projects/soc2005/libalias/sys/compat/linux/linux_futex.c#1 branch .. //depot/projects/soc2005/libalias/sys/compat/linux/linux_futex.h#1 branch .. //depot/projects/soc2005/libalias/sys/compat/linux/linux_misc.c#3 integrate .. //depot/projects/soc2005/libalias/sys/compat/linux/linux_signal.c#2 integrate .. //depot/projects/soc2005/libalias/sys/compat/linux/linux_time.c#1 branch .. //depot/projects/soc2005/libalias/sys/compat/linux/linux_util.c#2 integrate .. //depot/projects/soc2005/libalias/sys/compat/svr4/svr4_proto.h#4 integrate .. //depot/projects/soc2005/libalias/sys/compat/svr4/svr4_sockio.c#2 integrate .. //depot/projects/soc2005/libalias/sys/compat/svr4/svr4_stream.c#4 integrate .. //depot/projects/soc2005/libalias/sys/compat/svr4/svr4_syscall.h#4 integrate .. //depot/projects/soc2005/libalias/sys/compat/svr4/svr4_syscallnames.c#4 integrate .. //depot/projects/soc2005/libalias/sys/compat/svr4/svr4_sysent.c#4 integrate .. //depot/projects/soc2005/libalias/sys/compat/svr4/syscalls.conf#2 integrate .. //depot/projects/soc2005/libalias/sys/conf/files#5 integrate .. //depot/projects/soc2005/libalias/sys/conf/files.amd64#4 integrate .. //depot/projects/soc2005/libalias/sys/conf/files.i386#4 integrate .. //depot/projects/soc2005/libalias/sys/conf/files.powerpc#3 integrate .. //depot/projects/soc2005/libalias/sys/conf/kern.post.mk#2 integrate .. //depot/projects/soc2005/libalias/sys/conf/kmod.mk#3 integrate .. //depot/projects/soc2005/libalias/sys/conf/options#4 integrate .. //depot/projects/soc2005/libalias/sys/conf/options.arm#3 integrate .. //depot/projects/soc2005/libalias/sys/contrib/dev/acpica/acfreebsd.h#2 integrate .. //depot/projects/soc2005/libalias/sys/contrib/ipfilter/netinet/fil.c#2 integrate .. //depot/projects/soc2005/libalias/sys/contrib/ipfilter/netinet/ip_auth.c#2 integrate .. //depot/projects/soc2005/libalias/sys/contrib/ipfilter/netinet/ip_auth.h#2 integrate .. //depot/projects/soc2005/libalias/sys/contrib/ipfilter/netinet/ip_compat.h#2 integrate .. //depot/projects/soc2005/libalias/sys/contrib/ipfilter/netinet/ip_fil.h#2 integrate .. //depot/projects/soc2005/libalias/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c#2 integrate .. //depot/projects/soc2005/libalias/sys/contrib/ipfilter/netinet/ip_frag.c#2 integrate .. //depot/projects/soc2005/libalias/sys/contrib/ipfilter/netinet/ip_ftp_pxy.c#2 integrate .. //depot/projects/soc2005/libalias/sys/contrib/ipfilter/netinet/ip_log.c#2 integrate .. //depot/projects/soc2005/libalias/sys/contrib/ipfilter/netinet/ip_nat.c#2 integrate .. //depot/projects/soc2005/libalias/sys/contrib/ipfilter/netinet/ip_pptp_pxy.c#2 integrate .. //depot/projects/soc2005/libalias/sys/contrib/ipfilter/netinet/ip_proxy.c#2 integrate .. //depot/projects/soc2005/libalias/sys/contrib/ipfilter/netinet/ip_rcmd_pxy.c#2 integrate .. //depot/projects/soc2005/libalias/sys/contrib/ipfilter/netinet/ip_scan.c#2 integrate .. //depot/projects/soc2005/libalias/sys/contrib/ipfilter/netinet/ip_state.c#2 integrate .. //depot/projects/soc2005/libalias/sys/contrib/ipfilter/netinet/ip_sync.c#2 integrate .. //depot/projects/soc2005/libalias/sys/contrib/ipfilter/netinet/ip_sync.h#2 integrate .. //depot/projects/soc2005/libalias/sys/contrib/ipfilter/netinet/ipl.h#2 integrate .. //depot/projects/soc2005/libalias/sys/contrib/ipfilter/netinet/mlfk_ipl.c#2 integrate .. //depot/projects/soc2005/libalias/sys/ddb/db_ps.c#3 integrate .. //depot/projects/soc2005/libalias/sys/dev/acpi_support/acpi_ibm.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/acpica/Osd/OsdMemory.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/acpica/acpi_dock.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/acpica/acpi_hpet.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/acpica/acpi_pci_link.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/acpica/acpi_video.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/ata/ata-chipset.c#3 integrate .. //depot/projects/soc2005/libalias/sys/dev/ata/ata-disk.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/ata/ata-pci.h#3 integrate .. //depot/projects/soc2005/libalias/sys/dev/ath/if_ath.c#3 integrate .. //depot/projects/soc2005/libalias/sys/dev/ath/if_athioctl.h#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/bce/if_bce.c#3 integrate .. //depot/projects/soc2005/libalias/sys/dev/bge/if_bge.c#3 integrate .. //depot/projects/soc2005/libalias/sys/dev/bge/if_bgereg.h#3 integrate .. //depot/projects/soc2005/libalias/sys/dev/bktr/CHANGELOG.TXT#3 integrate .. //depot/projects/soc2005/libalias/sys/dev/dc/dcphy.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/dc/pnphy.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/dpt/dpt_scsi.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/em/README#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/em/if_em.c#4 integrate .. //depot/projects/soc2005/libalias/sys/dev/em/if_em.h#3 integrate .. //depot/projects/soc2005/libalias/sys/dev/em/if_em_hw.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/em/if_em_hw.h#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/em/if_em_osdep.h#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/exca/excareg.h#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/fe/if_fe.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/hme/if_hme.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/isp/isp.c#3 integrate .. //depot/projects/soc2005/libalias/sys/dev/isp/isp_freebsd.c#3 integrate .. //depot/projects/soc2005/libalias/sys/dev/isp/isp_ioctl.h#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/isp/isp_library.c#3 integrate .. //depot/projects/soc2005/libalias/sys/dev/isp/isp_pci.c#3 integrate .. //depot/projects/soc2005/libalias/sys/dev/isp/isp_target.c#3 integrate .. //depot/projects/soc2005/libalias/sys/dev/isp/isp_target.h#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/isp/isp_tpublic.h#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/isp/ispvar.h#3 integrate .. //depot/projects/soc2005/libalias/sys/dev/ixgb/if_ixgb.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/mii/rgephy.c#3 integrate .. //depot/projects/soc2005/libalias/sys/dev/mxge/if_mxge.c#3 integrate .. //depot/projects/soc2005/libalias/sys/dev/nfe/if_nfe.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/patm/if_patm_intr.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/pccard/pccard_cis.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/pccbb/pccbb.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/pccbb/pccbb_pci.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/pccbb/pccbbreg.h#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/pci/pcivar.h#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/powermac_nvram/powermac_nvram.c#1 branch .. //depot/projects/soc2005/libalias/sys/dev/powermac_nvram/powermac_nvramvar.h#1 branch .. //depot/projects/soc2005/libalias/sys/dev/ral/rt2560.c#3 integrate .. //depot/projects/soc2005/libalias/sys/dev/re/if_re.c#4 integrate .. //depot/projects/soc2005/libalias/sys/dev/sk/if_sk.c#4 integrate .. //depot/projects/soc2005/libalias/sys/dev/sound/pci/emu10k1.c#3 integrate .. //depot/projects/soc2005/libalias/sys/dev/sound/pci/emu10kx-pcm.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/sound/pci/emu10kx.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/sound/pci/emu10kx.h#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/sound/pci/ich.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/stge/if_stge.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/sym/sym_fw1.h#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/sym/sym_fw2.h#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/ti/if_ti.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/ubsec/ubsec.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/usb/if_ural.c#3 integrate .. //depot/projects/soc2005/libalias/sys/dev/usb/usbdevs#3 integrate .. //depot/projects/soc2005/libalias/sys/dev/usb/uscanner.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/wi/if_wavelan_ieee.h#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/wi/if_wi.c#2 integrate .. //depot/projects/soc2005/libalias/sys/dev/wi/if_wireg.h#2 integrate .. //depot/projects/soc2005/libalias/sys/fs/hpfs/hpfs.h#2 integrate .. //depot/projects/soc2005/libalias/sys/fs/msdosfs/msdosfs_vfsops.c#2 integrate .. //depot/projects/soc2005/libalias/sys/fs/nwfs/nwfs_io.c#2 integrate .. //depot/projects/soc2005/libalias/sys/fs/smbfs/smbfs_io.c#2 integrate .. //depot/projects/soc2005/libalias/sys/geom/bde/g_bde_work.c#2 integrate .. //depot/projects/soc2005/libalias/sys/geom/eli/g_eli.c#3 integrate .. //depot/projects/soc2005/libalias/sys/geom/eli/g_eli.h#2 integrate .. //depot/projects/soc2005/libalias/sys/geom/eli/g_eli_ctl.c#2 integrate .. //depot/projects/soc2005/libalias/sys/geom/geom_gpt.c#3 integrate .. //depot/projects/soc2005/libalias/sys/geom/label/g_label.c#2 integrate .. //depot/projects/soc2005/libalias/sys/geom/label/g_label_msdosfs.c#2 integrate .. //depot/projects/soc2005/libalias/sys/geom/label/g_label_msdosfs.h#1 branch .. //depot/projects/soc2005/libalias/sys/geom/mirror/g_mirror.c#3 integrate .. //depot/projects/soc2005/libalias/sys/geom/raid3/g_raid3.c#3 integrate .. //depot/projects/soc2005/libalias/sys/i386/acpica/acpi_machdep.c#2 integrate .. //depot/projects/soc2005/libalias/sys/i386/acpica/acpi_wakeup.c#2 integrate .. //depot/projects/soc2005/libalias/sys/i386/acpica/madt.c#2 integrate .. //depot/projects/soc2005/libalias/sys/i386/conf/XBOX#3 integrate .. //depot/projects/soc2005/libalias/sys/i386/i386/identcpu.c#3 integrate .. //depot/projects/soc2005/libalias/sys/i386/i386/machdep.c#4 integrate .. //depot/projects/soc2005/libalias/sys/i386/i386/pmap.c#3 integrate .. //depot/projects/soc2005/libalias/sys/i386/i386/support.s#2 integrate .. //depot/projects/soc2005/libalias/sys/i386/i386/trap.c#3 integrate .. //depot/projects/soc2005/libalias/sys/i386/i386/tsc.c#2 integrate .. //depot/projects/soc2005/libalias/sys/i386/ibcs2/ibcs2_isc_syscall.h#4 integrate .. //depot/projects/soc2005/libalias/sys/i386/ibcs2/ibcs2_isc_sysent.c#4 integrate .. //depot/projects/soc2005/libalias/sys/i386/ibcs2/ibcs2_proto.h#4 integrate .. //depot/projects/soc2005/libalias/sys/i386/ibcs2/ibcs2_syscall.h#4 integrate .. //depot/projects/soc2005/libalias/sys/i386/ibcs2/ibcs2_sysent.c#4 integrate .. //depot/projects/soc2005/libalias/sys/i386/ibcs2/ibcs2_xenix.h#4 integrate .. //depot/projects/soc2005/libalias/sys/i386/ibcs2/ibcs2_xenix_syscall.h#4 integrate .. //depot/projects/soc2005/libalias/sys/i386/ibcs2/ibcs2_xenix_sysent.c#4 integrate .. //depot/projects/soc2005/libalias/sys/i386/ibcs2/syscalls.conf#2 integrate .. //depot/projects/soc2005/libalias/sys/i386/ibcs2/syscalls.isc.conf#2 integrate .. //depot/projects/soc2005/libalias/sys/i386/ibcs2/syscalls.xenix.conf#2 integrate .. //depot/projects/soc2005/libalias/sys/i386/include/pmap.h#2 integrate .. //depot/projects/soc2005/libalias/sys/i386/isa/clock.c#2 integrate .. //depot/projects/soc2005/libalias/sys/i386/linux/linux.h#2 integrate .. //depot/projects/soc2005/libalias/sys/i386/linux/linux_dummy.c#2 integrate .. //depot/projects/soc2005/libalias/sys/i386/linux/linux_machdep.c#2 integrate .. //depot/projects/soc2005/libalias/sys/i386/linux/linux_proto.h#4 integrate .. //depot/projects/soc2005/libalias/sys/i386/linux/linux_syscall.h#4 integrate .. //depot/projects/soc2005/libalias/sys/i386/linux/linux_sysent.c#4 integrate .. //depot/projects/soc2005/libalias/sys/i386/linux/linux_sysvec.c#2 integrate .. //depot/projects/soc2005/libalias/sys/i386/linux/syscalls.conf#2 integrate .. //depot/projects/soc2005/libalias/sys/i386/linux/syscalls.master#4 integrate .. //depot/projects/soc2005/libalias/sys/i386/xbox/xbox.c#2 integrate .. //depot/projects/soc2005/libalias/sys/ia64/ia64/pmap.c#3 integrate .. //depot/projects/soc2005/libalias/sys/ia64/include/pmap.h#2 integrate .. //depot/projects/soc2005/libalias/sys/kern/Makefile#2 integrate .. //depot/projects/soc2005/libalias/sys/kern/init_sysent.c#4 integrate .. //depot/projects/soc2005/libalias/sys/kern/kern_exec.c#2 integrate .. //depot/projects/soc2005/libalias/sys/kern/kern_fork.c#3 integrate .. //depot/projects/soc2005/libalias/sys/kern/kern_ktrace.c#3 integrate .. //depot/projects/soc2005/libalias/sys/kern/kern_lock.c#3 integrate .. //depot/projects/soc2005/libalias/sys/kern/kern_mutex.c#3 integrate .. //depot/projects/soc2005/libalias/sys/kern/kern_resource.c#2 integrate .. //depot/projects/soc2005/libalias/sys/kern/kern_subr.c#2 integrate .. //depot/projects/soc2005/libalias/sys/kern/kern_sx.c#3 integrate .. //depot/projects/soc2005/libalias/sys/kern/kern_syscalls.c#2 integrate .. //depot/projects/soc2005/libalias/sys/kern/kern_tc.c#2 integrate .. //depot/projects/soc2005/libalias/sys/kern/kern_time.c#2 integrate .. //depot/projects/soc2005/libalias/sys/kern/makesyscalls.sh#3 integrate .. //depot/projects/soc2005/libalias/sys/kern/subr_bus.c#3 integrate .. //depot/projects/soc2005/libalias/sys/kern/subr_rman.c#2 integrate .. //depot/projects/soc2005/libalias/sys/kern/subr_turnstile.c#3 integrate .. //depot/projects/soc2005/libalias/sys/kern/syscalls.c#4 integrate .. //depot/projects/soc2005/libalias/sys/kern/syscalls.master#4 integrate .. //depot/projects/soc2005/libalias/sys/kern/systrace_args.c#1 branch .. //depot/projects/soc2005/libalias/sys/kern/uipc_proto.c#2 delete .. //depot/projects/soc2005/libalias/sys/kern/uipc_sem.c#2 integrate .. //depot/projects/soc2005/libalias/sys/kern/uipc_sockbuf.c#2 integrate .. //depot/projects/soc2005/libalias/sys/kern/uipc_socket.c#3 integrate .. //depot/projects/soc2005/libalias/sys/kern/uipc_socket2.c#3 integrate .. //depot/projects/soc2005/libalias/sys/kern/uipc_syscalls.c#4 integrate .. //depot/projects/soc2005/libalias/sys/kern/uipc_usrreq.c#4 integrate .. //depot/projects/soc2005/libalias/sys/kern/vfs_aio.c#2 integrate .. //depot/projects/soc2005/libalias/sys/kern/vfs_bio.c#3 integrate .. //depot/projects/soc2005/libalias/sys/kern/vfs_lookup.c#2 integrate .. //depot/projects/soc2005/libalias/sys/kern/vfs_subr.c#3 integrate .. //depot/projects/soc2005/libalias/sys/kern/vfs_syscalls.c#4 integrate .. //depot/projects/soc2005/libalias/sys/libkern/strstr.c#1 branch .. //depot/projects/soc2005/libalias/sys/modules/Makefile#5 integrate .. //depot/projects/soc2005/libalias/sys/modules/if_ef/Makefile#2 integrate .. //depot/projects/soc2005/libalias/sys/modules/if_ppp/Makefile#2 integrate .. //depot/projects/soc2005/libalias/sys/modules/linprocfs/Makefile#2 integrate .. //depot/projects/soc2005/libalias/sys/modules/linsysfs/Makefile#2 integrate .. //depot/projects/soc2005/libalias/sys/modules/linux/Makefile#2 integrate .. //depot/projects/soc2005/libalias/sys/modules/netgraph/mppc/Makefile#2 integrate .. //depot/projects/soc2005/libalias/sys/modules/powermac_nvram/Makefile#1 branch .. //depot/projects/soc2005/libalias/sys/modules/sound/sound/Makefile#2 integrate .. //depot/projects/soc2005/libalias/sys/net/bpf.c#3 integrate .. //depot/projects/soc2005/libalias/sys/net/bridgestp.c#3 integrate .. //depot/projects/soc2005/libalias/sys/net/bridgestp.h#2 integrate .. //depot/projects/soc2005/libalias/sys/net/if_bridge.c#5 integrate .. //depot/projects/soc2005/libalias/sys/net/if_bridgevar.h#4 integrate .. //depot/projects/soc2005/libalias/sys/net/if_faith.c#3 integrate .. //depot/projects/soc2005/libalias/sys/net/if_gif.c#5 integrate .. //depot/projects/soc2005/libalias/sys/net/if_gre.c#3 integrate .. //depot/projects/soc2005/libalias/sys/net/if_stf.c#3 integrate .. //depot/projects/soc2005/libalias/sys/net/if_tun.c#3 integrate .. //depot/projects/soc2005/libalias/sys/net/if_var.h#2 integrate .. //depot/projects/soc2005/libalias/sys/net/if_vlan.c#3 integrate .. //depot/projects/soc2005/libalias/sys/net/net_osdep.h#2 delete .. //depot/projects/soc2005/libalias/sys/net80211/ieee80211_input.c#3 integrate .. //depot/projects/soc2005/libalias/sys/net80211/ieee80211_ioctl.c#3 integrate .. //depot/projects/soc2005/libalias/sys/net80211/ieee80211_ioctl.h#3 integrate .. //depot/projects/soc2005/libalias/sys/net80211/ieee80211_output.c#3 integrate .. //depot/projects/soc2005/libalias/sys/netatalk/ddp_pcb.c#2 integrate .. //depot/projects/soc2005/libalias/sys/netatalk/ddp_usrreq.c#3 integrate .. //depot/projects/soc2005/libalias/sys/netgraph/ng_ether.c#4 integrate .. //depot/projects/soc2005/libalias/sys/netgraph/ng_pppoe.c#2 integrate .. //depot/projects/soc2005/libalias/sys/netgraph/ng_pppoe.h#2 integrate .. //depot/projects/soc2005/libalias/sys/netinet/in_gif.c#2 integrate .. //depot/projects/soc2005/libalias/sys/netinet/ip_encap.c#2 integrate .. //depot/projects/soc2005/libalias/sys/netinet/ip_fw2.c#4 integrate .. //depot/projects/soc2005/libalias/sys/netinet/tcp_input.c#3 integrate .. //depot/projects/soc2005/libalias/sys/netinet/tcp_subr.c#3 integrate .. //depot/projects/soc2005/libalias/sys/netinet/tcp_timer.c#2 integrate .. //depot/projects/soc2005/libalias/sys/netinet/tcp_timer.h#2 integrate .. //depot/projects/soc2005/libalias/sys/netinet6/ah_aesxcbcmac.c#2 integrate .. //depot/projects/soc2005/libalias/sys/netinet6/ah_core.c#2 integrate .. //depot/projects/soc2005/libalias/sys/netinet6/ah_input.c#2 integrate .. //depot/projects/soc2005/libalias/sys/netinet6/ah_output.c#2 integrate .. //depot/projects/soc2005/libalias/sys/netinet6/esp_aesctr.c#2 integrate .. //depot/projects/soc2005/libalias/sys/netinet6/esp_core.c#2 integrate .. //depot/projects/soc2005/libalias/sys/netinet6/esp_input.c#2 integrate .. //depot/projects/soc2005/libalias/sys/netinet6/esp_output.c#2 integrate .. //depot/projects/soc2005/libalias/sys/netinet6/esp_rijndael.c#2 integrate .. //depot/projects/soc2005/libalias/sys/netinet6/frag6.c#2 integrate .. //depot/projects/soc2005/libalias/sys/netinet6/icmp6.c#3 integrate .. //depot/projects/soc2005/libalias/sys/netinet6/in6.c#3 integrate .. //depot/projects/soc2005/libalias/sys/netinet6/in6_cksum.c#3 integrate .. //depot/projects/soc2005/libalias/sys/netinet6/in6_gif.c#2 integrate .. //depot/projects/soc2005/libalias/sys/netinet6/in6_ifattach.c#2 integrate .. //depot/projects/soc2005/libalias/sys/netinet6/in6_proto.c#2 integrate .. //depot/projects/soc2005/libalias/sys/netinet6/in6_src.c#2 integrate .. //depot/projects/soc2005/libalias/sys/netinet6/ip6_forward.c#2 integrate .. //depot/projects/soc2005/libalias/sys/netinet6/ip6_input.c#2 integrate .. //depot/projects/soc2005/libalias/sys/netinet6/ip6_mroute.c#2 integrate .. //depot/projects/soc2005/libalias/sys/netinet6/ip6_output.c#2 integrate .. //depot/projects/soc2005/libalias/sys/netinet6/ipcomp_core.c#2 integrate .. //depot/projects/soc2005/libalias/sys/netinet6/ipcomp_input.c#2 integrate .. //depot/projects/soc2005/libalias/sys/netinet6/ipcomp_output.c#2 integrate .. //depot/projects/soc2005/libalias/sys/netinet6/ipsec.c#3 integrate .. //depot/projects/soc2005/libalias/sys/netinet6/mld6.c#2 integrate .. //depot/projects/soc2005/libalias/sys/netinet6/nd6.c#2 integrate .. //depot/projects/soc2005/libalias/sys/netinet6/nd6_nbr.c#2 integrate .. //depot/projects/soc2005/libalias/sys/netinet6/nd6_rtr.c#2 integrate .. //depot/projects/soc2005/libalias/sys/netinet6/udp6_output.c#2 integrate .. //depot/projects/soc2005/libalias/sys/netkey/key.c#2 integrate .. //depot/projects/soc2005/libalias/sys/netkey/keydb.c#2 integrate .. //depot/projects/soc2005/libalias/sys/netncp/ncp_sock.c#3 integrate .. //depot/projects/soc2005/libalias/sys/netsmb/smb_trantcp.c#3 integrate .. //depot/projects/soc2005/libalias/sys/nfsclient/nfs_bio.c#2 integrate .. //depot/projects/soc2005/libalias/sys/nfsclient/nfs_vfsops.c#2 integrate .. //depot/projects/soc2005/libalias/sys/nfsserver/nfs.h#2 integrate .. //depot/projects/soc2005/libalias/sys/nfsserver/nfs_srvcache.c#2 integrate .. //depot/projects/soc2005/libalias/sys/nfsserver/nfs_srvsubs.c#3 integrate .. //depot/projects/soc2005/libalias/sys/nfsserver/nfs_syscalls.c#2 integrate .. //depot/projects/soc2005/libalias/sys/pc98/include/md_var.h#2 integrate .. //depot/projects/soc2005/libalias/sys/pc98/pc98/pc98_machdep.c#2 integrate .. //depot/projects/soc2005/libalias/sys/pci/agp.c#2 integrate .. //depot/projects/soc2005/libalias/sys/pci/if_rlreg.h#4 integrate .. //depot/projects/soc2005/libalias/sys/pci/if_xl.c#2 integrate .. //depot/projects/soc2005/libalias/sys/pci/ncr.c#2 integrate .. //depot/projects/soc2005/libalias/sys/powerpc/conf/GENERIC#4 integrate .. //depot/projects/soc2005/libalias/sys/powerpc/powerpc/intr_machdep.c#2 integrate .. //depot/projects/soc2005/libalias/sys/powerpc/powerpc/machdep.c#2 integrate .. //depot/projects/soc2005/libalias/sys/powerpc/powerpc/mmu_if.m#2 integrate .. //depot/projects/soc2005/libalias/sys/powerpc/powerpc/mmu_oea.c#3 integrate .. //depot/projects/soc2005/libalias/sys/powerpc/powerpc/pmap_dispatch.c#2 integrate .. //depot/projects/soc2005/libalias/sys/security/mac_biba/mac_biba.c#3 integrate .. //depot/projects/soc2005/libalias/sys/sparc64/sparc64/pmap.c#2 integrate .. //depot/projects/soc2005/libalias/sys/sys/dirent.h#2 integrate .. //depot/projects/soc2005/libalias/sys/sys/domain.h#2 integrate .. //depot/projects/soc2005/libalias/sys/sys/eventhandler.h#2 integrate .. //depot/projects/soc2005/libalias/sys/sys/imgact.h#2 integrate .. //depot/projects/soc2005/libalias/sys/sys/kernel.h#2 integrate .. //depot/projects/soc2005/libalias/sys/sys/libkern.h#3 integrate .. //depot/projects/soc2005/libalias/sys/sys/lockmgr.h#2 integrate .. //depot/projects/soc2005/libalias/sys/sys/mac_policy.h#2 integrate .. //depot/projects/soc2005/libalias/sys/sys/param.h#4 integrate .. //depot/projects/soc2005/libalias/sys/sys/socketvar.h#3 integrate .. //depot/projects/soc2005/libalias/sys/sys/stat.h#2 integrate .. //depot/projects/soc2005/libalias/sys/sys/sx.h#2 integrate .. //depot/projects/soc2005/libalias/sys/sys/syscall.h#4 integrate .. //depot/projects/soc2005/libalias/sys/sys/syscall.mk#4 integrate .. //depot/projects/soc2005/libalias/sys/sys/sysctl.h#3 integrate .. //depot/projects/soc2005/libalias/sys/sys/sysent.h#3 integrate .. //depot/projects/soc2005/libalias/sys/sys/sysproto.h#4 integrate .. //depot/projects/soc2005/libalias/sys/sys/systm.h#3 integrate .. //depot/projects/soc2005/libalias/sys/sys/time.h#2 integrate .. //depot/projects/soc2005/libalias/sys/sys/types.h#2 integrate .. //depot/projects/soc2005/libalias/sys/ufs/ufs/ufs_lookup.c#3 integrate .. //depot/projects/soc2005/libalias/sys/vm/device_pager.c#2 integrate .. //depot/projects/soc2005/libalias/sys/vm/pmap.h#3 integrate .. //depot/projects/soc2005/libalias/sys/vm/swap_pager.c#2 integrate .. //depot/projects/soc2005/libalias/sys/vm/vm_fault.c#3 integrate .. //depot/projects/soc2005/libalias/sys/vm/vm_object.c#3 integrate .. //depot/projects/soc2005/libalias/sys/vm/vm_page.c#3 integrate .. //depot/projects/soc2005/libalias/sys/vm/vm_page.h#2 integrate .. //depot/projects/soc2005/libalias/sys/vm/vm_pageout.c#2 integrate .. //depot/projects/soc2005/libalias/sys/vm/vnode_pager.c#2 integrate .. //depot/projects/soc2005/libalias/tools/build/options/WITHOUT_GNU#1 branch .. //depot/projects/soc2005/libalias/tools/build/options/WITHOUT_NS_CACHING#1 branch .. //depot/projects/soc2005/libalias/tools/build/options/WITHOUT_PAM#1 branch .. //depot/projects/soc2005/libalias/tools/build/options/makeman#2 integrate .. //depot/projects/soc2005/libalias/tools/kerneldoc/subsys/Makefile#2 integrate .. //depot/projects/soc2005/libalias/tools/regression/fsx/fsx.c#2 integrate .. //depot/projects/soc2005/libalias/tools/tools/ath/athstats/Makefile#2 integrate .. //depot/projects/soc2005/libalias/tools/tools/ath/athstats/athstats.c#2 integrate .. //depot/projects/soc2005/libalias/tools/tools/ath/athstats/athstats.h#1 branch .. //depot/projects/soc2005/libalias/tools/tools/ath/athstats/main.c#1 branch .. //depot/projects/soc2005/libalias/tools/tools/ath/athstats/statfoo.c#1 branch .. //depot/projects/soc2005/libalias/tools/tools/ath/athstats/statfoo.h#1 branch .. //depot/projects/soc2005/libalias/tools/tools/nanobsd/nanobsd.sh#4 integrate .. //depot/projects/soc2005/libalias/tools/tools/net80211/Makefile#2 integrate .. //depot/projects/soc2005/libalias/tools/tools/net80211/README#1 branch .. //depot/projects/soc2005/libalias/tools/tools/net80211/stumbler/Makefile#1 branch .. //depot/projects/soc2005/libalias/tools/tools/net80211/stumbler/stumbler.c#1 branch .. //depot/projects/soc2005/libalias/tools/tools/net80211/w00t/Makefile#1 branch .. //depot/projects/soc2005/libalias/tools/tools/net80211/w00t/Makefile.inc#1 branch .. //depot/projects/soc2005/libalias/tools/tools/net80211/w00t/README#1 branch .. //depot/projects/soc2005/libalias/tools/tools/net80211/w00t/ap/Makefile#1 branch .. //depot/projects/soc2005/libalias/tools/tools/net80211/w00t/ap/ap.c#1 branch .. //depot/projects/soc2005/libalias/tools/tools/net80211/w00t/assoc/Makefile#1 branch .. //depot/projects/soc2005/libalias/tools/tools/net80211/w00t/assoc/assoc.c#1 branch .. //depot/projects/soc2005/libalias/tools/tools/net80211/w00t/expand/Makefile#1 branch .. //depot/projects/soc2005/libalias/tools/tools/net80211/w00t/expand/expand.c#1 branch .. //depot/projects/soc2005/libalias/tools/tools/net80211/w00t/libw00t/Makefile#1 branch .. //depot/projects/soc2005/libalias/tools/tools/net80211/w00t/libw00t/w00t.c#1 branch .. //depot/projects/soc2005/libalias/tools/tools/net80211/w00t/libw00t/w00t.h#1 branch .. //depot/projects/soc2005/libalias/tools/tools/net80211/w00t/prga/Makefile#1 branch .. //depot/projects/soc2005/libalias/tools/tools/net80211/w00t/prga/prga.c#1 branch .. //depot/projects/soc2005/libalias/tools/tools/net80211/w00t/redir/Makefile#1 branch .. //depot/projects/soc2005/libalias/tools/tools/net80211/w00t/redir/buddy.c#1 branch .. //depot/projects/soc2005/libalias/tools/tools/net80211/w00t/redir/redir.c#1 branch .. //depot/projects/soc2005/libalias/tools/tools/net80211/wesside/Makefile#1 branch .. //depot/projects/soc2005/libalias/tools/tools/net80211/wesside/README#1 branch .. //depot/projects/soc2005/libalias/tools/tools/net80211/wesside/dics/Makefile#1 branch .. //depot/projects/soc2005/libalias/tools/tools/net80211/wesside/dics/dics.c#1 branch .. //depot/projects/soc2005/libalias/tools/tools/net80211/wesside/udps/Makefile#1 branch .. //depot/projects/soc2005/libalias/tools/tools/net80211/wesside/udps/udps.c#1 branch .. //depot/projects/soc2005/libalias/tools/tools/net80211/wesside/wesside/Makefile#1 branch .. //depot/projects/soc2005/libalias/tools/tools/net80211/wesside/wesside/wesside.c#1 branch .. //depot/projects/soc2005/libalias/tools/tools/net80211/wlaninject/Makefile#1 branch .. //depot/projects/soc2005/libalias/tools/tools/net80211/wlaninject/README#1 branch .. //depot/projects/soc2005/libalias/tools/tools/net80211/wlaninject/wlaninject.c#1 branch .. //depot/projects/soc2005/libalias/tools/tools/net80211/wlanstats/Makefile#2 integrate .. //depot/projects/soc2005/libalias/tools/tools/net80211/wlanstats/main.c#1 branch .. //depot/projects/soc2005/libalias/tools/tools/net80211/wlanstats/statfoo.c#1 branch .. //depot/projects/soc2005/libalias/tools/tools/net80211/wlanstats/statfoo.h#1 branch .. //depot/projects/soc2005/libalias/tools/tools/net80211/wlanstats/wlanstats.c#2 integrate .. //depot/projects/soc2005/libalias/tools/tools/net80211/wlanstats/wlanstats.h#1 branch .. //depot/projects/soc2005/libalias/usr.bin/hexdump/conv.c#2 integrate .. //depot/projects/soc2005/libalias/usr.bin/hexdump/parse.c#2 integrate .. //depot/projects/soc2005/libalias/usr.bin/logger/logger.1#2 integrate .. //depot/projects/soc2005/libalias/usr.bin/logger/logger.c#2 integrate .. //depot/projects/soc2005/libalias/usr.bin/split/split.1#2 integrate .. //depot/projects/soc2005/libalias/usr.bin/split/split.c#2 integrate .. //depot/projects/soc2005/libalias/usr.bin/telnet/Makefile#3 integrate .. //depot/projects/soc2005/libalias/usr.sbin/Makefile#3 integrate .. //depot/projects/soc2005/libalias/usr.sbin/elf2exe/Makefile#2 delete .. //depot/projects/soc2005/libalias/usr.sbin/elf2exe/elf2exe.8#2 delete .. //depot/projects/soc2005/libalias/usr.sbin/elf2exe/elf2exe.c#2 delete .. //depot/projects/soc2005/libalias/usr.sbin/inetd/Makefile#3 integrate .. //depot/projects/soc2005/libalias/usr.sbin/kldxref/Makefile#4 integrate .. //depot/projects/soc2005/libalias/usr.sbin/kldxref/kldxref.c#3 integrate .. //depot/projects/soc2005/libalias/usr.sbin/mailwrapper/mailwrapper.8#2 integrate .. //depot/projects/soc2005/libalias/usr.sbin/mailwrapper/mailwrapper.c#2 integrate .. //depot/projects/soc2005/libalias/usr.sbin/named/Makefile#2 integrate .. //depot/projects/soc2005/libalias/usr.sbin/ngctl/Makefile#2 integrate .. //depot/projects/soc2005/libalias/usr.sbin/ngctl/main.c#3 integrate .. //depot/projects/soc2005/libalias/usr.sbin/nvram/Makefile#1 branch .. //depot/projects/soc2005/libalias/usr.sbin/nvram/nvram.8#1 branch .. //depot/projects/soc2005/libalias/usr.sbin/nvram/nvram.c#1 branch .. //depot/projects/soc2005/libalias/usr.sbin/pkg_install/lib/url.c#3 integrate .. //depot/projects/soc2005/libalias/usr.sbin/pkg_install/version/perform.c#2 integrate .. //depot/projects/soc2005/libalias/usr.sbin/rpc.lockd/lockd_lock.c#2 integrate .. //depot/projects/soc2005/libalias/usr.sbin/rpc.statd/procs.c#2 integrate .. //depot/projects/soc2005/libalias/usr.sbin/rtsold/rtsold.8#2 integrate .. //depot/projects/soc2005/libalias/usr.sbin/sade/Makefile#2 integrate .. //depot/projects/soc2005/libalias/usr.sbin/sade/command.c#2 integrate .. //depot/projects/soc2005/libalias/usr.sbin/sade/config.c#2 integrate .. //depot/projects/soc2005/libalias/usr.sbin/sade/devices.c#2 integrate .. //depot/projects/soc2005/libalias/usr.sbin/sade/disks.c#2 integrate .. //depot/projects/soc2005/libalias/usr.sbin/sade/dispatch.c#2 integrate .. //depot/projects/soc2005/libalias/usr.sbin/sade/dmenu.c#2 integrate .. //depot/projects/soc2005/libalias/usr.sbin/sade/globals.c#2 integrate .. //depot/projects/soc2005/libalias/usr.sbin/sade/install.c#2 integrate .. //depot/projects/soc2005/libalias/usr.sbin/sade/keymap.c#2 delete .. //depot/projects/soc2005/libalias/usr.sbin/sade/label.c#2 integrate .. //depot/projects/soc2005/libalias/usr.sbin/sade/list.h#2 integrate .. //depot/projects/soc2005/libalias/usr.sbin/sade/main.c#2 integrate .. //depot/projects/soc2005/libalias/usr.sbin/sade/menus.c#2 integrate .. //depot/projects/soc2005/libalias/usr.sbin/sade/misc.c#2 integrate .. //depot/projects/soc2005/libalias/usr.sbin/sade/msg.c#2 integrate .. //depot/projects/soc2005/libalias/usr.sbin/sade/rtermcap.c#2 delete .. //depot/projects/soc2005/libalias/usr.sbin/sade/sade.8#2 integrate .. //depot/projects/soc2005/libalias/usr.sbin/sade/sade.h#2 integrate .. //depot/projects/soc2005/libalias/usr.sbin/sade/system.c#2 integrate .. //depot/projects/soc2005/libalias/usr.sbin/sade/termcap.c#2 integrate .. //depot/projects/soc2005/libalias/usr.sbin/sade/usb.c#2 delete .. //depot/projects/soc2005/libalias/usr.sbin/sade/variable.c#2 integrate .. //depot/projects/soc2005/libalias/usr.sbin/sade/wizard.c#2 integrate .. //depot/projects/soc2005/libalias/usr.sbin/yppush/yppush_main.c#2 integrate Differences ... ==== //depot/projects/soc2005/libalias/Makefile.inc1#2 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.549 2006/06/06 18:07:58 imp Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.552 2006/08/09 11:03:06 netchild Exp $ # # Make command line options: # -DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir @@ -731,7 +731,7 @@ echo "You need doxygen (devel/doxygen) to generate the API documentation of the kernel." | /usr/bin/fmt; \ exit 1; \ fi - cd ${.CURDIR}/sys/doc/subsys && ${MAKE} obj all + cd ${.CURDIR}/tools/kerneldoc/subsys && ${MAKE} obj all # # update ==== //depot/projects/soc2005/libalias/ObsoleteFiles.inc#3 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/ObsoleteFiles.inc,v 1.41 2006/07/08 03:22:44 avatar Exp $ +# $FreeBSD: src/ObsoleteFiles.inc,v 1.47 2006/08/14 18:20:36 netchild Exp $ # # This file lists old files (OLD_FILES), libraries (OLD_LIBS) and # directories (OLD_DIRS) which should get removed at an update. Recently @@ -14,6 +14,8 @@ # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last. # +# 20060704: KAME compat file net_osdep.h removed +OLD_FILES+=usr/include/net/net_osdep.h # 20060517: pcvt removed OLD_FILES+=usr/share/pcvt/README.FIRST OLD_FILES+=usr/share/pcvt/Etc/xmodmap-german @@ -743,6 +745,7 @@ OLD_FILES+=usr/bin/perlcc OLD_FILES+=usr/bin/perldoc OLD_FILES+=usr/bin/suidperl +OLD_FILES+=usr/lib/pam_ftp.so OLD_FILES+=usr/libdata/perl/5.00503/CGI/Apache.pm OLD_FILES+=usr/libdata/perl/5.00503/CGI/Carp.pm OLD_FILES+=usr/libdata/perl/5.00503/CGI/Cookie.pm @@ -2724,7 +2727,209 @@ OLD_FILES+=usr/games/worm OLD_FILES+=usr/games/worms OLD_FILES+=usr/games/wump +OLD_FILES+=sbin/mount_reiserfs +OLD_FILES+=usr/bin/hesinfo +OLD_FILES+=usr/share/examples/etc/usbd.conf +OLD_FILES+=usr/share/examples/meteor/README +OLD_FILES+=usr/share/examples/meteor/rgb16.c +OLD_FILES+=usr/share/examples/meteor/rgb24.c +OLD_FILES+=usr/share/examples/meteor/test-n.c +OLD_FILES+=usr/share/examples/meteor/yuvpk.c +OLD_FILES+=usr/share/examples/meteor/yuvpl.c +OLD_FILES+=usr/share/examples/worm/README +OLD_FILES+=usr/share/examples/worm/makecdfs.sh +OLD_FILES+=usr/share/groff_font/devlj4/Makefile +OLD_FILES+=usr/share/groff_font/devlj4/text.map +OLD_FILES+=usr/share/groff_font/devlj4/special.map +OLD_FILES+=usr/share/misc/nslookup.help +OLD_FILES+=usr/share/sendmail/cf/feature/nodns.m4 +OLD_FILES+=usr/share/syscons/keymaps/lat-amer.kbd +OLD_FILES+=usr/share/vi/catalog/ru_SU.KOI8-R +OLD_FILES+=usr/share/zoneinfo/Africa/Timbuktu +OLD_FILES+=usr/share/zoneinfo/America/Buenos_Aires +OLD_FILES+=usr/share/zoneinfo/America/Cordoba +OLD_FILES+=usr/share/zoneinfo/America/Jujuy +OLD_FILES+=usr/share/zoneinfo/America/Catamarca +OLD_FILES+=usr/share/zoneinfo/America/Mendoza +OLD_FILES+=usr/share/zoneinfo/America/Indianapolis +OLD_FILES+=usr/share/zoneinfo/America/Louisville +OLD_FILES+=usr/share/zoneinfo/America/Argentina/ComodRivadavia +OLD_FILES+=usr/share/zoneinfo/Europe/Belfast +OLD_FILES+=usr/share/zoneinfo/Pacific/Yap +OLD_FILES+=usr/share/zoneinfo/SystemV/YST9 +OLD_FILES+=usr/share/zoneinfo/SystemV/PST8 +OLD_FILES+=usr/share/zoneinfo/SystemV/EST5EDT +OLD_FILES+=usr/share/zoneinfo/SystemV/CST6CDT +OLD_FILES+=usr/share/zoneinfo/SystemV/MST7MDT +OLD_FILES+=usr/share/zoneinfo/SystemV/PST8PDT +OLD_FILES+=usr/share/zoneinfo/SystemV/YST9YDT +OLD_FILES+=usr/share/zoneinfo/SystemV/HST10 +OLD_FILES+=usr/share/zoneinfo/SystemV/MST7 +OLD_FILES+=usr/share/zoneinfo/SystemV/EST5 +OLD_FILES+=usr/share/zoneinfo/SystemV/AST4ADT +OLD_FILES+=usr/share/zoneinfo/SystemV/CST6 +OLD_FILES+=usr/share/zoneinfo/SystemV/AST4 +OLD_FILES+=usr/share/doc/ntp/accopt.htm +OLD_FILES+=usr/share/doc/ntp/assoc.htm +OLD_FILES+=usr/share/doc/ntp/audio.htm +OLD_FILES+=usr/share/doc/ntp/authopt.htm +OLD_FILES+=usr/share/doc/ntp/biblio.htm +OLD_FILES+=usr/share/doc/ntp/build.htm +OLD_FILES+=usr/share/doc/ntp/clockopt.htm +OLD_FILES+=usr/share/doc/ntp/config.htm +OLD_FILES+=usr/share/doc/ntp/confopt.htm +OLD_FILES+=usr/share/doc/ntp/copyright.htm +OLD_FILES+=usr/share/doc/ntp/debug.htm +OLD_FILES+=usr/share/doc/ntp/driver1.htm +OLD_FILES+=usr/share/doc/ntp/driver10.htm +OLD_FILES+=usr/share/doc/ntp/driver11.htm +OLD_FILES+=usr/share/doc/ntp/driver12.htm +OLD_FILES+=usr/share/doc/ntp/driver16.htm +OLD_FILES+=usr/share/doc/ntp/driver18.htm +OLD_FILES+=usr/share/doc/ntp/driver19.htm +OLD_FILES+=usr/share/doc/ntp/driver2.htm +OLD_FILES+=usr/share/doc/ntp/driver20.htm +OLD_FILES+=usr/share/doc/ntp/driver22.htm +OLD_FILES+=usr/share/doc/ntp/driver23.htm +OLD_FILES+=usr/share/doc/ntp/driver24.htm +OLD_FILES+=usr/share/doc/ntp/driver26.htm +OLD_FILES+=usr/share/doc/ntp/driver27.htm +OLD_FILES+=usr/share/doc/ntp/driver28.htm +OLD_FILES+=usr/share/doc/ntp/driver29.htm +OLD_FILES+=usr/share/doc/ntp/driver3.htm +OLD_FILES+=usr/share/doc/ntp/driver30.htm +OLD_FILES+=usr/share/doc/ntp/driver32.htm +OLD_FILES+=usr/share/doc/ntp/driver33.htm +OLD_FILES+=usr/share/doc/ntp/driver34.htm +OLD_FILES+=usr/share/doc/ntp/driver35.htm +OLD_FILES+=usr/share/doc/ntp/driver36.htm +OLD_FILES+=usr/share/doc/ntp/driver37.htm +OLD_FILES+=usr/share/doc/ntp/driver4.htm +OLD_FILES+=usr/share/doc/ntp/driver5.htm +OLD_FILES+=usr/share/doc/ntp/driver6.htm +OLD_FILES+=usr/share/doc/ntp/driver7.htm +OLD_FILES+=usr/share/doc/ntp/driver8.htm +OLD_FILES+=usr/share/doc/ntp/driver9.htm +OLD_FILES+=usr/share/doc/ntp/exec.htm +OLD_FILES+=usr/share/doc/ntp/extern.htm +OLD_FILES+=usr/share/doc/ntp/gadget.htm +OLD_FILES+=usr/share/doc/ntp/hints.htm +OLD_FILES+=usr/share/doc/ntp/howto.htm +OLD_FILES+=usr/share/doc/ntp/htmlprimer.htm +OLD_FILES+=usr/share/doc/ntp/index.htm +OLD_FILES+=usr/share/doc/ntp/kern.htm +OLD_FILES+=usr/share/doc/ntp/kernpps.htm +OLD_FILES+=usr/share/doc/ntp/ldisc.htm +OLD_FILES+=usr/share/doc/ntp/measure.htm +OLD_FILES+=usr/share/doc/ntp/miscopt.htm +OLD_FILES+=usr/share/doc/ntp/monopt.htm +OLD_FILES+=usr/share/doc/ntp/mx4200data.htm +OLD_FILES+=usr/share/doc/ntp/notes.htm +OLD_FILES+=usr/share/doc/ntp/ntpd.htm +OLD_FILES+=usr/share/doc/ntp/ntpdate.htm +OLD_FILES+=usr/share/doc/ntp/ntpdc.htm +OLD_FILES+=usr/share/doc/ntp/ntpq.htm +OLD_FILES+=usr/share/doc/ntp/ntptime.htm +OLD_FILES+=usr/share/doc/ntp/ntptrace.htm +OLD_FILES+=usr/share/doc/ntp/parsedata.htm +OLD_FILES+=usr/share/doc/ntp/parsenew.htm +OLD_FILES+=usr/share/doc/ntp/patches.htm +OLD_FILES+=usr/share/doc/ntp/porting.htm +OLD_FILES+=usr/share/doc/ntp/pps.htm +OLD_FILES+=usr/share/doc/ntp/prefer.htm +OLD_FILES+=usr/share/doc/ntp/qth.htm +OLD_FILES+=usr/share/doc/ntp/quick.htm +OLD_FILES+=usr/share/doc/ntp/rdebug.htm +OLD_FILES+=usr/share/doc/ntp/refclock.htm +OLD_FILES+=usr/share/doc/ntp/release.htm +OLD_FILES+=usr/share/doc/ntp/tickadj.htm +OLD_FILES+=usr/share/doc/papers/nqnfs.ascii.gz +OLD_FILES+=usr/share/doc/papers/px.ascii.gz +OLD_FILES+=usr/share/man/man1/hesinfo.1.gz +OLD_FILES+=usr/share/man/man3/mbrune.3.gz +OLD_FILES+=usr/share/man/man3/rune.3.gz +OLD_FILES+=usr/share/man/man3/hesiod.3.gz +OLD_FILES+=usr/share/man/man3/mac_is_present_np.3.gz +OLD_FILES+=usr/share/man/man3/fpsetsticky.3.gz +OLD_FILES+=usr/share/man/man3/gss_krb5_copy_ccache.3.gz +OLD_FILES+=usr/share/man/man3/gss_krb5_compat_des3_mic.3.gz +OLD_FILES+=usr/share/man/man3/exp10f.3.gz +OLD_FILES+=usr/share/man/man3/exp10.3.gz +OLD_FILES+=usr/share/man/man3/mbrrune.3.gz +OLD_FILES+=usr/share/man/man3/mbmb.3.gz +OLD_FILES+=usr/share/man/man3/sputrune.3.gz +OLD_FILES+=usr/share/man/man3/sgetrune.3.gz +OLD_FILES+=usr/share/man/man3/setrunelocale.3.gz +OLD_FILES+=usr/share/man/man3/setinvalidrune.3.gz +OLD_FILES+=usr/share/man/man3/mbrune.3.gz +OLD_FILES+=usr/share/man/man3/rune.3.gz +OLD_FILES+=usr/share/man/man3/hesiod.3.gz +OLD_FILES+=usr/share/man/man3/mac_is_present_np.3.gz +OLD_FILES+=usr/share/man/man3/fpsetsticky.3.gz +OLD_FILES+=usr/share/man/man3/gss_krb5_copy_ccache.3.gz +OLD_FILES+=usr/share/man/man3/gss_krb5_compat_des3_mic.3.gz +OLD_FILES+=usr/share/man/man3/exp10f.3.gz +OLD_FILES+=usr/share/man/man3/exp10.3.gz +OLD_FILES+=usr/share/man/man3/mbrrune.3.gz +OLD_FILES+=usr/share/man/man3/mbmb.3.gz +OLD_FILES+=usr/share/man/man3/sputrune.3.gz +OLD_FILES+=usr/share/man/man3/sgetrune.3.gz +OLD_FILES+=usr/share/man/man3/setrunelocale.3.gz +OLD_FILES+=usr/share/man/man3/setinvalidrune.3.gz +OLD_FILES+=usr/share/man/man3/fungetrune.3.gz +OLD_FILES+=usr/share/man/man3/fputrune.3.gz +OLD_FILES+=usr/share/man/man3/fgetrune.3.gz +OLD_FILES+=usr/share/man/man5/hesiod.conf.5.gz +OLD_FILES+=usr/share/man/man5/usbd.conf.5.gz +.if ${TARGET_ARCH} != "i386" +OLD_FILES+=usr/share/man/man8/boot_i386.8.gz +.endif +OLD_FILES+=usr/share/man/man8/ofwdump.8.gz +OLD_FILES+=usr/share/man/man8/mount_reiserfs.8.gz +OLD_FILES+=usr/share/man/man9/VFS_START.9.gz +OLD_FILES+=usr/share/man/man9/cpu_critical_exit.9.gz +OLD_FILES+=usr/share/man/man9/cpu_critical_enter.9.gz +OLD_FILES+=usr/share/info/annotate.info.gz +OLD_FILES+=usr/share/info/tar.info.gz +OLD_FILES+=usr/share/bsnmp/defs/tree.def +OLD_FILES+=usr/share/bsnmp/defs/mibII_tree.def +OLD_FILES+=usr/share/bsnmp/defs/netgraph_tree.def +OLD_FILES+=usr/share/bsnmp/mibs/FOKUS-MIB.txt +OLD_FILES+=usr/share/bsnmp/mibs/BEGEMOT-MIB.txt +OLD_FILES+=usr/share/bsnmp/mibs/BEGEMOT-SNMPD.txt +OLD_FILES+=usr/share/bsnmp/mibs/BEGEMOT-NETGRAPH.txt +OLD_FILES+=usr/libdata/ldscripts/elf64_sparc.x +OLD_FILES+=usr/libdata/ldscripts/elf64_sparc.xbn +OLD_FILES+=usr/libdata/ldscripts/elf64_sparc.xn +OLD_FILES+=usr/libdata/ldscripts/elf64_sparc.xr +OLD_FILES+=usr/libdata/ldscripts/elf64_sparc.xs +OLD_FILES+=usr/libdata/ldscripts/elf64_sparc.xu +OLD_FILES+=usr/libdata/ldscripts/elf64_sparc.xc +OLD_FILES+=usr/libdata/ldscripts/elf64_sparc.xsc +OLD_FILES+=usr/libdata/ldscripts/elf32_sparc.x +OLD_FILES+=usr/libdata/ldscripts/elf32_sparc.xbn +OLD_FILES+=usr/libdata/ldscripts/elf32_sparc.xn +OLD_FILES+=usr/libdata/ldscripts/elf32_sparc.xr +OLD_FILES+=usr/libdata/ldscripts/elf32_sparc.xs +OLD_FILES+=usr/libdata/ldscripts/elf32_sparc.xu +OLD_FILES+=usr/libdata/ldscripts/elf32_sparc.xc +OLD_FILES+=usr/libdata/ldscripts/elf32_sparc.xsc +OLD_FILES+=usr/libdata/msdosfs/iso22dos +OLD_FILES+=usr/libdata/msdosfs/iso72dos +OLD_FILES+=usr/libdata/msdosfs/koi2dos +OLD_FILES+=usr/libdata/msdosfs/koi8u2dos +# The following files are *not* obsolete, they just don't get touched at +# install, so don't add them: +# - boot/loader.rc +# - usr/share/tmac/man.local +# - usr/share/tmac/mm/locale +# - usr/share/tmac/mm/se_locale +# - var/yp/Makefile + +# 20060729: OpenSSL 0.9.7e -> 0.9.8b upgrade +OLD_LIBS+=lib/libcrypto.so.4 +OLD_LIBS+=usr/lib/libssl.so.4 # 20060521: gethostbyaddr(3) ABI change OLD_LIBS+=usr/lib/libroken.so.8 OLD_LIBS+=lib/libatm.so.3 @@ -2948,7 +3153,14 @@ # 199909XX OLD_LIBS+=usr/lib/libc_r.so.3 # ??? +OLD_LIBS+=usr/lib/libarchive.so.2 +OLD_LIBS+=usr/lib/libbsnmp.so.1 +OLD_LIBS+=usr/lib/libc_r.so.6 +OLD_LIBS+=usr/lib/libcipher.so.2 OLD_LIBS+=usr/lib/libgssapi.so.6 +OLD_LIBS+=usr/lib/libkse.so.1 +OLD_LIBS+=usr/lib/liblwres.so.3 +OLD_LIBS+=usr/lib/pam_ftp.so.2 # 20040925: bind9 import OLD_DIRS+=usr/share/doc/bind/html ==== //depot/projects/soc2005/libalias/bin/sh/histedit.c#2 (text+ko) ==== @@ -36,7 +36,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/sh/histedit.c,v 1.28 2005/10/19 15:37:42 stefanf Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/histedit.c,v 1.29 2006/08/04 07:56:31 yar Exp $"); #include #include @@ -370,7 +370,7 @@ fputs(s, efp); } /* - * At end? (if we were to loose last, we'd sure be + * At end? (if we were to lose last, we'd sure be * messed up). */ if (he.num == last) ==== //depot/projects/soc2005/libalias/bin/sh/parser.c#2 (text+ko) ==== @@ -36,7 +36,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/sh/parser.c,v 1.56 2005/08/15 17:49:38 stefanf Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/parser.c,v 1.57 2006/07/31 11:32:12 yar Exp $"); #include #include @@ -952,6 +952,7 @@ USTPUTC('\\', out); pungetc(); } else if (c == '\n') { + plinno++; if (doprompt) setprompt(2); else ==== //depot/projects/soc2005/libalias/bin/test/test.1#3 (text+ko) ==== @@ -30,9 +30,9 @@ .\" SUCH DAMAGE. .\" .\" @(#)test.1 8.1 (Berkeley) 5/31/93 -.\" $FreeBSD: src/bin/test/test.1,v 1.24 2006/07/27 19:08:21 yar Exp $ +.\" $FreeBSD: src/bin/test/test.1,v 1.25 2006/07/31 09:25:20 yar Exp $ .\" -.Dd July 27, 2006 +.Dd July 31, 2006 .Dt TEST 1 .Os .Sh NAME @@ -339,3 +339,9 @@ .Fl o , unlike in the logical operators of .Xr sh 1 . +For instance, the writable status of +.Pa file +will be tested by the following command even though the former expression +indicated false, which results in a gratuitous access to the file system: +.Pp +.Dl "[ -z abc -a -w file ]" ==== //depot/projects/soc2005/libalias/contrib/smbfs/smbutil/print.c#2 (text+ko) ==== @@ -31,6 +31,10 @@ * * $Id: print.c,v 1.4 2001/01/28 07:35:01 bp Exp $ */ + +#include +__FBSDID("$FreeBSD: src/contrib/smbfs/smbutil/print.c,v 1.2 2006/08/11 12:35:22 keramida Exp $"); + #include >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Aug 16 14:21:08 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0890816A4E2; Wed, 16 Aug 2006 14:21:08 +0000 (UTC) X-Original-To: perforce@FreeBSD.org 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 DB94C16A4DF for ; Wed, 16 Aug 2006 14:21:07 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A620943D49 for ; Wed, 16 Aug 2006 14:21:07 +0000 (GMT) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7GEL7bB073998 for ; Wed, 16 Aug 2006 14:21:07 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7GEL7SY073995 for perforce@freebsd.org; Wed, 16 Aug 2006 14:21:07 GMT (envelope-from rdivacky@FreeBSD.org) Date: Wed, 16 Aug 2006 14:21:07 GMT Message-Id: <200608161421.k7GEL7SY073995@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rdivacky@FreeBSD.org using -f From: Roman Divacky To: Perforce Change Reviews Cc: Subject: PERFORCE change 104233 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 16 Aug 2006 14:21:08 -0000 http://perforce.freebsd.org/chv.cgi?CH=104233 Change 104233 by rdivacky@rdivacky_witten on 2006/08/16 14:20:21 Remove debuging printfs that leaked into previous commit. Affected files ... .. //depot/projects/soc2006/rdivacky_linuxolator/compat/linux/linux_misc.c#16 edit Differences ... ==== //depot/projects/soc2006/rdivacky_linuxolator/compat/linux/linux_misc.c#16 (text+ko) ==== @@ -1395,7 +1395,6 @@ td->td_retval[0] = em->shared->group_pid; else td->td_retval[0] = pp->p_pid; - printf("getppid: group_pid: %i\n, pid: %i\n", pp->p_pid, em->shared->group_pid); } else td->td_retval[0] = pp->p_pid; @@ -1485,7 +1484,6 @@ EMUL_SHARED_RLOCK(&emul_shared_lock); LIST_FOREACH_SAFE(em, &td_em->shared->threads, threads, tmp_em) { - printf("em->pid: %i, td_em->pid: %i\n", em->pid, td_em->pid); if (em->pid == td_em->pid) continue; From owner-p4-projects@FreeBSD.ORG Wed Aug 16 14:25:14 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 54B5316A4E0; Wed, 16 Aug 2006 14:25:14 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 F04B616A4DD for ; Wed, 16 Aug 2006 14:25:13 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8EA0643D45 for ; Wed, 16 Aug 2006 14:25:13 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7GEPDNQ074219 for ; Wed, 16 Aug 2006 14:25:13 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7GEPDCZ074216 for perforce@freebsd.org; Wed, 16 Aug 2006 14:25:13 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Wed, 16 Aug 2006 14:25:13 GMT Message-Id: <200608161425.k7GEPDCZ074216@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 104234 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 16 Aug 2006 14:25:14 -0000 http://perforce.freebsd.org/chv.cgi?CH=104234 Change 104234 by rwatson@rwatson_zoo on 2006/08/16 14:25:02 Integrate trustedbsd_mac2: nfsd associate prototype fix. Affected files ... .. //depot/projects/trustedbsd/mac2/sys/amd64/amd64/pmap.c#3 integrate .. //depot/projects/trustedbsd/mac2/sys/compat/svr4/svr4_stream.c#5 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/usb/usbdevs#3 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/usb/uscanner.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/i386/i386/pmap.c#3 integrate .. //depot/projects/trustedbsd/mac2/sys/kern/Makefile#2 integrate .. //depot/projects/trustedbsd/mac2/sys/kern/uipc_syscalls.c#5 integrate .. //depot/projects/trustedbsd/mac2/sys/kern/uipc_usrreq.c#6 integrate .. //depot/projects/trustedbsd/mac2/sys/kern/vfs_lookup.c#4 integrate .. //depot/projects/trustedbsd/mac2/sys/kern/vfs_subr.c#5 integrate .. //depot/projects/trustedbsd/mac2/sys/netatalk/ddp_usrreq.c#3 integrate .. //depot/projects/trustedbsd/mac2/sys/security/mac_biba/mac_biba.c#4 integrate .. //depot/projects/trustedbsd/mac2/sys/sys/mac_policy.h#24 integrate .. //depot/projects/trustedbsd/mac2/sys/sys/param.h#3 integrate .. //depot/projects/trustedbsd/mac2/sys/vm/swap_pager.c#4 integrate .. //depot/projects/trustedbsd/mac2/sys/vm/vm_fault.c#3 integrate .. //depot/projects/trustedbsd/mac2/sys/vm/vm_page.c#3 integrate Differences ... ==== //depot/projects/trustedbsd/mac2/sys/amd64/amd64/pmap.c#3 (text+ko) ==== @@ -77,7 +77,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.568 2006/08/01 19:06:04 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.569 2006/08/06 06:29:16 alc Exp $"); /* * Manages physical address maps. @@ -2506,7 +2506,6 @@ retry: p = vm_page_lookup(object, pindex); if (p != NULL) { - vm_page_lock_queues(); if (vm_page_sleep_if_busy(p, FALSE, "init4p")) goto retry; } else { @@ -2525,8 +2524,8 @@ p = vm_page_lookup(object, pindex); vm_page_lock_queues(); vm_page_wakeup(p); + vm_page_unlock_queues(); } - vm_page_unlock_queues(); ptepa = VM_PAGE_TO_PHYS(p); if (ptepa & (NBPDR - 1)) ==== //depot/projects/trustedbsd/mac2/sys/compat/svr4/svr4_stream.c#5 (text+ko) ==== @@ -36,7 +36,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/svr4/svr4_stream.c,v 1.61 2006/07/28 16:56:17 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/svr4/svr4_stream.c,v 1.62 2006/08/05 22:04:21 rwatson Exp $"); #include "opt_compat.h" #include "opt_ktrace.h" ==== //depot/projects/trustedbsd/mac2/sys/dev/usb/usbdevs#3 (text+ko) ==== @@ -1,4 +1,4 @@ -$FreeBSD: src/sys/dev/usb/usbdevs,v 1.263 2006/07/24 19:47:00 imp Exp $ +$FreeBSD: src/sys/dev/usb/usbdevs,v 1.264 2006/08/06 12:01:42 bms Exp $ /* $NetBSD: usbdevs,v 1.392 2004/12/29 08:38:44 imp Exp $ */ /*- @@ -890,6 +890,7 @@ product EPSON 1670 0x011f Perfection 1670 scanner product EPSON 1270 0x0120 Perfection 1270 scanner product EPSON 2480 0x0121 Perfection 2480 scanner +product EPSON 3500 0x080e CX-3500/3600/3650 MFP product EPSON RX425 0x080f Stylus Photo RX425 scanner /* e-TEK Labs products */ ==== //depot/projects/trustedbsd/mac2/sys/dev/usb/uscanner.c#2 (text+ko) ==== @@ -5,7 +5,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/usb/uscanner.c,v 1.71 2006/06/18 17:28:08 netchild Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/usb/uscanner.c,v 1.72 2006/08/06 12:01:42 bms Exp $"); /*- * Copyright (c) 2000 The NetBSD Foundation, Inc. @@ -213,6 +213,7 @@ {{ USB_VENDOR_EPSON, USB_PRODUCT_EPSON_GT9700F }, USC_KEEP_OPEN }, {{ USB_VENDOR_EPSON, USB_PRODUCT_EPSON_GT9300UF }, 0 }, {{ USB_VENDOR_EPSON, USB_PRODUCT_EPSON_2480 }, 0 }, + {{ USB_VENDOR_EPSON, USB_PRODUCT_EPSON_3500 }, USC_KEEP_OPEN }, /* UMAX */ {{ USB_VENDOR_UMAX, USB_PRODUCT_UMAX_ASTRA1220U }, 0 }, ==== //depot/projects/trustedbsd/mac2/sys/i386/i386/pmap.c#3 (text+ko) ==== @@ -75,7 +75,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/i386/i386/pmap.c,v 1.572 2006/08/01 19:06:05 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/i386/i386/pmap.c,v 1.573 2006/08/06 06:29:16 alc Exp $"); /* * Manages physical address maps. @@ -2581,7 +2581,6 @@ retry: p = vm_page_lookup(object, pindex); if (p != NULL) { - vm_page_lock_queues(); if (vm_page_sleep_if_busy(p, FALSE, "init4p")) goto retry; } else { @@ -2600,8 +2599,8 @@ p = vm_page_lookup(object, pindex); vm_page_lock_queues(); vm_page_wakeup(p); + vm_page_unlock_queues(); } - vm_page_unlock_queues(); ptepa = VM_PAGE_TO_PHYS(p); if (ptepa & (NBPDR - 1)) ==== //depot/projects/trustedbsd/mac2/sys/kern/Makefile#2 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.2 (Berkeley) 3/21/94 -# $FreeBSD: src/sys/kern/Makefile,v 1.12 2005/07/13 20:50:17 jhb Exp $ +# $FreeBSD: src/sys/kern/Makefile,v 1.13 2006/08/05 19:25:14 jb Exp $ # Makefile for kernel tags files, init_sysent, etc. @@ -11,10 +11,11 @@ sysent: init_sysent.c syscalls.c ../sys/syscall.h ../sys/syscall.mk \ ../sys/sysproto.h -init_sysent.c syscalls.c ../sys/syscall.h \ +init_sysent.c syscalls.c systrace_args.c ../sys/syscall.h \ ../sys/syscall.mk ../sys/sysproto.h: makesyscalls.sh syscalls.master -mv -f init_sysent.c init_sysent.c.bak -mv -f syscalls.c syscalls.c.bak + -mv -f systrace_args.c systrace_args.c.bak -mv -f ../sys/syscall.h ../sys/syscall.h.bak -mv -f ../sys/syscall.mk ../sys/syscall.mk.bak -mv -f ../sys/sysproto.h ../sys/sysproto.h.bak ==== //depot/projects/trustedbsd/mac2/sys/kern/uipc_syscalls.c#5 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/uipc_syscalls.c,v 1.235 2006/08/04 05:53:20 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/uipc_syscalls.c,v 1.236 2006/08/06 01:00:09 alc Exp $"); #include "opt_compat.h" #include "opt_ktrace.h" @@ -2038,14 +2038,14 @@ VM_OBJECT_LOCK(obj); goto retry_lookup; } - } else { - vm_page_lock_queues(); - if (vm_page_sleep_if_busy(pg, TRUE, "sfpbsy")) - goto retry_lookup; + } else if (vm_page_sleep_if_busy(pg, TRUE, "sfpbsy")) + goto retry_lookup; + else { /* * Wire the page so it does not get ripped out from * under us. */ + vm_page_lock_queues(); vm_page_wire(pg); vm_page_unlock_queues(); } ==== //depot/projects/trustedbsd/mac2/sys/kern/uipc_usrreq.c#6 (text+ko) ==== @@ -50,7 +50,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/uipc_usrreq.c,v 1.184 2006/08/02 14:30:58 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/uipc_usrreq.c,v 1.185 2006/08/06 10:39:21 rwatson Exp $"); #include "opt_mac.h" @@ -800,9 +800,6 @@ .pru_sense = uipc_sense, .pru_shutdown = uipc_shutdown, .pru_sockaddr = uipc_sockaddr, - .pru_sosend = sosend_generic, - .pru_soreceive = soreceive_generic, - .pru_sopoll = sopoll_generic, .pru_close = uipc_close, }; ==== //depot/projects/trustedbsd/mac2/sys/kern/vfs_lookup.c#4 (text+ko) ==== @@ -35,7 +35,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/vfs_lookup.c,v 1.91 2006/04/29 07:13:49 kris Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/vfs_lookup.c,v 1.93 2006/08/05 21:40:59 rwatson Exp $"); #include "opt_ktrace.h" #include "opt_mac.h" @@ -88,7 +88,7 @@ "Enables/Disables shared locks for path name translation"); /* - * Convert a pathname into a pointer to a locked inode. + * Convert a pathname into a pointer to a locked vnode. * * The FOLLOW flag is set when symbolic links are to be followed * when they occur at the end of the name translation process. @@ -108,12 +108,11 @@ * } */ int -namei(ndp) - register struct nameidata *ndp; +namei(struct nameidata *ndp) { - register struct filedesc *fdp; /* pointer to file descriptor state */ - register char *cp; /* pointer into pathname argument */ - register struct vnode *dp; /* the directory we are searching */ + struct filedesc *fdp; /* pointer to file descriptor state */ + char *cp; /* pointer into pathname argument */ + struct vnode *dp; /* the directory we are searching */ struct iovec aiov; /* uio for reading symbolic links */ struct uio auio; int error, linklen; @@ -343,11 +342,10 @@ * if WANTPARENT set, return unlocked parent in ni_dvp */ int -lookup(ndp) - register struct nameidata *ndp; +lookup(struct nameidata *ndp) { - register char *cp; /* pointer into pathname argument */ - register struct vnode *dp = 0; /* the directory we are searching */ + char *cp; /* pointer into pathname argument */ + struct vnode *dp = 0; /* the directory we are searching */ struct vnode *tdp; /* saved dp */ struct mount *mp; /* mount table entry */ int docache; /* == 0 do not cache last component */ @@ -607,7 +605,7 @@ /* * We return with ni_vp NULL to indicate that the entry * doesn't currently exist, leaving a pointer to the - * (possibly locked) directory inode in ndp->ni_dvp. + * (possibly locked) directory vnode in ndp->ni_dvp. */ if (cnp->cn_flags & SAVESTART) { ndp->ni_startdir = ndp->ni_dvp; @@ -766,9 +764,7 @@ * Used by lookup to re-aquire things. */ int -relookup(dvp, vpp, cnp) - struct vnode *dvp, **vpp; - struct componentname *cnp; +relookup(struct vnode *dvp, struct vnode **vpp, struct componentname *cnp) { struct thread *td = cnp->cn_thread; struct vnode *dp = 0; /* the directory we are searching */ @@ -859,7 +855,7 @@ /* * We return with ni_vp NULL to indicate that the entry * doesn't currently exist, leaving a pointer to the - * (possibly locked) directory inode in ndp->ni_dvp. + * (possibly locked) directory vnode in ndp->ni_dvp. */ return (0); } @@ -910,9 +906,7 @@ * Free data allocated by namei(); see namei(9) for details. */ void -NDFREE(ndp, flags) - struct nameidata *ndp; - const u_int flags; +NDFREE(struct nameidata *ndp, const u_int flags) { int unlock_dvp; int unlock_vp; ==== //depot/projects/trustedbsd/mac2/sys/kern/vfs_subr.c#5 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/vfs_subr.c,v 1.678 2006/07/15 06:44:27 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/vfs_subr.c,v 1.679 2006/08/06 10:43:35 rwatson Exp $"); #include "opt_ddb.h" #include "opt_mac.h" @@ -3134,6 +3134,9 @@ * and optional call-by-reference privused argument allowing vaccess() * to indicate to the caller whether privilege was used to satisfy the * request (obsoleted). Returns 0 on success, or an errno on failure. + * + * The ifdef'd CAPABILITIES version is here for reference, but is not + * actually used. */ int vaccess(enum vtype type, mode_t file_mode, uid_t file_uid, gid_t file_gid, @@ -3207,9 +3210,11 @@ /* * Build a capability mask to determine if the set of capabilities * satisfies the requirements when combined with the granted mask - * from above. - * For each capability, if the capability is required, bitwise - * or the request type onto the cap_granted mask. + * from above. For each capability, if the capability is required, + * bitwise or the request type onto the cap_granted mask. + * + * Note: This is never actually used, but is here for reference + * purposes. */ cap_granted = 0; @@ -3219,7 +3224,8 @@ * VEXEC requests, instead of CAP_DAC_EXECUTE. */ if ((acc_mode & VEXEC) && ((dac_granted & VEXEC) == 0) && - !cap_check(cred, NULL, CAP_DAC_READ_SEARCH, SUSER_ALLOWJAIL)) + !cap_check(cred, NULL, CAP_DAC_READ_SEARCH, + SUSER_ALLOWJAIL)) cap_granted |= VEXEC; } else { if ((acc_mode & VEXEC) && ((dac_granted & VEXEC) == 0) && ==== //depot/projects/trustedbsd/mac2/sys/netatalk/ddp_usrreq.c#3 (text+ko) ==== @@ -24,7 +24,7 @@ * +1-313-764-2278 * netatalk@umich.edu * - * $FreeBSD: src/sys/netatalk/ddp_usrreq.c,v 1.51 2006/07/21 17:11:13 rwatson Exp $ + * $FreeBSD: src/sys/netatalk/ddp_usrreq.c,v 1.52 2006/08/05 14:14:34 rwatson Exp $ */ #include @@ -217,6 +217,7 @@ DDP_LOCK(ddp); at_pcbdisconnect(ddp); DDP_UNLOCK(ddp); + soisdisconnected(so); } static void @@ -230,6 +231,7 @@ DDP_LOCK(ddp); at_pcbdisconnect(ddp); DDP_UNLOCK(ddp); + soisdisconnected(so); } void ==== //depot/projects/trustedbsd/mac2/sys/security/mac_biba/mac_biba.c#4 (text+ko) ==== @@ -35,7 +35,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/security/mac_biba/mac_biba.c,v 1.92 2006/07/10 19:13:32 csjp Exp $ + * $FreeBSD: src/sys/security/mac_biba/mac_biba.c,v 1.93 2006/08/06 16:56:15 rwatson Exp $ */ /* @@ -3022,7 +3022,7 @@ return (0); } -static int +static void mac_biba_associate_nfsd_label(struct ucred *cred) { struct mac_biba *label; @@ -3031,7 +3031,6 @@ mac_biba_set_effective(label, MAC_BIBA_TYPE_LOW, 0, NULL); mac_biba_set_range(label, MAC_BIBA_TYPE_LOW, 0, NULL, MAC_BIBA_TYPE_HIGH, 0, NULL); - return (0); } static struct mac_policy_ops mac_biba_ops = ==== //depot/projects/trustedbsd/mac2/sys/sys/mac_policy.h#24 (text+ko) ==== @@ -35,7 +35,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/sys/mac_policy.h,v 1.72 2006/04/26 14:18:55 rwatson Exp $ + * $FreeBSD: src/sys/sys/mac_policy.h,v 1.73 2006/08/06 16:56:15 rwatson Exp $ */ /* * Kernel interface for MAC policy modules. @@ -661,6 +661,7 @@ typedef int (*mpo_vnode_check_write_t)(struct ucred *active_cred, struct ucred *file_cred, struct vnode *vp, struct label *label); +typedef void (*mpo_associate_nfsd_label_t)(struct ucred *cred); struct mac_policy_ops { mpo_policy_destroy_t mpo_policy_destroy; ==== //depot/projects/trustedbsd/mac2/sys/sys/param.h#3 (text+ko) ==== @@ -32,7 +32,7 @@ * SUCH DAMAGE. * * @(#)param.h 8.3 (Berkeley) 4/4/95 - * $FreeBSD: src/sys/sys/param.h,v 1.269 2006/07/29 19:44:07 simon Exp $ + * $FreeBSD: src/sys/sys/param.h,v 1.270 2006/08/05 20:35:11 jb Exp $ */ #ifndef _SYS_PARAM_H_ @@ -331,4 +331,20 @@ #define ctodb(db) /* calculates pages to devblks */ \ ((db) << (PAGE_SHIFT - DEV_BSHIFT)) +/* + * Solaris compatibility definitions. + */ +#ifdef _SOLARIS_C_SOURCE +#define PAGESIZE PAGE_SIZE + +/* + * The OpenSolaris version is set according to the version last imported + * from http://dlc.sun.com/osol/on/downloads/current/. In FreeBSD header + * files it can be used to detemine the level of compatibility that the + * FreeBSD headers provide to OpenSolaris code. Perhaps one day there + * will be a really, really Single Unix Specification. + */ +#define __OpenSolaris_version 20060731 +#endif + #endif /* _SYS_PARAM_H_ */ ==== //depot/projects/trustedbsd/mac2/sys/vm/swap_pager.c#4 (text+ko) ==== @@ -67,7 +67,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/vm/swap_pager.c,v 1.280 2006/08/03 23:56:11 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/vm/swap_pager.c,v 1.281 2006/08/05 19:07:07 alc Exp $"); #include "opt_mac.h" #include "opt_swap.h" @@ -1424,11 +1424,6 @@ * NOTE: for reads, m->dirty will probably * be overridden by the original caller of * getpages so don't play cute tricks here. - * - * XXX IT IS NOT LEGAL TO FREE THE PAGE HERE - * AS THIS MESSES WITH object->memq, and it is - * not legal to mess with object->memq from an - * interrupt. */ m->valid = 0; if (i != bp->b_pager.pg_reqpage) ==== //depot/projects/trustedbsd/mac2/sys/vm/vm_fault.c#3 (text+ko) ==== @@ -72,7 +72,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/vm/vm_fault.c,v 1.217 2006/07/21 23:22:49 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/vm/vm_fault.c,v 1.218 2006/08/06 00:17:17 alc Exp $"); #include #include @@ -389,10 +389,8 @@ VM_OBJECT_LOCK(fs.object); if (fs.m == vm_page_lookup(fs.object, fs.pindex)) { - vm_page_lock_queues(); - if (!vm_page_sleep_if_busy(fs.m, TRUE, - "vmpfw")) - vm_page_unlock_queues(); + vm_page_sleep_if_busy(fs.m, TRUE, + "vmpfw"); } vm_object_pip_wakeup(fs.object); VM_OBJECT_UNLOCK(fs.object); ==== //depot/projects/trustedbsd/mac2/sys/vm/vm_page.c#3 (text+ko) ==== @@ -97,7 +97,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/vm/vm_page.c,v 1.320 2006/08/03 23:56:11 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/vm/vm_page.c,v 1.321 2006/08/06 00:15:40 alc Exp $"); #include #include @@ -496,9 +496,10 @@ vm_page_sleep_if_busy(vm_page_t m, int also_m_busy, const char *msg) { - mtx_assert(&vm_page_queue_mtx, MA_OWNED); VM_OBJECT_LOCK_ASSERT(m->object, MA_OWNED); if ((m->flags & PG_BUSY) || (also_m_busy && m->busy)) { + if (!mtx_owned(&vm_page_queue_mtx)) + vm_page_lock_queues(); vm_page_flag_set(m, PG_WANTED | PG_REFERENCED); vm_page_unlock_queues(); From owner-p4-projects@FreeBSD.ORG Wed Aug 16 14:34:27 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8D13A16A4E2; Wed, 16 Aug 2006 14:34:27 +0000 (UTC) X-Original-To: perforce@FreeBSD.org 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 537D116A4DA for ; Wed, 16 Aug 2006 14:34:27 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B56C143D64 for ; Wed, 16 Aug 2006 14:34:25 +0000 (GMT) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7GEYPvk074958 for ; Wed, 16 Aug 2006 14:34:25 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7GEYPAv074955 for perforce@freebsd.org; Wed, 16 Aug 2006 14:34:25 GMT (envelope-from rdivacky@FreeBSD.org) Date: Wed, 16 Aug 2006 14:34:25 GMT Message-Id: <200608161434.k7GEYPAv074955@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rdivacky@FreeBSD.org using -f From: Roman Divacky To: Perforce Change Reviews Cc: Subject: PERFORCE change 104235 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 16 Aug 2006 14:34:27 -0000 http://perforce.freebsd.org/chv.cgi?CH=104235 Change 104235 by rdivacky@rdivacky_witten on 2006/08/16 14:34:20 Make ssouhlal happy and dont lock/unlock in getpid()/exit_group() Affected files ... .. //depot/projects/soc2006/rdivacky_linuxolator/compat/linux/linux_misc.c#17 edit Differences ... ==== //depot/projects/soc2006/rdivacky_linuxolator/compat/linux/linux_misc.c#17 (text+ko) ==== @@ -1334,16 +1334,14 @@ struct linux_emuldata *em; char osrel[LINUX_MAX_UTSNAME]; - em = em_find(td->td_proc, EMUL_UNLOCKED); - - KASSERT(em != NULL, ("getpid: emuldata not found.\n")); - linux_get_osrelease(td, osrel); - if (strlen(osrel) >= 3 && osrel[2] == '6') + if (strlen(osrel) >= 3 && osrel[2] == '6') { + em = em_find(td->td_proc, EMUL_UNLOCKED); + KASSERT(em != NULL, ("getpid: emuldata not found.\n")); td->td_retval[0] = em->shared->group_pid; - else + EMUL_UNLOCK(&emul_lock); + } else td->td_retval[0] = td->td_proc->p_pid; - EMUL_UNLOCK(&emul_lock); return (0); } @@ -1475,12 +1473,11 @@ printf(ARGS(exit_group, "%i"), args->error_code); #endif - td_em = em_find(td->td_proc, EMUL_UNLOCKED); - - KASSERT(td_em != NULL, ("exit_group: emuldata not found.\n")); - linux_get_osrelease(td, osrel); if (strlen(osrel) >= 3 && osrel[2] == '6') { + td_em = em_find(td->td_proc, EMUL_UNLOCKED); + + KASSERT(td_em != NULL, ("exit_group: emuldata not found.\n")); EMUL_SHARED_RLOCK(&emul_shared_lock); LIST_FOREACH_SAFE(em, &td_em->shared->threads, threads, tmp_em) { @@ -1496,8 +1493,8 @@ } EMUL_SHARED_RUNLOCK(&emul_shared_lock); + EMUL_UNLOCK(&emul_lock); } - EMUL_UNLOCK(&emul_lock); exit1(td, W_EXITCODE(args->error_code,0)); From owner-p4-projects@FreeBSD.ORG Wed Aug 16 14:40:35 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1DA0D16A4E6; Wed, 16 Aug 2006 14:40:35 +0000 (UTC) X-Original-To: perforce@FreeBSD.org 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 E506A16A4E1 for ; Wed, 16 Aug 2006 14:40:34 +0000 (UTC) (envelope-from gabor@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 86AC743D45 for ; Wed, 16 Aug 2006 14:40:34 +0000 (GMT) (envelope-from gabor@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7GEeYEK075769 for ; Wed, 16 Aug 2006 14:40:34 GMT (envelope-from gabor@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7GEeXeZ075746 for perforce@freebsd.org; Wed, 16 Aug 2006 14:40:33 GMT (envelope-from gabor@FreeBSD.org) Date: Wed, 16 Aug 2006 14:40:33 GMT Message-Id: <200608161440.k7GEeXeZ075746@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gabor@FreeBSD.org using -f From: Gabor Kovesdan To: Perforce Change Reviews Cc: Subject: PERFORCE change 104237 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 16 Aug 2006 14:40:35 -0000 http://perforce.freebsd.org/chv.cgi?CH=104237 Change 104237 by gabor@gabor_spitfire on 2006/08/16 14:39:59 IFC Affected files ... .. //depot/projects/soc2006/gabor_ports/CHANGES#6 integrate .. //depot/projects/soc2006/gabor_ports/MOVED#11 integrate .. //depot/projects/soc2006/gabor_ports/Mk/bsd.emacs.mk#5 integrate .. //depot/projects/soc2006/gabor_ports/Mk/bsd.gnome.mk#6 integrate .. //depot/projects/soc2006/gabor_ports/Mk/bsd.port.mk#82 integrate .. //depot/projects/soc2006/gabor_ports/Mk/bsd.sites.mk#8 integrate .. //depot/projects/soc2006/gabor_ports/UPDATING#13 integrate Differences ... ==== //depot/projects/soc2006/gabor_ports/CHANGES#6 (text+ko) ==== @@ -10,6 +10,33 @@ All ports committers are allowed to commit to this file. +20060805: +AUTHOR: sat@FreeBSD.org +The following functional changes were made to bsd.sites.mk: + + * MASTER_SITES variable can now contain special macros which are expanded into + traditional URL[:group] syntax and cause some convenient effects, e.g. set a + default M_S_SUBDIR. + + * A macro is any space-delimited word in MASTER_SITES without a forward slash. + + * If MASTER_SITE_ is defined, then the macro is expanded to its value. + + * Abbreviated macros are provided for extremely popular locations, e.g. CPAN + and SF. To avoid further obfuscation their unabbreviated equivalents should + be avoided. + + * Popular macros can trigger M_S_SUBDIR to default to a predefined value, e.g. + ${PORTNAME:L} for SF and ${PORTNAME:C/-.*//} for CPAN. + + * Abbreviations and M_S_SUBDIR defaults are defined by MASTER_SITES_ABBREVS + and MASTER_SITES_SUBDIRS, both set in bsd.sites.mk. + + * If a macro belongs to a group (e.g. SF:source1), all the sites it expands + into also belong to the same group. + + * Macros and traditional URL's can be mixed safely, their order stays intact. + 20060804: AUTHOR: gabor@FreeBSD.org The following functional changes were made to bsd.*.mk and to @@ -1149,4 +1176,4 @@ Contact Erwin Lansing if you have any questions about your use of this document. -$FreeBSD: ports/CHANGES,v 1.57 2006/08/04 13:17:59 erwin Exp $ +$FreeBSD: ports/CHANGES,v 1.58 2006/08/04 20:44:18 sat Exp $ ==== //depot/projects/soc2006/gabor_ports/MOVED#11 (text+ko) ==== @@ -1,7 +1,7 @@ # # MOVED - a list of (recently) moved or removed ports # -# $FreeBSD: ports/MOVED,v 1.1108 2006/08/04 14:57:47 acm Exp $ +# $FreeBSD: ports/MOVED,v 1.1115 2006/08/14 03:04:49 acm Exp $ # # Each entry consists of a single line containing the following four # fields in the order named, separated with the pipe (`|') character: @@ -2430,3 +2430,15 @@ net/svnc||2006-08-01|Has expired: mastersite gone, depends on unfetchable, antique version of vnc devel/p5-IPC-Mmap-SimpleShare||2006-08-01|Has expired devel/p5-Readonly-XS|devel/p5-Readonly|2006-08-02|p5-Readonly installs XS automatically +chinese/arnettf||2006-08-06|Renamed to chinese/CJKUnifonts +devel/SGE||2006-08-07|Has expired +editors/eshell-emacs20|editors/emacs|2006-08-07|expired +devel/openorb||2006-08-07|Has expired: not really maintained anymore (last beta version is 2 years old) +japanese/xemacs-devel-canna+freewnn||2006-08-07|Has expired: Unsupported and broken very long time +japanese/xemacs-devel-canna+wnn6||2006-08-07|Has expired: Unsupported and broken very long time +japanese/xemacs-devel-freewnn||2006-08-07|Has expired: Unsupported and broken very long time +japanese/xemacs-devel-wnn6||2006-08-07|Has expired: Unsupported and broken very long time +x11/gtk2-theme-switch||2006-08-07|Has expired: nothing new in over 2 years, use x11/gtkchtheme +russian/xpi-imagezoom|www/xpi-imagezoom|2006-08-09|Russian locale now comes bundled with official version +security/linux-krb5-libs||2006-08-13|Integrated with emulators/linux_base-fc4 +sysutils/linux-e2fsprogs||2006-08-13|Integrated with emulators/linux_base-fc4 ==== //depot/projects/soc2006/gabor_ports/Mk/bsd.emacs.mk#5 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: ports/Mk/bsd.emacs.mk,v 1.58 2006/08/04 12:34:41 erwin Exp $ +# $FreeBSD: ports/Mk/bsd.emacs.mk,v 1.59 2006/08/14 13:24:18 erwin Exp $ # # bsd.emacs.mk - 19990829 Shigeyuki Fukushima. # ==== //depot/projects/soc2006/gabor_ports/Mk/bsd.gnome.mk#6 (text+ko) ==== @@ -1,7 +1,7 @@ #-*- mode: Fundamental; tab-width: 4; -*- # ex:ts=4 # -# $FreeBSD: ports/Mk/bsd.gnome.mk,v 1.131 2006/08/04 12:34:41 erwin Exp $ +# $FreeBSD: ports/Mk/bsd.gnome.mk,v 1.132 2006/08/14 13:24:18 erwin Exp $ # $NetBSD: $ # $MCom: ports/Mk/bsd.gnome.mk,v 1.370 2006/04/27 01:40:22 ahze Exp $ # ==== //depot/projects/soc2006/gabor_ports/Mk/bsd.port.mk#82 (text+ko) ==== @@ -1,7 +1,7 @@ #-*- mode: makefile; tab-width: 4; -*- # ex:ts=4 # -# $FreeBSD: ports/Mk/bsd.port.mk,v 1.539 2006/08/04 12:34:41 erwin Exp $ +# $FreeBSD: ports/Mk/bsd.port.mk,v 1.540 2006/08/14 13:24:18 erwin Exp $ # $NetBSD: $ # # bsd.port.mk - 940820 Jordan K. Hubbard. @@ -1405,8 +1405,8 @@ .else LDCONFIG_CMD?= ${CHROOTDESTDIR} ${LDCONFIG} -m ${LDCONFIG_RUNLIST} LDCONFIG_PLIST_EXEC_CMD?= ${CHROOTDESTDIR} ${LDCONFIG} -m ${LDCONFIG_PLIST} +.endif LDCONFIG_PLIST_UNEXEC_CMD?= ${LDCONFIG} -R -.endif PKGCOMPATDIR?= ${LOCALBASE}/lib/compat/pkg @@ -1613,6 +1613,7 @@ DESTDIR=${DESTDIR} TARGETDIR=${TARGETDIR} CHROOTDESTDIR=${CHROOTDESTDIR} SUB_LIST+= PREFIX=${PREFIX} LOCALBASE=${LOCALBASE_REL} X11BASE=${X11BASE_REL} \ DATADIR=${DATADIR} DOCSDIR=${DOCSDIR} EXAMPLESDIR=${EXAMPLESDIR} \ + DESTDIR=${DESTDIR} TARGETDIR=${TARGETDIR} \ CHROOTDESTDIR=${CHROOTDESTDIR} PLIST_REINPLACE+= dirrmtry @@ -5152,7 +5153,7 @@ .endif @if [ ! -d ${PKG_DBDIR}/${PKGNAME} ]; then \ if [ -z "${DESTDIR}" ] ; then \ - ${ECHO_CMD} "===> Registering installation for ${PKGNAME}"; \ + ${ECHO_MSG} "===> Registering installation for ${PKGNAME}"; \ else \ ${ECHO_MSG} "===> Registering installation for ${PKGNAME} in ${DESTDIR}"; \ fi; \ ==== //depot/projects/soc2006/gabor_ports/Mk/bsd.sites.mk#8 (text+ko) ==== @@ -20,7 +20,7 @@ # # Note: all entries should terminate with a slash. # -# $FreeBSD: ports/Mk/bsd.sites.mk,v 1.395 2006/08/03 01:24:34 ahze Exp $ +# $FreeBSD: ports/Mk/bsd.sites.mk,v 1.396 2006/08/09 11:45:43 sat Exp $ # # Where to put distfiles that don't have any other master site @@ -1142,11 +1142,45 @@ http://linuxberg.ua.pt/files/%SUBDIR%/ .endif +# List: http://www.vim.org/mirrors.php +# Updated: 2006-06-13 .if !defined(IGNORE_MASTER_SITE_VIM) MASTER_SITE_VIM+= \ ftp://ftp.vim.org/pub/vim/unix/ \ + ftp://ftp2.us.vim.org/pub/vim/unix/ \ + ftp://ftp9.us.vim.org/pub/vim/unix/ \ + ftp://ftp.ca.vim.org/pub/vim/unix/ \ + ftp://ftp.nl.vim.org/pub/vim/unix/ \ + ftp://ftp.de.vim.org/pub/vim/unix/ \ + ftp://ftp3.de.vim.org/pub/vim/unix/ \ + ftp://ftp.uk.vim.org/pub/vim/unix/ \ + ftp://ftp.ie.vim.org/pub/vim/unix/ \ + ftp://ftp.at.vim.org/pub/vim/unix/ \ + ftp://ftp.se.vim.org/pub/vim/unix/ \ + ftp://ftp.pt.vim.org/pub/vim/unix/ \ + ftp://ftp.is.vim.org/pub/vim/unix/ \ + ftp://ftp.il.vim.org/pub/vim/unix/ \ + ftp://ftp.pl.vim.org/pub/vim/unix/ \ + ftp://ftp.ro.vim.org/pub/vim/unix/ \ + ftp://ftp.sk.vim.org/pub/vim/unix/ \ + ftp://ftp.tw.vim.org/pub/vim/unix/ \ + ftp://vim.stu.edu.tw/pub/vim/unix/ \ + ftp://ftp.jp.vim.org/pub/vim/unix/ \ + ftp://ftp.kr.vim.org/pub/vim/unix/ \ ftp://ftp.mirrorservice.org/sites/ftp.vim.org/pub/vim/unix/ \ - ftp://ftp.jp.vim.org/pub/vim/unix/ + http://ftp.vim.org/pub/vim/unix/ \ + http://mirrors.24-7-solutions.net/pub/vim/unix/ \ + http://ftp.tw.vim.org/pub/vim/unix/ \ + http://vim.stu.edu.tw/unix/ \ + http://gd.tuwien.ac.at/pub/vim/unix/ \ + http://www.etsimo.uniovi.es/pub/vim/unix/ \ + http://www.pt.vim.org/pub/vim/unix/ \ + http://www.pangora.org/vim.org/pub/vim/unix/ \ + http://www.math.technion.ac.il/pub/vim/unix/ \ + http://vim.fyxm.net/pub/vim/unix/ \ + http://zloba.ath.cx/pub/vim/unix/ \ + http://ftp2.uk.vim.org/sites/ftp.vim.org/pub/vim/unix/ \ + http://vim.mirror.fr/unix/ .endif .if !defined(IGNORE_MASTER_SITE_WINDOWMAKER) ==== //depot/projects/soc2006/gabor_ports/UPDATING#13 (text+ko) ==== @@ -6,6 +6,30 @@ time you update your ports collection, before attempting any port upgrades. +20060815: + AFFECTS: users of net/samba3 + AUTHOR: timur@gnu.org + + Since Samba 3.0.8, it has been recommended that all domain accounts + listed in smb.conf on a member server be fully qualified with the + domain name. This is now a requirement. All unqualified names are + assumed to be local to the Unix host, either as part of the server's + local passdb or in the local system list of accounts (e.g. /etc/passwd + or /etc/group). + + If the member server is not running winbindd at all, domain + accounts will be implicitly mapped to local accounts and their + tokens will be modified appropriately to reflect the local + SID and group membership. + +20060804: + AFFECTS: users of editors/jedit-devel + AUTHOR: question+fbsdports@closedsrc.org + + Starting with jEdit 4.3pre6, jedit-devel now requires Java 1.5+ to be + installed due to new features and classes used by the package. If you + cannot install or use Java 1.5, you will need to stay with jEdit 4.2. + 20060802: AFFECTS: users of www/linux-opera AUTHOR: mezz@FreeBSD.org @@ -3966,4 +3990,4 @@ 2) Update all p5-* modules. portupgrade -f p5-\* -$FreeBSD: ports/UPDATING,v 1.378 2006/08/03 18:45:53 blackend Exp $ +$FreeBSD: ports/UPDATING,v 1.380 2006/08/15 15:25:02 sem Exp $ From owner-p4-projects@FreeBSD.ORG Wed Aug 16 14:48:51 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3E20216A4E0; Wed, 16 Aug 2006 14:48:51 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 16B7B16A4DD for ; Wed, 16 Aug 2006 14:48:51 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B170A43D49 for ; Wed, 16 Aug 2006 14:48:50 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7GEmomJ076612 for ; Wed, 16 Aug 2006 14:48:50 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7GEmmEm076609 for perforce@freebsd.org; Wed, 16 Aug 2006 14:48:48 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Wed, 16 Aug 2006 14:48:48 GMT Message-Id: <200608161448.k7GEmmEm076609@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 104241 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 16 Aug 2006 14:48:51 -0000 http://perforce.freebsd.org/chv.cgi?CH=104241 Change 104241 by rwatson@rwatson_zoo on 2006/08/16 14:48:07 Update HISTORY. Affected files ... .. //depot/projects/trustedbsd/openbsm/HISTORY#22 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/HISTORY#22 (text+ko) ==== @@ -12,6 +12,8 @@ are now deprecated numberings. - autoconf now detects clock_gettime(), which is not available on Darwin. - praudit output fixes relating to arg32 and arg64 tokens. +- Maximum record size updated to 64k-1 to match Solaris record size limit. +- Various style and comment cleanups in include files. OpenBSM 1.0 alpha 7 @@ -190,4 +192,4 @@ to support reloading of kernel event table. - Allow comments in /etc/security configuration files. -$P4: //depot/projects/trustedbsd/openbsm/HISTORY#21 $ +$P4: //depot/projects/trustedbsd/openbsm/HISTORY#22 $ From owner-p4-projects@FreeBSD.ORG Wed Aug 16 14:57:30 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 40EAE16A4DF; Wed, 16 Aug 2006 14:57:30 +0000 (UTC) X-Original-To: perforce@FreeBSD.org 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 1C40616A4DA for ; Wed, 16 Aug 2006 14:57:30 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 79FC943DB3 for ; Wed, 16 Aug 2006 14:57:01 +0000 (GMT) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7GEv19F077044 for ; Wed, 16 Aug 2006 14:57:01 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7GEv1YG077040 for perforce@freebsd.org; Wed, 16 Aug 2006 14:57:01 GMT (envelope-from rdivacky@FreeBSD.org) Date: Wed, 16 Aug 2006 14:57:01 GMT Message-Id: <200608161457.k7GEv1YG077040@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rdivacky@FreeBSD.org using -f From: Roman Divacky To: Perforce Change Reviews Cc: Subject: PERFORCE change 104242 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 16 Aug 2006 14:57:30 -0000 http://perforce.freebsd.org/chv.cgi?CH=104242 Change 104242 by rdivacky@rdivacky_witten on 2006/08/16 14:56:54 Return p->p_ptr->p_pid in getppid directly instead of using 2.6 infrastructure. Affected files ... .. //depot/projects/soc2006/rdivacky_linuxolator/compat/linux/linux_misc.c#18 edit Differences ... ==== //depot/projects/soc2006/rdivacky_linuxolator/compat/linux/linux_misc.c#18 (text+ko) ==== @@ -1392,7 +1392,7 @@ if (strlen(osrel) >= 3 && osrel[2] == '6') td->td_retval[0] = em->shared->group_pid; else - td->td_retval[0] = pp->p_pid; + td->td_retval[0] = p->p_pptr->p_pid; } else td->td_retval[0] = pp->p_pid; From owner-p4-projects@FreeBSD.ORG Wed Aug 16 14:59:04 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B798F16A4E6; Wed, 16 Aug 2006 14:59:04 +0000 (UTC) X-Original-To: perforce@FreeBSD.org 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 9353716A4E2 for ; Wed, 16 Aug 2006 14:59:04 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4746943D70 for ; Wed, 16 Aug 2006 14:59:04 +0000 (GMT) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7GEx4WE077148 for ; Wed, 16 Aug 2006 14:59:04 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7GEx3NX077145 for perforce@freebsd.org; Wed, 16 Aug 2006 14:59:03 GMT (envelope-from rdivacky@FreeBSD.org) Date: Wed, 16 Aug 2006 14:59:03 GMT Message-Id: <200608161459.k7GEx3NX077145@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rdivacky@FreeBSD.org using -f From: Roman Divacky To: Perforce Change Reviews Cc: Subject: PERFORCE change 104243 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 16 Aug 2006 14:59:04 -0000 http://perforce.freebsd.org/chv.cgi?CH=104243 Change 104243 by rdivacky@rdivacky_witten on 2006/08/16 14:58:23 td->p_proc->p_pptr->p_pid Affected files ... .. //depot/projects/soc2006/rdivacky_linuxolator/compat/linux/linux_misc.c#19 edit Differences ... ==== //depot/projects/soc2006/rdivacky_linuxolator/compat/linux/linux_misc.c#19 (text+ko) ==== @@ -1392,7 +1392,7 @@ if (strlen(osrel) >= 3 && osrel[2] == '6') td->td_retval[0] = em->shared->group_pid; else - td->td_retval[0] = p->p_pptr->p_pid; + td->td_retval[0] = td->td_proc->p_pptr->p_pid; } else td->td_retval[0] = pp->p_pid; From owner-p4-projects@FreeBSD.ORG Wed Aug 16 15:01:08 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C4A7A16A4E2; Wed, 16 Aug 2006 15:01:08 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 64D8416A4DD for ; Wed, 16 Aug 2006 15:01:08 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 098E143D4C for ; Wed, 16 Aug 2006 15:01:08 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7GF17mB077484 for ; Wed, 16 Aug 2006 15:01:07 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7GF177a077481 for perforce@freebsd.org; Wed, 16 Aug 2006 15:01:07 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Wed, 16 Aug 2006 15:01:07 GMT Message-Id: <200608161501.k7GF177a077481@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 104245 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 16 Aug 2006 15:01:09 -0000 http://perforce.freebsd.org/chv.cgi?CH=104245 Change 104245 by rwatson@rwatson_zoo on 2006/08/16 15:01:03 Merge OpenBSM 1.0a8 changes into the audit3 kernel. Affected files ... .. //depot/projects/trustedbsd/audit3/sys/bsm/audit.h#31 integrate Differences ... ==== //depot/projects/trustedbsd/audit3/sys/bsm/audit.h#31 (text+ko) ==== @@ -30,7 +30,7 @@ * * @APPLE_BSD_LICENSE_HEADER_END@ * - * $P4: //depot/projects/trustedbsd/audit3/sys/bsm/audit.h#30 $ + * $P4: //depot/projects/trustedbsd/audit3/sys/bsm/audit.h#31 $ * $FreeBSD: src/sys/bsm/audit.h,v 1.4 2006/06/05 12:55:45 rwatson Exp $ */ @@ -43,7 +43,8 @@ #define AUDIT_RECORD_MAGIC 0x828a0f1b #define MAX_AUDIT_RECORDS 20 -#define MAX_AUDIT_RECORD_SIZE 4096 +#define MAXAUDITDATA (0x8000 - 1) +#define MAX_AUDIT_RECORD_SIZE MAXAUDITDATA #define MIN_AUDIT_FILE_SIZE (512 * 1024) /* @@ -55,7 +56,7 @@ #define AUDIT_HARD_LIMIT_FREE_BLOCKS 4 /* - * Triggers for the audit daemon + * Triggers for the audit daemon. */ #define AUDIT_TRIGGER_MIN 1 #define AUDIT_TRIGGER_LOW_SPACE 1 @@ -66,7 +67,8 @@ #define AUDIT_TRIGGER_MAX 5 /* - * File that will be read for trigger events from the kernel. + * Special file that will be read for trigger events from the kernel + * (FreeBSD). */ #define AUDIT_TRIGGER_FILE "/dev/audit" @@ -119,7 +121,7 @@ #define AU_ALL 0xffffffff /* - * IPC types + * IPC types. */ #define AT_IPC_MSG ((u_char)1) /* Message IPC id. */ #define AT_IPC_SEM ((u_char)2) /* Semaphore IPC id. */ @@ -164,19 +166,6 @@ /* * Audit policy controls. */ -#ifdef OLD_WORLD_ORDER -#define AUDIT_CNT 0x0001 -#define AUDIT_AHLT 0x0002 -#define AUDIT_ARGV 0x0004 -#define AUDIT_ARGE 0x0008 -#define AUDIT_PASSWD 0x0010 -#define AUDIT_SEQ 0x0020 -#define AUDIT_WINDATA 0x0040 -#define AUDIT_USER 0x0080 -#define AUDIT_GROUP 0x0100 -#define AUDIT_TRAIL 0x0200 -#define AUDIT_PATH 0x0400 -#else /* !OLD_WORLD_ORDER */ #define AUDIT_CNT 0x0001 #define AUDIT_AHLT 0x0002 #define AUDIT_ARGV 0x0004 @@ -191,10 +180,9 @@ #define AUDIT_PUBLIC 0x0800 #define AUDIT_ZONENAME 0x1000 #define AUDIT_PERZONE 0x2000 -#endif /* !OLD_WORLD_ORDER */ /* - * Audit queue control parameters + * Audit queue control parameters. */ #define AQ_HIWATER 100 #define AQ_MAXHIGH 10000 From owner-p4-projects@FreeBSD.ORG Wed Aug 16 15:01:09 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id F336416A540; Wed, 16 Aug 2006 15:01:08 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 9215A16A4DE for ; Wed, 16 Aug 2006 15:01:08 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A9B5143D49 for ; Wed, 16 Aug 2006 15:01:07 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7GF17Mp077478 for ; Wed, 16 Aug 2006 15:01:07 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7GF16YX077475 for perforce@freebsd.org; Wed, 16 Aug 2006 15:01:06 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Wed, 16 Aug 2006 15:01:06 GMT Message-Id: <200608161501.k7GF16YX077475@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 104244 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 16 Aug 2006 15:01:09 -0000 http://perforce.freebsd.org/chv.cgi?CH=104244 Change 104244 by rwatson@rwatson_zoo on 2006/08/16 15:00:06 Integrate OpenBSM 1.0a8 changes into TrustedBSD audit3 branch. Affected files ... .. //depot/projects/trustedbsd/audit3/contrib/openbsm/HISTORY#9 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/README#14 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/audit.h#14 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/libbsm.h#14 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/config/config.h.in#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/configure#8 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/configure.ac#9 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_event.c#10 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_io.c#16 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/test/bsm/generate.c#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/tools/Makefile.am#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/tools/Makefile.in#3 integrate Differences ... ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/HISTORY#9 (text+ko) ==== @@ -10,6 +10,10 @@ - OpenBSM-specific events assigned numbers in the 43xxx range to avoid future collisions with Solaris. Darwin events renamed to AUE_DARWIN_foo, as they are now deprecated numberings. +- autoconf now detects clock_gettime(), which is not available on Darwin. +- praudit output fixes relating to arg32 and arg64 tokens. +- Maximum record size updated to 64k-1 to match Solaris record size limit. +- Various style and comment cleanups in include files. OpenBSM 1.0 alpha 7 @@ -188,4 +192,4 @@ to support reloading of kernel event table. - Allow comments in /etc/security configuration files. -$P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/HISTORY#8 $ +$P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/HISTORY#9 $ ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/README#14 (text+ko) ==== @@ -74,6 +74,7 @@ Olivier Houchard Christian Peron Martin Fong + Pawel Worach In addition, Coverity, Inc.'s Prevent(tm) static analysis tool and Gimpel Software's FlexeLint tool were used to identify a number of bugs in the @@ -95,4 +96,4 @@ http://www.TrustedBSD.org/ -$P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/README#13 $ +$P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/README#14 $ ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/audit.h#14 (text+ko) ==== @@ -30,7 +30,7 @@ * * @APPLE_BSD_LICENSE_HEADER_END@ * - * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/audit.h#13 $ + * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/audit.h#14 $ */ #ifndef _BSM_AUDIT_H @@ -38,11 +38,12 @@ #define AUDIT_RECORD_MAGIC 0x828a0f1b #define MAX_AUDIT_RECORDS 20 -#define MAX_AUDIT_RECORD_SIZE 4096 +#define MAXAUDITDATA (0x8000 - 1) +#define MAX_AUDIT_RECORD_SIZE MAXAUDITDATA #define MIN_AUDIT_FILE_SIZE (512 * 1024) /* - * Triggers for the audit daemon + * Triggers for the audit daemon. */ #define AUDIT_TRIGGER_MIN 1 #define AUDIT_TRIGGER_LOW_SPACE 1 @@ -53,7 +54,8 @@ #define AUDIT_TRIGGER_MAX 5 /* - * File that will be read for trigger events from the kernel + * Special file that will be read for trigger events from the kernel + * (FreeBSD). */ #define AUDIT_TRIGGER_FILE "/dev/audit" @@ -101,7 +103,7 @@ #define AU_ALL 0xffffffff /* - * IPC types + * IPC types. */ #define AT_IPC_MSG ((u_char)1) /* Message IPC id. */ #define AT_IPC_SEM ((u_char)2) /* Semaphore IPC id. */ @@ -146,19 +148,6 @@ /* * Audit policy controls. */ -#ifdef OLD_WORLD_ORDER -#define AUDIT_CNT 0x0001 -#define AUDIT_AHLT 0x0002 -#define AUDIT_ARGV 0x0004 -#define AUDIT_ARGE 0x0008 -#define AUDIT_PASSWD 0x0010 -#define AUDIT_SEQ 0x0020 -#define AUDIT_WINDATA 0x0040 -#define AUDIT_USER 0x0080 -#define AUDIT_GROUP 0x0100 -#define AUDIT_TRAIL 0x0200 -#define AUDIT_PATH 0x0400 -#else /* !OLD_WORLD_ORDER */ #define AUDIT_CNT 0x0001 #define AUDIT_AHLT 0x0002 #define AUDIT_ARGV 0x0004 @@ -173,10 +162,9 @@ #define AUDIT_PUBLIC 0x0800 #define AUDIT_ZONENAME 0x1000 #define AUDIT_PERZONE 0x2000 -#endif /* !OLD_WORLD_ORDER */ /* - * Audit queue control parameters + * Audit queue control parameters. */ #define AQ_HIWATER 100 #define AQ_MAXHIGH 10000 ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/libbsm.h#14 (text+ko) ==== @@ -26,7 +26,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/libbsm.h#13 $ + * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/libbsm.h#14 $ */ #ifndef _LIBBSM_H_ @@ -37,8 +37,8 @@ * solely to allow OpenSSH to compile; Darwin/Apple code should not use them. */ -#define MAX_ARGS 10 -#define MAX_ENV 10 +#define BSM_MAX_ARGS 10 +#define BSM_MAX_ENV 10 #include #include @@ -82,11 +82,10 @@ #define BSM_TEXTBUFSZ MAX_AUDITSTRING_LEN /* OpenSSH compatibility */ /* - * These are referenced in Solaris 9 au_open(3BSM); values are guesses. - * Provided for OpenSSH compatibility. + * Arguments to au_close(3). */ -#define AU_TO_NO_WRITE 0 -#define AU_TO_WRITE 1 +#define AU_TO_NO_WRITE 0 /* Abandon audit record. */ +#define AU_TO_WRITE 1 /* Commit audit record. */ __BEGIN_DECLS struct au_event_ent { @@ -138,15 +137,6 @@ __BEGIN_DECLS -/* - * Internal representation of audit user in libnsl. - */ -typedef struct au_user_str_s { - char *au_name; - char *au_always; - char *au_never; -} au_user_str_t; - typedef struct au_tid32 { u_int32_t port; u_int32_t addr; @@ -228,7 +218,7 @@ */ typedef struct { u_int32_t count; - char *text[MAX_ARGS]; + char *text[BSM_MAX_ARGS]; } au_execarg_t; /* @@ -237,7 +227,7 @@ */ typedef struct { u_int32_t count; - char *text[MAX_ENV]; + char *text[BSM_MAX_ENV]; } au_execenv_t; /* @@ -729,8 +719,6 @@ /* * Functions relating to querying audit event information. - * - * XXXRW: getauevnonam() has no _r version? */ void setauevent(void); void endauevent(void); @@ -770,6 +758,11 @@ char *del, char raw, char sfrm); __END_DECLS +/* + * The remaining APIs are associated with Apple's BSM implementation, in + * particular as relates to Mach IPC auditing and triggers passed via Mach + * IPC. + */ #ifdef __APPLE__ #include ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/config/config.h.in#5 (text+ko) ==== @@ -12,6 +12,9 @@ /* Define to 1 if your system has a working `chown' function. */ #undef HAVE_CHOWN +/* Define to 1 if you have the `clock_gettime' function. */ +#undef HAVE_CLOCK_GETTIME + /* Define to 1 if you have the header file. */ #undef HAVE_DLFCN_H ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/configure#8 (xtext) ==== @@ -1,7 +1,7 @@ #! /bin/sh -# From configure.ac P4: //depot/projects/trustedbsd/openbsm/configure.ac#23 . +# From configure.ac P4: //depot/projects/trustedbsd/openbsm/configure.ac#26 . # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.59 for OpenBSM 1.0a7. +# Generated by GNU Autoconf 2.59 for OpenBSM 1.0a8. # # Report bugs to . # @@ -424,8 +424,8 @@ # Identity of this package. PACKAGE_NAME='OpenBSM' PACKAGE_TARNAME='openbsm' -PACKAGE_VERSION='1.0a7' -PACKAGE_STRING='OpenBSM 1.0a7' +PACKAGE_VERSION='1.0a8' +PACKAGE_STRING='OpenBSM 1.0a8' PACKAGE_BUGREPORT='trustedbsd-audit@TrustesdBSD.org' ac_unique_file="bin/auditreduce/auditreduce.c" @@ -955,7 +955,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures OpenBSM 1.0a7 to adapt to many kinds of systems. +\`configure' configures OpenBSM 1.0a8 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1021,7 +1021,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of OpenBSM 1.0a7:";; + short | recursive ) echo "Configuration of OpenBSM 1.0a8:";; esac cat <<\_ACEOF @@ -1162,7 +1162,7 @@ test -n "$ac_init_help" && exit 0 if $ac_init_version; then cat <<\_ACEOF -OpenBSM configure 1.0a7 +OpenBSM configure 1.0a8 generated by GNU Autoconf 2.59 Copyright (C) 2003 Free Software Foundation, Inc. @@ -1176,7 +1176,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by OpenBSM $as_me 1.0a7, which was +It was created by OpenBSM $as_me 1.0a8, which was generated by GNU Autoconf 2.59. Invocation command line was $ $0 $@ @@ -19278,7 +19278,7 @@ # Define the identity of the package. PACKAGE=OpenBSM - VERSION=1.0a7 + VERSION=1.0a8 cat >>confdefs.h <<_ACEOF @@ -22833,7 +22833,8 @@ -for ac_func in bzero ftruncate gettimeofday inet_ntoa memset strchr strerror strrchr strstr strtol strtoul + +for ac_func in bzero clock_gettime ftruncate gettimeofday inet_ntoa memset strchr strerror strrchr strstr strtol strtoul do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` echo "$as_me:$LINENO: checking for $ac_func" >&5 @@ -23477,7 +23478,7 @@ } >&5 cat >&5 <<_CSEOF -This file was extended by OpenBSM $as_me 1.0a7, which was +This file was extended by OpenBSM $as_me 1.0a8, which was generated by GNU Autoconf 2.59. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -23540,7 +23541,7 @@ cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -OpenBSM config.status 1.0a7 +OpenBSM config.status 1.0a8 configured by $0, generated by GNU Autoconf 2.59, with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/configure.ac#9 (text+ko) ==== @@ -3,7 +3,7 @@ AC_PREREQ(2.59) AC_INIT([OpenBSM], [1.0a8], [trustedbsd-audit@TrustesdBSD.org],[openbsm]) -AC_REVISION([$P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/configure.ac#8 $]) +AC_REVISION([$P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/configure.ac#9 $]) AC_CONFIG_SRCDIR([bin/auditreduce/auditreduce.c]) AC_CONFIG_AUX_DIR(config) AC_CONFIG_HEADER([config/config.h]) @@ -56,7 +56,7 @@ AC_TYPE_SIGNAL AC_FUNC_STAT AC_FUNC_STRFTIME -AC_CHECK_FUNCS([bzero ftruncate gettimeofday inet_ntoa memset strchr strerror strrchr strstr strtol strtoul]) +AC_CHECK_FUNCS([bzero clock_gettime ftruncate gettimeofday inet_ntoa memset strchr strerror strrchr strstr strtol strtoul]) # sys/queue.h exists on most systems, but its capabilities vary a great deal. # test for LIST_FIRST and TAILQ_FOREACH_SAFE, which appears to not exist in ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_event.c#10 (text+ko) ==== @@ -27,7 +27,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_event.c#9 $ + * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_event.c#10 $ */ #include @@ -62,27 +62,32 @@ evdesc = strtok_r(NULL, eventdelim, &last); evclass = strtok_r(NULL, eventdelim, &last); - if ((evno == NULL) || (evname == NULL) || (evdesc == NULL) || - (evclass == NULL)) + if ((evno == NULL) || (evname == NULL)) return (NULL); if (strlen(evname) >= AU_EVENT_NAME_MAX) return (NULL); strcpy(e->ae_name, evname); - if (strlen(evdesc) >= AU_EVENT_DESC_MAX) - return (NULL); - strcpy(e->ae_desc, evdesc); + if (evdesc != NULL) { + if (strlen(evdesc) >= AU_EVENT_DESC_MAX) + return (NULL); + strcpy(e->ae_desc, evdesc); + } else + strcpy(e->ae_desc, ""); e->ae_number = atoi(evno); /* * Find out the mask that corresponds to the given list of classes. */ - if (getauditflagsbin(evclass, &evmask) != 0) + if (evclass != NULL) { + if (getauditflagsbin(evclass, &evmask) != 0) + e->ae_class = AU_NULL; + else + e->ae_class = evmask.am_success; + } else e->ae_class = AU_NULL; - else - e->ae_class = evmask.am_success; return (e); } ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_io.c#16 (text+ko) ==== @@ -31,7 +31,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_io.c#15 $ + * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/libbsm/bsm_io.c#16 $ */ #include @@ -820,7 +820,7 @@ print_delim(fp, del); print_1_byte(fp, tok->tt.arg32.no, "%u"); print_delim(fp, del); - print_4_bytes(fp, tok->tt.arg32.val, "%#x"); + print_4_bytes(fp, tok->tt.arg32.val, "0x%x"); print_delim(fp, del); print_string(fp, tok->tt.arg32.text, tok->tt.arg32.len); } @@ -859,7 +859,7 @@ print_delim(fp, del); print_1_byte(fp, tok->tt.arg64.no, "%u"); print_delim(fp, del); - print_8_bytes(fp, tok->tt.arg64.val, "%#llx"); + print_8_bytes(fp, tok->tt.arg64.val, "0x%llx"); print_delim(fp, del); print_string(fp, tok->tt.arg64.text, tok->tt.arg64.len); } ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/test/bsm/generate.c#5 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/test/bsm/generate.c#4 $ + * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/test/bsm/generate.c#5 $ */ /* @@ -144,6 +144,17 @@ write_token(directory, token_filename, file_token); } +static void +generate_file_record(const char *directory, const char *record_filename) +{ + token_t *file_token; + + file_token = au_to_file("test", file_token_timeval); + if (file_token == NULL) + err(EX_UNAVAILABLE, "au_to_file"); + write_record(directory, record_filename, file_token, AUE_NULL); +} + /* * AUT_OHEADER */ @@ -326,6 +337,32 @@ write_token(directory, buf, subject32ex_token); } +static void +generate_subject32ex_record(const char *directory, const char *record_filename, + u_int32_t type) +{ + token_t *subject32ex_token; + char *buf; + + buf = (char *)malloc(strlen(record_filename) + 6); + if (type == AU_IPv6) { + inet_pton(AF_INET6, "fe80::1", subject32_tid_addr.at_addr); + subject32_tid_addr.at_type = AU_IPv6; + sprintf(buf, "%s%s", record_filename, "-IPv6"); + } else { + subject32_tid_addr.at_addr[0] = inet_addr("127.0.0.1"); + subject32_tid_addr.at_type = AU_IPv4; + sprintf(buf, "%s%s", record_filename, "-IPv4"); + } + + subject32ex_token = au_to_subject32_ex(subject32_auid, subject32_euid, + subject32_egid, subject32_ruid, subject32_rgid, subject32_pid, + subject32_sid, &subject32_tid_addr); + if (subject32ex_token == NULL) + err(EX_UNAVAILABLE, "au_to_subject32_ex"); + write_record(directory, record_filename, subject32ex_token, AUE_NULL); +} + static au_id_t process32_auid = 0x12345678; static uid_t process32_euid = 0x01234567; static gid_t process32_egid = 0x23456789; @@ -382,6 +419,22 @@ write_token(directory, token_filename, process32ex_token); } +static void +generate_process32ex_record(const char *directory, const char *record_filename) +{ + token_t *process32ex_token; + + process32_tid_addr.at_addr[0] = inet_addr("127.0.0.1"); + process32_tid_addr.at_type = AU_IPv4; + + process32ex_token = au_to_process32_ex(process32_auid, process32_euid, + process32_egid, process32_ruid, process32_rgid, process32_pid, + process32_sid, &process32_tid_addr); + if (process32ex_token == NULL) + err(EX_UNAVAILABLE, "au_to_process32_ex"); + write_record(directory, record_filename, process32ex_token, AUE_NULL); +} + static char return32_status = 0xd7; static uint32_t return32_ret = 0x12345678; @@ -777,29 +830,29 @@ } if (do_records) { - generate_file_token(directory, "file_token"); - generate_trailer_token(directory, "trailer_token"); - generate_header32_token(directory, "header32_token"); - generate_data_token(directory, "data_record"); - generate_ipc_token(directory, "ipc_record"); - generate_path_token(directory, "path_record"); - generate_subject32_token(directory, "subject32_record"); - generate_subject32ex_token(directory, "subject32ex_record", AU_IPv4); - generate_subject32ex_token(directory, "subject32ex_record", AU_IPv6); - generate_process32_token(directory, "process32_record"); - generate_process32ex_token(directory, "process32ex_token"); - generate_return32_token(directory, "return32_record"); - generate_text_token(directory, "text_record"); - generate_opaque_token(directory, "opaque_record"); - generate_in_addr_token(directory, "in_addr_record"); - generate_ip_token(directory, "ip_record"); - generate_iport_token(directory, "iport_record"); - generate_arg32_token(directory, "arg32_record"); - generate_seq_token(directory, "seq_record"); - generate_attr_token(directory, "attr_record"); - generate_ipc_perm_token(directory, "ipc_perm_record"); - generate_groups_token(directory, "groups_record"); - generate_attr32_token(directory, "attr32_record"); + generate_file_record(directory, "file_record"); + generate_data_record(directory, "data_record"); + generate_ipc_record(directory, "ipc_record"); + generate_path_record(directory, "path_record"); + generate_subject32_record(directory, "subject32_record"); + generate_subject32ex_record(directory, "subject32ex_record", + AU_IPv4); + generate_subject32ex_record(directory, "subject32ex_record", + AU_IPv6); + generate_process32_record(directory, "process32_record"); + generate_process32ex_record(directory, "process32ex_record"); + generate_return32_record(directory, "return32_record"); + generate_text_record(directory, "text_record"); + generate_opaque_record(directory, "opaque_record"); + generate_in_addr_record(directory, "in_addr_record"); + generate_ip_record(directory, "ip_record"); + generate_iport_record(directory, "iport_record"); + generate_arg32_record(directory, "arg32_record"); + generate_seq_record(directory, "seq_record"); + generate_attr_record(directory, "attr_record"); + generate_ipc_perm_record(directory, "ipc_perm_record"); + generate_groups_record(directory, "groups_record"); + generate_attr32_record(directory, "attr32_record"); } return (0); ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/tools/Makefile.am#3 (text+ko) ==== @@ -1,9 +1,9 @@ # -# $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/tools/Makefile.am#2 $ +# $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/tools/Makefile.am#3 $ # INCLUDES = -I$(top_srcdir) -bin_PROGRAMS = autool -autool_SOURCES = autool.c -autool_LDADD = $(top_builddir)/libbsm/libbsm.la +bin_PROGRAMS = audump +audump_SOURCES = audump.c +audump_LDADD = $(top_builddir)/libbsm/libbsm.la ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/tools/Makefile.in#3 (text+ko) ==== @@ -15,7 +15,7 @@ @SET_MAKE@ # -# $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/tools/Makefile.in#2 $ +# $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/tools/Makefile.in#3 $ # srcdir = @srcdir@ @@ -40,7 +40,7 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -bin_PROGRAMS = autool$(EXEEXT) +bin_PROGRAMS = audump$(EXEEXT) subdir = tools DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 @@ -53,9 +53,9 @@ am__installdirs = "$(DESTDIR)$(bindir)" binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) PROGRAMS = $(bin_PROGRAMS) -am_autool_OBJECTS = autool.$(OBJEXT) -autool_OBJECTS = $(am_autool_OBJECTS) -autool_DEPENDENCIES = $(top_builddir)/libbsm/libbsm.la +am_audump_OBJECTS = audump.$(OBJEXT) +audump_OBJECTS = $(am_audump_OBJECTS) +audump_DEPENDENCIES = $(top_builddir)/libbsm/libbsm.la DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/config depcomp = $(SHELL) $(top_srcdir)/config/depcomp am__depfiles_maybe = depfiles @@ -67,8 +67,8 @@ CCLD = $(CC) LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ -SOURCES = $(autool_SOURCES) -DIST_SOURCES = $(autool_SOURCES) +SOURCES = $(audump_SOURCES) +DIST_SOURCES = $(audump_SOURCES) ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -174,8 +174,8 @@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ INCLUDES = -I$(top_srcdir) -autool_SOURCES = autool.c -autool_LDADD = $(top_builddir)/libbsm/libbsm.la +audump_SOURCES = audump.c +audump_LDADD = $(top_builddir)/libbsm/libbsm.la all: all-am .SUFFIXES: @@ -237,9 +237,9 @@ echo " rm -f $$p $$f"; \ rm -f $$p $$f ; \ done -autool$(EXEEXT): $(autool_OBJECTS) $(autool_DEPENDENCIES) - @rm -f autool$(EXEEXT) - $(LINK) $(autool_LDFLAGS) $(autool_OBJECTS) $(autool_LDADD) $(LIBS) +audump$(EXEEXT): $(audump_OBJECTS) $(audump_DEPENDENCIES) + @rm -f audump$(EXEEXT) + $(LINK) $(audump_LDFLAGS) $(audump_OBJECTS) $(audump_LDADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -247,7 +247,7 @@ distclean-compile: -rm -f *.tab.c -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/autool.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/audump.Po@am__quote@ .c.o: @am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ From owner-p4-projects@FreeBSD.ORG Wed Aug 16 15:10:58 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 997FE16A4E9; Wed, 16 Aug 2006 15:10:58 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 77CD216A4E5; Wed, 16 Aug 2006 15:10:58 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from server.baldwin.cx (66-23-211-162.clients.speedfactory.net [66.23.211.162]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7269D43D5A; Wed, 16 Aug 2006 15:10:57 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from zion.baldwin.cx (zion.baldwin.cx [192.168.0.7]) (authenticated bits=0) by server.baldwin.cx (8.13.6/8.13.6) with ESMTP id k7GFAivT039350; Wed, 16 Aug 2006 11:10:55 -0400 (EDT) (envelope-from jhb@freebsd.org) From: John Baldwin To: Roman Divacky Date: Wed, 16 Aug 2006 11:03:38 -0400 User-Agent: KMail/1.9.1 References: <200608161457.k7GEv1YG077040@repoman.freebsd.org> In-Reply-To: <200608161457.k7GEv1YG077040@repoman.freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset="iso-8859-15" Content-Transfer-Encoding: 7bit Content-Disposition: inline Message-Id: <200608161103.38724.jhb@freebsd.org> X-Greylist: Sender succeeded SMTP AUTH authentication, not delayed by milter-greylist-2.0.2 (server.baldwin.cx [192.168.0.1]); Wed, 16 Aug 2006 11:10:56 -0400 (EDT) X-Virus-Scanned: ClamAV 0.88.3/1669/Wed Aug 16 07:54:21 2006 on server.baldwin.cx X-Virus-Status: Clean X-Spam-Status: No, score=-4.4 required=4.2 tests=ALL_TRUSTED,AWL,BAYES_00 autolearn=ham version=3.1.3 X-Spam-Checker-Version: SpamAssassin 3.1.3 (2006-06-01) on server.baldwin.cx Cc: Perforce Change Reviews Subject: Re: PERFORCE change 104242 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 16 Aug 2006 15:10:58 -0000 On Wednesday 16 August 2006 10:57, Roman Divacky wrote: > http://perforce.freebsd.org/chv.cgi?CH=104242 > > Change 104242 by rdivacky@rdivacky_witten on 2006/08/16 14:56:54 > > Return p->p_ptr->p_pid in getppid directly instead of using 2.6 infrastructure. You'll need to hold PROC_LOCK if not already to ensure p_pptr is valid while you dereference it. > Affected files ... > > .. //depot/projects/soc2006/rdivacky_linuxolator/compat/linux/linux_misc.c#18 edit > > Differences ... > > ==== //depot/projects/soc2006/rdivacky_linuxolator/compat/linux/linux_misc.c#18 (text+ko) ==== > > @@ -1392,7 +1392,7 @@ > if (strlen(osrel) >= 3 && osrel[2] == '6') > td->td_retval[0] = em->shared->group_pid; > else > - td->td_retval[0] = pp->p_pid; > + td->td_retval[0] = p->p_pptr->p_pid; > } else > td->td_retval[0] = pp->p_pid; > > -- John Baldwin From owner-p4-projects@FreeBSD.ORG Wed Aug 16 15:39:00 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4D6ED16A4E7; Wed, 16 Aug 2006 15:39:00 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 2953716A4DF for ; Wed, 16 Aug 2006 15:39:00 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9FE0543D5A for ; Wed, 16 Aug 2006 15:38:59 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7GFcxJ4080695 for ; Wed, 16 Aug 2006 15:38:59 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7GFcxvY080692 for perforce@freebsd.org; Wed, 16 Aug 2006 15:38:59 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Wed, 16 Aug 2006 15:38:59 GMT Message-Id: <200608161538.k7GFcxvY080692@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 104251 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 16 Aug 2006 15:39:00 -0000 http://perforce.freebsd.org/chv.cgi?CH=104251 Change 104251 by rwatson@rwatson_fledge on 2006/08/16 15:38:01 Add OpenBSM 1.0-alpha8 binary. Affected files ... .. //depot/projects/trustedbsd/www/downloads/openbsm-1.0-alpha8.tgz#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Wed Aug 16 15:42:05 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id ACBF216A4DD; Wed, 16 Aug 2006 15:42:05 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 703ED16A4E1 for ; Wed, 16 Aug 2006 15:42:05 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 529C743D5C for ; Wed, 16 Aug 2006 15:42:04 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7GFg4SL080955 for ; Wed, 16 Aug 2006 15:42:04 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7GFg3x6080952 for perforce@freebsd.org; Wed, 16 Aug 2006 15:42:03 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Wed, 16 Aug 2006 15:42:03 GMT Message-Id: <200608161542.k7GFg3x6080952@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 104253 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 16 Aug 2006 15:42:05 -0000 http://perforce.freebsd.org/chv.cgi?CH=104253 Change 104253 by rwatson@rwatson_fledge on 2006/08/16 15:41:49 OpenBSM 1.0a8 release. Add file sizes to other downloads. Affected files ... .. //depot/projects/trustedbsd/www/openbsm.page#13 edit Differences ... ==== //depot/projects/trustedbsd/www/openbsm.page#13 (text+ko) ==== @@ -29,7 +29,7 @@ - $P4: //depot/projects/trustedbsd/www/openbsm.page#12 $ + $P4: //depot/projects/trustedbsd/www/openbsm.page#13 $ @@ -120,32 +120,40 @@ Please see the file README present in the OpenBSM distribution for build and installation instructions.

+

2006-08-16 - OpenBSM 1.0 alpha 8 release is a test release of the + OpenBSM code base, and matches what is present in FreeBSD CVS at + this date. In this revision, the primary change is to renumber + non-Solaris audit events in order to avoid possible future + collisions, and to adopt a unique OpenBSM header token version + number. There are also a number of bug fixes, cleanups, etc. + Download (464K).

+

2006-06-27 - OpenBSM 1.0 alpha 7 release is a test release of the OpenBSM code base, and matches what is present in FreeBSD CVS at this date. In this revision, the primary changes involve improvements in the creation of subject tokens, and portability - improvements. Download. -

+ improvements. Download + (464K).

2006-06-02 - OpenBSM 1.0 alpha 6 release is a test release of the OpenBSM code base, and matches what is present in FreeBSD CVS at this date. In this revision, the primary changes are the introduction an experimental audit filter environment, improved APIs for submitting audit records from applications, and general - bug fixing. Download. -

+ bug fixing. Download + (464K).

2006-03-04 - OpenBSM 1.0 alpha 5 release is a test release of the OpenBSM code base, and matches what is present in FreeBSD CVS at this date. The primary change from alpha 4 is the introduction of autoconf/automake support, which allows it to build on Darwin and - Linux. Download. -

+ Linux. Download + (432K).

2006-02-23 - OpenBSM 1.0 alpha 4 release is an initial test release of the OpenBSM code base, and matches what is present in FreeBSD CVS - at this date. Download. -

+ at this date. Download + (86K).

From owner-p4-projects@FreeBSD.ORG Wed Aug 16 15:42:06 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EAC7C16A5B1; Wed, 16 Aug 2006 15:42:05 +0000 (UTC) X-Original-To: perforce@FreeBSD.org 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 C688416A56E for ; Wed, 16 Aug 2006 15:42:05 +0000 (UTC) (envelope-from gabor@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id DABCC43D4C for ; Wed, 16 Aug 2006 15:42:03 +0000 (GMT) (envelope-from gabor@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7GFg3WD080949 for ; Wed, 16 Aug 2006 15:42:03 GMT (envelope-from gabor@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7GFg3AF080946 for perforce@freebsd.org; Wed, 16 Aug 2006 15:42:03 GMT (envelope-from gabor@FreeBSD.org) Date: Wed, 16 Aug 2006 15:42:03 GMT Message-Id: <200608161542.k7GFg3AF080946@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gabor@FreeBSD.org using -f From: Gabor Kovesdan To: Perforce Change Reviews Cc: Subject: PERFORCE change 104252 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 16 Aug 2006 15:42:06 -0000 http://perforce.freebsd.org/chv.cgi?CH=104252 Change 104252 by gabor@gabor_spitfire on 2006/08/16 15:41:08 Change PREFIX to PREFIX/DESTDIR. PREFIX_REL can be used for the old behavior, and PREFIX is still unchanged in plists and pkg- scripts. This change is to make many ports respect DESTDIR with this internal change. With a hackery, PREFIX can be still overridden, so this change doesn't affect POLA. Besides, the current behavior was hard to understand where TARGETDIR is necessary and where not. TARGETDIR is kept for backward compatibility, might be removed later. With this change, we should s/PREFIX/PREFIX_REL/ in sed substitutions, but that is going to be much less pain than doing s/PREFIX/TARGETDIR/ almost everywhere. Idea by: sat Discussed with: erwin Affected files ... .. //depot/projects/soc2006/gabor_ports/Mk/bsd.port.mk#83 edit Differences ... ==== //depot/projects/soc2006/gabor_ports/Mk/bsd.port.mk#83 (text+ko) ==== @@ -1398,6 +1398,9 @@ PREFIX?= ${LOCALBASE_REL} .endif +PREFIX_REL:= ${PREFIX} +PREFIX:= ${DESTDIR}${PREFIX_REL} + .if defined(USE_LINUX_PREFIX) LDCONFIG_CMD?= ${CHROOTDESTDIR} ${LINUXBASE_REL}/sbin/ldconfig -r ${LINUXBASE_REL} LDCONFIG_PLIST_EXEC_CMD?= ${LDCONFIG_CMD} @@ -1536,7 +1539,7 @@ # These do some path checks if DESTDIR is set correctly. # You can force skipping these test by defining IGNORE_PATH_CHECKS .if !defined(IGNORE_PATH_CHECKS) -.if (${PREFIX:C,(^.).*,\1,} != "/") +.if (${PREFIX_REL:C,(^.).*,\1,} != "/") .BEGIN: @${ECHO_MSG} "PREFIX must be defined as an absolute path so that when 'make'" @${ECHO_MSG} "is invoked in the work area PREFIX points to the right place." @@ -1775,7 +1778,7 @@ NO_LDCONFIG_MTREE= yes .endif .if defined(USE_LDCONFIG) && ${USE_LDCONFIG:L} == "yes" -USE_LDCONFIG= ${PREFIX}/lib +USE_LDCONFIG= ${PREFIX_REL}/lib .endif .if defined(USE_LDCONFIG32) && ${USE_LDCONFIG32:L} == "yes" IGNORE= has USE_LDCONFIG set to yes, which is not correct @@ -1961,10 +1964,10 @@ PL_BUILD?= Build CONFIGURE_ARGS+= \ create_packlist=0 \ - install_path=lib="${TARGETDIR}/${SITE_PERL_REL}" \ - install_path=arch="${TARGETDIR}/${SITE_PERL_REL}/${PERL_ARCH}" \ - install_path=script="${TARGETDIR}/bin" \ - install_path=bin="${TARGETDIR}/bin" \ + install_path=lib="${PREFIX}/${SITE_PERL_REL}" \ + install_path=arch="${PREFIX}/${SITE_PERL_REL}/${PERL_ARCH}" \ + install_path=script="${PREFIX}/bin" \ + install_path=bin="${PREFIX}/bin" \ install_path=libdoc="${MAN3PREFIX}/man/man3" \ install_path=bindoc="${MAN1PREFIX}/man/man1" .elif defined(PERL_CONFIGURE) @@ -2094,12 +2097,12 @@ REINPLACE_CMD?= ${SED} ${REINPLACE_ARGS} # Names of cookies used to skip already completed stages -EXTRACT_COOKIE?= ${WRKDIR}/.extract_done.${PORTNAME}.${PREFIX:S/\//_/g} -CONFIGURE_COOKIE?= ${WRKDIR}/.configure_done.${PORTNAME}.${PREFIX:S/\//_/g} -INSTALL_COOKIE?= ${WRKDIR}/.install_done.${PORTNAME}.${PREFIX:S/\//_/g} -BUILD_COOKIE?= ${WRKDIR}/.build_done.${PORTNAME}.${PREFIX:S/\//_/g} -PATCH_COOKIE?= ${WRKDIR}/.patch_done.${PORTNAME}.${PREFIX:S/\//_/g} -PACKAGE_COOKIE?= ${WRKDIR}/.package_done.${PORTNAME}.${PREFIX:S/\//_/g} +EXTRACT_COOKIE?= ${WRKDIR}/.extract_done.${PORTNAME}.${PREFIX_REL:S/\//_/g} +CONFIGURE_COOKIE?= ${WRKDIR}/.configure_done.${PORTNAME}.${PREFIX_REL:S/\//_/g} +INSTALL_COOKIE?= ${WRKDIR}/.install_done.${PORTNAME}.${PREFIX_REL:S/\//_/g} +BUILD_COOKIE?= ${WRKDIR}/.build_done.${PORTNAME}.${PREFIX_REL:S/\//_/g} +PATCH_COOKIE?= ${WRKDIR}/.patch_done.${PORTNAME}.${PREFIX_REL:S/\//_/g} +PACKAGE_COOKIE?= ${WRKDIR}/.package_done.${PORTNAME}.${PREFIX_REL:S/\//_/g} # How to do nothing. Override if you, for some strange reason, would rather # do something. @@ -2130,7 +2133,7 @@ MAKE_FLAGS?= -f MAKEFILE?= Makefile -MAKE_ENV+= TARGETDIR=${TARGETDIR} DESTDIR=${DESTDIR} PREFIX=${PREFIX} \ +MAKE_ENV+= TARGETDIR=${TARGETDIR} DESTDIR=${DESTDIR} PREFIX=${PREFIX_REL} \ LOCALBASE=${LOCALBASE_REL} X11BASE=${X11BASE_REL} \ MOTIFLIB="${MOTIFLIB}" LIBDIR="${LIBDIR}" CFLAGS="${CFLAGS}" \ CXXFLAGS="${CXXFLAGS}" MANPREFIX="${MANPREFIX}" @@ -2238,7 +2241,7 @@ # Figure out where the local mtree file is .if !defined(MTREE_FILE) && !defined(NO_MTREE) -.if ${PREFIX} == ${X11BASE_REL} || defined(USE_X_PREFIX) +.if ${PREFIX_REL} == ${X11BASE_REL} || defined(USE_X_PREFIX) # User may have specified non-standard PREFIX for installing a port that # uses X .if ${X_WINDOW_SYSTEM:L} == xfree86-3 @@ -2246,7 +2249,7 @@ .else MTREE_FILE= /etc/mtree/BSD.x11-4.dist .endif -.elif ${PREFIX} == /usr +.elif ${PREFIX_REL} == /usr MTREE_FILE= /etc/mtree/BSD.usr.dist .else MTREE_FILE= /etc/mtree/BSD.local.dist @@ -2336,7 +2339,7 @@ DISABLE_CONFLICTS= YES .endif .if !defined(PKG_ARGS) -PKG_ARGS= -v -c -${COMMENT:Q} -d ${DESCR} -f ${TMPPLIST} -p ${PREFIX} -P "`cd ${.CURDIR} && ${MAKE} package-depends | ${GREP} -v -E ${PKG_IGNORE_DEPENDS} | ${SORT} -u`" ${EXTRA_PKG_ARGS} $${_LATE_PKG_ARGS} +PKG_ARGS= -v -c -${COMMENT:Q} -d ${DESCR} -f ${TMPPLIST} -p ${PREFIX_REL} -P "`cd ${.CURDIR} && ${MAKE} package-depends | ${GREP} -v -E ${PKG_IGNORE_DEPENDS} | ${SORT} -u`" ${EXTRA_PKG_ARGS} $${_LATE_PKG_ARGS} .if !defined(NO_MTREE) PKG_ARGS+= -m ${MTREE_FILE} .endif @@ -2513,10 +2516,10 @@ PKGLATESTFILE= ${PKGLATESTREPOSITORY}/${LATEST_LINK}${PKG_SUFX} .if defined(PERL_CONFIGURE) -CONFIGURE_ARGS+= CC="${CC}" CCFLAGS="${CFLAGS}" PREFIX="${TARGETDIR}" \ - INSTALLPRIVLIB="${TARGETDIR}/lib" INSTALLARCHLIB="${TARGETDIR}/lib" +CONFIGURE_ARGS+= CC="${CC}" CCFLAGS="${CFLAGS}" PREFIX="${PREFIX}" \ + INSTALLPRIVLIB="${PREFIX}/lib" INSTALLARCHLIB="${PREFIX}/lib" CONFIGURE_SCRIPT?= Makefile.PL -MAN3PREFIX?= ${TARGETDIR}/lib/perl5/${PERL_VERSION} +MAN3PREFIX?= ${PREFIX}/lib/perl5/${PERL_VERSION} .undef HAS_CONFIGURE .endif @@ -2532,7 +2535,7 @@ .if !defined(CONFIGURE_MAX_CMD_LEN) CONFIGURE_MAX_CMD_LEN!= ${SYSCTL} -n kern.argmax .endif -CONFIGURE_ARGS+= --prefix=${PREFIX} ${CONFIGURE_TARGET} +CONFIGURE_ARGS+= --prefix=${PREFIX_REL} ${CONFIGURE_TARGET} CONFIGURE_ENV+= lt_cv_sys_max_cmd_len=${CONFIGURE_MAX_CMD_LEN} HAS_CONFIGURE= yes .endif @@ -2542,7 +2545,7 @@ WRKDIR=${WRKDIR} WRKSRC=${WRKSRC} PATCHDIR=${PATCHDIR} \ SCRIPTDIR=${SCRIPTDIR} FILESDIR=${FILESDIR} \ PORTSDIR=${PORTSDIR} DEPENDS="${DEPENDS}" \ - PREFIX=${PREFIX} LOCALBASE=${LOCALBASE} X11BASE=${X11BASE} \ + PREFIX=${PREFIX_REL} LOCALBASE=${LOCALBASE_REL} X11BASE=${X11BASE_REL} \ DESTDIR=${DESTDIR} TARGETDIR=${DESTDIR} \ CHROOTDESTDIR=${CHROOTDESTDIR} @@ -2550,10 +2553,10 @@ SCRIPTS_ENV+= BATCH=yes .endif -.if ${PREFIX} == /usr +.if ${PREFIX_REL} == /usr MANPREFIX?= ${DESTDIR}/usr/share .else -MANPREFIX?= ${TARGETDIR} +MANPREFIX?= ${PREFIX} .endif .for sect in 1 2 3 4 5 6 7 8 9 @@ -2631,9 +2634,9 @@ .if defined(_MANPAGES) .if defined(NOMANCOMPRESS) -__MANPAGES:= ${_MANPAGES:S%^${TARGETDIR}/%%} +__MANPAGES:= ${_MANPAGES:S%^${PREFIX}/%%} .else -__MANPAGES:= ${_MANPAGES:S%^${TARGETDIR}/%%:S%$%.gz%} +__MANPAGES:= ${_MANPAGES:S%^${PREFIX}/%%:S%$%.gz%} .endif .if ${MANCOMPRESSED} == "yes" @@ -2648,16 +2651,16 @@ INFO_PATH?= info .endif -DOCSDIR?= ${TARGETDIR}/share/doc/${PORTNAME} -EXAMPLESDIR?= ${TARGETDIR}/share/examples/${PORTNAME} -DATADIR?= ${TARGETDIR}/share/${PORTNAME} +DOCSDIR?= ${PREFIX}/share/doc/${PORTNAME} +EXAMPLESDIR?= ${PREFIX}/share/examples/${PORTNAME} +DATADIR?= ${PREFIX}/share/${PORTNAME} -PLIST_SUB+= DOCSDIR="${DOCSDIR:S,^${TARGETDIR}/,,}" \ - EXAMPLESDIR="${EXAMPLESDIR:S,^${TARGETDIR}/,,}" \ - DATADIR="${DATADIR:S,^${TARGETDIR}/,,}" +PLIST_SUB+= DOCSDIR="${DOCSDIR:S,^${PREFIX}/,,}" \ + EXAMPLESDIR="${EXAMPLESDIR:S,^${PREFIX}/,,}" \ + DATADIR="${DATADIR:S,^${PREFIX}/,,}" DESKTOPDIR?= ${TARGETDIR}/share/applications -_DESKTOPDIR_REL= ${DESKTOPDIR:S,^${TARGETDIR}/,,}/ +_DESKTOPDIR_REL= ${DESKTOPDIR:S,^${PREFIX}/,,}/ .if ${_DESKTOPDIR_REL} == ${DESKTOPDIR}/ # DESKTOPDIR is not beneath PREFIX @@ -2669,7 +2672,7 @@ .if defined(INSTALLS_SHLIB) LDCONFIG_DIRS?= %%PREFIX%%/lib LDCONFIG_PLIST!= ${ECHO_CMD} ${LDCONFIG_DIRS} | ${SED} ${PLIST_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} -LDCONFIG_RUNLIST!= ${ECHO_CMD} ${LDCONFIG_PLIST} | ${SED} -e "s!%D!${PREFIX}!g" +LDCONFIG_RUNLIST!= ${ECHO_CMD} ${LDCONFIG_PLIST} | ${SED} -e "s!%D!${PREFIX_REL}!g" .endif .MAIN: all @@ -3138,7 +3141,7 @@ ${PERL5} -pi -e 's/ doc_(perl|site|\$$\(INSTALLDIRS\))_install$$//' Makefile .if ${PERL_LEVEL} <= 500503 @cd ${CONFIGURE_WRKSRC} && \ - ${PERL5} -pi -e 's/^(INSTALLSITELIB|INSTALLSITEARCH|SITELIBEXP|SITEARCHEXP|INSTALLMAN1DIR|INSTALLMAN3DIR) = \/usr\/local/$$1 = \$$(PREFIX)/' Makefile + ${PERL5} -pi -e 's/^(INSTALLSITELIB|INSTALLSITEARCH|SITELIBEXP|SITEARCHEXP|INSTALLMAN1DIR|INSTALLMAN3DIR) = \/usr\/local/$$1 = \$$(PREFIX_REL)/' Makefile .endif .endif .endif @@ -3173,7 +3176,7 @@ if ${PKG_INFO} -e $${entry} ; then \ prfx=`${PKG_INFO} -q -p "$${entry}" 2> /dev/null | ${SED} -ne '1s/^@cwd //p'`; \ orgn=`${PKG_INFO} -q -o "$${entry}" 2> /dev/null`; \ - if [ "/${PREFIX}" = "/$${prfx}" -a "/${PKGORIGIN}" != "/$${orgn}" ]; then \ + if [ "/${PREFIX_REL}" = "/$${prfx}" -a "/${PKGORIGIN}" != "/$${orgn}" ]; then \ conflicts_with="$${conflicts_with} $${entry}"; \ fi; \ fi; \ @@ -3322,7 +3325,7 @@ if [ -n "$${already_installed}" ]; then \ for p in $${already_installed}; do \ prfx=`${PKG_INFO} -q -p $${p} 2> /dev/null | ${SED} -ne '1s|^@cwd ||p'`; \ - if [ "x${PREFIX}" = "x$${prfx}" ]; then \ + if [ "x${PREFIX_REL}" = "x$${prfx}" ]; then \ df=`${PKG_INFO} -q -f $${p} 2> /dev/null | ${GREP} -v "^@" | ${COMM} -12 - ${TMPPLIST}`; \ if [ -n "$${df}" ]; then \ found_package=$${p}; \ @@ -3368,12 +3371,12 @@ .if !target(install-mtree) install-mtree: - @${MKDIR} ${TARGETDIR} + @${MKDIR} ${PREFIX} @if [ `${ID} -u` != 0 ]; then \ - if [ -w ${TARGETDIR}/ ]; then \ + if [ -w ${PREFIX}/ ]; then \ ${ECHO_MSG} "Warning: not superuser, you may get some errors during installation."; \ else \ - ${ECHO_MSG} "Error: ${TARGETDIR}/ not writable."; \ + ${ECHO_MSG} "Error: ${PREFIX}/ not writable."; \ ${FALSE}; \ fi; \ fi @@ -3384,7 +3387,7 @@ ${ECHO_MSG} "Copy it from a suitable location (e.g., /usr/src/etc/mtree) and try again."; \ exit 1; \ else \ - ${MTREE_CMD} ${MTREE_ARGS} ${TARGETDIR}/ >/dev/null; \ + ${MTREE_CMD} ${MTREE_ARGS} ${PREFIX}/ >/dev/null; \ if [ ${MTREE_FILE} = "/etc/mtree/BSD.local.dist" ]; then \ cd ${TARGETDIR}/share/nls; \ ${LN} -shf C POSIX; \ @@ -3419,13 +3422,13 @@ ${CHROOTDESTDIR} -${LDCONFIG} -m ${USE_LDCONFIG} .endif .endif -.if ${USE_LDCONFIG:L} != "${PREFIX}/lib" +.if ${USE_LDCONFIG:L} != "${PREFIX_REL}/lib" @${ECHO_MSG} "===> Installing ldconfig configuration file" .if defined(NO_LDCONFIG_MTREE) - @${MKDIR} ${PREFIX}/${LDCONFIG_DIR} + @${MKDIR} ${PREFIX_REL}/${LDCONFIG_DIR} .endif @${ECHO_CMD} ${USE_LDCONFIG} | ${TR} ' ' '\n' \ - > ${PREFIX}/${LDCONFIG_DIR}/${UNIQUENAME} + > ${PREFIX_REL}/${LDCONFIG_DIR}/${UNIQUENAME} @${ECHO_CMD} ${LDCONFIG_DIR}/${UNIQUENAME} >> ${TMPPLIST} .if defined(NO_LDCONFIG_MTREE) @${ECHO_CMD} "@unexec rmdir ${LDCONFIG_DIR} >/dev/null 2>&1" >> ${TMPPLIST} @@ -3452,10 +3455,10 @@ .endif @${ECHO_MSG} "===> Installing 32-bit ldconfig configuration file" .if defined(NO_LDCONFIG_MTREE) - @${MKDIR} ${PREFIX}/${LDCONFIG_32DIR} + @${MKDIR} ${PREFIX_REL}/${LDCONFIG_32DIR} .endif @${ECHO_CMD} ${USE_LDCONFIG32} | ${TR} ' ' '\n' \ - > ${PREFIX}/${LDCONFIG32_DIR}/${UNIQUENAME} + > ${PREFIX_REL}/${LDCONFIG32_DIR}/${UNIQUENAME} @${ECHO_CMD} ${LDCONFIG32_DIR}/${UNIQUENAME} >> ${TMPPLIST} .if defined(NO_LDCONFIG_MTREE) @${ECHO_CMD} "@unexec rmdir ${LDCONFIG32_DIR} >/dev/null 2>&1" >> ${TMPPLIST} @@ -3496,7 +3499,7 @@ # 5. world-writable files/dirs # -@${RM} -f ${WRKDIR}/.PLIST.setuid ${WRKDIR}/.PLIST.writable ${WRKDIR}/.PLIST.objdump; \ - ${AWK} -v prefix='${PREFIX}' ' \ + ${AWK} -v prefix='${PREFIX_REL}' ' \ match($$0, /^@cwd /) { prefix = substr($$0, RSTART + RLENGTH); if (prefix == "/") prefix=""; next; } \ /^@/ { next; } \ /^\// { print; next; } \ @@ -3541,8 +3544,8 @@ stupid_functions_regexp=' (gets|mktemp|tempnam|tmpnam)$$'; \ fi; \ for i in `${GREP} -v '^@' ${TMPPLIST}`; do \ - if [ ! -L "${PREFIX}/$$i" -a -f "${PREFIX}/$$i" ]; then \ - ${OBJDUMP} -R ${PREFIX}/$$i > \ + if [ ! -L "${PREFIX_REL}/$$i" -a -f "${PREFIX_REL}/$$i" ]; then \ + ${OBJDUMP} -R ${PREFIX_REL}/$$i > \ ${WRKDIR}/.PLIST.objdump 2> /dev/null; \ if [ -s ${WRKDIR}/.PLIST.objdump ] ; then \ ${EGREP} " $$stupid_functions_regexp" \ @@ -3550,27 +3553,27 @@ > ${WRKDIR}/.PLIST.stupid; \ if [ -n "`${EGREP} ' (accept|recvfrom)$$' ${WRKDIR}/.PLIST.objdump`" ] ; then \ if [ -s ${WRKDIR}/.PLIST.stupid ]; then \ - ${ECHO_CMD} -n "${PREFIX}/$$i (USES POSSIBLY INSECURE FUNCTIONS:" >> ${WRKDIR}/.PLIST.network; \ + ${ECHO_CMD} -n "${PREFIX_REL}/$$i (USES POSSIBLY INSECURE FUNCTIONS:" >> ${WRKDIR}/.PLIST.network; \ ${CAT} ${WRKDIR}/.PLIST.stupid >> ${WRKDIR}/.PLIST.network; \ ${ECHO_CMD} ")" >> ${WRKDIR}/.PLIST.network; \ else \ - ${ECHO_CMD} ${PREFIX}/$$i >> ${WRKDIR}/.PLIST.network; \ + ${ECHO_CMD} ${PREFIX_REL}/$$i >> ${WRKDIR}/.PLIST.network; \ fi; \ fi; \ fi; \ - if [ -n "`${FIND} ${PREFIX}/$$i -prune \( -perm -4000 -o -perm -2000 \) \( -perm -0010 -o -perm -0001 \) 2>/dev/null`" ]; then \ + if [ -n "`${FIND} ${PREFIX_REL}/$$i -prune \( -perm -4000 -o -perm -2000 \) \( -perm -0010 -o -perm -0001 \) 2>/dev/null`" ]; then \ if [ -s ${WRKDIR}/.PLIST.stupid ]; then \ - ${ECHO_CMD} -n "${PREFIX}/$$i (USES POSSIBLY INSECURE FUNCTIONS:" >> ${WRKDIR}/.PLIST.setuid; \ + ${ECHO_CMD} -n "${PREFIX_REL}/$$i (USES POSSIBLY INSECURE FUNCTIONS:" >> ${WRKDIR}/.PLIST.setuid; \ ${CAT} ${WRKDIR}/.PLIST.stupid >> ${WRKDIR}/.PLIST.setuid; \ ${ECHO_CMD} ")" >> ${WRKDIR}/.PLIST.setuid; \ else \ - ${ECHO_CMD} ${PREFIX}/$$i >> ${WRKDIR}/.PLIST.setuid; \ + ${ECHO_CMD} ${PREFIX_REL}/$$i >> ${WRKDIR}/.PLIST.setuid; \ fi; \ fi; \ fi; \ - if [ ! -L "${PREFIX}/$$i" ]; then \ - if [ -n "`${FIND} ${PREFIX}/$$i -prune -perm -0002 \! -type l 2>/dev/null`" ]; then \ - ${ECHO_CMD} ${PREFIX}/$$i >> ${WRKDIR}/.PLIST.writable; \ + if [ ! -L "${PREFIX_REL}/$$i" ]; then \ + if [ -n "`${FIND} ${PREFIX_REL}/$$i -prune -perm -0002 \! -type l 2>/dev/null`" ]; then \ + ${ECHO_CMD} ${PREFIX_REL}/$$i >> ${WRKDIR}/.PLIST.writable; \ fi; \ fi; \ done; \ @@ -3617,7 +3620,7 @@ ${ECHO_MSG} " This port has installed the following startup scripts into ${DESTDIR},"; \ fi; \ ${ECHO_MSG} " which may cause these network services to be started at boot time."; \ - ${SED} s,^,${PREFIX}/, < ${WRKDIR}/.PLIST.startup; \ + ${SED} s,^,${PREFIX_REL}/, < ${WRKDIR}/.PLIST.startup; \ ${ECHO_MSG}; \ fi; \ fi; \ @@ -3865,7 +3868,7 @@ check_name=`${ECHO_CMD} $${p} | ${SED} -e 's/-[^-]*$$//'`; \ if [ "$${check_name}" = "${PKGBASE}" ]; then \ prfx=`${PKG_INFO} -q -p $${p} 2> /dev/null | ${SED} -ne '1s|^@cwd ||p'`; \ - if [ "x${PREFIX}" = "x$${prfx}" ]; then \ + if [ "x${PREFIX_REL}" = "x$${prfx}" ]; then \ if [ -z "${DESTDIR}" ] ; then \ ${ECHO_MSG} "===> Deinstalling $${p}"; \ else \ @@ -4409,7 +4412,7 @@ fi; \ fi; \ elif ${WHICH} "$$prog" > /dev/null 2>&1 ; then \ - if [ -z "${PREFIX}" ] ; then \ + if [ -z "${DESTDIR}" ] ; then \ ${ECHO_MSG} "===> ${PKGNAME} depends on executable: $$prog - found"; \ else \ ${ECHO_MSG} "===> ${PKGNAME} depends on executable in ${DESTDIR}: $$prog - found"; \ @@ -4780,7 +4783,7 @@ .if !target(describe) describe: - @${ECHO_CMD} -n "${PKGNAME}|${.CURDIR}|${PREFIX}|" + @${ECHO_CMD} -n "${PKGNAME}|${.CURDIR}|${PREFIX_REL}|" .if defined(COMMENT) @${ECHO_CMD} -n ${COMMENT:Q} .else @@ -4948,7 +4951,7 @@ @for man in ${__MANPAGES}; do \ ${ECHO_CMD} $${man} >> ${TMPPLIST}; \ done -.for _PREFIX in ${PREFIX} +.for _PREFIX in ${PREFIX_REL} .if ${_TMLINKS:M${_PREFIX}*}x != x @for i in ${_TMLINKS:M${_PREFIX}*:S|^${_PREFIX}/||}; do \ ${ECHO_CMD} "$$i" >> ${TMPPLIST}; \ @@ -4959,7 +4962,7 @@ @for i in ${_TMLINKS:N${_PREFIX}*:S|^/||}; do \ ${ECHO_CMD} "$$i" >> ${TMPPLIST}; \ done - @${ECHO_CMD} '@cwd ${PREFIX}' >> ${TMPPLIST} + @${ECHO_CMD} '@cwd ${PREFIX_REL}' >> ${TMPPLIST} .endif @for i in $$(${ECHO_CMD} ${__MANPAGES} ${_TMLINKS:M${_PREFIX}*:S|^${_PREFIX}/||} ' ' | ${SED} -E -e 's|man([1-9ln])/([^/ ]+) |cat\1/\2 |g'); do \ ${ECHO_CMD} "@unexec rm -f %D/$${i%.gz} %D/$${i%.gz}.gz" >> ${TMPPLIST}; \ @@ -5020,21 +5023,21 @@ add-plist-docs: .if defined(PORTDOCS) && !defined(NOPORTDOCS) @if ${EGREP} -qe '^@cw?d' ${TMPPLIST} && \ - [ "`${SED} -En -e '/^@cw?d[ ]*/s,,,p' ${TMPPLIST} | ${TAIL} -n 1`" != "${PREFIX}" ]; then \ + [ "`${SED} -En -e '/^@cw?d[ ]*/s,,,p' ${TMPPLIST} | ${TAIL} -n 1`" != "${PREFIX_REL}" ]; then \ ${ECHO_CMD} "@cwd ${PREFIX}" >> ${TMPPLIST}; \ fi .for x in ${PORTDOCS} @if ${ECHO_CMD} "${x}"| ${AWK} '$$1 ~ /(\*|\||\[|\]|\?|\{|\}|\$$)/ { exit 1};'; then \ if [ ! -e ${DOCSDIR}/${x} ]; then \ ${ECHO_CMD} ${DOCSDIR}/${x} | \ - ${SED} -e 's,^${TARGETDIR}/,,' >> ${TMPPLIST}; \ + ${SED} -e 's,^${PREFIX}/,,' >> ${TMPPLIST}; \ fi;fi .endfor @${FIND} -P ${PORTDOCS:S/^/${DOCSDIR}\//} ! -type d 2>/dev/null | \ - ${SED} -ne 's,^${TARGETDIR}/,,p' >> ${TMPPLIST} + ${SED} -ne 's,^${PREFIX}/,,p' >> ${TMPPLIST} @${FIND} -P -d ${PORTDOCS:S/^/${DOCSDIR}\//} -type d 2>/dev/null | \ - ${SED} -ne 's,^${TARGETDIR}/,@dirrm ,p' >> ${TMPPLIST} - @${ECHO_CMD} "@dirrm ${DOCSDIR:S,^${TARGETDIR}/,,}" >> ${TMPPLIST} + ${SED} -ne 's,^${PREFIX}/,@dirrm ,p' >> ${TMPPLIST} + @${ECHO_CMD} "@dirrm ${DOCSDIR:S,^${PREFIX}/,,}" >> ${TMPPLIST} .else @${DO_NADA} .endif @@ -5045,19 +5048,19 @@ # Process GNU INFO files at package install/deinstall time .if defined(INFO) .for i in ${INFO} - install-info --quiet ${TARGETDIR}/${INFO_PATH}/$i.info ${TARGETDIR}/${INFO_PATH}/dir + install-info --quiet ${PREFIX}/${INFO_PATH}/$i.info ${PREFIX}/${INFO_PATH}/dir @${ECHO_CMD} "@unexec install-info --quiet --delete %D/${INFO_PATH}/$i.info %D/${INFO_PATH}/dir" \ >> ${TMPPLIST} - @${LS} ${TARGETDIR}/${INFO_PATH}/$i.info* | ${SED} -e s:${TARGETDIR}/::g >> ${TMPPLIST} + @${LS} ${PREFIX}/${INFO_PATH}/$i.info* | ${SED} -e s:${PREFIX}/::g >> ${TMPPLIST} @${ECHO_CMD} "@exec install-info --quiet %D/${INFO_PATH}/$i.info %D/${INFO_PATH}/dir" \ >> ${TMPPLIST} @if [ "`${DIRNAME} $i`" != "." ]; then \ ${ECHO_CMD} "@unexec ${RMDIR} %D/info/`${DIRNAME} $i` 2> /dev/null || true" >> ${TMPPLIST}; \ fi .endfor -.if (${PREFIX} != "/usr") +.if (${PREFIX_REL} != "/usr") @${ECHO_CMD} "@unexec if [ -f %D/${INFO_PATH}/dir ]; then if sed -e '1,/Menu:/d' %D/${INFO_PATH}/dir | grep -q '^[*] '; then true; else rm %D/${INFO_PATH}/dir; fi; fi" >> ${TMPPLIST} -.if (${PREFIX} != ${LOCALBASE_REL} && ${PREFIX} != ${X11BASE_REL} && ${PREFIX} != ${LINUXBASE_REL}) +.if (${PREFIX_REL} != ${LOCALBASE_REL} && ${PREFIX_REL} != ${X11BASE_REL} && ${PREFIX_REL} != ${LINUXBASE_REL}) @${ECHO_CMD} "@unexec rmdir %D/info 2> /dev/null || true" >> ${TMPPLIST} .endif .endif @@ -5068,7 +5071,7 @@ # deinstall-time .if !target(add-plist-post) add-plist-post: -.if (${PREFIX} != ${LOCALBASE_REL} && ${PREFIX} != ${X11BASE_REL} && ${PREFIX} != ${LINUXBASE_REL} && ${PREFIX} != "/usr") +.if (${PREFIX_REL} != ${LOCALBASE_REL} && ${PREFIX_REL} != ${X11BASE_REL} && ${PREFIX_REL} != ${LINUXBASE_REL} && ${PREFIX_REL} != "/usr") @${ECHO_CMD} "@unexec rmdir %D 2> /dev/null || true" >> ${TMPPLIST} .else @${DO_NADA} @@ -5085,19 +5088,19 @@ ${INSTALL_SCRIPT} ${WRKDIR}/$${i} ${DESTDIR}/etc/rc.d/$${i%.sh}; \ ${ECHO_CMD} "etc/rc.d/$${i%.sh}" >> ${TMPPLIST}; \ done - @${ECHO_CMD} "@cwd ${PREFIX}" >> ${TMPPLIST} + @${ECHO_CMD} "@cwd ${PREFIX_REL}" >> ${TMPPLIST} .endif .if defined(USE_RC_SUBR) && ${USE_RC_SUBR:U} != "YES" @${ECHO_MSG} "===> Installing rc.d startup script(s)" - @${ECHO_CMD} "@cwd ${PREFIX}" >> ${TMPPLIST} + @${ECHO_CMD} "@cwd ${PREFIX_REL}" >> ${TMPPLIST} .if (${OSVERSION} >= 700007 || ( ${OSVERSION} < 700000 && ${OSVERSION} >= 600101 )) @for i in ${USE_RC_SUBR}; do \ - ${INSTALL_SCRIPT} ${WRKDIR}/$${i} ${TARGETDIR}/etc/rc.d/$${i%.sh}; \ + ${INSTALL_SCRIPT} ${WRKDIR}/$${i} ${PREFIX}/etc/rc.d/$${i%.sh}; \ ${ECHO_CMD} "etc/rc.d/$${i%.sh}" >> ${TMPPLIST}; \ done .else @for i in ${USE_RC_SUBR}; do \ - ${INSTALL_SCRIPT} ${WRKDIR}/$${i} ${TARGETDIR}/etc/rc.d/$${i%.sh}.sh; \ + ${INSTALL_SCRIPT} ${WRKDIR}/$${i} ${PREFIX}/etc/rc.d/$${i%.sh}.sh; \ ${ECHO_CMD} "etc/rc.d/$${i%.sh}.sh" >> ${TMPPLIST}; \ done .endif @@ -5550,7 +5553,7 @@ done; \ ${ECHO_CMD} "@unexec rmdir ${DESKTOPDIR} 2>/dev/null || true" >> ${TMPPLIST}; \ if [ -z "${_DESKTOPDIR_REL}" ]; then \ - ${ECHO_CMD} "@cwd ${PREFIX}" >> ${TMPPLIST}; \ + ${ECHO_CMD} "@cwd ${PREFIX_REL}" >> ${TMPPLIST}; \ fi .else @${DO_NADA} From owner-p4-projects@FreeBSD.ORG Wed Aug 16 15:56:23 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 40F8116A4DF; Wed, 16 Aug 2006 15:56:23 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 1C7FB16A4DD for ; Wed, 16 Aug 2006 15:56:23 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 90DC143D4C for ; Wed, 16 Aug 2006 15:56:22 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7GFuMbd081687 for ; Wed, 16 Aug 2006 15:56:22 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7GFuMVH081682 for perforce@freebsd.org; Wed, 16 Aug 2006 15:56:22 GMT (envelope-from millert@freebsd.org) Date: Wed, 16 Aug 2006 15:56:22 GMT Message-Id: <200608161556.k7GFuMVH081682@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 104254 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 16 Aug 2006 15:56:23 -0000 http://perforce.freebsd.org/chv.cgi?CH=104254 Change 104254 by millert@millert_macbook on 2006/08/16 15:55:26 Fix editor goof Affected files ... .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/src/Makefile#4 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/src/Makefile#4 (text+ko) ==== @@ -4,8 +4,7 @@ -I../include -I../../libsepol/include -I../../libsecompat -Wall LIB = selinux -OBJS = - avc.o avc_internal.o avc_sidtab.o booleans.o canonicalize_context.o \ +OBJS = avc.o avc_internal.o avc_sidtab.o booleans.o canonicalize_context.o \ checkAccess.o check_context.o compute_av.o compute_create.o \ compute_member.o compute_relabel.o compute_user.o context.o \ disable.o enabled.o fgetfilecon.o freecon.o freeconary.o \ From owner-p4-projects@FreeBSD.ORG Wed Aug 16 16:09:19 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 89D8916A513; Wed, 16 Aug 2006 16:09:19 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 4C82B16A500 for ; Wed, 16 Aug 2006 16:09:19 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E73DD43DC0 for ; Wed, 16 Aug 2006 16:08:41 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7GG8ddk083545 for ; Wed, 16 Aug 2006 16:08:39 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7GG8dFd083542 for perforce@freebsd.org; Wed, 16 Aug 2006 16:08:39 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Wed, 16 Aug 2006 16:08:39 GMT Message-Id: <200608161608.k7GG8dFd083542@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 104256 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 16 Aug 2006 16:09:20 -0000 http://perforce.freebsd.org/chv.cgi?CH=104256 Change 104256 by rwatson@rwatson_fledge on 2006/08/16 16:08:37 Give ACLs their own web page. Affected files ... .. //depot/projects/trustedbsd/www/Makefile#6 edit .. //depot/projects/trustedbsd/www/acls.page#1 add .. //depot/projects/trustedbsd/www/components.page#7 edit .. //depot/projects/trustedbsd/www/sidebar.xml#9 edit Differences ... ==== //depot/projects/trustedbsd/www/Makefile#6 (text+ko) ==== @@ -28,7 +28,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $P4: //depot/projects/trustedbsd/www/Makefile#5 $ +# $P4: //depot/projects/trustedbsd/www/Makefile#6 $ STYLESHEET= page.xsl @@ -46,6 +46,7 @@ SRCS+= sedarwin.page SRCS+= audit.page SRCS+= cap.page +SRCS+= acls.page IMGS= components.gif componentsgray.gif IMGS+= developers.gif developersgray.gif docs.gif ==== //depot/projects/trustedbsd/www/components.page#7 (text+ko) ==== @@ -37,7 +37,7 @@ - $P4: //depot/projects/trustedbsd/www/components.page#6 $ + $P4: //depot/projects/trustedbsd/www/components.page#7 $ @@ -83,13 +83,11 @@

Access control lists allow more fine-grained discretionary access controls to be placed on files and directories. - Currently, ACLs are backed to extended attributes on UFS file - systems. An extended attribute implementation was layered - onto UFS1, and a native implementation is available as part - of UFS2. The finished ACL implementation has been available - as part of FreeBSD since the 5.0 release. Some further - application adaptation work is on-going, and is taking place - in the FreeBSD development tree.

+ ACLs have been a production feature in the FreeBSD operating + since being integrated in FreeBSD 5.0-RELEASE. + Portions of the TrustedBSD ACLs implementation also appear in + Mac OS X and Linux. Visit the TrustedBSD + ACLs web page for more information.

==== //depot/projects/trustedbsd/www/sidebar.xml#9 (text+ko) ==== @@ -3,7 +3,7 @@

TrustedBSD News

    -
  • ACLs
    • +
  • ACLs
  • Audit
  • Extended Attributes and UFS2
  • Capabilities
    • @@ -19,7 +19,7 @@

    Components

      -
    • ACLs
      • +
    • ACLs
    • Audit
    • Extended Attributes and UFS2
    • Capabilities
      • From owner-p4-projects@FreeBSD.ORG Wed Aug 16 16:22:05 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EF11016A4E2; Wed, 16 Aug 2006 16:22:04 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 AED4216A4DA for ; Wed, 16 Aug 2006 16:22:04 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 41F4843D46 for ; Wed, 16 Aug 2006 16:22:04 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7GGM4CV084784 for ; Wed, 16 Aug 2006 16:22:04 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7GGLuOT084672 for perforce@freebsd.org; Wed, 16 Aug 2006 16:21:56 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Wed, 16 Aug 2006 16:21:56 GMT Message-Id: <200608161621.k7GGLuOT084672@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 104257 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 16 Aug 2006 16:22:05 -0000 http://perforce.freebsd.org/chv.cgi?CH=104257 Change 104257 by rwatson@rwatson_zoo on 2006/08/16 16:21:10 Integrate TrustedBSD base branch from FreeBSD CVS: - ipfilter upgrade to 4.1.13 - linuxulator update to 2.6.x - strstr() in libkern - more sockets and protocols cleanup - new DDB lock debugging bits - new audit syscalls.master details to improve module support - tun kqueue support - sysctl xint + xlong - usual plethora of arm support changes, device driver updates, etc. Affected files ... .. //depot/projects/trustedbsd/base/Makefile.inc1#75 integrate .. //depot/projects/trustedbsd/base/ObsoleteFiles.inc#11 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/BSD/Makefile#9 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/HISTORY#10 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/Makefile#8 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/bpf_filter.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/ip_fil.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/ipf.h#6 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/iplang/iplang_y.y#6 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/ipmon.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/ipsd/sbpf.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/ipsend/ipsend.c#8 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/ipsend/iptests.c#7 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/ipsend/lsock.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/ipsend/resend.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/ipsend/sbpf.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/ipsend/sock.c#8 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/ipt.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/lib/Makefile#3 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/lib/addicmp.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/lib/addkeep.c#3 delete .. //depot/projects/trustedbsd/base/contrib/ipfilter/lib/facpri.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/lib/getport.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/lib/icmpcode.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/lib/ipft_tx.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/lib/make_range.c#3 delete .. //depot/projects/trustedbsd/base/contrib/ipfilter/lib/optprint.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/lib/printfr.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/lib/printlog.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/man/ipmon.8#10 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/radix.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/samples/proxy.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/Makefile#10 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/expected/f20#1 branch .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/expected/i1#4 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/expected/i10#2 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/expected/i11#5 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/expected/i18#2 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/expected/i5#3 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/expected/i8#3 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/expected/i9#4 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/expected/in2#4 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/expected/in5#3 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/expected/ni19#1 branch .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/expected/ni20#1 branch .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/expected/ni21#1 branch .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/input/f2#2 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/input/f20#1 branch .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/input/ni19#1 branch .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/input/ni20#1 branch .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/input/ni21#1 branch .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/regress/f20#1 branch .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/regress/i1#4 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/regress/i10#2 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/regress/i11#5 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/regress/i15#2 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/regress/i17#2 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/regress/i18#2 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/regress/i5#2 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/regress/i8#3 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/regress/i9#4 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/regress/in2#4 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/regress/in5#3 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/regress/ni19.ipf#1 branch .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/regress/ni19.nat#1 branch .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/regress/ni20.ipf#1 branch .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/regress/ni20.nat#1 branch .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/regress/ni21.ipf#1 branch .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/regress/ni21.nat#1 branch .. //depot/projects/trustedbsd/base/contrib/ipfilter/test/test.format#3 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/todo#4 branch .. //depot/projects/trustedbsd/base/contrib/ipfilter/tools/ipf.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/tools/ipf_y.y#4 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/tools/ipfcomp.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/tools/ipfs.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/tools/ipfstat.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/tools/ipftest.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/tools/ipmon.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/tools/ipnat_y.y#3 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/tools/ipsyncm.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/tools/ipsyncs.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/ipfilter/tools/lexer.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/smbfs/smbutil/print.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/smbfs/smbutil/view.c#5 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/binutils/libbfd/Makefile.arm#2 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/groff/contrib/mm/Makefile#7 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/groff/tmac/Makefile#11 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/groff/tmac/mdoc.local#29 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/msgctl.3#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/gen/syslog.c#16 integrate .. //depot/projects/trustedbsd/base/lib/libc/stdlib/malloc.c#30 integrate .. //depot/projects/trustedbsd/base/lib/libc/string/strcoll.3#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/connect.2#7 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/getfsstat.2#7 integrate .. //depot/projects/trustedbsd/base/lib/libdisk/write_ia64_disk.c#9 integrate .. //depot/projects/trustedbsd/base/lib/libpam/modules/pam_lastlog/pam_lastlog.c#13 integrate .. //depot/projects/trustedbsd/base/lib/libthr/thread/thr_init.c#20 integrate .. //depot/projects/trustedbsd/base/lib/libthr/thread/thr_mutex.c#19 integrate .. //depot/projects/trustedbsd/base/lib/libthr/thread/thr_private.h#22 integrate .. //depot/projects/trustedbsd/base/lib/libthr/thread/thr_pspinlock.c#3 integrate .. //depot/projects/trustedbsd/base/libexec/tftpd/tftpd.8#4 integrate .. //depot/projects/trustedbsd/base/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#105 integrate .. //depot/projects/trustedbsd/base/sbin/dump/main.c#24 integrate .. //depot/projects/trustedbsd/base/sbin/geom/class/eli/geli.8#7 integrate .. //depot/projects/trustedbsd/base/sbin/geom/class/eli/geom_eli.c#8 integrate .. //depot/projects/trustedbsd/base/sbin/ifconfig/ifclone.c#3 integrate .. //depot/projects/trustedbsd/base/sbin/ifconfig/ifieee80211.c#21 integrate .. //depot/projects/trustedbsd/base/sbin/ipf/libipf/Makefile#4 integrate .. //depot/projects/trustedbsd/base/sbin/ping/ping.c#27 integrate .. //depot/projects/trustedbsd/base/sbin/sysctl/sysctl.c#25 integrate .. //depot/projects/trustedbsd/base/share/examples/drivers/make_device_driver.sh#6 integrate .. //depot/projects/trustedbsd/base/share/examples/drivers/make_pseudo_driver.sh#5 integrate .. //depot/projects/trustedbsd/base/share/man/man4/acpi.4#28 integrate .. //depot/projects/trustedbsd/base/share/man/man4/ata.4#21 integrate .. //depot/projects/trustedbsd/base/share/man/man4/if_bridge.4#9 integrate .. //depot/projects/trustedbsd/base/share/man/man4/ng_pppoe.4#13 integrate .. //depot/projects/trustedbsd/base/share/man/man4/uscanner.4#12 integrate .. //depot/projects/trustedbsd/base/share/man/man4/vlan.4#17 integrate .. //depot/projects/trustedbsd/base/share/man/man7/release.7#30 integrate .. //depot/projects/trustedbsd/base/share/man/man9/sysctl.9#2 integrate .. //depot/projects/trustedbsd/base/share/mk/bsd.cpu.mk#24 integrate .. //depot/projects/trustedbsd/base/share/mk/bsd.sys.mk#16 integrate .. //depot/projects/trustedbsd/base/sys/Makefile#13 integrate .. //depot/projects/trustedbsd/base/sys/amd64/acpica/madt.c#10 integrate .. //depot/projects/trustedbsd/base/sys/amd64/amd64/pmap.c#34 integrate .. //depot/projects/trustedbsd/base/sys/amd64/amd64/support.S#12 integrate .. //depot/projects/trustedbsd/base/sys/amd64/amd64/trap.c#28 integrate .. //depot/projects/trustedbsd/base/sys/amd64/include/pmap.h#21 integrate .. //depot/projects/trustedbsd/base/sys/amd64/linux32/linux.h#3 integrate .. //depot/projects/trustedbsd/base/sys/amd64/linux32/linux32_dummy.c#4 integrate .. //depot/projects/trustedbsd/base/sys/amd64/linux32/linux32_machdep.c#7 integrate .. //depot/projects/trustedbsd/base/sys/amd64/linux32/linux32_proto.h#12 integrate .. //depot/projects/trustedbsd/base/sys/amd64/linux32/linux32_syscall.h#12 integrate .. //depot/projects/trustedbsd/base/sys/amd64/linux32/linux32_sysent.c#12 integrate .. //depot/projects/trustedbsd/base/sys/amd64/linux32/linux32_sysvec.c#10 integrate .. //depot/projects/trustedbsd/base/sys/amd64/linux32/syscalls.conf#2 integrate .. //depot/projects/trustedbsd/base/sys/amd64/linux32/syscalls.master#12 integrate .. //depot/projects/trustedbsd/base/sys/arm/arm/elf_trampoline.c#5 integrate .. //depot/projects/trustedbsd/base/sys/arm/arm/mem.c#3 integrate .. //depot/projects/trustedbsd/base/sys/arm/arm/pmap.c#17 integrate .. //depot/projects/trustedbsd/base/sys/arm/arm/vm_machdep.c#16 integrate .. //depot/projects/trustedbsd/base/sys/arm/at91/at91_st.c#5 integrate .. //depot/projects/trustedbsd/base/sys/arm/at91/kb920x_machdep.c#6 integrate .. //depot/projects/trustedbsd/base/sys/arm/include/pmap.h#14 integrate .. //depot/projects/trustedbsd/base/sys/arm/include/sf_buf.h#2 integrate .. //depot/projects/trustedbsd/base/sys/arm/include/vmparam.h#5 integrate .. //depot/projects/trustedbsd/base/sys/arm/sa11x0/assabet_machdep.c#9 integrate .. //depot/projects/trustedbsd/base/sys/arm/xscale/i80321/iq31244_machdep.c#11 integrate .. //depot/projects/trustedbsd/base/sys/boot/Makefile#17 integrate .. //depot/projects/trustedbsd/base/sys/boot/arm/Makefile#1 branch .. //depot/projects/trustedbsd/base/sys/boot/arm/at91/Makefile.inc#2 integrate .. //depot/projects/trustedbsd/base/sys/boot/arm/at91/bootiic/Makefile#2 integrate .. //depot/projects/trustedbsd/base/sys/boot/arm/at91/bootiic/arm_init.S#2 integrate .. //depot/projects/trustedbsd/base/sys/boot/arm/at91/bootiic/env_vars.c#1 branch .. //depot/projects/trustedbsd/base/sys/boot/arm/at91/bootiic/env_vars.h#1 branch .. //depot/projects/trustedbsd/base/sys/boot/arm/at91/bootiic/loader_prompt.c#1 branch .. //depot/projects/trustedbsd/base/sys/boot/arm/at91/bootiic/loader_prompt.h#1 branch .. //depot/projects/trustedbsd/base/sys/boot/arm/at91/bootiic/main.c#2 integrate .. //depot/projects/trustedbsd/base/sys/boot/arm/at91/libat91/Makefile#2 integrate .. //depot/projects/trustedbsd/base/sys/boot/arm/at91/libat91/at91rm9200.h#2 integrate .. //depot/projects/trustedbsd/base/sys/boot/arm/at91/libat91/at91rm9200_lowlevel.h#2 integrate .. //depot/projects/trustedbsd/base/sys/boot/arm/at91/libat91/eeprom.c#2 integrate .. //depot/projects/trustedbsd/base/sys/boot/arm/at91/libat91/eeprom.h#2 delete .. //depot/projects/trustedbsd/base/sys/boot/arm/at91/libat91/emac.c#2 integrate .. //depot/projects/trustedbsd/base/sys/boot/arm/at91/libat91/emac.h#2 integrate .. //depot/projects/trustedbsd/base/sys/boot/arm/at91/libat91/env_vars.c#2 delete .. //depot/projects/trustedbsd/base/sys/boot/arm/at91/libat91/env_vars.h#2 delete .. //depot/projects/trustedbsd/base/sys/boot/arm/at91/libat91/lib.h#2 integrate .. //depot/projects/trustedbsd/base/sys/boot/arm/at91/libat91/loader_prompt.c#2 delete .. //depot/projects/trustedbsd/base/sys/boot/arm/at91/libat91/loader_prompt.h#2 delete .. //depot/projects/trustedbsd/base/sys/boot/arm/at91/libat91/p_string.c#2 integrate .. //depot/projects/trustedbsd/base/sys/boot/arm/at91/libat91/p_string.h#2 delete .. //depot/projects/trustedbsd/base/sys/boot/arm/at91/libat91/spi_flash.c#1 branch .. //depot/projects/trustedbsd/base/sys/boot/arm/at91/libat91/spi_flash.h#1 branch .. //depot/projects/trustedbsd/base/sys/boot/arm/at91/libat91/xmodem.c#2 integrate .. //depot/projects/trustedbsd/base/sys/boot/forth/loader.conf#32 integrate .. //depot/projects/trustedbsd/base/sys/cam/scsi/scsi_pass.c#11 integrate .. //depot/projects/trustedbsd/base/sys/compat/freebsd32/freebsd32_misc.c#23 integrate .. //depot/projects/trustedbsd/base/sys/compat/freebsd32/freebsd32_proto.h#22 integrate .. //depot/projects/trustedbsd/base/sys/compat/freebsd32/freebsd32_syscall.h#22 integrate .. //depot/projects/trustedbsd/base/sys/compat/freebsd32/freebsd32_syscalls.c#22 integrate .. //depot/projects/trustedbsd/base/sys/compat/freebsd32/freebsd32_sysent.c#22 integrate .. //depot/projects/trustedbsd/base/sys/compat/freebsd32/syscalls.conf#3 integrate .. //depot/projects/trustedbsd/base/sys/compat/linprocfs/linprocfs.c#35 integrate .. //depot/projects/trustedbsd/base/sys/compat/linux/linux_emul.c#1 branch .. //depot/projects/trustedbsd/base/sys/compat/linux/linux_emul.h#1 branch .. //depot/projects/trustedbsd/base/sys/compat/linux/linux_futex.c#1 branch .. //depot/projects/trustedbsd/base/sys/compat/linux/linux_futex.h#1 branch .. //depot/projects/trustedbsd/base/sys/compat/linux/linux_misc.c#43 integrate .. //depot/projects/trustedbsd/base/sys/compat/linux/linux_signal.c#14 integrate .. //depot/projects/trustedbsd/base/sys/compat/linux/linux_time.c#1 branch .. //depot/projects/trustedbsd/base/sys/compat/linux/linux_util.c#11 integrate .. //depot/projects/trustedbsd/base/sys/compat/svr4/svr4_proto.h#11 integrate .. //depot/projects/trustedbsd/base/sys/compat/svr4/svr4_syscall.h#10 integrate .. //depot/projects/trustedbsd/base/sys/compat/svr4/svr4_syscallnames.c#10 integrate .. //depot/projects/trustedbsd/base/sys/compat/svr4/svr4_sysent.c#10 integrate .. //depot/projects/trustedbsd/base/sys/compat/svr4/syscalls.conf#3 integrate .. //depot/projects/trustedbsd/base/sys/conf/files#103 integrate .. //depot/projects/trustedbsd/base/sys/conf/files.amd64#31 integrate .. //depot/projects/trustedbsd/base/sys/conf/files.i386#65 integrate .. //depot/projects/trustedbsd/base/sys/conf/kern.post.mk#49 integrate .. //depot/projects/trustedbsd/base/sys/conf/kmod.mk#44 integrate .. //depot/projects/trustedbsd/base/sys/conf/options.arm#11 integrate .. //depot/projects/trustedbsd/base/sys/contrib/dev/acpica/acfreebsd.h#14 integrate .. //depot/projects/trustedbsd/base/sys/contrib/ipfilter/netinet/fil.c#18 integrate .. //depot/projects/trustedbsd/base/sys/contrib/ipfilter/netinet/ip_auth.c#14 integrate .. //depot/projects/trustedbsd/base/sys/contrib/ipfilter/netinet/ip_auth.h#5 integrate .. //depot/projects/trustedbsd/base/sys/contrib/ipfilter/netinet/ip_compat.h#15 integrate .. //depot/projects/trustedbsd/base/sys/contrib/ipfilter/netinet/ip_fil.h#11 integrate .. //depot/projects/trustedbsd/base/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c#4 integrate .. //depot/projects/trustedbsd/base/sys/contrib/ipfilter/netinet/ip_frag.c#12 integrate .. //depot/projects/trustedbsd/base/sys/contrib/ipfilter/netinet/ip_ftp_pxy.c#10 integrate .. //depot/projects/trustedbsd/base/sys/contrib/ipfilter/netinet/ip_log.c#13 integrate .. //depot/projects/trustedbsd/base/sys/contrib/ipfilter/netinet/ip_nat.c#15 integrate .. //depot/projects/trustedbsd/base/sys/contrib/ipfilter/netinet/ip_pptp_pxy.c#3 integrate .. //depot/projects/trustedbsd/base/sys/contrib/ipfilter/netinet/ip_proxy.c#12 integrate .. //depot/projects/trustedbsd/base/sys/contrib/ipfilter/netinet/ip_rcmd_pxy.c#7 integrate .. //depot/projects/trustedbsd/base/sys/contrib/ipfilter/netinet/ip_scan.c#3 integrate .. //depot/projects/trustedbsd/base/sys/contrib/ipfilter/netinet/ip_state.c#14 integrate .. //depot/projects/trustedbsd/base/sys/contrib/ipfilter/netinet/ip_sync.c#4 integrate .. //depot/projects/trustedbsd/base/sys/contrib/ipfilter/netinet/ip_sync.h#3 integrate .. //depot/projects/trustedbsd/base/sys/contrib/ipfilter/netinet/ipl.h#11 integrate .. //depot/projects/trustedbsd/base/sys/contrib/ipfilter/netinet/mlfk_ipl.c#9 integrate .. //depot/projects/trustedbsd/base/sys/dev/acpi_support/acpi_ibm.c#6 integrate .. //depot/projects/trustedbsd/base/sys/dev/acpica/Osd/OsdMemory.c#11 integrate .. //depot/projects/trustedbsd/base/sys/dev/acpica/acpi_dock.c#3 integrate .. //depot/projects/trustedbsd/base/sys/dev/acpica/acpi_hpet.c#3 integrate .. //depot/projects/trustedbsd/base/sys/dev/acpica/acpi_pci_link.c#21 integrate .. //depot/projects/trustedbsd/base/sys/dev/acpica/acpi_video.c#10 integrate .. //depot/projects/trustedbsd/base/sys/dev/ata/ata-chipset.c#40 integrate .. //depot/projects/trustedbsd/base/sys/dev/ata/ata-disk.c#43 integrate .. //depot/projects/trustedbsd/base/sys/dev/ata/ata-pci.h#30 integrate .. //depot/projects/trustedbsd/base/sys/dev/ath/if_ath.c#29 integrate .. //depot/projects/trustedbsd/base/sys/dev/ath/if_athioctl.h#14 integrate .. //depot/projects/trustedbsd/base/sys/dev/bce/if_bce.c#4 integrate .. //depot/projects/trustedbsd/base/sys/dev/bge/if_bge.c#56 integrate .. //depot/projects/trustedbsd/base/sys/dev/bge/if_bgereg.h#34 integrate .. //depot/projects/trustedbsd/base/sys/dev/em/if_em.c#54 integrate .. //depot/projects/trustedbsd/base/sys/dev/em/if_em.h#33 integrate .. //depot/projects/trustedbsd/base/sys/dev/em/if_em_hw.c#20 integrate .. //depot/projects/trustedbsd/base/sys/dev/em/if_em_hw.h#21 integrate .. //depot/projects/trustedbsd/base/sys/dev/exca/excareg.h#6 integrate .. //depot/projects/trustedbsd/base/sys/dev/hme/if_hme.c#25 integrate .. //depot/projects/trustedbsd/base/sys/dev/isp/isp.c#35 integrate .. //depot/projects/trustedbsd/base/sys/dev/isp/isp_pci.c#27 integrate .. //depot/projects/trustedbsd/base/sys/dev/isp/ispvar.h#23 integrate .. //depot/projects/trustedbsd/base/sys/dev/mii/rgephy.c#9 integrate .. //depot/projects/trustedbsd/base/sys/dev/nfe/if_nfe.c#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/pccard/pccard_cis.c#20 integrate .. //depot/projects/trustedbsd/base/sys/dev/pccbb/pccbb.c#49 integrate .. //depot/projects/trustedbsd/base/sys/dev/pccbb/pccbb_pci.c#9 integrate .. //depot/projects/trustedbsd/base/sys/dev/pccbb/pccbbreg.h#12 integrate .. //depot/projects/trustedbsd/base/sys/dev/sk/if_sk.c#5 integrate .. //depot/projects/trustedbsd/base/sys/dev/sound/pci/emu10k1.c#20 integrate .. //depot/projects/trustedbsd/base/sys/dev/sound/pci/emu10kx-pcm.c#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/sound/pci/emu10kx.c#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/sound/pci/emu10kx.h#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/sound/pci/ich.c#34 integrate .. //depot/projects/trustedbsd/base/sys/dev/stge/if_stge.c#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/ti/if_ti.c#2 integrate .. //depot/projects/trustedbsd/base/sys/fs/nwfs/nwfs_io.c#17 integrate .. //depot/projects/trustedbsd/base/sys/fs/smbfs/smbfs_io.c#21 integrate .. //depot/projects/trustedbsd/base/sys/geom/eli/g_eli.c#9 integrate .. //depot/projects/trustedbsd/base/sys/geom/eli/g_eli.h#6 integrate .. //depot/projects/trustedbsd/base/sys/geom/eli/g_eli_ctl.c#6 integrate .. //depot/projects/trustedbsd/base/sys/geom/geom_gpt.c#26 integrate .. //depot/projects/trustedbsd/base/sys/geom/label/g_label.c#8 integrate .. //depot/projects/trustedbsd/base/sys/geom/label/g_label_msdosfs.c#4 integrate .. //depot/projects/trustedbsd/base/sys/geom/label/g_label_msdosfs.h#1 branch .. //depot/projects/trustedbsd/base/sys/geom/mirror/g_mirror.c#17 integrate .. //depot/projects/trustedbsd/base/sys/geom/raid3/g_raid3.c#16 integrate .. //depot/projects/trustedbsd/base/sys/i386/acpica/acpi_machdep.c#22 integrate .. //depot/projects/trustedbsd/base/sys/i386/acpica/acpi_wakeup.c#27 integrate .. //depot/projects/trustedbsd/base/sys/i386/acpica/madt.c#13 integrate .. //depot/projects/trustedbsd/base/sys/i386/conf/XBOX#7 integrate .. //depot/projects/trustedbsd/base/sys/i386/i386/machdep.c#62 integrate .. //depot/projects/trustedbsd/base/sys/i386/i386/pmap.c#68 integrate .. //depot/projects/trustedbsd/base/sys/i386/i386/support.s#17 integrate .. //depot/projects/trustedbsd/base/sys/i386/i386/trap.c#50 integrate .. //depot/projects/trustedbsd/base/sys/i386/ibcs2/ibcs2_isc_syscall.h#8 integrate .. //depot/projects/trustedbsd/base/sys/i386/ibcs2/ibcs2_isc_sysent.c#9 integrate .. //depot/projects/trustedbsd/base/sys/i386/ibcs2/ibcs2_proto.h#12 integrate .. //depot/projects/trustedbsd/base/sys/i386/ibcs2/ibcs2_syscall.h#11 integrate .. //depot/projects/trustedbsd/base/sys/i386/ibcs2/ibcs2_sysent.c#13 integrate .. //depot/projects/trustedbsd/base/sys/i386/ibcs2/ibcs2_xenix.h#9 integrate .. //depot/projects/trustedbsd/base/sys/i386/ibcs2/ibcs2_xenix_syscall.h#8 integrate .. //depot/projects/trustedbsd/base/sys/i386/ibcs2/ibcs2_xenix_sysent.c#9 integrate .. //depot/projects/trustedbsd/base/sys/i386/ibcs2/syscalls.conf#3 integrate .. //depot/projects/trustedbsd/base/sys/i386/ibcs2/syscalls.isc.conf#3 integrate .. //depot/projects/trustedbsd/base/sys/i386/ibcs2/syscalls.xenix.conf#3 integrate .. //depot/projects/trustedbsd/base/sys/i386/include/pmap.h#24 integrate .. //depot/projects/trustedbsd/base/sys/i386/isa/clock.c#33 integrate .. //depot/projects/trustedbsd/base/sys/i386/linux/linux.h#9 integrate .. //depot/projects/trustedbsd/base/sys/i386/linux/linux_dummy.c#11 integrate .. //depot/projects/trustedbsd/base/sys/i386/linux/linux_machdep.c#21 integrate .. //depot/projects/trustedbsd/base/sys/i386/linux/linux_proto.h#24 integrate .. //depot/projects/trustedbsd/base/sys/i386/linux/linux_syscall.h#24 integrate .. //depot/projects/trustedbsd/base/sys/i386/linux/linux_sysent.c#25 integrate .. //depot/projects/trustedbsd/base/sys/i386/linux/linux_sysvec.c#30 integrate .. //depot/projects/trustedbsd/base/sys/i386/linux/syscalls.conf#3 integrate .. //depot/projects/trustedbsd/base/sys/i386/linux/syscalls.master#23 integrate .. //depot/projects/trustedbsd/base/sys/i386/xbox/xbox.c#3 integrate .. //depot/projects/trustedbsd/base/sys/ia64/include/pmap.h#20 integrate .. //depot/projects/trustedbsd/base/sys/kern/init_sysent.c#56 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_exec.c#60 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_fork.c#56 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_lock.c#25 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_mutex.c#48 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_subr.c#28 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_sx.c#12 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_time.c#28 integrate .. //depot/projects/trustedbsd/base/sys/kern/makesyscalls.sh#12 integrate .. //depot/projects/trustedbsd/base/sys/kern/subr_turnstile.c#16 integrate .. //depot/projects/trustedbsd/base/sys/kern/syscalls.c#56 integrate .. //depot/projects/trustedbsd/base/sys/kern/syscalls.master#56 integrate .. //depot/projects/trustedbsd/base/sys/kern/systrace_args.c#2 integrate .. //depot/projects/trustedbsd/base/sys/kern/uipc_proto.c#7 delete .. //depot/projects/trustedbsd/base/sys/kern/uipc_sem.c#17 integrate .. //depot/projects/trustedbsd/base/sys/kern/uipc_socket.c#58 integrate .. //depot/projects/trustedbsd/base/sys/kern/uipc_syscalls.c#57 integrate .. //depot/projects/trustedbsd/base/sys/kern/uipc_usrreq.c#43 integrate .. //depot/projects/trustedbsd/base/sys/kern/vfs_aio.c#53 integrate .. //depot/projects/trustedbsd/base/sys/kern/vfs_bio.c#59 integrate .. //depot/projects/trustedbsd/base/sys/kern/vfs_subr.c#79 integrate .. //depot/projects/trustedbsd/base/sys/libkern/strstr.c#1 branch .. //depot/projects/trustedbsd/base/sys/modules/if_ef/Makefile#6 integrate .. //depot/projects/trustedbsd/base/sys/modules/if_ppp/Makefile#9 integrate .. //depot/projects/trustedbsd/base/sys/modules/linprocfs/Makefile#4 integrate .. //depot/projects/trustedbsd/base/sys/modules/linsysfs/Makefile#2 integrate .. //depot/projects/trustedbsd/base/sys/modules/linux/Makefile#15 integrate .. //depot/projects/trustedbsd/base/sys/modules/netgraph/mppc/Makefile#5 integrate .. //depot/projects/trustedbsd/base/sys/modules/sound/sound/Makefile#5 integrate .. //depot/projects/trustedbsd/base/sys/net/bpf.c#44 integrate .. //depot/projects/trustedbsd/base/sys/net/bridgestp.c#8 integrate .. //depot/projects/trustedbsd/base/sys/net/if_tun.c#34 integrate .. //depot/projects/trustedbsd/base/sys/net/if_vlan.c#38 integrate .. //depot/projects/trustedbsd/base/sys/net80211/ieee80211_input.c#20 integrate .. //depot/projects/trustedbsd/base/sys/net80211/ieee80211_ioctl.c#22 integrate .. //depot/projects/trustedbsd/base/sys/net80211/ieee80211_ioctl.h#13 integrate .. //depot/projects/trustedbsd/base/sys/net80211/ieee80211_output.c#21 integrate .. //depot/projects/trustedbsd/base/sys/netgraph/ng_pppoe.c#21 integrate .. //depot/projects/trustedbsd/base/sys/netgraph/ng_pppoe.h#11 integrate .. //depot/projects/trustedbsd/base/sys/netinet/tcp_input.c#64 integrate .. //depot/projects/trustedbsd/base/sys/netinet/tcp_subr.c#50 integrate .. //depot/projects/trustedbsd/base/sys/netinet/tcp_timer.c#26 integrate .. //depot/projects/trustedbsd/base/sys/netinet/tcp_timer.h#12 integrate .. //depot/projects/trustedbsd/base/sys/nfsclient/nfs_bio.c#32 integrate .. //depot/projects/trustedbsd/base/sys/nfsclient/nfs_vfsops.c#47 integrate .. //depot/projects/trustedbsd/base/sys/pc98/include/md_var.h#2 integrate .. //depot/projects/trustedbsd/base/sys/pc98/pc98/pc98_machdep.c#7 integrate .. //depot/projects/trustedbsd/base/sys/pci/agp.c#24 integrate .. //depot/projects/trustedbsd/base/sys/pci/if_xl.c#44 integrate .. //depot/projects/trustedbsd/base/sys/sparc64/sparc64/pmap.c#58 integrate .. //depot/projects/trustedbsd/base/sys/sys/dirent.h#6 integrate .. //depot/projects/trustedbsd/base/sys/sys/domain.h#7 integrate .. //depot/projects/trustedbsd/base/sys/sys/eventhandler.h#13 integrate .. //depot/projects/trustedbsd/base/sys/sys/imgact.h#13 integrate .. //depot/projects/trustedbsd/base/sys/sys/libkern.h#20 integrate .. //depot/projects/trustedbsd/base/sys/sys/lockmgr.h#15 integrate .. //depot/projects/trustedbsd/base/sys/sys/param.h#57 integrate .. //depot/projects/trustedbsd/base/sys/sys/sx.h#10 integrate .. //depot/projects/trustedbsd/base/sys/sys/syscall.h#56 integrate .. //depot/projects/trustedbsd/base/sys/sys/syscall.mk#56 integrate .. //depot/projects/trustedbsd/base/sys/sys/sysctl.h#31 integrate .. //depot/projects/trustedbsd/base/sys/sys/sysent.h#14 integrate .. //depot/projects/trustedbsd/base/sys/sys/sysproto.h#57 integrate .. //depot/projects/trustedbsd/base/sys/vm/device_pager.c#20 integrate .. //depot/projects/trustedbsd/base/sys/vm/swap_pager.c#48 integrate .. //depot/projects/trustedbsd/base/sys/vm/vm_fault.c#48 integrate .. //depot/projects/trustedbsd/base/sys/vm/vm_object.c#61 integrate .. //depot/projects/trustedbsd/base/sys/vm/vm_page.c#64 integrate .. //depot/projects/trustedbsd/base/sys/vm/vm_page.h#32 integrate .. //depot/projects/trustedbsd/base/sys/vm/vnode_pager.c#47 integrate .. //depot/projects/trustedbsd/base/tools/tools/ath/athstats/Makefile#3 integrate .. //depot/projects/trustedbsd/base/tools/tools/ath/athstats/athstats.c#4 integrate .. //depot/projects/trustedbsd/base/tools/tools/ath/athstats/athstats.h#1 branch .. //depot/projects/trustedbsd/base/tools/tools/ath/athstats/main.c#1 branch .. //depot/projects/trustedbsd/base/tools/tools/ath/athstats/statfoo.c#1 branch .. //depot/projects/trustedbsd/base/tools/tools/ath/athstats/statfoo.h#1 branch .. //depot/projects/trustedbsd/base/tools/tools/nanobsd/nanobsd.sh#8 integrate .. //depot/projects/trustedbsd/base/tools/tools/net80211/Makefile#3 integrate .. //depot/projects/trustedbsd/base/tools/tools/net80211/README#2 integrate .. //depot/projects/trustedbsd/base/tools/tools/net80211/w00t/libw00t/w00t.c#2 integrate .. //depot/projects/trustedbsd/base/tools/tools/net80211/wesside/Makefile#1 branch .. //depot/projects/trustedbsd/base/tools/tools/net80211/wesside/README#1 branch .. //depot/projects/trustedbsd/base/tools/tools/net80211/wesside/dics/Makefile#1 branch .. //depot/projects/trustedbsd/base/tools/tools/net80211/wesside/dics/dics.c#1 branch .. //depot/projects/trustedbsd/base/tools/tools/net80211/wesside/udps/Makefile#1 branch .. //depot/projects/trustedbsd/base/tools/tools/net80211/wesside/udps/udps.c#1 branch .. //depot/projects/trustedbsd/base/tools/tools/net80211/wesside/wesside/Makefile#1 branch .. //depot/projects/trustedbsd/base/tools/tools/net80211/wesside/wesside/wesside.c#1 branch .. //depot/projects/trustedbsd/base/tools/tools/net80211/wlanstats/Makefile#3 integrate .. //depot/projects/trustedbsd/base/tools/tools/net80211/wlanstats/main.c#1 branch .. //depot/projects/trustedbsd/base/tools/tools/net80211/wlanstats/statfoo.c#1 branch .. //depot/projects/trustedbsd/base/tools/tools/net80211/wlanstats/statfoo.h#1 branch .. //depot/projects/trustedbsd/base/tools/tools/net80211/wlanstats/wlanstats.c#2 integrate .. //depot/projects/trustedbsd/base/tools/tools/net80211/wlanstats/wlanstats.h#1 branch .. //depot/projects/trustedbsd/base/usr.bin/calendar/calendars/calendar.history#14 integrate .. //depot/projects/trustedbsd/base/usr.bin/hexdump/parse.c#8 integrate .. //depot/projects/trustedbsd/base/usr.bin/split/split.1#8 integrate .. //depot/projects/trustedbsd/base/usr.bin/split/split.c#10 integrate .. //depot/projects/trustedbsd/base/usr.sbin/Makefile#53 integrate .. //depot/projects/trustedbsd/base/usr.sbin/mailwrapper/mailwrapper.8#6 integrate .. //depot/projects/trustedbsd/base/usr.sbin/mailwrapper/mailwrapper.c#5 integrate .. //depot/projects/trustedbsd/base/usr.sbin/named/Makefile#8 integrate .. //depot/projects/trustedbsd/base/usr.sbin/ngctl/Makefile#5 integrate .. //depot/projects/trustedbsd/base/usr.sbin/ngctl/main.c#10 integrate .. //depot/projects/trustedbsd/base/usr.sbin/pkg_install/lib/url.c#6 integrate .. //depot/projects/trustedbsd/base/usr.sbin/pkg_install/version/perform.c#11 integrate .. //depot/projects/trustedbsd/base/usr.sbin/rpc.lockd/lockd_lock.c#11 integrate .. //depot/projects/trustedbsd/base/usr.sbin/rpc.statd/procs.c#5 integrate .. //depot/projects/trustedbsd/base/usr.sbin/rtsold/rtsold.8#8 integrate .. //depot/projects/trustedbsd/base/usr.sbin/sade/Makefile#2 integrate .. //depot/projects/trustedbsd/base/usr.sbin/sade/command.c#2 integrate .. //depot/projects/trustedbsd/base/usr.sbin/sade/config.c#2 integrate .. //depot/projects/trustedbsd/base/usr.sbin/sade/devices.c#2 integrate .. //depot/projects/trustedbsd/base/usr.sbin/sade/disks.c#2 integrate .. //depot/projects/trustedbsd/base/usr.sbin/sade/dispatch.c#2 integrate .. //depot/projects/trustedbsd/base/usr.sbin/sade/dmenu.c#2 integrate .. //depot/projects/trustedbsd/base/usr.sbin/sade/globals.c#2 integrate .. //depot/projects/trustedbsd/base/usr.sbin/sade/install.c#2 integrate .. //depot/projects/trustedbsd/base/usr.sbin/sade/keymap.c#2 delete .. //depot/projects/trustedbsd/base/usr.sbin/sade/label.c#2 integrate .. //depot/projects/trustedbsd/base/usr.sbin/sade/list.h#2 integrate .. //depot/projects/trustedbsd/base/usr.sbin/sade/main.c#2 integrate .. //depot/projects/trustedbsd/base/usr.sbin/sade/menus.c#2 integrate .. //depot/projects/trustedbsd/base/usr.sbin/sade/misc.c#2 integrate .. //depot/projects/trustedbsd/base/usr.sbin/sade/msg.c#2 integrate .. //depot/projects/trustedbsd/base/usr.sbin/sade/rtermcap.c#2 delete .. //depot/projects/trustedbsd/base/usr.sbin/sade/sade.8#2 integrate .. //depot/projects/trustedbsd/base/usr.sbin/sade/sade.h#2 integrate .. //depot/projects/trustedbsd/base/usr.sbin/sade/system.c#2 integrate .. //depot/projects/trustedbsd/base/usr.sbin/sade/termcap.c#2 integrate .. //depot/projects/trustedbsd/base/usr.sbin/sade/usb.c#2 delete .. //depot/projects/trustedbsd/base/usr.sbin/sade/variable.c#2 integrate .. //depot/projects/trustedbsd/base/usr.sbin/sade/wizard.c#2 integrate .. //depot/projects/trustedbsd/base/usr.sbin/yppush/yppush_main.c#8 integrate Differences ... ==== //depot/projects/trustedbsd/base/Makefile.inc1#75 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.550 2006/08/02 15:26:15 netchild Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.552 2006/08/09 11:03:06 netchild Exp $ # # Make command line options: # -DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir ==== //depot/projects/trustedbsd/base/ObsoleteFiles.inc#11 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/ObsoleteFiles.inc,v 1.42 2006/08/04 21:29:22 brooks Exp $ +# $FreeBSD: src/ObsoleteFiles.inc,v 1.47 2006/08/14 18:20:36 netchild Exp $ # # This file lists old files (OLD_FILES), libraries (OLD_LIBS) and # directories (OLD_DIRS) which should get removed at an update. Recently @@ -745,6 +745,7 @@ OLD_FILES+=usr/bin/perlcc OLD_FILES+=usr/bin/perldoc OLD_FILES+=usr/bin/suidperl +OLD_FILES+=usr/lib/pam_ftp.so OLD_FILES+=usr/libdata/perl/5.00503/CGI/Apache.pm OLD_FILES+=usr/libdata/perl/5.00503/CGI/Carp.pm OLD_FILES+=usr/libdata/perl/5.00503/CGI/Cookie.pm @@ -2726,7 +2727,209 @@ OLD_FILES+=usr/games/worm OLD_FILES+=usr/games/worms OLD_FILES+=usr/games/wump +OLD_FILES+=sbin/mount_reiserfs +OLD_FILES+=usr/bin/hesinfo +OLD_FILES+=usr/share/examples/etc/usbd.conf +OLD_FILES+=usr/share/examples/meteor/README +OLD_FILES+=usr/share/examples/meteor/rgb16.c +OLD_FILES+=usr/share/examples/meteor/rgb24.c +OLD_FILES+=usr/share/examples/meteor/test-n.c +OLD_FILES+=usr/share/examples/meteor/yuvpk.c +OLD_FILES+=usr/share/examples/meteor/yuvpl.c +OLD_FILES+=usr/share/examples/worm/README +OLD_FILES+=usr/share/examples/worm/makecdfs.sh +OLD_FILES+=usr/share/groff_font/devlj4/Makefile +OLD_FILES+=usr/share/groff_font/devlj4/text.map +OLD_FILES+=usr/share/groff_font/devlj4/special.map +OLD_FILES+=usr/share/misc/nslookup.help +OLD_FILES+=usr/share/sendmail/cf/feature/nodns.m4 +OLD_FILES+=usr/share/syscons/keymaps/lat-amer.kbd +OLD_FILES+=usr/share/vi/catalog/ru_SU.KOI8-R +OLD_FILES+=usr/share/zoneinfo/Africa/Timbuktu +OLD_FILES+=usr/share/zoneinfo/America/Buenos_Aires +OLD_FILES+=usr/share/zoneinfo/America/Cordoba +OLD_FILES+=usr/share/zoneinfo/America/Jujuy +OLD_FILES+=usr/share/zoneinfo/America/Catamarca +OLD_FILES+=usr/share/zoneinfo/America/Mendoza +OLD_FILES+=usr/share/zoneinfo/America/Indianapolis +OLD_FILES+=usr/share/zoneinfo/America/Louisville +OLD_FILES+=usr/share/zoneinfo/America/Argentina/ComodRivadavia +OLD_FILES+=usr/share/zoneinfo/Europe/Belfast +OLD_FILES+=usr/share/zoneinfo/Pacific/Yap +OLD_FILES+=usr/share/zoneinfo/SystemV/YST9 +OLD_FILES+=usr/share/zoneinfo/SystemV/PST8 +OLD_FILES+=usr/share/zoneinfo/SystemV/EST5EDT +OLD_FILES+=usr/share/zoneinfo/SystemV/CST6CDT +OLD_FILES+=usr/share/zoneinfo/SystemV/MST7MDT +OLD_FILES+=usr/share/zoneinfo/SystemV/PST8PDT +OLD_FILES+=usr/share/zoneinfo/SystemV/YST9YDT +OLD_FILES+=usr/share/zoneinfo/SystemV/HST10 +OLD_FILES+=usr/share/zoneinfo/SystemV/MST7 +OLD_FILES+=usr/share/zoneinfo/SystemV/EST5 +OLD_FILES+=usr/share/zoneinfo/SystemV/AST4ADT +OLD_FILES+=usr/share/zoneinfo/SystemV/CST6 +OLD_FILES+=usr/share/zoneinfo/SystemV/AST4 +OLD_FILES+=usr/share/doc/ntp/accopt.htm +OLD_FILES+=usr/share/doc/ntp/assoc.htm +OLD_FILES+=usr/share/doc/ntp/audio.htm +OLD_FILES+=usr/share/doc/ntp/authopt.htm +OLD_FILES+=usr/share/doc/ntp/biblio.htm +OLD_FILES+=usr/share/doc/ntp/build.htm +OLD_FILES+=usr/share/doc/ntp/clockopt.htm +OLD_FILES+=usr/share/doc/ntp/config.htm +OLD_FILES+=usr/share/doc/ntp/confopt.htm +OLD_FILES+=usr/share/doc/ntp/copyright.htm +OLD_FILES+=usr/share/doc/ntp/debug.htm +OLD_FILES+=usr/share/doc/ntp/driver1.htm +OLD_FILES+=usr/share/doc/ntp/driver10.htm +OLD_FILES+=usr/share/doc/ntp/driver11.htm +OLD_FILES+=usr/share/doc/ntp/driver12.htm +OLD_FILES+=usr/share/doc/ntp/driver16.htm +OLD_FILES+=usr/share/doc/ntp/driver18.htm +OLD_FILES+=usr/share/doc/ntp/driver19.htm +OLD_FILES+=usr/share/doc/ntp/driver2.htm +OLD_FILES+=usr/share/doc/ntp/driver20.htm +OLD_FILES+=usr/share/doc/ntp/driver22.htm +OLD_FILES+=usr/share/doc/ntp/driver23.htm +OLD_FILES+=usr/share/doc/ntp/driver24.htm +OLD_FILES+=usr/share/doc/ntp/driver26.htm +OLD_FILES+=usr/share/doc/ntp/driver27.htm +OLD_FILES+=usr/share/doc/ntp/driver28.htm +OLD_FILES+=usr/share/doc/ntp/driver29.htm +OLD_FILES+=usr/share/doc/ntp/driver3.htm +OLD_FILES+=usr/share/doc/ntp/driver30.htm +OLD_FILES+=usr/share/doc/ntp/driver32.htm +OLD_FILES+=usr/share/doc/ntp/driver33.htm +OLD_FILES+=usr/share/doc/ntp/driver34.htm +OLD_FILES+=usr/share/doc/ntp/driver35.htm +OLD_FILES+=usr/share/doc/ntp/driver36.htm +OLD_FILES+=usr/share/doc/ntp/driver37.htm +OLD_FILES+=usr/share/doc/ntp/driver4.htm +OLD_FILES+=usr/share/doc/ntp/driver5.htm +OLD_FILES+=usr/share/doc/ntp/driver6.htm +OLD_FILES+=usr/share/doc/ntp/driver7.htm +OLD_FILES+=usr/share/doc/ntp/driver8.htm +OLD_FILES+=usr/share/doc/ntp/driver9.htm +OLD_FILES+=usr/share/doc/ntp/exec.htm +OLD_FILES+=usr/share/doc/ntp/extern.htm +OLD_FILES+=usr/share/doc/ntp/gadget.htm +OLD_FILES+=usr/share/doc/ntp/hints.htm +OLD_FILES+=usr/share/doc/ntp/howto.htm +OLD_FILES+=usr/share/doc/ntp/htmlprimer.htm +OLD_FILES+=usr/share/doc/ntp/index.htm +OLD_FILES+=usr/share/doc/ntp/kern.htm +OLD_FILES+=usr/share/doc/ntp/kernpps.htm +OLD_FILES+=usr/share/doc/ntp/ldisc.htm +OLD_FILES+=usr/share/doc/ntp/measure.htm +OLD_FILES+=usr/share/doc/ntp/miscopt.htm +OLD_FILES+=usr/share/doc/ntp/monopt.htm +OLD_FILES+=usr/share/doc/ntp/mx4200data.htm +OLD_FILES+=usr/share/doc/ntp/notes.htm +OLD_FILES+=usr/share/doc/ntp/ntpd.htm +OLD_FILES+=usr/share/doc/ntp/ntpdate.htm +OLD_FILES+=usr/share/doc/ntp/ntpdc.htm +OLD_FILES+=usr/share/doc/ntp/ntpq.htm +OLD_FILES+=usr/share/doc/ntp/ntptime.htm +OLD_FILES+=usr/share/doc/ntp/ntptrace.htm +OLD_FILES+=usr/share/doc/ntp/parsedata.htm +OLD_FILES+=usr/share/doc/ntp/parsenew.htm +OLD_FILES+=usr/share/doc/ntp/patches.htm +OLD_FILES+=usr/share/doc/ntp/porting.htm +OLD_FILES+=usr/share/doc/ntp/pps.htm +OLD_FILES+=usr/share/doc/ntp/prefer.htm +OLD_FILES+=usr/share/doc/ntp/qth.htm +OLD_FILES+=usr/share/doc/ntp/quick.htm +OLD_FILES+=usr/share/doc/ntp/rdebug.htm +OLD_FILES+=usr/share/doc/ntp/refclock.htm +OLD_FILES+=usr/share/doc/ntp/release.htm +OLD_FILES+=usr/share/doc/ntp/tickadj.htm +OLD_FILES+=usr/share/doc/papers/nqnfs.ascii.gz +OLD_FILES+=usr/share/doc/papers/px.ascii.gz +OLD_FILES+=usr/share/man/man1/hesinfo.1.gz +OLD_FILES+=usr/share/man/man3/mbrune.3.gz +OLD_FILES+=usr/share/man/man3/rune.3.gz +OLD_FILES+=usr/share/man/man3/hesiod.3.gz +OLD_FILES+=usr/share/man/man3/mac_is_present_np.3.gz +OLD_FILES+=usr/share/man/man3/fpsetsticky.3.gz +OLD_FILES+=usr/share/man/man3/gss_krb5_copy_ccache.3.gz +OLD_FILES+=usr/share/man/man3/gss_krb5_compat_des3_mic.3.gz +OLD_FILES+=usr/share/man/man3/exp10f.3.gz +OLD_FILES+=usr/share/man/man3/exp10.3.gz +OLD_FILES+=usr/share/man/man3/mbrrune.3.gz +OLD_FILES+=usr/share/man/man3/mbmb.3.gz +OLD_FILES+=usr/share/man/man3/sputrune.3.gz +OLD_FILES+=usr/share/man/man3/sgetrune.3.gz +OLD_FILES+=usr/share/man/man3/setrunelocale.3.gz +OLD_FILES+=usr/share/man/man3/setinvalidrune.3.gz +OLD_FILES+=usr/share/man/man3/mbrune.3.gz +OLD_FILES+=usr/share/man/man3/rune.3.gz +OLD_FILES+=usr/share/man/man3/hesiod.3.gz +OLD_FILES+=usr/share/man/man3/mac_is_present_np.3.gz +OLD_FILES+=usr/share/man/man3/fpsetsticky.3.gz +OLD_FILES+=usr/share/man/man3/gss_krb5_copy_ccache.3.gz +OLD_FILES+=usr/share/man/man3/gss_krb5_compat_des3_mic.3.gz +OLD_FILES+=usr/share/man/man3/exp10f.3.gz +OLD_FILES+=usr/share/man/man3/exp10.3.gz +OLD_FILES+=usr/share/man/man3/mbrrune.3.gz +OLD_FILES+=usr/share/man/man3/mbmb.3.gz +OLD_FILES+=usr/share/man/man3/sputrune.3.gz +OLD_FILES+=usr/share/man/man3/sgetrune.3.gz +OLD_FILES+=usr/share/man/man3/setrunelocale.3.gz +OLD_FILES+=usr/share/man/man3/setinvalidrune.3.gz +OLD_FILES+=usr/share/man/man3/fungetrune.3.gz +OLD_FILES+=usr/share/man/man3/fputrune.3.gz +OLD_FILES+=usr/share/man/man3/fgetrune.3.gz +OLD_FILES+=usr/share/man/man5/hesiod.conf.5.gz +OLD_FILES+=usr/share/man/man5/usbd.conf.5.gz +.if ${TARGET_ARCH} != "i386" +OLD_FILES+=usr/share/man/man8/boot_i386.8.gz +.endif +OLD_FILES+=usr/share/man/man8/ofwdump.8.gz +OLD_FILES+=usr/share/man/man8/mount_reiserfs.8.gz +OLD_FILES+=usr/share/man/man9/VFS_START.9.gz +OLD_FILES+=usr/share/man/man9/cpu_critical_exit.9.gz +OLD_FILES+=usr/share/man/man9/cpu_critical_enter.9.gz +OLD_FILES+=usr/share/info/annotate.info.gz +OLD_FILES+=usr/share/info/tar.info.gz +OLD_FILES+=usr/share/bsnmp/defs/tree.def +OLD_FILES+=usr/share/bsnmp/defs/mibII_tree.def +OLD_FILES+=usr/share/bsnmp/defs/netgraph_tree.def +OLD_FILES+=usr/share/bsnmp/mibs/FOKUS-MIB.txt +OLD_FILES+=usr/share/bsnmp/mibs/BEGEMOT-MIB.txt +OLD_FILES+=usr/share/bsnmp/mibs/BEGEMOT-SNMPD.txt +OLD_FILES+=usr/share/bsnmp/mibs/BEGEMOT-NETGRAPH.txt +OLD_FILES+=usr/libdata/ldscripts/elf64_sparc.x +OLD_FILES+=usr/libdata/ldscripts/elf64_sparc.xbn +OLD_FILES+=usr/libdata/ldscripts/elf64_sparc.xn +OLD_FILES+=usr/libdata/ldscripts/elf64_sparc.xr +OLD_FILES+=usr/libdata/ldscripts/elf64_sparc.xs +OLD_FILES+=usr/libdata/ldscripts/elf64_sparc.xu +OLD_FILES+=usr/libdata/ldscripts/elf64_sparc.xc +OLD_FILES+=usr/libdata/ldscripts/elf64_sparc.xsc +OLD_FILES+=usr/libdata/ldscripts/elf32_sparc.x +OLD_FILES+=usr/libdata/ldscripts/elf32_sparc.xbn +OLD_FILES+=usr/libdata/ldscripts/elf32_sparc.xn +OLD_FILES+=usr/libdata/ldscripts/elf32_sparc.xr +OLD_FILES+=usr/libdata/ldscripts/elf32_sparc.xs +OLD_FILES+=usr/libdata/ldscripts/elf32_sparc.xu +OLD_FILES+=usr/libdata/ldscripts/elf32_sparc.xc +OLD_FILES+=usr/libdata/ldscripts/elf32_sparc.xsc +OLD_FILES+=usr/libdata/msdosfs/iso22dos +OLD_FILES+=usr/libdata/msdosfs/iso72dos +OLD_FILES+=usr/libdata/msdosfs/koi2dos +OLD_FILES+=usr/libdata/msdosfs/koi8u2dos +# The following files are *not* obsolete, they just don't get touched at +# install, so don't add them: +# - boot/loader.rc +# - usr/share/tmac/man.local +# - usr/share/tmac/mm/locale +# - usr/share/tmac/mm/se_locale +# - var/yp/Makefile + +# 20060729: OpenSSL 0.9.7e -> 0.9.8b upgrade +OLD_LIBS+=lib/libcrypto.so.4 +OLD_LIBS+=usr/lib/libssl.so.4 # 20060521: gethostbyaddr(3) ABI change OLD_LIBS+=usr/lib/libroken.so.8 OLD_LIBS+=lib/libatm.so.3 @@ -2950,7 +3153,14 @@ # 199909XX OLD_LIBS+=usr/lib/libc_r.so.3 # ??? +OLD_LIBS+=usr/lib/libarchive.so.2 +OLD_LIBS+=usr/lib/libbsnmp.so.1 +OLD_LIBS+=usr/lib/libc_r.so.6 +OLD_LIBS+=usr/lib/libcipher.so.2 OLD_LIBS+=usr/lib/libgssapi.so.6 +OLD_LIBS+=usr/lib/libkse.so.1 +OLD_LIBS+=usr/lib/liblwres.so.3 +OLD_LIBS+=usr/lib/pam_ftp.so.2 # 20040925: bind9 import OLD_DIRS+=usr/share/doc/bind/html ==== //depot/projects/trustedbsd/base/contrib/ipfilter/BSD/Makefile#9 (text+ko) ==== @@ -3,12 +3,13 @@ # # See the IPFILTER.LICENCE file for details on licencing. # +TOP=../.. BINDEST=/usr/sbin SBINDEST=/sbin MANDIR=/usr/share/man SEARCHDIRS!=echo $(BINDEST) $(SBINDEST) /bin /usr/bin /sbin /usr/sbin /usr/local/bin /usr/local/sbin | awk '{for(i=1;i&1 | sed -n 's/.*devfs.*/-DDEVFS/p' CPU!=uname -m INC=-I/usr/include -I/sys -I/sys/sys -I/sys/arch -DEF=-D$(CPU) -D__$(CPU)__ -DINET -DKERNEL -D_KERNEL $(INC) $(DEVFS) +DEF=-D$(CPU) -D__$(CPU)__ -DINET -DKERNEL -D_KERNEL $(INC) $(DEVFS) -fno-builtin IPDEF=$(DEF) -DGATEWAY -DDIRECTED_BROADCAST VNODESHDIR=/sys/kern MLD=$(ML) @@ -516,8 +517,8 @@ (cd $(TOP)/man; make INSTALL=$(INSTALL) MANDIR=$(MANDIR) install; cd $(TOP)) coverage: - ksh -c 'for i in *.da; do j=$${i%%.da}.c; gcov $$j 2>&1 | egrep -v "y.tab.c|Could|Creating|_l\.c|\.h"; done' | sort -n > report - sort -n report | perl -e 'while(<>) { next if (/^0.00/); s/\%//g; @F=split;$$lc+=$$F[2];$$t += $$F[0]/100*$$F[2];} printf "%d of %d = %d%%\n", $$t, $$lc,$$t/$$lc*100;' >> report + ksh -c 'for i in *.da; do j=$${i%%.da}.c; gcov $$j 2>&1 | egrep -v "y.tab.c|Could|Creating|_l\.c|\.h"; done' | sort -k 1n -k 3n > report + sort -k 1n -k 3n report | perl -e 'while(<>) { next if (/^0.00/); s/\%//g; @F=split;$$lc+=$$F[2];$$t += ($$F[0]/100)*$$F[2];} printf "%d of %d = %d%%\n", $$t, $$lc,($$t/$$lc)*100;' >> report clean-coverage: /bin/rm -f *.gcov *.da ==== //depot/projects/trustedbsd/base/contrib/ipfilter/HISTORY#10 (text+ko) ==== @@ -10,6 +10,88 @@ # and especially those who have found the time to port IP Filter to new # platforms. # +4.1.13 - Released 4 April 2006 + +fix bug where null pointers introduced by proxies could cause a crash + +pass out the rule flags with SIOCAUTHW + +force loading NAT rules with bad proxy labels to cause an error + +nat_state is used unsafely in calls to fr_addstate + +make return-rst and return-icmp* work with auth rules + +4.1.12 - Released 28 March 2006 + +poll support on FreeBSD/NetBSD needs to use selrecord/selwakeup + +make the fastroute code used by ipftest invoke state/NAT + +move verbose/debug macros out of fil.c and into ip_fil.h (for wider use) + +remove unused code in fr_fastroute + +fix NAT with rules that specify forward and reverise interfaces + +add missing ipfsync_canread() and ipfsync_canwrite() + +behaviour of \ on the end of a line in ipf.conf does not match older behaviour + +remove duplicate statistics line output with "ipfstat -s" +4.1.11 - Released 19 March 2006 + +Patch for NAT with ipfsync from N. Ersen (SESCI) - www.enderunix.org + +NetBSD coverity report fixes (from run 5) + +Possible to reacquire ipf_auth without releasing it in some circumstances + +Locking in FreeBSD's iplioctl for ipf_global isn't present like it shoudl be + +Add poll support for platforms I can build on: NetBSD, FreeBSD, Solaris, Linux + +Using auth rules to return "keep state" got broken with pushing fr_addstate +call into fr_firewall + +all use of '!' in map/rdr rules to match use in ipf configs + +add -L command line option to ipmon to set the default syslog facility + +looking up a port number is more complex than needed in ipft_tx.c + +allow lib/getport to work when neither tcp or udp are specified in a rule + +remove some dead code from lib/addicmpc, lib/facpri.c, lib/icmpcode.c + +program in some more cases where TCP packets fail an initial in-window +check but should be allowed to match + +filter rule added with NAT/state handling of SIOCSTPUT doesn't properly +initialise all fields, making it possible to panic + +simplify NAT ICMP error handling where it updates checksums + +rename "min" variables to "xmin" on NetBSD to avoid problems with the +macro "min" + +#ifdef's for NetBSD compile incorrect for pfil interface + +support select/poll on NetBSD + +copying out a packet with an auth rule fails (EFAULT) because the wrong +pointer is passed to copyoutptr + +ip_len/ip_off where byte swapped twice instead of once for packets +going to be stored on the auth queue + +change timeout queue manipulation functions to make fewer mutex calls + +fix use of skip rules with groups +fix coding problems discovered by the coverity project for FreeBSD + +update BPF program validation with FreeBSD changes + 4.1.10 - Released 6 December 2005 Expand regression testing to cover more features ==== //depot/projects/trustedbsd/base/contrib/ipfilter/Makefile#8 (text+ko) ==== @@ -5,8 +5,8 @@ # provided that this notice is preserved and due credit is given # to the original author and the contributors. # -# $FreeBSD: src/contrib/ipfilter/Makefile,v 1.5 2005/12/30 11:52:22 guido Exp $ -# Id: Makefile,v 2.76.2.13 2004/11/08 18:42:40 darrenr Exp +# $FreeBSD: src/contrib/ipfilter/Makefile,v 1.6 2006/08/16 12:23:00 guido Exp $ +# Id: Makefile,v 2.76.2.19 2006/03/17 10:38:38 darrenr Exp $ # SHELL=/bin/sh BINDEST=/usr/local/bin @@ -135,6 +135,7 @@ @echo "freebsd3 - compile for FreeBSD-3.x" @echo "freebsd4 - compile for FreeBSD-4.x" @echo "freebsd5 - compile for FreeBSD-5.x" + @echo "freebsd6 - compile for FreeBSD-6.x" @echo "bsd - compile for generic 4.4BSD systems" @echo "bsdi - compile for BSD/OS" @echo "irix - compile for SGI IRIX" @@ -187,7 +188,7 @@ fi make freebsd20 -freebsd5: include +freebsd5 freebsd6: include if [ x$(INET6) = x ] ; then \ echo "#undef INET6" > opt_inet6.h; \ else \ ==== //depot/projects/trustedbsd/base/contrib/ipfilter/bpf_filter.c#3 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/contrib/ipfilter/bpf_filter.c,v 1.4 2005/12/30 11:52:22 guido Exp $ */ +/* $FreeBSD: src/contrib/ipfilter/bpf_filter.c,v 1.5 2006/08/16 12:23:00 guido Exp $ */ /*- * Copyright (c) 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997 @@ -42,7 +42,7 @@ #if !(defined(lint) || defined(KERNEL) || defined(_KERNEL)) static const char rcsid[] = - "@(#) $Header: /devel/CVS/IP-Filter/bpf_filter.c,v 2.2.2.1 2005/06/18 02:41:30 darrenr Exp $ (LBL)"; + "@(#) $Header: /devel/CVS/IP-Filter/bpf_filter.c,v 2.2.2.2 2005/12/30 12:57:28 darrenr Exp $ (LBL)"; #endif #include @@ -468,9 +468,10 @@ /* * Return true if the 'fcode' is a valid filter program. * The constraints are that each jump be forward and to a valid - * code. The code must terminate with either an accept or reject. - * 'valid' is an array for use by the routine (it must be at least - * 'len' bytes long). + * code, that memory accesses are within valid ranges (to the + * extent that this can be checked statically; loads of packet + * data have to be, and are, also checked at run time), and that + * the code terminates with either an accept or reject. * * The kernel needs to be able to verify an application's filter code. * Otherwise, a bogus program could easily crash the system. @@ -480,38 +481,114 @@ struct bpf_insn *f; int len; { - register int i; - register struct bpf_insn *p; + u_int i, from; + const struct bpf_insn *p; + + if (len == 0) + return 1; + + if (len < 1 || len > BPF_MAXINSNS) + return 0; for (i = 0; i < len; ++i) { + p = &f[i]; + switch (BPF_CLASS(p->code)) { /* - * Check that that jumps are forward, and within - * the code block. + * Check that memory operations use valid addresses. */ - p = &f[i]; - if (BPF_CLASS(p->code) == BPF_JMP) { - register int from = i + 1; - - if (BPF_OP(p->code) == BPF_JA) { - if (from + p->k >= (unsigned)len) + case BPF_LD: + case BPF_LDX: + switch (BPF_MODE(p->code)) { + case BPF_IMM: + break; + case BPF_ABS: + case BPF_IND: + case BPF_MSH: + /* + * More strict check with actual packet length + * is done runtime. + */ +#if 0 + if (p->k >= bpf_maxbufsize) + return 0; +#endif + break; + case BPF_MEM: + if (p->k >= BPF_MEMWORDS) + return 0; + break; + case BPF_LEN: + break; + default: + return 0; + } + break; + case BPF_ST: + case BPF_STX: + if (p->k >= BPF_MEMWORDS) + return 0; + break; + case BPF_ALU: + switch (BPF_OP(p->code)) { + case BPF_ADD: + case BPF_SUB: + case BPF_OR: + case BPF_AND: + case BPF_LSH: + case BPF_RSH: + case BPF_NEG: + break; + case BPF_DIV: + /* + * Check for constant division by 0. + */ + if (BPF_RVAL(p->code) == BPF_K && p->k == 0) return 0; + default: + return 0; } - else if (from + p->jt >= len || from + p->jf >= len) + break; + case BPF_JMP: + /* + * Check that jumps are within the code block, + * and that unconditional branches don't go + * backwards as a result of an overflow. + * Unconditional branches have a 32-bit offset, + * so they could overflow; we check to make + * sure they don't. Conditional branches have + * an 8-bit offset, and the from address is <= + * BPF_MAXINSNS, and we assume that BPF_MAXINSNS + * is sufficiently small that adding 255 to it + * won't overflow. + * + * We know that len is <= BPF_MAXINSNS, and we + * assume that BPF_MAXINSNS is < the maximum size + * of a u_int, so that i + 1 doesn't overflow. + */ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Aug 16 16:46:31 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7AF4716A4E0; Wed, 16 Aug 2006 16:46:31 +0000 (UTC) X-Original-To: perforce@FreeBSD.org 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 3AC9B16A4E7 for ; Wed, 16 Aug 2006 16:46:31 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 87AF443E78 for ; Wed, 16 Aug 2006 16:44:53 +0000 (GMT) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7GGiXgU088960 for ; Wed, 16 Aug 2006 16:44:33 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7GGiXqw088955 for perforce@freebsd.org; Wed, 16 Aug 2006 16:44:33 GMT (envelope-from rdivacky@FreeBSD.org) Date: Wed, 16 Aug 2006 16:44:33 GMT Message-Id: <200608161644.k7GGiXqw088955@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rdivacky@FreeBSD.org using -f From: Roman Divacky To: Perforce Change Reviews Cc: Subject: PERFORCE change 104259 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 16 Aug 2006 16:46:31 -0000 http://perforce.freebsd.org/chv.cgi?CH=104259 Change 104259 by rdivacky@rdivacky_witten on 2006/08/16 16:44:09 Lock proc and rework getppid(). Affected files ... .. //depot/projects/soc2006/rdivacky_linuxolator/compat/linux/linux_misc.c#20 edit Differences ... ==== //depot/projects/soc2006/rdivacky_linuxolator/compat/linux/linux_misc.c#20 (text+ko) ==== @@ -1340,8 +1340,11 @@ KASSERT(em != NULL, ("getpid: emuldata not found.\n")); td->td_retval[0] = em->shared->group_pid; EMUL_UNLOCK(&emul_lock); - } else + } else { + PROC_LOCK(td->td_proc); td->td_retval[0] = td->td_proc->p_pid; + PROC_UNLOCK(td->td_proc); + } return (0); } @@ -1365,6 +1368,14 @@ struct proc *p, *pp; char osrel[LINUX_MAX_UTSNAME]; + linux_get_osrelease(td, osrel); + if (strlen(osrel) >= 3 && osrel[2] != '6') { + PROC_LOCK(td->td_proc); + td->td_retval[0] = td->td_proc->p_pptr->p_pid; + PROC_UNLOCK(td->td_proc); + return (0); + } + em = em_find(td->td_proc, EMUL_UNLOCKED); KASSERT(em != NULL, ("getppid: process emuldata not found.\n")); @@ -1388,11 +1399,7 @@ em = em_find(pp, EMUL_LOCKED); KASSERT(em != NULL, ("getppid: parent emuldata not found.\n")); - linux_get_osrelease(td, osrel); - if (strlen(osrel) >= 3 && osrel[2] == '6') - td->td_retval[0] = em->shared->group_pid; - else - td->td_retval[0] = td->td_proc->p_pptr->p_pid; + td->td_retval[0] = em->shared->group_pid; } else td->td_retval[0] = pp->p_pid; From owner-p4-projects@FreeBSD.ORG Wed Aug 16 17:44:56 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4D26C16A4E7; Wed, 16 Aug 2006 17:44:56 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 0E5EF16A4E2 for ; Wed, 16 Aug 2006 17:44:56 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D3F8F43DFB for ; Wed, 16 Aug 2006 17:42:13 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7GHfsQg001008 for ; Wed, 16 Aug 2006 17:41:54 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7GHfmnQ001005 for perforce@freebsd.org; Wed, 16 Aug 2006 17:41:48 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Wed, 16 Aug 2006 17:41:48 GMT Message-Id: <200608161741.k7GHfmnQ001005@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 104265 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 16 Aug 2006 17:44:56 -0000 http://perforce.freebsd.org/chv.cgi?CH=104265 Change 104265 by rwatson@rwatson_zoo on 2006/08/16 17:41:15 Integrate TrustedBSD audit3 branch from TrustedBSD base. Change list in @104257. Affected files ... .. //depot/projects/trustedbsd/audit3/Makefile.inc1#12 integrate .. //depot/projects/trustedbsd/audit3/ObsoleteFiles.inc#7 integrate .. //depot/projects/trustedbsd/audit3/contrib/ipfilter/BSD/Makefile#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/ipfilter/HISTORY#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/ipfilter/Makefile#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/ipfilter/bpf_filter.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/ipfilter/ip_fil.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ipfilter/ipf.h#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/ipfilter/iplang/iplang_y.y#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/ipfilter/ipmon.h#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/ipfilter/ipsd/sbpf.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/ipfilter/ipsend/ipsend.c#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/ipfilter/ipsend/iptests.c#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/ipfilter/ipsend/lsock.c#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/ipfilter/ipsend/resend.c#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/ipfilter/ipsend/sbpf.c#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/ipfilter/ipsend/sock.c#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/ipfilter/ipt.h#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/ipfilter/lib/Makefile#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/ipfilter/lib/addicmp.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/ipfilter/lib/addkeep.c#3 delete .. //depot/projects/trustedbsd/audit3/contrib/ipfilter/lib/facpri.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/ipfilter/lib/getport.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ipfilter/lib/icmpcode.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/ipfilter/lib/ipft_tx.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/ipfilter/lib/make_range.c#3 delete .. //depot/projects/trustedbsd/audit3/contrib/ipfilter/lib/optprint.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/ipfilter/lib/printfr.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/ipfilter/lib/printlog.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/ipfilter/man/ipmon.8#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/ipfilter/radix.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/ipfilter/samples/proxy.c#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/ipfilter/test/Makefile#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/ipfilter/test/expected/f20#1 branch .. //depot/projects/trustedbsd/audit3/contrib/ipfilter/test/expected/i1#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/ipfilter/test/expected/i10#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ipfilter/test/expected/i11#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/ipfilter/test/expected/i18#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ipfilter/test/expected/i5#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/ipfilter/test/expected/i8#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/ipfilter/test/expected/i9#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/ipfilter/test/expected/in2#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/ipfilter/test/expected/in5#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/ipfilter/test/expected/ni19#1 branch .. //depot/projects/trustedbsd/audit3/contrib/ipfilter/test/expected/ni20#1 branch .. //depot/projects/trustedbsd/audit3/contrib/ipfilter/test/expected/ni21#1 branch .. //depot/projects/trustedbsd/audit3/contrib/ipfilter/test/input/f2#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ipfilter/test/input/f20#1 branch .. //depot/projects/trustedbsd/audit3/contrib/ipfilter/test/input/ni19#1 branch .. //depot/projects/trustedbsd/audit3/contrib/ipfilter/test/input/ni20#1 branch .. //depot/projects/trustedbsd/audit3/contrib/ipfilter/test/input/ni21#1 branch .. //depot/projects/trustedbsd/audit3/contrib/ipfilter/test/regress/f20#1 branch .. //depot/projects/trustedbsd/audit3/contrib/ipfilter/test/regress/i1#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/ipfilter/test/regress/i10#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ipfilter/test/regress/i11#5 integrate .. //depot/projects/trustedbsd/audit3/contrib/ipfilter/test/regress/i15#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ipfilter/test/regress/i17#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ipfilter/test/regress/i18#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ipfilter/test/regress/i5#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ipfilter/test/regress/i8#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/ipfilter/test/regress/i9#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/ipfilter/test/regress/in2#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/ipfilter/test/regress/in5#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/ipfilter/test/regress/ni19.ipf#1 branch .. //depot/projects/trustedbsd/audit3/contrib/ipfilter/test/regress/ni19.nat#1 branch .. //depot/projects/trustedbsd/audit3/contrib/ipfilter/test/regress/ni20.ipf#1 branch .. //depot/projects/trustedbsd/audit3/contrib/ipfilter/test/regress/ni20.nat#1 branch .. //depot/projects/trustedbsd/audit3/contrib/ipfilter/test/regress/ni21.ipf#1 branch .. //depot/projects/trustedbsd/audit3/contrib/ipfilter/test/regress/ni21.nat#1 branch .. //depot/projects/trustedbsd/audit3/contrib/ipfilter/test/test.format#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/ipfilter/tools/ipf.c#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/ipfilter/tools/ipf_y.y#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/ipfilter/tools/ipfcomp.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/ipfilter/tools/ipfs.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/ipfilter/tools/ipfstat.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/ipfilter/tools/ipftest.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/ipfilter/tools/ipmon.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/ipfilter/tools/ipnat_y.y#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/ipfilter/tools/ipsyncm.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/ipfilter/tools/ipsyncs.c#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/ipfilter/tools/lexer.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/smbfs/smbutil/print.c#2 integrate .. //depot/projects/trustedbsd/audit3/contrib/smbfs/smbutil/view.c#3 integrate .. //depot/projects/trustedbsd/audit3/etc/defaults/rc.conf#15 integrate .. //depot/projects/trustedbsd/audit3/gnu/usr.bin/binutils/libbfd/Makefile.arm#2 integrate .. //depot/projects/trustedbsd/audit3/gnu/usr.bin/groff/contrib/mm/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/gnu/usr.bin/groff/tmac/Makefile#3 integrate .. //depot/projects/trustedbsd/audit3/gnu/usr.bin/groff/tmac/mdoc.local#6 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/gen/msgctl.3#2 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/gen/syslog.c#6 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/stdlib/malloc.c#11 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/string/strcoll.3#2 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/sys/connect.2#3 integrate .. //depot/projects/trustedbsd/audit3/lib/libc/sys/getfsstat.2#3 integrate .. //depot/projects/trustedbsd/audit3/lib/libdisk/write_ia64_disk.c#2 integrate .. //depot/projects/trustedbsd/audit3/lib/libpam/modules/pam_lastlog/pam_lastlog.c#2 integrate .. //depot/projects/trustedbsd/audit3/lib/libthr/thread/thr_init.c#9 integrate .. //depot/projects/trustedbsd/audit3/lib/libthr/thread/thr_mutex.c#10 integrate .. //depot/projects/trustedbsd/audit3/lib/libthr/thread/thr_private.h#11 integrate .. //depot/projects/trustedbsd/audit3/lib/libthr/thread/thr_pspinlock.c#3 integrate .. //depot/projects/trustedbsd/audit3/libexec/tftpd/tftpd.8#3 integrate .. //depot/projects/trustedbsd/audit3/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#14 integrate .. //depot/projects/trustedbsd/audit3/sbin/dump/main.c#3 integrate .. //depot/projects/trustedbsd/audit3/sbin/dump/optr.c#4 integrate .. //depot/projects/trustedbsd/audit3/sbin/geom/class/eli/geli.8#6 integrate .. //depot/projects/trustedbsd/audit3/sbin/geom/class/eli/geom_eli.c#7 integrate .. //depot/projects/trustedbsd/audit3/sbin/ifconfig/ifclone.c#3 integrate .. //depot/projects/trustedbsd/audit3/sbin/ifconfig/ifieee80211.c#10 integrate .. //depot/projects/trustedbsd/audit3/sbin/ipf/libipf/Makefile#3 integrate .. //depot/projects/trustedbsd/audit3/sbin/ipfw/ipfw2.c#10 integrate .. //depot/projects/trustedbsd/audit3/sbin/ping/ping.c#6 integrate .. //depot/projects/trustedbsd/audit3/sbin/sysctl/sysctl.c#7 integrate .. //depot/projects/trustedbsd/audit3/share/examples/drivers/make_device_driver.sh#2 integrate .. //depot/projects/trustedbsd/audit3/share/examples/drivers/make_pseudo_driver.sh#3 integrate .. //depot/projects/trustedbsd/audit3/share/man/man4/acpi.4#9 integrate .. //depot/projects/trustedbsd/audit3/share/man/man4/ata.4#9 integrate .. //depot/projects/trustedbsd/audit3/share/man/man4/if_bridge.4#7 integrate .. //depot/projects/trustedbsd/audit3/share/man/man4/ng_pppoe.4#7 integrate .. //depot/projects/trustedbsd/audit3/share/man/man4/uscanner.4#6 integrate .. //depot/projects/trustedbsd/audit3/share/man/man4/vlan.4#8 integrate .. //depot/projects/trustedbsd/audit3/share/man/man7/release.7#6 integrate .. //depot/projects/trustedbsd/audit3/share/man/man9/sysctl.9#2 integrate .. //depot/projects/trustedbsd/audit3/share/mk/bsd.cpu.mk#6 integrate .. //depot/projects/trustedbsd/audit3/share/mk/bsd.sys.mk#3 integrate .. //depot/projects/trustedbsd/audit3/sys/Makefile#8 integrate .. //depot/projects/trustedbsd/audit3/sys/amd64/acpica/madt.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/amd64/amd64/pmap.c#12 integrate .. //depot/projects/trustedbsd/audit3/sys/amd64/amd64/support.S#6 integrate .. //depot/projects/trustedbsd/audit3/sys/amd64/amd64/trap.c#13 integrate .. //depot/projects/trustedbsd/audit3/sys/amd64/include/pmap.h#8 integrate .. //depot/projects/trustedbsd/audit3/sys/amd64/linux32/linux.h#3 integrate .. //depot/projects/trustedbsd/audit3/sys/amd64/linux32/linux32_dummy.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/amd64/linux32/linux32_machdep.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/amd64/linux32/linux32_proto.h#8 integrate .. //depot/projects/trustedbsd/audit3/sys/amd64/linux32/linux32_syscall.h#8 integrate .. //depot/projects/trustedbsd/audit3/sys/amd64/linux32/linux32_sysent.c#8 integrate .. //depot/projects/trustedbsd/audit3/sys/amd64/linux32/linux32_sysvec.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/amd64/linux32/syscalls.conf#2 integrate .. //depot/projects/trustedbsd/audit3/sys/amd64/linux32/syscalls.master#8 integrate .. //depot/projects/trustedbsd/audit3/sys/arm/arm/elf_trampoline.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/arm/arm/mem.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/arm/arm/pmap.c#10 integrate .. //depot/projects/trustedbsd/audit3/sys/arm/arm/vm_machdep.c#9 integrate .. //depot/projects/trustedbsd/audit3/sys/arm/at91/at91_st.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/arm/at91/kb920x_machdep.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/arm/include/pmap.h#9 integrate .. //depot/projects/trustedbsd/audit3/sys/arm/include/sf_buf.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/arm/include/vmparam.h#4 integrate .. //depot/projects/trustedbsd/audit3/sys/arm/sa11x0/assabet_machdep.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/arm/xscale/i80321/iq31244_machdep.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/boot/Makefile#6 integrate .. //depot/projects/trustedbsd/audit3/sys/boot/arm/Makefile#1 branch .. //depot/projects/trustedbsd/audit3/sys/boot/arm/at91/Makefile.inc#2 integrate .. //depot/projects/trustedbsd/audit3/sys/boot/arm/at91/bootiic/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/sys/boot/arm/at91/bootiic/arm_init.S#2 integrate .. //depot/projects/trustedbsd/audit3/sys/boot/arm/at91/bootiic/env_vars.c#1 branch .. //depot/projects/trustedbsd/audit3/sys/boot/arm/at91/bootiic/env_vars.h#1 branch .. //depot/projects/trustedbsd/audit3/sys/boot/arm/at91/bootiic/loader_prompt.c#1 branch .. //depot/projects/trustedbsd/audit3/sys/boot/arm/at91/bootiic/loader_prompt.h#1 branch .. //depot/projects/trustedbsd/audit3/sys/boot/arm/at91/bootiic/main.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/boot/arm/at91/libat91/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/sys/boot/arm/at91/libat91/at91rm9200.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/boot/arm/at91/libat91/at91rm9200_lowlevel.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/boot/arm/at91/libat91/eeprom.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/boot/arm/at91/libat91/eeprom.h#2 delete .. //depot/projects/trustedbsd/audit3/sys/boot/arm/at91/libat91/emac.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/boot/arm/at91/libat91/emac.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/boot/arm/at91/libat91/env_vars.c#2 delete .. //depot/projects/trustedbsd/audit3/sys/boot/arm/at91/libat91/env_vars.h#2 delete .. //depot/projects/trustedbsd/audit3/sys/boot/arm/at91/libat91/lib.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/boot/arm/at91/libat91/loader_prompt.c#2 delete .. //depot/projects/trustedbsd/audit3/sys/boot/arm/at91/libat91/loader_prompt.h#2 delete .. //depot/projects/trustedbsd/audit3/sys/boot/arm/at91/libat91/p_string.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/boot/arm/at91/libat91/p_string.h#2 delete .. //depot/projects/trustedbsd/audit3/sys/boot/arm/at91/libat91/spi_flash.c#1 branch .. //depot/projects/trustedbsd/audit3/sys/boot/arm/at91/libat91/spi_flash.h#1 branch .. //depot/projects/trustedbsd/audit3/sys/boot/arm/at91/libat91/xmodem.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/boot/forth/loader.conf#9 integrate .. //depot/projects/trustedbsd/audit3/sys/cam/scsi/scsi_pass.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/compat/freebsd32/freebsd32_misc.c#11 integrate .. //depot/projects/trustedbsd/audit3/sys/compat/freebsd32/freebsd32_proto.h#19 integrate .. //depot/projects/trustedbsd/audit3/sys/compat/freebsd32/freebsd32_syscall.h#19 integrate .. //depot/projects/trustedbsd/audit3/sys/compat/freebsd32/freebsd32_syscalls.c#19 integrate .. //depot/projects/trustedbsd/audit3/sys/compat/freebsd32/freebsd32_sysent.c#20 integrate .. //depot/projects/trustedbsd/audit3/sys/compat/freebsd32/syscalls.conf#2 integrate .. //depot/projects/trustedbsd/audit3/sys/compat/linprocfs/linprocfs.c#9 integrate .. //depot/projects/trustedbsd/audit3/sys/compat/linux/linux_emul.c#1 branch .. //depot/projects/trustedbsd/audit3/sys/compat/linux/linux_emul.h#1 branch .. //depot/projects/trustedbsd/audit3/sys/compat/linux/linux_futex.c#1 branch .. //depot/projects/trustedbsd/audit3/sys/compat/linux/linux_futex.h#1 branch .. //depot/projects/trustedbsd/audit3/sys/compat/linux/linux_misc.c#9 integrate .. //depot/projects/trustedbsd/audit3/sys/compat/linux/linux_signal.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/compat/linux/linux_time.c#1 branch .. //depot/projects/trustedbsd/audit3/sys/compat/linux/linux_util.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/compat/svr4/svr4_proto.h#8 integrate .. //depot/projects/trustedbsd/audit3/sys/compat/svr4/svr4_stream.c#8 integrate .. //depot/projects/trustedbsd/audit3/sys/compat/svr4/svr4_syscall.h#8 integrate .. //depot/projects/trustedbsd/audit3/sys/compat/svr4/svr4_syscallnames.c#8 integrate .. //depot/projects/trustedbsd/audit3/sys/compat/svr4/svr4_sysent.c#8 integrate .. //depot/projects/trustedbsd/audit3/sys/compat/svr4/syscalls.conf#2 integrate .. //depot/projects/trustedbsd/audit3/sys/conf/files#25 integrate .. //depot/projects/trustedbsd/audit3/sys/conf/files.amd64#10 integrate .. //depot/projects/trustedbsd/audit3/sys/conf/files.i386#12 integrate .. //depot/projects/trustedbsd/audit3/sys/conf/kern.post.mk#9 integrate .. //depot/projects/trustedbsd/audit3/sys/conf/kmod.mk#12 integrate .. //depot/projects/trustedbsd/audit3/sys/conf/options.arm#8 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/dev/acpica/acfreebsd.h#4 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/ipfilter/netinet/fil.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/ipfilter/netinet/ip_auth.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/ipfilter/netinet/ip_auth.h#3 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/ipfilter/netinet/ip_compat.h#5 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/ipfilter/netinet/ip_fil.h#5 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/ipfilter/netinet/ip_frag.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/ipfilter/netinet/ip_ftp_pxy.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/ipfilter/netinet/ip_log.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/ipfilter/netinet/ip_nat.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/ipfilter/netinet/ip_pptp_pxy.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/ipfilter/netinet/ip_proxy.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/ipfilter/netinet/ip_rcmd_pxy.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/ipfilter/netinet/ip_scan.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/ipfilter/netinet/ip_state.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/ipfilter/netinet/ip_sync.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/ipfilter/netinet/ip_sync.h#3 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/ipfilter/netinet/ipl.h#5 integrate .. //depot/projects/trustedbsd/audit3/sys/contrib/ipfilter/netinet/mlfk_ipl.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/acpi_support/acpi_ibm.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/acpica/Osd/OsdMemory.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/acpica/acpi_dock.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/acpica/acpi_hpet.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/acpica/acpi_pci_link.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/acpica/acpi_video.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/ata/ata-chipset.c#14 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/ata/ata-disk.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/ata/ata-pci.h#10 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/ath/if_ath.c#12 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/ath/if_athioctl.h#7 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/bce/if_bce.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/bge/if_bge.c#12 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/bge/if_bgereg.h#11 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/em/if_em.c#14 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/em/if_em.h#9 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/em/if_em_hw.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/em/if_em_hw.h#7 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/exca/excareg.h#3 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/hme/if_hme.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/isp/isp.c#11 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/isp/isp_pci.c#10 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/isp/ispvar.h#9 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/mii/rgephy.c#8 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/nfe/if_nfe.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/pccard/pccard_cis.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/pccbb/pccbb.c#11 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/pccbb/pccbb_pci.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/pccbb/pccbbreg.h#6 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/sk/if_sk.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/sound/pci/emu10k1.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/sound/pci/emu10kx-pcm.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/sound/pci/emu10kx.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/sound/pci/emu10kx.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/sound/pci/ich.c#8 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/stge/if_stge.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/ti/if_ti.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/usb/usbdevs#14 integrate .. //depot/projects/trustedbsd/audit3/sys/dev/usb/uscanner.c#8 integrate .. //depot/projects/trustedbsd/audit3/sys/fs/nwfs/nwfs_io.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/fs/smbfs/smbfs_io.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/geom/eli/g_eli.c#8 integrate .. //depot/projects/trustedbsd/audit3/sys/geom/eli/g_eli.h#5 integrate .. //depot/projects/trustedbsd/audit3/sys/geom/eli/g_eli_ctl.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/geom/geom_gpt.c#9 integrate .. //depot/projects/trustedbsd/audit3/sys/geom/label/g_label.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/geom/label/g_label_msdosfs.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/geom/label/g_label_msdosfs.h#1 branch .. //depot/projects/trustedbsd/audit3/sys/geom/mirror/g_mirror.c#9 integrate .. //depot/projects/trustedbsd/audit3/sys/geom/raid3/g_raid3.c#11 integrate .. //depot/projects/trustedbsd/audit3/sys/i386/acpica/acpi_machdep.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/i386/acpica/acpi_wakeup.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/i386/acpica/madt.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/i386/conf/XBOX#6 integrate .. //depot/projects/trustedbsd/audit3/sys/i386/i386/machdep.c#12 integrate .. //depot/projects/trustedbsd/audit3/sys/i386/i386/pmap.c#13 integrate .. //depot/projects/trustedbsd/audit3/sys/i386/i386/support.s#4 integrate .. //depot/projects/trustedbsd/audit3/sys/i386/i386/trap.c#14 integrate .. //depot/projects/trustedbsd/audit3/sys/i386/ibcs2/ibcs2_isc_syscall.h#7 integrate .. //depot/projects/trustedbsd/audit3/sys/i386/ibcs2/ibcs2_isc_sysent.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/i386/ibcs2/ibcs2_proto.h#8 integrate .. //depot/projects/trustedbsd/audit3/sys/i386/ibcs2/ibcs2_syscall.h#8 integrate .. //depot/projects/trustedbsd/audit3/sys/i386/ibcs2/ibcs2_sysent.c#8 integrate .. //depot/projects/trustedbsd/audit3/sys/i386/ibcs2/ibcs2_xenix.h#7 integrate .. //depot/projects/trustedbsd/audit3/sys/i386/ibcs2/ibcs2_xenix_syscall.h#7 integrate .. //depot/projects/trustedbsd/audit3/sys/i386/ibcs2/ibcs2_xenix_sysent.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/i386/ibcs2/syscalls.conf#2 integrate .. //depot/projects/trustedbsd/audit3/sys/i386/ibcs2/syscalls.isc.conf#2 integrate .. //depot/projects/trustedbsd/audit3/sys/i386/ibcs2/syscalls.xenix.conf#2 integrate .. //depot/projects/trustedbsd/audit3/sys/i386/include/pmap.h#7 integrate .. //depot/projects/trustedbsd/audit3/sys/i386/isa/clock.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/i386/linux/linux.h#5 integrate .. //depot/projects/trustedbsd/audit3/sys/i386/linux/linux_dummy.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/i386/linux/linux_machdep.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/i386/linux/linux_proto.h#14 integrate .. //depot/projects/trustedbsd/audit3/sys/i386/linux/linux_syscall.h#14 integrate .. //depot/projects/trustedbsd/audit3/sys/i386/linux/linux_sysent.c#18 integrate .. //depot/projects/trustedbsd/audit3/sys/i386/linux/linux_sysvec.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/i386/linux/syscalls.conf#2 integrate .. //depot/projects/trustedbsd/audit3/sys/i386/linux/syscalls.master#18 integrate .. //depot/projects/trustedbsd/audit3/sys/i386/xbox/xbox.c#3 integrate .. //depot/projects/trustedbsd/audit3/sys/ia64/include/pmap.h#6 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/Makefile#4 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/init_sysent.c#33 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/kern_exec.c#12 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/kern_fork.c#18 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/kern_lock.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/kern_mutex.c#10 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/kern_subr.c#4 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/kern_sx.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/kern_time.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/makesyscalls.sh#7 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/subr_turnstile.c#8 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/syscalls.c#24 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/syscalls.master#38 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/systrace_args.c#2 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/uipc_proto.c#4 delete .. //depot/projects/trustedbsd/audit3/sys/kern/uipc_sem.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/uipc_socket.c#11 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/uipc_syscalls.c#11 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/uipc_usrreq.c#10 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/vfs_aio.c#11 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/vfs_bio.c#10 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/vfs_lookup.c#12 integrate .. //depot/projects/trustedbsd/audit3/sys/kern/vfs_subr.c#13 integrate .. //depot/projects/trustedbsd/audit3/sys/libkern/strstr.c#1 branch .. //depot/projects/trustedbsd/audit3/sys/modules/if_ef/Makefile#4 integrate .. //depot/projects/trustedbsd/audit3/sys/modules/if_ppp/Makefile#6 integrate .. //depot/projects/trustedbsd/audit3/sys/modules/linprocfs/Makefile#3 integrate .. //depot/projects/trustedbsd/audit3/sys/modules/linsysfs/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/sys/modules/linux/Makefile#5 integrate .. //depot/projects/trustedbsd/audit3/sys/modules/netgraph/mppc/Makefile#3 integrate .. //depot/projects/trustedbsd/audit3/sys/modules/sound/sound/Makefile#5 integrate .. //depot/projects/trustedbsd/audit3/sys/net/bpf.c#11 integrate .. //depot/projects/trustedbsd/audit3/sys/net/bridgestp.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/net/if_tun.c#8 integrate .. //depot/projects/trustedbsd/audit3/sys/net/if_vlan.c#13 integrate .. //depot/projects/trustedbsd/audit3/sys/net80211/ieee80211_input.c#9 integrate .. //depot/projects/trustedbsd/audit3/sys/net80211/ieee80211_ioctl.c#9 integrate .. //depot/projects/trustedbsd/audit3/sys/net80211/ieee80211_ioctl.h#6 integrate .. //depot/projects/trustedbsd/audit3/sys/net80211/ieee80211_output.c#10 integrate .. //depot/projects/trustedbsd/audit3/sys/netatalk/ddp_usrreq.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/netgraph/ng_pppoe.c#8 integrate .. //depot/projects/trustedbsd/audit3/sys/netgraph/ng_pppoe.h#6 integrate .. //depot/projects/trustedbsd/audit3/sys/netinet/tcp_input.c#11 integrate .. //depot/projects/trustedbsd/audit3/sys/netinet/tcp_subr.c#9 integrate .. //depot/projects/trustedbsd/audit3/sys/netinet/tcp_timer.c#8 integrate .. //depot/projects/trustedbsd/audit3/sys/netinet/tcp_timer.h#5 integrate .. //depot/projects/trustedbsd/audit3/sys/nfsclient/nfs_bio.c#8 integrate .. //depot/projects/trustedbsd/audit3/sys/nfsclient/nfs_vfsops.c#8 integrate .. //depot/projects/trustedbsd/audit3/sys/pc98/include/md_var.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/pc98/pc98/pc98_machdep.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/pci/agp.c#6 integrate .. //depot/projects/trustedbsd/audit3/sys/pci/if_xl.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/security/mac_biba/mac_biba.c#7 integrate .. //depot/projects/trustedbsd/audit3/sys/sparc64/sparc64/pmap.c#10 integrate .. //depot/projects/trustedbsd/audit3/sys/sys/dirent.h#2 integrate .. //depot/projects/trustedbsd/audit3/sys/sys/domain.h#3 integrate .. //depot/projects/trustedbsd/audit3/sys/sys/eventhandler.h#4 integrate .. //depot/projects/trustedbsd/audit3/sys/sys/imgact.h#4 integrate .. //depot/projects/trustedbsd/audit3/sys/sys/libkern.h#7 integrate .. //depot/projects/trustedbsd/audit3/sys/sys/lockmgr.h#4 integrate .. //depot/projects/trustedbsd/audit3/sys/sys/mac_policy.h#8 integrate .. //depot/projects/trustedbsd/audit3/sys/sys/param.h#9 integrate .. //depot/projects/trustedbsd/audit3/sys/sys/sx.h#7 integrate .. //depot/projects/trustedbsd/audit3/sys/sys/syscall.h#23 integrate .. //depot/projects/trustedbsd/audit3/sys/sys/syscall.mk#24 integrate .. //depot/projects/trustedbsd/audit3/sys/sys/sysctl.h#8 integrate .. //depot/projects/trustedbsd/audit3/sys/sys/sysent.h#6 integrate .. //depot/projects/trustedbsd/audit3/sys/sys/sysproto.h#27 integrate .. //depot/projects/trustedbsd/audit3/sys/vm/device_pager.c#5 integrate .. //depot/projects/trustedbsd/audit3/sys/vm/swap_pager.c#10 integrate .. //depot/projects/trustedbsd/audit3/sys/vm/vm_fault.c#11 integrate .. //depot/projects/trustedbsd/audit3/sys/vm/vm_object.c#10 integrate .. //depot/projects/trustedbsd/audit3/sys/vm/vm_page.c#13 integrate .. //depot/projects/trustedbsd/audit3/sys/vm/vm_page.h#7 integrate .. //depot/projects/trustedbsd/audit3/sys/vm/vnode_pager.c#9 integrate .. //depot/projects/trustedbsd/audit3/tools/tools/ath/athstats/Makefile#3 integrate .. //depot/projects/trustedbsd/audit3/tools/tools/ath/athstats/athstats.c#4 integrate .. //depot/projects/trustedbsd/audit3/tools/tools/ath/athstats/athstats.h#1 branch .. //depot/projects/trustedbsd/audit3/tools/tools/ath/athstats/main.c#1 branch .. //depot/projects/trustedbsd/audit3/tools/tools/ath/athstats/statfoo.c#1 branch .. //depot/projects/trustedbsd/audit3/tools/tools/ath/athstats/statfoo.h#1 branch .. //depot/projects/trustedbsd/audit3/tools/tools/nanobsd/nanobsd.sh#6 integrate .. //depot/projects/trustedbsd/audit3/tools/tools/net80211/Makefile#3 integrate .. //depot/projects/trustedbsd/audit3/tools/tools/net80211/README#2 integrate .. //depot/projects/trustedbsd/audit3/tools/tools/net80211/w00t/libw00t/w00t.c#2 integrate .. //depot/projects/trustedbsd/audit3/tools/tools/net80211/wesside/Makefile#1 branch .. //depot/projects/trustedbsd/audit3/tools/tools/net80211/wesside/README#1 branch .. //depot/projects/trustedbsd/audit3/tools/tools/net80211/wesside/dics/Makefile#1 branch .. //depot/projects/trustedbsd/audit3/tools/tools/net80211/wesside/dics/dics.c#1 branch .. //depot/projects/trustedbsd/audit3/tools/tools/net80211/wesside/udps/Makefile#1 branch .. //depot/projects/trustedbsd/audit3/tools/tools/net80211/wesside/udps/udps.c#1 branch .. //depot/projects/trustedbsd/audit3/tools/tools/net80211/wesside/wesside/Makefile#1 branch .. //depot/projects/trustedbsd/audit3/tools/tools/net80211/wesside/wesside/wesside.c#1 branch .. //depot/projects/trustedbsd/audit3/tools/tools/net80211/wlaninject/wlaninject.c#2 integrate .. //depot/projects/trustedbsd/audit3/tools/tools/net80211/wlanstats/Makefile#3 integrate .. //depot/projects/trustedbsd/audit3/tools/tools/net80211/wlanstats/main.c#1 branch .. //depot/projects/trustedbsd/audit3/tools/tools/net80211/wlanstats/statfoo.c#1 branch .. //depot/projects/trustedbsd/audit3/tools/tools/net80211/wlanstats/statfoo.h#1 branch .. //depot/projects/trustedbsd/audit3/tools/tools/net80211/wlanstats/wlanstats.c#2 integrate .. //depot/projects/trustedbsd/audit3/tools/tools/net80211/wlanstats/wlanstats.h#1 branch .. //depot/projects/trustedbsd/audit3/usr.bin/calendar/calendars/calendar.history#3 integrate .. //depot/projects/trustedbsd/audit3/usr.bin/hexdump/parse.c#3 integrate .. //depot/projects/trustedbsd/audit3/usr.bin/split/split.1#6 integrate .. //depot/projects/trustedbsd/audit3/usr.bin/split/split.c#4 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/Makefile#18 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/kldxref/kldxref.c#5 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/mailwrapper/mailwrapper.8#3 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/mailwrapper/mailwrapper.c#3 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/named/Makefile#4 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/ngctl/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/ngctl/main.c#5 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/pkg_install/lib/url.c#5 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/pkg_install/version/perform.c#7 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/rpc.lockd/lockd_lock.c#4 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/rpc.statd/procs.c#2 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/rtsold/rtsold.8#4 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/sade/Makefile#2 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/sade/command.c#2 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/sade/config.c#2 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/sade/devices.c#2 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/sade/disks.c#2 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/sade/dispatch.c#2 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/sade/dmenu.c#2 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/sade/globals.c#2 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/sade/install.c#2 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/sade/keymap.c#2 delete .. //depot/projects/trustedbsd/audit3/usr.sbin/sade/label.c#2 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/sade/list.h#2 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/sade/main.c#2 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/sade/menus.c#2 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/sade/misc.c#2 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/sade/msg.c#2 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/sade/rtermcap.c#2 delete .. //depot/projects/trustedbsd/audit3/usr.sbin/sade/sade.8#2 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/sade/sade.h#2 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/sade/system.c#2 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/sade/termcap.c#2 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/sade/usb.c#2 delete .. //depot/projects/trustedbsd/audit3/usr.sbin/sade/variable.c#2 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/sade/wizard.c#2 integrate .. //depot/projects/trustedbsd/audit3/usr.sbin/yppush/yppush_main.c#4 integrate Differences ... ==== //depot/projects/trustedbsd/audit3/Makefile.inc1#12 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.550 2006/08/02 15:26:15 netchild Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.552 2006/08/09 11:03:06 netchild Exp $ # # Make command line options: # -DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir ==== //depot/projects/trustedbsd/audit3/ObsoleteFiles.inc#7 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/ObsoleteFiles.inc,v 1.42 2006/08/04 21:29:22 brooks Exp $ +# $FreeBSD: src/ObsoleteFiles.inc,v 1.47 2006/08/14 18:20:36 netchild Exp $ # # This file lists old files (OLD_FILES), libraries (OLD_LIBS) and # directories (OLD_DIRS) which should get removed at an update. Recently @@ -745,6 +745,7 @@ OLD_FILES+=usr/bin/perlcc OLD_FILES+=usr/bin/perldoc OLD_FILES+=usr/bin/suidperl +OLD_FILES+=usr/lib/pam_ftp.so OLD_FILES+=usr/libdata/perl/5.00503/CGI/Apache.pm OLD_FILES+=usr/libdata/perl/5.00503/CGI/Carp.pm OLD_FILES+=usr/libdata/perl/5.00503/CGI/Cookie.pm @@ -2726,7 +2727,209 @@ OLD_FILES+=usr/games/worm OLD_FILES+=usr/games/worms OLD_FILES+=usr/games/wump +OLD_FILES+=sbin/mount_reiserfs +OLD_FILES+=usr/bin/hesinfo +OLD_FILES+=usr/share/examples/etc/usbd.conf +OLD_FILES+=usr/share/examples/meteor/README +OLD_FILES+=usr/share/examples/meteor/rgb16.c +OLD_FILES+=usr/share/examples/meteor/rgb24.c +OLD_FILES+=usr/share/examples/meteor/test-n.c +OLD_FILES+=usr/share/examples/meteor/yuvpk.c +OLD_FILES+=usr/share/examples/meteor/yuvpl.c +OLD_FILES+=usr/share/examples/worm/README +OLD_FILES+=usr/share/examples/worm/makecdfs.sh +OLD_FILES+=usr/share/groff_font/devlj4/Makefile +OLD_FILES+=usr/share/groff_font/devlj4/text.map +OLD_FILES+=usr/share/groff_font/devlj4/special.map +OLD_FILES+=usr/share/misc/nslookup.help +OLD_FILES+=usr/share/sendmail/cf/feature/nodns.m4 +OLD_FILES+=usr/share/syscons/keymaps/lat-amer.kbd +OLD_FILES+=usr/share/vi/catalog/ru_SU.KOI8-R +OLD_FILES+=usr/share/zoneinfo/Africa/Timbuktu +OLD_FILES+=usr/share/zoneinfo/America/Buenos_Aires +OLD_FILES+=usr/share/zoneinfo/America/Cordoba +OLD_FILES+=usr/share/zoneinfo/America/Jujuy +OLD_FILES+=usr/share/zoneinfo/America/Catamarca +OLD_FILES+=usr/share/zoneinfo/America/Mendoza +OLD_FILES+=usr/share/zoneinfo/America/Indianapolis +OLD_FILES+=usr/share/zoneinfo/America/Louisville +OLD_FILES+=usr/share/zoneinfo/America/Argentina/ComodRivadavia +OLD_FILES+=usr/share/zoneinfo/Europe/Belfast +OLD_FILES+=usr/share/zoneinfo/Pacific/Yap +OLD_FILES+=usr/share/zoneinfo/SystemV/YST9 +OLD_FILES+=usr/share/zoneinfo/SystemV/PST8 +OLD_FILES+=usr/share/zoneinfo/SystemV/EST5EDT +OLD_FILES+=usr/share/zoneinfo/SystemV/CST6CDT +OLD_FILES+=usr/share/zoneinfo/SystemV/MST7MDT +OLD_FILES+=usr/share/zoneinfo/SystemV/PST8PDT +OLD_FILES+=usr/share/zoneinfo/SystemV/YST9YDT +OLD_FILES+=usr/share/zoneinfo/SystemV/HST10 +OLD_FILES+=usr/share/zoneinfo/SystemV/MST7 +OLD_FILES+=usr/share/zoneinfo/SystemV/EST5 +OLD_FILES+=usr/share/zoneinfo/SystemV/AST4ADT +OLD_FILES+=usr/share/zoneinfo/SystemV/CST6 +OLD_FILES+=usr/share/zoneinfo/SystemV/AST4 +OLD_FILES+=usr/share/doc/ntp/accopt.htm +OLD_FILES+=usr/share/doc/ntp/assoc.htm +OLD_FILES+=usr/share/doc/ntp/audio.htm +OLD_FILES+=usr/share/doc/ntp/authopt.htm +OLD_FILES+=usr/share/doc/ntp/biblio.htm +OLD_FILES+=usr/share/doc/ntp/build.htm +OLD_FILES+=usr/share/doc/ntp/clockopt.htm +OLD_FILES+=usr/share/doc/ntp/config.htm +OLD_FILES+=usr/share/doc/ntp/confopt.htm +OLD_FILES+=usr/share/doc/ntp/copyright.htm +OLD_FILES+=usr/share/doc/ntp/debug.htm +OLD_FILES+=usr/share/doc/ntp/driver1.htm +OLD_FILES+=usr/share/doc/ntp/driver10.htm +OLD_FILES+=usr/share/doc/ntp/driver11.htm +OLD_FILES+=usr/share/doc/ntp/driver12.htm +OLD_FILES+=usr/share/doc/ntp/driver16.htm +OLD_FILES+=usr/share/doc/ntp/driver18.htm +OLD_FILES+=usr/share/doc/ntp/driver19.htm +OLD_FILES+=usr/share/doc/ntp/driver2.htm +OLD_FILES+=usr/share/doc/ntp/driver20.htm +OLD_FILES+=usr/share/doc/ntp/driver22.htm +OLD_FILES+=usr/share/doc/ntp/driver23.htm +OLD_FILES+=usr/share/doc/ntp/driver24.htm +OLD_FILES+=usr/share/doc/ntp/driver26.htm +OLD_FILES+=usr/share/doc/ntp/driver27.htm +OLD_FILES+=usr/share/doc/ntp/driver28.htm +OLD_FILES+=usr/share/doc/ntp/driver29.htm +OLD_FILES+=usr/share/doc/ntp/driver3.htm +OLD_FILES+=usr/share/doc/ntp/driver30.htm +OLD_FILES+=usr/share/doc/ntp/driver32.htm +OLD_FILES+=usr/share/doc/ntp/driver33.htm +OLD_FILES+=usr/share/doc/ntp/driver34.htm +OLD_FILES+=usr/share/doc/ntp/driver35.htm +OLD_FILES+=usr/share/doc/ntp/driver36.htm +OLD_FILES+=usr/share/doc/ntp/driver37.htm +OLD_FILES+=usr/share/doc/ntp/driver4.htm +OLD_FILES+=usr/share/doc/ntp/driver5.htm +OLD_FILES+=usr/share/doc/ntp/driver6.htm +OLD_FILES+=usr/share/doc/ntp/driver7.htm +OLD_FILES+=usr/share/doc/ntp/driver8.htm +OLD_FILES+=usr/share/doc/ntp/driver9.htm +OLD_FILES+=usr/share/doc/ntp/exec.htm +OLD_FILES+=usr/share/doc/ntp/extern.htm +OLD_FILES+=usr/share/doc/ntp/gadget.htm +OLD_FILES+=usr/share/doc/ntp/hints.htm +OLD_FILES+=usr/share/doc/ntp/howto.htm +OLD_FILES+=usr/share/doc/ntp/htmlprimer.htm +OLD_FILES+=usr/share/doc/ntp/index.htm +OLD_FILES+=usr/share/doc/ntp/kern.htm +OLD_FILES+=usr/share/doc/ntp/kernpps.htm +OLD_FILES+=usr/share/doc/ntp/ldisc.htm +OLD_FILES+=usr/share/doc/ntp/measure.htm +OLD_FILES+=usr/share/doc/ntp/miscopt.htm +OLD_FILES+=usr/share/doc/ntp/monopt.htm +OLD_FILES+=usr/share/doc/ntp/mx4200data.htm +OLD_FILES+=usr/share/doc/ntp/notes.htm +OLD_FILES+=usr/share/doc/ntp/ntpd.htm +OLD_FILES+=usr/share/doc/ntp/ntpdate.htm +OLD_FILES+=usr/share/doc/ntp/ntpdc.htm +OLD_FILES+=usr/share/doc/ntp/ntpq.htm +OLD_FILES+=usr/share/doc/ntp/ntptime.htm +OLD_FILES+=usr/share/doc/ntp/ntptrace.htm +OLD_FILES+=usr/share/doc/ntp/parsedata.htm +OLD_FILES+=usr/share/doc/ntp/parsenew.htm +OLD_FILES+=usr/share/doc/ntp/patches.htm +OLD_FILES+=usr/share/doc/ntp/porting.htm +OLD_FILES+=usr/share/doc/ntp/pps.htm +OLD_FILES+=usr/share/doc/ntp/prefer.htm +OLD_FILES+=usr/share/doc/ntp/qth.htm +OLD_FILES+=usr/share/doc/ntp/quick.htm +OLD_FILES+=usr/share/doc/ntp/rdebug.htm +OLD_FILES+=usr/share/doc/ntp/refclock.htm +OLD_FILES+=usr/share/doc/ntp/release.htm +OLD_FILES+=usr/share/doc/ntp/tickadj.htm +OLD_FILES+=usr/share/doc/papers/nqnfs.ascii.gz +OLD_FILES+=usr/share/doc/papers/px.ascii.gz +OLD_FILES+=usr/share/man/man1/hesinfo.1.gz +OLD_FILES+=usr/share/man/man3/mbrune.3.gz +OLD_FILES+=usr/share/man/man3/rune.3.gz +OLD_FILES+=usr/share/man/man3/hesiod.3.gz +OLD_FILES+=usr/share/man/man3/mac_is_present_np.3.gz +OLD_FILES+=usr/share/man/man3/fpsetsticky.3.gz +OLD_FILES+=usr/share/man/man3/gss_krb5_copy_ccache.3.gz +OLD_FILES+=usr/share/man/man3/gss_krb5_compat_des3_mic.3.gz +OLD_FILES+=usr/share/man/man3/exp10f.3.gz +OLD_FILES+=usr/share/man/man3/exp10.3.gz +OLD_FILES+=usr/share/man/man3/mbrrune.3.gz +OLD_FILES+=usr/share/man/man3/mbmb.3.gz +OLD_FILES+=usr/share/man/man3/sputrune.3.gz +OLD_FILES+=usr/share/man/man3/sgetrune.3.gz +OLD_FILES+=usr/share/man/man3/setrunelocale.3.gz +OLD_FILES+=usr/share/man/man3/setinvalidrune.3.gz +OLD_FILES+=usr/share/man/man3/mbrune.3.gz +OLD_FILES+=usr/share/man/man3/rune.3.gz +OLD_FILES+=usr/share/man/man3/hesiod.3.gz +OLD_FILES+=usr/share/man/man3/mac_is_present_np.3.gz +OLD_FILES+=usr/share/man/man3/fpsetsticky.3.gz +OLD_FILES+=usr/share/man/man3/gss_krb5_copy_ccache.3.gz +OLD_FILES+=usr/share/man/man3/gss_krb5_compat_des3_mic.3.gz +OLD_FILES+=usr/share/man/man3/exp10f.3.gz +OLD_FILES+=usr/share/man/man3/exp10.3.gz +OLD_FILES+=usr/share/man/man3/mbrrune.3.gz +OLD_FILES+=usr/share/man/man3/mbmb.3.gz +OLD_FILES+=usr/share/man/man3/sputrune.3.gz +OLD_FILES+=usr/share/man/man3/sgetrune.3.gz +OLD_FILES+=usr/share/man/man3/setrunelocale.3.gz +OLD_FILES+=usr/share/man/man3/setinvalidrune.3.gz +OLD_FILES+=usr/share/man/man3/fungetrune.3.gz +OLD_FILES+=usr/share/man/man3/fputrune.3.gz +OLD_FILES+=usr/share/man/man3/fgetrune.3.gz +OLD_FILES+=usr/share/man/man5/hesiod.conf.5.gz +OLD_FILES+=usr/share/man/man5/usbd.conf.5.gz +.if ${TARGET_ARCH} != "i386" +OLD_FILES+=usr/share/man/man8/boot_i386.8.gz +.endif +OLD_FILES+=usr/share/man/man8/ofwdump.8.gz +OLD_FILES+=usr/share/man/man8/mount_reiserfs.8.gz +OLD_FILES+=usr/share/man/man9/VFS_START.9.gz +OLD_FILES+=usr/share/man/man9/cpu_critical_exit.9.gz +OLD_FILES+=usr/share/man/man9/cpu_critical_enter.9.gz +OLD_FILES+=usr/share/info/annotate.info.gz +OLD_FILES+=usr/share/info/tar.info.gz +OLD_FILES+=usr/share/bsnmp/defs/tree.def +OLD_FILES+=usr/share/bsnmp/defs/mibII_tree.def +OLD_FILES+=usr/share/bsnmp/defs/netgraph_tree.def +OLD_FILES+=usr/share/bsnmp/mibs/FOKUS-MIB.txt +OLD_FILES+=usr/share/bsnmp/mibs/BEGEMOT-MIB.txt +OLD_FILES+=usr/share/bsnmp/mibs/BEGEMOT-SNMPD.txt +OLD_FILES+=usr/share/bsnmp/mibs/BEGEMOT-NETGRAPH.txt +OLD_FILES+=usr/libdata/ldscripts/elf64_sparc.x +OLD_FILES+=usr/libdata/ldscripts/elf64_sparc.xbn +OLD_FILES+=usr/libdata/ldscripts/elf64_sparc.xn +OLD_FILES+=usr/libdata/ldscripts/elf64_sparc.xr +OLD_FILES+=usr/libdata/ldscripts/elf64_sparc.xs +OLD_FILES+=usr/libdata/ldscripts/elf64_sparc.xu +OLD_FILES+=usr/libdata/ldscripts/elf64_sparc.xc +OLD_FILES+=usr/libdata/ldscripts/elf64_sparc.xsc +OLD_FILES+=usr/libdata/ldscripts/elf32_sparc.x +OLD_FILES+=usr/libdata/ldscripts/elf32_sparc.xbn +OLD_FILES+=usr/libdata/ldscripts/elf32_sparc.xn +OLD_FILES+=usr/libdata/ldscripts/elf32_sparc.xr +OLD_FILES+=usr/libdata/ldscripts/elf32_sparc.xs +OLD_FILES+=usr/libdata/ldscripts/elf32_sparc.xu +OLD_FILES+=usr/libdata/ldscripts/elf32_sparc.xc +OLD_FILES+=usr/libdata/ldscripts/elf32_sparc.xsc +OLD_FILES+=usr/libdata/msdosfs/iso22dos +OLD_FILES+=usr/libdata/msdosfs/iso72dos +OLD_FILES+=usr/libdata/msdosfs/koi2dos +OLD_FILES+=usr/libdata/msdosfs/koi8u2dos +# The following files are *not* obsolete, they just don't get touched at +# install, so don't add them: +# - boot/loader.rc +# - usr/share/tmac/man.local +# - usr/share/tmac/mm/locale +# - usr/share/tmac/mm/se_locale +# - var/yp/Makefile + +# 20060729: OpenSSL 0.9.7e -> 0.9.8b upgrade +OLD_LIBS+=lib/libcrypto.so.4 +OLD_LIBS+=usr/lib/libssl.so.4 # 20060521: gethostbyaddr(3) ABI change OLD_LIBS+=usr/lib/libroken.so.8 OLD_LIBS+=lib/libatm.so.3 @@ -2950,7 +3153,14 @@ # 199909XX OLD_LIBS+=usr/lib/libc_r.so.3 # ??? +OLD_LIBS+=usr/lib/libarchive.so.2 +OLD_LIBS+=usr/lib/libbsnmp.so.1 +OLD_LIBS+=usr/lib/libc_r.so.6 +OLD_LIBS+=usr/lib/libcipher.so.2 OLD_LIBS+=usr/lib/libgssapi.so.6 +OLD_LIBS+=usr/lib/libkse.so.1 +OLD_LIBS+=usr/lib/liblwres.so.3 +OLD_LIBS+=usr/lib/pam_ftp.so.2 # 20040925: bind9 import OLD_DIRS+=usr/share/doc/bind/html ==== //depot/projects/trustedbsd/audit3/contrib/ipfilter/BSD/Makefile#4 (text+ko) ==== @@ -3,12 +3,13 @@ # # See the IPFILTER.LICENCE file for details on licencing. # +TOP=../.. BINDEST=/usr/sbin SBINDEST=/sbin MANDIR=/usr/share/man SEARCHDIRS!=echo $(BINDEST) $(SBINDEST) /bin /usr/bin /sbin /usr/sbin /usr/local/bin /usr/local/sbin | awk '{for(i=1;i&1 | sed -n 's/.*devfs.*/-DDEVFS/p' CPU!=uname -m INC=-I/usr/include -I/sys -I/sys/sys -I/sys/arch -DEF=-D$(CPU) -D__$(CPU)__ -DINET -DKERNEL -D_KERNEL $(INC) $(DEVFS) +DEF=-D$(CPU) -D__$(CPU)__ -DINET -DKERNEL -D_KERNEL $(INC) $(DEVFS) -fno-builtin IPDEF=$(DEF) -DGATEWAY -DDIRECTED_BROADCAST VNODESHDIR=/sys/kern MLD=$(ML) @@ -516,8 +517,8 @@ (cd $(TOP)/man; make INSTALL=$(INSTALL) MANDIR=$(MANDIR) install; cd $(TOP)) coverage: - ksh -c 'for i in *.da; do j=$${i%%.da}.c; gcov $$j 2>&1 | egrep -v "y.tab.c|Could|Creating|_l\.c|\.h"; done' | sort -n > report - sort -n report | perl -e 'while(<>) { next if (/^0.00/); s/\%//g; @F=split;$$lc+=$$F[2];$$t += $$F[0]/100*$$F[2];} printf "%d of %d = %d%%\n", $$t, $$lc,$$t/$$lc*100;' >> report + ksh -c 'for i in *.da; do j=$${i%%.da}.c; gcov $$j 2>&1 | egrep -v "y.tab.c|Could|Creating|_l\.c|\.h"; done' | sort -k 1n -k 3n > report + sort -k 1n -k 3n report | perl -e 'while(<>) { next if (/^0.00/); s/\%//g; @F=split;$$lc+=$$F[2];$$t += ($$F[0]/100)*$$F[2];} printf "%d of %d = %d%%\n", $$t, $$lc,($$t/$$lc)*100;' >> report clean-coverage: /bin/rm -f *.gcov *.da ==== //depot/projects/trustedbsd/audit3/contrib/ipfilter/HISTORY#5 (text+ko) ==== @@ -10,6 +10,88 @@ # and especially those who have found the time to port IP Filter to new # platforms. # +4.1.13 - Released 4 April 2006 + +fix bug where null pointers introduced by proxies could cause a crash + +pass out the rule flags with SIOCAUTHW + +force loading NAT rules with bad proxy labels to cause an error + +nat_state is used unsafely in calls to fr_addstate + +make return-rst and return-icmp* work with auth rules + +4.1.12 - Released 28 March 2006 + +poll support on FreeBSD/NetBSD needs to use selrecord/selwakeup + +make the fastroute code used by ipftest invoke state/NAT + +move verbose/debug macros out of fil.c and into ip_fil.h (for wider use) + +remove unused code in fr_fastroute + +fix NAT with rules that specify forward and reverise interfaces + +add missing ipfsync_canread() and ipfsync_canwrite() + +behaviour of \ on the end of a line in ipf.conf does not match older behaviour + +remove duplicate statistics line output with "ipfstat -s" +4.1.11 - Released 19 March 2006 + +Patch for NAT with ipfsync from N. Ersen (SESCI) - www.enderunix.org + +NetBSD coverity report fixes (from run 5) + +Possible to reacquire ipf_auth without releasing it in some circumstances + +Locking in FreeBSD's iplioctl for ipf_global isn't present like it shoudl be + +Add poll support for platforms I can build on: NetBSD, FreeBSD, Solaris, Linux + +Using auth rules to return "keep state" got broken with pushing fr_addstate +call into fr_firewall + +all use of '!' in map/rdr rules to match use in ipf configs + +add -L command line option to ipmon to set the default syslog facility + +looking up a port number is more complex than needed in ipft_tx.c + +allow lib/getport to work when neither tcp or udp are specified in a rule + +remove some dead code from lib/addicmpc, lib/facpri.c, lib/icmpcode.c + +program in some more cases where TCP packets fail an initial in-window +check but should be allowed to match + +filter rule added with NAT/state handling of SIOCSTPUT doesn't properly +initialise all fields, making it possible to panic + +simplify NAT ICMP error handling where it updates checksums + +rename "min" variables to "xmin" on NetBSD to avoid problems with the +macro "min" + +#ifdef's for NetBSD compile incorrect for pfil interface + +support select/poll on NetBSD + +copying out a packet with an auth rule fails (EFAULT) because the wrong +pointer is passed to copyoutptr + +ip_len/ip_off where byte swapped twice instead of once for packets +going to be stored on the auth queue + +change timeout queue manipulation functions to make fewer mutex calls + +fix use of skip rules with groups +fix coding problems discovered by the coverity project for FreeBSD + +update BPF program validation with FreeBSD changes + 4.1.10 - Released 6 December 2005 Expand regression testing to cover more features ==== //depot/projects/trustedbsd/audit3/contrib/ipfilter/Makefile#5 (text+ko) ==== @@ -5,8 +5,8 @@ # provided that this notice is preserved and due credit is given # to the original author and the contributors. # -# $FreeBSD: src/contrib/ipfilter/Makefile,v 1.5 2005/12/30 11:52:22 guido Exp $ -# Id: Makefile,v 2.76.2.13 2004/11/08 18:42:40 darrenr Exp +# $FreeBSD: src/contrib/ipfilter/Makefile,v 1.6 2006/08/16 12:23:00 guido Exp $ +# Id: Makefile,v 2.76.2.19 2006/03/17 10:38:38 darrenr Exp $ # SHELL=/bin/sh BINDEST=/usr/local/bin @@ -135,6 +135,7 @@ @echo "freebsd3 - compile for FreeBSD-3.x" @echo "freebsd4 - compile for FreeBSD-4.x" @echo "freebsd5 - compile for FreeBSD-5.x" + @echo "freebsd6 - compile for FreeBSD-6.x" @echo "bsd - compile for generic 4.4BSD systems" @echo "bsdi - compile for BSD/OS" @echo "irix - compile for SGI IRIX" @@ -187,7 +188,7 @@ fi make freebsd20 -freebsd5: include +freebsd5 freebsd6: include if [ x$(INET6) = x ] ; then \ echo "#undef INET6" > opt_inet6.h; \ else \ ==== //depot/projects/trustedbsd/audit3/contrib/ipfilter/bpf_filter.c#3 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/contrib/ipfilter/bpf_filter.c,v 1.4 2005/12/30 11:52:22 guido Exp $ */ +/* $FreeBSD: src/contrib/ipfilter/bpf_filter.c,v 1.5 2006/08/16 12:23:00 guido Exp $ */ /*- * Copyright (c) 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997 @@ -42,7 +42,7 @@ #if !(defined(lint) || defined(KERNEL) || defined(_KERNEL)) static const char rcsid[] = - "@(#) $Header: /devel/CVS/IP-Filter/bpf_filter.c,v 2.2.2.1 2005/06/18 02:41:30 darrenr Exp $ (LBL)"; + "@(#) $Header: /devel/CVS/IP-Filter/bpf_filter.c,v 2.2.2.2 2005/12/30 12:57:28 darrenr Exp $ (LBL)"; #endif #include @@ -468,9 +468,10 @@ /* * Return true if the 'fcode' is a valid filter program. * The constraints are that each jump be forward and to a valid - * code. The code must terminate with either an accept or reject. - * 'valid' is an array for use by the routine (it must be at least - * 'len' bytes long). + * code, that memory accesses are within valid ranges (to the + * extent that this can be checked statically; loads of packet + * data have to be, and are, also checked at run time), and that + * the code terminates with either an accept or reject. * * The kernel needs to be able to verify an application's filter code. * Otherwise, a bogus program could easily crash the system. @@ -480,38 +481,114 @@ struct bpf_insn *f; int len; { - register int i; - register struct bpf_insn *p; + u_int i, from; + const struct bpf_insn *p; + + if (len == 0) + return 1; + + if (len < 1 || len > BPF_MAXINSNS) + return 0; for (i = 0; i < len; ++i) { + p = &f[i]; + switch (BPF_CLASS(p->code)) { /* - * Check that that jumps are forward, and within - * the code block. + * Check that memory operations use valid addresses. */ - p = &f[i]; - if (BPF_CLASS(p->code) == BPF_JMP) { - register int from = i + 1; - - if (BPF_OP(p->code) == BPF_JA) { - if (from + p->k >= (unsigned)len) + case BPF_LD: + case BPF_LDX: + switch (BPF_MODE(p->code)) { + case BPF_IMM: + break; + case BPF_ABS: + case BPF_IND: + case BPF_MSH: + /* + * More strict check with actual packet length + * is done runtime. + */ +#if 0 + if (p->k >= bpf_maxbufsize) + return 0; +#endif + break; + case BPF_MEM: + if (p->k >= BPF_MEMWORDS) + return 0; + break; + case BPF_LEN: + break; + default: + return 0; + } + break; + case BPF_ST: + case BPF_STX: + if (p->k >= BPF_MEMWORDS) + return 0; + break; + case BPF_ALU: + switch (BPF_OP(p->code)) { + case BPF_ADD: + case BPF_SUB: + case BPF_OR: + case BPF_AND: + case BPF_LSH: + case BPF_RSH: + case BPF_NEG: + break; + case BPF_DIV: + /* + * Check for constant division by 0. + */ + if (BPF_RVAL(p->code) == BPF_K && p->k == 0) return 0; + default: + return 0; } - else if (from + p->jt >= len || from + p->jf >= len) + break; + case BPF_JMP: + /* + * Check that jumps are within the code block, + * and that unconditional branches don't go + * backwards as a result of an overflow. + * Unconditional branches have a 32-bit offset, + * so they could overflow; we check to make + * sure they don't. Conditional branches have + * an 8-bit offset, and the from address is <= + * BPF_MAXINSNS, and we assume that BPF_MAXINSNS + * is sufficiently small that adding 255 to it + * won't overflow. + * + * We know that len is <= BPF_MAXINSNS, and we >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Aug 16 18:37:04 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2C19516A4E5; Wed, 16 Aug 2006 18:37:04 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 06B7216A4DA for ; Wed, 16 Aug 2006 18:37:04 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B16B043D5A for ; Wed, 16 Aug 2006 18:37:03 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7GIb3jM008777 for ; Wed, 16 Aug 2006 18:37:03 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7GIb3at008774 for perforce@freebsd.org; Wed, 16 Aug 2006 18:37:03 GMT (envelope-from millert@freebsd.org) Date: Wed, 16 Aug 2006 18:37:03 GMT Message-Id: <200608161837.k7GIb3at008774@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 104267 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 16 Aug 2006 18:37:04 -0000 http://perforce.freebsd.org/chv.cgi?CH=104267 Change 104267 by millert@millert_macbook on 2006/08/16 18:36:49 g/c mac_copy_kbuf() proto; it was leftover from a previous module data implementation. Affected files ... .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_policy.h#2 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_policy.h#2 (text+ko) ==== @@ -5352,6 +5352,4 @@ #define MAC_NOWAIT 1 /*@}*/ -int mac_copy_kbuf(struct proc *p, void *src, user_addr_t *dst, size_t len); - #endif /* !_SECURITY_MAC_POLICY_H_ */ From owner-p4-projects@FreeBSD.ORG Wed Aug 16 18:39:07 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8E7E716A4E6; Wed, 16 Aug 2006 18:39:07 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 51D1316A4DE for ; Wed, 16 Aug 2006 18:39:07 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id F1F0E43D5A for ; Wed, 16 Aug 2006 18:39:06 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7GId691008876 for ; Wed, 16 Aug 2006 18:39:06 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7GId6ur008873 for perforce@freebsd.org; Wed, 16 Aug 2006 18:39:06 GMT (envelope-from millert@freebsd.org) Date: Wed, 16 Aug 2006 18:39:06 GMT Message-Id: <200608161839.k7GId6ur008873@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 104268 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 16 Aug 2006 18:39:07 -0000 http://perforce.freebsd.org/chv.cgi?CH=104268 Change 104268 by millert@millert_macbook on 2006/08/16 18:38:57 Use struct xsocket, not struct socket. Affected files ... .. //depot/projects/trustedbsd/sedarwin8/policies/mls/mac_mls.c#3 edit .. //depot/projects/trustedbsd/sedarwin8/policies/test/mac_test.c#2 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/policies/mls/mac_mls.c#3 (text+ko) ==== @@ -1464,7 +1464,7 @@ * Labeling event operations: network objects. */ static void -mac_mls_create_socket(struct ucred *cred, struct socket *so, +mac_mls_create_socket(struct ucred *cred, struct xsocket *so, struct label *solabel) { struct mac_mls *source, *dest; @@ -1477,8 +1477,8 @@ static void mac_mls_create_socket_from_socket( - struct socket *oldsock, struct label *oldlabel, - struct socket *newsock, struct label *newlabel) + struct xsocket *oldsock, struct label *oldlabel, + struct xsocket *newsock, struct label *newlabel) { struct mac_mls *source, *dest; @@ -1493,7 +1493,7 @@ } static void -mac_mls_relabel_socket(struct ucred *cred, struct socket *so, +mac_mls_relabel_socket(struct ucred *cred, struct xsocket *so, struct label *oldlabel, struct label *newlabel) { struct mac_mls *source, *dest; @@ -1536,7 +1536,7 @@ } static void -mac_mls_create_mbuf_from_socket(struct socket *so, struct label *socketlabel, +mac_mls_create_mbuf_from_socket(struct xsocket *so, struct label *socketlabel, struct mbuf *m, struct label *mbuflabel) { struct mac_mls *source, *dest; @@ -1556,7 +1556,7 @@ static void mac_mls_set_socket_peer_from_mbuf(struct mbuf *mbuf, struct label *mbuflabel, - struct socket *socket, struct label *socketpeerlabel) + struct xsocket *socket, struct label *socketpeerlabel) { struct mac_mls *source, *dest; @@ -1575,8 +1575,8 @@ } static void -mac_mls_set_socket_peer_from_socket(struct socket *oldsocket, - struct label *oldsocketlabel, struct socket *newsocket, +mac_mls_set_socket_peer_from_socket(struct xsocket *oldsocket, + struct label *oldsocketlabel, struct xsocket *newsocket, struct label *newsocketpeerlabel) { struct mac_mls *source, *dest; @@ -2236,7 +2236,7 @@ } static int -mac_mls_check_socket_accept(struct ucred *cred, struct socket *socket, +mac_mls_check_socket_accept(struct ucred *cred, struct xsocket *socket, struct label *socklabel) { struct mac_mls *subj, *obj; @@ -2254,7 +2254,7 @@ } static int -mac_mls_check_socket_bind(struct ucred *cred, struct socket *socket, +mac_mls_check_socket_bind(struct ucred *cred, struct xsocket *socket, struct label *socklabel, struct sockaddr *addr) { struct mac_mls *subj, *obj; @@ -2272,7 +2272,7 @@ } static int -mac_mls_check_socket_connect(struct ucred *cred, struct socket *socket, +mac_mls_check_socket_connect(struct ucred *cred, struct xsocket *socket, struct label *socklabel, struct sockaddr *addr) { struct mac_mls *subj, *obj; @@ -2297,7 +2297,7 @@ } static int -mac_mls_check_socket_deliver(struct socket *so, struct label *so_label, +mac_mls_check_socket_deliver(struct xsocket *so, struct label *so_label, struct mbuf *m, struct label *m_label) { struct mac_mls *src, *dest; @@ -2324,7 +2324,7 @@ static int mac_mls_check_socket_kqfilter(struct ucred *cred, struct knote *kn, - struct socket *so, struct label *solabel) + struct xsocket *so, struct label *solabel) { struct mac_mls *subj, *obj; @@ -2338,7 +2338,7 @@ } static int -mac_mls_check_socket_listen(struct ucred *cred, struct socket *socket, +mac_mls_check_socket_listen(struct ucred *cred, struct xsocket *socket, struct label *socklabel) { struct mac_mls *subj, *obj; @@ -2356,7 +2356,7 @@ } static int -mac_mls_check_socket_receive(struct ucred *cred, struct socket *socket, +mac_mls_check_socket_receive(struct ucred *cred, struct xsocket *socket, struct label *socklabel) { struct mac_mls *subj, *obj; @@ -2374,7 +2374,7 @@ } static int -mac_mls_check_socket_relabel(struct ucred *cred, struct socket *so, +mac_mls_check_socket_relabel(struct ucred *cred, struct xsocket *so, struct label *socklabel, struct label *newlabel) { struct mac_mls *subj, *obj, *new; @@ -2432,7 +2432,7 @@ } static int -mac_mls_check_socket_select(struct ucred *cred, struct socket *so, +mac_mls_check_socket_select(struct ucred *cred, struct xsocket *so, struct label *socklabel, int which) { struct mac_mls *subj, *obj; @@ -2450,7 +2450,7 @@ } static int -mac_mls_check_socket_send(struct ucred *cred, struct socket *so, +mac_mls_check_socket_send(struct ucred *cred, struct xsocket *so, struct label *socklabel) { struct mac_mls *subj, *obj; @@ -2468,7 +2468,7 @@ } static int -mac_mls_check_socket_stat(struct ucred *cred, struct socket *so, +mac_mls_check_socket_stat(struct ucred *cred, struct xsocket *so, struct label *socklabel) { struct mac_mls *subj, *obj; ==== //depot/projects/trustedbsd/sedarwin8/policies/test/mac_test.c#2 (text+ko) ==== @@ -2328,7 +2328,7 @@ static void -mac_test_create_socket(struct ucred *cred, struct socket *so, +mac_test_create_socket(struct ucred *cred, struct xsocket *so, struct label *solabel) { // KASSERT(thread_funnel_get() == network_flock, @@ -2343,8 +2343,8 @@ static void -mac_test_create_socket_from_socket(struct socket *oldsock, - struct label *oldlabel, struct socket *newsock, +mac_test_create_socket_from_socket(struct xsocket *oldsock, + struct label *oldlabel, struct xsocket *newsock, struct label *newlabel) { // KASSERT(thread_funnel_get() == network_flock, @@ -2393,7 +2393,7 @@ } static void -mac_test_relabel_socket(struct ucred *cred, struct socket *so, +mac_test_relabel_socket(struct ucred *cred, struct xsocket *so, struct label *oldlabel, struct label *newlabel) { // KASSERT(thread_funnel_get() == network_flock, @@ -2408,8 +2408,8 @@ } static void -mac_test_set_socket_peer_from_socket(struct socket *oldsocket, - struct label *oldsocketlabel, struct socket *newsocket, +mac_test_set_socket_peer_from_socket(struct xsocket *oldsocket, + struct label *oldsocketlabel, struct xsocket *newsocket, struct label *newsocketpeerlabel) { // KASSERT(thread_funnel_get() == network_flock, @@ -2435,7 +2435,7 @@ } static int -mac_test_check_socket_accept(struct ucred *cred, struct socket *so, +mac_test_check_socket_accept(struct ucred *cred, struct xsocket *so, struct label *so_label) { // KASSERT(thread_funnel_get() == network_flock, @@ -2450,7 +2450,7 @@ } static int -mac_test_check_socket_bind(struct ucred *cred, struct socket *socket, +mac_test_check_socket_bind(struct ucred *cred, struct xsocket *socket, struct label *socketlabel, struct sockaddr *sockaddr) { // KASSERT(thread_funnel_get() == network_flock, @@ -2465,7 +2465,7 @@ } static int -mac_test_check_socket_connect(struct ucred *cred, struct socket *socket, +mac_test_check_socket_connect(struct ucred *cred, struct xsocket *socket, struct label *socketlabel, struct sockaddr *sockaddr) { // KASSERT(thread_funnel_get() == network_flock, @@ -2493,7 +2493,7 @@ static int mac_test_check_socket_kqfilter(struct ucred *cred, struct knote *kn, - struct socket *so, struct label *socklabel) + struct xsocket *so, struct label *socklabel) { CHECKNULL(cred); @@ -2507,7 +2507,7 @@ } static int -mac_test_check_socket_listen(struct ucred *cred, struct socket *socket, +mac_test_check_socket_listen(struct ucred *cred, struct xsocket *socket, struct label *socketlabel) { // KASSERT(thread_funnel_get() == network_flock, @@ -2522,7 +2522,7 @@ } static int -mac_test_check_socket_receive(struct ucred *cred, struct socket *so, +mac_test_check_socket_receive(struct ucred *cred, struct xsocket *so, struct label *socketlabel) { // KASSERT(thread_funnel_get() == network_flock, @@ -2538,7 +2538,7 @@ static int -mac_test_check_socket_relabel(struct ucred *cred, struct socket *socket, +mac_test_check_socket_relabel(struct ucred *cred, struct xsocket *socket, struct label *oldlabel, struct label *newlabel) { // KASSERT(thread_funnel_get() == network_flock, @@ -2554,7 +2554,7 @@ } static int -mac_test_check_socket_select(struct ucred *cred, struct socket *so, +mac_test_check_socket_select(struct ucred *cred, struct xsocket *so, struct label *socketlabel, int which) { // KASSERT(thread_funnel_get() == network_flock, @@ -2569,7 +2569,7 @@ } static int -mac_test_check_socket_send(struct ucred *cred, struct socket *so, +mac_test_check_socket_send(struct ucred *cred, struct xsocket *so, struct label *socketlabel) { // KASSERT(thread_funnel_get() == network_flock, @@ -2584,7 +2584,7 @@ } static int -mac_test_check_socket_stat(struct ucred *cred, struct socket *so, struct label *solabel) +mac_test_check_socket_stat(struct ucred *cred, struct xsocket *so, struct label *solabel) { // KASSERT(thread_funnel_get() == network_flock, // "mac_test_check_socket_stat: not holding the network funnel!"); @@ -2608,7 +2608,7 @@ } static int -mac_test_check_socket_deliver(struct socket *so, struct label *so_label, +mac_test_check_socket_deliver(struct xsocket *so, struct label *so_label, struct mbuf *m, struct label *m_label) { // KASSERT(thread_funnel_get() == network_flock, @@ -2639,7 +2639,7 @@ static void mac_test_set_socket_peer_from_mbuf(struct mbuf *mbuf, struct label *mbuflabel, - struct socket *socket, struct label *socketpeerlabel) + struct xsocket *socket, struct label *socketpeerlabel) { CHECKNULL(mbuf); CHECKNULL(socket); @@ -2681,7 +2681,7 @@ } static void -mac_test_create_mbuf_from_socket(struct socket *so, struct label *so_label, +mac_test_create_mbuf_from_socket(struct xsocket *so, struct label *so_label, struct mbuf *m, struct label *m_label) { // KASSERT(thread_funnel_get() == network_flock, From owner-p4-projects@FreeBSD.ORG Wed Aug 16 18:41:11 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id F368E16A4E6; Wed, 16 Aug 2006 18:41:10 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 B8B1316A4E2 for ; Wed, 16 Aug 2006 18:41:10 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8687143D53 for ; Wed, 16 Aug 2006 18:41:10 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7GIfAmM009127 for ; Wed, 16 Aug 2006 18:41:10 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7GIfAul009124 for perforce@freebsd.org; Wed, 16 Aug 2006 18:41:10 GMT (envelope-from millert@freebsd.org) Date: Wed, 16 Aug 2006 18:41:10 GMT Message-Id: <200608161841.k7GIfAul009124@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 104270 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 16 Aug 2006 18:41:11 -0000 http://perforce.freebsd.org/chv.cgi?CH=104270 Change 104270 by millert@millert_macbook on 2006/08/16 18:40:36 Fix typo Affected files ... .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/osfmk/ipc/ipc_labelh.h#2 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/osfmk/ipc/ipc_labelh.h#2 (text+ko) ==== @@ -64,7 +64,7 @@ #define lh_unlock io_unlock /* - * Check the number of references the label handle a left. + * Check the number of references the label handle has left. * If there are 0 references and this is a kernel-allocated * label handle, deallocate the associated port. The * storage space for the label handle will be deallocated From owner-p4-projects@FreeBSD.ORG Wed Aug 16 18:42:15 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 905B416A4E0; Wed, 16 Aug 2006 18:42:15 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 6AA0816A4DA for ; Wed, 16 Aug 2006 18:42:15 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 597EF43D77 for ; Wed, 16 Aug 2006 18:42:12 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7GIgCud009217 for ; Wed, 16 Aug 2006 18:42:12 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7GIgCsi009214 for perforce@freebsd.org; Wed, 16 Aug 2006 18:42:12 GMT (envelope-from millert@freebsd.org) Date: Wed, 16 Aug 2006 18:42:12 GMT Message-Id: <200608161842.k7GIgCsi009214@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 104271 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 16 Aug 2006 18:42:15 -0000 http://perforce.freebsd.org/chv.cgi?CH=104271 Change 104271 by millert@millert_macbook on 2006/08/16 18:41:28 Just treat the return value of mac_check_service_access() as 0 or non-zero instead of trying to interpret BSD errno values (which are not visible here). Affected files ... .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/osfmk/kern/security.c#2 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/osfmk/kern/security.c#2 (text+ko) ==== @@ -124,15 +124,7 @@ mac_destroy_task_label(&subjl); mac_destroy_task_label(&objl); - switch (rc) { - case 0: - return KERN_SUCCESS; - case 22: - /* EINVAL */ - return KERN_INVALID_ARGUMENT; - default: - return KERN_NO_ACCESS; - } + return rc ? KERN_NO_ACCESS : KERN_SUCCESS; } kern_return_t @@ -191,15 +183,7 @@ io_unlock (objp); mac_destroy_task_label(&subjl); - switch (rc) { - case 0: - return KERN_SUCCESS; - case 22: - /* EINVAL */ - return KERN_INVALID_ARGUMENT; - default: - return KERN_NO_ACCESS; - } + return rc ? KERN_NO_ACCESS : KERN_SUCCESS; } kern_return_t @@ -248,15 +232,7 @@ io_unlock(objp); ipc_port_multiple_unlock(); - switch (rc) { - case 0: - return KERN_SUCCESS; - case 22: - /* EINVAL */ - return KERN_INVALID_ARGUMENT; - default: - return KERN_NO_ACCESS; - } + return rc ? KERN_NO_ACCESS : KERN_SUCCESS; errout: io_unlocklabel(subp); @@ -314,19 +290,7 @@ io_unlock(objp); ipc_port_multiple_unlock(); - switch (rc) { - case 0: - kr = labelh_new_user(space, &outl, outlabel); - break; - case 22: - /* EINVAL */ - kr = KERN_INVALID_ARGUMENT; - break; - default: - kr = KERN_NO_ACCESS; - break; - } - + kr = rc ? KERN_NO_ACCESS : KERN_SUCCESS; if (kr != KERN_SUCCESS) mac_destroy_port_label(&outl); From owner-p4-projects@FreeBSD.ORG Wed Aug 16 18:47:26 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7976E16A4DE; Wed, 16 Aug 2006 18:47:26 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 47EA616A4DA for ; Wed, 16 Aug 2006 18:47:26 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7243743D5E for ; Wed, 16 Aug 2006 18:47:24 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7GIlOx7009492 for ; Wed, 16 Aug 2006 18:47:24 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7GIlKhF009461 for perforce@freebsd.org; Wed, 16 Aug 2006 18:47:20 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Wed, 16 Aug 2006 18:47:20 GMT Message-Id: <200608161847.k7GIlKhF009461@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 104273 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 16 Aug 2006 18:47:26 -0000 http://perforce.freebsd.org/chv.cgi?CH=104273 Change 104273 by rwatson@rwatson_zoo on 2006/08/16 18:46:58 Integrate TrustedBSD mac2 branch. Affected files ... .. //depot/projects/trustedbsd/mac2/sys/Makefile#2 integrate .. //depot/projects/trustedbsd/mac2/sys/amd64/acpica/madt.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/amd64/amd64/pmap.c#4 integrate .. //depot/projects/trustedbsd/mac2/sys/amd64/amd64/support.S#2 integrate .. //depot/projects/trustedbsd/mac2/sys/amd64/amd64/trap.c#3 integrate .. //depot/projects/trustedbsd/mac2/sys/amd64/include/pmap.h#3 integrate .. //depot/projects/trustedbsd/mac2/sys/amd64/linux32/linux.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/amd64/linux32/linux32_dummy.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/amd64/linux32/linux32_machdep.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/amd64/linux32/linux32_proto.h#3 integrate .. //depot/projects/trustedbsd/mac2/sys/amd64/linux32/linux32_syscall.h#3 integrate .. //depot/projects/trustedbsd/mac2/sys/amd64/linux32/linux32_sysent.c#3 integrate .. //depot/projects/trustedbsd/mac2/sys/amd64/linux32/linux32_sysvec.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/amd64/linux32/syscalls.conf#2 integrate .. //depot/projects/trustedbsd/mac2/sys/amd64/linux32/syscalls.master#3 integrate .. //depot/projects/trustedbsd/mac2/sys/arm/arm/elf_trampoline.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/arm/arm/mem.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/arm/arm/pmap.c#3 integrate .. //depot/projects/trustedbsd/mac2/sys/arm/arm/vm_machdep.c#3 integrate .. //depot/projects/trustedbsd/mac2/sys/arm/at91/at91_st.c#3 integrate .. //depot/projects/trustedbsd/mac2/sys/arm/at91/kb920x_machdep.c#3 integrate .. //depot/projects/trustedbsd/mac2/sys/arm/include/pmap.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/arm/include/sf_buf.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/arm/include/vmparam.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/arm/sa11x0/assabet_machdep.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/arm/xscale/i80321/iq31244_machdep.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/boot/Makefile#2 integrate .. //depot/projects/trustedbsd/mac2/sys/boot/arm/Makefile#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/arm/at91/Makefile.inc#2 integrate .. //depot/projects/trustedbsd/mac2/sys/boot/arm/at91/bootiic/Makefile#2 integrate .. //depot/projects/trustedbsd/mac2/sys/boot/arm/at91/bootiic/arm_init.S#2 integrate .. //depot/projects/trustedbsd/mac2/sys/boot/arm/at91/bootiic/env_vars.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/arm/at91/bootiic/env_vars.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/arm/at91/bootiic/loader_prompt.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/arm/at91/bootiic/loader_prompt.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/arm/at91/bootiic/main.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/boot/arm/at91/libat91/Makefile#2 integrate .. //depot/projects/trustedbsd/mac2/sys/boot/arm/at91/libat91/at91rm9200.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/boot/arm/at91/libat91/at91rm9200_lowlevel.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/boot/arm/at91/libat91/eeprom.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/boot/arm/at91/libat91/eeprom.h#2 delete .. //depot/projects/trustedbsd/mac2/sys/boot/arm/at91/libat91/emac.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/boot/arm/at91/libat91/emac.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/boot/arm/at91/libat91/env_vars.c#2 delete .. //depot/projects/trustedbsd/mac2/sys/boot/arm/at91/libat91/env_vars.h#2 delete .. //depot/projects/trustedbsd/mac2/sys/boot/arm/at91/libat91/lib.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/boot/arm/at91/libat91/loader_prompt.c#2 delete .. //depot/projects/trustedbsd/mac2/sys/boot/arm/at91/libat91/loader_prompt.h#2 delete .. //depot/projects/trustedbsd/mac2/sys/boot/arm/at91/libat91/p_string.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/boot/arm/at91/libat91/p_string.h#2 delete .. //depot/projects/trustedbsd/mac2/sys/boot/arm/at91/libat91/spi_flash.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/arm/at91/libat91/spi_flash.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/boot/arm/at91/libat91/xmodem.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/boot/forth/loader.conf#3 integrate .. //depot/projects/trustedbsd/mac2/sys/cam/scsi/scsi_pass.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/compat/freebsd32/freebsd32_misc.c#3 integrate .. //depot/projects/trustedbsd/mac2/sys/compat/freebsd32/freebsd32_proto.h#3 integrate .. //depot/projects/trustedbsd/mac2/sys/compat/freebsd32/freebsd32_syscall.h#3 integrate .. //depot/projects/trustedbsd/mac2/sys/compat/freebsd32/freebsd32_syscalls.c#3 integrate .. //depot/projects/trustedbsd/mac2/sys/compat/freebsd32/freebsd32_sysent.c#3 integrate .. //depot/projects/trustedbsd/mac2/sys/compat/freebsd32/syscalls.conf#2 integrate .. //depot/projects/trustedbsd/mac2/sys/compat/linprocfs/linprocfs.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/compat/linux/linux_emul.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/compat/linux/linux_emul.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/compat/linux/linux_futex.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/compat/linux/linux_futex.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/compat/linux/linux_misc.c#5 integrate .. //depot/projects/trustedbsd/mac2/sys/compat/linux/linux_signal.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/compat/linux/linux_time.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/compat/linux/linux_util.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/compat/svr4/svr4_proto.h#3 integrate .. //depot/projects/trustedbsd/mac2/sys/compat/svr4/svr4_syscall.h#3 integrate .. //depot/projects/trustedbsd/mac2/sys/compat/svr4/svr4_syscallnames.c#3 integrate .. //depot/projects/trustedbsd/mac2/sys/compat/svr4/svr4_sysent.c#3 integrate .. //depot/projects/trustedbsd/mac2/sys/compat/svr4/syscalls.conf#2 integrate .. //depot/projects/trustedbsd/mac2/sys/conf/files#4 integrate .. //depot/projects/trustedbsd/mac2/sys/conf/files.amd64#3 integrate .. //depot/projects/trustedbsd/mac2/sys/conf/files.i386#3 integrate .. //depot/projects/trustedbsd/mac2/sys/conf/kern.post.mk#2 integrate .. //depot/projects/trustedbsd/mac2/sys/conf/kmod.mk#2 integrate .. //depot/projects/trustedbsd/mac2/sys/conf/options.arm#3 integrate .. //depot/projects/trustedbsd/mac2/sys/contrib/dev/acpica/acfreebsd.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/contrib/ipfilter/netinet/fil.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/contrib/ipfilter/netinet/ip_auth.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/contrib/ipfilter/netinet/ip_auth.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/contrib/ipfilter/netinet/ip_compat.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/contrib/ipfilter/netinet/ip_fil.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/contrib/ipfilter/netinet/ip_frag.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/contrib/ipfilter/netinet/ip_ftp_pxy.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/contrib/ipfilter/netinet/ip_log.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/contrib/ipfilter/netinet/ip_nat.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/contrib/ipfilter/netinet/ip_pptp_pxy.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/contrib/ipfilter/netinet/ip_proxy.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/contrib/ipfilter/netinet/ip_rcmd_pxy.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/contrib/ipfilter/netinet/ip_scan.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/contrib/ipfilter/netinet/ip_state.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/contrib/ipfilter/netinet/ip_sync.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/contrib/ipfilter/netinet/ip_sync.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/contrib/ipfilter/netinet/ipl.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/contrib/ipfilter/netinet/mlfk_ipl.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/acpi_support/acpi_ibm.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/acpica/Osd/OsdMemory.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/acpica/acpi_dock.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/acpica/acpi_hpet.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/acpica/acpi_pci_link.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/acpica/acpi_video.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/ata/ata-chipset.c#3 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/ata/ata-disk.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/ata/ata-pci.h#3 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/ath/if_ath.c#3 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/ath/if_athioctl.h#3 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/bce/if_bce.c#3 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/bge/if_bge.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/bge/if_bgereg.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/em/if_em.c#3 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/em/if_em.h#3 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/em/if_em_hw.c#3 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/em/if_em_hw.h#3 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/exca/excareg.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/hme/if_hme.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/isp/isp.c#3 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/isp/isp_pci.c#3 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/isp/ispvar.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/mii/rgephy.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/nfe/if_nfe.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/pccard/pccard_cis.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/pccbb/pccbb.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/pccbb/pccbb_pci.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/pccbb/pccbbreg.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/sk/if_sk.c#3 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/sound/pci/emu10k1.c#3 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/sound/pci/emu10kx-pcm.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/sound/pci/emu10kx.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/sound/pci/emu10kx.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/sound/pci/ich.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/stge/if_stge.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/dev/ti/if_ti.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/fs/nwfs/nwfs_io.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/fs/smbfs/smbfs_io.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/geom/eli/g_eli.c#3 integrate .. //depot/projects/trustedbsd/mac2/sys/geom/eli/g_eli.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/geom/eli/g_eli_ctl.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/geom/geom_gpt.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/geom/label/g_label.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/geom/label/g_label_msdosfs.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/geom/label/g_label_msdosfs.h#1 branch .. //depot/projects/trustedbsd/mac2/sys/geom/mirror/g_mirror.c#3 integrate .. //depot/projects/trustedbsd/mac2/sys/geom/raid3/g_raid3.c#3 integrate .. //depot/projects/trustedbsd/mac2/sys/i386/acpica/acpi_machdep.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/i386/acpica/acpi_wakeup.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/i386/acpica/madt.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/i386/conf/XBOX#2 integrate .. //depot/projects/trustedbsd/mac2/sys/i386/i386/machdep.c#3 integrate .. //depot/projects/trustedbsd/mac2/sys/i386/i386/pmap.c#4 integrate .. //depot/projects/trustedbsd/mac2/sys/i386/i386/support.s#2 integrate .. //depot/projects/trustedbsd/mac2/sys/i386/i386/trap.c#3 integrate .. //depot/projects/trustedbsd/mac2/sys/i386/ibcs2/ibcs2_isc_syscall.h#3 integrate .. //depot/projects/trustedbsd/mac2/sys/i386/ibcs2/ibcs2_isc_sysent.c#3 integrate .. //depot/projects/trustedbsd/mac2/sys/i386/ibcs2/ibcs2_proto.h#3 integrate .. //depot/projects/trustedbsd/mac2/sys/i386/ibcs2/ibcs2_syscall.h#3 integrate .. //depot/projects/trustedbsd/mac2/sys/i386/ibcs2/ibcs2_sysent.c#3 integrate .. //depot/projects/trustedbsd/mac2/sys/i386/ibcs2/ibcs2_xenix.h#3 integrate .. //depot/projects/trustedbsd/mac2/sys/i386/ibcs2/ibcs2_xenix_syscall.h#3 integrate .. //depot/projects/trustedbsd/mac2/sys/i386/ibcs2/ibcs2_xenix_sysent.c#3 integrate .. //depot/projects/trustedbsd/mac2/sys/i386/ibcs2/syscalls.conf#2 integrate .. //depot/projects/trustedbsd/mac2/sys/i386/ibcs2/syscalls.isc.conf#2 integrate .. //depot/projects/trustedbsd/mac2/sys/i386/ibcs2/syscalls.xenix.conf#2 integrate .. //depot/projects/trustedbsd/mac2/sys/i386/include/pmap.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/i386/isa/clock.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/i386/linux/linux.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/i386/linux/linux_dummy.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/i386/linux/linux_machdep.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/i386/linux/linux_proto.h#3 integrate .. //depot/projects/trustedbsd/mac2/sys/i386/linux/linux_syscall.h#3 integrate .. //depot/projects/trustedbsd/mac2/sys/i386/linux/linux_sysent.c#3 integrate .. //depot/projects/trustedbsd/mac2/sys/i386/linux/linux_sysvec.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/i386/linux/syscalls.conf#2 integrate .. //depot/projects/trustedbsd/mac2/sys/i386/linux/syscalls.master#3 integrate .. //depot/projects/trustedbsd/mac2/sys/i386/xbox/xbox.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/ia64/include/pmap.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/kern/init_sysent.c#3 integrate .. //depot/projects/trustedbsd/mac2/sys/kern/kern_exec.c#5 integrate .. //depot/projects/trustedbsd/mac2/sys/kern/kern_fork.c#5 integrate .. //depot/projects/trustedbsd/mac2/sys/kern/kern_lock.c#3 integrate .. //depot/projects/trustedbsd/mac2/sys/kern/kern_mutex.c#3 integrate .. //depot/projects/trustedbsd/mac2/sys/kern/kern_subr.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/kern/kern_sx.c#3 integrate .. //depot/projects/trustedbsd/mac2/sys/kern/kern_time.c#5 integrate .. //depot/projects/trustedbsd/mac2/sys/kern/makesyscalls.sh#3 integrate .. //depot/projects/trustedbsd/mac2/sys/kern/subr_turnstile.c#3 integrate .. //depot/projects/trustedbsd/mac2/sys/kern/syscalls.c#3 integrate .. //depot/projects/trustedbsd/mac2/sys/kern/syscalls.master#3 integrate .. //depot/projects/trustedbsd/mac2/sys/kern/systrace_args.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/kern/uipc_proto.c#2 delete .. //depot/projects/trustedbsd/mac2/sys/kern/uipc_sem.c#4 integrate .. //depot/projects/trustedbsd/mac2/sys/kern/uipc_socket.c#6 integrate .. //depot/projects/trustedbsd/mac2/sys/kern/uipc_syscalls.c#6 integrate .. //depot/projects/trustedbsd/mac2/sys/kern/uipc_usrreq.c#7 integrate .. //depot/projects/trustedbsd/mac2/sys/kern/vfs_aio.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/kern/vfs_bio.c#3 integrate .. //depot/projects/trustedbsd/mac2/sys/kern/vfs_subr.c#6 integrate .. //depot/projects/trustedbsd/mac2/sys/libkern/strstr.c#1 branch .. //depot/projects/trustedbsd/mac2/sys/modules/if_ef/Makefile#2 integrate .. //depot/projects/trustedbsd/mac2/sys/modules/if_ppp/Makefile#2 integrate .. //depot/projects/trustedbsd/mac2/sys/modules/linprocfs/Makefile#2 integrate .. //depot/projects/trustedbsd/mac2/sys/modules/linsysfs/Makefile#2 integrate .. //depot/projects/trustedbsd/mac2/sys/modules/linux/Makefile#2 integrate .. //depot/projects/trustedbsd/mac2/sys/modules/netgraph/mppc/Makefile#2 integrate .. //depot/projects/trustedbsd/mac2/sys/modules/sound/sound/Makefile#2 integrate .. //depot/projects/trustedbsd/mac2/sys/net/bpf.c#5 integrate .. //depot/projects/trustedbsd/mac2/sys/net/bridgestp.c#3 integrate .. //depot/projects/trustedbsd/mac2/sys/net/if_tun.c#4 integrate .. //depot/projects/trustedbsd/mac2/sys/net/if_vlan.c#3 integrate .. //depot/projects/trustedbsd/mac2/sys/net80211/ieee80211_input.c#3 integrate .. //depot/projects/trustedbsd/mac2/sys/net80211/ieee80211_ioctl.c#3 integrate .. //depot/projects/trustedbsd/mac2/sys/net80211/ieee80211_ioctl.h#3 integrate .. //depot/projects/trustedbsd/mac2/sys/net80211/ieee80211_output.c#3 integrate .. //depot/projects/trustedbsd/mac2/sys/netgraph/ng_pppoe.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/netgraph/ng_pppoe.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/netinet/tcp_input.c#5 integrate .. //depot/projects/trustedbsd/mac2/sys/netinet/tcp_subr.c#5 integrate .. //depot/projects/trustedbsd/mac2/sys/netinet/tcp_timer.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/netinet/tcp_timer.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/nfsclient/nfs_bio.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/nfsclient/nfs_vfsops.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/pc98/include/md_var.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/pc98/pc98/pc98_machdep.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/pci/agp.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/pci/if_xl.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/sparc64/sparc64/pmap.c#3 integrate .. //depot/projects/trustedbsd/mac2/sys/sys/dirent.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/sys/domain.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/sys/eventhandler.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/sys/imgact.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/sys/libkern.h#3 integrate .. //depot/projects/trustedbsd/mac2/sys/sys/lockmgr.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/sys/param.h#4 integrate .. //depot/projects/trustedbsd/mac2/sys/sys/sx.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/sys/syscall.h#3 integrate .. //depot/projects/trustedbsd/mac2/sys/sys/syscall.mk#3 integrate .. //depot/projects/trustedbsd/mac2/sys/sys/sysctl.h#3 integrate .. //depot/projects/trustedbsd/mac2/sys/sys/sysent.h#3 integrate .. //depot/projects/trustedbsd/mac2/sys/sys/sysproto.h#3 integrate .. //depot/projects/trustedbsd/mac2/sys/vm/device_pager.c#2 integrate .. //depot/projects/trustedbsd/mac2/sys/vm/swap_pager.c#5 integrate .. //depot/projects/trustedbsd/mac2/sys/vm/vm_fault.c#4 integrate .. //depot/projects/trustedbsd/mac2/sys/vm/vm_object.c#3 integrate .. //depot/projects/trustedbsd/mac2/sys/vm/vm_page.c#4 integrate .. //depot/projects/trustedbsd/mac2/sys/vm/vm_page.h#2 integrate .. //depot/projects/trustedbsd/mac2/sys/vm/vnode_pager.c#2 integrate Differences ... ==== //depot/projects/trustedbsd/mac2/sys/Makefile#2 (text+ko) ==== @@ -1,13 +1,11 @@ -# $FreeBSD: src/sys/Makefile,v 1.37 2006/07/04 14:14:16 maxim Exp $ +# $FreeBSD: src/sys/Makefile,v 1.38 2006/08/10 06:29:43 imp Exp $ .include # The boot loader .if ${MK_BOOT} != "no" -.if ${MACHINE_ARCH} != "arm" SUBDIR= boot .endif -.endif # Directories to include in cscope name file and TAGS. CSCOPEDIRS= coda compat conf contrib crypto ddb dev fs geom gnu i4b isa \ ==== //depot/projects/trustedbsd/mac2/sys/amd64/acpica/madt.c#2 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/acpica/madt.c,v 1.20 2006/03/27 15:59:48 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/acpica/madt.c,v 1.21 2006/08/11 19:22:55 jhb Exp $"); #include #include @@ -203,15 +203,15 @@ /* * Map in the RSDP. Since ACPI uses AcpiOsMapMemory() which in turn - * calls pmap_mapdev() to find the RSDP, we assume that we can use - * pmap_mapdev() to map the RSDP. + * calls pmap_mapbios() to find the RSDP, we assume that we can use + * pmap_mapbios() to map the RSDP. */ if (AcpiOsGetRootPointer(ACPI_LOGICAL_ADDRESSING, &rsdp_ptr) != AE_OK) return (ENXIO); #ifdef __i386__ KASSERT(rsdp_ptr.Pointer.Physical < KERNLOAD, ("RSDP too high")); #endif - rsdp = pmap_mapdev(rsdp_ptr.Pointer.Physical, sizeof(RSDP_DESCRIPTOR)); + rsdp = pmap_mapbios(rsdp_ptr.Pointer.Physical, sizeof(RSDP_DESCRIPTOR)); if (rsdp == NULL) { if (bootverbose) printf("MADT: Failed to map RSDP\n"); @@ -261,7 +261,7 @@ break; madt_unmap_table(rsdt); } - pmap_unmapdev((vm_offset_t)rsdp, sizeof(RSDP_DESCRIPTOR)); + pmap_unmapbios((vm_offset_t)rsdp, sizeof(RSDP_DESCRIPTOR)); if (madt_physaddr == 0) { if (bootverbose) printf("MADT: No MADT table found\n"); @@ -335,7 +335,7 @@ madt_setup_local(void) { - madt = pmap_mapdev(madt_physaddr, madt_length); + madt = pmap_mapbios(madt_physaddr, madt_length); lapic_init((uintptr_t)madt->LocalApicAddress); printf("ACPI APIC Table: <%.*s %.*s>\n", (int)sizeof(madt->OemId), madt->OemId, ==== //depot/projects/trustedbsd/mac2/sys/amd64/amd64/pmap.c#4 (text+ko) ==== @@ -77,7 +77,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.569 2006/08/06 06:29:16 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.571 2006/08/14 15:39:41 jhb Exp $"); /* * Manages physical address maps. @@ -665,6 +665,84 @@ * Low level helper routines..... ***************************************************/ +/* + * Determine the appropriate bits to set in a PTE or PDE for a specified + * caching mode. + */ +static int +pmap_cache_bits(int mode, boolean_t is_pde) +{ + int pat_flag, pat_index, cache_bits; + + /* The PAT bit is different for PTE's and PDE's. */ + pat_flag = is_pde ? PG_PDE_PAT : PG_PTE_PAT; + + /* If we don't support PAT, map extended modes to older ones. */ + if (!(cpu_feature & CPUID_PAT)) { + switch (mode) { + case PAT_UNCACHEABLE: + case PAT_WRITE_THROUGH: + case PAT_WRITE_BACK: + break; + case PAT_UNCACHED: + case PAT_WRITE_COMBINING: + case PAT_WRITE_PROTECTED: + mode = PAT_UNCACHEABLE; + break; + } + } + + /* Map the caching mode to a PAT index. */ + switch (mode) { +#ifdef PAT_WORKS + case PAT_UNCACHEABLE: + pat_index = 3; + break; + case PAT_WRITE_THROUGH: + pat_index = 1; + break; + case PAT_WRITE_BACK: + pat_index = 0; + break; + case PAT_UNCACHED: + pat_index = 2; + break; + case PAT_WRITE_COMBINING: + pat_index = 5; + break; + case PAT_WRITE_PROTECTED: + pat_index = 4; + break; +#else + case PAT_UNCACHED: + case PAT_UNCACHEABLE: + case PAT_WRITE_PROTECTED: + pat_index = 3; + break; + case PAT_WRITE_THROUGH: + pat_index = 1; + break; + case PAT_WRITE_BACK: + pat_index = 0; + break; + case PAT_WRITE_COMBINING: + pat_index = 2; + break; +#endif + default: + panic("Unknown caching mode %d\n", mode); + } + + /* Map the 3-bit index value into the PAT, PCD, and PWT bits. */ + cache_bits = 0; + if (pat_index & 0x4) + cache_bits |= pat_flag; + if (pat_index & 0x2) + cache_bits |= PG_NC_PCD; + if (pat_index & 0x1) + cache_bits |= PG_NC_PWT; + return (cache_bits); +} #ifdef SMP /* * For SMP, these functions have to use the IPI mechanism for coherence. @@ -962,6 +1040,15 @@ pte_store(pte, pa | PG_RW | PG_V | PG_G); } +PMAP_INLINE void +pmap_kenter_attr(vm_offset_t va, vm_paddr_t pa, int mode) +{ + pt_entry_t *pte; + + pte = vtopte(va); + pte_store(pte, pa | PG_RW | PG_V | PG_G | pmap_cache_bits(mode, 0)); +} + /* * Remove a page from the kernel pagetables. * Note: not SMP coherent. @@ -3101,6 +3188,46 @@ * Miscellaneous support routines follow */ +/* Adjust the cache mode for a 4KB page mapped via a PTE. */ +static __inline void +pmap_pte_attr(vm_offset_t va, int mode) +{ + pt_entry_t *pte; + u_int opte, npte; + + pte = vtopte(va); + + /* + * The cache mode bits are all in the low 32-bits of the + * PTE, so we can just spin on updating the low 32-bits. + */ + do { + opte = *(u_int *)pte; + npte = opte & ~(PG_PTE_PAT | PG_NC_PCD | PG_NC_PWT); + npte |= pmap_cache_bits(mode, 0); + } while (npte != opte && !atomic_cmpset_int((u_int *)pte, opte, npte)); +} + +/* Adjust the cache mode for a 2MB page mapped via a PDE. */ +static __inline void +pmap_pde_attr(vm_offset_t va, int mode) +{ + pd_entry_t *pde; + u_int opde, npde; + + pde = pmap_pde(kernel_pmap, va); + + /* + * The cache mode bits are all in the low 32-bits of the + * PDE, so we can just spin on updating the low 32-bits. + */ + do { + opde = *(u_int *)pde; + npde = opde & ~(PG_PDE_PAT | PG_NC_PCD | PG_NC_PWT); + npde |= pmap_cache_bits(mode, 1); + } while (npde != opde && !atomic_cmpset_int((u_int *)pde, opde, npde)); +} + /* * Map a set of physical memory pages into the kernel virtual * address space. Return a pointer to where it is mapped. This @@ -3108,12 +3235,15 @@ * NOT real memory. */ void * -pmap_mapdev(vm_paddr_t pa, vm_size_t size) +pmap_mapdev_attr(vm_paddr_t pa, vm_size_t size, int mode) { vm_offset_t va, tmpva, offset; - /* If this fits within the direct map window, use it */ - if (pa < dmaplimit && (pa + size) < dmaplimit) + /* + * If this fits within the direct map window and use WB caching + * mode, use the direct map. + */ + if (pa < dmaplimit && (pa + size) < dmaplimit && mode == PAT_WRITE_BACK) return ((void *)PHYS_TO_DMAP(pa)); offset = pa & PAGE_MASK; size = roundup(offset + size, PAGE_SIZE); @@ -3122,15 +3252,30 @@ panic("pmap_mapdev: Couldn't alloc kernel virtual memory"); pa = trunc_page(pa); for (tmpva = va; size > 0; ) { - pmap_kenter(tmpva, pa); + pmap_kenter_attr(tmpva, pa, mode); size -= PAGE_SIZE; tmpva += PAGE_SIZE; pa += PAGE_SIZE; } pmap_invalidate_range(kernel_pmap, va, tmpva); + pmap_invalidate_cache(); return ((void *)(va + offset)); } +void * +pmap_mapdev(vm_paddr_t pa, vm_size_t size) +{ + + return (pmap_mapdev_attr(pa, size, PAT_UNCACHEABLE)); +} + +void * +pmap_mapbios(vm_paddr_t pa, vm_size_t size) +{ + + return (pmap_mapdev_attr(pa, size, PAT_WRITE_BACK)); +} + void pmap_unmapdev(vm_offset_t va, vm_size_t size) { @@ -3148,6 +3293,73 @@ kmem_free(kernel_map, base, size); } +int +pmap_change_attr(va, size, mode) + vm_offset_t va; + vm_size_t size; + int mode; +{ + vm_offset_t base, offset, tmpva; + pd_entry_t *pde; + pt_entry_t *pte; + + base = va & PG_FRAME; + offset = va & PAGE_MASK; + size = roundup(offset + size, PAGE_SIZE); + + /* Only supported on kernel virtual addresses. */ + if (base <= VM_MAXUSER_ADDRESS) + return (EINVAL); + + /* + * XXX: We have to support tearing 2MB pages down into 4k pages if + * needed here. + */ + /* Pages that aren't mapped aren't supported. */ + for (tmpva = base; tmpva < (base + size); ) { + pde = pmap_pde(kernel_pmap, tmpva); + if (*pde == 0) + return (EINVAL); + if (*pde & PG_PS) { + /* Handle 2MB pages that are completely contained. */ + if (size >= NBPDR) { + tmpva += NBPDR; + continue; + } + return (EINVAL); + } + pte = vtopte(va); + if (*pte == 0) + return (EINVAL); + tmpva += PAGE_SIZE; + } + + /* + * Ok, all the pages exist, so run through them updating their + * cache mode. + */ + for (tmpva = base; size > 0; ) { + pde = pmap_pde(kernel_pmap, tmpva); + if (*pde & PG_PS) { + pmap_pde_attr(tmpva, mode); + tmpva += NBPDR; + size -= NBPDR; + } else { + pmap_pte_attr(tmpva, mode); + tmpva += PAGE_SIZE; + size -= PAGE_SIZE; + } + } + + /* + * Flush CPU caches to make sure any data isn't cached that shouldn't + * be, etc. + */ + pmap_invalidate_range(kernel_pmap, base, tmpva); + pmap_invalidate_cache(); + return (0); +} + /* * perform the pmap work for mincore */ ==== //depot/projects/trustedbsd/mac2/sys/amd64/amd64/support.S#2 (text+ko) ==== @@ -27,7 +27,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/amd64/support.S,v 1.116 2005/09/27 18:32:46 peter Exp $ + * $FreeBSD: src/sys/amd64/amd64/support.S,v 1.118 2006/08/15 22:43:02 davidxu Exp $ */ #include "opt_ddb.h" @@ -432,7 +432,7 @@ ja fusufault movq %rsi,(%rdi) - xorl %eax,%eax + xorq %rax,%rax movq PCPU(CURPCB),%rcx movq %rax,PCB_ONFAULT(%rcx) ret ==== //depot/projects/trustedbsd/mac2/sys/amd64/amd64/trap.c#3 (text+ko) ==== @@ -38,7 +38,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/trap.c,v 1.307 2006/07/28 20:22:57 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/trap.c,v 1.310 2006/08/14 19:53:53 alc Exp $"); /* * AMD64 Trap and System call handling @@ -535,7 +535,7 @@ { vm_offset_t va; struct vmspace *vm = NULL; - vm_map_t map = 0; + vm_map_t map; int rv = 0; vm_prot_t ftype; struct thread *td = curthread; @@ -566,8 +566,14 @@ map = &vm->vm_map; } + /* + * PGEX_I is defined only if the execute disable bit capability is + * supported and enabled. + */ if (frame->tf_err & PGEX_W) ftype = VM_PROT_WRITE; + else if ((frame->tf_err & PGEX_I) && pg_nx != 0) + ftype = VM_PROT_EXECUTE; else ftype = VM_PROT_READ; ==== //depot/projects/trustedbsd/mac2/sys/amd64/include/pmap.h#3 (text+ko) ==== @@ -39,7 +39,7 @@ * * from: hp300: @(#)pmap.h 7.2 (Berkeley) 12/16/90 * from: @(#)pmap.h 7.4 (Berkeley) 5/12/91 - * $FreeBSD: src/sys/amd64/include/pmap.h,v 1.133 2006/08/02 16:24:23 alc Exp $ + * $FreeBSD: src/sys/amd64/include/pmap.h,v 1.134 2006/08/11 19:22:56 jhb Exp $ */ #ifndef _MACHINE_PMAP_H_ @@ -302,14 +302,19 @@ extern vm_offset_t virtual_end; #define pmap_page_is_mapped(m) (!TAILQ_EMPTY(&(m)->md.pv_list)) +#define pmap_unmapbios(va, sz) pmap_unmapdev((va), (sz)) void pmap_bootstrap(vm_paddr_t *); +int pmap_change_attr(vm_offset_t, vm_size_t, int); void pmap_init_pat(void); void pmap_kenter(vm_offset_t va, vm_paddr_t pa); +void pmap_kenter_attr(vm_offset_t va, vm_paddr_t pa, int mode); void *pmap_kenter_temporary(vm_paddr_t pa, int i); vm_paddr_t pmap_kextract(vm_offset_t); void pmap_kremove(vm_offset_t); +void *pmap_mapbios(vm_paddr_t, vm_size_t); void *pmap_mapdev(vm_paddr_t, vm_size_t); +void *pmap_mapdev_attr(vm_paddr_t, vm_size_t, int); void pmap_unmapdev(vm_offset_t, vm_size_t); void pmap_invalidate_page(pmap_t, vm_offset_t); void pmap_invalidate_range(pmap_t, vm_offset_t, vm_offset_t); ==== //depot/projects/trustedbsd/mac2/sys/amd64/linux32/linux.h#2 (text+ko) ==== @@ -27,13 +27,17 @@ * (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/amd64/linux32/linux.h,v 1.2 2006/03/18 18:24:38 netchild Exp $ + * $FreeBSD: src/sys/amd64/linux32/linux.h,v 1.3 2006/08/15 12:54:29 netchild Exp $ */ #ifndef _AMD64_LINUX_LINUX_H_ #define _AMD64_LINUX_LINUX_H_ #include /* for sigval union */ +#include +#include +#include +#include #include @@ -495,6 +499,7 @@ extern int bsd_to_linux_signal[]; extern int linux_to_bsd_signal[]; +extern struct sysentvec elf_linux_sysvec; /* * Pluggable ioctl handlers @@ -527,6 +532,11 @@ #define LINUX_O_NDELAY LINUX_O_NONBLOCK #define LINUX_O_SYNC 010000 #define LINUX_FASYNC 020000 +#define LINUX_O_DIRECT 040000 /* direct disk access hint */ +#define LINUX_O_LARGEFILE 0100000 +#define LINUX_O_DIRECTORY 0200000 /* must be a directory */ +#define LINUX_O_NOFOLLOW 0400000 /* don't follow links */ +#define LINUX_O_NOATIME 01000000 #define LINUX_F_DUPFD 0 #define LINUX_F_GETFD 1 @@ -737,4 +747,99 @@ l_short revents; } __packed; +struct l_user_desc { + l_uint entry_number; + l_uint base_addr; + l_uint limit; + l_uint seg_32bit:1; + l_uint contents:2; + l_uint read_exec_only:1; + l_uint limit_in_pages:1; + l_uint seg_not_present:1; + l_uint useable:1; +}; + +struct l_desc_struct { + unsigned long a,b; +}; + + +#define LINUX_LOWERWORD 0x0000ffff + +/* macros which does the same thing as those in linux include/asm-um/ldt-i386.h + * these convert linux user-space descriptor to machine one + */ +#define LDT_entry_a(info) \ + ((((info)->base_addr & LINUX_LOWERWORD) << 16) | ((info)->limit & LINUX_LOWERWORD)) + +#define ENTRY_B_READ_EXEC_ONLY 9 +#define ENTRY_B_CONTENTS 10 +#define ENTRY_B_SEG_NOT_PRESENT 15 +#define ENTRY_B_BASE_ADDR 16 +#define ENTRY_B_USEABLE 20 +#define ENTRY_B_SEG32BIT 22 +#define ENTRY_B_LIMIT 23 + +#define LDT_entry_b(info) \ + (((info)->base_addr & 0xff000000) | \ + ((info)->limit & 0xf0000) | \ + ((info)->contents << ENTRY_B_CONTENTS) | \ + (((info)->seg_not_present == 0) << ENTRY_B_SEG_NOT_PRESENT) | \ + (((info)->base_addr & 0x00ff0000) >> ENTRY_B_BASE_ADDR) | \ + (((info)->read_exec_only == 0) << ENTRY_B_READ_EXEC_ONLY) | \ + ((info)->seg_32bit << ENTRY_B_SEG32BIT) | \ + ((info)->useable << ENTRY_B_USEABLE) | \ + ((info)->limit_in_pages << ENTRY_B_LIMIT) | 0x7000) + +#define LDT_empty(info) (\ + (info)->base_addr == 0 && \ + (info)->limit == 0 && \ + (info)->contents == 0 && \ + (info)->seg_not_present == 1 && \ + (info)->read_exec_only == 1 && \ + (info)->seg_32bit == 0 && \ + (info)->limit_in_pages == 0 && \ + (info)->useable == 0 ) + +/* macros for converting segments, they do the same as those in arch/i386/kernel/process.c */ +#define GET_BASE(desc) ( \ + (((desc)->a >> 16) & LINUX_LOWERWORD) | \ + (((desc)->b << 16) & 0x00ff0000) | \ + ( (desc)->b & 0xff000000) ) + +#define GET_LIMIT(desc) ( \ + ((desc)->a & LINUX_LOWERWORD) | \ + ((desc)->b & 0xf0000) ) + +#define GET_32BIT(desc) (((desc)->b >> ENTRY_B_SEG32BIT) & 1) +#define GET_CONTENTS(desc) (((desc)->b >> ENTRY_B_CONTENTS) & 3) +#define GET_WRITABLE(desc) (((desc)->b >> ENTRY_B_READ_EXEC_ONLY) & 1) +#define GET_LIMIT_PAGES(desc) (((desc)->b >> ENTRY_B_LIMIT) & 1) +#define GET_PRESENT(desc) (((desc)->b >> ENTRY_B_SEG_NOT_PRESENT) & 1) +#define GET_USEABLE(desc) (((desc)->b >> ENTRY_B_USEABLE) & 1) + +#define LINUX_CLOCK_REALTIME 0 +#define LINUX_CLOCK_MONOTONIC 1 +#define LINUX_CLOCK_PROCESS_CPUTIME_ID 2 +#define LINUX_CLOCK_THREAD_CPUTIME_ID 3 +#define LINUX_CLOCK_REALTIME_HR 4 +#define LINUX_CLOCK_MONOTONIC_HR 5 + +typedef int l_timer_t; +typedef int l_mqd_t; + +#define CLONE_VM 0x100 +#define CLONE_FS 0x200 +#define CLONE_FILES 0x400 +#define CLONE_SIGHAND 0x800 +#define CLONE_PID 0x1000 /* this flag does not exist in linux anymore */ +#define CLONE_PARENT 0x00008000 +#define CLONE_THREAD 0x10000 +#define CLONE_SETTLS 0x80000 +#define CLONE_CHILD_CLEARTID 0x00200000 +#define CLONE_CHILD_SETTID 0x01000000 +#define CLONE_PARENT_SETTID 0x00100000 + +#define THREADING_FLAGS (CLONE_VM | CLONE_FS | CLONE_FILES | CLONE_SIGHAND) + #endif /* !_AMD64_LINUX_LINUX_H_ */ ==== //depot/projects/trustedbsd/mac2/sys/amd64/linux32/linux32_dummy.c#2 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_dummy.c,v 1.3 2006/06/21 08:45:40 netchild Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_dummy.c,v 1.4 2006/08/15 12:54:29 netchild Exp $"); #include #include @@ -72,19 +72,13 @@ DUMMY(epoll_ctl); DUMMY(epoll_wait); DUMMY(remap_file_pages); -DUMMY(set_tid_address); DUMMY(timer_create); DUMMY(timer_settime); DUMMY(timer_gettime); DUMMY(timer_getoverrun); DUMMY(timer_delete); -DUMMY(clock_settime); -DUMMY(clock_gettime); -DUMMY(clock_getres); -DUMMY(clock_nanosleep); DUMMY(statfs64); DUMMY(fstatfs64); -DUMMY(tgkill); DUMMY(utimes); DUMMY(fadvise64_64); DUMMY(mbind); ==== //depot/projects/trustedbsd/mac2/sys/amd64/linux32/linux32_machdep.c#2 (text+ko) ==== @@ -29,12 +29,13 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_machdep.c,v 1.12 2006/03/08 20:21:53 ups Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_machdep.c,v 1.13 2006/08/15 12:54:29 netchild Exp $"); #include #include #include #include +#include #include #include #include @@ -472,12 +473,6 @@ return (0); } -#define CLONE_VM 0x100 -#define CLONE_FS 0x200 -#define CLONE_FILES 0x400 -#define CLONE_SIGHAND 0x800 -#define CLONE_PID 0x1000 - int linux_clone(struct thread *td, struct linux_clone_args *args) { @@ -491,14 +486,9 @@ printf(ARGS(clone, "flags %x, stack %x"), (unsigned int)(uintptr_t)args->flags, (unsigned int)(uintptr_t)args->stack); - if (args->flags & CLONE_PID) - printf(LMSG("CLONE_PID not yet supported")); } #endif - if (!args->stack) - return (EINVAL); - exit_signal = args->flags & 0x000000ff; if (exit_signal >= LINUX_NSIG) return (EINVAL); @@ -522,7 +512,11 @@ p2->p_sigparent = exit_signal; PROC_UNLOCK(p2); td2 = FIRST_THREAD_IN_PROC(p2); - td2->td_frame->tf_rsp = PTROUT(args->stack); + /* in a case of stack = NULL we are supposed to COW calling process stack + * this is what normal fork() does so we just keep the tf_rsp arg intact + */ + if (args->stack) + td2->td_frame->tf_rsp = PTROUT(args->stack); #ifdef DEBUG if (ldebug(clone)) ==== //depot/projects/trustedbsd/mac2/sys/amd64/linux32/linux32_proto.h#3 (text+ko) ==== @@ -2,8 +2,8 @@ * System call prototypes. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/amd64/linux32/linux32_proto.h,v 1.19 2006/07/28 19:08:35 jhb Exp $ - * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.18 2006/07/28 19:05:26 jhb Exp + * $FreeBSD: src/sys/amd64/linux32/linux32_proto.h,v 1.21 2006/08/15 17:36:58 jhb Exp $ + * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.19 2006/08/15 12:28:14 netchild Exp */ #ifndef _LINUX_SYSPROTO_H_ @@ -11,11 +11,10 @@ #include #include -#include -#include #include +#include -#include +#include struct proc; @@ -197,6 +196,9 @@ char dev_l_[PADL_(l_dev_t)]; l_dev_t dev; char dev_r_[PADR_(l_dev_t)]; char ubuf_l_[PADL_(struct l_ustat *)]; struct l_ustat * ubuf; char ubuf_r_[PADR_(struct l_ustat *)]; }; +struct linux_getppid_args { + register_t dummy; +}; struct linux_sigaction_args { char sig_l_[PADL_(l_int)]; l_int sig; char sig_r_[PADR_(l_int)]; char nsa_l_[PADL_(l_osigaction_t *)]; l_osigaction_t * nsa; char nsa_r_[PADR_(l_osigaction_t *)]; @@ -368,6 +370,9 @@ struct linux_clone_args { char flags_l_[PADL_(l_int)]; l_int flags; char flags_r_[PADR_(l_int)]; char stack_l_[PADL_(void *)]; void * stack; char stack_r_[PADR_(void *)]; + char parent_tidptr_l_[PADL_(void *)]; void * parent_tidptr; char parent_tidptr_r_[PADR_(void *)]; + char dummy_l_[PADL_(int)]; int dummy; char dummy_r_[PADR_(int)]; + char child_tidptr_l_[PADL_(void *)]; void * child_tidptr; char child_tidptr_r_[PADR_(void *)]; }; struct linux_newuname_args { char buf_l_[PADL_(struct l_new_utsname *)]; struct l_new_utsname * buf; char buf_r_[PADR_(struct l_new_utsname *)]; @@ -668,6 +673,9 @@ char cmd_l_[PADL_(l_uint)]; l_uint cmd; char cmd_r_[PADR_(l_uint)]; char arg_l_[PADL_(uintptr_t)]; uintptr_t arg; char arg_r_[PADR_(uintptr_t)]; }; +struct linux_gettid_args { + register_t dummy; +}; struct linux_setxattr_args { register_t dummy; }; @@ -704,9 +712,24 @@ struct linux_fremovexattr_args { register_t dummy; }; +struct linux_tkill_args { + char tid_l_[PADL_(int)]; int tid; char tid_r_[PADR_(int)]; + char sig_l_[PADL_(int)]; int sig; char sig_r_[PADR_(int)]; +}; +struct linux_sys_futex_args { >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Aug 16 19:29:20 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E178E16A4DE; Wed, 16 Aug 2006 19:29:19 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 A627216A4E1 for ; Wed, 16 Aug 2006 19:29:19 +0000 (UTC) (envelope-from bushman@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5043543D45 for ; Wed, 16 Aug 2006 19:29:19 +0000 (GMT) (envelope-from bushman@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7GJTJLh014799 for ; Wed, 16 Aug 2006 19:29:19 GMT (envelope-from bushman@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7GJTICG014796 for perforce@freebsd.org; Wed, 16 Aug 2006 19:29:18 GMT (envelope-from bushman@freebsd.org) Date: Wed, 16 Aug 2006 19:29:18 GMT Message-Id: <200608161929.k7GJTICG014796@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bushman@freebsd.org using -f From: Michael Bushkov To: Perforce Change Reviews Cc: Subject: PERFORCE change 104278 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 16 Aug 2006 19:29:20 -0000 http://perforce.freebsd.org/chv.cgi?CH=104278 Change 104278 by bushman@bushman_nss_ldap_cached on 2006/08/16 19:28:36 share/mk branched Affected files ... .. //depot/projects/soc2006/nss_ldap_cached/src/share/mk/Makefile#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/share/mk/bsd.README#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/share/mk/bsd.compat.mk#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/share/mk/bsd.cpu.mk#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/share/mk/bsd.dep.mk#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/share/mk/bsd.doc.mk#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/share/mk/bsd.endian.mk#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/share/mk/bsd.files.mk#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/share/mk/bsd.incs.mk#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/share/mk/bsd.info.mk#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/share/mk/bsd.init.mk#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/share/mk/bsd.kmod.mk#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/share/mk/bsd.lib.mk#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/share/mk/bsd.libnames.mk#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/share/mk/bsd.links.mk#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/share/mk/bsd.man.mk#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/share/mk/bsd.nls.mk#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/share/mk/bsd.obj.mk#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/share/mk/bsd.own.mk#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/share/mk/bsd.pkg.mk#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/share/mk/bsd.port.mk#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/share/mk/bsd.port.post.mk#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/share/mk/bsd.port.pre.mk#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/share/mk/bsd.port.subdir.mk#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/share/mk/bsd.prog.mk#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/share/mk/bsd.snmpmod.mk#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/share/mk/bsd.subdir.mk#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/share/mk/bsd.sys.mk#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/share/mk/sys.mk#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/share/mk/version_gen.awk#1 branch Differences ... From owner-p4-projects@FreeBSD.ORG Wed Aug 16 19:30:22 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E6AC816A4DD; Wed, 16 Aug 2006 19:30:21 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 AC61816A4E0 for ; Wed, 16 Aug 2006 19:30:21 +0000 (UTC) (envelope-from bushman@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4B21743D49 for ; Wed, 16 Aug 2006 19:30:21 +0000 (GMT) (envelope-from bushman@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7GJULRH014914 for ; Wed, 16 Aug 2006 19:30:21 GMT (envelope-from bushman@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7GJUKnP014911 for perforce@freebsd.org; Wed, 16 Aug 2006 19:30:20 GMT (envelope-from bushman@freebsd.org) Date: Wed, 16 Aug 2006 19:30:20 GMT Message-Id: <200608161930.k7GJUKnP014911@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bushman@freebsd.org using -f From: Michael Bushkov To: Perforce Change Reviews Cc: Subject: PERFORCE change 104279 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 16 Aug 2006 19:30:22 -0000 http://perforce.freebsd.org/chv.cgi?CH=104279 Change 104279 by bushman@bushman_nss_ldap_cached on 2006/08/16 19:29:51 IFC Affected files ... .. //depot/projects/soc2006/nss_ldap_cached/src/etc/defaults/rc.conf#4 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/stdlib/malloc.c#5 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/string/strcoll.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/sys/connect.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/sys/getfsstat.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/rpc.lockd/kern.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/rtsold/rtsold.8#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/yppush/yppush_main.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/Makefile#2 edit .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/nss_ldap/ldapconn.h#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/nss_ldap/nss_ldap.5#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/share/mk/Makefile#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/share/mk/bsd.README#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/share/mk/bsd.compat.mk#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/share/mk/bsd.cpu.mk#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/share/mk/bsd.dep.mk#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/share/mk/bsd.doc.mk#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/share/mk/bsd.endian.mk#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/share/mk/bsd.files.mk#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/share/mk/bsd.incs.mk#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/share/mk/bsd.info.mk#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/share/mk/bsd.init.mk#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/share/mk/bsd.kmod.mk#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/share/mk/bsd.lib.mk#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/share/mk/bsd.libnames.mk#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/share/mk/bsd.links.mk#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/share/mk/bsd.man.mk#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/share/mk/bsd.nls.mk#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/share/mk/bsd.obj.mk#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/share/mk/bsd.own.mk#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/share/mk/bsd.pkg.mk#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/share/mk/bsd.port.mk#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/share/mk/bsd.port.post.mk#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/share/mk/bsd.port.pre.mk#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/share/mk/bsd.port.subdir.mk#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/share/mk/bsd.prog.mk#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/share/mk/bsd.snmpmod.mk#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/share/mk/bsd.subdir.mk#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/share/mk/bsd.sys.mk#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/share/mk/sys.mk#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/share/mk/version_gen.awk#1 branch Differences ... ==== //depot/projects/soc2006/nss_ldap_cached/src/etc/defaults/rc.conf#4 (text+ko) ==== @@ -15,7 +15,7 @@ # For a more detailed explanation of all the rc.conf variables, please # refer to the rc.conf(5) manual page. # -# $FreeBSD: src/etc/defaults/rc.conf,v 1.291 2006/08/05 20:28:50 njl Exp $ +# $FreeBSD: src/etc/defaults/rc.conf,v 1.292 2006/08/16 17:14:52 brooks Exp $ ############################################################## ### Important initial Boot-time options #################### @@ -40,7 +40,7 @@ kldxref_module_path="" # Override kern.module_path. A ';'-delimited list. powerd_enable="NO" # Run powerd to lower our power usage. powerd_flags="" # Flags to powerd (if enabled). -removable_route_flush="YES" # Flush routes when removing an interface +removable_route_flush="NO" # Flush routes when removing an interface tmpmfs="AUTO" # Set to YES to always create an mfs /tmp, NO to never tmpsize="20m" # Size of mfs /tmp if created tmpmfs_flags="-S -M" # Extra mdmfs options for the mfs /tmp ==== //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/stdlib/malloc.c#5 (text+ko) ==== @@ -185,7 +185,7 @@ #endif #include -__FBSDID("$FreeBSD: src/lib/libc/stdlib/malloc.c,v 1.133 2006/08/09 19:01:27 marcel Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/stdlib/malloc.c,v 1.134 2006/08/13 21:54:47 cperciva Exp $"); #include "libc_private.h" #ifdef MALLOC_DEBUG @@ -3495,7 +3495,7 @@ num_size = num * size; if (num_size == 0) { - if (opt_sysv == false) + if ((opt_sysv == false) && ((num == 0) || (size == 0))) num_size = 1; else { ret = NULL; ==== //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/string/strcoll.3#2 (text+ko) ==== @@ -34,7 +34,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)strcoll.3 8.1 (Berkeley) 6/4/93 -.\" $FreeBSD: src/lib/libc/string/strcoll.3,v 1.12 2002/10/15 10:11:53 tjr Exp $ +.\" $FreeBSD: src/lib/libc/string/strcoll.3,v 1.13 2006/08/14 08:21:27 dd Exp $ .\" .Dd June 4, 1993 .Dt STRCOLL 3 @@ -56,13 +56,16 @@ .Fa s1 and .Fa s2 -according to the current locale collation if any, otherwise call -.Fa strcmp , +according to the current locale collation and returns an integer greater than, equal to, or less than 0, according as .Fa s1 is greater than, equal to, or less than .Fa s2 . +If information about the current locale collation is not available, +the value of +.Fn strcmp s1 s2 +is returned. .Sh SEE ALSO .Xr setlocale 3 , .Xr strcmp 3 , ==== //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/sys/connect.2#2 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)connect.2 8.1 (Berkeley) 6/4/93 -.\" $FreeBSD: src/lib/libc/sys/connect.2,v 1.26 2004/07/02 19:07:30 ru Exp $ +.\" $FreeBSD: src/lib/libc/sys/connect.2,v 1.27 2006/08/16 02:56:51 wes Exp $ .\" .Dd June 4, 1993 .Dt CONNECT 2 @@ -130,6 +130,15 @@ constant or the .Dv INADDR_NONE return value) through a socket that does not provide broadcast functionality. +.It Bq Er EAGAIN +An auto-assigned port number was requested but no auto-assigned ports +are available. Increasing the port range specified by +.Xr sysctl 3 +MIB variables +.Dq Va net.inet.ip.portrange.first +and +.Dq Va net.inet.ip.portrange.last +may alleviate the problem. .El .Pp The following errors are specific to connecting names in the UNIX domain. @@ -154,7 +163,9 @@ .Xr getpeername 2 , .Xr getsockname 2 , .Xr select 2 , -.Xr socket 2 +.Xr socket 2 , +.Xr sysctl 3 , +.Xr sysctl 8 .Sh HISTORY The .Fn connect ==== //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/sys/getfsstat.2#2 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)getfsstat.2 8.3 (Berkeley) 5/25/95 -.\" $FreeBSD: src/lib/libc/sys/getfsstat.2,v 1.17 2004/07/16 01:18:13 alfred Exp $ +.\" $FreeBSD: src/lib/libc/sys/getfsstat.2,v 1.18 2006/08/15 18:17:03 pjd Exp $ .\" .Dd November 20, 2003 .Dt GETFSSTAT 2 @@ -61,7 +61,7 @@ .Pp Fields that are undefined for a particular file system are set to -1. The buffer is filled with an array of -.Fa fsstat +.Fa statfs structures, one for each mounted file system up to the byte count specified by .Fa bufsize . @@ -94,7 +94,7 @@ unable to respond. .Sh RETURN VALUES Upon successful completion, the number of -.Fa fsstat +.Fa statfs structures is returned. Otherwise, -1 is returned and the global variable .Va errno ==== //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/rpc.lockd/kern.c#2 (text+ko) ==== @@ -29,7 +29,7 @@ */ #include -__FBSDID("$FreeBSD: src/usr.sbin/rpc.lockd/kern.c,v 1.19 2006/05/27 02:37:37 rodrigc Exp $"); +__FBSDID("$FreeBSD: src/usr.sbin/rpc.lockd/kern.c,v 1.20 2006/08/16 18:33:35 thomas Exp $"); #include #include @@ -147,8 +147,10 @@ case -1: err(1, "fork"); case 0: + setproctitle ("client"); break; default: + setproctitle ("server"); return (child); } ==== //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/rtsold/rtsold.8#2 (text+ko) ==== @@ -27,7 +27,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/usr.sbin/rtsold/rtsold.8,v 1.15 2005/02/09 18:04:42 ru Exp $ +.\" $FreeBSD: src/usr.sbin/rtsold/rtsold.8,v 1.16 2006/08/14 08:49:08 dd Exp $ .\" .Dd May 17, 1998 .Dt RTSOLD 8 @@ -169,25 +169,24 @@ .It Fl D Enable more debugging including the printing of internal timer information. .It Fl f -.Fl f -prevents +Prevent .Nm from becoming a daemon (foreground mode). Warning messages are generated to standard error instead of .Xr syslog 3 . .It Fl F -Configure -.Xr sysctl 8 -variable related to +Explicitly configure the kernel to accept Router Advertisements and +disable IPv6 forwarding. +These settings are required for proper .Nm -by itself. -Without -.Fl F , -.Nm -will not alter and obey the current -.Xr sysctl 8 -settings. +operation. +Without this option, the current settings will be obeyed; +if they are incompatible with proper operation, +warning messages will be generated, +but Router Solicitations will still be sent. +The settings may be changed manually with +.Xr sysctl 8 . .It Fl m Enable mobility support. If this option is specified, ==== //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/yppush/yppush_main.c#2 (text+ko) ==== @@ -31,13 +31,14 @@ */ #include -__FBSDID("$FreeBSD: src/usr.sbin/yppush/yppush_main.c,v 1.20 2005/04/12 15:02:57 thomas Exp $"); +__FBSDID("$FreeBSD: src/usr.sbin/yppush/yppush_main.c,v 1.22 2006/08/16 12:58:41 thomas Exp $"); #include #include #include #include #include +#include #include #include #include @@ -60,17 +61,16 @@ char *yppush_mapname = NULL; /* Map to transfer. */ char *yppush_domain = NULL; /* Domain in which map resides. */ char *yppush_master = NULL; /* Master NIS server for said domain. */ +int skip_master = 0; /* Do not attempt to push map to master. */ int verbose = 0; /* Toggle verbose mode. */ unsigned long yppush_transid = 0; int yppush_timeout = 80; /* Default timeout. */ -int yppush_jobs = 0; /* Number of allowed concurrent jobs. */ +int yppush_jobs = 1; /* Number of allowed concurrent jobs. */ int yppush_running_jobs = 0; /* Number of currently running jobs. */ -int yppush_alarm_tripped = 0; /* Structure for holding information about a running job. */ struct jobs { unsigned long tid; - int sock; int port; ypxfrstat stat; unsigned long prognum; @@ -82,6 +82,8 @@ struct jobs *yppush_joblist; /* Linked list of running jobs. */ +static int yppush_svc_run(int); + /* * Local error messages. */ @@ -112,19 +114,29 @@ job = yppush_joblist; - while (job) { + while (job != NULL) { if (job->tid == tid) break; job = job->next; } + if (job == NULL) { + yp_error("warning: received callback with invalid transaction ID: %lu", + tid); + return (0); + } + if (job->polled) { - return(0); + yp_error("warning: received callback with duplicate transaction ID: %lu", + tid); + return (0); } - if (verbose > 1) + if (verbose > 1) { yp_error("checking return status: transaction ID: %lu", job->tid); + } + if (status != YPPUSH_SUCC || verbose) { yp_error("transfer of map %s to server %s %s", job->map, job->server, status == YPPUSH_SUCC ? @@ -171,11 +183,7 @@ yp_error("%d transfer%sstill pending", still_pending, still_pending > 1 ? "s " : " "); - yppush_alarm_tripped = 0; - alarm(YPPUSH_RESPONSE_TIMEOUT); - pause(); - alarm(0); - if (yppush_alarm_tripped == 1) { + if (yppush_svc_run (YPPUSH_RESPONSE_TIMEOUT) == 0) { yp_error("timed out"); now = 1; } @@ -207,42 +215,31 @@ static void handler(int sig) { - if (sig == SIGTERM || sig == SIGINT || sig == SIGABRT) { - yppush_joblist = NULL; - yppush_exit(1); - } - - if (sig == SIGALRM) { - alarm(0); - yppush_alarm_tripped++; - } - + yppush_exit (1); return; } /* * Dispatch loop for callback RPC services. + * Return value: + * -1 error + * 0 timeout + * >0 request serviced */ -static void -yppush_svc_run(void) +static int +yppush_svc_run(int timeout_secs) { -#ifdef FD_SETSIZE + int rc; fd_set readfds; -#else - int readfds; -#endif /* def FD_SETSIZE */ struct timeval timeout; timeout.tv_usec = 0; - timeout.tv_sec = 5; + timeout.tv_sec = timeout_secs; retry: -#ifdef FD_SETSIZE readfds = svc_fdset; -#else - readfds = svc_fds; -#endif /* def FD_SETSIZE */ - switch (select(_rpc_dtablesize(), &readfds, NULL, NULL, &timeout)) { + rc = select(svc_maxfd + 1, &readfds, NULL, NULL, &timeout); + switch (rc) { case -1: if (errno == EINTR) goto retry; @@ -255,28 +252,10 @@ svc_getreqset(&readfds); break; } - return; + return rc; } /* - * Special handler for asynchronous socket I/O. We mark the - * sockets of the callback handlers as O_ASYNC and handle SIGIO - * events here, which will occur when the callback handler has - * something interesting to tell us. - */ -static void -async_handler(int sig) -{ - yppush_svc_run(); - - /* reset any pending alarms. */ - alarm(0); - yppush_alarm_tripped++; - kill(getpid(), SIGALRM); - return; -} - -/* * RPC service routines for callbacks. */ void * @@ -394,9 +373,17 @@ SVCXPRT *xprt; struct jobs *job; + /* Register the job in our linked list of jobs. */ + + /* First allocate job structure */ + if ((job = (struct jobs *)malloc(sizeof (struct jobs))) == NULL) { + yp_error("malloc failed"); + yppush_exit (1); + } + /* - * Register the callback service on the first free - * transient program number. + * Register the callback service on the first free transient + * program number. */ xprt = svcudp_create(sock); for (prognum = 0x40000000; prognum < 0x5FFFFFFF; prognum++) { @@ -404,18 +391,15 @@ yppush_xfrrespprog_1, IPPROTO_UDP) == TRUE) break; } - - /* Register the job in our linked list of jobs. */ - if ((job = (struct jobs *)malloc(sizeof (struct jobs))) == NULL) { - yp_error("malloc failed"); - yppush_exit(1); + if (prognum == 0x5FFFFFFF) { + yp_error ("can't register yppush_xfrrespprog_1"); + yppush_exit (1); } /* Initialize the info for this job. */ job->stat = 0; job->tid = tid; job->port = xprt->xp_port; - job->sock = xprt->xp_fd; /*XXX: Evil!! EEEEEEEVIL!!! */ job->server = strdup(server); job->map = strdup(map); job->prognum = prognum; @@ -423,27 +407,6 @@ job->next = yppush_joblist; yppush_joblist = job; - /* - * Set the RPC sockets to asynchronous mode. This will - * cause the system to smack us with a SIGIO when an RPC - * callback is delivered. This in turn allows us to handle - * the callback even though we may be in the middle of doing - * something else at the time. - * - * XXX This is a horrible thing to do for two reasons, - * both of which have to do with portability: - * 1) We really ought not to be sticking our grubby mits - * into the RPC service transport handle like this. - * 2) Even in this day and age, there are still some *NIXes - * that don't support async socket I/O. - */ - if (fcntl(xprt->xp_fd, F_SETOWN, getpid()) == -1 || - fcntl(xprt->xp_fd, F_SETFL, O_ASYNC) == -1) { - yp_error("failed to set async I/O mode: %s", - strerror(errno)); - yppush_exit(1); - } - if (verbose) { yp_error("initiating transfer: %s -> %s (transid = %lu)", yppush_mapname, server, tid); @@ -451,7 +414,7 @@ /* * Send the XFR request to ypserv. We don't have to wait for - * a response here since we can handle them asynchronously. + * a response here since we handle them asynchronously. */ if (yppush_send_xfr(job)){ @@ -480,29 +443,16 @@ return (status); snprintf(server, sizeof(server), "%.*s", vallen, val); + if (skip_master && strcasecmp(server, yppush_master) == 0) + return (0); /* - * Restrict the number of concurrent jobs. If yppush_jobs number + * Restrict the number of concurrent jobs: if yppush_jobs number * of jobs have already been dispatched and are still pending, * wait for one of them to finish so we can reuse its slot. */ - if (yppush_jobs <= 1) { - yppush_alarm_tripped = 0; - while (!yppush_alarm_tripped && yppush_running_jobs) { - alarm(yppush_timeout); - yppush_alarm_tripped = 0; - pause(); - alarm(0); - } - } else { - yppush_alarm_tripped = 0; - while (!yppush_alarm_tripped && yppush_running_jobs >= yppush_jobs) { - alarm(yppush_timeout); - yppush_alarm_tripped = 0; - pause(); - alarm(0); - } - } + while (yppush_running_jobs >= yppush_jobs && (yppush_svc_run (yppush_timeout) > 0)) + ; /* Cleared for takeoff: set everything in motion. */ if (yp_push(server, yppush_mapname, yppush_transid)) @@ -615,7 +565,13 @@ yppush_exit(1); } - if (strncmp(myname, data.data, data.size)) { + if (strncasecmp(myname, data.data, data.size) == 0) { + /* I am master server, and no explicit host list was + specified: do not push map to myself -- this will + fail with YPPUSH_AGE anyway. */ + if (yppush_hostlist == NULL) + skip_master = 1; + } else { yp_error("warning: this host is not the master for %s", yppush_mapname); #ifdef NITPICKY @@ -628,26 +584,8 @@ yppush_master[data.size] = '\0'; /* Install some handy handlers. */ - signal(SIGALRM, handler); signal(SIGTERM, handler); signal(SIGINT, handler); - signal(SIGABRT, handler); - - /* - * Set up the SIGIO handler. Make sure that some of the - * other signals are blocked while the handler is running so - * select() doesn't get interrupted. - */ - sigemptyset(&sa.sa_mask); - sigaddset(&sa.sa_mask, SIGIO); /* Goes without saying. */ - sigaddset(&sa.sa_mask, SIGPIPE); - sigaddset(&sa.sa_mask, SIGCHLD); - sigaddset(&sa.sa_mask, SIGALRM); - sigaddset(&sa.sa_mask, SIGINT); - sa.sa_handler = async_handler; - sa.sa_flags = 0; - - sigaction(SIGIO, &sa, NULL); /* set initial transaction ID */ yppush_transid = time((time_t *)NULL); ==== //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/Makefile#2 (text+ko) ==== @@ -11,12 +11,13 @@ # libcrypt must be built before libkrb5 and libpam. # libkvm must be built before libdevstat. # msun must be built before libg++ and libstdc++. +# libldap must be built before nss_ldap # libmd must be built before libatm, libopie, libradius, and libtacplus. # libncurses must be built before libdialog, libedit and libreadline. # libnetgraph must be built before libbsnmp/modules/snmp_netgraph. # libnssutil must be built before nss_files/nss_dns/nss_nis/nss_compat # libnss_files must be built before libnss_compat -# nssfiles/nss_dns/nss_nis/nss_compat/nss_icmp must be built before libc +# nssfiles/nss_dns/nss_nis/nss_ldap/nss_compat/nss_icmp must be built before libc # libopie must be built before libpam. # libradius must be built before libpam. # librpcsvc must be built before libpam. @@ -27,8 +28,8 @@ # # Otherwise, the SUBDIR list should be in alphabetical order. -SUBDIR= ${_csu} libbsm libcom_err libcrypt libkvm msun libmd libncurses \ - libnssutil nss_files nss_compat nss_dns nss_icmp ${_nss_nis}\ +SUBDIR= ${_csu} libbsm libcom_err libcrypt libkvm msun libmd libncurses ${_libldap}\ + libnssutil nss_compat nss_dns nss_files nss_icmp ${_nss_ldap} ${_nss_nis}\ libnetgraph libradius librpcsvc libsbuf libtacplus libutil \ ${_libypclnt} libalias libarchive ${_libatm} \ libbegemot ${_libbluetooth} libbsnmp libbz2 libc ${_libc_r} \ @@ -132,4 +133,12 @@ _libgpib= libgpib .endif +.if ${MK_OPENLDAP} != "no" +_libldap= libldap +.endif + +.if ${MK_NSS_LDAP} != "no" +_nss_ldap= nss_ldap +.endif + .include ==== //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/nss_ldap/ldapconn.h#2 (text+ko) ==== @@ -30,10 +30,10 @@ #define _LDAPCONN_H_ /* TODO: remove in release */ -#define NSS_LDAP_START_TLS_ENABLED -#define NSS_LDAP_SSL_ENABLED #define NSS_LDAP_SIMPLE_AUTH_ENABLED +#ifdef SASL #define NSS_LDAP_SASL_AUTH_ENABLED +#endif #define NSS_LDAP_MAX_ERR_DESC_SIZE 256 /* TODO: is this correct? */ From owner-p4-projects@FreeBSD.ORG Wed Aug 16 19:38:32 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A3EA516A4E0; Wed, 16 Aug 2006 19:38:32 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 804FF16A4DA for ; Wed, 16 Aug 2006 19:38:32 +0000 (UTC) (envelope-from bushman@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 381E743D4C for ; Wed, 16 Aug 2006 19:38:32 +0000 (GMT) (envelope-from bushman@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7GJcWS5015396 for ; Wed, 16 Aug 2006 19:38:32 GMT (envelope-from bushman@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7GJcWRn015393 for perforce@freebsd.org; Wed, 16 Aug 2006 19:38:32 GMT (envelope-from bushman@freebsd.org) Date: Wed, 16 Aug 2006 19:38:32 GMT Message-Id: <200608161938.k7GJcWRn015393@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bushman@freebsd.org using -f From: Michael Bushkov To: Perforce Change Reviews Cc: Subject: PERFORCE change 104280 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 16 Aug 2006 19:38:32 -0000 http://perforce.freebsd.org/chv.cgi?CH=104280 Change 104280 by bushman@bushman_nss_ldap_cached on 2006/08/16 19:37:46 src/Makfile.inc1 branched to allow libldap prebuild. Affected files ... .. //depot/projects/soc2006/nss_ldap_cached/src/Makefile.inc1#1 branch Differences ... From owner-p4-projects@FreeBSD.ORG Wed Aug 16 19:39:34 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BEBD716A4E1; Wed, 16 Aug 2006 19:39:34 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 9CACA16A4DD for ; Wed, 16 Aug 2006 19:39:34 +0000 (UTC) (envelope-from bushman@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4174543D53 for ; Wed, 16 Aug 2006 19:39:34 +0000 (GMT) (envelope-from bushman@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7GJdYDN015440 for ; Wed, 16 Aug 2006 19:39:34 GMT (envelope-from bushman@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7GJdXog015437 for perforce@freebsd.org; Wed, 16 Aug 2006 19:39:33 GMT (envelope-from bushman@freebsd.org) Date: Wed, 16 Aug 2006 19:39:33 GMT Message-Id: <200608161939.k7GJdXog015437@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bushman@freebsd.org using -f From: Michael Bushkov To: Perforce Change Reviews Cc: Subject: PERFORCE change 104281 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 16 Aug 2006 19:39:35 -0000 http://perforce.freebsd.org/chv.cgi?CH=104281 Change 104281 by bushman@bushman_nss_ldap_cached on 2006/08/16 19:39:02 IFC Affected files ... .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/Makefile.inc1#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/defaults/rc.conf#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/stdlib/malloc.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/string/strcoll.3#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/sys/connect.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/sys/getfsstat.2#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/rpc.lockd/kern.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/rtsold/rtsold.8#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/yppush/yppush_main.c#2 integrate Differences ... ==== //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/defaults/rc.conf#2 (text+ko) ==== @@ -15,7 +15,7 @@ # For a more detailed explanation of all the rc.conf variables, please # refer to the rc.conf(5) manual page. # -# $FreeBSD: src/etc/defaults/rc.conf,v 1.291 2006/08/05 20:28:50 njl Exp $ +# $FreeBSD: src/etc/defaults/rc.conf,v 1.292 2006/08/16 17:14:52 brooks Exp $ ############################################################## ### Important initial Boot-time options #################### @@ -40,7 +40,7 @@ kldxref_module_path="" # Override kern.module_path. A ';'-delimited list. powerd_enable="NO" # Run powerd to lower our power usage. powerd_flags="" # Flags to powerd (if enabled). -removable_route_flush="YES" # Flush routes when removing an interface +removable_route_flush="NO" # Flush routes when removing an interface tmpmfs="AUTO" # Set to YES to always create an mfs /tmp, NO to never tmpsize="20m" # Size of mfs /tmp if created tmpmfs_flags="-S -M" # Extra mdmfs options for the mfs /tmp ==== //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/stdlib/malloc.c#2 (text+ko) ==== @@ -185,7 +185,7 @@ #endif #include -__FBSDID("$FreeBSD: src/lib/libc/stdlib/malloc.c,v 1.133 2006/08/09 19:01:27 marcel Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/stdlib/malloc.c,v 1.134 2006/08/13 21:54:47 cperciva Exp $"); #include "libc_private.h" #ifdef MALLOC_DEBUG @@ -3495,7 +3495,7 @@ num_size = num * size; if (num_size == 0) { - if (opt_sysv == false) + if ((opt_sysv == false) && ((num == 0) || (size == 0))) num_size = 1; else { ret = NULL; ==== //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/string/strcoll.3#2 (text+ko) ==== @@ -34,7 +34,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)strcoll.3 8.1 (Berkeley) 6/4/93 -.\" $FreeBSD: src/lib/libc/string/strcoll.3,v 1.12 2002/10/15 10:11:53 tjr Exp $ +.\" $FreeBSD: src/lib/libc/string/strcoll.3,v 1.13 2006/08/14 08:21:27 dd Exp $ .\" .Dd June 4, 1993 .Dt STRCOLL 3 @@ -56,13 +56,16 @@ .Fa s1 and .Fa s2 -according to the current locale collation if any, otherwise call -.Fa strcmp , +according to the current locale collation and returns an integer greater than, equal to, or less than 0, according as .Fa s1 is greater than, equal to, or less than .Fa s2 . +If information about the current locale collation is not available, +the value of +.Fn strcmp s1 s2 +is returned. .Sh SEE ALSO .Xr setlocale 3 , .Xr strcmp 3 , ==== //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/sys/connect.2#2 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)connect.2 8.1 (Berkeley) 6/4/93 -.\" $FreeBSD: src/lib/libc/sys/connect.2,v 1.26 2004/07/02 19:07:30 ru Exp $ +.\" $FreeBSD: src/lib/libc/sys/connect.2,v 1.27 2006/08/16 02:56:51 wes Exp $ .\" .Dd June 4, 1993 .Dt CONNECT 2 @@ -130,6 +130,15 @@ constant or the .Dv INADDR_NONE return value) through a socket that does not provide broadcast functionality. +.It Bq Er EAGAIN +An auto-assigned port number was requested but no auto-assigned ports +are available. Increasing the port range specified by +.Xr sysctl 3 +MIB variables +.Dq Va net.inet.ip.portrange.first +and +.Dq Va net.inet.ip.portrange.last +may alleviate the problem. .El .Pp The following errors are specific to connecting names in the UNIX domain. @@ -154,7 +163,9 @@ .Xr getpeername 2 , .Xr getsockname 2 , .Xr select 2 , -.Xr socket 2 +.Xr socket 2 , +.Xr sysctl 3 , +.Xr sysctl 8 .Sh HISTORY The .Fn connect ==== //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/sys/getfsstat.2#2 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)getfsstat.2 8.3 (Berkeley) 5/25/95 -.\" $FreeBSD: src/lib/libc/sys/getfsstat.2,v 1.17 2004/07/16 01:18:13 alfred Exp $ +.\" $FreeBSD: src/lib/libc/sys/getfsstat.2,v 1.18 2006/08/15 18:17:03 pjd Exp $ .\" .Dd November 20, 2003 .Dt GETFSSTAT 2 @@ -61,7 +61,7 @@ .Pp Fields that are undefined for a particular file system are set to -1. The buffer is filled with an array of -.Fa fsstat +.Fa statfs structures, one for each mounted file system up to the byte count specified by .Fa bufsize . @@ -94,7 +94,7 @@ unable to respond. .Sh RETURN VALUES Upon successful completion, the number of -.Fa fsstat +.Fa statfs structures is returned. Otherwise, -1 is returned and the global variable .Va errno ==== //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/rpc.lockd/kern.c#2 (text+ko) ==== @@ -29,7 +29,7 @@ */ #include -__FBSDID("$FreeBSD: src/usr.sbin/rpc.lockd/kern.c,v 1.19 2006/05/27 02:37:37 rodrigc Exp $"); +__FBSDID("$FreeBSD: src/usr.sbin/rpc.lockd/kern.c,v 1.20 2006/08/16 18:33:35 thomas Exp $"); #include #include @@ -147,8 +147,10 @@ case -1: err(1, "fork"); case 0: + setproctitle ("client"); break; default: + setproctitle ("server"); return (child); } ==== //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/rtsold/rtsold.8#2 (text+ko) ==== @@ -27,7 +27,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/usr.sbin/rtsold/rtsold.8,v 1.15 2005/02/09 18:04:42 ru Exp $ +.\" $FreeBSD: src/usr.sbin/rtsold/rtsold.8,v 1.16 2006/08/14 08:49:08 dd Exp $ .\" .Dd May 17, 1998 .Dt RTSOLD 8 @@ -169,25 +169,24 @@ .It Fl D Enable more debugging including the printing of internal timer information. .It Fl f -.Fl f -prevents +Prevent .Nm from becoming a daemon (foreground mode). Warning messages are generated to standard error instead of .Xr syslog 3 . .It Fl F -Configure -.Xr sysctl 8 -variable related to +Explicitly configure the kernel to accept Router Advertisements and +disable IPv6 forwarding. +These settings are required for proper .Nm -by itself. -Without -.Fl F , -.Nm -will not alter and obey the current -.Xr sysctl 8 -settings. +operation. +Without this option, the current settings will be obeyed; +if they are incompatible with proper operation, +warning messages will be generated, +but Router Solicitations will still be sent. +The settings may be changed manually with +.Xr sysctl 8 . .It Fl m Enable mobility support. If this option is specified, ==== //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/yppush/yppush_main.c#2 (text+ko) ==== @@ -31,13 +31,14 @@ */ #include -__FBSDID("$FreeBSD: src/usr.sbin/yppush/yppush_main.c,v 1.20 2005/04/12 15:02:57 thomas Exp $"); +__FBSDID("$FreeBSD: src/usr.sbin/yppush/yppush_main.c,v 1.22 2006/08/16 12:58:41 thomas Exp $"); #include #include #include #include #include +#include #include #include #include @@ -60,17 +61,16 @@ char *yppush_mapname = NULL; /* Map to transfer. */ char *yppush_domain = NULL; /* Domain in which map resides. */ char *yppush_master = NULL; /* Master NIS server for said domain. */ +int skip_master = 0; /* Do not attempt to push map to master. */ int verbose = 0; /* Toggle verbose mode. */ unsigned long yppush_transid = 0; int yppush_timeout = 80; /* Default timeout. */ -int yppush_jobs = 0; /* Number of allowed concurrent jobs. */ +int yppush_jobs = 1; /* Number of allowed concurrent jobs. */ int yppush_running_jobs = 0; /* Number of currently running jobs. */ -int yppush_alarm_tripped = 0; /* Structure for holding information about a running job. */ struct jobs { unsigned long tid; - int sock; int port; ypxfrstat stat; unsigned long prognum; @@ -82,6 +82,8 @@ struct jobs *yppush_joblist; /* Linked list of running jobs. */ +static int yppush_svc_run(int); + /* * Local error messages. */ @@ -112,19 +114,29 @@ job = yppush_joblist; - while (job) { + while (job != NULL) { if (job->tid == tid) break; job = job->next; } + if (job == NULL) { + yp_error("warning: received callback with invalid transaction ID: %lu", + tid); + return (0); + } + if (job->polled) { - return(0); + yp_error("warning: received callback with duplicate transaction ID: %lu", + tid); + return (0); } - if (verbose > 1) + if (verbose > 1) { yp_error("checking return status: transaction ID: %lu", job->tid); + } + if (status != YPPUSH_SUCC || verbose) { yp_error("transfer of map %s to server %s %s", job->map, job->server, status == YPPUSH_SUCC ? @@ -171,11 +183,7 @@ yp_error("%d transfer%sstill pending", still_pending, still_pending > 1 ? "s " : " "); - yppush_alarm_tripped = 0; - alarm(YPPUSH_RESPONSE_TIMEOUT); - pause(); - alarm(0); - if (yppush_alarm_tripped == 1) { + if (yppush_svc_run (YPPUSH_RESPONSE_TIMEOUT) == 0) { yp_error("timed out"); now = 1; } @@ -207,42 +215,31 @@ static void handler(int sig) { - if (sig == SIGTERM || sig == SIGINT || sig == SIGABRT) { - yppush_joblist = NULL; - yppush_exit(1); - } - - if (sig == SIGALRM) { - alarm(0); - yppush_alarm_tripped++; - } - + yppush_exit (1); return; } /* * Dispatch loop for callback RPC services. + * Return value: + * -1 error + * 0 timeout + * >0 request serviced */ -static void -yppush_svc_run(void) +static int +yppush_svc_run(int timeout_secs) { -#ifdef FD_SETSIZE + int rc; fd_set readfds; -#else - int readfds; -#endif /* def FD_SETSIZE */ struct timeval timeout; timeout.tv_usec = 0; - timeout.tv_sec = 5; + timeout.tv_sec = timeout_secs; retry: -#ifdef FD_SETSIZE readfds = svc_fdset; -#else - readfds = svc_fds; -#endif /* def FD_SETSIZE */ - switch (select(_rpc_dtablesize(), &readfds, NULL, NULL, &timeout)) { + rc = select(svc_maxfd + 1, &readfds, NULL, NULL, &timeout); + switch (rc) { case -1: if (errno == EINTR) goto retry; @@ -255,28 +252,10 @@ svc_getreqset(&readfds); break; } - return; + return rc; } /* - * Special handler for asynchronous socket I/O. We mark the - * sockets of the callback handlers as O_ASYNC and handle SIGIO - * events here, which will occur when the callback handler has - * something interesting to tell us. - */ -static void -async_handler(int sig) -{ - yppush_svc_run(); - - /* reset any pending alarms. */ - alarm(0); - yppush_alarm_tripped++; - kill(getpid(), SIGALRM); - return; -} - -/* * RPC service routines for callbacks. */ void * @@ -394,9 +373,17 @@ SVCXPRT *xprt; struct jobs *job; + /* Register the job in our linked list of jobs. */ + + /* First allocate job structure */ + if ((job = (struct jobs *)malloc(sizeof (struct jobs))) == NULL) { + yp_error("malloc failed"); + yppush_exit (1); + } + /* - * Register the callback service on the first free - * transient program number. + * Register the callback service on the first free transient + * program number. */ xprt = svcudp_create(sock); for (prognum = 0x40000000; prognum < 0x5FFFFFFF; prognum++) { @@ -404,18 +391,15 @@ yppush_xfrrespprog_1, IPPROTO_UDP) == TRUE) break; } - - /* Register the job in our linked list of jobs. */ - if ((job = (struct jobs *)malloc(sizeof (struct jobs))) == NULL) { - yp_error("malloc failed"); - yppush_exit(1); + if (prognum == 0x5FFFFFFF) { + yp_error ("can't register yppush_xfrrespprog_1"); + yppush_exit (1); } /* Initialize the info for this job. */ job->stat = 0; job->tid = tid; job->port = xprt->xp_port; - job->sock = xprt->xp_fd; /*XXX: Evil!! EEEEEEEVIL!!! */ job->server = strdup(server); job->map = strdup(map); job->prognum = prognum; @@ -423,27 +407,6 @@ job->next = yppush_joblist; yppush_joblist = job; - /* - * Set the RPC sockets to asynchronous mode. This will - * cause the system to smack us with a SIGIO when an RPC - * callback is delivered. This in turn allows us to handle - * the callback even though we may be in the middle of doing - * something else at the time. - * - * XXX This is a horrible thing to do for two reasons, - * both of which have to do with portability: - * 1) We really ought not to be sticking our grubby mits - * into the RPC service transport handle like this. - * 2) Even in this day and age, there are still some *NIXes - * that don't support async socket I/O. - */ - if (fcntl(xprt->xp_fd, F_SETOWN, getpid()) == -1 || - fcntl(xprt->xp_fd, F_SETFL, O_ASYNC) == -1) { - yp_error("failed to set async I/O mode: %s", - strerror(errno)); - yppush_exit(1); - } - if (verbose) { yp_error("initiating transfer: %s -> %s (transid = %lu)", yppush_mapname, server, tid); @@ -451,7 +414,7 @@ /* * Send the XFR request to ypserv. We don't have to wait for - * a response here since we can handle them asynchronously. + * a response here since we handle them asynchronously. */ if (yppush_send_xfr(job)){ @@ -480,29 +443,16 @@ return (status); snprintf(server, sizeof(server), "%.*s", vallen, val); + if (skip_master && strcasecmp(server, yppush_master) == 0) + return (0); /* - * Restrict the number of concurrent jobs. If yppush_jobs number + * Restrict the number of concurrent jobs: if yppush_jobs number * of jobs have already been dispatched and are still pending, * wait for one of them to finish so we can reuse its slot. */ - if (yppush_jobs <= 1) { - yppush_alarm_tripped = 0; - while (!yppush_alarm_tripped && yppush_running_jobs) { - alarm(yppush_timeout); - yppush_alarm_tripped = 0; - pause(); - alarm(0); - } - } else { - yppush_alarm_tripped = 0; - while (!yppush_alarm_tripped && yppush_running_jobs >= yppush_jobs) { - alarm(yppush_timeout); - yppush_alarm_tripped = 0; - pause(); - alarm(0); - } - } + while (yppush_running_jobs >= yppush_jobs && (yppush_svc_run (yppush_timeout) > 0)) + ; /* Cleared for takeoff: set everything in motion. */ if (yp_push(server, yppush_mapname, yppush_transid)) @@ -615,7 +565,13 @@ yppush_exit(1); } - if (strncmp(myname, data.data, data.size)) { + if (strncasecmp(myname, data.data, data.size) == 0) { + /* I am master server, and no explicit host list was + specified: do not push map to myself -- this will + fail with YPPUSH_AGE anyway. */ + if (yppush_hostlist == NULL) + skip_master = 1; + } else { yp_error("warning: this host is not the master for %s", yppush_mapname); #ifdef NITPICKY @@ -628,26 +584,8 @@ yppush_master[data.size] = '\0'; /* Install some handy handlers. */ - signal(SIGALRM, handler); signal(SIGTERM, handler); signal(SIGINT, handler); - signal(SIGABRT, handler); - - /* - * Set up the SIGIO handler. Make sure that some of the - * other signals are blocked while the handler is running so - * select() doesn't get interrupted. - */ - sigemptyset(&sa.sa_mask); - sigaddset(&sa.sa_mask, SIGIO); /* Goes without saying. */ - sigaddset(&sa.sa_mask, SIGPIPE); - sigaddset(&sa.sa_mask, SIGCHLD); - sigaddset(&sa.sa_mask, SIGALRM); - sigaddset(&sa.sa_mask, SIGINT); - sa.sa_handler = async_handler; - sa.sa_flags = 0; - - sigaction(SIGIO, &sa, NULL); /* set initial transaction ID */ yppush_transid = time((time_t *)NULL); From owner-p4-projects@FreeBSD.ORG Wed Aug 16 19:46:45 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9B4D616A597; Wed, 16 Aug 2006 19:46:45 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 4C61516A590 for ; Wed, 16 Aug 2006 19:46:45 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id BE59043D58 for ; Wed, 16 Aug 2006 19:46:43 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7GJkhnH015893 for ; Wed, 16 Aug 2006 19:46:43 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7GJkhLl015890 for perforce@freebsd.org; Wed, 16 Aug 2006 19:46:43 GMT (envelope-from millert@freebsd.org) Date: Wed, 16 Aug 2006 19:46:43 GMT Message-Id: <200608161946.k7GJkhLl015890@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 104282 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 16 Aug 2006 19:46:46 -0000 http://perforce.freebsd.org/chv.cgi?CH=104282 Change 104282 by millert@millert_macbook on 2006/08/16 19:46:16 Remove prototype for non-existent mac_check_ipc_semctl function. The actualy function is mac_check_sysv_semctl() (which has its own prototype). Affected files ... .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac.h#3 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac.h#3 (text+ko) ==== @@ -352,8 +352,6 @@ */ int mac_check_ioctl(struct ucred *cred, struct fileproc *fp, int com, void *data); -int mac_check_ipc_semctl(struct ucred *cred, - struct semid_kernel *semakptr, int cmd); int mac_check_sysv_semget(struct ucred *cred, struct semid_kernel *semakptr); int mac_check_sysv_semop(struct ucred *cred,struct semid_kernel *semakptr, From owner-p4-projects@FreeBSD.ORG Wed Aug 16 19:50:53 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B23BD16A4E2; Wed, 16 Aug 2006 19:50:53 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 713BB16A4E0 for ; Wed, 16 Aug 2006 19:50:53 +0000 (UTC) (envelope-from bushman@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id AA2EF43D8A for ; Wed, 16 Aug 2006 19:50:49 +0000 (GMT) (envelope-from bushman@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7GJone6016150 for ; Wed, 16 Aug 2006 19:50:49 GMT (envelope-from bushman@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7GJomeA016145 for perforce@freebsd.org; Wed, 16 Aug 2006 19:50:48 GMT (envelope-from bushman@freebsd.org) Date: Wed, 16 Aug 2006 19:50:48 GMT Message-Id: <200608161950.k7GJomeA016145@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bushman@freebsd.org using -f From: Michael Bushkov To: Perforce Change Reviews Cc: Subject: PERFORCE change 104283 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 16 Aug 2006 19:50:54 -0000 http://perforce.freebsd.org/chv.cgi?CH=104283 Change 104283 by bushman@bushman_nss_ldap_cached on 2006/08/16 19:50:18 OpenLDAP merged into the sources along with nss_ldap. Still have to handle manpages and includes properly. Affected files ... .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/Makefile.inc1#2 edit .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/ANNOUNCEMENT#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/CHANGES#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/COPYRIGHT#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/INSTALL#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/LICENSE#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/Makefile.in#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/README#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/aclocal.m4#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/build/LICENSE-2.0.1#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/build/README#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/build/config.guess#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/build/config.sub#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/build/crupdate#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/build/dir.mk#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/build/info.mk#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/build/lib-shared.mk#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/build/lib-static.mk#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/build/lib.mk#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/build/ltmain.sh#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/build/man.mk#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/build/missing#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/build/mkdep#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/build/mkdep.aix#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/build/mkrelease#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/build/mkvers.bat#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/build/mkversion#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/build/mod.mk#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/build/openldap.m4#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/build/rules.mk#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/build/shtool#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/build/srv.mk#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/build/top.mk#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/build/version.h#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/build/version.sh#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/build/version.var#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/configure#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/configure.in#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/doc/Makefile.in#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/doc/man/Makefile.in#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/doc/man/man1/Makefile.in#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/doc/man/man1/ldapcompare.1#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/doc/man/man1/ldapdelete.1#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/doc/man/man1/ldapmodify.1#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/doc/man/man1/ldapmodify.1.links#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/doc/man/man1/ldapmodrdn.1#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/doc/man/man1/ldappasswd.1#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/doc/man/man1/ldapsearch.1#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/doc/man/man1/ldapwhoami.1#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/doc/man/man3/Makefile.in#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/doc/man/man3/lber-decode.3#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/doc/man/man3/lber-decode.3.links#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/doc/man/man3/lber-encode.3#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/doc/man/man3/lber-encode.3.links#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/doc/man/man3/lber-memory.3#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/doc/man/man3/lber-types.3#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/doc/man/man3/lber-types.3.links#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/doc/man/man3/ldap.3#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/doc/man/man3/ldap_abandon.3#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/doc/man/man3/ldap_abandon.3.links#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/doc/man/man3/ldap_add.3#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/doc/man/man3/ldap_add.3.links#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/doc/man/man3/ldap_bind.3#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/doc/man/man3/ldap_bind.3.links#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/doc/man/man3/ldap_compare.3#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/doc/man/man3/ldap_compare.3.links#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/doc/man/man3/ldap_delete.3#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/doc/man/man3/ldap_delete.3.links#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/doc/man/man3/ldap_error.3#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/doc/man/man3/ldap_error.3.links#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/doc/man/man3/ldap_first_attribute.3#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/doc/man/man3/ldap_first_attribute.3.links#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/doc/man/man3/ldap_first_entry.3#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/doc/man/man3/ldap_first_entry.3.links#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/doc/man/man3/ldap_first_message.3#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/doc/man/man3/ldap_first_message.3.links#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/doc/man/man3/ldap_first_reference.3#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/doc/man/man3/ldap_first_reference.3.links#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/doc/man/man3/ldap_get_dn.3#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/doc/man/man3/ldap_get_dn.3.links#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/doc/man/man3/ldap_get_values.3#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/doc/man/man3/ldap_get_values.3.links#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/doc/man/man3/ldap_modify.3#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/doc/man/man3/ldap_modify.3.links#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/doc/man/man3/ldap_modrdn.3#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/doc/man/man3/ldap_modrdn.3.links#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/doc/man/man3/ldap_open.3#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/doc/man/man3/ldap_open.3.links#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/doc/man/man3/ldap_parse_reference.3#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/doc/man/man3/ldap_parse_result.3#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/doc/man/man3/ldap_parse_result.3.links#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/doc/man/man3/ldap_result.3#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/doc/man/man3/ldap_result.3.links#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/doc/man/man3/ldap_schema.3#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/doc/man/man3/ldap_schema.3.links#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/doc/man/man3/ldap_search.3#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/doc/man/man3/ldap_search.3.links#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/doc/man/man3/ldap_sort.3#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/doc/man/man3/ldap_sort.3.links#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/doc/man/man3/ldap_url.3#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/doc/man/man3/ldap_url.3.links#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/doc/man/man5/Makefile.in#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/doc/man/man5/ldap.conf.5#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/doc/man/man5/ldif.5#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/doc/man/man5/slapd-bdb.5#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/doc/man/man5/slapd-bdb.5.links#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/doc/man/man5/slapd-dnssrv.5#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/doc/man/man5/slapd-ldap.5#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/doc/man/man5/slapd-ldbm.5#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/doc/man/man5/slapd-ldif.5#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/doc/man/man5/slapd-meta.5#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/doc/man/man5/slapd-monitor.5#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/doc/man/man5/slapd-null.5#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/doc/man/man5/slapd-passwd.5#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/doc/man/man5/slapd-perl.5#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/doc/man/man5/slapd-relay.5#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/doc/man/man5/slapd-shell.5#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/doc/man/man5/slapd-sql.5#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/doc/man/man5/slapd-tcl.5#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/doc/man/man5/slapd.access.5#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/doc/man/man5/slapd.conf.5#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/doc/man/man5/slapd.plugin.5#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/doc/man/man5/slapd.replog.5#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/doc/man/man5/slapo-accesslog.5#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/doc/man/man5/slapo-auditlog.5#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/doc/man/man5/slapo-chain.5#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/doc/man/man5/slapo-dynlist.5#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/doc/man/man5/slapo-lastmod.5#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/doc/man/man5/slapo-pcache.5#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/doc/man/man5/slapo-ppolicy.5#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/doc/man/man5/slapo-refint.5#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/doc/man/man5/slapo-retcode.5#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/doc/man/man5/slapo-rwm.5#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/doc/man/man5/slapo-syncprov.5#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/doc/man/man5/slapo-translucent.5#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/doc/man/man5/slapo-unique.5#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/doc/man/man5/slapo-valsort.5#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/doc/man/man8/Makefile.in#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/doc/man/man8/slapacl.8#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/doc/man/man8/slapadd.8#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/doc/man/man8/slapauth.8#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/doc/man/man8/slapcat.8#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/doc/man/man8/slapd.8#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/doc/man/man8/slapdn.8#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/doc/man/man8/slapindex.8#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/doc/man/man8/slappasswd.8#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/doc/man/man8/slaptest.8#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/doc/man/man8/slurpd.8#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/include/Makefile.in#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/include/ac/alloca.h#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/include/ac/assert.h#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/include/ac/bytes.h#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/include/ac/crypt.h#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/include/ac/ctype.h#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/include/ac/dirent.h#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/include/ac/errno.h#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/include/ac/fdset.h#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/include/ac/krb.h#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/include/ac/krb5.h#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/include/ac/localize.h#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/include/ac/param.h#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/include/ac/regex.h#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/include/ac/setproctitle.h#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/include/ac/signal.h#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/include/ac/socket.h#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/include/ac/stdarg.h#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/include/ac/stdlib.h#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/include/ac/string.h#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/include/ac/sysexits.h#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/include/ac/syslog.h#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/include/ac/termios.h#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/include/ac/time.h#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/include/ac/unistd.h#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/include/ac/wait.h#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/include/avl.h#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/include/getopt-compat.h#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/include/lber.h#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/include/lber_pvt.h#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/include/lber_types.hin#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/include/ldap.h#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/include/ldap_cdefs.h#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/include/ldap_config.hin#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/include/ldap_defaults.h#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/include/ldap_features.hin#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/include/ldap_int_thread.h#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/include/ldap_log.h#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/include/ldap_pvt.h#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/include/ldap_pvt_thread.h#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/include/ldap_pvt_uc.h#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/include/ldap_queue.h#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/include/ldap_rq.h#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/include/ldap_schema.h#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/include/ldap_utf8.h#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/include/ldif.h#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/include/lutil.h#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/include/lutil_hash.h#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/include/lutil_ldap.h#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/include/lutil_lockf.h#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/include/lutil_md5.h#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/include/lutil_sha1.h#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/include/portable.hin#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/include/rewrite.h#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/include/slapi-plugin.h#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/include/sysexits-compat.h#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/libraries/Makefile.in#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/libraries/liblber/Makefile.in#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/libraries/liblber/assert.c#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/libraries/liblber/bprint.c#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/libraries/liblber/debug.c#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/libraries/liblber/decode.c#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/libraries/liblber/dtest.c#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/libraries/liblber/encode.c#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/libraries/liblber/etest.c#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/libraries/liblber/idtest.c#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/libraries/liblber/io.c#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/libraries/liblber/lber-int.h#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/libraries/liblber/memory.c#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/libraries/liblber/nt_err.c#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/libraries/liblber/options.c#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/libraries/liblber/sockbuf.c#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/libraries/liblber/stdio.c#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/libraries/libldap/Makefile.in#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/libraries/libldap/abandon.c#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/libraries/libldap/add.c#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/libraries/libldap/addentry.c#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/libraries/libldap/apitest.c#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/libraries/libldap/bind.c#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/libraries/libldap/cancel.c#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/libraries/libldap/charray.c#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/libraries/libldap/compare.c#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/libraries/libldap/controls.c#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/libraries/libldap/cyrus.c#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/libraries/libldap/delete.c#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/libraries/libldap/dnssrv.c#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/libraries/libldap/dntest.c#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/libraries/libldap/error.c#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/libraries/libldap/extended.c#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/libraries/libldap/filter.c#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/libraries/libldap/free.c#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/libraries/libldap/ftest.c#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/libraries/libldap/getattr.c#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/libraries/libldap/getdn.c#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/libraries/libldap/getentry.c#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/libraries/libldap/getvalues.c#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/libraries/libldap/groupings.c#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/libraries/libldap/init.c#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/libraries/libldap/kbind.c#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/libraries/libldap/ldap-int.h#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/libraries/libldap/ldap.conf#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/libraries/libldap/messages.c#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/libraries/libldap/modify.c#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/libraries/libldap/modrdn.c#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/libraries/libldap/open.c#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/libraries/libldap/options.c#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/libraries/libldap/os-ip.c#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/libraries/libldap/os-local.c#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/libraries/libldap/passwd.c#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/libraries/libldap/ppolicy.c#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/libraries/libldap/print.c#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/libraries/libldap/references.c#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/libraries/libldap/request.c#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/libraries/libldap/result.c#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/libraries/libldap/sasl.c#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/libraries/libldap/sbind.c#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/libraries/libldap/schema.c#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/libraries/libldap/search.c#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/libraries/libldap/sort.c#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/libraries/libldap/sortctrl.c#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/libraries/libldap/string.c#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/libraries/libldap/t61.c#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/libraries/libldap/test.c#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/libraries/libldap/tls.c#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/libraries/libldap/turn.c#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/libraries/libldap/txn.c#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/libraries/libldap/unbind.c#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/libraries/libldap/url.c#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/libraries/libldap/utf-8-conv.c#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/libraries/libldap/utf-8.c#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/libraries/libldap/util-int.c#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/libraries/libldap/vlvctrl.c#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/libraries/libldap/whoami.c#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/libraries/libldap_r/Makefile.in#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/libraries/libldap_r/ldap_thr_debug.h#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/libraries/libldap_r/rdwr.c#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/libraries/libldap_r/rq.c#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/libraries/libldap_r/thr_cthreads.c#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/libraries/libldap_r/thr_debug.c#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/libraries/libldap_r/thr_lwp.c#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/libraries/libldap_r/thr_nt.c#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/libraries/libldap_r/thr_posix.c#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/libraries/libldap_r/thr_pth.c#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/libraries/libldap_r/thr_stub.c#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/libraries/libldap_r/thr_thr.c#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/libraries/libldap_r/threads.c#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/libraries/libldap_r/tpool.c#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/libraries/liblunicode/CompositionExclusions.txt#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/libraries/liblunicode/Makefile.in#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/libraries/liblunicode/UCD-Terms#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/libraries/liblunicode/UnicodeData.txt#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/libraries/liblunicode/ucdata/MUTTUCData.txt#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/libraries/liblunicode/ucdata/README#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/libraries/liblunicode/ucdata/api.txt#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/libraries/liblunicode/ucdata/bidiapi.txt#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/libraries/liblunicode/ucdata/format.txt#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/libraries/liblunicode/ucdata/ucdata.c#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/libraries/liblunicode/ucdata/ucdata.h#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/libraries/liblunicode/ucdata/ucdata.man#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/libraries/liblunicode/ucdata/ucgendat.c#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/libraries/liblunicode/ucdata/ucpgba.c#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/libraries/liblunicode/ucdata/ucpgba.h#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/libraries/liblunicode/ucdata/ucpgba.man#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/libraries/liblunicode/ucdata/uctable.h#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/libraries/liblunicode/ucstr.c#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/libraries/liblunicode/ure/README#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/libraries/liblunicode/ure/ure.c#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/libraries/liblunicode/ure/ure.h#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/libraries/liblunicode/ure/urestubs.c#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/libraries/liblunicode/utbm/README#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/libraries/liblunicode/utbm/utbm.c#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/libraries/liblunicode/utbm/utbm.h#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/libraries/liblunicode/utbm/utbmstub.c#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/libraries/liblutil/Makefile.in#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/libraries/liblutil/avl.c#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/libraries/liblutil/base64.c#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/libraries/liblutil/csn.c#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/libraries/liblutil/detach.c#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/libraries/liblutil/entropy.c#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/libraries/liblutil/fetch.c#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/libraries/liblutil/getopt.c#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/libraries/liblutil/getpass.c#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/libraries/liblutil/getpeereid.c#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/libraries/liblutil/hash.c#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/libraries/liblutil/ldif.c#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/libraries/liblutil/lockf.c#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/libraries/liblutil/md5.c#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/libraries/liblutil/memcmp.c#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/libraries/liblutil/ntservice.c#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/libraries/liblutil/passfile.c#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/libraries/liblutil/passwd.c#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/libraries/liblutil/ptest.c#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/libraries/liblutil/sasl.c#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/libraries/liblutil/setproctitle.c#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/libraries/liblutil/sha1.c#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/libraries/liblutil/signal.c#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/libraries/liblutil/slapdmsg.bin#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/libraries/liblutil/slapdmsg.h#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/libraries/liblutil/slapdmsg.mc#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/libraries/liblutil/slapdmsg.rc#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/libraries/liblutil/sockpair.c#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/libraries/liblutil/tavl.c#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/libraries/liblutil/testavl.c#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/libraries/liblutil/utils.c#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/libraries/liblutil/uuid.c#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/libraries/librewrite/Copyright#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/libraries/librewrite/Makefile.in#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/libraries/librewrite/RATIONALE#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/libraries/librewrite/config.c#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/libraries/librewrite/context.c#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/libraries/librewrite/info.c#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/libraries/librewrite/ldapmap.c#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/libraries/librewrite/map.c#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/libraries/librewrite/params.c#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/libraries/librewrite/parse.c#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/libraries/librewrite/rewrite-int.h#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/libraries/librewrite/rewrite-map.h#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/libraries/librewrite/rewrite.c#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/libraries/librewrite/rule.c#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/libraries/librewrite/session.c#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/libraries/librewrite/subst.c#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/libraries/librewrite/var.c#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/contrib/openldap/libraries/librewrite/xmap.c#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libldap/Makefile#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libldap/include/lber_types.h#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libldap/include/ldap_config.h#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libldap/include/ldap_features.h#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libldap/include/portable.h#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libldap/liblber/Makefile#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libldap/libldap/Makefile#1 add .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/nss_ldap/Makefile#2 edit .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/share/mk/bsd.libnames.mk#2 edit .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/share/mk/bsd.own.mk#2 edit Differences ... ==== //depot/projects/soc2006/nss_ldap_cached_openldap/src/Makefile.inc1#2 (text+ko) ==== @@ -1027,6 +1027,10 @@ lib/libradius__L: lib/libmd__L .endif +.if ${MK_OPENLDAP} != "no" +_prebuild_libs+= lib/libldap +.endif + .if ${MK_NIS} != "no" _prebuild_libs+= lib/libypclnt .endif ==== //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/nss_ldap/Makefile#2 (text+ko) ==== @@ -9,14 +9,22 @@ SRCS= nss_ldap.c ldap_group.c ldap_passwd.c ldap_serv.c ldapconn.c\ ldapconf.c ldapschema.c ldapsearch.c ldaptls.c ldaputil.c -CFLAGS+=-I${.CURDIR}/../libnssutil -I/usr/local/include +.if ${MK_INET6_SUPPORT} != "no" CFLAGS+=-DINET6 -CFLAGS+=-g +.endif + +DPADD+= ${LIBLDAP} +LDADD+= -lldap + +.if ${MK_OPENSSL} != "no" +CFLAGS+= -DNSS_LDAP_START_TLS_ENABLED -DNSS_LDAP_SSL_ENABLED +.endif -LDADD+= -lnssutil -lldap -lsasl2 -LDFLAGS+= -L${.OBJDIR}/../libnssutil -L/usr/local/lib +CFLAGS+= ${OPENLDAP_CFLAGS} +LDFLAGS+= ${OPENLDAP_LDFLAGS} +LDADD+= ${OPENLDAP_LDADD} -INCS= -MAN= +INCS= +MAN= nss_ldap.5 .include ==== //depot/projects/soc2006/nss_ldap_cached_openldap/src/share/mk/bsd.libnames.mk#2 (text+ko) ==== @@ -69,6 +69,9 @@ LIBKRB5?= ${DESTDIR}${LIBDIR}/libkrb5.a LIBKVM?= ${DESTDIR}${LIBDIR}/libkvm.a LIBL?= ${DESTDIR}${LIBDIR}/libl.a +.if ${MK_OPENLDAP} != "no" +LIBLDAP?= ${DESTDIR}${LIBDIR}/libldap.a +.endif LIBLN?= "don't use LIBLN, use LIBL" .if ${MK_BIND} != "no" LIBLWRES?= ${DESTDIR}${LIBDIR}/liblwres.a ==== //depot/projects/soc2006/nss_ldap_cached_openldap/src/share/mk/bsd.own.mk#2 (text+ko) ==== @@ -244,7 +244,9 @@ NLS \ NLS_CATALOGS \ NS_CACHING \ + NSS_LDAP \ OBJC \ + OPENLDAP \ OPENSSH \ OPENSSL \ PAM \ @@ -332,7 +334,9 @@ NLS \ NLS_CATALOGS \ NS_CACHING \ + NSS_LDAP \ OBJC \ + OPENLDAP \ OPENSSH \ OPENSSL \ PAM \ @@ -409,6 +413,10 @@ MK_NCP:= no .endif +.if ${MK_OPENLDAP} == "no" +MK_NSS_LDAP:= no +.endif + .if ${MK_OPENSSL} == "no" MK_OPENSSH:= no MK_KERBEROS:= no From owner-p4-projects@FreeBSD.ORG Wed Aug 16 19:53:07 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1F7BD16A4DE; Wed, 16 Aug 2006 19:53:07 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 EE35B16A4E2 for ; Wed, 16 Aug 2006 19:53:06 +0000 (UTC) (envelope-from bushman@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0F30F43D6B for ; Wed, 16 Aug 2006 19:52:53 +0000 (GMT) (envelope-from bushman@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7GJqqxC016263 for ; Wed, 16 Aug 2006 19:52:52 GMT (envelope-from bushman@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7GJqq6g016260 for perforce@freebsd.org; Wed, 16 Aug 2006 19:52:52 GMT (envelope-from bushman@freebsd.org) Date: Wed, 16 Aug 2006 19:52:52 GMT Message-Id: <200608161952.k7GJqq6g016260@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bushman@freebsd.org using -f From: Michael Bushkov To: Perforce Change Reviews Cc: Subject: PERFORCE change 104284 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 16 Aug 2006 19:53:07 -0000 http://perforce.freebsd.org/chv.cgi?CH=104284 Change 104284 by bushman@bushman_nss_ldap_cached on 2006/08/16 19:52:26 Bug fix - couldn't be built with INET6 turned off. Affected files ... .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/net/name6.c#4 edit Differences ... ==== //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/net/name6.c#4 (text+ko) ==== @@ -195,8 +195,8 @@ static struct hostent *_hpcopy(struct hostent *, int *); static struct hostent *_hpaddr(int, const char *, void *, int *); +#ifdef INET6 static struct hostent *_hpmerge(struct hostent *, struct hostent *, int *); -#ifdef INET6 static struct hostent *_hpmapv6(struct hostent *, int *); #endif static struct hostent *_hpsort(struct hostent *, res_state); @@ -522,6 +522,7 @@ return (_hpcopy(hp, errp)); } +#ifdef INET6 /* * _hpmerge: merge 2 hostent structure, arguments will be freed */ @@ -558,17 +559,14 @@ } } aliases[nalias] = NULL; -#ifdef INET6 if (hp1->h_length != hp2->h_length) { hp->h_addrtype = AF_INET6; hp->h_length = sizeof(struct in6_addr); } else { -#endif hp->h_addrtype = hp1->h_addrtype; hp->h_length = hp1->h_length; -#ifdef INET6 } -#endif + hp->h_addr_list = addrs; naddr = 0; for (i = 1; i <= 2; i++) { @@ -589,6 +587,7 @@ addrs[naddr] = NULL; return (_hpcopy(hp, errp)); } +#endif /* * _hpmapv6: convert IPv4 hostent into IPv4-mapped IPv6 addresses From owner-p4-projects@FreeBSD.ORG Wed Aug 16 19:58:11 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7519016A4EA; Wed, 16 Aug 2006 19:58:11 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 3043516A4DF for ; Wed, 16 Aug 2006 19:58:11 +0000 (UTC) (envelope-from bushman@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D585A43E0D for ; Wed, 16 Aug 2006 19:57:09 +0000 (GMT) (envelope-from bushman@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7GJuwFO017466 for ; Wed, 16 Aug 2006 19:56:58 GMT (envelope-from bushman@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7GJuw9M017449 for perforce@freebsd.org; Wed, 16 Aug 2006 19:56:58 GMT (envelope-from bushman@freebsd.org) Date: Wed, 16 Aug 2006 19:56:58 GMT Message-Id: <200608161956.k7GJuw9M017449@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bushman@freebsd.org using -f From: Michael Bushkov To: Perforce Change Reviews Cc: Subject: PERFORCE change 104285 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 16 Aug 2006 19:58:11 -0000 http://perforce.freebsd.org/chv.cgi?CH=104285 Change 104285 by bushman@bushman_nss_ldap_cached on 2006/08/16 19:56:39 Several small fixes and optimizations (basically - memory issues). Affected files ... .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/net/nscache.c#3 edit .. //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_dns/dns_shells.c#3 edit .. //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_dns/nss_dns.c#9 edit .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/cached/Makefile#3 edit .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/cached/agent.c#5 edit .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/cached/agent.h#5 edit .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/cached/agents/Makefile.inc#4 edit .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/cached/agents/group.c#5 edit .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/cached/agents/group.h#4 edit .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/cached/agents/hosts.c#4 edit .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/cached/agents/hosts.h#3 edit .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/cached/agents/net.c#4 edit .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/cached/agents/net.h#3 edit .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/cached/agents/passwd.c#5 edit .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/cached/agents/passwd.h#4 edit .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/cached/agents/proto.c#4 edit .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/cached/agents/proto.h#3 edit .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/cached/agents/rpc.c#4 edit .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/cached/agents/rpc.h#3 edit .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/cached/agents/services.c#5 edit .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/cached/agents/services.h#4 edit .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/cached/cached.8#2 edit .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/cached/cached.c#5 edit .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/cached/cached.conf.5#2 edit .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/cached/cachedcli.c#3 edit .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/cached/cachedcli.h#2 edit .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/cached/cachelib.c#3 edit .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/cached/cachelib.h#2 edit .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/cached/cacheplcs.c#3 edit .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/cached/cacheplcs.h#2 edit .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/cached/config.c#3 edit .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/cached/config.h#3 edit .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/cached/debug.c#2 edit .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/cached/debug.h#4 edit .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/cached/hashtable.h#3 edit .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/cached/log.c#3 edit .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/cached/log.h#3 edit .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/cached/mp_rs_query.c#4 edit .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/cached/mp_rs_query.h#2 edit .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/cached/mp_ws_query.c#3 edit .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/cached/mp_ws_query.h#2 edit .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/cached/parser.c#3 edit .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/cached/parser.h#2 edit .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/cached/protocol.c#2 edit .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/cached/protocol.h#2 edit .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/cached/query.c#4 edit .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/cached/query.h#2 edit .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/cached/singletons.c#2 edit .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/cached/singletons.h#2 edit Differences ... ==== //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/net/nscache.c#3 (text) ==== @@ -89,13 +89,12 @@ break; cache_data->key_size <<= 1; - cache_data->key = reallocf(cache_data->key, - cache_data->key_size); + free(cache_data->key); + cache_data->key = malloc(cache_data->key_size); if (cache_data->key == NULL) { res = NS_UNAVAIL; break; } - memset(cache_data->key, 0, cache_data->key_size); va_copy(ap_new, ap); } } while (res == NS_RETURN); @@ -112,7 +111,6 @@ buffer = (char *)malloc(NSS_CACHE_BUFFER_INITIAL_SIZE); if (buffer == NULL) return (NS_UNAVAIL); - memset(buffer, 0, NSS_CACHE_BUFFER_INITIAL_SIZE); do { connection = __open_cached_connection(¶ms); @@ -125,10 +123,10 @@ &buffer_size); __close_cached_connection(connection); if (res == -2 && buffer_size < NSS_CACHE_BUFFER_SIZE_LIMIT) { - buffer = (char *)reallocf(buffer, buffer_size); + free(buffer); + buffer = (char *)malloc(buffer, buffer_size); if (buffer == NULL) return (NS_UNAVAIL); - memset(buffer, 0, buffer_size); } } while (res == -2); @@ -202,7 +200,6 @@ free(cache_data->key); return (NS_UNAVAIL); } - memset(buffer, 0, NSS_CACHE_BUFFER_INITIAL_SIZE); do { size_t size; @@ -218,12 +215,12 @@ break; buffer_size <<= 1; - buffer = (char *)reallocf(buffer, buffer_size); + free(buffer); + buffer = (char *)malloc(buffer_size); if (buffer == NULL) { res = NS_UNAVAIL; break; } - memset(buffer, 0, buffer_size); } } while (res == NS_RETURN); @@ -318,17 +315,16 @@ cache_info->set_mp_rs_func(rs); return (NS_UNAVAIL); } - memset(buffer, 0, NSS_CACHE_BUFFER_INITIAL_SIZE); do { res = __cached_mp_read(rs, buffer, &buffer_size); if (res == -2 && buffer_size < NSS_CACHE_BUFFER_SIZE_LIMIT) { - buffer = (char *)reallocf(buffer, buffer_size); + free(buffer); + buffer = (char *)malloc(buffer); if (buffer == NULL) { res = -1; break; } - memset(buffer, 0, buffer_size); } } while (res == -2); @@ -376,8 +372,7 @@ buffer = (char *)malloc(NSS_CACHE_BUFFER_INITIAL_SIZE); if (buffer == NULL) return (NS_UNAVAIL); - memset(buffer, 0, NSS_CACHE_BUFFER_INITIAL_SIZE); - + ws = cache_info->get_mp_ws_func(); if (ws == INVALID_CACHED_MP_WRITE_SESSION) { memset(¶ms, 0, sizeof(struct cached_connection_params)); @@ -405,12 +400,12 @@ break; buffer_size <<= 1; - buffer = (char *)reallocf(buffer, buffer_size); + free(buffer); + buffer = (char *)malloc(buffer_size); if (buffer == NULL) { res = NS_UNAVAIL; break; } - memset(buffer, 0, buffer_size); } } while (res == NS_RETURN); ==== //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_dns/dns_shells.c#3 (text+ko) ==== @@ -65,10 +65,12 @@ { free(st); } +#endif int __dns_getusershell_r(void *rv, void *cb_data, va_list ap) { +#ifdef HESIOD struct dns_usershell_state *st; char *buffer; size_t buflen; @@ -127,12 +129,16 @@ } hesiod_end(context); - return (r); + return (r); +#else + return (NS_UNAVAIL); +#endif } int __dns_setusershell(void *rv, void *cb_data, va_list ap) { +#ifdef HESIOD struct dns_usershell_state *st; int r; @@ -141,8 +147,6 @@ return (NS_UNAVAIL); st->counter = 0; - +#endif return (NS_UNAVAIL); } - -#endif ==== //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_dns/nss_dns.c#9 (text+ko) ==== ==== //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/cached/Makefile#3 (text) ==== @@ -8,7 +8,7 @@ SRCS= agent.c cached.c cachedcli.c cachelib.c cacheplcs.c debug.c log.c \ config.c query.c mp_ws_query.c mp_rs_query.c singletons.c protocol.c \ parser.c -CFLAGS+= -g -DCONFIG_PATH="\"${PREFIX}/etc/cached.conf\"" +CFLAGS+= -DCONFIG_PATH="\"${PREFIX}/etc/cached.conf\"" DPADD+=${LIBM} ${LIBPTHREAD} ${LIBUTIL} LDADD+=${LIBM} ${LIBPTHREAD} ${LIBUTIL} LDFLAGS+= -Xlinker --export-dynamic ==== //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/cached/agent.c#5 (text) ==== ==== //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/cached/agent.h#5 (text) ==== ==== //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/cached/agents/Makefile.inc#4 (text) ==== ==== //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/cached/agents/group.c#5 (text) ==== @@ -122,7 +122,7 @@ } memcpy(&new_grp, grp, sizeof(struct group)); - memset(buffer, 0, desired_size); + //memset(buffer, 0, desired_size); *buffer_size = desired_size; p = buffer + sizeof(struct group) + sizeof(char *); @@ -192,7 +192,8 @@ TRACE_OUT(group_lookup_func); return (NS_UNAVAIL); } - memset(name, 0, size); + //memset(name, 0, size); + name[size - 1] = '\0'; memcpy(name, key + sizeof(enum nss_lookup_type), size - 1); break; case nss_lt_id: ==== //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/cached/agents/group.h#4 (text) ==== ==== //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/cached/agents/hosts.c#4 (text+ko) ==== @@ -133,7 +133,7 @@ } memcpy(&new_ht, ht, sizeof(struct hostent)); - memset(buffer, 0, desired_size); + //memset(buffer, 0, desired_size); *buffer_size = desired_size; p = buffer + sizeof(struct hostent) + sizeof(char *); @@ -205,7 +205,7 @@ return (NS_RETURN); } - memset(buffer, 0, desired_size); + //memset(buffer, 0, desired_size); p = buffer; memcpy(p, &ai_size, sizeof(size_t)); @@ -306,7 +306,8 @@ TRACE_OUT(hosts_lookup_func); return (NS_UNAVAIL); } - memset(str, 0, size); + //memset(str, 0, size); + str[size - 1] = '\0'; memcpy(str, key, key_size); old_options = statp->options; @@ -343,7 +344,8 @@ TRACE_OUT(hosts_lookup_func); return (NS_UNAVAIL); } - memset(str, 0, size); + //memset(str, 0, size); + str[size - 1] = '\0'; memcpy(str, key, key_size); break; case nss_lt_id: ==== //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/cached/agents/hosts.h#3 (text+ko) ==== ==== //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/cached/agents/net.c#4 (text+ko) ==== @@ -126,7 +126,7 @@ memcpy(&new_ne, ne, sizeof(struct netent)); *buffer_size = desired_size; - memset(buffer, 0, desired_size); + //memset(buffer, 0, desired_size); p = buffer + sizeof(struct netent) + sizeof(char *); memcpy(buffer + sizeof(struct netent), &p, sizeof(char *)); p = (char *)_ALIGN(p); @@ -188,7 +188,8 @@ TRACE_OUT(networks_lookup_func); return (NS_UNAVAIL); } - memset(name, 0, size); + //memset(name, 0, size); + name[size - 1] = '\0'; memcpy(name, key + sizeof(enum nss_lookup_type), size - 1); break; case nss_lt_id: ==== //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/cached/agents/net.h#3 (text+ko) ==== ==== //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/cached/agents/passwd.c#5 (text) ==== @@ -108,7 +108,7 @@ } memcpy(&new_pwd, pwd, sizeof(struct passwd)); - memset(buffer, 0, desired_size); + //memset(buffer, 0, desired_size); *buffer_size = desired_size; p = buffer + sizeof(struct passwd) + sizeof(char *); @@ -191,7 +191,8 @@ TRACE_OUT(passwd_lookup_func); return (NS_UNAVAIL); } - memset(login, 0, size); + //memset(login, 0, size); + login[size - 1] ='\0'; memcpy(login, key + sizeof(enum nss_lookup_type), size - 1); break; case nss_lt_id: ==== //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/cached/agents/passwd.h#4 (text) ==== ==== //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/cached/agents/proto.c#4 (text+ko) ==== @@ -123,7 +123,7 @@ memcpy(&new_proto, proto, sizeof(struct protoent)); *buffer_size = desired_size; - memset(buffer, 0, desired_size); + //memset(buffer, 0, desired_size); p = buffer + sizeof(struct protoent) + sizeof(char *); memcpy(buffer + sizeof(struct protoent), &p, sizeof(char *)); p = (char *)_ALIGN(p); @@ -184,7 +184,8 @@ TRACE_OUT(protocols_lookup_func); return (NS_UNAVAIL); } - memset(name, 0, size); + //memset(name, 0, size); + name[size - 1] = '\0'; memcpy(name, key + sizeof(enum nss_lookup_type), size - 1); break; case nss_lt_id: ==== //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/cached/agents/proto.h#3 (text+ko) ==== ==== //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/cached/agents/rpc.c#4 (text+ko) ==== @@ -119,7 +119,8 @@ memcpy(&new_rpc, rpc, sizeof(struct rpcent)); *buffer_size = desired_size; - memset(buffer, 0, desired_size); + //memset(buffer, 0, desired_size); + p = buffer + sizeof(struct rpcent) + sizeof(char *); memcpy(buffer + sizeof(struct rpcent), &p, sizeof(char *)); p = (char *)_ALIGN(p); @@ -180,7 +181,8 @@ TRACE_OUT(rpc_lookup_func); return (NS_UNAVAIL); } - memset(name, 0, size); + //memset(name, 0, size); + name[size - 1] = '\0'; memcpy(name, key + sizeof(enum nss_lookup_type), size - 1); break; case nss_lt_id: ==== //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/cached/agents/rpc.h#3 (text+ko) ==== ==== //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/cached/agents/services.c#5 (text) ==== @@ -119,7 +119,7 @@ } memcpy(&new_serv, serv, sizeof(struct servent)); - memset(buffer, 0, desired_size); +// memset(buffer, 0, desired_size); *buffer_size = desired_size; p = buffer + sizeof(struct servent) + sizeof(char *); @@ -189,7 +189,8 @@ result = NS_UNAVAIL; goto fin; } - memset(name, 0, size + 1); +// memset(name, 0, size + 1); + name[size] = '\0'; memcpy(name, key + sizeof(enum nss_lookup_type), size); size2 = strlen(name) + 1; @@ -216,7 +217,8 @@ result = NS_UNAVAIL; goto fin; } - memset(proto, size + 1, 0); + //memset(proto, size + 1, 0); + proto[size] = '\0'; memcpy(proto, key + sizeof(enum nss_lookup_type) + sizeof(int), size); } ==== //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/cached/agents/services.h#4 (text) ==== ==== //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/cached/cached.8#2 (text) ==== ==== //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/cached/cached.c#5 (text) ==== @@ -444,7 +444,7 @@ TRACE_OUT(process_socket_event); return; } - memset(qstate->io_buffer, 0, qstate->kevent_watermark); + //memset(qstate->io_buffer, 0, qstate->kevent_watermark); qstate->io_buffer_p = qstate->io_buffer; qstate->io_buffer_size = qstate->kevent_watermark; @@ -524,6 +524,9 @@ memset(&timeout, 0, sizeof(struct timespec)); memset(&eventlist, 0, sizeof(struct kevent) * eventlist_size); +// int j_max = 6016 * 3; +// int j; +// for (j = 0; j < j_max; ++j) { for (;;) { nevents = kevent(env->queue, NULL, 0, eventlist, eventlist_size, NULL); ==== //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/cached/cached.conf.5#2 (text) ==== ==== //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/cached/cachedcli.c#3 (text) ==== ==== //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/cached/cachedcli.h#2 (text) ==== ==== //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/cached/cachelib.c#3 (text) ==== @@ -555,8 +555,8 @@ return (-1); } - memset(new_entries, 0, sizeof(struct cache_entry_ *) * - new_capacity); +// memset(new_entries, 0, sizeof(struct cache_entry_ *) * +// new_capacity); memcpy(new_entries, the_cache->entries, sizeof(struct cache_entry_ *) * the_cache->entries_size); @@ -589,10 +589,10 @@ TRACE_OUT(register_cache_entry); return (-1); } - memset(new_common_entry->common_params.entry_name, 0, - entry_name_size + 1); - strncpy(new_common_entry->common_params.entry_name, - params->entry_name, entry_name_size); +// memset(new_common_entry->common_params.entry_name, 0, +// entry_name_size + 1); + strlcpy(new_common_entry->common_params.entry_name, + params->entry_name, entry_name_size + 1); new_common_entry->name = new_common_entry->common_params.entry_name; @@ -687,10 +687,10 @@ TRACE_OUT(register_cache_entry); return (-1); } - memset(new_mp_entry->mp_params.entry_name, 0, +// memset(new_mp_entry->mp_params.entry_name, 0, +// entry_name_size + 1); + strlcpy(new_mp_entry->mp_params.entry_name, params->entry_name, entry_name_size + 1); - strncpy(new_mp_entry->mp_params.entry_name, params->entry_name, - entry_name_size); new_mp_entry->name = new_mp_entry->mp_params.entry_name; TAILQ_INIT(&new_mp_entry->ws_head); ==== //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/cached/cachelib.h#2 (text) ==== ==== //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/cached/cacheplcs.c#3 (text) ==== ==== //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/cached/cacheplcs.h#2 (text) ==== ==== //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/cached/config.c#3 (text) ==== @@ -171,7 +171,8 @@ TRACE_OUT(create_configuration_entry); return (NULL); } - memset(retval->name, 0, size + 1); + //memset(retval->name, 0, size + 1); + retval->name[size] = '\0'; memcpy(retval->name, name, size); memcpy(&retval->common_query_timeout, common_timeout, @@ -286,8 +287,8 @@ TRACE_OUT(add_configuration_entry); return (-1); } - memset(new_entries, 0, sizeof(struct configuration_entry *) * - config->entries_capacity); +// memset(new_entries, 0, sizeof(struct configuration_entry *) * +// config->entries_capacity); memcpy(new_entries, config->entries, sizeof(struct configuration_entry *) * config->entries_size); @@ -574,7 +575,8 @@ TRACE_OUT(fill_configuration_defaults); return (-1); } - memset(config->socket_path, 0, len + 1); + //memset(config->socket_path, 0, len + 1); + config->socket_path[len] = '\0'; memcpy(config->socket_path, DEFAULT_SOCKET_PATH, len); len = strlen(DEFAULT_PIDFILE_PATH); @@ -583,7 +585,8 @@ TRACE_OUT(fill_configuration_defaults); return (-1); } - memset(config->pidfile_path, 0, len + 1); + //memset(config->pidfile_path, 0, len + 1); + config->pidfile_path[len] = '\0'; memcpy(config->pidfile_path, DEFAULT_PIDFILE_PATH, len); config->socket_mode = S_IFSOCK | S_IRUSR | S_IWUSR | ==== //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/cached/config.h#3 (text) ==== ==== //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/cached/debug.c#2 (text) ==== ==== //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/cached/debug.h#4 (text) ==== ==== //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/cached/hashtable.h#3 (text) ==== ==== //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/cached/log.c#3 (text) ==== ==== //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/cached/log.h#3 (text) ==== ==== //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/cached/mp_rs_query.c#4 (text) ==== @@ -121,8 +121,9 @@ TRACE_OUT(on_mp_read_session_request_read1); return (-1); } - memset(c_mp_rs_request->entry, 0, - c_mp_rs_request->entry_length + 1); + //memset(c_mp_rs_request->entry, 0, + // c_mp_rs_request->entry_length + 1); + c_mp_rs_request->entry[c_mp_rs_request->entry_length] = '\0'; qstate->kevent_watermark = c_mp_rs_request->entry_length; qstate->process_func = on_mp_read_session_request_read2; ==== //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/cached/mp_rs_query.h#2 (text) ==== ==== //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/cached/mp_ws_query.c#3 (text) ==== @@ -127,8 +127,9 @@ TRACE_OUT(on_mp_write_session_request_read1); return (-1); } - memset(c_mp_ws_request->entry, 0, - c_mp_ws_request->entry_length + 1); +// memset(c_mp_ws_request->entry, 0, +// c_mp_ws_request->entry_length + 1); + c_mp_ws_request->entry[c_mp_ws_request->entry_length] = '\0'; qstate->kevent_watermark = c_mp_ws_request->entry_length; qstate->process_func = on_mp_write_session_request_read2; @@ -392,7 +393,7 @@ return (-1); } - memset(write_request->data, 0, write_request->data_size); + //memset(write_request->data, 0, write_request->data_size); qstate->kevent_watermark = write_request->data_size; qstate->process_func = on_mp_write_session_write_request_read2; ==== //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/cached/mp_ws_query.h#2 (text) ==== ==== //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/cached/parser.c#3 (text) ==== @@ -374,7 +374,8 @@ res = 0; line_num = 0; - memset(buffer, 0, sizeof(buffer)); + //memset(buffer, 0, sizeof(buffer)); + buffer[0] = '\0'; while ((res == 0) && (fgets(buffer, sizeof(buffer) - 1, fin) != NULL)) { field_count = strbreak(buffer, fields, sizeof(fields)); ++line_num; ==== //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/cached/parser.h#2 (text) ==== ==== //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/cached/protocol.c#2 (text) ==== ==== //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/cached/protocol.h#2 (text) ==== ==== //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/cached/query.c#4 (text) ==== @@ -338,8 +338,9 @@ TRACE_OUT(on_write_request_read1); return (-1); } - memset(write_request->entry, 0, - write_request->entry_length + 1); +// memset(write_request->entry, 0, +// write_request->entry_length + 1); + write_request->entry[write_request->entry_length] = '\0'; write_request->cache_key = (char *)malloc( write_request->cache_key_size + @@ -351,8 +352,8 @@ } memcpy(write_request->cache_key, qstate->eid_str, qstate->eid_str_length); - memset(write_request->cache_key + qstate->eid_str_length, 0, - write_request->cache_key_size); + //memset(write_request->cache_key + qstate->eid_str_length, 0, + // write_request->cache_key_size); if (write_request->data_size != 0) { write_request->data = (char *)malloc( @@ -363,8 +364,8 @@ TRACE_OUT(on_write_request_read1); return (-1); } - memset(write_request->data, 0, - write_request->data_size); +// memset(write_request->data, 0, +// write_request->data_size); } qstate->kevent_watermark = write_request->entry_length + @@ -629,7 +630,8 @@ TRACE_OUT(on_read_request_read1); return (-1); } - memset(read_request->entry, 0, read_request->entry_length + 1); + //memset(read_request->entry, 0, read_request->entry_length + 1); + read_request->entry[read_request->entry_length] = '\0'; read_request->cache_key = (char *)malloc( read_request->cache_key_size + @@ -641,8 +643,8 @@ } memcpy(read_request->cache_key, qstate->eid_str, qstate->eid_str_length); - memset(read_request->cache_key + qstate->eid_str_length, 0, - read_request->cache_key_size); +// memset(read_request->cache_key + qstate->eid_str_length, 0, +// read_request->cache_key_size); qstate->kevent_watermark = read_request->entry_length + read_request->cache_key_size; @@ -952,23 +954,25 @@ } if (transform_request->entry_length != 0) { - if (BUFSIZE_INVALID(transform_request->entry_length)) { - TRACE_OUT(on_transform_request_read1); - return (-1); - } + if (BUFSIZE_INVALID(transform_request->entry_length)) { + TRACE_OUT(on_transform_request_read1); + return (-1); + } - transform_request->entry = (char *)malloc( - transform_request->entry_length + 1); - if (transform_request->entry == NULL) { - TRACE_OUT(on_transform_request_read1); - return (-1); - } - memset(transform_request->entry, 0, - transform_request->entry_length + 1); + transform_request->entry = (char *)malloc( + transform_request->entry_length + 1); + if (transform_request->entry == NULL) { + TRACE_OUT(on_transform_request_read1); + return (-1); + } + //memset(transform_request->entry, 0, + // transform_request->entry_length + 1); + transform_request->entry[transform_request->entry_length] = + '\0'; - qstate->process_func = on_transform_request_read2; + qstate->process_func = on_transform_request_read2; } else - qstate->process_func = on_transform_request_process; + qstate->process_func = on_transform_request_process; qstate->kevent_watermark = transform_request->entry_length; } ==== //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/cached/query.h#2 (text) ==== ==== //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/cached/singletons.c#2 (text) ==== ==== //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/cached/singletons.h#2 (text) ==== From owner-p4-projects@FreeBSD.ORG Wed Aug 16 20:01:22 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8EC0816A4E1; Wed, 16 Aug 2006 20:01:22 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 379AF16A4E8 for ; Wed, 16 Aug 2006 20:01:22 +0000 (UTC) (envelope-from bushman@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3D18543DE5 for ; Wed, 16 Aug 2006 19:59:13 +0000 (GMT) (envelope-from bushman@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7GJx3ol017945 for ; Wed, 16 Aug 2006 19:59:03 GMT (envelope-from bushman@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7GJx2Qt017934 for perforce@freebsd.org; Wed, 16 Aug 2006 19:59:02 GMT (envelope-from bushman@freebsd.org) Date: Wed, 16 Aug 2006 19:59:02 GMT Message-Id: <200608161959.k7GJx2Qt017934@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bushman@freebsd.org using -f From: Michael Bushkov To: Perforce Change Reviews Cc: Subject: PERFORCE change 104287 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 16 Aug 2006 20:01:22 -0000 http://perforce.freebsd.org/chv.cgi?CH=104287 Change 104287 by bushman@bushman_nss_ldap_cached on 2006/08/16 19:58:45 IFC Affected files ... .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/net/name6.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/net/nscache.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/nss_dns/dns_shells.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/nss_dns/nss_dns.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/cached/Makefile#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/cached/agent.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/cached/agent.h#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/cached/agents/Makefile.inc#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/cached/agents/group.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/cached/agents/group.h#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/cached/agents/hosts.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/cached/agents/hosts.h#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/cached/agents/net.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/cached/agents/net.h#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/cached/agents/passwd.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/cached/agents/passwd.h#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/cached/agents/proto.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/cached/agents/proto.h#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/cached/agents/rpc.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/cached/agents/rpc.h#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/cached/agents/services.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/cached/agents/services.h#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/cached/cached.8#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/cached/cached.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/cached/cached.conf.5#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/cached/cachedcli.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/cached/cachedcli.h#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/cached/cachelib.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/cached/cachelib.h#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/cached/cacheplcs.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/cached/cacheplcs.h#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/cached/config.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/cached/config.h#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/cached/debug.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/cached/debug.h#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/cached/hashtable.h#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/cached/log.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/cached/log.h#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/cached/mp_rs_query.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/cached/mp_rs_query.h#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/cached/mp_ws_query.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/cached/mp_ws_query.h#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/cached/parser.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/cached/parser.h#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/cached/protocol.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/cached/protocol.h#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/cached/query.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/cached/query.h#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/cached/singletons.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/cached/singletons.h#2 integrate Differences ... ==== //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/net/name6.c#2 (text+ko) ==== @@ -195,8 +195,8 @@ static struct hostent *_hpcopy(struct hostent *, int *); static struct hostent *_hpaddr(int, const char *, void *, int *); +#ifdef INET6 static struct hostent *_hpmerge(struct hostent *, struct hostent *, int *); -#ifdef INET6 static struct hostent *_hpmapv6(struct hostent *, int *); #endif static struct hostent *_hpsort(struct hostent *, res_state); @@ -522,6 +522,7 @@ return (_hpcopy(hp, errp)); } +#ifdef INET6 /* * _hpmerge: merge 2 hostent structure, arguments will be freed */ @@ -558,17 +559,14 @@ } } aliases[nalias] = NULL; -#ifdef INET6 if (hp1->h_length != hp2->h_length) { hp->h_addrtype = AF_INET6; hp->h_length = sizeof(struct in6_addr); } else { -#endif hp->h_addrtype = hp1->h_addrtype; hp->h_length = hp1->h_length; -#ifdef INET6 } -#endif + hp->h_addr_list = addrs; naddr = 0; for (i = 1; i <= 2; i++) { @@ -589,6 +587,7 @@ addrs[naddr] = NULL; return (_hpcopy(hp, errp)); } +#endif /* * _hpmapv6: convert IPv4 hostent into IPv4-mapped IPv6 addresses ==== //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/net/nscache.c#2 (text) ==== @@ -89,13 +89,12 @@ break; cache_data->key_size <<= 1; - cache_data->key = reallocf(cache_data->key, - cache_data->key_size); + free(cache_data->key); + cache_data->key = malloc(cache_data->key_size); if (cache_data->key == NULL) { res = NS_UNAVAIL; break; } - memset(cache_data->key, 0, cache_data->key_size); va_copy(ap_new, ap); } } while (res == NS_RETURN); @@ -112,7 +111,6 @@ buffer = (char *)malloc(NSS_CACHE_BUFFER_INITIAL_SIZE); if (buffer == NULL) return (NS_UNAVAIL); - memset(buffer, 0, NSS_CACHE_BUFFER_INITIAL_SIZE); do { connection = __open_cached_connection(¶ms); @@ -125,10 +123,10 @@ &buffer_size); __close_cached_connection(connection); if (res == -2 && buffer_size < NSS_CACHE_BUFFER_SIZE_LIMIT) { - buffer = (char *)reallocf(buffer, buffer_size); + free(buffer); + buffer = (char *)malloc(buffer, buffer_size); if (buffer == NULL) return (NS_UNAVAIL); - memset(buffer, 0, buffer_size); } } while (res == -2); @@ -202,7 +200,6 @@ free(cache_data->key); return (NS_UNAVAIL); } - memset(buffer, 0, NSS_CACHE_BUFFER_INITIAL_SIZE); do { size_t size; @@ -218,12 +215,12 @@ break; buffer_size <<= 1; - buffer = (char *)reallocf(buffer, buffer_size); + free(buffer); + buffer = (char *)malloc(buffer_size); if (buffer == NULL) { res = NS_UNAVAIL; break; } - memset(buffer, 0, buffer_size); } } while (res == NS_RETURN); @@ -318,17 +315,16 @@ cache_info->set_mp_rs_func(rs); return (NS_UNAVAIL); } - memset(buffer, 0, NSS_CACHE_BUFFER_INITIAL_SIZE); do { res = __cached_mp_read(rs, buffer, &buffer_size); if (res == -2 && buffer_size < NSS_CACHE_BUFFER_SIZE_LIMIT) { - buffer = (char *)reallocf(buffer, buffer_size); + free(buffer); + buffer = (char *)malloc(buffer); if (buffer == NULL) { res = -1; break; } - memset(buffer, 0, buffer_size); } } while (res == -2); @@ -376,8 +372,7 @@ buffer = (char *)malloc(NSS_CACHE_BUFFER_INITIAL_SIZE); if (buffer == NULL) return (NS_UNAVAIL); - memset(buffer, 0, NSS_CACHE_BUFFER_INITIAL_SIZE); - + ws = cache_info->get_mp_ws_func(); if (ws == INVALID_CACHED_MP_WRITE_SESSION) { memset(¶ms, 0, sizeof(struct cached_connection_params)); @@ -405,12 +400,12 @@ break; buffer_size <<= 1; - buffer = (char *)reallocf(buffer, buffer_size); + free(buffer); + buffer = (char *)malloc(buffer_size); if (buffer == NULL) { res = NS_UNAVAIL; break; } - memset(buffer, 0, buffer_size); } } while (res == NS_RETURN); ==== //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/nss_dns/dns_shells.c#2 (text+ko) ==== @@ -65,10 +65,12 @@ { free(st); } +#endif int __dns_getusershell_r(void *rv, void *cb_data, va_list ap) { +#ifdef HESIOD struct dns_usershell_state *st; char *buffer; size_t buflen; @@ -127,12 +129,16 @@ } hesiod_end(context); - return (r); + return (r); +#else + return (NS_UNAVAIL); +#endif } int __dns_setusershell(void *rv, void *cb_data, va_list ap) { +#ifdef HESIOD struct dns_usershell_state *st; int r; @@ -141,8 +147,6 @@ return (NS_UNAVAIL); st->counter = 0; - +#endif return (NS_UNAVAIL); } - -#endif ==== //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/nss_dns/nss_dns.c#2 (text+ko) ==== ==== //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/cached/Makefile#2 (text) ==== @@ -8,7 +8,7 @@ SRCS= agent.c cached.c cachedcli.c cachelib.c cacheplcs.c debug.c log.c \ config.c query.c mp_ws_query.c mp_rs_query.c singletons.c protocol.c \ parser.c -CFLAGS+= -g -DCONFIG_PATH="\"${PREFIX}/etc/cached.conf\"" +CFLAGS+= -DCONFIG_PATH="\"${PREFIX}/etc/cached.conf\"" DPADD+=${LIBM} ${LIBPTHREAD} ${LIBUTIL} LDADD+=${LIBM} ${LIBPTHREAD} ${LIBUTIL} LDFLAGS+= -Xlinker --export-dynamic ==== //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/cached/agent.c#2 (text) ==== ==== //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/cached/agent.h#2 (text) ==== ==== //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/cached/agents/Makefile.inc#2 (text) ==== ==== //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/cached/agents/group.c#2 (text) ==== @@ -122,7 +122,7 @@ } memcpy(&new_grp, grp, sizeof(struct group)); - memset(buffer, 0, desired_size); + //memset(buffer, 0, desired_size); *buffer_size = desired_size; p = buffer + sizeof(struct group) + sizeof(char *); @@ -192,7 +192,8 @@ TRACE_OUT(group_lookup_func); return (NS_UNAVAIL); } - memset(name, 0, size); + //memset(name, 0, size); + name[size - 1] = '\0'; memcpy(name, key + sizeof(enum nss_lookup_type), size - 1); break; case nss_lt_id: ==== //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/cached/agents/group.h#2 (text) ==== ==== //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/cached/agents/hosts.c#2 (text+ko) ==== @@ -133,7 +133,7 @@ } memcpy(&new_ht, ht, sizeof(struct hostent)); - memset(buffer, 0, desired_size); + //memset(buffer, 0, desired_size); *buffer_size = desired_size; p = buffer + sizeof(struct hostent) + sizeof(char *); @@ -205,7 +205,7 @@ return (NS_RETURN); } - memset(buffer, 0, desired_size); + //memset(buffer, 0, desired_size); p = buffer; memcpy(p, &ai_size, sizeof(size_t)); @@ -306,7 +306,8 @@ TRACE_OUT(hosts_lookup_func); return (NS_UNAVAIL); } - memset(str, 0, size); + //memset(str, 0, size); + str[size - 1] = '\0'; memcpy(str, key, key_size); old_options = statp->options; @@ -343,7 +344,8 @@ TRACE_OUT(hosts_lookup_func); return (NS_UNAVAIL); } - memset(str, 0, size); + //memset(str, 0, size); + str[size - 1] = '\0'; memcpy(str, key, key_size); break; case nss_lt_id: ==== //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/cached/agents/hosts.h#2 (text+ko) ==== ==== //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/cached/agents/net.c#2 (text+ko) ==== @@ -126,7 +126,7 @@ memcpy(&new_ne, ne, sizeof(struct netent)); *buffer_size = desired_size; - memset(buffer, 0, desired_size); + //memset(buffer, 0, desired_size); p = buffer + sizeof(struct netent) + sizeof(char *); memcpy(buffer + sizeof(struct netent), &p, sizeof(char *)); p = (char *)_ALIGN(p); @@ -188,7 +188,8 @@ TRACE_OUT(networks_lookup_func); return (NS_UNAVAIL); } - memset(name, 0, size); + //memset(name, 0, size); + name[size - 1] = '\0'; memcpy(name, key + sizeof(enum nss_lookup_type), size - 1); break; case nss_lt_id: ==== //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/cached/agents/net.h#2 (text+ko) ==== ==== //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/cached/agents/passwd.c#2 (text) ==== @@ -108,7 +108,7 @@ } memcpy(&new_pwd, pwd, sizeof(struct passwd)); - memset(buffer, 0, desired_size); + //memset(buffer, 0, desired_size); *buffer_size = desired_size; p = buffer + sizeof(struct passwd) + sizeof(char *); @@ -191,7 +191,8 @@ TRACE_OUT(passwd_lookup_func); return (NS_UNAVAIL); } - memset(login, 0, size); + //memset(login, 0, size); + login[size - 1] ='\0'; memcpy(login, key + sizeof(enum nss_lookup_type), size - 1); break; case nss_lt_id: ==== //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/cached/agents/passwd.h#2 (text) ==== ==== //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/cached/agents/proto.c#2 (text+ko) ==== @@ -123,7 +123,7 @@ memcpy(&new_proto, proto, sizeof(struct protoent)); *buffer_size = desired_size; - memset(buffer, 0, desired_size); + //memset(buffer, 0, desired_size); p = buffer + sizeof(struct protoent) + sizeof(char *); memcpy(buffer + sizeof(struct protoent), &p, sizeof(char *)); p = (char *)_ALIGN(p); @@ -184,7 +184,8 @@ TRACE_OUT(protocols_lookup_func); return (NS_UNAVAIL); } - memset(name, 0, size); + //memset(name, 0, size); + name[size - 1] = '\0'; memcpy(name, key + sizeof(enum nss_lookup_type), size - 1); break; case nss_lt_id: ==== //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/cached/agents/proto.h#2 (text+ko) ==== ==== //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/cached/agents/rpc.c#2 (text+ko) ==== @@ -119,7 +119,8 @@ memcpy(&new_rpc, rpc, sizeof(struct rpcent)); *buffer_size = desired_size; - memset(buffer, 0, desired_size); + //memset(buffer, 0, desired_size); + p = buffer + sizeof(struct rpcent) + sizeof(char *); memcpy(buffer + sizeof(struct rpcent), &p, sizeof(char *)); p = (char *)_ALIGN(p); @@ -180,7 +181,8 @@ TRACE_OUT(rpc_lookup_func); return (NS_UNAVAIL); } - memset(name, 0, size); + //memset(name, 0, size); + name[size - 1] = '\0'; memcpy(name, key + sizeof(enum nss_lookup_type), size - 1); break; case nss_lt_id: ==== //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/cached/agents/rpc.h#2 (text+ko) ==== ==== //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/cached/agents/services.c#2 (text) ==== @@ -119,7 +119,7 @@ } memcpy(&new_serv, serv, sizeof(struct servent)); - memset(buffer, 0, desired_size); +// memset(buffer, 0, desired_size); *buffer_size = desired_size; p = buffer + sizeof(struct servent) + sizeof(char *); @@ -189,7 +189,8 @@ result = NS_UNAVAIL; goto fin; } - memset(name, 0, size + 1); +// memset(name, 0, size + 1); + name[size] = '\0'; memcpy(name, key + sizeof(enum nss_lookup_type), size); size2 = strlen(name) + 1; @@ -216,7 +217,8 @@ result = NS_UNAVAIL; goto fin; } - memset(proto, size + 1, 0); + //memset(proto, size + 1, 0); + proto[size] = '\0'; memcpy(proto, key + sizeof(enum nss_lookup_type) + sizeof(int), size); } ==== //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/cached/agents/services.h#2 (text) ==== ==== //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/cached/cached.8#2 (text) ==== ==== //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/cached/cached.c#2 (text) ==== @@ -444,7 +444,7 @@ TRACE_OUT(process_socket_event); return; } - memset(qstate->io_buffer, 0, qstate->kevent_watermark); + //memset(qstate->io_buffer, 0, qstate->kevent_watermark); qstate->io_buffer_p = qstate->io_buffer; qstate->io_buffer_size = qstate->kevent_watermark; @@ -524,6 +524,9 @@ memset(&timeout, 0, sizeof(struct timespec)); memset(&eventlist, 0, sizeof(struct kevent) * eventlist_size); +// int j_max = 6016 * 3; +// int j; +// for (j = 0; j < j_max; ++j) { for (;;) { nevents = kevent(env->queue, NULL, 0, eventlist, eventlist_size, NULL); ==== //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/cached/cached.conf.5#2 (text) ==== ==== //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/cached/cachedcli.c#2 (text) ==== ==== //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/cached/cachedcli.h#2 (text) ==== ==== //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/cached/cachelib.c#2 (text) ==== @@ -555,8 +555,8 @@ return (-1); } - memset(new_entries, 0, sizeof(struct cache_entry_ *) * - new_capacity); +// memset(new_entries, 0, sizeof(struct cache_entry_ *) * +// new_capacity); memcpy(new_entries, the_cache->entries, sizeof(struct cache_entry_ *) * the_cache->entries_size); @@ -589,10 +589,10 @@ TRACE_OUT(register_cache_entry); return (-1); } - memset(new_common_entry->common_params.entry_name, 0, - entry_name_size + 1); - strncpy(new_common_entry->common_params.entry_name, - params->entry_name, entry_name_size); +// memset(new_common_entry->common_params.entry_name, 0, +// entry_name_size + 1); + strlcpy(new_common_entry->common_params.entry_name, + params->entry_name, entry_name_size + 1); new_common_entry->name = new_common_entry->common_params.entry_name; @@ -687,10 +687,10 @@ TRACE_OUT(register_cache_entry); return (-1); } - memset(new_mp_entry->mp_params.entry_name, 0, +// memset(new_mp_entry->mp_params.entry_name, 0, +// entry_name_size + 1); + strlcpy(new_mp_entry->mp_params.entry_name, params->entry_name, entry_name_size + 1); - strncpy(new_mp_entry->mp_params.entry_name, params->entry_name, - entry_name_size); new_mp_entry->name = new_mp_entry->mp_params.entry_name; TAILQ_INIT(&new_mp_entry->ws_head); ==== //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/cached/cachelib.h#2 (text) ==== ==== //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/cached/cacheplcs.c#2 (text) ==== ==== //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/cached/cacheplcs.h#2 (text) ==== ==== //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/cached/config.c#2 (text) ==== @@ -171,7 +171,8 @@ TRACE_OUT(create_configuration_entry); return (NULL); } - memset(retval->name, 0, size + 1); + //memset(retval->name, 0, size + 1); + retval->name[size] = '\0'; memcpy(retval->name, name, size); memcpy(&retval->common_query_timeout, common_timeout, @@ -286,8 +287,8 @@ TRACE_OUT(add_configuration_entry); return (-1); } - memset(new_entries, 0, sizeof(struct configuration_entry *) * - config->entries_capacity); +// memset(new_entries, 0, sizeof(struct configuration_entry *) * +// config->entries_capacity); memcpy(new_entries, config->entries, sizeof(struct configuration_entry *) * config->entries_size); @@ -574,7 +575,8 @@ TRACE_OUT(fill_configuration_defaults); return (-1); } - memset(config->socket_path, 0, len + 1); + //memset(config->socket_path, 0, len + 1); + config->socket_path[len] = '\0'; memcpy(config->socket_path, DEFAULT_SOCKET_PATH, len); len = strlen(DEFAULT_PIDFILE_PATH); @@ -583,7 +585,8 @@ TRACE_OUT(fill_configuration_defaults); return (-1); } - memset(config->pidfile_path, 0, len + 1); + //memset(config->pidfile_path, 0, len + 1); + config->pidfile_path[len] = '\0'; memcpy(config->pidfile_path, DEFAULT_PIDFILE_PATH, len); config->socket_mode = S_IFSOCK | S_IRUSR | S_IWUSR | ==== //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/cached/config.h#2 (text) ==== ==== //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/cached/debug.c#2 (text) ==== ==== //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/cached/debug.h#2 (text) ==== ==== //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/cached/hashtable.h#2 (text) ==== ==== //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/cached/log.c#2 (text) ==== ==== //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/cached/log.h#2 (text) ==== ==== //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/cached/mp_rs_query.c#2 (text) ==== @@ -121,8 +121,9 @@ TRACE_OUT(on_mp_read_session_request_read1); return (-1); } - memset(c_mp_rs_request->entry, 0, - c_mp_rs_request->entry_length + 1); + //memset(c_mp_rs_request->entry, 0, + // c_mp_rs_request->entry_length + 1); + c_mp_rs_request->entry[c_mp_rs_request->entry_length] = '\0'; qstate->kevent_watermark = c_mp_rs_request->entry_length; qstate->process_func = on_mp_read_session_request_read2; ==== //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/cached/mp_rs_query.h#2 (text) ==== ==== //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/cached/mp_ws_query.c#2 (text) ==== @@ -127,8 +127,9 @@ TRACE_OUT(on_mp_write_session_request_read1); return (-1); } - memset(c_mp_ws_request->entry, 0, - c_mp_ws_request->entry_length + 1); +// memset(c_mp_ws_request->entry, 0, +// c_mp_ws_request->entry_length + 1); + c_mp_ws_request->entry[c_mp_ws_request->entry_length] = '\0'; qstate->kevent_watermark = c_mp_ws_request->entry_length; qstate->process_func = on_mp_write_session_request_read2; @@ -392,7 +393,7 @@ return (-1); } - memset(write_request->data, 0, write_request->data_size); + //memset(write_request->data, 0, write_request->data_size); qstate->kevent_watermark = write_request->data_size; qstate->process_func = on_mp_write_session_write_request_read2; ==== //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/cached/mp_ws_query.h#2 (text) ==== ==== //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/cached/parser.c#2 (text) ==== @@ -374,7 +374,8 @@ res = 0; line_num = 0; - memset(buffer, 0, sizeof(buffer)); + //memset(buffer, 0, sizeof(buffer)); + buffer[0] = '\0'; while ((res == 0) && (fgets(buffer, sizeof(buffer) - 1, fin) != NULL)) { field_count = strbreak(buffer, fields, sizeof(fields)); ++line_num; ==== //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/cached/parser.h#2 (text) ==== ==== //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/cached/protocol.c#2 (text) ==== ==== //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/cached/protocol.h#2 (text) ==== ==== //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/cached/query.c#2 (text) ==== @@ -338,8 +338,9 @@ TRACE_OUT(on_write_request_read1); return (-1); } - memset(write_request->entry, 0, - write_request->entry_length + 1); +// memset(write_request->entry, 0, +// write_request->entry_length + 1); + write_request->entry[write_request->entry_length] = '\0'; write_request->cache_key = (char *)malloc( write_request->cache_key_size + @@ -351,8 +352,8 @@ } memcpy(write_request->cache_key, qstate->eid_str, qstate->eid_str_length); - memset(write_request->cache_key + qstate->eid_str_length, 0, - write_request->cache_key_size); + //memset(write_request->cache_key + qstate->eid_str_length, 0, + // write_request->cache_key_size); if (write_request->data_size != 0) { write_request->data = (char *)malloc( @@ -363,8 +364,8 @@ TRACE_OUT(on_write_request_read1); return (-1); } - memset(write_request->data, 0, - write_request->data_size); +// memset(write_request->data, 0, +// write_request->data_size); } qstate->kevent_watermark = write_request->entry_length + @@ -629,7 +630,8 @@ TRACE_OUT(on_read_request_read1); return (-1); } - memset(read_request->entry, 0, read_request->entry_length + 1); + //memset(read_request->entry, 0, read_request->entry_length + 1); + read_request->entry[read_request->entry_length] = '\0'; read_request->cache_key = (char *)malloc( read_request->cache_key_size + @@ -641,8 +643,8 @@ } memcpy(read_request->cache_key, qstate->eid_str, qstate->eid_str_length); - memset(read_request->cache_key + qstate->eid_str_length, 0, - read_request->cache_key_size); +// memset(read_request->cache_key + qstate->eid_str_length, 0, +// read_request->cache_key_size); qstate->kevent_watermark = read_request->entry_length + read_request->cache_key_size; @@ -952,23 +954,25 @@ } if (transform_request->entry_length != 0) { - if (BUFSIZE_INVALID(transform_request->entry_length)) { - TRACE_OUT(on_transform_request_read1); - return (-1); - } + if (BUFSIZE_INVALID(transform_request->entry_length)) { + TRACE_OUT(on_transform_request_read1); + return (-1); + } - transform_request->entry = (char *)malloc( - transform_request->entry_length + 1); - if (transform_request->entry == NULL) { - TRACE_OUT(on_transform_request_read1); - return (-1); - } - memset(transform_request->entry, 0, - transform_request->entry_length + 1); + transform_request->entry = (char *)malloc( + transform_request->entry_length + 1); + if (transform_request->entry == NULL) { + TRACE_OUT(on_transform_request_read1); + return (-1); + } + //memset(transform_request->entry, 0, + // transform_request->entry_length + 1); + transform_request->entry[transform_request->entry_length] = + '\0'; - qstate->process_func = on_transform_request_read2; + qstate->process_func = on_transform_request_read2; } else - qstate->process_func = on_transform_request_process; + qstate->process_func = on_transform_request_process; qstate->kevent_watermark = transform_request->entry_length; } ==== //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/cached/query.h#2 (text) ==== ==== //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/cached/singletons.c#2 (text) ==== ==== //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/cached/singletons.h#2 (text) ==== From owner-p4-projects@FreeBSD.ORG Wed Aug 16 20:09:55 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1979516A4E9; Wed, 16 Aug 2006 20:09:55 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 C155116A4DE for ; Wed, 16 Aug 2006 20:09:54 +0000 (UTC) (envelope-from netchild@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E803A43F03 for ; Wed, 16 Aug 2006 20:07:16 +0000 (GMT) (envelope-from netchild@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7GK7GY9019667 for ; Wed, 16 Aug 2006 20:07:16 GMT (envelope-from netchild@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7GK7Ep2019662 for perforce@freebsd.org; Wed, 16 Aug 2006 20:07:14 GMT (envelope-from netchild@freebsd.org) Date: Wed, 16 Aug 2006 20:07:14 GMT Message-Id: <200608162007.k7GK7Ep2019662@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to netchild@freebsd.org using -f From: Alexander Leidinger To: Perforce Change Reviews Cc: Subject: PERFORCE change 104289 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 16 Aug 2006 20:09:55 -0000 http://perforce.freebsd.org/chv.cgi?CH=104289 Change 104289 by netchild@netchild_magellan on 2006/08/16 20:06:53 IFC Affected files ... .. //depot/projects/soc2006/rdivacky_linuxolator/amd64/amd64/support.S#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/amd64/amd64/trap.c#6 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/amd64/linux32/linux.h#6 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/amd64/linux32/linux32_dummy.c#6 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/amd64/linux32/linux32_machdep.c#8 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/amd64/linux32/linux32_proto.h#13 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/amd64/linux32/linux32_syscall.h#13 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/amd64/linux32/linux32_sysent.c#13 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/amd64/linux32/linux32_sysvec.c#9 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/amd64/linux32/syscalls.conf#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/amd64/linux32/syscalls.master#14 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/arm/arm/elf_trampoline.c#4 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/arm/arm/mem.c#3 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/boot/forth/loader.conf#3 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/cam/scsi/scsi_pass.c#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/compat/freebsd32/freebsd32_misc.c#4 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/compat/freebsd32/freebsd32_proto.h#5 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/compat/freebsd32/freebsd32_syscall.h#5 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/compat/freebsd32/freebsd32_syscalls.c#5 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/compat/freebsd32/freebsd32_sysent.c#5 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/compat/freebsd32/syscalls.conf#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/compat/linux/linux_misc.c#21 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/compat/linux/linux_signal.c#8 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/compat/linux/linux_util.c#8 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/compat/svr4/svr4_proto.h#6 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/compat/svr4/svr4_syscall.h#6 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/compat/svr4/svr4_syscallnames.c#6 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/compat/svr4/svr4_sysent.c#6 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/compat/svr4/syscalls.conf#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/conf/files#9 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/conf/files.amd64#6 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/conf/files.i386#6 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/contrib/ipfilter/netinet/fil.c#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/contrib/ipfilter/netinet/ip_auth.c#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/contrib/ipfilter/netinet/ip_auth.h#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/contrib/ipfilter/netinet/ip_compat.h#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/contrib/ipfilter/netinet/ip_fil.h#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/contrib/ipfilter/netinet/ip_fil_freebsd.c#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/contrib/ipfilter/netinet/ip_frag.c#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/contrib/ipfilter/netinet/ip_ftp_pxy.c#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/contrib/ipfilter/netinet/ip_log.c#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/contrib/ipfilter/netinet/ip_nat.c#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/contrib/ipfilter/netinet/ip_pptp_pxy.c#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/contrib/ipfilter/netinet/ip_proxy.c#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/contrib/ipfilter/netinet/ip_rcmd_pxy.c#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/contrib/ipfilter/netinet/ip_scan.c#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/contrib/ipfilter/netinet/ip_state.c#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/contrib/ipfilter/netinet/ip_sync.c#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/contrib/ipfilter/netinet/ip_sync.h#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/contrib/ipfilter/netinet/ipl.h#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/contrib/ipfilter/netinet/mlfk_ipl.c#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/dev/acpi_support/acpi_ibm.c#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/dev/ata/ata-chipset.c#7 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/dev/ata/ata-pci.h#6 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/dev/bce/if_bce.c#4 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/dev/sound/pci/ich.c#3 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/i386/i386/support.s#6 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/i386/i386/trap.c#4 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/i386/ibcs2/ibcs2_isc_syscall.h#4 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/i386/ibcs2/ibcs2_isc_sysent.c#4 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/i386/ibcs2/ibcs2_proto.h#5 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/i386/ibcs2/ibcs2_syscall.h#5 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/i386/ibcs2/ibcs2_sysent.c#5 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/i386/ibcs2/ibcs2_xenix.h#4 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/i386/ibcs2/ibcs2_xenix_syscall.h#4 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/i386/ibcs2/ibcs2_xenix_sysent.c#4 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/i386/ibcs2/syscalls.conf#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/i386/ibcs2/syscalls.isc.conf#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/i386/ibcs2/syscalls.xenix.conf#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/i386/linux/linux.h#21 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/i386/linux/linux_dummy.c#10 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/i386/linux/linux_machdep.c#53 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/i386/linux/linux_proto.h#24 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/i386/linux/linux_syscall.h#24 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/i386/linux/linux_sysent.c#24 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/i386/linux/linux_sysvec.c#18 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/i386/linux/syscalls.conf#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/i386/linux/syscalls.master#24 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/i386/xbox/xbox.c#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/kern/init_sysent.c#6 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/kern/kern_exec.c#4 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/kern/kern_fork.c#5 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/kern/kern_lock.c#3 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/kern/kern_mutex.c#4 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/kern/kern_sx.c#3 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/kern/kern_time.c#5 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/kern/makesyscalls.sh#4 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/kern/subr_turnstile.c#3 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/kern/syscalls.c#6 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/kern/syscalls.master#5 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/kern/systrace_args.c#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/kern/uipc_sem.c#5 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/kern/vfs_aio.c#5 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/modules/linprocfs/Makefile#3 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/modules/linsysfs/Makefile#3 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/modules/linux/Makefile#8 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/net/if_vlan.c#7 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/sys/dirent.h#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/sys/eventhandler.h#5 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/sys/imgact.h#3 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/sys/lockmgr.h#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/sys/sx.h#3 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/sys/syscall.h#6 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/sys/syscall.mk#6 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/sys/sysent.h#4 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/sys/sysproto.h#6 integrate Differences ... ==== //depot/projects/soc2006/rdivacky_linuxolator/amd64/amd64/support.S#2 (text+ko) ==== @@ -27,7 +27,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/amd64/support.S,v 1.116 2005/09/27 18:32:46 peter Exp $ + * $FreeBSD: src/sys/amd64/amd64/support.S,v 1.118 2006/08/15 22:43:02 davidxu Exp $ */ #include "opt_ddb.h" @@ -432,7 +432,7 @@ ja fusufault movq %rsi,(%rdi) - xorl %eax,%eax + xorq %rax,%rax movq PCPU(CURPCB),%rcx movq %rax,PCB_ONFAULT(%rcx) ret ==== //depot/projects/soc2006/rdivacky_linuxolator/amd64/amd64/trap.c#6 (text+ko) ==== @@ -38,7 +38,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/trap.c,v 1.309 2006/08/14 06:15:16 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/trap.c,v 1.310 2006/08/14 19:53:53 alc Exp $"); /* * AMD64 Trap and System call handling @@ -535,7 +535,7 @@ { vm_offset_t va; struct vmspace *vm = NULL; - vm_map_t map = 0; + vm_map_t map; int rv = 0; vm_prot_t ftype; struct thread *td = curthread; ==== //depot/projects/soc2006/rdivacky_linuxolator/amd64/linux32/linux.h#6 (text+ko) ==== @@ -27,7 +27,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/amd64/linux32/linux.h,v 1.2 2006/03/18 18:24:38 netchild Exp $ + * $FreeBSD: src/sys/amd64/linux32/linux.h,v 1.4 2006/08/16 18:54:50 netchild Exp $ */ #ifndef _AMD64_LINUX_LINUX_H_ ==== //depot/projects/soc2006/rdivacky_linuxolator/amd64/linux32/linux32_dummy.c#6 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_dummy.c,v 1.3 2006/06/21 08:45:40 netchild Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_dummy.c,v 1.4 2006/08/15 12:54:29 netchild Exp $"); #include #include ==== //depot/projects/soc2006/rdivacky_linuxolator/amd64/linux32/linux32_machdep.c#8 (text+ko) ==== @@ -29,7 +29,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_machdep.c,v 1.12 2006/03/08 20:21:53 ups Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_machdep.c,v 1.14 2006/08/16 18:54:50 netchild Exp $"); #include #include ==== //depot/projects/soc2006/rdivacky_linuxolator/amd64/linux32/linux32_proto.h#13 (text+ko) ==== @@ -2,8 +2,8 @@ * System call prototypes. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD$ - * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.18 2006/07/28 19:05:26 jhb Exp + * $FreeBSD: src/sys/amd64/linux32/linux32_proto.h,v 1.21 2006/08/15 17:36:58 jhb Exp $ + * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.19 2006/08/15 12:28:14 netchild Exp */ #ifndef _LINUX_SYSPROTO_H_ @@ -14,6 +14,8 @@ #include #include +#include + struct proc; struct thread; @@ -367,7 +369,8 @@ }; struct linux_clone_args { char flags_l_[PADL_(l_int)]; l_int flags; char flags_r_[PADR_(l_int)]; - char parent_tidptr_l_[PADL_(void *stack void *)]; void *stack void * parent_tidptr; char parent_tidptr_r_[PADR_(void *stack void *)]; + char stack_l_[PADL_(void *)]; void * stack; char stack_r_[PADR_(void *)]; + char parent_tidptr_l_[PADL_(void *)]; void * parent_tidptr; char parent_tidptr_r_[PADR_(void *)]; char dummy_l_[PADL_(int)]; int dummy; char dummy_r_[PADR_(int)]; char child_tidptr_l_[PADL_(void *)]; void * child_tidptr; char child_tidptr_r_[PADR_(void *)]; }; @@ -1149,6 +1152,238 @@ #endif /* COMPAT_FREEBSD4 */ +#define LINUX_SYS_AUE_linux_fork AUE_FORK +#define LINUX_SYS_AUE_linux_open AUE_OPEN_RWTC +#define LINUX_SYS_AUE_linux_waitpid AUE_WAIT4 +#define LINUX_SYS_AUE_linux_creat AUE_O_CREAT +#define LINUX_SYS_AUE_linux_link AUE_LINK +#define LINUX_SYS_AUE_linux_unlink AUE_UNLINK +#define LINUX_SYS_AUE_linux_execve AUE_EXECVE +#define LINUX_SYS_AUE_linux_chdir AUE_CHDIR +#define LINUX_SYS_AUE_linux_time AUE_NULL +#define LINUX_SYS_AUE_linux_mknod AUE_MKNOD +#define LINUX_SYS_AUE_linux_chmod AUE_CHMOD +#define LINUX_SYS_AUE_linux_lchown16 AUE_LCHOWN +#define LINUX_SYS_AUE_linux_stat AUE_STAT +#define LINUX_SYS_AUE_linux_lseek AUE_LSEEK +#define LINUX_SYS_AUE_linux_getpid AUE_GETPID +#define LINUX_SYS_AUE_linux_mount AUE_MOUNT +#define LINUX_SYS_AUE_linux_oldumount AUE_UMOUNT +#define LINUX_SYS_AUE_linux_setuid16 AUE_SETUID +#define LINUX_SYS_AUE_linux_getuid16 AUE_GETUID +#define LINUX_SYS_AUE_linux_stime AUE_SETTIMEOFDAY +#define LINUX_SYS_AUE_linux_ptrace AUE_PTRACE +#define LINUX_SYS_AUE_linux_alarm AUE_NULL +#define LINUX_SYS_AUE_linux_pause AUE_NULL +#define LINUX_SYS_AUE_linux_utime AUE_UTIME +#define LINUX_SYS_AUE_linux_access AUE_ACCESS +#define LINUX_SYS_AUE_linux_nice AUE_NICE +#define LINUX_SYS_AUE_linux_kill AUE_KILL +#define LINUX_SYS_AUE_linux_rename AUE_RENAME +#define LINUX_SYS_AUE_linux_mkdir AUE_MKDIR +#define LINUX_SYS_AUE_linux_rmdir AUE_RMDIR +#define LINUX_SYS_AUE_linux_pipe AUE_PIPE +#define LINUX_SYS_AUE_linux_times AUE_NULL +#define LINUX_SYS_AUE_linux_brk AUE_NULL +#define LINUX_SYS_AUE_linux_setgid16 AUE_SETGID +#define LINUX_SYS_AUE_linux_getgid16 AUE_GETGID +#define LINUX_SYS_AUE_linux_signal AUE_NULL +#define LINUX_SYS_AUE_linux_geteuid16 AUE_GETEUID +#define LINUX_SYS_AUE_linux_getegid16 AUE_GETEGID +#define LINUX_SYS_AUE_linux_umount AUE_UMOUNT +#define LINUX_SYS_AUE_linux_ioctl AUE_IOCTL +#define LINUX_SYS_AUE_linux_fcntl AUE_FCNTL +#define LINUX_SYS_AUE_linux_olduname AUE_NULL +#define LINUX_SYS_AUE_linux_ustat AUE_NULL +#define LINUX_SYS_AUE_linux_getppid AUE_GETPPID +#define LINUX_SYS_AUE_linux_sigaction AUE_NULL +#define LINUX_SYS_AUE_linux_sgetmask AUE_NULL +#define LINUX_SYS_AUE_linux_ssetmask AUE_NULL +#define LINUX_SYS_AUE_linux_setreuid16 AUE_SETREUID +#define LINUX_SYS_AUE_linux_setregid16 AUE_SETREGID +#define LINUX_SYS_AUE_linux_sigsuspend AUE_NULL +#define LINUX_SYS_AUE_linux_sigpending AUE_NULL +#define LINUX_SYS_AUE_linux_sethostname AUE_SYSCTL +#define LINUX_SYS_AUE_linux_setrlimit AUE_SETRLIMIT +#define LINUX_SYS_AUE_linux_old_getrlimit AUE_GETRLIMIT +#define LINUX_SYS_AUE_linux_getrusage AUE_GETRUSAGE +#define LINUX_SYS_AUE_linux_gettimeofday AUE_NULL +#define LINUX_SYS_AUE_linux_settimeofday AUE_SETTIMEOFDAY +#define LINUX_SYS_AUE_linux_getgroups16 AUE_GETGROUPS +#define LINUX_SYS_AUE_linux_setgroups16 AUE_SETGROUPS +#define LINUX_SYS_AUE_linux_old_select AUE_SELECT +#define LINUX_SYS_AUE_linux_symlink AUE_SYMLINK +#define LINUX_SYS_AUE_linux_lstat AUE_LSTAT +#define LINUX_SYS_AUE_linux_readlink AUE_READLINK +#define LINUX_SYS_AUE_linux_reboot AUE_REBOOT +#define LINUX_SYS_AUE_linux_readdir AUE_O_GETDENTS +#define LINUX_SYS_AUE_linux_mmap AUE_MMAP +#define LINUX_SYS_AUE_linux_truncate AUE_TRUNCATE +#define LINUX_SYS_AUE_linux_ftruncate AUE_FTRUNCATE +#define LINUX_SYS_AUE_linux_getpriority AUE_GETPRIORITY +#define LINUX_SYS_AUE_linux_statfs AUE_STATFS +#define LINUX_SYS_AUE_linux_fstatfs AUE_FSTATFS +#define LINUX_SYS_AUE_linux_socketcall AUE_NULL +#define LINUX_SYS_AUE_linux_syslog AUE_NULL +#define LINUX_SYS_AUE_linux_setitimer AUE_SETITIMER +#define LINUX_SYS_AUE_linux_getitimer AUE_GETITIMER +#define LINUX_SYS_AUE_linux_newstat AUE_STAT +#define LINUX_SYS_AUE_linux_newlstat AUE_LSTAT +#define LINUX_SYS_AUE_linux_newfstat AUE_FSTAT +#define LINUX_SYS_AUE_linux_uname AUE_NULL +#define LINUX_SYS_AUE_linux_vhangup AUE_NULL +#define LINUX_SYS_AUE_linux_wait4 AUE_WAIT4 +#define LINUX_SYS_AUE_linux_swapoff AUE_SWAPOFF +#define LINUX_SYS_AUE_linux_sysinfo AUE_NULL +#define LINUX_SYS_AUE_linux_ipc AUE_NULL +#define LINUX_SYS_AUE_linux_sigreturn AUE_SIGRETURN +#define LINUX_SYS_AUE_linux_clone AUE_RFORK +#define LINUX_SYS_AUE_linux_newuname AUE_NULL +#define LINUX_SYS_AUE_linux_adjtimex AUE_ADJTIME +#define LINUX_SYS_AUE_linux_mprotect AUE_MPROTECT +#define LINUX_SYS_AUE_linux_sigprocmask AUE_SIGPROCMASK +#define LINUX_SYS_AUE_linux_create_module AUE_NULL +#define LINUX_SYS_AUE_linux_init_module AUE_NULL +#define LINUX_SYS_AUE_linux_delete_module AUE_NULL +#define LINUX_SYS_AUE_linux_get_kernel_syms AUE_NULL +#define LINUX_SYS_AUE_linux_quotactl AUE_QUOTACTL +#define LINUX_SYS_AUE_linux_bdflush AUE_BDFLUSH +#define LINUX_SYS_AUE_linux_sysfs AUE_NULL +#define LINUX_SYS_AUE_linux_personality AUE_PERSONALITY +#define LINUX_SYS_AUE_linux_setfsuid16 AUE_SETFSUID +#define LINUX_SYS_AUE_linux_setfsgid16 AUE_SETFSGID +#define LINUX_SYS_AUE_linux_llseek AUE_LSEEK +#define LINUX_SYS_AUE_linux_getdents AUE_O_GETDENTS +#define LINUX_SYS_AUE_linux_select AUE_SELECT +#define LINUX_SYS_AUE_linux_msync AUE_MSYNC +#define LINUX_SYS_AUE_linux_readv AUE_READV +#define LINUX_SYS_AUE_linux_writev AUE_WRITEV +#define LINUX_SYS_AUE_linux_getsid AUE_GETSID +#define LINUX_SYS_AUE_linux_fdatasync AUE_NULL +#define LINUX_SYS_AUE_linux_sysctl AUE_SYSCTL +#define LINUX_SYS_AUE_linux_sched_setscheduler AUE_SCHED_SETSCHEDULER +#define LINUX_SYS_AUE_linux_sched_getscheduler AUE_SCHED_GETSCHEDULER +#define LINUX_SYS_AUE_linux_sched_get_priority_max AUE_SCHED_GET_PRIORITY_MAX +#define LINUX_SYS_AUE_linux_sched_get_priority_min AUE_SCHED_GET_PRIORITY_MIN +#define LINUX_SYS_AUE_linux_sched_rr_get_interval AUE_SCHED_RR_GET_INTERVAL +#define LINUX_SYS_AUE_linux_nanosleep AUE_NULL +#define LINUX_SYS_AUE_linux_mremap AUE_NULL +#define LINUX_SYS_AUE_linux_setresuid16 AUE_SETRESUID +#define LINUX_SYS_AUE_linux_getresuid16 AUE_GETRESUID +#define LINUX_SYS_AUE_linux_query_module AUE_NULL +#define LINUX_SYS_AUE_linux_nfsservctl AUE_NULL +#define LINUX_SYS_AUE_linux_setresgid16 AUE_SETRESGID +#define LINUX_SYS_AUE_linux_getresgid16 AUE_GETRESGID +#define LINUX_SYS_AUE_linux_prctl AUE_PRCTL +#define LINUX_SYS_AUE_linux_rt_sigreturn AUE_NULL +#define LINUX_SYS_AUE_linux_rt_sigaction AUE_NULL +#define LINUX_SYS_AUE_linux_rt_sigprocmask AUE_NULL +#define LINUX_SYS_AUE_linux_rt_sigpending AUE_NULL +#define LINUX_SYS_AUE_linux_rt_sigtimedwait AUE_NULL +#define LINUX_SYS_AUE_linux_rt_sigqueueinfo AUE_NULL +#define LINUX_SYS_AUE_linux_rt_sigsuspend AUE_NULL +#define LINUX_SYS_AUE_linux_pread AUE_PREAD +#define LINUX_SYS_AUE_linux_pwrite AUE_PWRITE +#define LINUX_SYS_AUE_linux_chown16 AUE_CHOWN +#define LINUX_SYS_AUE_linux_getcwd AUE_GETCWD +#define LINUX_SYS_AUE_linux_capget AUE_CAPGET +#define LINUX_SYS_AUE_linux_capset AUE_CAPSET +#define LINUX_SYS_AUE_linux_sigaltstack AUE_NULL +#define LINUX_SYS_AUE_linux_sendfile AUE_SENDFILE +#define LINUX_SYS_AUE_linux_vfork AUE_VFORK +#define LINUX_SYS_AUE_linux_getrlimit AUE_GETRLIMIT +#define LINUX_SYS_AUE_linux_mmap2 AUE_MMAP +#define LINUX_SYS_AUE_linux_truncate64 AUE_TRUNCATE +#define LINUX_SYS_AUE_linux_ftruncate64 AUE_FTRUNCATE +#define LINUX_SYS_AUE_linux_stat64 AUE_STAT +#define LINUX_SYS_AUE_linux_lstat64 AUE_LSTAT +#define LINUX_SYS_AUE_linux_fstat64 AUE_FSTAT +#define LINUX_SYS_AUE_linux_lchown AUE_LCHOWN +#define LINUX_SYS_AUE_linux_getuid AUE_GETUID +#define LINUX_SYS_AUE_linux_getgid AUE_GETGID +#define LINUX_SYS_AUE_linux_getgroups AUE_GETGROUPS +#define LINUX_SYS_AUE_linux_setgroups AUE_SETGROUPS +#define LINUX_SYS_AUE_linux_chown AUE_CHOWN +#define LINUX_SYS_AUE_linux_setfsuid AUE_SETFSUID +#define LINUX_SYS_AUE_linux_setfsgid AUE_SETFSGID +#define LINUX_SYS_AUE_linux_pivot_root AUE_PIVOT_ROOT +#define LINUX_SYS_AUE_linux_mincore AUE_MINCORE +#define LINUX_SYS_AUE_linux_getdents64 AUE_O_GETDENTS +#define LINUX_SYS_AUE_linux_fcntl64 AUE_FCNTL +#define LINUX_SYS_AUE_linux_gettid AUE_NULL +#define LINUX_SYS_AUE_linux_setxattr AUE_NULL +#define LINUX_SYS_AUE_linux_lsetxattr AUE_NULL +#define LINUX_SYS_AUE_linux_fsetxattr AUE_NULL +#define LINUX_SYS_AUE_linux_getxattr AUE_NULL +#define LINUX_SYS_AUE_linux_lgetxattr AUE_NULL +#define LINUX_SYS_AUE_linux_fgetxattr AUE_NULL +#define LINUX_SYS_AUE_linux_listxattr AUE_NULL +#define LINUX_SYS_AUE_linux_llistxattr AUE_NULL +#define LINUX_SYS_AUE_linux_flistxattr AUE_NULL +#define LINUX_SYS_AUE_linux_removexattr AUE_NULL +#define LINUX_SYS_AUE_linux_lremovexattr AUE_NULL +#define LINUX_SYS_AUE_linux_fremovexattr AUE_NULL +#define LINUX_SYS_AUE_linux_tkill AUE_NULL +#define LINUX_SYS_AUE_linux_sys_futex AUE_NULL +#define LINUX_SYS_AUE_linux_fadvise64 AUE_NULL +#define LINUX_SYS_AUE_linux_exit_group AUE_EXIT +#define LINUX_SYS_AUE_linux_lookup_dcookie AUE_NULL +#define LINUX_SYS_AUE_linux_epoll_create AUE_NULL +#define LINUX_SYS_AUE_linux_epoll_ctl AUE_NULL +#define LINUX_SYS_AUE_linux_epoll_wait AUE_NULL +#define LINUX_SYS_AUE_linux_remap_file_pages AUE_NULL +#define LINUX_SYS_AUE_linux_set_tid_address AUE_NULL +#define LINUX_SYS_AUE_linux_timer_create AUE_NULL +#define LINUX_SYS_AUE_linux_timer_settime AUE_NULL +#define LINUX_SYS_AUE_linux_timer_gettime AUE_NULL +#define LINUX_SYS_AUE_linux_timer_getoverrun AUE_NULL +#define LINUX_SYS_AUE_linux_timer_delete AUE_NULL +#define LINUX_SYS_AUE_linux_clock_settime AUE_CLOCK_SETTIME +#define LINUX_SYS_AUE_linux_clock_gettime AUE_NULL +#define LINUX_SYS_AUE_linux_clock_getres AUE_NULL +#define LINUX_SYS_AUE_linux_clock_nanosleep AUE_NULL +#define LINUX_SYS_AUE_linux_statfs64 AUE_NULL +#define LINUX_SYS_AUE_linux_fstatfs64 AUE_NULL +#define LINUX_SYS_AUE_linux_tgkill AUE_NULL +#define LINUX_SYS_AUE_linux_utimes AUE_NULL +#define LINUX_SYS_AUE_linux_fadvise64_64 AUE_NULL +#define LINUX_SYS_AUE_linux_mbind AUE_NULL +#define LINUX_SYS_AUE_linux_get_mempolicy AUE_NULL +#define LINUX_SYS_AUE_linux_set_mempolicy AUE_NULL +#define LINUX_SYS_AUE_linux_mq_open AUE_NULL +#define LINUX_SYS_AUE_linux_mq_unlink AUE_NULL +#define LINUX_SYS_AUE_linux_mq_timedsend AUE_NULL +#define LINUX_SYS_AUE_linux_mq_timedreceive AUE_NULL +#define LINUX_SYS_AUE_linux_mq_notify AUE_NULL +#define LINUX_SYS_AUE_linux_mq_getsetattr AUE_NULL +#define LINUX_SYS_AUE_linux_kexec_load AUE_NULL +#define LINUX_SYS_AUE_linux_waitid AUE_NULL +#define LINUX_SYS_AUE_linux_add_key AUE_NULL +#define LINUX_SYS_AUE_linux_request_key AUE_NULL +#define LINUX_SYS_AUE_linux_keyctl AUE_NULL +#define LINUX_SYS_AUE_linux_ioprio_set AUE_NULL +#define LINUX_SYS_AUE_linux_ioprio_get AUE_NULL +#define LINUX_SYS_AUE_linux_inotify_init AUE_NULL +#define LINUX_SYS_AUE_linux_inotify_add_watch AUE_NULL +#define LINUX_SYS_AUE_linux_inotify_rm_watch AUE_NULL +#define LINUX_SYS_AUE_linux_migrate_pages AUE_NULL +#define LINUX_SYS_AUE_linux_openat AUE_NULL +#define LINUX_SYS_AUE_linux_mkdirat AUE_NULL +#define LINUX_SYS_AUE_linux_mknodat AUE_NULL +#define LINUX_SYS_AUE_linux_fchownat AUE_NULL +#define LINUX_SYS_AUE_linux_futimesat AUE_NULL +#define LINUX_SYS_AUE_linux_fstatat64 AUE_NULL +#define LINUX_SYS_AUE_linux_unlinkat AUE_NULL +#define LINUX_SYS_AUE_linux_renameat AUE_NULL +#define LINUX_SYS_AUE_linux_linkat AUE_NULL +#define LINUX_SYS_AUE_linux_symlinkat AUE_NULL +#define LINUX_SYS_AUE_linux_readlinkat AUE_NULL +#define LINUX_SYS_AUE_linux_fchmodat AUE_NULL +#define LINUX_SYS_AUE_linux_faccessat AUE_NULL +#define LINUX_SYS_AUE_linux_pselect6 AUE_NULL +#define LINUX_SYS_AUE_linux_ppoll AUE_NULL +#define LINUX_SYS_AUE_linux_unshare AUE_NULL + #undef PAD_ #undef PADL_ #undef PADR_ ==== //depot/projects/soc2006/rdivacky_linuxolator/amd64/linux32/linux32_syscall.h#13 (text+ko) ==== @@ -2,8 +2,8 @@ * System call numbers. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD$ - * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.18 2006/07/28 19:05:26 jhb Exp + * $FreeBSD: src/sys/amd64/linux32/linux32_syscall.h,v 1.21 2006/08/15 17:36:58 jhb Exp $ + * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.19 2006/08/15 12:28:14 netchild Exp */ #define LINUX_SYS_exit 1 ==== //depot/projects/soc2006/rdivacky_linuxolator/amd64/linux32/linux32_sysent.c#13 (text+ko) ==== @@ -2,8 +2,8 @@ * System call switch table. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD$ - * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.18 2006/07/28 19:05:26 jhb Exp + * $FreeBSD: src/sys/amd64/linux32/linux32_sysent.c,v 1.21 2006/08/15 17:36:58 jhb Exp $ + * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.19 2006/08/15 12:28:14 netchild Exp */ #include ==== //depot/projects/soc2006/rdivacky_linuxolator/amd64/linux32/linux32_sysvec.c#9 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_sysvec.c,v 1.19 2006/08/10 22:05:25 netchild Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_sysvec.c,v 1.21 2006/08/15 14:58:15 netchild Exp $"); #include "opt_compat.h" #ifndef COMPAT_IA32 ==== //depot/projects/soc2006/rdivacky_linuxolator/amd64/linux32/syscalls.conf#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/amd64/linux32/syscalls.conf,v 1.1 2004/08/16 07:55:06 tjr Exp $ +# $FreeBSD: src/sys/amd64/linux32/syscalls.conf,v 1.2 2006/08/15 17:25:54 jhb Exp $ sysnames="/dev/null" sysproto="linux32_proto.h" sysproto_h=_LINUX_SYSPROTO_H_ @@ -8,4 +8,4 @@ syscallprefix="LINUX_SYS_" switchname="linux_sysent" namesname="linux_syscallnames" -sysvec="\n" +systrace="/dev/null" ==== //depot/projects/soc2006/rdivacky_linuxolator/amd64/linux32/syscalls.master#14 (text+ko) ==== @@ -1,4 +1,4 @@ - $FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.18 2006/07/28 19:05:26 jhb Exp $ + $FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.19 2006/08/15 12:28:14 netchild Exp $ ; @(#)syscalls.master 8.1 (Berkeley) 7/19/93 ; System call name/number master file (or rather, slave, from LINUX). ==== //depot/projects/soc2006/rdivacky_linuxolator/arm/arm/elf_trampoline.c#4 (text+ko) ==== @@ -23,7 +23,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/arm/elf_trampoline.c,v 1.11 2006/06/23 22:45:35 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/elf_trampoline.c,v 1.12 2006/08/15 18:11:25 imp Exp $"); #include #include #include @@ -36,6 +36,10 @@ #include +/* + * Since we are compiled outside of the normal kernel build process, we + * need to include opt_global.h manually. + */ #include "opt_global.h" #include "opt_kernname.h" ==== //depot/projects/soc2006/rdivacky_linuxolator/arm/arm/mem.c#3 (text+ko) ==== @@ -37,7 +37,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/arm/mem.c,v 1.3 2006/08/08 20:59:38 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/mem.c,v 1.4 2006/08/15 16:43:07 cognet Exp $"); /* * Memory special file @@ -63,8 +63,7 @@ #include #include - -#include "opt_global.h" +#include /* * Used in /dev/mem drivers and elsewhere ==== //depot/projects/soc2006/rdivacky_linuxolator/boot/forth/loader.conf#3 (text+ko) ==== @@ -6,7 +6,7 @@ # # All arguments must be in double quotes. # -# $FreeBSD: src/sys/boot/forth/loader.conf,v 1.108 2006/07/26 12:59:42 ache Exp $ +# $FreeBSD: src/sys/boot/forth/loader.conf,v 1.109 2006/08/14 18:04:01 brueffer Exp $ ############################################################## ### Basic configuration options ############################ @@ -123,6 +123,7 @@ coda_load="NO" # CODA filesystem fdescfs_load="NO" # Filedescriptors filesystem linprocfs_load="NO" # Linux compatibility process filesystem +linsysfs_load="NO" # Linux compatibility system filesystem msdosfs_load="NO" # FAT-12/16/32 nfsclient_load="NO" # NFS client nfsserver_load="NO" # NFS server @@ -132,6 +133,7 @@ procfs_load="NO" # Process filesystem #umapfs_load="NO" # User-id map filesystem unionfs_load="NO" # Union filesystem +xfs_load="NO" # XFS # Related stuff @@ -206,29 +208,32 @@ if_aue_load="NO" # ADMtek AN986 Pegasus USB Ethernet if_awi_load="NO" # AMD PCnetMobile IEEE 802.11 wireless NICs if_axe_load="NO" # ASIX Electronics AX88172 USB Ethernet +if_bce_load="NO" # Broadcom NetXtreme II Gigabit Ethernet if_bfe_load="NO" # Broadcom BCM4401 -if_bge_load="NO" # Broadcom BCM570x PCI gigabit ethernet +if_bge_load="NO" # Broadcom BCM570x PCI Gigabit Ethernet if_cm_load="NO" # SMC (90c26, 90c56, 90c66) if_cs_load="NO" # Crystal Semiconductor CS8920 if_cue_load="NO" # CATC USB-EL1210A USB Ethernet if_dc_load="NO" # DEC/Intel 21143 and various workalikes -if_de_load="NO" # DEC DC21x4x ethernet -if_ed_load="NO" # National Semiconductor DS8390/WD83C690 ethernet -if_el_load="NO" # 3Com Etherlink 3C501 -if_em_load="NO" # Intel(R) PRO/1000 gigabit ethernet +if_de_load="NO" # DEC DC21x4x Ethernet +if_ed_load="NO" # National Semiconductor DS8390/WD83C690 Ethernet +if_em_load="NO" # Intel(R) PRO/1000 Gigabit Ethernet if_en_load="NO" # Midway-based ATM interfaces if_ep_load="NO" # 3Com Etherlink III (3c5x9) -if_ex_load="NO" # Intel EtherExpress Pro/10 ethernet +if_ex_load="NO" # Intel EtherExpress Pro/10 Ethernet if_fe_load="NO" # Fujitsu MB86960A/MB86965A based Ethernet adapters if_fxp_load="NO" # Intel EtherExpress PRO/100B (82557, 82558) if_gem_load="NO" # Sun GEM/Sun ERI/Apple GMAC -if_gx_load="NO" # Intel Pro/1000 gigabit ethernet if_hme_load="NO" # Sun Microelectronics STP2002-STQ Ethernet if_ie_load="NO" # Intel 82586 +if_ipw_load="NO" # Intel PRO/Wireless 2100 wireless +if_iwi_load="NO" # Intel PRO/Wireless 2200BG/2225BG/2915ABG wireless if_le_load="NO" # AMD Am7900 LANCE and Am79C9xx PCnet -if_lge_load="NO" # Level 1 LXT1001 NetCellerator PCI gigabit ethernet -if_my_load="NO" # Myson PCI fast ethernet -if_nge_load="NO" # National Semiconductor PCI gigabit ethernet +if_lge_load="NO" # Level 1 LXT1001 NetCellerator PCI Gigabit Ethernet +if_mxge_load="NO" # Myricom Myri10GE 10 Gigabit Ethernet +if_my_load="NO" # Myson PCI Fast Ethernet +if_nge_load="NO" # National Semiconductor PCI Gigabit Ethernet +if_nfe_load="NO" # NVIDIA nForce MCP Networking Adapter if_nve_load="NO" # NVIDIA nForce MCP Networking Adapter if_oltr_load="NO" # Olicom if_pcn_load="NO" # AMD PCnet PCI @@ -239,14 +244,14 @@ if_sbni_load="NO" # Granch SBNI12 leased line adapters if_sf_load="NO" # Adaptec Duralink PCI (AIC-6915 "starfire") if_sis_load="NO" # Silicon Integrated Systems SiS 900/7016 -if_sk_load="NO" # SysKonnect SK-984x series PCI gigabit ethernet +if_sk_load="NO" # SysKonnect SK-984x series PCI Gigabit Ethernet if_sn_load="NO" # SMC 91Cxx if_sr_load="NO" # synchronous RISCom/N2 / WANic 400/405 -if_ste_load="NO" # Sundance Technologies ST201 fast ethernet -if_stge_load="NO" # Sundance/Tamarack TC9021 gigabit ethernet +if_ste_load="NO" # Sundance Technologies ST201 Fast Ethernet +if_stge_load="NO" # Sundance/Tamarack TC9021 Gigabit Ethernet if_ti_load="NO" # Alteon Networks Tigon 1 and Tigon 2 if_tl_load="NO" # Texas Instruments TNETE100 ("ThunderLAN") -if_tx_load="NO" # SMC 83c17x fast ethernet +if_tx_load="NO" # SMC 83c17x Fast Ethernet if_txp_load="NO" # 3Com 3XP Typhoon/Sidewinder (3CR990) if_vge_load="NO" # VIA VT6122 PCI Gigabit Ethernet if_udav_load="NO" # Davicom DM9601 USB Ethernet @@ -302,6 +307,7 @@ sound_load="NO" # Digital sound subsystem snd_ad1816_load="NO" # ad1816 +snd_ak452x_load="NO" # ak452x snd_als4000_load="NO" # als4000 snd_atiixp_load="NO" # atiixp snd_cmi_load="NO" # cmi @@ -310,6 +316,7 @@ snd_ds1_load="NO" # ds1 snd_emu10k1_load="NO" # Creative Sound Blaster Live snd_emu10kx_load="NO" # Creative SoundBlaster Live! and Audigy +snd_envy24_load="NO" # VIA Envy24 snd_es137x_load="NO" # es137x snd_ess_load="NO" # ess snd_fm801_load="NO" # fm801 ==== //depot/projects/soc2006/rdivacky_linuxolator/cam/scsi/scsi_pass.c#2 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_pass.c,v 1.43 2005/01/22 07:21:25 mjacob Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_pass.c,v 1.44 2006/08/14 19:29:45 jhb Exp $"); #include #include @@ -361,7 +361,7 @@ */ if ((flags & O_NONBLOCK) != 0) { xpt_print_path(periph->path); - printf("can't do nonblocking accesss\n"); + printf("can't do nonblocking access\n"); splx(s); return(EINVAL); } ==== //depot/projects/soc2006/rdivacky_linuxolator/compat/freebsd32/freebsd32_misc.c#4 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/freebsd32/freebsd32_misc.c,v 1.57 2006/07/10 21:38:16 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/freebsd32/freebsd32_misc.c,v 1.58 2006/08/16 00:02:36 jkim Exp $"); #include "opt_compat.h" @@ -38,6 +38,7 @@ #include #include #include +#include #include #include #include /* Must come after sys/malloc.h */ ==== //depot/projects/soc2006/rdivacky_linuxolator/compat/freebsd32/freebsd32_proto.h#5 (text+ko) ==== @@ -2,7 +2,7 @@ * System call prototypes. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/freebsd32/freebsd32_proto.h,v 1.57 2006/07/28 19:08:35 jhb Exp $ + * $FreeBSD: src/sys/compat/freebsd32/freebsd32_proto.h,v 1.58 2006/08/15 17:36:59 jhb Exp $ * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.70 2006/07/28 19:05:26 jhb Exp */ @@ -11,11 +11,10 @@ #include #include -#include -#include #include +#include -#include +#include struct proc; @@ -416,6 +415,53 @@ #endif /* COMPAT_FREEBSD4 */ +#define FREEBSD32_SYS_AUE_freebsd32_wait4 AUE_WAIT4 +#define FREEBSD32_SYS_AUE_freebsd32_recvmsg AUE_RECVMSG +#define FREEBSD32_SYS_AUE_freebsd32_sendmsg AUE_SENDMSG +#define FREEBSD32_SYS_AUE_freebsd32_recvfrom AUE_RECVFROM +#define FREEBSD32_SYS_AUE_freebsd32_sigaltstack AUE_SIGPENDING +#define FREEBSD32_SYS_AUE_freebsd32_execve AUE_EXECVE +#define FREEBSD32_SYS_AUE_freebsd32_setitimer AUE_SETITIMER +#define FREEBSD32_SYS_AUE_freebsd32_getitimer AUE_GETITIMER +#define FREEBSD32_SYS_AUE_freebsd32_select AUE_SELECT +#define FREEBSD32_SYS_AUE_freebsd32_gettimeofday AUE_GETTIMEOFDAY +#define FREEBSD32_SYS_AUE_freebsd32_getrusage AUE_GETRUSAGE +#define FREEBSD32_SYS_AUE_freebsd32_readv AUE_READV +#define FREEBSD32_SYS_AUE_freebsd32_writev AUE_WRITEV +#define FREEBSD32_SYS_AUE_freebsd32_settimeofday AUE_SETTIMEOFDAY +#define FREEBSD32_SYS_AUE_freebsd32_utimes AUE_UTIMES +#define FREEBSD32_SYS_AUE_freebsd32_adjtime AUE_ADJTIME +#define FREEBSD32_SYS_AUE_freebsd32_semsys AUE_SEMSYS +#define FREEBSD32_SYS_AUE_freebsd32_msgsys AUE_MSGSYS +#define FREEBSD32_SYS_AUE_freebsd32_shmsys AUE_SHMSYS +#define FREEBSD32_SYS_AUE_freebsd32_pread AUE_PREAD +#define FREEBSD32_SYS_AUE_freebsd32_pwrite AUE_PWRITE +#define FREEBSD32_SYS_AUE_freebsd32_stat AUE_STAT +#define FREEBSD32_SYS_AUE_freebsd32_fstat AUE_FSTAT +#define FREEBSD32_SYS_AUE_freebsd32_lstat AUE_LSTAT +#define FREEBSD32_SYS_AUE_freebsd32_mmap AUE_MMAP +#define FREEBSD32_SYS_AUE_freebsd32_lseek AUE_LSEEK +#define FREEBSD32_SYS_AUE_freebsd32_truncate AUE_TRUNCATE +#define FREEBSD32_SYS_AUE_freebsd32_ftruncate AUE_FTRUNCATE +#define FREEBSD32_SYS_AUE_freebsd32_sysctl AUE_SYSCTL +#define FREEBSD32_SYS_AUE_freebsd32_futimes AUE_FUTIMES +#define FREEBSD32_SYS_AUE_freebsd32_shmctl AUE_SHMCTL +#define FREEBSD32_SYS_AUE_freebsd32_clock_gettime AUE_NULL +#define FREEBSD32_SYS_AUE_freebsd32_clock_settime AUE_CLOCK_SETTIME +#define FREEBSD32_SYS_AUE_freebsd32_clock_getres AUE_NULL +#define FREEBSD32_SYS_AUE_freebsd32_nanosleep AUE_NULL +#define FREEBSD32_SYS_AUE_freebsd32_lutimes AUE_LUTIMES +#define FREEBSD32_SYS_AUE_freebsd32_preadv AUE_PREADV +#define FREEBSD32_SYS_AUE_freebsd32_pwritev AUE_PWRITEV +#define FREEBSD32_SYS_AUE_freebsd32_modstat AUE_NULL +#define FREEBSD32_SYS_AUE_freebsd32_kevent AUE_NULL +#define FREEBSD32_SYS_AUE_freebsd32_sendfile AUE_NULL +#define FREEBSD32_SYS_AUE_freebsd32_sigaction AUE_SIGACTION +#define FREEBSD32_SYS_AUE_freebsd32_sigreturn AUE_SIGRETURN +#define FREEBSD32_SYS_AUE_freebsd32_getcontext AUE_NULL +#define FREEBSD32_SYS_AUE_freebsd32_setcontext AUE_NULL +#define FREEBSD32_SYS_AUE_freebsd32_swapcontext AUE_NULL + #undef PAD_ #undef PADL_ #undef PADR_ ==== //depot/projects/soc2006/rdivacky_linuxolator/compat/freebsd32/freebsd32_syscall.h#5 (text+ko) ==== @@ -2,7 +2,7 @@ * System call numbers. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscall.h,v 1.55 2006/07/28 19:08:35 jhb Exp $ + * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscall.h,v 1.56 2006/08/15 17:36:59 jhb Exp $ * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.70 2006/07/28 19:05:26 jhb Exp */ ==== //depot/projects/soc2006/rdivacky_linuxolator/compat/freebsd32/freebsd32_syscalls.c#5 (text+ko) ==== @@ -2,7 +2,7 @@ * System call names. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscalls.c,v 1.46 2006/07/28 19:08:35 jhb Exp $ + * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscalls.c,v 1.47 2006/08/15 17:36:59 jhb Exp $ * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.70 2006/07/28 19:05:26 jhb Exp */ ==== //depot/projects/soc2006/rdivacky_linuxolator/compat/freebsd32/freebsd32_sysent.c#5 (text+ko) ==== @@ -2,7 +2,7 @@ * System call switch table. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/freebsd32/freebsd32_sysent.c,v 1.56 2006/07/28 19:08:35 jhb Exp $ + * $FreeBSD: src/sys/compat/freebsd32/freebsd32_sysent.c,v 1.57 2006/08/15 17:36:59 jhb Exp $ * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.70 2006/07/28 19:05:26 jhb Exp */ @@ -32,473 +32,473 @@ /* The casts are bogus but will do for now. */ struct sysent freebsd32_sysent[] = { - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 0 = syscall */ - { AS(sys_exit_args), (sy_call_t *)sys_exit, AUE_EXIT }, /* 1 = exit */ - { 0, (sy_call_t *)fork, AUE_FORK }, /* 2 = fork */ - { AS(read_args), (sy_call_t *)read, AUE_READ }, /* 3 = read */ - { AS(write_args), (sy_call_t *)write, AUE_WRITE }, /* 4 = write */ - { AS(open_args), (sy_call_t *)open, AUE_OPEN_RWTC }, /* 5 = open */ - { AS(close_args), (sy_call_t *)close, AUE_CLOSE }, /* 6 = close */ - { AS(freebsd32_wait4_args), (sy_call_t *)freebsd32_wait4, AUE_WAIT4 }, /* 7 = freebsd32_wait4 */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 8 = obsolete old creat */ - { AS(link_args), (sy_call_t *)link, AUE_LINK }, /* 9 = link */ - { AS(unlink_args), (sy_call_t *)unlink, AUE_UNLINK }, /* 10 = unlink */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 11 = obsolete execv */ - { AS(chdir_args), (sy_call_t *)chdir, AUE_CHDIR }, /* 12 = chdir */ - { AS(fchdir_args), (sy_call_t *)fchdir, AUE_FCHDIR }, /* 13 = fchdir */ - { AS(mknod_args), (sy_call_t *)mknod, AUE_MKNOD }, /* 14 = mknod */ - { AS(chmod_args), (sy_call_t *)chmod, AUE_CHMOD }, /* 15 = chmod */ - { AS(chown_args), (sy_call_t *)chown, AUE_CHOWN }, /* 16 = chown */ - { AS(obreak_args), (sy_call_t *)obreak, AUE_NULL }, /* 17 = break */ - { compat4(AS(freebsd4_freebsd32_getfsstat_args),freebsd32_getfsstat), AUE_GETFSSTAT }, /* 18 = old freebsd32_getfsstat */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 19 = obsolete olseek */ - { 0, (sy_call_t *)getpid, AUE_GETPID }, /* 20 = getpid */ - { AS(mount_args), (sy_call_t *)mount, AUE_MOUNT }, /* 21 = mount */ - { AS(unmount_args), (sy_call_t *)unmount, AUE_UMOUNT }, /* 22 = unmount */ - { AS(setuid_args), (sy_call_t *)setuid, AUE_SETUID }, /* 23 = setuid */ - { 0, (sy_call_t *)getuid, AUE_GETUID }, /* 24 = getuid */ - { 0, (sy_call_t *)geteuid, AUE_GETEUID }, /* 25 = geteuid */ - { AS(ptrace_args), (sy_call_t *)ptrace, AUE_PTRACE }, /* 26 = ptrace */ - { AS(freebsd32_recvmsg_args), (sy_call_t *)freebsd32_recvmsg, AUE_RECVMSG }, /* 27 = freebsd32_recvmsg */ - { AS(freebsd32_sendmsg_args), (sy_call_t *)freebsd32_sendmsg, AUE_SENDMSG }, /* 28 = freebsd32_sendmsg */ - { AS(freebsd32_recvfrom_args), (sy_call_t *)freebsd32_recvfrom, AUE_RECVFROM }, /* 29 = freebsd32_recvfrom */ - { AS(accept_args), (sy_call_t *)accept, AUE_ACCEPT }, /* 30 = accept */ - { AS(getpeername_args), (sy_call_t *)getpeername, AUE_GETPEERNAME }, /* 31 = getpeername */ - { AS(getsockname_args), (sy_call_t *)getsockname, AUE_GETSOCKNAME }, /* 32 = getsockname */ - { AS(access_args), (sy_call_t *)access, AUE_ACCESS }, /* 33 = access */ - { AS(chflags_args), (sy_call_t *)chflags, AUE_CHFLAGS }, /* 34 = chflags */ - { AS(fchflags_args), (sy_call_t *)fchflags, AUE_FCHFLAGS }, /* 35 = fchflags */ - { 0, (sy_call_t *)sync, AUE_SYNC }, /* 36 = sync */ - { AS(kill_args), (sy_call_t *)kill, AUE_KILL }, /* 37 = kill */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 38 = ostat */ - { 0, (sy_call_t *)getppid, AUE_GETPPID }, /* 39 = getppid */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 40 = olstat */ - { AS(dup_args), (sy_call_t *)dup, AUE_DUP }, /* 41 = dup */ - { 0, (sy_call_t *)pipe, AUE_PIPE }, /* 42 = pipe */ - { 0, (sy_call_t *)getegid, AUE_GETEGID }, /* 43 = getegid */ - { AS(profil_args), (sy_call_t *)profil, AUE_PROFILE }, /* 44 = profil */ - { AS(ktrace_args), (sy_call_t *)ktrace, AUE_KTRACE }, /* 45 = ktrace */ - { compat(AS(ofreebsd32_sigaction_args),freebsd32_sigaction), AUE_SIGACTION }, /* 46 = old freebsd32_sigaction */ - { 0, (sy_call_t *)getgid, AUE_GETGID }, /* 47 = getgid */ - { compat(AS(ofreebsd32_sigprocmask_args),freebsd32_sigprocmask), AUE_SIGPROCMASK }, /* 48 = old freebsd32_sigprocmask */ - { AS(getlogin_args), (sy_call_t *)getlogin, AUE_GETLOGIN }, /* 49 = getlogin */ - { AS(setlogin_args), (sy_call_t *)setlogin, AUE_SETLOGIN }, /* 50 = setlogin */ - { AS(acct_args), (sy_call_t *)acct, AUE_ACCT }, /* 51 = acct */ - { compat(0,freebsd32_sigpending), AUE_SIGPENDING }, /* 52 = old freebsd32_sigpending */ - { AS(freebsd32_sigaltstack_args), (sy_call_t *)freebsd32_sigaltstack, AUE_SIGPENDING }, /* 53 = freebsd32_sigaltstack */ - { AS(ioctl_args), (sy_call_t *)ioctl, AUE_IOCTL }, /* 54 = ioctl */ - { AS(reboot_args), (sy_call_t *)reboot, AUE_REBOOT }, /* 55 = reboot */ - { AS(revoke_args), (sy_call_t *)revoke, AUE_REVOKE }, /* 56 = revoke */ - { AS(symlink_args), (sy_call_t *)symlink, AUE_SYMLINK }, /* 57 = symlink */ - { AS(readlink_args), (sy_call_t *)readlink, AUE_READLINK }, /* 58 = readlink */ - { AS(freebsd32_execve_args), (sy_call_t *)freebsd32_execve, AUE_EXECVE }, /* 59 = freebsd32_execve */ - { AS(umask_args), (sy_call_t *)umask, AUE_UMASK }, /* 60 = umask */ - { AS(chroot_args), (sy_call_t *)chroot, AUE_CHROOT }, /* 61 = chroot */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 62 = obsolete ofstat */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 63 = obsolete ogetkerninfo */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 64 = obsolete ogetpagesize */ - { AS(msync_args), (sy_call_t *)msync, AUE_MSYNC }, /* 65 = msync */ - { 0, (sy_call_t *)vfork, AUE_VFORK }, /* 66 = vfork */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 67 = obsolete vread */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 68 = obsolete vwrite */ - { AS(sbrk_args), (sy_call_t *)sbrk, AUE_SBRK }, /* 69 = sbrk */ - { AS(sstk_args), (sy_call_t *)sstk, AUE_SSTK }, /* 70 = sstk */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 71 = obsolete ommap */ - { AS(ovadvise_args), (sy_call_t *)ovadvise, AUE_O_VADVISE }, /* 72 = vadvise */ - { AS(munmap_args), (sy_call_t *)munmap, AUE_MUNMAP }, /* 73 = munmap */ - { AS(mprotect_args), (sy_call_t *)mprotect, AUE_MPROTECT }, /* 74 = mprotect */ - { AS(madvise_args), (sy_call_t *)madvise, AUE_MADVISE }, /* 75 = madvise */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 76 = obsolete vhangup */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 77 = obsolete vlimit */ - { AS(mincore_args), (sy_call_t *)mincore, AUE_MINCORE }, /* 78 = mincore */ - { AS(getgroups_args), (sy_call_t *)getgroups, AUE_GETGROUPS }, /* 79 = getgroups */ - { AS(setgroups_args), (sy_call_t *)setgroups, AUE_SETGROUPS }, /* 80 = setgroups */ - { 0, (sy_call_t *)getpgrp, AUE_GETPGRP }, /* 81 = getpgrp */ - { AS(setpgid_args), (sy_call_t *)setpgid, AUE_SETPGRP }, /* 82 = setpgid */ - { AS(freebsd32_setitimer_args), (sy_call_t *)freebsd32_setitimer, AUE_SETITIMER }, /* 83 = freebsd32_setitimer */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 84 = obsolete owait */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 85 = obsolete oswapon */ - { AS(freebsd32_getitimer_args), (sy_call_t *)freebsd32_getitimer, AUE_GETITIMER }, /* 86 = freebsd32_getitimer */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 87 = obsolete ogethostname */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 88 = obsolete osethostname */ - { 0, (sy_call_t *)getdtablesize, AUE_GETDTABLESIZE }, /* 89 = getdtablesize */ - { AS(dup2_args), (sy_call_t *)dup2, AUE_DUP2 }, /* 90 = dup2 */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 91 = getdopt */ - { AS(fcntl_args), (sy_call_t *)fcntl, AUE_FCNTL }, /* 92 = fcntl */ - { AS(freebsd32_select_args), (sy_call_t *)freebsd32_select, AUE_SELECT }, /* 93 = freebsd32_select */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 94 = setdopt */ - { AS(fsync_args), (sy_call_t *)fsync, AUE_FSYNC }, /* 95 = fsync */ - { AS(setpriority_args), (sy_call_t *)setpriority, AUE_SETPRIORITY }, /* 96 = setpriority */ - { AS(socket_args), (sy_call_t *)socket, AUE_SOCKET }, /* 97 = socket */ - { AS(connect_args), (sy_call_t *)connect, AUE_CONNECT }, /* 98 = connect */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 99 = obsolete oaccept */ - { AS(getpriority_args), (sy_call_t *)getpriority, AUE_GETPRIORITY }, /* 100 = getpriority */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 101 = obsolete osend */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 102 = obsolete orecv */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 103 = obsolete osigreturn */ - { AS(bind_args), (sy_call_t *)bind, AUE_BIND }, /* 104 = bind */ - { AS(setsockopt_args), (sy_call_t *)setsockopt, AUE_SETSOCKOPT }, /* 105 = setsockopt */ - { AS(listen_args), (sy_call_t *)listen, AUE_LISTEN }, /* 106 = listen */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 107 = obsolete vtimes */ - { compat(AS(ofreebsd32_sigvec_args),freebsd32_sigvec), AUE_O_SIGVEC }, /* 108 = old freebsd32_sigvec */ - { compat(AS(ofreebsd32_sigblock_args),freebsd32_sigblock), AUE_O_SIGBLOCK }, /* 109 = old freebsd32_sigblock */ - { compat(AS(ofreebsd32_sigsetmask_args),freebsd32_sigsetmask), AUE_O_SIGSETMASK }, /* 110 = old freebsd32_sigsetmask */ - { compat(AS(ofreebsd32_sigsuspend_args),freebsd32_sigsuspend), AUE_SIGSUSPEND }, /* 111 = old freebsd32_sigsuspend */ - { compat(AS(ofreebsd32_sigstack_args),freebsd32_sigstack), AUE_O_SIGSTACK }, /* 112 = old freebsd32_sigstack */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 113 = obsolete orecvmsg */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 114 = obsolete osendmsg */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 115 = obsolete vtrace */ - { AS(freebsd32_gettimeofday_args), (sy_call_t *)freebsd32_gettimeofday, AUE_GETTIMEOFDAY }, /* 116 = freebsd32_gettimeofday */ - { AS(freebsd32_getrusage_args), (sy_call_t *)freebsd32_getrusage, AUE_GETRUSAGE }, /* 117 = freebsd32_getrusage */ - { AS(getsockopt_args), (sy_call_t *)getsockopt, AUE_GETSOCKOPT }, /* 118 = getsockopt */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 119 = resuba */ - { AS(freebsd32_readv_args), (sy_call_t *)freebsd32_readv, AUE_READV }, /* 120 = freebsd32_readv */ - { AS(freebsd32_writev_args), (sy_call_t *)freebsd32_writev, AUE_WRITEV }, /* 121 = freebsd32_writev */ - { AS(freebsd32_settimeofday_args), (sy_call_t *)freebsd32_settimeofday, AUE_SETTIMEOFDAY }, /* 122 = freebsd32_settimeofday */ - { AS(fchown_args), (sy_call_t *)fchown, AUE_FCHOWN }, /* 123 = fchown */ - { AS(fchmod_args), (sy_call_t *)fchmod, AUE_FCHMOD }, /* 124 = fchmod */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 125 = obsolete orecvfrom */ - { AS(setreuid_args), (sy_call_t *)setreuid, AUE_SETREUID }, /* 126 = setreuid */ - { AS(setregid_args), (sy_call_t *)setregid, AUE_SETREGID }, /* 127 = setregid */ - { AS(rename_args), (sy_call_t *)rename, AUE_RENAME }, /* 128 = rename */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 129 = obsolete otruncate */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 130 = obsolete ftruncate */ - { AS(flock_args), (sy_call_t *)flock, AUE_FLOCK }, /* 131 = flock */ - { AS(mkfifo_args), (sy_call_t *)mkfifo, AUE_MKFIFO }, /* 132 = mkfifo */ - { AS(sendto_args), (sy_call_t *)sendto, AUE_SENDTO }, /* 133 = sendto */ - { AS(shutdown_args), (sy_call_t *)shutdown, AUE_SHUTDOWN }, /* 134 = shutdown */ - { AS(socketpair_args), (sy_call_t *)socketpair, AUE_SOCKETPAIR }, /* 135 = socketpair */ - { AS(mkdir_args), (sy_call_t *)mkdir, AUE_MKDIR }, /* 136 = mkdir */ - { AS(rmdir_args), (sy_call_t *)rmdir, AUE_RMDIR }, /* 137 = rmdir */ - { AS(freebsd32_utimes_args), (sy_call_t *)freebsd32_utimes, AUE_UTIMES }, /* 138 = freebsd32_utimes */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 139 = obsolete 4.2 sigreturn */ - { AS(freebsd32_adjtime_args), (sy_call_t *)freebsd32_adjtime, AUE_ADJTIME }, /* 140 = freebsd32_adjtime */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 141 = obsolete ogetpeername */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 142 = obsolete ogethostid */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 143 = obsolete sethostid */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 144 = obsolete getrlimit */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 145 = obsolete setrlimit */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 146 = obsolete killpg */ - { 0, (sy_call_t *)setsid, AUE_SETSID }, /* 147 = setsid */ - { AS(quotactl_args), (sy_call_t *)quotactl, AUE_QUOTACTL }, /* 148 = quotactl */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 149 = obsolete oquota */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 150 = obsolete ogetsockname */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 151 = sem_lock */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 152 = sem_wakeup */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 153 = asyncdaemon */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 154 = nosys */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 155 = nfssvc */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 156 = obsolete ogetdirentries */ - { compat4(AS(freebsd4_freebsd32_statfs_args),freebsd32_statfs), AUE_STATFS }, /* 157 = old freebsd32_statfs */ - { compat4(AS(freebsd4_freebsd32_fstatfs_args),freebsd32_fstatfs), AUE_FSTATFS }, /* 158 = old freebsd32_fstatfs */ - { 0, (sy_call_t *)nosys, AUE_NULL }, /* 159 = nosys */ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Aug 16 20:37:56 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 15F4516A4E0; Wed, 16 Aug 2006 20:37:56 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 E312D16A4DE for ; Wed, 16 Aug 2006 20:37:55 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0C40D43D46 for ; Wed, 16 Aug 2006 20:37:55 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7GKbsaB021149 for ; Wed, 16 Aug 2006 20:37:54 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7GKbsah021146 for perforce@freebsd.org; Wed, 16 Aug 2006 20:37:54 GMT (envelope-from jb@freebsd.org) Date: Wed, 16 Aug 2006 20:37:54 GMT Message-Id: <200608162037.k7GKbsah021146@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 104290 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 16 Aug 2006 20:37:56 -0000 http://perforce.freebsd.org/chv.cgi?CH=104290 Change 104290 by jb@jb_freebsd2 on 2006/08/16 20:37:27 IFlibbsdelf (a.k.a. two steps forward, one step back) Affected files ... .. //depot/projects/dtrace/src/lib/libelf/Makefile#7 integrate .. //depot/projects/dtrace/src/lib/libelf/_libelf.h#4 integrate .. //depot/projects/dtrace/src/lib/libelf/elf_allocate.c#5 delete .. //depot/projects/dtrace/src/lib/libelf/elf_errmsg.c#4 integrate .. //depot/projects/dtrace/src/lib/libelf/elf_memory.c#3 integrate .. //depot/projects/dtrace/src/lib/libelf/gelf_ehdr.c#1 branch .. //depot/projects/dtrace/src/lib/libelf/gelf_getehdr.3#2 integrate .. //depot/projects/dtrace/src/lib/libelf/gelf_getehdr.c#3 delete .. //depot/projects/dtrace/src/lib/libelf/gelf_newehdr.3#2 integrate .. //depot/projects/dtrace/src/lib/libelf/gelf_newehdr.c#2 delete .. //depot/projects/dtrace/src/lib/libelf/libelf.c#2 integrate .. //depot/projects/dtrace/src/lib/libelf/libelf.h#4 integrate .. //depot/projects/dtrace/src/lib/libelf/libelf_allocate.c#1 branch .. //depot/projects/dtrace/src/lib/libelf/libelf_ar.c#1 branch .. //depot/projects/dtrace/src/lib/libelf/libelf_ehdr.c#1 branch Differences ... ==== //depot/projects/dtrace/src/lib/libelf/Makefile#7 (text+ko) ==== @@ -2,8 +2,7 @@ LIB= elf -SRCS= elf_allocate.c \ - elf_begin.c \ +SRCS= elf_begin.c \ elf_cntl.c \ elf_dump.c \ elf_dump_argv.c \ @@ -31,7 +30,7 @@ elf_version.c \ gelf_fsize.c \ gelf_getclass.c \ - gelf_getehdr.c \ + gelf_ehdr.c \ gelf_getphdr.c \ gelf_getshdr.c \ gelf_getsym.c \ @@ -42,7 +41,10 @@ gelf_update_shdr.c \ gelf_update_sym.c \ gelf_xlate.c \ - libelf.c + libelf.c \ + libelf_allocate.c \ + libelf_ar.c \ + libelf_ehdr.c INCS= libelf.h gelf.h DPSRCS+= libelf_fsize.c libelf_msize.c libelf_convert.c @@ -97,8 +99,13 @@ gelf_xlatetof.3 gelf_xlatetom.3 MLINKS+= \ - gelf_fsize.3 elf32_fsize.3 \ - gelf_fsize.3 elf64_fsize.3 + gelf_fsize.3 elf32_fsize.3 \ + gelf_fsize.3 elf64_fsize.3 \ + gelf_getehdr.3 elf32_getehdr.3 \ + gelf_getehdr.3 elf64_getehdr.3 \ + gelf_newehdr.3 elf32_newehdr.3 \ + gelf_newehdr.3 elf64_newehdr.3 + MLINKS+= \ elf_flagdata.3 elf_flagehdr.3 \ ==== //depot/projects/dtrace/src/lib/libelf/_libelf.h#4 (text+ko) ==== @@ -42,6 +42,7 @@ #define LIBELF_MSG_SIZE 256 struct _libelf_globals { + int libelf_arch; unsigned int libelf_byteorder; int libelf_class; int libelf_error; @@ -62,6 +63,8 @@ ((O) << LIBELF_OS_ERROR_SHIFT)); \ } while (0) +#define LIBELF_ADJUST_AR_SIZE(S) (((S) + 1) & ~1) + /* * Flags for library internal use. These use the upper 16 bits of a * flags field. @@ -72,7 +75,7 @@ struct _Elf { int e_activations; /* activation count */ - int e_byteorder; /* ELFDATA* */ + unsigned int e_byteorder; /* ELFDATA* */ int e_class; /* ELFCLASS* */ Elf_Cmd e_cmd; /* ELF_C_* used at creation time */ int e_fd; /* associated file descriptor */ @@ -99,14 +102,20 @@ struct { /* ar(1) archives */ off_t e_next; int e_nchildren; + char *e_rawstrtab; /* file name strings */ + size_t e_rawstrtabsz; + char *e_rawsymtab; /* symbol table */ + size_t e_rawsymtabsz; + Elf_Arhdr *e_hdrtab; + Elf_Arsym *e_symtab; } e_ar; struct { /* regular ELF files */ + union { + Elf32_Ehdr *e_ehdr32; + Elf64_Ehdr *e_ehdr64; + } e_ehdr; } e_elf; } e_u; - struct { /* archive members */ - LIST_ENTRY(_Elf) e_sibling; /* sibling */ - } e_mem; - }; enum { @@ -123,11 +132,12 @@ unsigned int _flags); int _libelf_dump64(Elf *_elf, const char *_name, const char *_outfile, unsigned int _flags); -void *libelf_ehdr(Elf *_e, int _elfclass, int _allocate); +void *_libelf_ehdr(Elf *_e, int _elfclass, int _allocate); void (*_libelf_get_translator(Elf_Type _t, int _direction, int _elfclass)) (char *_dst, char *_src, int _cnt, int _byteswap); int _libelf_malign(Elf_Type _t, int _elfclass); size_t _libelf_msize(Elf_Type _t, int _elfclass, unsigned int _version); +Elf *_libelf_ar_open(Elf *_e); void _libelf_release_elf(Elf *_e); #endif /* __LIBELF_H_ */ ==== //depot/projects/dtrace/src/lib/libelf/elf_errmsg.c#4 (text+ko) ==== @@ -41,7 +41,7 @@ DEFINE_ERROR(NONE, "No Error"), DEFINE_ERROR(ARCHIVE, "Malformed ar(1) archive"), DEFINE_ERROR(ARGUMENT, "Invalid argument"), - DEFINE_ERROR(HEADER, "Missing ELF header"), + DEFINE_ERROR(HEADER, "Missing or malformed ELF header"), DEFINE_ERROR(CLASS, "ELF class mismatch"), DEFINE_ERROR(MMAP, "File mapping failed"), DEFINE_ERROR(MODE, "Incorrect ELF descriptor mode"), ==== //depot/projects/dtrace/src/lib/libelf/elf_memory.c#3 (text+ko) ==== @@ -55,6 +55,10 @@ return (NULL); } + e->e_cmd = ELF_C_READ; + e->e_rawfile = image; + e->e_rawsize = sz; + #undef LIBELF_IS_ELF #define LIBELF_IS_ELF(P) ((P)[EI_MAG0] == ELFMAG0 && \ (P)[EI_MAG1] == ELFMAG1 && (P)[EI_MAG2] == ELFMAG2 && \ @@ -71,17 +75,11 @@ LIBELF_SET_ERROR(VERSION, 0); return (NULL); } - } else if (sz >= SARMAG && strncmp(image, ARMAG, SARMAG) == 0) { - e->e_kind = ELF_K_AR; - e->e_u.e_ar.e_nchildren = 0; - e->e_u.e_ar.e_next = (off_t) -1; /* XXX set to first element */ - } else + } else if (sz >= SARMAG && strncmp(image, ARMAG, SARMAG) == 0) + e = _libelf_ar_open(e); + else e->e_kind = ELF_K_NONE; - e->e_cmd = ELF_C_READ; - e->e_rawfile = image; - e->e_rawsize = sz; - if (e->e_kind == ELF_K_ELF) { src.d_buf = image; src.d_off = 0; ==== //depot/projects/dtrace/src/lib/libelf/gelf_getehdr.3#2 (text+ko) ==== @@ -46,32 +46,18 @@ These functions retrieve the ELF object file header from the ELF descriptor .Ar elf -and return a translated header descriptor structure to their caller. -.Pp -The semantics of translation between file data structures and memory -data structures is described in -.Xr elf 3 . -The semantics of translation between class-independent representations -and class-dependent representations is described in -.Xr gelf 3 . -The -.Vt Elf32_Ehdr -and -.Vt Elf64_Ehdr -header descriptors are described in -.Xr elf 5 . -The -.Vt Gelf_Ehdr -descriptor is described in -.Xr gelf 3 . +and return a translated header descriptor to their callers. .Pp Functions .Fn elf32_getehdr and .Fn elf64_getehdr -return a pointer to the appropriate class-specific header descriptor if it exists, or +return a pointer to the appropriate class-specific header descriptor +if it exists in the file referenced by descriptor +.Ar elf . +These functions return .Dv NULL -if no header exists for ELF descriptor +if an ELF header was not found in file .Ar elf . .Pp Function @@ -100,6 +86,10 @@ .Ar elf was not a descriptor for an ELF file. .It Bq Er ELF_E_ARGUMENT +The elf class of descriptor +.Ar elf +was not recognized. +.It Bq Er ELF_E_ARGUMENT Argument .Ar dst was null. ==== //depot/projects/dtrace/src/lib/libelf/gelf_newehdr.3#2 (text+ko) ==== @@ -30,7 +30,7 @@ .Nm elf32_newehdr .Nm elf64_newehdr .Nm gelf_newehdr -.Nd retrieve the object file header +.Nd retrieve or allocate the object file header .Sh LIBRARY .Lb libelf .Sh SYNOPSIS @@ -43,52 +43,78 @@ .Ft "void *" .Fn gelf_newehdr "Elf *elf" "int elfclass" .Sh DESCRIPTION -These functions retrieve the ELF object file -header from the ELF descriptor +These functions retrieve the ELF header from the ELF descriptor .Ar elf , allocating a new header if needed. -.Pp -The semantics of translation between file data structures and memory -data structures is described in +File data structures are translated to their in-memory representations +as described in .Xr elf 3 . -The -.Vt Elf32_Ehdr -and -.Vt Elf64_Ehdr -header descriptors are described in -.Xr elf 5 . .Pp -Functions +Function .Fn elf32_newehdr -and +returns a pointer to a 32 bit +.Vt Elf32_Ehdr +structure. +Function .Fn elf64_newehdr -return a pointer to a 32 bit and 64 bit class-specific header -descriptor respectively. +returns a pointer to a 64 bit +.Vt Elf64_Ehdr structure. .Pp -Function -.Fn gelf_newehdr -returns the value returned by -.Fn elf32_newehdr "elf" -when argument +When argument .Ar elfclass has value .Dv ELFCLASS32 , -and returns the value returned by -.Fn elf64_newehdr "elf" -when argument +function +.Fn gelf_newehdr +returns the value returned by +.Fn elf32_newehdr "elf" . +When argument .Ar elfclass has value -.Dv ELFCLASS64 . -Its return value is of type -.Ft "Elf32_Ehdr *" -or -.Ft "Elf64_Ehdr *" -depending on the value of argument -.Ar elfclass . +.Dv ELFCLASS64 +it returns the value returned by +.Fn elf64_newehdr "elf" . +.Pp +If a fresh header structure is allocated, the following members of the +structure will be set to zero except the following: +.Bl -tag -width indent +.It Va e_ident +Identification bytes at offsets +.Dv EI_MAG0 , +.Dv EI_MAG1 , +.Dv EI_MAG2 +and +.Dv EI_MAG3 +are set to the ELF signature. +The byte at offset +.Dv EI_CLASS +is set to the default ELF class for the host, +the byte at offset +.Dv EI_DATA +is set to +.Dv ELFDATANONE , +and byte at offset +.Dv EI_VERSION +is set to +.Dv EV_NONE . +.It Va e_machine +is set to +.Dv EM_NONE . +.It Va e_type +is set to +.Dv ELF_K_ELF . +.It Va e_version +is set to +.Dv EV_NONE . +.El +.Pp +The application is responsible for changing these values +as needed before calling +.Fn elf_update . .Pp If successful, these three functions set the .Dv ELF_F_DIRTY -bit on ELF executable +bit on ELF descriptor .Ar elf . .Sh RETURN VALUES These functions return a pointer to a translated header descriptor @@ -103,7 +129,7 @@ .It Bq Er ELF_E_ARGUMENT Argument .Ar elf -was not a descriptor for an ELF file. +was not a descriptor for an ELF object. .It Bq Er ELF_E_ARGUMENT Argument .Ar elfclass @@ -111,9 +137,18 @@ .It Bq Er ELF_E_ARGUMENT The class of the ELF descriptor .Ar elf -was set previously, and argument -.Ar elfclass -did not match its class. +did not match that of the requested operation. +.It Bq Er ELF_E_ARGUMENT +For function +.Fn gelf_newehdr , +the class of argument +.Ar elf +was not +.Dv ELFCLASSNONE +and did not match the argument +.Ar elfclass . +.It Bq Er ELF_E_HEADER +A malformed ELF header was detected. .It Bq Er ELF_E_RESOURCE An out of memory condition was detected during execution. .El @@ -121,8 +156,10 @@ .Xr elf 3 , .Xr elf_flagdata 3 , .Xr elf_getident 3 , +.Xr elf_update 3 , .Xr elf32_getehdr 3 , .Xr elf64_getehdr 3 , +.Xr elf_version 3 , .Xr gelf 3 , .Xr gelf_getehdr 3 , .Xr elf 5 ==== //depot/projects/dtrace/src/lib/libelf/libelf.c#2 (text+ko) ==== @@ -37,11 +37,12 @@ #include "_libelf.h" struct _libelf_globals _libelf = { - .libelf_byteorder = ELF_TARG_DATA, - .libelf_class = ELF_TARG_CLASS, - .libelf_error = 0, - .libelf_fillchar = 0, - .libelf_version = EV_NONE + .libelf_arch = ELF_ARCH, + .libelf_byteorder = ELF_TARG_DATA, + .libelf_class = ELF_TARG_CLASS, + .libelf_error = 0, + .libelf_fillchar = 0, + .libelf_version = EV_NONE }; ==== //depot/projects/dtrace/src/lib/libelf/libelf.h#4 (text+ko) ==== @@ -141,7 +141,7 @@ ELF_E_ARCHIVE, /* Malformed ar(1) archive */ ELF_E_ARGUMENT, /* Invalid argument */ ELF_E_CLASS, /* ELF class mismatch */ - ELF_E_HEADER, /* Missing ELF header */ + ELF_E_HEADER, /* Missing or malformed ELF header */ ELF_E_MMAP, /* File mapping failed */ ELF_E_MODE, /* Wrong mode for ELF descriptor */ ELF_E_RESOURCE, /* Resource exhaustion */ From owner-p4-projects@FreeBSD.ORG Wed Aug 16 20:48:09 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2876A16A4DF; Wed, 16 Aug 2006 20:48:09 +0000 (UTC) X-Original-To: perforce@FreeBSD.org 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 DB3A916A4DE for ; Wed, 16 Aug 2006 20:48:08 +0000 (UTC) (envelope-from cdjones@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A88FB43D49 for ; Wed, 16 Aug 2006 20:48:08 +0000 (GMT) (envelope-from cdjones@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7GKm8hA029416 for ; Wed, 16 Aug 2006 20:48:08 GMT (envelope-from cdjones@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7GKm8rs029413 for perforce@freebsd.org; Wed, 16 Aug 2006 20:48:08 GMT (envelope-from cdjones@FreeBSD.org) Date: Wed, 16 Aug 2006 20:48:08 GMT Message-Id: <200608162048.k7GKm8rs029413@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to cdjones@FreeBSD.org using -f From: Chris Jones To: Perforce Change Reviews Cc: Subject: PERFORCE change 104291 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 16 Aug 2006 20:48:09 -0000 http://perforce.freebsd.org/chv.cgi?CH=104291 Change 104291 by cdjones@cdjones_meanook on 2006/08/16 20:47:17 Fix crash in schedcpu. No, Virginia, when you try writing to a NULL value (i.e. when a process isn't jailed), good things do not happen. Affected files ... .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/sched_hier.c#11 edit Differences ... ==== //depot/projects/soc2006/cdjones_jail/src/sys/kern/sched_hier.c#11 (text+ko) ==== @@ -541,7 +541,9 @@ if (kg->kg_slptime > 1) continue; kg->kg_estcpu = decay_cpu(loadfac, kg->kg_estcpu); - kg->kg_proc->p_ucred->cr_prison->pr_estcpu += kg->kg_estcpu; + if (kg->kg_proc->p_ucred->cr_prison) + kg->kg_proc->p_ucred->cr_prison->pr_estcpu += + kg->kg_estcpu; resetpriority(kg); FOREACH_THREAD_IN_GROUP(kg, td) { resetpriority_thread(td, kg); From owner-p4-projects@FreeBSD.ORG Wed Aug 16 21:02:32 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1387F16A4E1; Wed, 16 Aug 2006 21:02:32 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 E3CAF16A4DE for ; Wed, 16 Aug 2006 21:02:31 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 347EA43D55 for ; Wed, 16 Aug 2006 21:02:30 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7GL2T9X030217 for ; Wed, 16 Aug 2006 21:02:29 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7GL2TDB030214 for perforce@freebsd.org; Wed, 16 Aug 2006 21:02:29 GMT (envelope-from jb@freebsd.org) Date: Wed, 16 Aug 2006 21:02:29 GMT Message-Id: <200608162102.k7GL2TDB030214@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 104296 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 16 Aug 2006 21:02:32 -0000 http://perforce.freebsd.org/chv.cgi?CH=104296 Change 104296 by jb@jb_freebsd2 on 2006/08/16 21:01:57 Return the pointer after translation. Affected files ... .. //depot/projects/dtrace/src/lib/libelf/libelf_ehdr.c#2 edit Differences ... ==== //depot/projects/dtrace/src/lib/libelf/libelf_ehdr.c#2 (text+ko) ==== @@ -112,5 +112,5 @@ xlator = _libelf_get_translator(ELF_T_EHDR, ELF_TOMEMORY, ec); (*xlator)(ehdr, e->e_rawfile, 1, e->e_byteorder != LIBELF_PRIVATE(byteorder)); - return (NULL); + return (ehdr); } From owner-p4-projects@FreeBSD.ORG Wed Aug 16 21:04:40 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B0E4216A4EC; Wed, 16 Aug 2006 21:04:40 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 73E0716A4E7 for ; Wed, 16 Aug 2006 21:04:40 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5122E43D78 for ; Wed, 16 Aug 2006 21:04:33 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7GL4XeB031505 for ; Wed, 16 Aug 2006 21:04:33 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7GL4WgW031502 for perforce@freebsd.org; Wed, 16 Aug 2006 21:04:32 GMT (envelope-from jb@freebsd.org) Date: Wed, 16 Aug 2006 21:04:32 GMT Message-Id: <200608162104.k7GL4WgW031502@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 104297 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 16 Aug 2006 21:04:40 -0000 http://perforce.freebsd.org/chv.cgi?CH=104297 Change 104297 by jb@jb_freebsd2 on 2006/08/16 21:03:59 Remove code that got implemented in a different way. Sigh. Affected files ... .. //depot/projects/dtrace/src/lib/libelf/elf_memory.c#4 edit Differences ... ==== //depot/projects/dtrace/src/lib/libelf/elf_memory.c#4 (text+ko) ==== @@ -38,7 +38,6 @@ elf_memory(char *image, size_t sz) { Elf *e; - Elf_Data dst, src; if (LIBELF_PRIVATE(version) == EV_NONE) { LIBELF_SET_ERROR(SEQUENCE, 0); @@ -80,35 +79,6 @@ else e->e_kind = ELF_K_NONE; - if (e->e_kind == ELF_K_ELF) { - src.d_buf = image; - src.d_off = 0; - src.d_align = 0; - src.d_type = ELF_T_EHDR; - src.d_version = EV_CURRENT; - - dst.d_off = 0; - dst.d_align = 0; - dst.d_type = ELF_T_EHDR; - dst.d_version = EV_CURRENT; - - if (e->e_class == ELFCLASS32) { - dst.d_buf = &e->e_eh32; - dst.d_size = sizeof(e->e_eh32); - src.d_size = sizeof(e->e_eh32); - } else if (e->e_class == ELFCLASS64) { - dst.d_buf = &e->e_eh64; - dst.d_size = sizeof(e->e_eh64); - src.d_size = sizeof(e->e_eh64); - } else { - LIBELF_SET_ERROR(CLASS, e->e_class); - return (NULL); - } - - if (gelf_xlatetom(e, &dst, &src, e->e_byteorder) == NULL) - return (NULL); - } - return (e); } From owner-p4-projects@FreeBSD.ORG Wed Aug 16 21:05:35 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7BEB716A4E1; Wed, 16 Aug 2006 21:05:35 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 4436F16A4DD for ; Wed, 16 Aug 2006 21:05:35 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0FE2E43D46 for ; Wed, 16 Aug 2006 21:05:35 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7GL5YNO031645 for ; Wed, 16 Aug 2006 21:05:34 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7GL5YSL031642 for perforce@freebsd.org; Wed, 16 Aug 2006 21:05:34 GMT (envelope-from jb@freebsd.org) Date: Wed, 16 Aug 2006 21:05:34 GMT Message-Id: <200608162105.k7GL5YSL031642@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 104298 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 16 Aug 2006 21:05:35 -0000 http://perforce.freebsd.org/chv.cgi?CH=104298 Change 104298 by jb@jb_freebsd2 on 2006/08/16 21:04:54 It seems the caching is being implemented in a different way. This is like trying to guess lotto numbers. Affected files ... .. //depot/projects/dtrace/src/lib/libelf/_libelf.h#5 edit Differences ... ==== //depot/projects/dtrace/src/lib/libelf/_libelf.h#5 (text+ko) ==== @@ -86,18 +86,6 @@ size_t e_rawsize; /* size of uninterpreted bytes */ unsigned int e_version; /* file version */ - /* - * Cached data in host byte order. Pointers are to malloc'ed - * memory and the dimensions of the arrays are in the relevant - * header. - */ - Elf32_Ehdr e_eh32; /* 32-bit ELF header */ - Elf64_Ehdr e_eh64; /* 64-bit ELF header */ - Elf32_Phdr *e_ph32; /* Ptr to the 32-bit program header array */ - Elf64_Phdr *e_ph64; /* Ptr to the 64-bit program header array */ - Elf32_Shdr *e_sh32; /* Ptr to the 32-bit section header array */ - Elf64_Shdr *e_sh64; /* Ptr to the 64-bit section header array */ - union { struct { /* ar(1) archives */ off_t e_next; @@ -114,6 +102,14 @@ Elf32_Ehdr *e_ehdr32; Elf64_Ehdr *e_ehdr64; } e_ehdr; + union { + Elf32_Phdr *e_phdr32; + Elf64_Phdr *e_phdr64; + } e_phdr; + union { + Elf32_Shdr *e_shdr32; + Elf64_Shdr *e_shdr64; + } e_shdr; } e_elf; } e_u; }; From owner-p4-projects@FreeBSD.ORG Wed Aug 16 21:05:36 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D668516A557; Wed, 16 Aug 2006 21:05:35 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 B31AD16A542 for ; Wed, 16 Aug 2006 21:05:35 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 62B2F43D45 for ; Wed, 16 Aug 2006 21:05:35 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7GL5Zk9031653 for ; Wed, 16 Aug 2006 21:05:35 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7GL5Zpr031648 for perforce@freebsd.org; Wed, 16 Aug 2006 21:05:35 GMT (envelope-from jb@freebsd.org) Date: Wed, 16 Aug 2006 21:05:35 GMT Message-Id: <200608162105.k7GL5Zpr031648@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 104299 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 16 Aug 2006 21:05:36 -0000 http://perforce.freebsd.org/chv.cgi?CH=104299 Change 104299 by jb@jb_freebsd2 on 2006/08/16 21:05:12 Integration fix. Affected files ... .. //depot/projects/dtrace/src/lib/libelf/Makefile#8 edit Differences ... ==== //depot/projects/dtrace/src/lib/libelf/Makefile#8 (text+ko) ==== @@ -34,7 +34,6 @@ gelf_getphdr.c \ gelf_getshdr.c \ gelf_getsym.c \ - gelf_newehdr.c \ gelf_newphdr.c \ gelf_update_ehdr.c \ gelf_update_phdr.c \ From owner-p4-projects@FreeBSD.ORG Wed Aug 16 21:39:21 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E1B4316A4E7; Wed, 16 Aug 2006 21:39:20 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 A4D4D16A4E0 for ; Wed, 16 Aug 2006 21:39:20 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7404043D46 for ; Wed, 16 Aug 2006 21:39:20 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7GLdKQv077184 for ; Wed, 16 Aug 2006 21:39:20 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7GLdK4v077181 for perforce@freebsd.org; Wed, 16 Aug 2006 21:39:20 GMT (envelope-from jb@freebsd.org) Date: Wed, 16 Aug 2006 21:39:20 GMT Message-Id: <200608162139.k7GLdK4v077181@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 104304 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 16 Aug 2006 21:39:21 -0000 http://perforce.freebsd.org/chv.cgi?CH=104304 Change 104304 by jb@jb_freebsd2 on 2006/08/16 21:38:21 Add a few more macros. Affected files ... .. //depot/projects/dtrace/src/sys/sys/elf64.h#5 edit Differences ... ==== //depot/projects/dtrace/src/sys/sys/elf64.h#5 (text+ko) ==== @@ -147,6 +147,11 @@ /* Macro for constructing r_info from field values. */ #define ELF64_R_INFO(sym, type) (((sym) << 32) + ((type) & 0xffffffffL)) +#define ELF64_R_TYPE_DATA(info) (((Elf64_Xword)(info)<<32)>>40) +#define ELF64_R_TYPE_ID(info) (((Elf64_Xword)(info)<<56)>>56) +#define ELF64_R_TYPE_INFO(data, type) \ + (((Elf64_Xword)(data)<<8)+(Elf64_Xword)(type)) + /* * Note entry header */ From owner-p4-projects@FreeBSD.ORG Wed Aug 16 22:04:02 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5756E16A4E2; Wed, 16 Aug 2006 22:04:02 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 1AAE916A4DF for ; Wed, 16 Aug 2006 22:04:02 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0D9DC43D49 for ; Wed, 16 Aug 2006 22:03:56 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7GM3tVu079624 for ; Wed, 16 Aug 2006 22:03:55 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7GM3tjm079621 for perforce@freebsd.org; Wed, 16 Aug 2006 22:03:55 GMT (envelope-from jb@freebsd.org) Date: Wed, 16 Aug 2006 22:03:55 GMT Message-Id: <200608162203.k7GM3tjm079621@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 104306 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 16 Aug 2006 22:04:02 -0000 http://perforce.freebsd.org/chv.cgi?CH=104306 Change 104306 by jb@jb_freebsd2 on 2006/08/16 22:03:02 Add more shell functions so that the DTrace programs have stubs for all the functions that they require. This establishes the minimum libelf functionality that DTrace requires on FreeBSD at it's current state of development. Affected files ... .. //depot/projects/dtrace/src/lib/libelf/Makefile#9 edit .. //depot/projects/dtrace/src/lib/libelf/elf_flagelf.c#2 edit .. //depot/projects/dtrace/src/lib/libelf/gelf_getshdr.c#2 edit .. //depot/projects/dtrace/src/lib/libelf/gelf_rel.c#1 add .. //depot/projects/dtrace/src/lib/libelf/gelf_rela.c#1 add Differences ... ==== //depot/projects/dtrace/src/lib/libelf/Makefile#9 (text+ko) ==== @@ -35,6 +35,8 @@ gelf_getshdr.c \ gelf_getsym.c \ gelf_newphdr.c \ + gelf_rel.c \ + gelf_rela.c \ gelf_update_ehdr.c \ gelf_update_phdr.c \ gelf_update_shdr.c \ ==== //depot/projects/dtrace/src/lib/libelf/elf_flagelf.c#2 (text+ko) ==== @@ -38,3 +38,10 @@ printf("%s: not implemented\n", __FUNCTION__); return (0); } + +unsigned int +elf_flagdata(__unused Elf_Data *data, __unused Elf_Cmd cmd, __unused unsigned int flags) +{ + printf("%s: not implemented\n", __FUNCTION__); + return (0); +} ==== //depot/projects/dtrace/src/lib/libelf/gelf_getshdr.c#2 (text+ko) ==== @@ -53,3 +53,10 @@ printf("%s: not implemented\n", __FUNCTION__); return (0); } + +int +elf_getshstrndx(__unused Elf *elf, __unused size_t *dst) +{ + printf("%s: not implemented\n", __FUNCTION__); + return (0); +} From owner-p4-projects@FreeBSD.ORG Wed Aug 16 22:34:45 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CD59C16A4DF; Wed, 16 Aug 2006 22:34:44 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 77A0D16A4DE for ; Wed, 16 Aug 2006 22:34:44 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 91E5843D5F for ; Wed, 16 Aug 2006 22:34:41 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7GMYflr086070 for ; Wed, 16 Aug 2006 22:34:41 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7GMYcBi085862 for perforce@freebsd.org; Wed, 16 Aug 2006 22:34:38 GMT (envelope-from imp@freebsd.org) Date: Wed, 16 Aug 2006 22:34:38 GMT Message-Id: <200608162234.k7GMYcBi085862@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 104309 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 16 Aug 2006 22:34:45 -0000 http://perforce.freebsd.org/chv.cgi?CH=104309 Change 104309 by imp@imp_paco-paco on 2006/08/16 22:34:02 IFC @104305 Affected files ... .. //depot/projects/arm/src/ObsoleteFiles.inc#4 integrate .. //depot/projects/arm/src/contrib/ipfilter/BSD/Makefile#2 integrate .. //depot/projects/arm/src/contrib/ipfilter/HISTORY#2 integrate .. //depot/projects/arm/src/contrib/ipfilter/Makefile#2 integrate .. //depot/projects/arm/src/contrib/ipfilter/bpf_filter.c#2 integrate .. //depot/projects/arm/src/contrib/ipfilter/ip_fil.c#2 integrate .. //depot/projects/arm/src/contrib/ipfilter/ipf.h#2 integrate .. //depot/projects/arm/src/contrib/ipfilter/iplang/iplang_y.y#2 integrate .. //depot/projects/arm/src/contrib/ipfilter/ipmon.h#2 integrate .. //depot/projects/arm/src/contrib/ipfilter/ipsd/sbpf.c#2 integrate .. //depot/projects/arm/src/contrib/ipfilter/ipsend/ipsend.c#2 integrate .. //depot/projects/arm/src/contrib/ipfilter/ipsend/iptests.c#2 integrate .. //depot/projects/arm/src/contrib/ipfilter/ipsend/lsock.c#2 integrate .. //depot/projects/arm/src/contrib/ipfilter/ipsend/resend.c#2 integrate .. //depot/projects/arm/src/contrib/ipfilter/ipsend/sbpf.c#2 integrate .. //depot/projects/arm/src/contrib/ipfilter/ipsend/sock.c#2 integrate .. //depot/projects/arm/src/contrib/ipfilter/ipt.h#2 integrate .. //depot/projects/arm/src/contrib/ipfilter/lib/Makefile#2 integrate .. //depot/projects/arm/src/contrib/ipfilter/lib/addicmp.c#2 integrate .. //depot/projects/arm/src/contrib/ipfilter/lib/addkeep.c#2 delete .. //depot/projects/arm/src/contrib/ipfilter/lib/facpri.c#2 integrate .. //depot/projects/arm/src/contrib/ipfilter/lib/getport.c#2 integrate .. //depot/projects/arm/src/contrib/ipfilter/lib/icmpcode.c#2 integrate .. //depot/projects/arm/src/contrib/ipfilter/lib/ipft_tx.c#2 integrate .. //depot/projects/arm/src/contrib/ipfilter/lib/make_range.c#2 delete .. //depot/projects/arm/src/contrib/ipfilter/lib/optprint.c#2 integrate .. //depot/projects/arm/src/contrib/ipfilter/lib/printfr.c#2 integrate .. //depot/projects/arm/src/contrib/ipfilter/lib/printlog.c#2 integrate .. //depot/projects/arm/src/contrib/ipfilter/man/ipmon.8#2 integrate .. //depot/projects/arm/src/contrib/ipfilter/radix.c#2 integrate .. //depot/projects/arm/src/contrib/ipfilter/samples/proxy.c#2 integrate .. //depot/projects/arm/src/contrib/ipfilter/test/Makefile#2 integrate .. //depot/projects/arm/src/contrib/ipfilter/test/expected/f20#1 branch .. //depot/projects/arm/src/contrib/ipfilter/test/expected/i1#2 integrate .. //depot/projects/arm/src/contrib/ipfilter/test/expected/i10#2 integrate .. //depot/projects/arm/src/contrib/ipfilter/test/expected/i11#2 integrate .. //depot/projects/arm/src/contrib/ipfilter/test/expected/i18#2 integrate .. //depot/projects/arm/src/contrib/ipfilter/test/expected/i5#2 integrate .. //depot/projects/arm/src/contrib/ipfilter/test/expected/i8#2 integrate .. //depot/projects/arm/src/contrib/ipfilter/test/expected/i9#2 integrate .. //depot/projects/arm/src/contrib/ipfilter/test/expected/in2#2 integrate .. //depot/projects/arm/src/contrib/ipfilter/test/expected/in5#2 integrate .. //depot/projects/arm/src/contrib/ipfilter/test/expected/ni19#1 branch .. //depot/projects/arm/src/contrib/ipfilter/test/expected/ni20#1 branch .. //depot/projects/arm/src/contrib/ipfilter/test/expected/ni21#1 branch .. //depot/projects/arm/src/contrib/ipfilter/test/input/f2#2 integrate .. //depot/projects/arm/src/contrib/ipfilter/test/input/f20#1 branch .. //depot/projects/arm/src/contrib/ipfilter/test/input/ni19#1 branch .. //depot/projects/arm/src/contrib/ipfilter/test/input/ni20#1 branch .. //depot/projects/arm/src/contrib/ipfilter/test/input/ni21#1 branch .. //depot/projects/arm/src/contrib/ipfilter/test/regress/f20#1 branch .. //depot/projects/arm/src/contrib/ipfilter/test/regress/i1#2 integrate .. //depot/projects/arm/src/contrib/ipfilter/test/regress/i10#2 integrate .. //depot/projects/arm/src/contrib/ipfilter/test/regress/i11#2 integrate .. //depot/projects/arm/src/contrib/ipfilter/test/regress/i15#2 integrate .. //depot/projects/arm/src/contrib/ipfilter/test/regress/i17#2 integrate .. //depot/projects/arm/src/contrib/ipfilter/test/regress/i18#2 integrate .. //depot/projects/arm/src/contrib/ipfilter/test/regress/i5#2 integrate .. //depot/projects/arm/src/contrib/ipfilter/test/regress/i8#2 integrate .. //depot/projects/arm/src/contrib/ipfilter/test/regress/i9#2 integrate .. //depot/projects/arm/src/contrib/ipfilter/test/regress/in2#2 integrate .. //depot/projects/arm/src/contrib/ipfilter/test/regress/in5#2 integrate .. //depot/projects/arm/src/contrib/ipfilter/test/regress/ni19.ipf#1 branch .. //depot/projects/arm/src/contrib/ipfilter/test/regress/ni19.nat#1 branch .. //depot/projects/arm/src/contrib/ipfilter/test/regress/ni20.ipf#1 branch .. //depot/projects/arm/src/contrib/ipfilter/test/regress/ni20.nat#1 branch .. //depot/projects/arm/src/contrib/ipfilter/test/regress/ni21.ipf#1 branch .. //depot/projects/arm/src/contrib/ipfilter/test/regress/ni21.nat#1 branch .. //depot/projects/arm/src/contrib/ipfilter/test/test.format#2 integrate .. //depot/projects/arm/src/contrib/ipfilter/todo#1 branch .. //depot/projects/arm/src/contrib/ipfilter/tools/ipf.c#2 integrate .. //depot/projects/arm/src/contrib/ipfilter/tools/ipf_y.y#2 integrate .. //depot/projects/arm/src/contrib/ipfilter/tools/ipfcomp.c#2 integrate .. //depot/projects/arm/src/contrib/ipfilter/tools/ipfs.c#2 integrate .. //depot/projects/arm/src/contrib/ipfilter/tools/ipfstat.c#2 integrate .. //depot/projects/arm/src/contrib/ipfilter/tools/ipftest.c#2 integrate .. //depot/projects/arm/src/contrib/ipfilter/tools/ipmon.c#2 integrate .. //depot/projects/arm/src/contrib/ipfilter/tools/ipnat_y.y#2 integrate .. //depot/projects/arm/src/contrib/ipfilter/tools/ipsyncm.c#2 integrate .. //depot/projects/arm/src/contrib/ipfilter/tools/ipsyncs.c#2 integrate .. //depot/projects/arm/src/contrib/ipfilter/tools/lexer.c#2 integrate .. //depot/projects/arm/src/etc/defaults/rc.conf#3 integrate .. //depot/projects/arm/src/gnu/usr.bin/groff/contrib/mm/Makefile#2 integrate .. //depot/projects/arm/src/gnu/usr.bin/groff/tmac/Makefile#2 integrate .. //depot/projects/arm/src/lib/libc/stdlib/malloc.c#5 integrate .. //depot/projects/arm/src/lib/libc/string/strcoll.3#2 integrate .. //depot/projects/arm/src/lib/libc/sys/connect.2#2 integrate .. //depot/projects/arm/src/lib/libc/sys/getfsstat.2#2 integrate .. //depot/projects/arm/src/sbin/dump/dump.8#2 integrate .. //depot/projects/arm/src/sbin/dump/main.c#2 integrate .. //depot/projects/arm/src/sbin/ipf/libipf/Makefile#2 integrate .. //depot/projects/arm/src/sbin/ping/ping.c#2 integrate .. //depot/projects/arm/src/sbin/sysctl/sysctl.c#4 integrate .. //depot/projects/arm/src/share/man/man4/ata.4#2 integrate .. //depot/projects/arm/src/share/man/man4/if_bridge.4#3 integrate .. //depot/projects/arm/src/share/man/man7/release.7#2 integrate .. //depot/projects/arm/src/share/mk/bsd.cpu.mk#3 integrate .. //depot/projects/arm/src/sys/amd64/amd64/pmap.c#24 integrate .. //depot/projects/arm/src/sys/amd64/amd64/support.S#3 integrate .. //depot/projects/arm/src/sys/amd64/amd64/trap.c#12 integrate .. //depot/projects/arm/src/sys/amd64/linux32/linux.h#3 integrate .. //depot/projects/arm/src/sys/amd64/linux32/linux32_dummy.c#4 integrate .. //depot/projects/arm/src/sys/amd64/linux32/linux32_machdep.c#5 integrate .. //depot/projects/arm/src/sys/amd64/linux32/linux32_proto.h#12 integrate .. //depot/projects/arm/src/sys/amd64/linux32/linux32_syscall.h#12 integrate .. //depot/projects/arm/src/sys/amd64/linux32/linux32_sysent.c#12 integrate .. //depot/projects/arm/src/sys/amd64/linux32/linux32_sysvec.c#8 integrate .. //depot/projects/arm/src/sys/amd64/linux32/syscalls.conf#2 integrate .. //depot/projects/arm/src/sys/amd64/linux32/syscalls.master#12 integrate .. //depot/projects/arm/src/sys/arm/arm/elf_trampoline.c#11 integrate .. //depot/projects/arm/src/sys/arm/arm/mem.c#4 integrate .. //depot/projects/arm/src/sys/boot/forth/loader.conf#7 integrate .. //depot/projects/arm/src/sys/cam/scsi/scsi_pass.c#2 integrate .. //depot/projects/arm/src/sys/compat/freebsd32/freebsd32_misc.c#12 integrate .. //depot/projects/arm/src/sys/compat/freebsd32/freebsd32_proto.h#13 integrate .. //depot/projects/arm/src/sys/compat/freebsd32/freebsd32_syscall.h#13 integrate .. //depot/projects/arm/src/sys/compat/freebsd32/freebsd32_syscalls.c#13 integrate .. //depot/projects/arm/src/sys/compat/freebsd32/freebsd32_sysent.c#13 integrate .. //depot/projects/arm/src/sys/compat/freebsd32/syscalls.conf#2 integrate .. //depot/projects/arm/src/sys/compat/linux/linux_emul.c#1 branch .. //depot/projects/arm/src/sys/compat/linux/linux_emul.h#1 branch .. //depot/projects/arm/src/sys/compat/linux/linux_futex.c#1 branch .. //depot/projects/arm/src/sys/compat/linux/linux_futex.h#1 branch .. //depot/projects/arm/src/sys/compat/linux/linux_misc.c#10 integrate .. //depot/projects/arm/src/sys/compat/linux/linux_signal.c#5 integrate .. //depot/projects/arm/src/sys/compat/linux/linux_time.c#1 branch .. //depot/projects/arm/src/sys/compat/linux/linux_util.c#4 integrate .. //depot/projects/arm/src/sys/compat/svr4/svr4_proto.h#8 integrate .. //depot/projects/arm/src/sys/compat/svr4/svr4_syscall.h#8 integrate .. //depot/projects/arm/src/sys/compat/svr4/svr4_syscallnames.c#8 integrate .. //depot/projects/arm/src/sys/compat/svr4/svr4_sysent.c#8 integrate .. //depot/projects/arm/src/sys/compat/svr4/syscalls.conf#2 integrate .. //depot/projects/arm/src/sys/conf/files#43 integrate .. //depot/projects/arm/src/sys/conf/files.amd64#14 integrate .. //depot/projects/arm/src/sys/conf/files.i386#17 integrate .. //depot/projects/arm/src/sys/conf/kern.post.mk#11 integrate .. //depot/projects/arm/src/sys/conf/kmod.mk#12 integrate .. //depot/projects/arm/src/sys/contrib/ipfilter/netinet/fil.c#6 integrate .. //depot/projects/arm/src/sys/contrib/ipfilter/netinet/ip_auth.c#5 integrate .. //depot/projects/arm/src/sys/contrib/ipfilter/netinet/ip_auth.h#3 integrate .. //depot/projects/arm/src/sys/contrib/ipfilter/netinet/ip_compat.h#5 integrate .. //depot/projects/arm/src/sys/contrib/ipfilter/netinet/ip_fil.h#5 integrate .. //depot/projects/arm/src/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c#3 integrate .. //depot/projects/arm/src/sys/contrib/ipfilter/netinet/ip_frag.c#4 integrate .. //depot/projects/arm/src/sys/contrib/ipfilter/netinet/ip_ftp_pxy.c#4 integrate .. //depot/projects/arm/src/sys/contrib/ipfilter/netinet/ip_log.c#5 integrate .. //depot/projects/arm/src/sys/contrib/ipfilter/netinet/ip_nat.c#4 integrate .. //depot/projects/arm/src/sys/contrib/ipfilter/netinet/ip_pptp_pxy.c#3 integrate .. //depot/projects/arm/src/sys/contrib/ipfilter/netinet/ip_proxy.c#4 integrate .. //depot/projects/arm/src/sys/contrib/ipfilter/netinet/ip_rcmd_pxy.c#4 integrate .. //depot/projects/arm/src/sys/contrib/ipfilter/netinet/ip_scan.c#3 integrate .. //depot/projects/arm/src/sys/contrib/ipfilter/netinet/ip_state.c#4 integrate .. //depot/projects/arm/src/sys/contrib/ipfilter/netinet/ip_sync.c#3 integrate .. //depot/projects/arm/src/sys/contrib/ipfilter/netinet/ip_sync.h#3 integrate .. //depot/projects/arm/src/sys/contrib/ipfilter/netinet/ipl.h#4 integrate .. //depot/projects/arm/src/sys/contrib/ipfilter/netinet/mlfk_ipl.c#5 integrate .. //depot/projects/arm/src/sys/dev/acpi_support/acpi_ibm.c#5 integrate .. //depot/projects/arm/src/sys/dev/ata/ata-chipset.c#23 integrate .. //depot/projects/arm/src/sys/dev/ata/ata-pci.h#14 integrate .. //depot/projects/arm/src/sys/dev/bce/if_bce.c#6 integrate .. //depot/projects/arm/src/sys/dev/em/if_em.c#23 integrate .. //depot/projects/arm/src/sys/dev/em/if_em.h#9 integrate .. //depot/projects/arm/src/sys/dev/isp/isp.c#10 integrate .. //depot/projects/arm/src/sys/dev/isp/isp_pci.c#12 integrate .. //depot/projects/arm/src/sys/dev/isp/ispvar.h#10 integrate .. //depot/projects/arm/src/sys/dev/nfe/if_nfe.c#3 integrate .. //depot/projects/arm/src/sys/dev/sound/pci/ich.c#12 integrate .. //depot/projects/arm/src/sys/i386/i386/pmap.c#21 integrate .. //depot/projects/arm/src/sys/i386/i386/support.s#3 integrate .. //depot/projects/arm/src/sys/i386/i386/trap.c#9 integrate .. //depot/projects/arm/src/sys/i386/ibcs2/ibcs2_isc_syscall.h#6 integrate .. //depot/projects/arm/src/sys/i386/ibcs2/ibcs2_isc_sysent.c#6 integrate .. //depot/projects/arm/src/sys/i386/ibcs2/ibcs2_proto.h#6 integrate .. //depot/projects/arm/src/sys/i386/ibcs2/ibcs2_syscall.h#6 integrate .. //depot/projects/arm/src/sys/i386/ibcs2/ibcs2_sysent.c#6 integrate .. //depot/projects/arm/src/sys/i386/ibcs2/ibcs2_xenix.h#6 integrate .. //depot/projects/arm/src/sys/i386/ibcs2/ibcs2_xenix_syscall.h#6 integrate .. //depot/projects/arm/src/sys/i386/ibcs2/ibcs2_xenix_sysent.c#6 integrate .. //depot/projects/arm/src/sys/i386/ibcs2/syscalls.conf#2 integrate .. //depot/projects/arm/src/sys/i386/ibcs2/syscalls.isc.conf#2 integrate .. //depot/projects/arm/src/sys/i386/ibcs2/syscalls.xenix.conf#2 integrate .. //depot/projects/arm/src/sys/i386/linux/linux.h#4 integrate .. //depot/projects/arm/src/sys/i386/linux/linux_dummy.c#5 integrate .. //depot/projects/arm/src/sys/i386/linux/linux_machdep.c#5 integrate .. //depot/projects/arm/src/sys/i386/linux/linux_proto.h#14 integrate .. //depot/projects/arm/src/sys/i386/linux/linux_syscall.h#14 integrate .. //depot/projects/arm/src/sys/i386/linux/linux_sysent.c#14 integrate .. //depot/projects/arm/src/sys/i386/linux/linux_sysvec.c#8 integrate .. //depot/projects/arm/src/sys/i386/linux/syscalls.conf#2 integrate .. //depot/projects/arm/src/sys/i386/linux/syscalls.master#14 integrate .. //depot/projects/arm/src/sys/i386/xbox/xbox.c#3 integrate .. //depot/projects/arm/src/sys/kern/init_sysent.c#14 integrate .. //depot/projects/arm/src/sys/kern/kern_exec.c#11 integrate .. //depot/projects/arm/src/sys/kern/kern_fork.c#10 integrate .. //depot/projects/arm/src/sys/kern/kern_lock.c#6 integrate .. //depot/projects/arm/src/sys/kern/kern_mutex.c#9 integrate .. //depot/projects/arm/src/sys/kern/kern_sx.c#5 integrate .. //depot/projects/arm/src/sys/kern/kern_time.c#8 integrate .. //depot/projects/arm/src/sys/kern/makesyscalls.sh#5 integrate .. //depot/projects/arm/src/sys/kern/subr_turnstile.c#8 integrate .. //depot/projects/arm/src/sys/kern/syscalls.c#14 integrate .. //depot/projects/arm/src/sys/kern/syscalls.master#16 integrate .. //depot/projects/arm/src/sys/kern/systrace_args.c#2 integrate .. //depot/projects/arm/src/sys/kern/uipc_sem.c#5 integrate .. //depot/projects/arm/src/sys/kern/uipc_usrreq.c#18 integrate .. //depot/projects/arm/src/sys/kern/vfs_aio.c#10 integrate .. //depot/projects/arm/src/sys/modules/if_ef/Makefile#4 integrate .. //depot/projects/arm/src/sys/modules/if_ppp/Makefile#4 integrate .. //depot/projects/arm/src/sys/modules/linprocfs/Makefile#2 integrate .. //depot/projects/arm/src/sys/modules/linsysfs/Makefile#2 integrate .. //depot/projects/arm/src/sys/modules/linux/Makefile#6 integrate .. //depot/projects/arm/src/sys/modules/netgraph/mppc/Makefile#3 integrate .. //depot/projects/arm/src/sys/modules/sound/sound/Makefile#4 integrate .. //depot/projects/arm/src/sys/net/if_vlan.c#16 integrate .. //depot/projects/arm/src/sys/sys/dirent.h#2 integrate .. //depot/projects/arm/src/sys/sys/eventhandler.h#3 integrate .. //depot/projects/arm/src/sys/sys/imgact.h#4 integrate .. //depot/projects/arm/src/sys/sys/lockmgr.h#4 integrate .. //depot/projects/arm/src/sys/sys/sx.h#5 integrate .. //depot/projects/arm/src/sys/sys/syscall.h#14 integrate .. //depot/projects/arm/src/sys/sys/syscall.mk#14 integrate .. //depot/projects/arm/src/sys/sys/sysent.h#6 integrate .. //depot/projects/arm/src/sys/sys/sysproto.h#15 integrate .. //depot/projects/arm/src/tools/tools/nanobsd/nanobsd.sh#3 integrate .. //depot/projects/arm/src/usr.bin/calendar/calendars/calendar.history#2 integrate .. //depot/projects/arm/src/usr.sbin/named/Makefile#2 integrate .. //depot/projects/arm/src/usr.sbin/rpc.lockd/kern.c#2 integrate .. //depot/projects/arm/src/usr.sbin/rtsold/rtsold.8#2 integrate .. //depot/projects/arm/src/usr.sbin/yppush/yppush_main.c#2 integrate Differences ... ==== //depot/projects/arm/src/ObsoleteFiles.inc#4 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/ObsoleteFiles.inc,v 1.46 2006/08/11 22:02:16 ru Exp $ +# $FreeBSD: src/ObsoleteFiles.inc,v 1.47 2006/08/14 18:20:36 netchild Exp $ # # This file lists old files (OLD_FILES), libraries (OLD_LIBS) and # directories (OLD_DIRS) which should get removed at an update. Recently @@ -2918,6 +2918,14 @@ OLD_FILES+=usr/libdata/msdosfs/iso72dos OLD_FILES+=usr/libdata/msdosfs/koi2dos OLD_FILES+=usr/libdata/msdosfs/koi8u2dos +# The following files are *not* obsolete, they just don't get touched at +# install, so don't add them: +# - boot/loader.rc +# - usr/share/tmac/man.local +# - usr/share/tmac/mm/locale +# - usr/share/tmac/mm/se_locale +# - var/yp/Makefile + # 20060729: OpenSSL 0.9.7e -> 0.9.8b upgrade OLD_LIBS+=lib/libcrypto.so.4 ==== //depot/projects/arm/src/contrib/ipfilter/BSD/Makefile#2 (text+ko) ==== @@ -3,12 +3,13 @@ # # See the IPFILTER.LICENCE file for details on licencing. # +TOP=../.. BINDEST=/usr/sbin SBINDEST=/sbin MANDIR=/usr/share/man SEARCHDIRS!=echo $(BINDEST) $(SBINDEST) /bin /usr/bin /sbin /usr/sbin /usr/local/bin /usr/local/sbin | awk '{for(i=1;i&1 | sed -n 's/.*devfs.*/-DDEVFS/p' CPU!=uname -m INC=-I/usr/include -I/sys -I/sys/sys -I/sys/arch -DEF=-D$(CPU) -D__$(CPU)__ -DINET -DKERNEL -D_KERNEL $(INC) $(DEVFS) +DEF=-D$(CPU) -D__$(CPU)__ -DINET -DKERNEL -D_KERNEL $(INC) $(DEVFS) -fno-builtin IPDEF=$(DEF) -DGATEWAY -DDIRECTED_BROADCAST VNODESHDIR=/sys/kern MLD=$(ML) @@ -516,8 +517,8 @@ (cd $(TOP)/man; make INSTALL=$(INSTALL) MANDIR=$(MANDIR) install; cd $(TOP)) coverage: - ksh -c 'for i in *.da; do j=$${i%%.da}.c; gcov $$j 2>&1 | egrep -v "y.tab.c|Could|Creating|_l\.c|\.h"; done' | sort -n > report - sort -n report | perl -e 'while(<>) { next if (/^0.00/); s/\%//g; @F=split;$$lc+=$$F[2];$$t += $$F[0]/100*$$F[2];} printf "%d of %d = %d%%\n", $$t, $$lc,$$t/$$lc*100;' >> report + ksh -c 'for i in *.da; do j=$${i%%.da}.c; gcov $$j 2>&1 | egrep -v "y.tab.c|Could|Creating|_l\.c|\.h"; done' | sort -k 1n -k 3n > report + sort -k 1n -k 3n report | perl -e 'while(<>) { next if (/^0.00/); s/\%//g; @F=split;$$lc+=$$F[2];$$t += ($$F[0]/100)*$$F[2];} printf "%d of %d = %d%%\n", $$t, $$lc,($$t/$$lc)*100;' >> report clean-coverage: /bin/rm -f *.gcov *.da ==== //depot/projects/arm/src/contrib/ipfilter/HISTORY#2 (text+ko) ==== @@ -10,6 +10,88 @@ # and especially those who have found the time to port IP Filter to new # platforms. # +4.1.13 - Released 4 April 2006 + +fix bug where null pointers introduced by proxies could cause a crash + +pass out the rule flags with SIOCAUTHW + +force loading NAT rules with bad proxy labels to cause an error + +nat_state is used unsafely in calls to fr_addstate + +make return-rst and return-icmp* work with auth rules + +4.1.12 - Released 28 March 2006 + +poll support on FreeBSD/NetBSD needs to use selrecord/selwakeup + +make the fastroute code used by ipftest invoke state/NAT + +move verbose/debug macros out of fil.c and into ip_fil.h (for wider use) + +remove unused code in fr_fastroute + +fix NAT with rules that specify forward and reverise interfaces + +add missing ipfsync_canread() and ipfsync_canwrite() + +behaviour of \ on the end of a line in ipf.conf does not match older behaviour + +remove duplicate statistics line output with "ipfstat -s" +4.1.11 - Released 19 March 2006 + +Patch for NAT with ipfsync from N. Ersen (SESCI) - www.enderunix.org + +NetBSD coverity report fixes (from run 5) + +Possible to reacquire ipf_auth without releasing it in some circumstances + +Locking in FreeBSD's iplioctl for ipf_global isn't present like it shoudl be + +Add poll support for platforms I can build on: NetBSD, FreeBSD, Solaris, Linux + +Using auth rules to return "keep state" got broken with pushing fr_addstate +call into fr_firewall + +all use of '!' in map/rdr rules to match use in ipf configs + +add -L command line option to ipmon to set the default syslog facility + +looking up a port number is more complex than needed in ipft_tx.c + +allow lib/getport to work when neither tcp or udp are specified in a rule + +remove some dead code from lib/addicmpc, lib/facpri.c, lib/icmpcode.c + +program in some more cases where TCP packets fail an initial in-window +check but should be allowed to match + +filter rule added with NAT/state handling of SIOCSTPUT doesn't properly +initialise all fields, making it possible to panic + +simplify NAT ICMP error handling where it updates checksums + +rename "min" variables to "xmin" on NetBSD to avoid problems with the +macro "min" + +#ifdef's for NetBSD compile incorrect for pfil interface + +support select/poll on NetBSD + +copying out a packet with an auth rule fails (EFAULT) because the wrong +pointer is passed to copyoutptr + +ip_len/ip_off where byte swapped twice instead of once for packets +going to be stored on the auth queue + +change timeout queue manipulation functions to make fewer mutex calls + +fix use of skip rules with groups +fix coding problems discovered by the coverity project for FreeBSD + +update BPF program validation with FreeBSD changes + 4.1.10 - Released 6 December 2005 Expand regression testing to cover more features ==== //depot/projects/arm/src/contrib/ipfilter/Makefile#2 (text+ko) ==== @@ -5,8 +5,8 @@ # provided that this notice is preserved and due credit is given # to the original author and the contributors. # -# $FreeBSD: src/contrib/ipfilter/Makefile,v 1.5 2005/12/30 11:52:22 guido Exp $ -# Id: Makefile,v 2.76.2.13 2004/11/08 18:42:40 darrenr Exp +# $FreeBSD: src/contrib/ipfilter/Makefile,v 1.6 2006/08/16 12:23:00 guido Exp $ +# Id: Makefile,v 2.76.2.19 2006/03/17 10:38:38 darrenr Exp $ # SHELL=/bin/sh BINDEST=/usr/local/bin @@ -135,6 +135,7 @@ @echo "freebsd3 - compile for FreeBSD-3.x" @echo "freebsd4 - compile for FreeBSD-4.x" @echo "freebsd5 - compile for FreeBSD-5.x" + @echo "freebsd6 - compile for FreeBSD-6.x" @echo "bsd - compile for generic 4.4BSD systems" @echo "bsdi - compile for BSD/OS" @echo "irix - compile for SGI IRIX" @@ -187,7 +188,7 @@ fi make freebsd20 -freebsd5: include +freebsd5 freebsd6: include if [ x$(INET6) = x ] ; then \ echo "#undef INET6" > opt_inet6.h; \ else \ ==== //depot/projects/arm/src/contrib/ipfilter/bpf_filter.c#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/contrib/ipfilter/bpf_filter.c,v 1.4 2005/12/30 11:52:22 guido Exp $ */ +/* $FreeBSD: src/contrib/ipfilter/bpf_filter.c,v 1.5 2006/08/16 12:23:00 guido Exp $ */ /*- * Copyright (c) 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997 @@ -42,7 +42,7 @@ #if !(defined(lint) || defined(KERNEL) || defined(_KERNEL)) static const char rcsid[] = - "@(#) $Header: /devel/CVS/IP-Filter/bpf_filter.c,v 2.2.2.1 2005/06/18 02:41:30 darrenr Exp $ (LBL)"; + "@(#) $Header: /devel/CVS/IP-Filter/bpf_filter.c,v 2.2.2.2 2005/12/30 12:57:28 darrenr Exp $ (LBL)"; #endif #include @@ -468,9 +468,10 @@ /* * Return true if the 'fcode' is a valid filter program. * The constraints are that each jump be forward and to a valid - * code. The code must terminate with either an accept or reject. - * 'valid' is an array for use by the routine (it must be at least - * 'len' bytes long). + * code, that memory accesses are within valid ranges (to the + * extent that this can be checked statically; loads of packet + * data have to be, and are, also checked at run time), and that + * the code terminates with either an accept or reject. * * The kernel needs to be able to verify an application's filter code. * Otherwise, a bogus program could easily crash the system. @@ -480,38 +481,114 @@ struct bpf_insn *f; int len; { - register int i; - register struct bpf_insn *p; + u_int i, from; + const struct bpf_insn *p; + + if (len == 0) + return 1; + + if (len < 1 || len > BPF_MAXINSNS) + return 0; for (i = 0; i < len; ++i) { + p = &f[i]; + switch (BPF_CLASS(p->code)) { /* - * Check that that jumps are forward, and within - * the code block. + * Check that memory operations use valid addresses. */ - p = &f[i]; - if (BPF_CLASS(p->code) == BPF_JMP) { - register int from = i + 1; - - if (BPF_OP(p->code) == BPF_JA) { - if (from + p->k >= (unsigned)len) + case BPF_LD: + case BPF_LDX: + switch (BPF_MODE(p->code)) { + case BPF_IMM: + break; + case BPF_ABS: + case BPF_IND: + case BPF_MSH: + /* + * More strict check with actual packet length + * is done runtime. + */ +#if 0 + if (p->k >= bpf_maxbufsize) + return 0; +#endif + break; + case BPF_MEM: + if (p->k >= BPF_MEMWORDS) + return 0; + break; + case BPF_LEN: + break; + default: + return 0; + } + break; + case BPF_ST: + case BPF_STX: + if (p->k >= BPF_MEMWORDS) + return 0; + break; + case BPF_ALU: + switch (BPF_OP(p->code)) { + case BPF_ADD: + case BPF_SUB: + case BPF_OR: + case BPF_AND: + case BPF_LSH: + case BPF_RSH: + case BPF_NEG: + break; + case BPF_DIV: + /* + * Check for constant division by 0. + */ + if (BPF_RVAL(p->code) == BPF_K && p->k == 0) return 0; + default: + return 0; } - else if (from + p->jt >= len || from + p->jf >= len) + break; + case BPF_JMP: + /* + * Check that jumps are within the code block, + * and that unconditional branches don't go + * backwards as a result of an overflow. + * Unconditional branches have a 32-bit offset, + * so they could overflow; we check to make + * sure they don't. Conditional branches have + * an 8-bit offset, and the from address is <= + * BPF_MAXINSNS, and we assume that BPF_MAXINSNS + * is sufficiently small that adding 255 to it + * won't overflow. + * + * We know that len is <= BPF_MAXINSNS, and we + * assume that BPF_MAXINSNS is < the maximum size + * of a u_int, so that i + 1 doesn't overflow. + */ + from = i + 1; + switch (BPF_OP(p->code)) { + case BPF_JA: + if (from + p->k < from || from + p->k >= len) + return 0; + break; + case BPF_JEQ: + case BPF_JGT: + case BPF_JGE: + case BPF_JSET: + if (from + p->jt >= len || from + p->jf >= len) + return 0; + break; + default: return 0; + } + break; + case BPF_RET: + break; + case BPF_MISC: + break; + default: + return 0; } - /* - * Check that memory operations use valid addresses. - */ - if ((BPF_CLASS(p->code) == BPF_ST || - (BPF_CLASS(p->code) == BPF_LD && - (p->code & 0xe0) == BPF_MEM)) && - (p->k >= BPF_MEMWORDS || p->k < 0)) - return 0; - /* - * Check for constant division by 0. - */ - if (p->code == (BPF_ALU|BPF_DIV|BPF_K) && p->k == 0) - return 0; } return BPF_CLASS(f[len - 1].code) == BPF_RET; } ==== //depot/projects/arm/src/contrib/ipfilter/ip_fil.c#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/contrib/ipfilter/ip_fil.c,v 1.3 2005/04/26 15:18:45 darrenr Exp $ */ +/* $FreeBSD: src/contrib/ipfilter/ip_fil.c,v 1.4 2006/08/16 12:23:00 guido Exp $ */ /* * Copyright (C) 1993-2001 by Darren Reed. @@ -7,7 +7,7 @@ */ #if !defined(lint) static const char sccsid[] = "@(#)ip_fil.c 2.41 6/5/96 (C) 1993-2000 Darren Reed"; -static const char rcsid[] = "@(#)$Id: ip_fil.c,v 2.133.2.9 2005/01/08 14:22:18 darrenr Exp $"; +static const char rcsid[] = "@(#)$Id: ip_fil.c,v 2.133.2.11 2006/03/25 11:15:30 darrenr Exp $"; #endif #ifndef SOLARIS @@ -138,7 +138,7 @@ #include "md5.h" -#if !defined(__osf__) +#if !defined(__osf__) && !defined(__linux__) extern struct protosw inetsw[]; #endif @@ -718,13 +718,45 @@ { struct ifnet *ifp = fdp->fd_ifp; ip_t *ip = fin->fin_ip; + int error = 0; + frentry_t *fr; + void *sifp; if (!ifp) return 0; /* no routing table out here */ - ip->ip_len = htons((u_short)ip->ip_len); - ip->ip_off = htons((u_short)(ip->ip_off | IP_MF)); + fr = fin->fin_fr; ip->ip_sum = 0; + + if (fin->fin_out == 0) { + sifp = fin->fin_ifp; + fin->fin_ifp = ifp; + fin->fin_out = 1; + (void) fr_acctpkt(fin, NULL); + fin->fin_fr = NULL; + if (!fr || !(fr->fr_flags & FR_RETMASK)) { + u_32_t pass; + + (void) fr_checkstate(fin, &pass); + } + + switch (fr_checknatout(fin, NULL)) + { + case 0 : + break; + case 1 : + ip->ip_sum = 0; + break; + case -1 : + error = -1; + goto done; + break; + } + + fin->fin_ifp = sifp; + fin->fin_out = 0; + } + #if defined(__sgi) && (IRIX < 60500) (*ifp->if_output)(ifp, (void *)ip, NULL); # if TRU64 >= 1885 @@ -733,7 +765,8 @@ (*ifp->if_output)(ifp, (void *)m, NULL, 0); # endif #endif - return 0; +done: + return error; } ==== //depot/projects/arm/src/contrib/ipfilter/ipf.h#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/contrib/ipfilter/ipf.h,v 1.3 2005/12/30 11:52:22 guido Exp $ */ +/* $FreeBSD: src/contrib/ipfilter/ipf.h,v 1.4 2006/08/16 12:23:01 guido Exp $ */ /* * Copyright (C) 1993-2001, 2003 by Darren Reed. @@ -6,7 +6,7 @@ * See the IPFILTER.LICENCE file for details on licencing. * * @(#)ipf.h 1.12 6/5/96 - * $Id: ipf.h,v 2.71.2.7 2005/06/12 07:18:31 darrenr Exp $ + * $Id: ipf.h,v 2.71.2.8 2005/12/30 07:03:21 darrenr Exp $ */ #ifndef __IPF_H__ @@ -184,7 +184,6 @@ extern int addicmp __P((char ***, struct frentry *, int)); extern int addipopt __P((char *, struct ipopt_names *, int, char *)); extern int addkeep __P((char ***, struct frentry *, int)); -extern int bcopywrap __P((void *, void *, size_t)); extern void binprint __P((void *, size_t)); extern void initparse __P((void)); extern u_32_t buildopts __P((char *, char *, int)); ==== //depot/projects/arm/src/contrib/ipfilter/iplang/iplang_y.y#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/contrib/ipfilter/iplang/iplang_y.y,v 1.7 2005/12/30 11:52:23 guido Exp $ */ +/* $FreeBSD: src/contrib/ipfilter/iplang/iplang_y.y,v 1.8 2006/08/16 12:23:01 guido Exp $ */ %{ /* @@ -6,8 +6,8 @@ * * See the IPFILTER.LICENCE file for details on licencing. * - * Id: iplang_y.y,v 2.9.2.2 2004/12/09 19:41:10 darrenr Exp - * $FreeBSD: src/contrib/ipfilter/iplang/iplang_y.y,v 1.7 2005/12/30 11:52:23 guido Exp $ + * Id: iplang_y.y,v 2.9.2.4 2006/03/17 12:11:29 darrenr Exp $ + * $FreeBSD: src/contrib/ipfilter/iplang/iplang_y.y,v 1.8 2006/08/16 12:23:01 guido Exp $ */ #include @@ -1649,7 +1649,7 @@ for (sto = toipopts; sto->sto_st; sto++) if (sto->sto_st == state) break; - if (!sto || !sto->sto_st) { + if (!sto->sto_st) { fprintf(stderr, "No mapping for state %d to IP option\n", state); return; ==== //depot/projects/arm/src/contrib/ipfilter/ipmon.h#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/contrib/ipfilter/ipmon.h,v 1.3 2005/12/30 11:52:22 guido Exp $ */ +/* $FreeBSD: src/contrib/ipfilter/ipmon.h,v 1.4 2006/08/16 12:23:01 guido Exp $ */ /* * Copyright (C) 1993-2001 by Darren Reed. @@ -6,7 +6,7 @@ * See the IPFILTER.LICENCE file for details on licencing. * * @(#)ip_fil.h 1.35 6/5/96 - * $Id: ipmon.h,v 2.8 2003/07/25 22:16:20 darrenr Exp $ + * $Id: ipmon.h,v 2.8.2.1 2006/03/21 16:13:31 darrenr Exp $ */ @@ -94,3 +94,4 @@ extern void dumphex __P((FILE *, int, char *, int)); extern int check_action __P((char *, char *, int, int)); extern char *getword __P((int)); +extern int fac_findname __P((char *)); ==== //depot/projects/arm/src/contrib/ipfilter/ipsd/sbpf.c#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/contrib/ipfilter/ipsd/sbpf.c,v 1.2 2005/04/25 18:20:10 darrenr Exp $ */ +/* $FreeBSD: src/contrib/ipfilter/ipsd/sbpf.c,v 1.3 2006/08/16 12:23:01 guido Exp $ */ /* * (C)opyright 1995-1998 Darren Reed. (from tcplog) @@ -11,6 +11,9 @@ #include #include #include +#ifdef __NetBSD__ +# include +#endif #include #include #include @@ -123,8 +126,18 @@ struct bpf_version bv; struct timeval to; struct ifreq ifr; +#ifdef _PATH_BPF + char *bpfname = _PATH_BPF; + int fd; + + if ((fd = open(bpfname, O_RDWR)) < 0) + { + fprintf(stderr, "no bpf devices available as /dev/bpfxx\n"); + return -1; + } +#else char bpfname[16]; - int fd, i; + int fd = -1, i; for (i = 0; i < 16; i++) { @@ -137,6 +150,7 @@ fprintf(stderr, "no bpf devices available as /dev/bpfxx\n"); return -1; } +#endif if (ioctl(fd, BIOCVERSION, (caddr_t)&bv) < 0) { ==== //depot/projects/arm/src/contrib/ipfilter/ipsend/ipsend.c#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/contrib/ipfilter/ipsend/ipsend.c,v 1.13 2005/12/30 11:52:23 guido Exp $ */ +/* $FreeBSD: src/contrib/ipfilter/ipsend/ipsend.c,v 1.14 2006/08/16 12:23:01 guido Exp $ */ /* * ipsend.c (C) 1995-1998 Darren Reed * @@ -6,7 +6,7 @@ */ #if !defined(lint) static const char sccsid[] = "@(#)ipsend.c 1.5 12/10/95 (C)1995 Darren Reed"; -static const char rcsid[] = "@(#)$Id: ipsend.c,v 2.8.2.2 2004/11/13 16:50:10 darrenr Exp $"; +static const char rcsid[] = "@(#)$Id: ipsend.c,v 2.8.2.3 2006/03/17 13:45:34 darrenr Exp $"; #endif #include #include @@ -155,6 +155,8 @@ int wfd; wfd = initdevice(dev, 5); + if (wfd == -1) + return -1; return send_packet(wfd, mtu, ip, gwip); } ==== //depot/projects/arm/src/contrib/ipfilter/ipsend/iptests.c#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/contrib/ipfilter/ipsend/iptests.c,v 1.11 2005/12/30 11:52:23 guido Exp $ */ +/* $FreeBSD: src/contrib/ipfilter/ipsend/iptests.c,v 1.12 2006/08/16 12:23:01 guido Exp $ */ /* * Copyright (C) 1993-1998 by Darren Reed. @@ -8,10 +8,18 @@ */ #if !defined(lint) static const char sccsid[] = "%W% %G% (C)1995 Darren Reed"; -static const char rcsid[] = "@(#)$Id: iptests.c,v 2.8.2.4 2005/06/12 07:18:39 darrenr Exp $"; +static const char rcsid[] = "@(#)$Id: iptests.c,v 2.8.2.7 2006/03/21 16:10:55 darrenr Exp $"; #endif #include #include +#if defined(__NetBSD__) && defined(__vax__) +/* + * XXX need to declare boolean_t for _KERNEL + * which ends up including for vax. See PR#32907 + * for further details. + */ +typedef int boolean_t; +#endif #include #if !defined(__osf__) # define _KERNEL @@ -136,7 +144,10 @@ u->uh_ulen = htons(sizeof(*u) + 4); ip->ip_len = sizeof(*ip) + ntohs(u->uh_ulen); len = ip->ip_len; + nfd = initdevice(dev, 1); + if (nfd == -1) + return; if (!ptest || (ptest == 1)) { /* @@ -470,11 +481,14 @@ int nfd; u_char *s; - s = (u_char *)(ip + 1); + nfd = initdevice(dev, 1); + if (nfd == -1) + return; IP_HL_A(ip, 6); ip->ip_len = IP_HL(ip) << 2; + s = (u_char *)(ip + 1); s[IPOPT_OPTVAL] = IPOPT_NOP; s++; if (!ptest || (ptest == 1)) { @@ -574,7 +588,10 @@ ip->ip_sum = 0; ip->ip_len = sizeof(*ip) + sizeof(*icp); icp = (struct icmp *)((char *)ip + (IP_HL(ip) << 2)); + nfd = initdevice(dev, 1); + if (nfd == -1) + return; if (!ptest || (ptest == 1)) { /* @@ -773,7 +790,10 @@ u->uh_sport = htons(1); u->uh_dport = htons(1); u->uh_ulen = htons(sizeof(*u) + 4); + nfd = initdevice(dev, 1); + if (nfd == -1) + return; if (!ptest || (ptest == 1)) { /* @@ -936,7 +956,10 @@ t->th_seq = htonl(1); t->th_ack = 0; ip->ip_len = sizeof(ip_t) + sizeof(tcphdr_t); + nfd = initdevice(dev, 1); + if (nfd == -1) + return; if (!ptest || (ptest == 1)) { /* @@ -1281,6 +1304,9 @@ u->uh_sum = 0; nfd = initdevice(dev, 1); + if (nfd == -1) + return; + u->uh_ulen = htons(7168); printf("6. Exhaustive mbuf test.\n"); @@ -1350,6 +1376,9 @@ u_char *s; nfd = initdevice(dev, 1); + if (nfd == -1) + return; + pip = (ip_t *)tbuf; srand(time(NULL) ^ (getpid() * getppid())); ==== //depot/projects/arm/src/contrib/ipfilter/ipsend/lsock.c#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/contrib/ipfilter/ipsend/lsock.c,v 1.3 2005/12/30 11:52:23 guido Exp $ */ +/* $FreeBSD: src/contrib/ipfilter/ipsend/lsock.c,v 1.4 2006/08/16 12:23:01 guido Exp $ */ /* * lsock.c (C) 1995-1998 Darren Reed @@ -8,7 +8,7 @@ */ #if !defined(lint) static const char sccsid[] = "@(#)lsock.c 1.2 1/11/96 (C)1995 Darren Reed"; -static const char rcsid[] = "@(#)$Id: lsock.c,v 2.3 2001/06/09 17:09:26 darrenr Exp $"; +static const char rcsid[] = "@(#)$Id: lsock.c,v 2.3.4.1 2006/03/17 13:45:34 darrenr Exp $"; #endif #include #include @@ -227,6 +227,8 @@ ti->ti_sport = lsin.sin_port; printf("sport %d\n", ntohs(lsin.sin_port)); nfd = initdevice(dev, 0); + if (nfd == -1) + return -1; if (!(s = find_tcp(fd, ti))) return -1; ==== //depot/projects/arm/src/contrib/ipfilter/ipsend/resend.c#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/contrib/ipfilter/ipsend/resend.c,v 1.3 2005/12/30 11:52:23 guido Exp $ */ +/* $FreeBSD: src/contrib/ipfilter/ipsend/resend.c,v 1.4 2006/08/16 12:23:01 guido Exp $ */ /* * resend.c (C) 1995-1998 Darren Reed @@ -8,7 +8,7 @@ */ #if !defined(lint) static const char sccsid[] = "@(#)resend.c 1.3 1/11/96 (C)1995 Darren Reed"; -static const char rcsid[] = "@(#)$Id: resend.c,v 2.8 2004/01/08 13:34:31 darrenr Exp $"; +static const char rcsid[] = "@(#)$Id: resend.c,v 2.8.2.2 2006/03/17 13:45:34 darrenr Exp $"; #endif #include #include @@ -81,6 +81,9 @@ ip_t *ip; int fd, wfd = initdevice(dev, 5), len, i; + if (wfd == -1) + return -1; + if (datain) fd = (*r->r_open)(datain); else @@ -101,6 +104,7 @@ if (gwip.s_addr && (arp((char *)&gwip, dhost) == -1)) { perror("arp"); + free(eh); >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Aug 16 23:10:28 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3F9C916A4E1; Wed, 16 Aug 2006 23:10:28 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 1A79916A4DF for ; Wed, 16 Aug 2006 23:10:28 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D994A43D46 for ; Wed, 16 Aug 2006 23:10:27 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7GNARhV091051 for ; Wed, 16 Aug 2006 23:10:27 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7GNARuX091048 for perforce@freebsd.org; Wed, 16 Aug 2006 23:10:27 GMT (envelope-from imp@freebsd.org) Date: Wed, 16 Aug 2006 23:10:27 GMT Message-Id: <200608162310.k7GNARuX091048@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 104314 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 16 Aug 2006 23:10:28 -0000 http://perforce.freebsd.org/chv.cgi?CH=104314 Change 104314 by imp@imp_lighthouse on 2006/08/16 23:09:53 Cleanup Affected files ... .. //depot/projects/arm/src/sys/boot/arm/at91/boot0spi/doit.c#5 delete .. //depot/projects/arm/src/sys/boot/arm/at91/boot0spi/main.c#13 edit Differences ... ==== //depot/projects/arm/src/sys/boot/arm/at91/boot0spi/main.c#13 (text) ==== @@ -30,17 +30,6 @@ #include "spi_flash.h" #include "fpga.h" -struct fpga main_fpga = -{ - AT91C_BASE_PIOB, AT91C_PIO_PB0, - AT91C_BASE_PIOC, AT91C_PIO_PC11, - AT91C_BASE_PIOB, AT91C_PIO_PB2, - AT91C_BASE_PIOC, AT91C_PIO_PC12 -}; - -#define BURN_FPGA 1 - -//#define OFFSET (15 * FLASH_PAGE_SIZE) #define OFFSET 0 int @@ -48,16 +37,13 @@ { int len, i, j, off; char *addr = (char *)SDRAM_BASE + (1 << 20); /* Load to base + 1MB */ -#ifdef BURN_FPGA char *addr2 = (char *)SDRAM_BASE + (2 << 20); /* Load to base + 2MB */ char *addr3 = (char *)SDRAM_BASE + (3 << 20); /* Load to base + 2MB */ -#endif SPI_InitFlash(); printf("Waiting for data\r\n"); while ((len = xmodem_rx(addr)) == -1) continue; -#ifdef BURN_FPGA printf("\r\nDownloaded %u bytes.\r\n", len); p_memcpy(addr3, addr, (len + FLASH_PAGE_SIZE - 1) / FLASH_PAGE_SIZE * FLASH_PAGE_SIZE); printf("Writing %u bytes to flash at %u\r\n", len, OFFSET); @@ -72,14 +58,5 @@ if (j >= 10) printf("Bad Readback at %u\r\n", i); } -#else - len = 212482; - SPI_ReadFlash(15 * FLASH_PAGE_SIZE, addr, len); - printf("Downloaded %u bytes... burning FPGA...\r\n", len); - fpga_init(&main_fpga); - fpga_clear(&main_fpga); - fpga_write_bytes(&main_fpga, addr, len); - fpga_done(&main_fpga); -#endif return (1); } From owner-p4-projects@FreeBSD.ORG Wed Aug 16 23:10:28 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9073416A556; Wed, 16 Aug 2006 23:10:28 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 53DB016A50B for ; Wed, 16 Aug 2006 23:10:28 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2209543D46 for ; Wed, 16 Aug 2006 23:10:28 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7GNASE5091057 for ; Wed, 16 Aug 2006 23:10:28 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7GNARjN091054 for perforce@freebsd.org; Wed, 16 Aug 2006 23:10:27 GMT (envelope-from imp@freebsd.org) Date: Wed, 16 Aug 2006 23:10:27 GMT Message-Id: <200608162310.k7GNARjN091054@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 104315 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 16 Aug 2006 23:10:28 -0000 http://perforce.freebsd.org/chv.cgi?CH=104315 Change 104315 by imp@imp_lighthouse on 2006/08/16 23:10:10 More usb Affected files ... .. //depot/projects/arm/src/sys/i386/conf/505TS#2 edit Differences ... ==== //depot/projects/arm/src/sys/i386/conf/505TS#2 (text+ko) ==== @@ -28,7 +28,7 @@ #hints "GENERIC.hints" # Default places to look for devices. makeoptions DEBUG=-g # Build kernel with gdb(1) debug symbols -makeoptions MODULES_OVERRIDE="acpi linux sound" +makeoptions MODULES_OVERRIDE="acpi linux sound uplcom uftdi" #options SCHED_ULE # ULE scheduler options SCHED_4BSD # 4BSD scheduler @@ -277,6 +277,7 @@ device uscanner # Scanners device uplcom device uftdi +device ucom # USB Ethernet, requires miibus device aue # ADMtek USB Ethernet device axe # ASIX Electronics USB Ethernet From owner-p4-projects@FreeBSD.ORG Wed Aug 16 23:13:33 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1527316A4E8; Wed, 16 Aug 2006 23:13:33 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 D91EC16A4E0 for ; Wed, 16 Aug 2006 23:13:32 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A5BC543D53 for ; Wed, 16 Aug 2006 23:13:32 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7GNDWX5091247 for ; Wed, 16 Aug 2006 23:13:32 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7GNDWln091244 for perforce@freebsd.org; Wed, 16 Aug 2006 23:13:32 GMT (envelope-from imp@freebsd.org) Date: Wed, 16 Aug 2006 23:13:32 GMT Message-Id: <200608162313.k7GNDWln091244@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 104316 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 16 Aug 2006 23:13:33 -0000 http://perforce.freebsd.org/chv.cgi?CH=104316 Change 104316 by imp@imp_lighthouse on 2006/08/16 23:12:57 More cleanup Affected files ... .. //depot/projects/arm/src/sys/boot/arm/at91/boot0iic/Makefile#7 edit .. //depot/projects/arm/src/sys/boot/arm/at91/boot0iic/doit.c#6 delete .. //depot/projects/arm/src/sys/boot/arm/at91/boot0iic/main.c#4 edit Differences ... ==== //depot/projects/arm/src/sys/boot/arm/at91/boot0iic/Makefile#7 (text) ==== @@ -4,7 +4,7 @@ P=boot0iic FILES=${P} -SRCS=arm_init.s main.c doit.c +SRCS=arm_init.s main.c NO_MAN= LDFLAGS=-e 0 -T ${.CURDIR}/../linker.cfg OBJS+= ${SRCS:N*.h:R:S/$/.o/g} ==== //depot/projects/arm/src/sys/boot/arm/at91/boot0iic/main.c#4 (text) ==== @@ -28,8 +28,6 @@ #include "lib.h" #include "at91rm9200_lowlevel.h" -extern void doit(void *); - int main(void) { @@ -37,6 +35,9 @@ while (xmodem_rx(addr) == -1) continue; - doit(addr); + InitEEPROM(); + printf("Writing EEPROM from 0x%x to addr 0\r\n", addr); + WriteEEPROM(0, addr, 8192); + printf("Write complete. Press reset\r\n"); return (1); } From owner-p4-projects@FreeBSD.ORG Wed Aug 16 23:17:39 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0025F16A4E7; Wed, 16 Aug 2006 23:17:38 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 D33B816A4DA for ; Wed, 16 Aug 2006 23:17:38 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8A6C943D67 for ; Wed, 16 Aug 2006 23:17:38 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7GNHcQo091496 for ; Wed, 16 Aug 2006 23:17:38 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7GNHc3i091493 for perforce@freebsd.org; Wed, 16 Aug 2006 23:17:38 GMT (envelope-from imp@freebsd.org) Date: Wed, 16 Aug 2006 23:17:38 GMT Message-Id: <200608162317.k7GNHc3i091493@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 104318 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 16 Aug 2006 23:17:39 -0000 http://perforce.freebsd.org/chv.cgi?CH=104318 Change 104318 by imp@imp_lighthouse on 2006/08/16 23:17:31 Kill unnecessary include Affected files ... .. //depot/projects/arm/src/sys/boot/arm/at91/boot0spi/main.c#14 edit Differences ... ==== //depot/projects/arm/src/sys/boot/arm/at91/boot0spi/main.c#14 (text) ==== @@ -28,7 +28,6 @@ #include "lib.h" #include "at91rm9200_lowlevel.h" #include "spi_flash.h" -#include "fpga.h" #define OFFSET 0 From owner-p4-projects@FreeBSD.ORG Thu Aug 17 00:04:42 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8117716A4E6; Thu, 17 Aug 2006 00:04:42 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 5BBD116A4DE for ; Thu, 17 Aug 2006 00:04:42 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0155043D4C for ; Thu, 17 Aug 2006 00:04:42 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7H04fvn095638 for ; Thu, 17 Aug 2006 00:04:41 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7H04f6r095635 for perforce@freebsd.org; Thu, 17 Aug 2006 00:04:41 GMT (envelope-from imp@freebsd.org) Date: Thu, 17 Aug 2006 00:04:41 GMT Message-Id: <200608170004.k7H04f6r095635@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 104328 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 17 Aug 2006 00:04:42 -0000 http://perforce.freebsd.org/chv.cgi?CH=104328 Change 104328 by imp@imp_lighthouse on 2006/08/17 00:04:03 Fixups for $FreeBSD$ spoo, plus some copyright header additions that I made before integrating into FreeBSD-current. Affected files ... .. //depot/projects/arm/src/sys/boot/arm/at91/Makefile#10 edit .. //depot/projects/arm/src/sys/boot/arm/at91/boot0iic/main.c#5 edit .. //depot/projects/arm/src/sys/boot/arm/at91/boot0spi/main.c#15 edit .. //depot/projects/arm/src/sys/boot/arm/at91/bootiic/env_vars.c#14 edit .. //depot/projects/arm/src/sys/boot/arm/at91/bootiic/env_vars.h#6 edit .. //depot/projects/arm/src/sys/boot/arm/at91/bootiic/loader_prompt.c#15 edit .. //depot/projects/arm/src/sys/boot/arm/at91/bootiic/loader_prompt.h#8 edit .. //depot/projects/arm/src/sys/boot/arm/at91/bootspi/env_vars.c#8 edit .. //depot/projects/arm/src/sys/boot/arm/at91/bootspi/env_vars.h#2 edit .. //depot/projects/arm/src/sys/boot/arm/at91/bootspi/loader_prompt.h#8 edit .. //depot/projects/arm/src/sys/boot/arm/at91/libat91/delay.c#3 edit .. //depot/projects/arm/src/sys/boot/arm/at91/libat91/emac.c#26 edit .. //depot/projects/arm/src/sys/boot/arm/at91/libat91/emac.h#10 edit .. //depot/projects/arm/src/sys/boot/arm/at91/libat91/emac_init.c#2 edit .. //depot/projects/arm/src/sys/boot/arm/at91/libat91/lib_AT91RM9200.h#2 edit .. //depot/projects/arm/src/sys/boot/arm/at91/libat91/mci_device.c#6 edit .. //depot/projects/arm/src/sys/boot/arm/at91/libat91/mci_device.h#4 edit .. //depot/projects/arm/src/sys/boot/arm/at91/libat91/reset.c#4 edit .. //depot/projects/arm/src/sys/boot/arm/at91/libat91/sd-card.c#4 edit .. //depot/projects/arm/src/sys/boot/arm/at91/libat91/sd-card.h#2 edit .. //depot/projects/arm/src/sys/boot/arm/at91/libat91/spi_flash.c#16 edit .. //depot/projects/arm/src/sys/boot/arm/at91/libat91/spi_flash.h#8 edit Differences ... ==== //depot/projects/arm/src/sys/boot/arm/at91/Makefile#10 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/boot/arm/at91/Makefile,v 1.2 2006/04/21 06:43:32 imp Exp $ +# $FreeBSD: src/sys/boot/arm/at91/boot0spi/Makefile,v 1.2 2006/08/16 23:18:07 imp Exp $ SUBDIR= libat91 boot0 boot0iic boot0spi boot2 bootiic bootspi bootsd ==== //depot/projects/arm/src/sys/boot/arm/at91/boot0iic/main.c#5 (text) ==== @@ -21,7 +21,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/boot/arm/at91/boot0iic/main.c,v 1.1 2006/04/21 06:48:52 imp Exp $ + * $FreeBSD: src/sys/boot/arm/at91/boot0iic/main.c,v 1.2 2006/08/16 23:14:52 imp Exp $ */ #include "at91rm9200.h" ==== //depot/projects/arm/src/sys/boot/arm/at91/boot0spi/main.c#15 (text) ==== @@ -21,7 +21,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/boot/arm/at91/boot0spi/main.c,v 1.1 2006/04/21 06:51:08 imp Exp $ + * $FreeBSD: src/sys/boot/arm/at91/boot0spi/main.c,v 1.2 2006/08/16 23:18:07 imp Exp $ */ #include "at91rm9200.h" ==== //depot/projects/arm/src/sys/boot/arm/at91/bootiic/env_vars.c#14 (text+ko) ==== @@ -17,7 +17,7 @@ * only. * END_BLOCK * - * $FreeBSD: src/sys/boot/arm/at91/libat91/env_vars.c,v 1.1 2006/04/19 17:16:49 imp Exp $ + * $FreeBSD: src/sys/boot/arm/at91/bootiic/env_vars.c,v 1.1 2006/08/10 19:55:52 imp Exp $ *****************************************************************************/ #include "env_vars.h" ==== //depot/projects/arm/src/sys/boot/arm/at91/bootiic/env_vars.h#6 (text+ko) ==== @@ -17,7 +17,7 @@ * only. * END_BLOCK * - * $FreeBSD: src/sys/boot/arm/at91/libat91/env_vars.h,v 1.1 2006/04/19 17:16:49 imp Exp $ + * $FreeBSD: src/sys/boot/arm/at91/bootiic/env_vars.h,v 1.1 2006/08/10 19:55:52 imp Exp $ *****************************************************************************/ #ifndef _ENV_VARS_H_ ==== //depot/projects/arm/src/sys/boot/arm/at91/bootiic/loader_prompt.c#15 (text+ko) ==== @@ -19,7 +19,7 @@ * only. * END_BLOCK * - * $FreeBSD: src/sys/boot/arm/at91/libat91/loader_prompt.c,v 1.2 2006/04/21 13:56:26 imp Exp $ + * $FreeBSD: src/sys/boot/arm/at91/bootiic/loader_prompt.c,v 1.2 2006/08/16 23:39:58 imp Exp $ *****************************************************************************/ #include "at91rm9200_lowlevel.h" ==== //depot/projects/arm/src/sys/boot/arm/at91/bootiic/loader_prompt.h#8 (text+ko) ==== @@ -17,7 +17,7 @@ * only. * END_BLOCK * - * $FreeBSD: src/sys/boot/arm/at91/libat91/loader_prompt.h,v 1.1 2006/04/19 17:16:49 imp Exp $ + * $FreeBSD: src/sys/boot/arm/at91/bootiic/loader_prompt.h,v 1.1 2006/08/10 19:55:52 imp Exp $ *****************************************************************************/ #ifndef _LOADER_PROMPT_H_ ==== //depot/projects/arm/src/sys/boot/arm/at91/bootspi/env_vars.c#8 (text+ko) ==== @@ -17,7 +17,7 @@ * only. * END_BLOCK * - * $FreeBSD: src/sys/boot/arm/at91/libat91/env_vars.c,v 1.1 2006/04/19 17:16:49 imp Exp $ + * $FreeBSD: src/sys/boot/arm/at91/bootspi/env_vars.c,v 1.1 2006/08/16 23:39:58 imp Exp $ *****************************************************************************/ #include "env_vars.h" ==== //depot/projects/arm/src/sys/boot/arm/at91/bootspi/env_vars.h#2 (text+ko) ==== @@ -17,7 +17,7 @@ * only. * END_BLOCK * - * $FreeBSD: src/sys/boot/arm/at91/libat91/env_vars.h,v 1.1 2006/04/19 17:16:49 imp Exp $ + * $FreeBSD: src/sys/boot/arm/at91/bootspi/env_vars.h,v 1.1 2006/08/16 23:39:58 imp Exp $ *****************************************************************************/ #ifndef _ENV_VARS_H_ ==== //depot/projects/arm/src/sys/boot/arm/at91/bootspi/loader_prompt.h#8 (text+ko) ==== @@ -17,7 +17,7 @@ * only. * END_BLOCK * - * $FreeBSD: src/sys/boot/arm/at91/libat91/loader_prompt.h,v 1.1 2006/04/19 17:16:49 imp Exp $ + * $FreeBSD: src/sys/boot/arm/at91/bootspi/loader_prompt.h,v 1.1 2006/08/16 23:39:58 imp Exp $ *****************************************************************************/ #ifndef _LOADER_PROMPT_H_ ==== //depot/projects/arm/src/sys/boot/arm/at91/libat91/delay.c#3 (text+ko) ==== @@ -1,3 +1,32 @@ +/*- + * Copyright (c) 2006 M. Warner Losh. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * + * This software is derived from software provide by Kwikbyte who specifically + * disclaimed copyright on the code. + * + * $FreeBSD: src/sys/boot/arm/at91/libat91/delay.c,v 1.1 2006/08/16 23:39:58 imp Exp $ + */ + #include "at91rm9200.h" #include "spi_flash.h" #include "lib.h" ==== //depot/projects/arm/src/sys/boot/arm/at91/libat91/emac.c#26 (text+ko) ==== @@ -19,7 +19,7 @@ * only. * END_BLOCK * - * $FreeBSD: src/sys/boot/arm/at91/libat91/emac.c,v 1.2 2006/08/10 18:11:22 imp Exp $ + * $FreeBSD: src/sys/boot/arm/at91/libat91/emac.c,v 1.3 2006/08/16 23:39:58 imp Exp $ ******************************************************************************/ #include "at91rm9200.h" ==== //depot/projects/arm/src/sys/boot/arm/at91/libat91/emac.h#10 (text+ko) ==== @@ -17,7 +17,7 @@ * only. * END_BLOCK * - * $FreeBSD: src/sys/boot/arm/at91/libat91/emac.h,v 1.2 2006/08/10 18:11:22 imp Exp $ + * $FreeBSD: src/sys/boot/arm/at91/libat91/emac.h,v 1.3 2006/08/16 23:39:58 imp Exp $ *****************************************************************************/ ==== //depot/projects/arm/src/sys/boot/arm/at91/libat91/emac_init.c#2 (text+ko) ==== @@ -1,4 +1,33 @@ -/******************************************************************************* +/*- + * Copyright (c) 2006 M. Warner Losh. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * + * This software is derived from software provide by Kwikbyte who specifically + * disclaimed copyright on the code. + * + * $FreeBSD: src/sys/boot/arm/at91/libat91/emac_init.c,v 1.1 2006/08/16 23:39:58 imp Exp $ + */ + +/****************************************************************************** * * Filename: emac.c * ==== //depot/projects/arm/src/sys/boot/arm/at91/libat91/lib_AT91RM9200.h#2 (text+ko) ==== @@ -1,3 +1,32 @@ +/*- + * Copyright (c) 2006 M. Warner Losh. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * + * This software is derived from software provide by Kwikbyte who specifically + * disclaimed copyright on the code. + * + * $FreeBSD: src/sys/boot/arm/at91/libat91/lib_AT91RM9200.h,v 1.1 2006/08/16 23:39:58 imp Exp $ + */ + #ifndef __LIBAT91RM9200_H #define __LIBAT91RM9200_H ==== //depot/projects/arm/src/sys/boot/arm/at91/libat91/mci_device.c#6 (text+ko) ==== @@ -1,3 +1,32 @@ +/*- + * Copyright (c) 2006 M. Warner Losh. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * + * This software is derived from software provide by Kwikbyte who specifically + * disclaimed copyright on the code. + * + * $FreeBSD: src/sys/boot/arm/at91/libat91/mci_device.c,v 1.1 2006/08/16 23:39:58 imp Exp $ + */ + //*---------------------------------------------------------------------------- //* ATMEL Microcontroller Software Support - ROUSSET - //*---------------------------------------------------------------------------- ==== //depot/projects/arm/src/sys/boot/arm/at91/libat91/mci_device.h#4 (text+ko) ==== @@ -1,3 +1,32 @@ +/*- + * Copyright (c) 2006 M. Warner Losh. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * + * This software is derived from software provide by Kwikbyte who specifically + * disclaimed copyright on the code. + * + * $FreeBSD: src/sys/boot/arm/at91/libat91/mci_device.h,v 1.1 2006/08/16 23:39:58 imp Exp $ + */ + //*--------------------------------------------------------------------------- //* ATMEL Microcontroller Software Support - ROUSSET - //*--------------------------------------------------------------------------- ==== //depot/projects/arm/src/sys/boot/arm/at91/libat91/reset.c#4 (text+ko) ==== @@ -21,7 +21,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$ + * $FreeBSD: src/sys/boot/arm/at91/libat91/reset.c,v 1.1 2006/08/16 23:39:58 imp Exp $ */ #include "at91rm9200.h" ==== //depot/projects/arm/src/sys/boot/arm/at91/libat91/sd-card.c#4 (text+ko) ==== @@ -1,3 +1,32 @@ +/*- + * Copyright (c) 2006 M. Warner Losh. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * + * This software is derived from software provide by Kwikbyte who specifically + * disclaimed copyright on the code. + * + * $FreeBSD: src/sys/boot/arm/at91/libat91/sd-card.c,v 1.1 2006/08/16 23:39:58 imp Exp $ + */ + //*---------------------------------------------------------------------------- //* ATMEL Microcontroller Software Support - ROUSSET - //*---------------------------------------------------------------------------- ==== //depot/projects/arm/src/sys/boot/arm/at91/libat91/sd-card.h#2 (text+ko) ==== @@ -1,3 +1,32 @@ +/*- + * Copyright (c) 2006 M. Warner Losh. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * + * This software is derived from software provide by Kwikbyte who specifically + * disclaimed copyright on the code. + * + * $FreeBSD: src/sys/boot/arm/at91/libat91/sd-card.h,v 1.1 2006/08/16 23:39:58 imp Exp $ + */ + #ifndef __SD_CARD_H #define __SD_CARD_H ==== //depot/projects/arm/src/sys/boot/arm/at91/libat91/spi_flash.c#16 (text+ko) ==== @@ -19,7 +19,7 @@ * only. * END_BLOCK * - * $FreeBSD$ + * $FreeBSD: src/sys/boot/arm/at91/libat91/spi_flash.c,v 1.1 2006/08/10 18:14:35 imp Exp $ *****************************************************************************/ #include "at91rm9200.h" ==== //depot/projects/arm/src/sys/boot/arm/at91/libat91/spi_flash.h#8 (text+ko) ==== @@ -17,7 +17,7 @@ * only. * END_BLOCK * - * $FreeBSD$ + * $FreeBSD: src/sys/boot/arm/at91/libat91/spi_flash.h,v 1.1 2006/08/10 18:14:35 imp Exp $ ******************************************************************************/ #ifndef _SPI_FLASH_H_ From owner-p4-projects@FreeBSD.ORG Thu Aug 17 00:06:46 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A3C3916A4E2; Thu, 17 Aug 2006 00:06:46 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 51A8216A4DE for ; Thu, 17 Aug 2006 00:06:46 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6883643D45 for ; Thu, 17 Aug 2006 00:06:45 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7H06jdA095837 for ; Thu, 17 Aug 2006 00:06:45 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7H06iIV095834 for perforce@freebsd.org; Thu, 17 Aug 2006 00:06:44 GMT (envelope-from imp@freebsd.org) Date: Thu, 17 Aug 2006 00:06:44 GMT Message-Id: <200608170006.k7H06iIV095834@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 104329 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 17 Aug 2006 00:06:46 -0000 http://perforce.freebsd.org/chv.cgi?CH=104329 Change 104329 by imp@imp_lighthouse on 2006/08/17 00:06:10 IFC @104382 Affected files ... .. //depot/projects/arm/src/sys/amd64/amd64/support.S#4 integrate .. //depot/projects/arm/src/sys/boot/arm/at91/boot0iic/Makefile#8 integrate .. //depot/projects/arm/src/sys/boot/arm/at91/boot0iic/main.c#6 integrate .. //depot/projects/arm/src/sys/boot/arm/at91/boot0spi/Makefile#7 integrate .. //depot/projects/arm/src/sys/boot/arm/at91/boot0spi/main.c#16 integrate .. //depot/projects/arm/src/sys/boot/arm/at91/bootiic/loader_prompt.c#16 integrate .. //depot/projects/arm/src/sys/boot/arm/at91/bootspi/Makefile#13 integrate .. //depot/projects/arm/src/sys/boot/arm/at91/bootspi/main.c#16 integrate .. //depot/projects/arm/src/sys/boot/arm/at91/libat91/Makefile#18 integrate .. //depot/projects/arm/src/sys/boot/arm/at91/libat91/emac.c#27 integrate .. //depot/projects/arm/src/sys/boot/arm/at91/libat91/emac.h#11 integrate .. //depot/projects/arm/src/sys/compat/freebsd32/syscalls.master#14 integrate .. //depot/projects/arm/src/sys/dev/em/if_em.c#24 integrate .. //depot/projects/arm/src/sys/kern/syscalls.master#17 integrate .. //depot/projects/arm/src/sys/nfsclient/nfs_lock.c#4 integrate Differences ... ==== //depot/projects/arm/src/sys/amd64/amd64/support.S#4 (text+ko) ==== @@ -27,7 +27,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/amd64/support.S,v 1.118 2006/08/15 22:43:02 davidxu Exp $ + * $FreeBSD: src/sys/amd64/amd64/support.S,v 1.119 2006/08/16 22:22:28 davidxu Exp $ */ #include "opt_ddb.h" @@ -432,7 +432,7 @@ ja fusufault movq %rsi,(%rdi) - xorq %rax,%rax + xorl %eax,%eax movq PCPU(CURPCB),%rcx movq %rax,PCB_ONFAULT(%rcx) ret ==== //depot/projects/arm/src/sys/boot/arm/at91/boot0iic/Makefile#8 (text) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/boot/arm/at91/boot0iic/Makefile,v 1.1 2006/04/21 06:48:52 imp Exp $ +# $FreeBSD: src/sys/boot/arm/at91/boot0iic/Makefile,v 1.2 2006/08/16 23:14:52 imp Exp $ .PATH: ${.CURDIR}/../boot0 ==== //depot/projects/arm/src/sys/boot/arm/at91/boot0iic/main.c#6 (text) ==== ==== //depot/projects/arm/src/sys/boot/arm/at91/boot0spi/Makefile#7 (text) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/boot/arm/at91/boot0spi/Makefile,v 1.1 2006/04/21 06:51:08 imp Exp $ +# $FreeBSD: src/sys/boot/arm/at91/boot0spi/Makefile,v 1.2 2006/08/16 23:18:07 imp Exp $ .PATH: ${.CURDIR}/../boot0 ==== //depot/projects/arm/src/sys/boot/arm/at91/boot0spi/main.c#16 (text) ==== ==== //depot/projects/arm/src/sys/boot/arm/at91/bootiic/loader_prompt.c#16 (text+ko) ==== ==== //depot/projects/arm/src/sys/boot/arm/at91/bootspi/Makefile#13 (text+ko) ==== @@ -1,9 +1,8 @@ -# $FreeBSD: src/sys/boot/arm/at91/bootspi/Makefile,v 1.1 2006/04/19 17:16:48 imp Exp $ +# $FreeBSD: src/sys/boot/arm/at91/bootspi/Makefile,v 1.2 2006/08/16 23:39:58 imp Exp $ P=bootspi FILES=${P} SRCS=arm_init.S main.c loader_prompt.c env_vars.c ee.c -#SRCS+=ints.c mci_device.c sd-card.c stormy16-lib2.c NO_MAN= LDFLAGS=-e 0 -T ${.CURDIR}/../linker.cfg OBJS+= ${SRCS:N*.h:R:S/$/.o/g} ==== //depot/projects/arm/src/sys/boot/arm/at91/bootspi/main.c#16 (text+ko) ==== @@ -31,7 +31,7 @@ * owners. This software is not copyrighted and is intended for reference * only. * - * $FreeBSD$ + * $FreeBSD: src/sys/boot/arm/at91/bootspi/main.c,v 1.2 2006/08/16 23:39:58 imp Exp $ */ #include "env_vars.h" ==== //depot/projects/arm/src/sys/boot/arm/at91/libat91/Makefile#18 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/boot/arm/at91/libat91/Makefile,v 1.3 2006/08/10 18:14:35 imp Exp $ +# $FreeBSD: src/sys/boot/arm/at91/libat91/Makefile,v 1.4 2006/08/16 23:39:58 imp Exp $ .include "${.CURDIR}/../Makefile.inc" ==== //depot/projects/arm/src/sys/boot/arm/at91/libat91/emac.c#27 (text+ko) ==== ==== //depot/projects/arm/src/sys/boot/arm/at91/libat91/emac.h#11 (text+ko) ==== ==== //depot/projects/arm/src/sys/compat/freebsd32/syscalls.master#14 (text+ko) ==== @@ -1,4 +1,4 @@ - $FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.70 2006/07/28 19:05:26 jhb Exp $ + $FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.71 2006/08/16 22:32:50 peter Exp $ ; from: @(#)syscalls.master 8.2 (Berkeley) 1/13/94 ; from: src/sys/kern/syscalls.master 1.107 ; @@ -754,3 +754,5 @@ 466 AUE_NULL UNIMPL thr_setscheduler 467 AUE_NULL UNIMPL thr_getscheduler 468 AUE_NULL UNIMPL thr_setschedparam +469 AUE_NULL UNIMPL __getpath_fromfd +470 AUE_NULL UNIMPL __getpath_fromaddr ==== //depot/projects/arm/src/sys/dev/em/if_em.c#24 (text+ko) ==== @@ -31,7 +31,7 @@ ***************************************************************************/ -/*$FreeBSD: src/sys/dev/em/if_em.c,v 1.131 2006/08/14 09:52:35 glebius Exp $*/ +/*$FreeBSD: src/sys/dev/em/if_em.c,v 1.132 2006/08/16 23:55:34 yongari Exp $*/ #ifdef HAVE_KERNEL_OPTION_HEADERS #include "opt_device_polling.h" @@ -2865,8 +2865,6 @@ rx_buffer->m_head = m; adapter->rx_desc_base[i].buffer_addr = htole64(segs[0].ds_addr); - /* Zero out the receive descriptors status. */ - adapter->rx_desc_base[i].status = 0; return (0); } @@ -3123,6 +3121,7 @@ /* Pointer to the receive descriptor being examined. */ struct em_rx_desc *current_desc; + uint8_t status; ifp = adapter->ifp; i = adapter->next_rx_desc_to_check; @@ -3149,7 +3148,8 @@ accept_frame = 1; prev_len_adj = 0; desc_len = le16toh(current_desc->length); - if (current_desc->status & E1000_RXD_STAT_EOP) { + status = current_desc->status; + if (status & E1000_RXD_STAT_EOP) { count--; eop = 1; if (desc_len < ETHER_CRC_LEN) { @@ -3170,9 +3170,8 @@ pkt_len += adapter->fmp->m_pkthdr.len; last_byte = *(mtod(mp, caddr_t) + desc_len - 1); - if (TBI_ACCEPT(&adapter->hw, current_desc->status, - current_desc->errors, - pkt_len, last_byte)) { + if (TBI_ACCEPT(&adapter->hw, status, + current_desc->errors, pkt_len, last_byte)) { em_tbi_adjust_stats(&adapter->hw, &adapter->stats, pkt_len, adapter->hw.mac_addr); @@ -3224,7 +3223,7 @@ em_fixup_rx(adapter) != 0) goto skip; #endif - if (current_desc->status & E1000_RXD_STAT_VP) + if (status & E1000_RXD_STAT_VP) VLAN_INPUT_TAG(ifp, adapter->fmp, (le16toh(current_desc->special) & E1000_RXD_SPC_VLAN_MASK)); @@ -3250,11 +3249,11 @@ adapter->fmp = NULL; adapter->lmp = NULL; } - /* Zero out the receive descriptors status. */ - adapter->rx_desc_base[i].status = 0; m = NULL; } + /* Zero out the receive descriptors status. */ + current_desc->status = 0; bus_dmamap_sync(adapter->rxdma.dma_tag, adapter->rxdma.dma_map, BUS_DMASYNC_PREREAD | BUS_DMASYNC_PREWRITE); ==== //depot/projects/arm/src/sys/kern/syscalls.master#17 (text+ko) ==== @@ -1,4 +1,4 @@ - $FreeBSD: src/sys/kern/syscalls.master,v 1.222 2006/08/15 16:45:41 jhb Exp $ + $FreeBSD: src/sys/kern/syscalls.master,v 1.223 2006/08/16 22:32:50 peter Exp $ ; from: @(#)syscalls.master 8.2 (Berkeley) 1/13/94 ; ; System call name/number master file. @@ -827,5 +827,7 @@ 468 AUE_NULL STD { int thr_setschedparam(long id, \ const struct sched_param *param, \ int param_size); } +469 AUE_NULL UNIMPL __getpath_fromfd +470 AUE_NULL UNIMPL __getpath_fromaddr ; Please copy any additions and changes to the following compatability tables: ; sys/compat/freebsd32/syscalls.master ==== //depot/projects/arm/src/sys/nfsclient/nfs_lock.c#4 (text+ko) ==== @@ -29,7 +29,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/nfsclient/nfs_lock.c,v 1.43 2006/01/13 23:16:29 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/nfsclient/nfs_lock.c,v 1.44 2006/08/16 23:53:05 thomas Exp $"); #include #include @@ -290,7 +290,7 @@ return (error); /* - * retry after 20 seconds if we haven't gotten a responce yet. + * Retry after 20 seconds if we haven't gotten a response yet. * This number was picked out of thin air... but is longer * then even a reasonably loaded system should take (at least * on a local network). XXX Probably should use a back-off From owner-p4-projects@FreeBSD.ORG Thu Aug 17 00:10:52 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5D28D16A4DA; Thu, 17 Aug 2006 00:10:52 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 3154016A4E1 for ; Thu, 17 Aug 2006 00:10:52 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5049C43D55 for ; Thu, 17 Aug 2006 00:10:51 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7H0ApZ3096055 for ; Thu, 17 Aug 2006 00:10:51 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7H0ApRB096052 for perforce@freebsd.org; Thu, 17 Aug 2006 00:10:51 GMT (envelope-from imp@freebsd.org) Date: Thu, 17 Aug 2006 00:10:51 GMT Message-Id: <200608170010.k7H0ApRB096052@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 104330 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 17 Aug 2006 00:10:52 -0000 http://perforce.freebsd.org/chv.cgi?CH=104330 Change 104330 by imp@imp_lighthouse on 2006/08/17 00:10:37 Get closer to FreeBSD-current Affected files ... .. //depot/projects/arm/src/sys/boot/arm/at91/Makefile#11 edit .. //depot/projects/arm/src/sys/boot/arm/at91/bootspi/arm_init.S#6 edit .. //depot/projects/arm/src/sys/boot/arm/at91/bootspi/loader_prompt.c#18 edit Differences ... ==== //depot/projects/arm/src/sys/boot/arm/at91/Makefile#11 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/boot/arm/at91/boot0spi/Makefile,v 1.2 2006/08/16 23:18:07 imp Exp $ +# $FreeBSD: src/sys/boot/arm/at91/Makefile,v 1.2 2006/04/21 06:43:32 imp Exp $ SUBDIR= libat91 boot0 boot0iic boot0spi boot2 bootiic bootspi bootsd ==== //depot/projects/arm/src/sys/boot/arm/at91/bootspi/arm_init.S#6 (text+ko) ==== @@ -20,7 +20,7 @@ * only. * END_BLOCK * - * $FreeBSD: src/sys/boot/arm/at91/bootspi/arm_init.s,v 1.1 2006/04/19 17:16:48 imp Exp $ + * $FreeBSD: src/sys/boot/arm/at91/bootspi/arm_init.S,v 1.1 2006/08/16 23:39:58 imp Exp $ ******************************************************************************/ .equ ARM_MODE_USER, 0x10 ==== //depot/projects/arm/src/sys/boot/arm/at91/bootspi/loader_prompt.c#18 (text+ko) ==== @@ -19,7 +19,7 @@ * only. * END_BLOCK * - * $FreeBSD: src/sys/boot/arm/at91/libat91/loader_prompt.c,v 1.2 2006/04/21 13:56:26 imp Exp $ + * $FreeBSD: src/sys/boot/arm/at91/bootspi/loader_prompt.c,v 1.1 2006/08/16 23:39:58 imp Exp $ *****************************************************************************/ #include "at91rm9200_lowlevel.h" From owner-p4-projects@FreeBSD.ORG Thu Aug 17 06:12:35 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4528B16A4E0; Thu, 17 Aug 2006 06:12:35 +0000 (UTC) X-Original-To: perforce@FreeBSD.org 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 0688C16A4DD for ; Thu, 17 Aug 2006 06:12:35 +0000 (UTC) (envelope-from cdjones@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C98AF43D46 for ; Thu, 17 Aug 2006 06:12:34 +0000 (GMT) (envelope-from cdjones@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7H6CYjw067102 for ; Thu, 17 Aug 2006 06:12:34 GMT (envelope-from cdjones@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7H6CYS6067099 for perforce@freebsd.org; Thu, 17 Aug 2006 06:12:34 GMT (envelope-from cdjones@FreeBSD.org) Date: Thu, 17 Aug 2006 06:12:34 GMT Message-Id: <200608170612.k7H6CYS6067099@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to cdjones@FreeBSD.org using -f From: Chris Jones To: Perforce Change Reviews Cc: Subject: PERFORCE change 104357 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 17 Aug 2006 06:12:35 -0000 http://perforce.freebsd.org/chv.cgi?CH=104357 Change 104357 by cdjones@cdjones_meanook on 2006/08/17 06:12:23 Keep track of total jailed CPU usage, and make the schedcpu output less frequently spammy. Affected files ... .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/sched_hier.c#12 edit Differences ... ==== //depot/projects/soc2006/cdjones_jail/src/sys/kern/sched_hier.c#12 (text+ko) ==== @@ -178,6 +178,7 @@ #endif static uint32_t total_jail_sched_shares; +static u_int total_est_cpu; extern struct mtx allprison_mtx; extern int prisoncount; @@ -457,6 +458,7 @@ } } sx_slock(&allproc_lock); + total_est_cpu = 0; FOREACH_PROC_IN_SYSTEM(p) { /* * Prevent state changes and protect run queue. @@ -541,6 +543,7 @@ if (kg->kg_slptime > 1) continue; kg->kg_estcpu = decay_cpu(loadfac, kg->kg_estcpu); + total_est_cpu += kg->kg_estcpu; if (kg->kg_proc->p_ucred->cr_prison) kg->kg_proc->p_ucred->cr_prison->pr_estcpu += kg->kg_estcpu; @@ -570,6 +573,7 @@ struct prison *pr; u_int32_t nShares = 0; u_int nCpu = 0; + unsigned int counter = 0; for (;;) { /* @@ -589,8 +593,11 @@ nShares += pr->pr_sched_shares; nCpu += pr->pr_estcpu; } - printf("schedcpu_thread: %d CPU shares total, %d CPU est. usage\n", nShares, nCpu); + if (0 == (counter % 10)) + printf("schedcpu_thread: %d CPU shares total, %d / %d CPU est. usage\n", + nShares, nCpu, total_est_cpu); total_jail_sched_shares = nShares; + counter++; schedcpu(); tsleep(&nowake, 0, "-", hz); From owner-p4-projects@FreeBSD.ORG Thu Aug 17 08:12:09 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B600216A4E1; Thu, 17 Aug 2006 08:12:09 +0000 (UTC) X-Original-To: perforce@FreeBSD.org 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 77EA016A4DA for ; Thu, 17 Aug 2006 08:12:09 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 47ADD43D58 for ; Thu, 17 Aug 2006 08:12:09 +0000 (GMT) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7H8C9D2005175 for ; Thu, 17 Aug 2006 08:12:09 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7H8C9k2005172 for perforce@freebsd.org; Thu, 17 Aug 2006 08:12:09 GMT (envelope-from rdivacky@FreeBSD.org) Date: Thu, 17 Aug 2006 08:12:09 GMT Message-Id: <200608170812.k7H8C9k2005172@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rdivacky@FreeBSD.org using -f From: Roman Divacky To: Perforce Change Reviews Cc: Subject: PERFORCE change 104364 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 17 Aug 2006 08:12:10 -0000 http://perforce.freebsd.org/chv.cgi?CH=104364 Change 104364 by rdivacky@rdivacky_witten on 2006/08/17 08:11:24 Sync with src in amd64ficition + amd64fy exit_group. Change the getpid() in amd64 version to lock the proc. Affected files ... .. //depot/projects/soc2006/rdivacky_linuxolator/compat/linux/linux_misc.c#22 edit Differences ... ==== //depot/projects/soc2006/rdivacky_linuxolator/compat/linux/linux_misc.c#22 (text+ko) ==== @@ -1331,6 +1331,7 @@ int linux_getpid(struct thread *td, struct linux_getpid_args *args) { +#ifdef __i386__ struct linux_emuldata *em; char osrel[LINUX_MAX_UTSNAME]; @@ -1345,6 +1346,11 @@ td->td_retval[0] = td->td_proc->p_pid; PROC_UNLOCK(td->td_proc); } +#else + PROC_LOCK(td->td_proc); + td->td_retval[0] = td->td_proc->p_pid; + PROC_UNLOCK(td->td_proc); +#endif return (0); } @@ -1364,6 +1370,7 @@ int linux_getppid(struct thread *td, struct linux_getppid_args *args) { +#ifdef __i386__ struct linux_emuldata *em; struct proc *p, *pp; char osrel[LINUX_MAX_UTSNAME]; @@ -1405,6 +1412,9 @@ EMUL_UNLOCK(&emul_lock); PROC_UNLOCK(pp); +#else + return getppid(td, (struct getppid_args *) args); +#endif return (0); } @@ -1471,6 +1481,7 @@ int linux_exit_group(struct thread *td, struct linux_exit_group_args *args) { +#ifdef __i386__ struct linux_emuldata *em, *td_em, *tmp_em; struct proc *sp; char osrel[LINUX_MAX_UTSNAME]; @@ -1502,6 +1513,7 @@ EMUL_SHARED_RUNLOCK(&emul_shared_lock); EMUL_UNLOCK(&emul_lock); } +#endif exit1(td, W_EXITCODE(args->error_code,0)); From owner-p4-projects@FreeBSD.ORG Thu Aug 17 08:21:21 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C53A416A50A; Thu, 17 Aug 2006 08:21:21 +0000 (UTC) X-Original-To: perforce@FreeBSD.org 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 8B60916A4E0 for ; Thu, 17 Aug 2006 08:21:21 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5EC4B43D45 for ; Thu, 17 Aug 2006 08:21:21 +0000 (GMT) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7H8LLIc005652 for ; Thu, 17 Aug 2006 08:21:21 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7H8LL0U005649 for perforce@freebsd.org; Thu, 17 Aug 2006 08:21:21 GMT (envelope-from rdivacky@FreeBSD.org) Date: Thu, 17 Aug 2006 08:21:21 GMT Message-Id: <200608170821.k7H8LL0U005649@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rdivacky@FreeBSD.org using -f From: Roman Divacky To: Perforce Change Reviews Cc: Subject: PERFORCE change 104366 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 17 Aug 2006 08:21:22 -0000 http://perforce.freebsd.org/chv.cgi?CH=104366 Change 104366 by rdivacky@rdivacky_witten on 2006/08/17 08:21:11 Initialize emul_lock in amd64 case. I forgot this in the last commit. Affected files ... .. //depot/projects/soc2006/rdivacky_linuxolator/amd64/linux32/linux32_sysvec.c#10 edit Differences ... ==== //depot/projects/soc2006/rdivacky_linuxolator/amd64/linux32/linux32_sysvec.c#10 (text+ko) ==== @@ -1077,6 +1077,7 @@ linux_ioctl_register_handler(*lihp); SET_FOREACH(ldhp, linux_device_handler_set) linux_device_register_handler(*ldhp); + sx_init(&emul_lock, "emuldata lock"); sx_init(&emul_shared_lock, "emuldata->shared lock"); LIST_INIT(&futex_list); sx_init(&futex_sx, "futex protection lock"); From owner-p4-projects@FreeBSD.ORG Thu Aug 17 08:26:48 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CAE2616A4E2; Thu, 17 Aug 2006 08:26:48 +0000 (UTC) X-Original-To: perforce@FreeBSD.org 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 583FC16A4DF for ; Thu, 17 Aug 2006 08:26:48 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 14DC343D78 for ; Thu, 17 Aug 2006 08:26:48 +0000 (GMT) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7H8QlvK005968 for ; Thu, 17 Aug 2006 08:26:47 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7H8QlMT005947 for perforce@freebsd.org; Thu, 17 Aug 2006 08:26:47 GMT (envelope-from rdivacky@FreeBSD.org) Date: Thu, 17 Aug 2006 08:26:47 GMT Message-Id: <200608170826.k7H8QlMT005947@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rdivacky@FreeBSD.org using -f From: Roman Divacky To: Perforce Change Reviews Cc: Subject: PERFORCE change 104367 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 17 Aug 2006 08:26:49 -0000 http://perforce.freebsd.org/chv.cgi?CH=104367 Change 104367 by rdivacky@rdivacky_witten on 2006/08/17 08:26:05 td is unused now. remove that to fix -DDEBUG build. Affected files ... .. //depot/projects/soc2006/rdivacky_linuxolator/compat/linux/linux_emul.c#11 edit Differences ... ==== //depot/projects/soc2006/rdivacky_linuxolator/compat/linux/linux_emul.c#11 (text+ko) ==== @@ -248,9 +248,6 @@ { struct linux_emuldata *em; int error = 0; -#ifdef DEBUG - struct thread *td = FIRST_THREAD_IN_PROC(p); -#endif int *child_set_tid; if (p->p_sysent != &elf_linux_sysvec) From owner-p4-projects@FreeBSD.ORG Thu Aug 17 08:27:31 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6759016A524; Thu, 17 Aug 2006 08:27:31 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 27A6A16A523 for ; Thu, 17 Aug 2006 08:27:31 +0000 (UTC) (envelope-from tyler@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 74A2743D79 for ; Thu, 17 Aug 2006 08:27:20 +0000 (GMT) (envelope-from tyler@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7H8RKXg006101 for ; Thu, 17 Aug 2006 08:27:20 GMT (envelope-from tyler@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7H8QmZi005971 for perforce@freebsd.org; Thu, 17 Aug 2006 08:26:48 GMT (envelope-from tyler@freebsd.org) Date: Thu, 17 Aug 2006 08:26:48 GMT Message-Id: <200608170826.k7H8QmZi005971@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to tyler@freebsd.org using -f From: "R. Tyler Ballance" To: Perforce Change Reviews Cc: Subject: PERFORCE change 104368 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 17 Aug 2006 08:27:31 -0000 http://perforce.freebsd.org/chv.cgi?CH=104368 Change 104368 by tyler@intellian_audit on 2006/08/17 08:26:12 IFC, since everybody else was doing it :P Affected files ... .. //depot/projects/l4bsd/src/Makefile.inc1#3 integrate .. //depot/projects/l4bsd/src/ObsoleteFiles.inc#3 integrate .. //depot/projects/l4bsd/src/UPDATING#3 integrate .. //depot/projects/l4bsd/src/bin/sh/histedit.c#2 integrate .. //depot/projects/l4bsd/src/bin/sh/parser.c#2 integrate .. //depot/projects/l4bsd/src/bin/sh/sh.1#3 integrate .. //depot/projects/l4bsd/src/bin/test/test.1#2 integrate .. //depot/projects/l4bsd/src/contrib/ipfilter/BSD/Makefile#2 integrate .. //depot/projects/l4bsd/src/contrib/ipfilter/HISTORY#2 integrate .. //depot/projects/l4bsd/src/contrib/ipfilter/Makefile#2 integrate .. //depot/projects/l4bsd/src/contrib/ipfilter/bpf_filter.c#2 integrate .. //depot/projects/l4bsd/src/contrib/ipfilter/ip_fil.c#2 integrate .. //depot/projects/l4bsd/src/contrib/ipfilter/ipf.h#2 integrate .. //depot/projects/l4bsd/src/contrib/ipfilter/iplang/iplang_y.y#2 integrate .. //depot/projects/l4bsd/src/contrib/ipfilter/ipmon.h#2 integrate .. //depot/projects/l4bsd/src/contrib/ipfilter/ipsd/sbpf.c#2 integrate .. //depot/projects/l4bsd/src/contrib/ipfilter/ipsend/ipsend.c#2 integrate .. //depot/projects/l4bsd/src/contrib/ipfilter/ipsend/iptests.c#2 integrate .. //depot/projects/l4bsd/src/contrib/ipfilter/ipsend/lsock.c#2 integrate .. //depot/projects/l4bsd/src/contrib/ipfilter/ipsend/resend.c#2 integrate .. //depot/projects/l4bsd/src/contrib/ipfilter/ipsend/sbpf.c#2 integrate .. //depot/projects/l4bsd/src/contrib/ipfilter/ipsend/sock.c#2 integrate .. //depot/projects/l4bsd/src/contrib/ipfilter/ipt.h#2 integrate .. //depot/projects/l4bsd/src/contrib/ipfilter/lib/Makefile#2 integrate .. //depot/projects/l4bsd/src/contrib/ipfilter/lib/addicmp.c#2 integrate .. //depot/projects/l4bsd/src/contrib/ipfilter/lib/addkeep.c#2 delete .. //depot/projects/l4bsd/src/contrib/ipfilter/lib/facpri.c#2 integrate .. //depot/projects/l4bsd/src/contrib/ipfilter/lib/getport.c#2 integrate .. //depot/projects/l4bsd/src/contrib/ipfilter/lib/icmpcode.c#2 integrate .. //depot/projects/l4bsd/src/contrib/ipfilter/lib/ipft_tx.c#2 integrate .. //depot/projects/l4bsd/src/contrib/ipfilter/lib/make_range.c#2 delete .. //depot/projects/l4bsd/src/contrib/ipfilter/lib/optprint.c#2 integrate .. //depot/projects/l4bsd/src/contrib/ipfilter/lib/printfr.c#2 integrate .. //depot/projects/l4bsd/src/contrib/ipfilter/lib/printlog.c#2 integrate .. //depot/projects/l4bsd/src/contrib/ipfilter/man/ipmon.8#2 integrate .. //depot/projects/l4bsd/src/contrib/ipfilter/radix.c#2 integrate .. //depot/projects/l4bsd/src/contrib/ipfilter/samples/proxy.c#2 integrate .. //depot/projects/l4bsd/src/contrib/ipfilter/test/Makefile#2 integrate .. //depot/projects/l4bsd/src/contrib/ipfilter/test/expected/f20#1 branch .. //depot/projects/l4bsd/src/contrib/ipfilter/test/expected/i1#2 integrate .. //depot/projects/l4bsd/src/contrib/ipfilter/test/expected/i10#2 integrate .. //depot/projects/l4bsd/src/contrib/ipfilter/test/expected/i11#2 integrate .. //depot/projects/l4bsd/src/contrib/ipfilter/test/expected/i18#2 integrate .. //depot/projects/l4bsd/src/contrib/ipfilter/test/expected/i5#2 integrate .. //depot/projects/l4bsd/src/contrib/ipfilter/test/expected/i8#2 integrate .. //depot/projects/l4bsd/src/contrib/ipfilter/test/expected/i9#2 integrate .. //depot/projects/l4bsd/src/contrib/ipfilter/test/expected/in2#2 integrate .. //depot/projects/l4bsd/src/contrib/ipfilter/test/expected/in5#2 integrate .. //depot/projects/l4bsd/src/contrib/ipfilter/test/expected/ni19#1 branch .. //depot/projects/l4bsd/src/contrib/ipfilter/test/expected/ni20#1 branch .. //depot/projects/l4bsd/src/contrib/ipfilter/test/expected/ni21#1 branch .. //depot/projects/l4bsd/src/contrib/ipfilter/test/input/f2#2 integrate .. //depot/projects/l4bsd/src/contrib/ipfilter/test/input/f20#1 branch .. //depot/projects/l4bsd/src/contrib/ipfilter/test/input/ni19#1 branch .. //depot/projects/l4bsd/src/contrib/ipfilter/test/input/ni20#1 branch .. //depot/projects/l4bsd/src/contrib/ipfilter/test/input/ni21#1 branch .. //depot/projects/l4bsd/src/contrib/ipfilter/test/regress/f20#1 branch .. //depot/projects/l4bsd/src/contrib/ipfilter/test/regress/i1#2 integrate .. //depot/projects/l4bsd/src/contrib/ipfilter/test/regress/i10#2 integrate .. //depot/projects/l4bsd/src/contrib/ipfilter/test/regress/i11#2 integrate .. //depot/projects/l4bsd/src/contrib/ipfilter/test/regress/i15#2 integrate .. //depot/projects/l4bsd/src/contrib/ipfilter/test/regress/i17#2 integrate .. //depot/projects/l4bsd/src/contrib/ipfilter/test/regress/i18#2 integrate .. //depot/projects/l4bsd/src/contrib/ipfilter/test/regress/i5#2 integrate .. //depot/projects/l4bsd/src/contrib/ipfilter/test/regress/i8#2 integrate .. //depot/projects/l4bsd/src/contrib/ipfilter/test/regress/i9#2 integrate .. //depot/projects/l4bsd/src/contrib/ipfilter/test/regress/in2#2 integrate .. //depot/projects/l4bsd/src/contrib/ipfilter/test/regress/in5#2 integrate .. //depot/projects/l4bsd/src/contrib/ipfilter/test/regress/ni19.ipf#1 branch .. //depot/projects/l4bsd/src/contrib/ipfilter/test/regress/ni19.nat#1 branch .. //depot/projects/l4bsd/src/contrib/ipfilter/test/regress/ni20.ipf#1 branch .. //depot/projects/l4bsd/src/contrib/ipfilter/test/regress/ni20.nat#1 branch .. //depot/projects/l4bsd/src/contrib/ipfilter/test/regress/ni21.ipf#1 branch .. //depot/projects/l4bsd/src/contrib/ipfilter/test/regress/ni21.nat#1 branch .. //depot/projects/l4bsd/src/contrib/ipfilter/test/test.format#2 integrate .. //depot/projects/l4bsd/src/contrib/ipfilter/todo#1 branch .. //depot/projects/l4bsd/src/contrib/ipfilter/tools/ipf.c#2 integrate .. //depot/projects/l4bsd/src/contrib/ipfilter/tools/ipf_y.y#2 integrate .. //depot/projects/l4bsd/src/contrib/ipfilter/tools/ipfcomp.c#2 integrate .. //depot/projects/l4bsd/src/contrib/ipfilter/tools/ipfs.c#2 integrate .. //depot/projects/l4bsd/src/contrib/ipfilter/tools/ipfstat.c#2 integrate .. //depot/projects/l4bsd/src/contrib/ipfilter/tools/ipftest.c#2 integrate .. //depot/projects/l4bsd/src/contrib/ipfilter/tools/ipmon.c#2 integrate .. //depot/projects/l4bsd/src/contrib/ipfilter/tools/ipnat_y.y#2 integrate .. //depot/projects/l4bsd/src/contrib/ipfilter/tools/ipsyncm.c#2 integrate .. //depot/projects/l4bsd/src/contrib/ipfilter/tools/ipsyncs.c#2 integrate .. //depot/projects/l4bsd/src/contrib/ipfilter/tools/lexer.c#2 integrate .. //depot/projects/l4bsd/src/contrib/smbfs/smbutil/print.c#2 integrate .. //depot/projects/l4bsd/src/contrib/smbfs/smbutil/view.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/CHANGES#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/ChangeLog.0_9_7-stable_not-in-head#1 branch .. //depot/projects/l4bsd/src/crypto/openssl/ChangeLog.0_9_7-stable_not-in-head_FIPS#1 branch .. //depot/projects/l4bsd/src/crypto/openssl/Configure#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/FAQ#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/FREEBSD-Xlist#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/FREEBSD-upgrade#1 branch .. //depot/projects/l4bsd/src/crypto/openssl/INSTALL#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/LICENSE#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/Makefile#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/Makefile.org#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/Makefile.shared#1 branch .. //depot/projects/l4bsd/src/crypto/openssl/NEWS#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/PROBLEMS#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/README#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/apps/CA.pl#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/apps/CA.pl.in#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/apps/CA.sh#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/apps/Makefile#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/apps/apps.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/apps/apps.h#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/apps/asn1pars.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/apps/ca.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/apps/ciphers.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/apps/crl.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/apps/der_chop#2 delete .. //depot/projects/l4bsd/src/crypto/openssl/apps/der_chop.in#2 delete .. //depot/projects/l4bsd/src/crypto/openssl/apps/dgst.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/apps/dh.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/apps/dhparam.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/apps/dsa.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/apps/dsaparam.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/apps/ec.c#1 branch .. //depot/projects/l4bsd/src/crypto/openssl/apps/ecparam.c#1 branch .. //depot/projects/l4bsd/src/crypto/openssl/apps/enc.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/apps/engine.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/apps/gendh.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/apps/gendsa.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/apps/genrsa.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/apps/ocsp.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/apps/openssl.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/apps/openssl.cnf#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/apps/passwd.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/apps/pkcs12.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/apps/prime.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/apps/progs.h#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/apps/progs.pl#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/apps/rand.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/apps/req.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/apps/rsa.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/apps/rsautl.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/apps/s_apps.h#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/apps/s_cb.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/apps/s_client.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/apps/s_server.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/apps/s_socket.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/apps/s_time.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/apps/sess_id.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/apps/smime.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/apps/speed.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/apps/spkac.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/apps/timeouts.h#1 branch .. //depot/projects/l4bsd/src/crypto/openssl/apps/verify.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/apps/version.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/apps/x509.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/bugs/VC16.bug#2 delete .. //depot/projects/l4bsd/src/crypto/openssl/certs/ICE-CA.pem#2 delete .. //depot/projects/l4bsd/src/crypto/openssl/certs/ICE-root.pem#2 delete .. //depot/projects/l4bsd/src/crypto/openssl/certs/ICE-user.pem#2 delete .. //depot/projects/l4bsd/src/crypto/openssl/certs/ICE.crl#2 delete .. //depot/projects/l4bsd/src/crypto/openssl/certs/RegTP-4R.pem#2 delete .. //depot/projects/l4bsd/src/crypto/openssl/certs/argena.pem#1 branch .. //depot/projects/l4bsd/src/crypto/openssl/certs/argeng.pem#1 branch .. //depot/projects/l4bsd/src/crypto/openssl/certs/ca-cert.pem#2 delete .. //depot/projects/l4bsd/src/crypto/openssl/certs/demo/ca-cert.pem#1 branch .. //depot/projects/l4bsd/src/crypto/openssl/certs/demo/dsa-ca.pem#1 branch .. //depot/projects/l4bsd/src/crypto/openssl/certs/demo/dsa-pca.pem#1 branch .. //depot/projects/l4bsd/src/crypto/openssl/certs/demo/nortelCA.pem#1 branch .. //depot/projects/l4bsd/src/crypto/openssl/certs/demo/pca-cert.pem#1 branch .. //depot/projects/l4bsd/src/crypto/openssl/certs/demo/timCA.pem#1 branch .. //depot/projects/l4bsd/src/crypto/openssl/certs/demo/tjhCA.pem#1 branch .. //depot/projects/l4bsd/src/crypto/openssl/certs/demo/vsigntca.pem#1 branch .. //depot/projects/l4bsd/src/crypto/openssl/certs/dsa-ca.pem#2 delete .. //depot/projects/l4bsd/src/crypto/openssl/certs/dsa-pca.pem#2 delete .. //depot/projects/l4bsd/src/crypto/openssl/certs/expired/RegTP-4R.pem#1 branch .. //depot/projects/l4bsd/src/crypto/openssl/certs/expired/factory.pem#1 branch .. //depot/projects/l4bsd/src/crypto/openssl/certs/expired/rsa-cca.pem#1 branch .. //depot/projects/l4bsd/src/crypto/openssl/certs/expired/vsign2.pem#1 branch .. //depot/projects/l4bsd/src/crypto/openssl/certs/factory.pem#2 delete .. //depot/projects/l4bsd/src/crypto/openssl/certs/nortelCA.pem#2 delete .. //depot/projects/l4bsd/src/crypto/openssl/certs/pca-cert.pem#2 delete .. //depot/projects/l4bsd/src/crypto/openssl/certs/rsa-cca.pem#2 delete .. //depot/projects/l4bsd/src/crypto/openssl/certs/timCA.pem#2 delete .. //depot/projects/l4bsd/src/crypto/openssl/certs/tjhCA.pem#2 delete .. //depot/projects/l4bsd/src/crypto/openssl/certs/vsign2.pem#2 delete .. //depot/projects/l4bsd/src/crypto/openssl/certs/vsigntca.pem#2 delete .. //depot/projects/l4bsd/src/crypto/openssl/certs/wellsfgo.pem#1 branch .. //depot/projects/l4bsd/src/crypto/openssl/comm.txt#2 delete .. //depot/projects/l4bsd/src/crypto/openssl/comms.txt#2 delete .. //depot/projects/l4bsd/src/crypto/openssl/config#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/LPdir_nyi.c#1 branch .. //depot/projects/l4bsd/src/crypto/openssl/crypto/LPdir_unix.c#1 branch .. //depot/projects/l4bsd/src/crypto/openssl/crypto/LPdir_vms.c#1 branch .. //depot/projects/l4bsd/src/crypto/openssl/crypto/LPdir_win.c#1 branch .. //depot/projects/l4bsd/src/crypto/openssl/crypto/LPdir_win32.c#1 branch .. //depot/projects/l4bsd/src/crypto/openssl/crypto/LPdir_wince.c#1 branch .. //depot/projects/l4bsd/src/crypto/openssl/crypto/Makefile#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/aes/Makefile#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/aes/aes.h#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/aes/aes_cbc.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/aes/aes_cfb.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/aes/aes_core.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/aes/aes_locl.h#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/aes/asm/aes-586.pl#1 branch .. //depot/projects/l4bsd/src/crypto/openssl/crypto/aes/asm/aes-ia64.S#1 branch .. //depot/projects/l4bsd/src/crypto/openssl/crypto/asn1/Makefile#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/asn1/a_bitstr.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/asn1/a_bool.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/asn1/a_bytes.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/asn1/a_d2i_fp.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/asn1/a_digest.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/asn1/a_dup.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/asn1/a_enum.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/asn1/a_gentm.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/asn1/a_hdr.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/asn1/a_i2d_fp.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/asn1/a_int.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/asn1/a_mbstr.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/asn1/a_meth.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/asn1/a_object.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/asn1/a_octet.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/asn1/a_print.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/asn1/a_set.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/asn1/a_sign.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/asn1/a_strex.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/asn1/a_type.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/asn1/a_utctm.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/asn1/a_verify.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/asn1/asn1.h#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/asn1/asn1_err.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/asn1/asn1_gen.c#1 branch .. //depot/projects/l4bsd/src/crypto/openssl/crypto/asn1/asn1_lib.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/asn1/asn1_mac.h#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/asn1/asn1_par.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/asn1/asn1t.h#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/asn1/asn_moid.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/asn1/asn_pack.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/asn1/d2i_pr.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/asn1/d2i_pu.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/asn1/evp_asn1.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/asn1/i2d_pr.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/asn1/i2d_pu.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/asn1/n_pkey.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/asn1/p5_pbe.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/asn1/p5_pbev2.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/asn1/t_bitst.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/asn1/t_crl.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/asn1/t_pkey.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/asn1/t_req.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/asn1/t_spki.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/asn1/t_x509.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/asn1/tasn_dec.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/asn1/tasn_enc.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/asn1/tasn_fre.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/asn1/tasn_new.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/asn1/tasn_typ.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/asn1/tasn_utl.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/asn1/x_bignum.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/asn1/x_crl.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/asn1/x_long.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/asn1/x_name.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/asn1/x_pkey.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/asn1/x_pubkey.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/asn1/x_x509.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/asn1/x_x509a.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/bf/Makefile#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/bf/bf_enc.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/bf/bf_opts.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/bf/bfspeed.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/bf/bftest.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/bio/Makefile#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/bio/b_dump.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/bio/b_print.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/bio/b_sock.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/bio/bf_nbio.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/bio/bio.h#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/bio/bio_err.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/bio/bio_lcl.h#1 branch .. //depot/projects/l4bsd/src/crypto/openssl/crypto/bio/bio_lib.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/bio/bss_acpt.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/bio/bss_conn.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/bio/bss_dgram.c#1 branch .. //depot/projects/l4bsd/src/crypto/openssl/crypto/bio/bss_fd.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/bio/bss_file.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/bio/bss_log.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/bio/bss_sock.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/bn/Makefile#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/bn/asm/alpha.s#2 delete .. //depot/projects/l4bsd/src/crypto/openssl/crypto/bn/asm/alpha.s.works#2 delete .. //depot/projects/l4bsd/src/crypto/openssl/crypto/bn/asm/alpha.works/add.pl#2 delete .. //depot/projects/l4bsd/src/crypto/openssl/crypto/bn/asm/alpha.works/div.pl#2 delete .. //depot/projects/l4bsd/src/crypto/openssl/crypto/bn/asm/alpha.works/mul.pl#2 delete .. //depot/projects/l4bsd/src/crypto/openssl/crypto/bn/asm/alpha.works/mul_add.pl#2 delete .. //depot/projects/l4bsd/src/crypto/openssl/crypto/bn/asm/alpha.works/mul_c4.pl#2 delete .. //depot/projects/l4bsd/src/crypto/openssl/crypto/bn/asm/alpha.works/mul_c4.works.pl#2 delete .. //depot/projects/l4bsd/src/crypto/openssl/crypto/bn/asm/alpha.works/mul_c8.pl#2 delete .. //depot/projects/l4bsd/src/crypto/openssl/crypto/bn/asm/alpha.works/sqr.pl#2 delete .. //depot/projects/l4bsd/src/crypto/openssl/crypto/bn/asm/alpha.works/sqr_c4.pl#2 delete .. //depot/projects/l4bsd/src/crypto/openssl/crypto/bn/asm/alpha.works/sqr_c8.pl#2 delete .. //depot/projects/l4bsd/src/crypto/openssl/crypto/bn/asm/alpha.works/sub.pl#2 delete .. //depot/projects/l4bsd/src/crypto/openssl/crypto/bn/asm/alpha/add.pl#2 delete .. //depot/projects/l4bsd/src/crypto/openssl/crypto/bn/asm/alpha/div.pl#2 delete .. //depot/projects/l4bsd/src/crypto/openssl/crypto/bn/asm/alpha/mul.pl#2 delete .. //depot/projects/l4bsd/src/crypto/openssl/crypto/bn/asm/alpha/mul_add.pl#2 delete .. //depot/projects/l4bsd/src/crypto/openssl/crypto/bn/asm/alpha/mul_c4.pl#2 delete .. //depot/projects/l4bsd/src/crypto/openssl/crypto/bn/asm/alpha/mul_c4.works.pl#2 delete .. //depot/projects/l4bsd/src/crypto/openssl/crypto/bn/asm/alpha/mul_c8.pl#2 delete .. //depot/projects/l4bsd/src/crypto/openssl/crypto/bn/asm/alpha/sqr.pl#2 delete .. //depot/projects/l4bsd/src/crypto/openssl/crypto/bn/asm/alpha/sqr_c4.pl#2 delete .. //depot/projects/l4bsd/src/crypto/openssl/crypto/bn/asm/alpha/sqr_c8.pl#2 delete .. //depot/projects/l4bsd/src/crypto/openssl/crypto/bn/asm/alpha/sub.pl#2 delete .. //depot/projects/l4bsd/src/crypto/openssl/crypto/bn/asm/bn-586.pl#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/bn/asm/bn-alpha.pl#2 delete .. //depot/projects/l4bsd/src/crypto/openssl/crypto/bn/asm/ca.pl#2 delete .. //depot/projects/l4bsd/src/crypto/openssl/crypto/bn/asm/co-alpha.pl#2 delete .. //depot/projects/l4bsd/src/crypto/openssl/crypto/bn/asm/mips1.s#2 delete .. //depot/projects/l4bsd/src/crypto/openssl/crypto/bn/asm/pa-risc.s#2 delete .. //depot/projects/l4bsd/src/crypto/openssl/crypto/bn/asm/ppc.pl#1 branch .. //depot/projects/l4bsd/src/crypto/openssl/crypto/bn/asm/r3000.s#2 delete .. //depot/projects/l4bsd/src/crypto/openssl/crypto/bn/asm/sparcv8plus.S#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/bn/asm/x86_64-gcc.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/bn/bn.h#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/bn/bn_add.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/bn/bn_asm.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/bn/bn_blind.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/bn/bn_const.c#1 branch .. //depot/projects/l4bsd/src/crypto/openssl/crypto/bn/bn_ctx.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/bn/bn_depr.c#1 branch .. //depot/projects/l4bsd/src/crypto/openssl/crypto/bn/bn_div.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/bn/bn_err.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/bn/bn_exp.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/bn/bn_exp2.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/bn/bn_gcd.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/bn/bn_gf2m.c#1 branch .. //depot/projects/l4bsd/src/crypto/openssl/crypto/bn/bn_kron.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/bn/bn_lcl.h#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/bn/bn_lib.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/bn/bn_mod.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/bn/bn_mont.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/bn/bn_mpi.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/bn/bn_mul.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/bn/bn_nist.c#1 branch .. //depot/projects/l4bsd/src/crypto/openssl/crypto/bn/bn_prime.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/bn/bn_prime.pl#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/bn/bn_print.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/bn/bn_rand.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/bn/bn_recp.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/bn/bn_shift.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/bn/bn_sqr.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/bn/bn_sqrt.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/bn/bn_word.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/bn/bntest.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/bn/expspeed.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/bn/exptest.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/buffer/Makefile#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/buffer/buf_err.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/buffer/buffer.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/buffer/buffer.h#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/cast/Makefile#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/cast/cast.h#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/cast/cast_lcl.h#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/cast/cast_spd.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/cast/castopts.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/cast/casttest.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/comp/Makefile#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/comp/c_zlib.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/comp/comp.h#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/comp/comp_err.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/comp/comp_lib.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/conf/Makefile#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/conf/conf.h#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/conf/conf_def.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/conf/conf_err.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/conf/conf_lib.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/conf/conf_mod.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/cpt_err.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/cryptlib.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/cryptlib.h#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/crypto.h#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/cversion.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/des/FILES0#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/des/Makefile#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/des/asm/des_enc.m4#1 branch .. //depot/projects/l4bsd/src/crypto/openssl/crypto/des/cfb64ede.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/des/cfb_enc.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/des/des.h#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/des/des_enc.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/des/des_locl.h#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/des/des_old.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/des/des_old.h#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/des/des_opts.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/des/destest.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/des/ecb3_enc.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/des/ede_cbcm_enc.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/des/fcrypt.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/des/read2pwd.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/des/set_key.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/des/speed.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/des/str2key.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/dh/Makefile#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/dh/dh.h#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/dh/dh_check.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/dh/dh_depr.c#1 branch .. //depot/projects/l4bsd/src/crypto/openssl/crypto/dh/dh_err.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/dh/dh_gen.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/dh/dh_key.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/dh/dhtest.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/dsa/Makefile#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/dsa/dsa.h#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/dsa/dsa_depr.c#1 branch .. //depot/projects/l4bsd/src/crypto/openssl/crypto/dsa/dsa_err.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/dsa/dsa_gen.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/dsa/dsa_key.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/dsa/dsa_lib.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/dsa/dsa_ossl.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/dsa/dsa_sign.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/dsa/dsa_vrf.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/dsa/dsatest.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/dso/Makefile#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/dso/dso.h#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/dso/dso_dl.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/dso/dso_dlfcn.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/dso/dso_err.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/dso/dso_lib.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/dso/dso_null.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/ebcdic.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/ec/Makefile#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/ec/ec.h#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/ec/ec2_mult.c#1 branch .. //depot/projects/l4bsd/src/crypto/openssl/crypto/ec/ec2_smpl.c#1 branch .. //depot/projects/l4bsd/src/crypto/openssl/crypto/ec/ec2_smpt.c#1 branch .. //depot/projects/l4bsd/src/crypto/openssl/crypto/ec/ec_asn1.c#1 branch .. //depot/projects/l4bsd/src/crypto/openssl/crypto/ec/ec_check.c#1 branch .. //depot/projects/l4bsd/src/crypto/openssl/crypto/ec/ec_curve.c#1 branch .. //depot/projects/l4bsd/src/crypto/openssl/crypto/ec/ec_cvt.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/ec/ec_err.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/ec/ec_key.c#1 branch .. //depot/projects/l4bsd/src/crypto/openssl/crypto/ec/ec_lcl.h#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/ec/ec_lib.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/ec/ec_mult.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/ec/ec_print.c#1 branch .. //depot/projects/l4bsd/src/crypto/openssl/crypto/ec/ecp_mont.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/ec/ecp_nist.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/ec/ecp_recp.c#2 delete .. //depot/projects/l4bsd/src/crypto/openssl/crypto/ec/ecp_smpl.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/ec/ectest.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/ecdh/Makefile#1 branch .. //depot/projects/l4bsd/src/crypto/openssl/crypto/ecdh/ecdh.h#1 branch .. //depot/projects/l4bsd/src/crypto/openssl/crypto/ecdh/ecdhtest.c#1 branch .. //depot/projects/l4bsd/src/crypto/openssl/crypto/ecdh/ech_err.c#1 branch .. //depot/projects/l4bsd/src/crypto/openssl/crypto/ecdh/ech_key.c#1 branch .. //depot/projects/l4bsd/src/crypto/openssl/crypto/ecdh/ech_lib.c#1 branch .. //depot/projects/l4bsd/src/crypto/openssl/crypto/ecdh/ech_locl.h#1 branch .. //depot/projects/l4bsd/src/crypto/openssl/crypto/ecdh/ech_ossl.c#1 branch .. //depot/projects/l4bsd/src/crypto/openssl/crypto/ecdsa/Makefile#1 branch .. //depot/projects/l4bsd/src/crypto/openssl/crypto/ecdsa/ecdsa.h#1 branch .. //depot/projects/l4bsd/src/crypto/openssl/crypto/ecdsa/ecdsatest.c#1 branch .. //depot/projects/l4bsd/src/crypto/openssl/crypto/ecdsa/ecs_asn1.c#1 branch .. //depot/projects/l4bsd/src/crypto/openssl/crypto/ecdsa/ecs_err.c#1 branch .. //depot/projects/l4bsd/src/crypto/openssl/crypto/ecdsa/ecs_lib.c#1 branch .. //depot/projects/l4bsd/src/crypto/openssl/crypto/ecdsa/ecs_locl.h#1 branch .. //depot/projects/l4bsd/src/crypto/openssl/crypto/ecdsa/ecs_ossl.c#1 branch .. //depot/projects/l4bsd/src/crypto/openssl/crypto/ecdsa/ecs_sign.c#1 branch .. //depot/projects/l4bsd/src/crypto/openssl/crypto/ecdsa/ecs_vrf.c#1 branch .. //depot/projects/l4bsd/src/crypto/openssl/crypto/engine/Makefile#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/engine/eng_all.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/engine/eng_cnf.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/engine/eng_cryptodev.c#1 branch .. //depot/projects/l4bsd/src/crypto/openssl/crypto/engine/eng_ctrl.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/engine/eng_dyn.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/engine/eng_err.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/engine/eng_fat.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/engine/eng_init.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/engine/eng_int.h#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/engine/eng_lib.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/engine/eng_list.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/engine/eng_openssl.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/engine/eng_padlock.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/engine/eng_pkey.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/engine/eng_table.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/engine/engine.h#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/engine/enginetest.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/engine/hw.ec#2 delete .. //depot/projects/l4bsd/src/crypto/openssl/crypto/engine/hw_4758_cca.c#2 delete .. //depot/projects/l4bsd/src/crypto/openssl/crypto/engine/hw_4758_cca_err.c#2 delete .. //depot/projects/l4bsd/src/crypto/openssl/crypto/engine/hw_4758_cca_err.h#2 delete .. //depot/projects/l4bsd/src/crypto/openssl/crypto/engine/hw_aep.c#2 delete .. //depot/projects/l4bsd/src/crypto/openssl/crypto/engine/hw_aep_err.c#2 delete .. //depot/projects/l4bsd/src/crypto/openssl/crypto/engine/hw_aep_err.h#2 delete .. //depot/projects/l4bsd/src/crypto/openssl/crypto/engine/hw_atalla.c#2 delete .. //depot/projects/l4bsd/src/crypto/openssl/crypto/engine/hw_atalla_err.c#2 delete .. //depot/projects/l4bsd/src/crypto/openssl/crypto/engine/hw_atalla_err.h#2 delete .. //depot/projects/l4bsd/src/crypto/openssl/crypto/engine/hw_cryptodev.c#2 delete .. //depot/projects/l4bsd/src/crypto/openssl/crypto/engine/hw_cswift.c#2 delete .. //depot/projects/l4bsd/src/crypto/openssl/crypto/engine/hw_cswift_err.c#2 delete .. //depot/projects/l4bsd/src/crypto/openssl/crypto/engine/hw_cswift_err.h#2 delete .. //depot/projects/l4bsd/src/crypto/openssl/crypto/engine/hw_ncipher.c#2 delete .. //depot/projects/l4bsd/src/crypto/openssl/crypto/engine/hw_ncipher_err.c#2 delete .. //depot/projects/l4bsd/src/crypto/openssl/crypto/engine/hw_ncipher_err.h#2 delete .. //depot/projects/l4bsd/src/crypto/openssl/crypto/engine/hw_nuron.c#2 delete .. //depot/projects/l4bsd/src/crypto/openssl/crypto/engine/hw_nuron_err.c#2 delete .. //depot/projects/l4bsd/src/crypto/openssl/crypto/engine/hw_nuron_err.h#2 delete .. //depot/projects/l4bsd/src/crypto/openssl/crypto/engine/hw_sureware.c#2 delete .. //depot/projects/l4bsd/src/crypto/openssl/crypto/engine/hw_sureware_err.c#2 delete .. //depot/projects/l4bsd/src/crypto/openssl/crypto/engine/hw_sureware_err.h#2 delete .. //depot/projects/l4bsd/src/crypto/openssl/crypto/engine/hw_ubsec.c#2 delete .. //depot/projects/l4bsd/src/crypto/openssl/crypto/engine/hw_ubsec_err.c#2 delete .. //depot/projects/l4bsd/src/crypto/openssl/crypto/engine/hw_ubsec_err.h#2 delete .. //depot/projects/l4bsd/src/crypto/openssl/crypto/engine/tb_cipher.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/engine/tb_dh.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/engine/tb_digest.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/engine/tb_dsa.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/engine/tb_ecdh.c#1 branch .. //depot/projects/l4bsd/src/crypto/openssl/crypto/engine/tb_ecdsa.c#1 branch .. //depot/projects/l4bsd/src/crypto/openssl/crypto/engine/tb_rand.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/engine/tb_rsa.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/engine/tb_store.c#1 branch .. //depot/projects/l4bsd/src/crypto/openssl/crypto/engine/vendor_defns/aep.h#2 delete .. //depot/projects/l4bsd/src/crypto/openssl/crypto/engine/vendor_defns/atalla.h#2 delete .. //depot/projects/l4bsd/src/crypto/openssl/crypto/engine/vendor_defns/cswift.h#2 delete .. //depot/projects/l4bsd/src/crypto/openssl/crypto/engine/vendor_defns/hw_4758_cca.h#2 delete .. //depot/projects/l4bsd/src/crypto/openssl/crypto/engine/vendor_defns/hw_ubsec.h#2 delete .. //depot/projects/l4bsd/src/crypto/openssl/crypto/engine/vendor_defns/hwcryptohook.h#2 delete .. //depot/projects/l4bsd/src/crypto/openssl/crypto/engine/vendor_defns/sureware.h#2 delete .. //depot/projects/l4bsd/src/crypto/openssl/crypto/err/Makefile#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/err/err.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/err/err.h#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/err/err_all.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/err/err_prn.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/err/openssl.ec#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/evp/Makefile#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/evp/bio_b64.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/evp/bio_enc.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/evp/bio_md.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/evp/bio_ok.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/evp/c_all.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/evp/c_alld.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/evp/digest.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/evp/e_aes.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/evp/e_bf.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/evp/e_cast.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/evp/e_des.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/evp/e_des3.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/evp/e_idea.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/evp/e_null.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/evp/e_old.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/evp/e_rc2.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/evp/e_rc4.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/evp/e_rc5.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/evp/e_xcbc_d.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/evp/encode.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/evp/evp.h#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/evp/evp_enc.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/evp/evp_err.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/evp/evp_key.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/evp/evp_lib.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/evp/evp_pbe.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/evp/evp_pkey.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/evp/evp_test.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/evp/evptests.txt#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/evp/m_dss.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/evp/m_dss1.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/evp/m_ecdsa.c#1 branch .. //depot/projects/l4bsd/src/crypto/openssl/crypto/evp/m_md2.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/evp/m_md4.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/evp/m_md5.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/evp/m_mdc2.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/evp/m_null.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/evp/m_ripemd.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/evp/m_sha.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/evp/m_sha1.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/evp/names.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/evp/p5_crpt.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/evp/p5_crpt2.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/evp/p_dec.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/evp/p_enc.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/evp/p_lib.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/evp/p_open.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/evp/p_seal.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/evp/p_verify.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/ex_data.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/hmac/Makefile#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/hmac/hmac.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/hmac/hmac.h#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/ia64cpuid.S#1 branch .. //depot/projects/l4bsd/src/crypto/openssl/crypto/idea/Makefile#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/idea/i_skey.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/idea/idea.h#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/idea/idea_spd.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/idea/ideatest.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/krb5/Makefile#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/krb5/krb5_asn.h#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/lhash/Makefile#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/lhash/lhash.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/lhash/lhash.h#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/md2/Makefile#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/md2/md2.h#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/md2/md2_dgst.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/md2/md2_one.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/md2/md2test.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/md32_common.h#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/md4/Makefile#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/md4/md4.h#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/md4/md4_dgst.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/md4/md4_locl.h#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/md4/md4_one.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/md4/md4test.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/md5/Makefile#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/md5/asm/md5-x86_64.pl#1 branch .. //depot/projects/l4bsd/src/crypto/openssl/crypto/md5/md5.h#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/md5/md5_dgst.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/md5/md5_locl.h#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/md5/md5_one.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/md5/md5test.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/mdc2/Makefile#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/mdc2/mdc2.h#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/mdc2/mdc2_one.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/mdc2/mdc2dgst.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/mdc2/mdc2test.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/mem.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/mem_clr.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/mem_dbg.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/o_dir.c#1 branch .. //depot/projects/l4bsd/src/crypto/openssl/crypto/o_dir.h#1 branch .. //depot/projects/l4bsd/src/crypto/openssl/crypto/o_dir_test.c#1 branch .. //depot/projects/l4bsd/src/crypto/openssl/crypto/o_str.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/o_str.h#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/objects/Makefile#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/objects/o_names.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/objects/obj_dat.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/objects/obj_dat.h#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/objects/obj_dat.pl#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/objects/obj_err.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/objects/obj_lib.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/objects/obj_mac.h#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/objects/obj_mac.num#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/objects/objects.h#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/objects/objects.txt#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/ocsp/Makefile#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/ocsp/ocsp.h#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/ocsp/ocsp_cl.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/ocsp/ocsp_err.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/ocsp/ocsp_ext.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/ocsp/ocsp_lib.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/ocsp/ocsp_prn.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/opensslconf.h#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/opensslconf.h.in#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/opensslv.h#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/ossl_typ.h#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/pem/Makefile#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/pem/pem.h#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/pem/pem_all.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/pem/pem_err.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/pem/pem_info.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/pem/pem_lib.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/pem/pem_oth.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/pem/pem_pk8.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/pem/pem_pkey.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/pem/pem_seal.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/pem/pem_xaux.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/perlasm/alpha.pl#2 delete .. //depot/projects/l4bsd/src/crypto/openssl/crypto/perlasm/cbc.pl#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/perlasm/x86_64-xlate.pl#1 branch .. //depot/projects/l4bsd/src/crypto/openssl/crypto/perlasm/x86asm.pl#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/perlasm/x86ms.pl#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/perlasm/x86nasm.pl#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/perlasm/x86unix.pl#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/pkcs12/Makefile#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/pkcs12/p12_add.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/pkcs12/p12_crpt.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/pkcs12/p12_crt.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/pkcs12/p12_decr.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/pkcs12/p12_init.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/pkcs12/p12_key.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/pkcs12/p12_kiss.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/pkcs12/p12_mutl.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/pkcs12/p12_npas.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/pkcs12/pk12err.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/pkcs12/pkcs12.h#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/pkcs7/Makefile#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/pkcs7/bio_ber.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/pkcs7/example.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/pkcs7/pk7_asn1.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/pkcs7/pk7_attr.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/pkcs7/pk7_doit.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/pkcs7/pk7_lib.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/pkcs7/pk7_mime.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/pkcs7/pk7_smime.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/pkcs7/pkcs7.h#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/pkcs7/pkcs7err.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/pqueue/Makefile#1 branch .. //depot/projects/l4bsd/src/crypto/openssl/crypto/pqueue/pq_compat.h#1 branch .. //depot/projects/l4bsd/src/crypto/openssl/crypto/pqueue/pq_test.c#1 branch .. //depot/projects/l4bsd/src/crypto/openssl/crypto/pqueue/pqueue.c#1 branch .. //depot/projects/l4bsd/src/crypto/openssl/crypto/pqueue/pqueue.h#1 branch .. //depot/projects/l4bsd/src/crypto/openssl/crypto/rand/Makefile#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/rand/md_rand.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/rand/rand.h#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/rand/rand_egd.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/rand/rand_err.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/rand/rand_lib.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/rand/rand_nw.c#1 branch .. //depot/projects/l4bsd/src/crypto/openssl/crypto/rand/rand_unix.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/rand/rand_vms.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/rand/rand_win.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/rand/randfile.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/rand/randtest.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/rc2/Makefile#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/rc2/rc2.h#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/rc2/rc2_skey.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/rc2/rc2speed.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/rc2/rc2test.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/rc4/Makefile#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/rc4/asm/rc4-586.pl#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/rc4/asm/rc4-ia64.S#1 branch .. //depot/projects/l4bsd/src/crypto/openssl/crypto/rc4/asm/rc4-x86_64.pl#1 branch .. //depot/projects/l4bsd/src/crypto/openssl/crypto/rc4/rc4.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/rc4/rc4.h#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/rc4/rc4_enc.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/rc4/rc4_locl.h#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/rc4/rc4_skey.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/rc4/rc4speed.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/rc4/rc4test.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/rc5/Makefile#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/rc5/rc5.h#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/rc5/rc5_locl.h#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/rc5/rc5speed.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/ripemd/Makefile#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/ripemd/ripemd.h#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/ripemd/rmd_dgst.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/ripemd/rmd_locl.h#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/ripemd/rmd_one.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/ripemd/rmdtest.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/rsa/Makefile#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/rsa/rsa.h#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/rsa/rsa_asn1.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/rsa/rsa_chk.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/rsa/rsa_depr.c#1 branch .. //depot/projects/l4bsd/src/crypto/openssl/crypto/rsa/rsa_eay.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/rsa/rsa_err.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/rsa/rsa_gen.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/rsa/rsa_lib.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/rsa/rsa_null.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/rsa/rsa_oaep.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/rsa/rsa_pss.c#1 branch .. //depot/projects/l4bsd/src/crypto/openssl/crypto/rsa/rsa_saos.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/rsa/rsa_sign.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/rsa/rsa_test.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/rsa/rsa_x931.c#1 branch .. //depot/projects/l4bsd/src/crypto/openssl/crypto/sha/Makefile#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/sha/asm/sha1-586.pl#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/sha/asm/sha1-ia64.pl#1 branch .. //depot/projects/l4bsd/src/crypto/openssl/crypto/sha/asm/sha512-ia64.pl#1 branch .. //depot/projects/l4bsd/src/crypto/openssl/crypto/sha/asm/sha512-sse2.pl#1 branch .. //depot/projects/l4bsd/src/crypto/openssl/crypto/sha/sha.h#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/sha/sha1_one.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/sha/sha1dgst.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/sha/sha1test.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/sha/sha256.c#1 branch .. //depot/projects/l4bsd/src/crypto/openssl/crypto/sha/sha256t.c#1 branch .. //depot/projects/l4bsd/src/crypto/openssl/crypto/sha/sha512.c#1 branch .. //depot/projects/l4bsd/src/crypto/openssl/crypto/sha/sha512t.c#1 branch .. //depot/projects/l4bsd/src/crypto/openssl/crypto/sha/sha_dgst.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/sha/sha_locl.h#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/sha/sha_one.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/sha/shatest.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/sparccpuid.S#1 branch .. //depot/projects/l4bsd/src/crypto/openssl/crypto/stack/Makefile#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/stack/safestack.h#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/stack/stack.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/stack/stack.h#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/store/Makefile#1 branch .. //depot/projects/l4bsd/src/crypto/openssl/crypto/store/README#1 branch .. //depot/projects/l4bsd/src/crypto/openssl/crypto/store/store.h#1 branch .. //depot/projects/l4bsd/src/crypto/openssl/crypto/store/str_err.c#1 branch .. //depot/projects/l4bsd/src/crypto/openssl/crypto/store/str_lib.c#1 branch .. //depot/projects/l4bsd/src/crypto/openssl/crypto/store/str_locl.h#1 branch .. //depot/projects/l4bsd/src/crypto/openssl/crypto/store/str_mem.c#1 branch .. //depot/projects/l4bsd/src/crypto/openssl/crypto/store/str_meth.c#1 branch .. //depot/projects/l4bsd/src/crypto/openssl/crypto/symhacks.h#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/threads/mttest.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/threads/th-lock.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/tmdiff.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/tmdiff.h#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/txt_db/Makefile#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/txt_db/txt_db.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/txt_db/txt_db.h#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/ui/Makefile#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/ui/ui.h#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/ui/ui_err.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/ui/ui_lib.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/ui/ui_locl.h#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/ui/ui_openssl.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/ui/ui_util.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/uid.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/x509/Makefile#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/x509/by_dir.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/x509/by_file.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/x509/x509.h#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/x509/x509_att.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/x509/x509_cmp.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/x509/x509_err.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/x509/x509_lu.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/x509/x509_r2x.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/x509/x509_req.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/x509/x509_trs.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/x509/x509_txt.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/x509/x509_v3.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/x509/x509_vfy.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/x509/x509_vfy.h#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/x509/x509_vpm.c#1 branch .. //depot/projects/l4bsd/src/crypto/openssl/crypto/x509/x509cset.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/x509/x509name.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/x509/x509spki.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/x509/x509type.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/x509/x_all.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/x509v3/Makefile#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/x509v3/ext_dat.h#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/x509v3/pcy_cache.c#1 branch .. //depot/projects/l4bsd/src/crypto/openssl/crypto/x509v3/pcy_data.c#1 branch .. //depot/projects/l4bsd/src/crypto/openssl/crypto/x509v3/pcy_int.h#1 branch .. //depot/projects/l4bsd/src/crypto/openssl/crypto/x509v3/pcy_lib.c#1 branch .. //depot/projects/l4bsd/src/crypto/openssl/crypto/x509v3/pcy_map.c#1 branch .. //depot/projects/l4bsd/src/crypto/openssl/crypto/x509v3/pcy_node.c#1 branch .. //depot/projects/l4bsd/src/crypto/openssl/crypto/x509v3/pcy_tree.c#1 branch .. //depot/projects/l4bsd/src/crypto/openssl/crypto/x509v3/v3_akey.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/x509v3/v3_alt.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/x509v3/v3_bitst.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/x509v3/v3_conf.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/x509v3/v3_cpols.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/x509v3/v3_extku.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/x509v3/v3_ia5.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/x509v3/v3_info.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/x509v3/v3_int.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/x509v3/v3_lib.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/x509v3/v3_ncons.c#1 branch .. //depot/projects/l4bsd/src/crypto/openssl/crypto/x509v3/v3_ocsp.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/x509v3/v3_pci.c#1 branch .. //depot/projects/l4bsd/src/crypto/openssl/crypto/x509v3/v3_pcia.c#1 branch .. //depot/projects/l4bsd/src/crypto/openssl/crypto/x509v3/v3_pcons.c#1 branch .. //depot/projects/l4bsd/src/crypto/openssl/crypto/x509v3/v3_pmaps.c#1 branch .. //depot/projects/l4bsd/src/crypto/openssl/crypto/x509v3/v3_prn.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/x509v3/v3_purp.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/x509v3/v3_skey.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/x509v3/v3_sxnet.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/x509v3/v3_utl.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/x509v3/v3err.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/x509v3/x509v3.h#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/crypto/x86_64cpuid.pl#1 branch .. //depot/projects/l4bsd/src/crypto/openssl/crypto/x86cpuid.pl#1 branch .. //depot/projects/l4bsd/src/crypto/openssl/demos/easy_tls/easy-tls.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/demos/engines/zencod/hw_zencod.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/demos/ssltest-ecc/ECC-RSAcertgen.sh#1 branch .. //depot/projects/l4bsd/src/crypto/openssl/demos/ssltest-ecc/ECCcertgen.sh#1 branch .. //depot/projects/l4bsd/src/crypto/openssl/demos/ssltest-ecc/README#1 branch .. //depot/projects/l4bsd/src/crypto/openssl/demos/ssltest-ecc/RSAcertgen.sh#1 branch .. //depot/projects/l4bsd/src/crypto/openssl/demos/ssltest-ecc/ssltest.sh#1 branch .. //depot/projects/l4bsd/src/crypto/openssl/demos/tunala/autoungunk.sh#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/demos/tunala/cb.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/demos/tunala/configure.in#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/demos/tunala/test.sh#1 branch .. //depot/projects/l4bsd/src/crypto/openssl/demos/tunala/tunala.c#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/demos/tunala/tunala.h#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/doc/HOWTO/certificates.txt#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/doc/HOWTO/keys.txt#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/doc/HOWTO/proxy_certificates.txt#1 branch .. //depot/projects/l4bsd/src/crypto/openssl/doc/apps/CA.pl.pod#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/doc/apps/asn1parse.pod#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/doc/apps/ca.pod#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/doc/apps/config.pod#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/doc/apps/dgst.pod#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/doc/apps/ec.pod#1 branch .. //depot/projects/l4bsd/src/crypto/openssl/doc/apps/ecparam.pod#1 branch .. //depot/projects/l4bsd/src/crypto/openssl/doc/apps/enc.pod#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/doc/apps/errstr.pod#1 branch .. //depot/projects/l4bsd/src/crypto/openssl/doc/apps/req.pod#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/doc/apps/s_client.pod#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/doc/apps/s_server.pod#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/doc/apps/x509.pod#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/doc/apps/x509v3_config.pod#1 branch .. //depot/projects/l4bsd/src/crypto/openssl/doc/crypto/ASN1_STRING_print_ex.pod#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/doc/crypto/ASN1_generate_nconf.pod#1 branch .. //depot/projects/l4bsd/src/crypto/openssl/doc/crypto/BIO_f_base64.pod#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/doc/crypto/BN_BLINDING_new.pod#1 branch .. //depot/projects/l4bsd/src/crypto/openssl/doc/crypto/BN_add_word.pod#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/doc/crypto/BN_new.pod#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/doc/crypto/ERR_error_string.pod#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/doc/crypto/ERR_set_mark.pod#1 branch .. //depot/projects/l4bsd/src/crypto/openssl/doc/crypto/EVP_BytesToKey.pod#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/doc/crypto/EVP_DigestInit.pod#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/doc/crypto/EVP_EncryptInit.pod#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/doc/crypto/EVP_SealInit.pod#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/doc/crypto/EVP_SignInit.pod#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/doc/crypto/OPENSSL_Applink.pod#1 branch .. //depot/projects/l4bsd/src/crypto/openssl/doc/crypto/OPENSSL_config.pod#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/doc/crypto/OPENSSL_ia32cap.pod#1 branch .. //depot/projects/l4bsd/src/crypto/openssl/doc/crypto/PKCS12_create.pod#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/doc/crypto/PKCS7_sign.pod#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/doc/crypto/PKCS7_verify.pod#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/doc/crypto/RSA_sign.pod#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/doc/crypto/SMIME_write_PKCS7.pod#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/doc/crypto/X509_NAME_ENTRY_get_object.pod#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/doc/crypto/X509_NAME_add_entry_by_txt.pod#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/doc/crypto/X509_NAME_print_ex.pod#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/doc/crypto/blowfish.pod#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/doc/crypto/bn.pod#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/doc/crypto/bn_internal.pod#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/doc/crypto/d2i_X509.pod#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/doc/crypto/d2i_X509_CRL.pod#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/doc/crypto/d2i_X509_REQ.pod#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/doc/crypto/des_modes.pod#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/doc/crypto/ecdsa.pod#1 branch .. //depot/projects/l4bsd/src/crypto/openssl/doc/crypto/engine.pod#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/doc/crypto/hmac.pod#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/doc/crypto/threads.pod#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/doc/crypto/x509.pod#1 branch .. //depot/projects/l4bsd/src/crypto/openssl/doc/fingerprints.txt#1 branch .. //depot/projects/l4bsd/src/crypto/openssl/doc/openssl.txt#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/doc/ssl/SSL_CIPHER_get_name.pod#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/doc/ssl/SSL_CTX_get_ex_new_index.pod#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/doc/ssl/SSL_CTX_get_verify_mode.pod#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/doc/ssl/SSL_CTX_set_cert_store.pod#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/doc/ssl/SSL_CTX_set_info_callback.pod#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/doc/ssl/SSL_CTX_set_options.pod#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/doc/ssl/SSL_CTX_set_quiet_shutdown.pod#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/doc/ssl/SSL_CTX_use_certificate.pod#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/doc/ssl/SSL_SESSION_get_ex_new_index.pod#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/doc/ssl/SSL_SESSION_get_time.pod#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/doc/ssl/SSL_get_SSL_CTX.pod#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/doc/ssl/SSL_get_ciphers.pod#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/doc/ssl/SSL_get_client_CA_list.pod#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/doc/ssl/SSL_get_current_cipher.pod#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/doc/ssl/SSL_get_default_timeout.pod#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/doc/ssl/SSL_get_error.pod#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/doc/ssl/SSL_get_ex_new_index.pod#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/doc/ssl/SSL_get_fd.pod#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/doc/ssl/SSL_get_peer_cert_chain.pod#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/doc/ssl/SSL_get_peer_certificate.pod#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/doc/ssl/SSL_get_session.pod#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/doc/ssl/SSL_get_verify_result.pod#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/doc/ssl/SSL_get_version.pod#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/doc/ssl/SSL_pending.pod#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/doc/ssl/SSL_set_shutdown.pod#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/doc/ssl/SSL_shutdown.pod#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/doc/ssl/SSL_state_string.pod#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/doc/ssl/SSL_want.pod#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/doc/ssl/d2i_SSL_SESSION.pod#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/doc/ssl/ssl.pod#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/doc/ssleay.txt#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/doc/standards.txt#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/e_os.h#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/e_os2.h#2 integrate .. //depot/projects/l4bsd/src/crypto/openssl/engines/Makefile#1 branch .. //depot/projects/l4bsd/src/crypto/openssl/engines/axp.opt#1 branch .. //depot/projects/l4bsd/src/crypto/openssl/engines/e_4758cca.c#1 branch .. //depot/projects/l4bsd/src/crypto/openssl/engines/e_4758cca.ec#1 branch .. //depot/projects/l4bsd/src/crypto/openssl/engines/e_4758cca_err.c#1 branch .. //depot/projects/l4bsd/src/crypto/openssl/engines/e_4758cca_err.h#1 branch .. //depot/projects/l4bsd/src/crypto/openssl/engines/e_aep.c#1 branch .. //depot/projects/l4bsd/src/crypto/openssl/engines/e_aep.ec#1 branch .. //depot/projects/l4bsd/src/crypto/openssl/engines/e_aep_err.c#1 branch .. //depot/projects/l4bsd/src/crypto/openssl/engines/e_aep_err.h#1 branch .. //depot/projects/l4bsd/src/crypto/openssl/engines/e_atalla.c#1 branch .. //depot/projects/l4bsd/src/crypto/openssl/engines/e_atalla.ec#1 branch .. //depot/projects/l4bsd/src/crypto/openssl/engines/e_atalla_err.c#1 branch .. //depot/projects/l4bsd/src/crypto/openssl/engines/e_atalla_err.h#1 branch .. //depot/projects/l4bsd/src/crypto/openssl/engines/e_chil.c#1 branch .. //depot/projects/l4bsd/src/crypto/openssl/engines/e_chil.ec#1 branch .. //depot/projects/l4bsd/src/crypto/openssl/engines/e_chil_err.c#1 branch .. //depot/projects/l4bsd/src/crypto/openssl/engines/e_chil_err.h#1 branch .. //depot/projects/l4bsd/src/crypto/openssl/engines/e_cswift.c#1 branch .. //depot/projects/l4bsd/src/crypto/openssl/engines/e_cswift.ec#1 branch .. //depot/projects/l4bsd/src/crypto/openssl/engines/e_cswift_err.c#1 branch .. //depot/projects/l4bsd/src/crypto/openssl/engines/e_cswift_err.h#1 branch .. //depot/projects/l4bsd/src/crypto/openssl/engines/e_gmp.c#1 branch .. //depot/projects/l4bsd/src/crypto/openssl/engines/e_gmp.ec#1 branch .. //depot/projects/l4bsd/src/crypto/openssl/engines/e_gmp_err.c#1 branch .. //depot/projects/l4bsd/src/crypto/openssl/engines/e_gmp_err.h#1 branch .. //depot/projects/l4bsd/src/crypto/openssl/engines/e_nuron.c#1 branch .. //depot/projects/l4bsd/src/crypto/openssl/engines/e_nuron.ec#1 branch .. //depot/projects/l4bsd/src/crypto/openssl/engines/e_nuron_err.c#1 branch .. //depot/projects/l4bsd/src/crypto/openssl/engines/e_nuron_err.h#1 branch .. //depot/projects/l4bsd/src/crypto/openssl/engines/e_sureware.c#1 branch .. //depot/projects/l4bsd/src/crypto/openssl/engines/e_sureware.ec#1 branch .. //depot/projects/l4bsd/src/crypto/openssl/engines/e_sureware_err.c#1 branch .. //depot/projects/l4bsd/src/crypto/openssl/engines/e_sureware_err.h#1 branch .. //depot/projects/l4bsd/src/crypto/openssl/engines/e_ubsec.c#1 branch .. //depot/projects/l4bsd/src/crypto/openssl/engines/e_ubsec.ec#1 branch .. //depot/projects/l4bsd/src/crypto/openssl/engines/e_ubsec_err.c#1 branch .. //depot/projects/l4bsd/src/crypto/openssl/engines/e_ubsec_err.h#1 branch .. //depot/projects/l4bsd/src/crypto/openssl/engines/engine_vector.mar#1 branch .. //depot/projects/l4bsd/src/crypto/openssl/engines/vax.opt#1 branch .. //depot/projects/l4bsd/src/crypto/openssl/engines/vendor_defns/aep.h#1 branch .. //depot/projects/l4bsd/src/crypto/openssl/engines/vendor_defns/atalla.h#1 branch .. //depot/projects/l4bsd/src/crypto/openssl/engines/vendor_defns/cswift.h#1 branch >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu Aug 17 08:45:44 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1319416A4E1; Thu, 17 Aug 2006 08:45:44 +0000 (UTC) X-Original-To: perforce@FreeBSD.org 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 D82B216A4DA for ; Thu, 17 Aug 2006 08:45:43 +0000 (UTC) (envelope-from cdjones@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 547BF43D45 for ; Thu, 17 Aug 2006 08:45:43 +0000 (GMT) (envelope-from cdjones@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7H8jhSN007138 for ; Thu, 17 Aug 2006 08:45:43 GMT (envelope-from cdjones@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7H8jh3B007135 for perforce@freebsd.org; Thu, 17 Aug 2006 08:45:43 GMT (envelope-from cdjones@FreeBSD.org) Date: Thu, 17 Aug 2006 08:45:43 GMT Message-Id: <200608170845.k7H8jh3B007135@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to cdjones@FreeBSD.org using -f From: Chris Jones To: Perforce Change Reviews Cc: Subject: PERFORCE change 104369 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 17 Aug 2006 08:45:44 -0000 http://perforce.freebsd.org/chv.cgi?CH=104369 Change 104369 by cdjones@cdjones-impulse on 2006/08/17 08:45:40 Remove lock order reversal, make skew formula vary with proportionate CPU usage and proportionate share allocation. Further tweaking required, and then actually hooking it into the priority-setting bit can be done. Affected files ... .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/sched_hier.c#13 edit Differences ... ==== //depot/projects/soc2006/cdjones_jail/src/sys/kern/sched_hier.c#13 (text+ko) ==== @@ -450,6 +450,7 @@ * everything out while we recalculate per-jail CPU usage. * TODO: this is excessively icky. */ + sx_slock(&allproc_lock); mtx_lock(&allprison_mtx); if (prisoncount) { LIST_FOREACH(pr, &allprison, pr_list) { @@ -457,7 +458,6 @@ pr->pr_estcpu = 0; } } - sx_slock(&allproc_lock); total_est_cpu = 0; FOREACH_PROC_IN_SYSTEM(p) { /* @@ -554,13 +554,13 @@ } /* end of ksegrp loop */ mtx_unlock_spin(&sched_lock); } /* end of process loop */ - sx_sunlock(&allproc_lock); if (prisoncount) { LIST_FOREACH(pr, &allprison, pr_list) { mtx_unlock(&pr->pr_mtx); } } mtx_unlock(&allprison_mtx); + sx_sunlock(&allproc_lock); } /* @@ -589,7 +589,6 @@ nShares = 0; nCpu = 0; LIST_FOREACH(pr, &allprison, pr_list) { - printf("schedcpu_thread: prison %p\n", &pr); nShares += pr->pr_sched_shares; nCpu += pr->pr_estcpu; } @@ -650,13 +649,19 @@ * soft limits available. Also, the amount of CPU time * reserved to unjailed processes really should be sysctl'd. */ - register unsigned int np = newpriority; - newpriority *= pr->pr_sched_shares; - KASSERT(0 != total_jail_sched_shares, - "no jail sched shares when a jail exists?!"); - newpriority /= 2*total_jail_sched_shares; - printf("resetpriority: reset KSE %p from %d to %d\n", - &kg, np, newpriority); + register unsigned int np = newpriority; + register unsigned int skew = PRI_MAX_TIMESHARE; + skew -= PRI_MIN_TIMESHARE; + skew /= 16; + + skew *= pr->pr_sched_shares; + skew *= pr->pr_estcpu; + /* avoid divide-by-zero hazards */ + skew /= max(total_jail_sched_shares, 1); + skew /= max(total_est_cpu, 1); + + printf("resetpriority: skewing KSE %p to %d from %d\n", + &kg, np + skew, np); } newpriority = min(max(newpriority, PRI_MIN_TIMESHARE), PRI_MAX_TIMESHARE); From owner-p4-projects@FreeBSD.ORG Thu Aug 17 09:01:03 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6BE6516A4E5; Thu, 17 Aug 2006 09:01:03 +0000 (UTC) X-Original-To: perforce@FreeBSD.org 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 448AE16A4DE for ; Thu, 17 Aug 2006 09:01:03 +0000 (UTC) (envelope-from cdjones@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1542D43D55 for ; Thu, 17 Aug 2006 09:01:03 +0000 (GMT) (envelope-from cdjones@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7H912Qn015790 for ; Thu, 17 Aug 2006 09:01:02 GMT (envelope-from cdjones@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7H912oa015787 for perforce@freebsd.org; Thu, 17 Aug 2006 09:01:02 GMT (envelope-from cdjones@FreeBSD.org) Date: Thu, 17 Aug 2006 09:01:02 GMT Message-Id: <200608170901.k7H912oa015787@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to cdjones@FreeBSD.org using -f From: Chris Jones To: Perforce Change Reviews Cc: Subject: PERFORCE change 104371 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 17 Aug 2006 09:01:03 -0000 http://perforce.freebsd.org/chv.cgi?CH=104371 Change 104371 by cdjones@cdjones_meanook on 2006/08/17 09:00:53 Add sysctl to permit tweaking the number of cpu shares that non-jailed processes, erm, share. Affected files ... .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/sched_hier.c#14 edit Differences ... ==== //depot/projects/soc2006/cdjones_jail/src/sys/kern/sched_hier.c#14 (text+ko) ==== @@ -295,6 +295,11 @@ &sched_kgfollowons, 0, "number of followons done in a ksegrp"); +static int sched_unjailedProcessShares = 50; +SYSCTL_INT(_kern_sched, OID_AUTO, unjailedprocessshares, CTLFLAG_RW, + &sched_unjailedProcessShares, 0, + "number of shares to allocate to unjailed processes"); + static __inline void sched_load_add(void) { @@ -586,7 +591,7 @@ * when jail CPU shares are added / changed, rather than * doing it every second. */ - nShares = 0; + nShares = sched_unjailedProcessShares; nCpu = 0; LIST_FOREACH(pr, &allprison, pr_list) { nShares += pr->pr_sched_shares; From owner-p4-projects@FreeBSD.ORG Thu Aug 17 15:52:04 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5088A16A511; Thu, 17 Aug 2006 15:52:04 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 2BFBB16A50E for ; Thu, 17 Aug 2006 15:52:04 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 217C943D62 for ; Thu, 17 Aug 2006 15:52:02 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7HFq24H054862 for ; Thu, 17 Aug 2006 15:52:02 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7HFq1iO054859 for perforce@freebsd.org; Thu, 17 Aug 2006 15:52:01 GMT (envelope-from millert@freebsd.org) Date: Thu, 17 Aug 2006 15:52:01 GMT Message-Id: <200608171552.k7HFq1iO054859@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 104412 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 17 Aug 2006 15:52:04 -0000 http://perforce.freebsd.org/chv.cgi?CH=104412 Change 104412 by millert@millert_g4tower on 2006/08/17 15:51:45 Make the sedarwin dirs in export if they don't already exist. Affected files ... .. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policy/Makefile#3 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policy/Makefile#3 (text+ko) ==== @@ -36,13 +36,14 @@ install: ./update_plist --policy=$(POLICY) --migscs=sebsd_migscs ../sedarwin/mac_sedarwin.kext/Contents/Info.plist && make -C ../sedarwin mac_sedarwin.kext.tar install + mkdir -p $(DESTDIR)/private/etc/sedarwin + (cd $(CURDIR)/.. && tar -X policy/excludes -cf - policy) | (cd $(DESTDIR)/private/etc/sedarwin/ && tar -xf -) + (cd $(FLASK)/.. && tar -cf - flask) | (cd $(DESTDIR)/private/etc/sedarwin/policy && tar -xf -) + cp -f Makefile.install $(DESTDIR)/private/etc/sedarwin/policy/Makefile $(INSTALL) -o ${BINOWN} -g ${BINGRP} -m 644 ${POLICY} ${DESTDIR}/private/etc/sedarwin/policy $(INSTALL) -o ${BINOWN} -g ${BINGRP} -m 644 sebsd_migscs ${DESTDIR}/private/etc/sedarwin/policy $(INSTALL) -o ${BINOWN} -g ${BINGRP} -m 644 failsafe_context ${DESTDIR}/private/etc/sedarwin/contexts $(INSTALL) -o ${BINOWN} -g ${BINGRP} -m 700 ${SCRIPTS} ${DESTDIR}/private/etc/sedarwin - (cd $(CURDIR)/.. && tar -X policy/excludes -cf - policy) | (cd $(DESTDIR)/private/etc/sedarwin/ && tar -xf -) - (cd $(FLASK)/.. && tar -cf - flask) | (cd $(DESTDIR)/private/etc/sedarwin/policy && tar -xf -) - cp -f Makefile.install $(DESTDIR)/private/etc/sedarwin/policy/Makefile # Mig security classes and access vectors From owner-p4-projects@FreeBSD.ORG Thu Aug 17 17:55:42 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EB8DA16A4E1; Thu, 17 Aug 2006 17:55:41 +0000 (UTC) X-Original-To: perforce@FreeBSD.org 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 C081C16A4DE for ; Thu, 17 Aug 2006 17:55:41 +0000 (UTC) (envelope-from cdjones@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 89A8F43D49 for ; Thu, 17 Aug 2006 17:55:41 +0000 (GMT) (envelope-from cdjones@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7HHtfcM071223 for ; Thu, 17 Aug 2006 17:55:41 GMT (envelope-from cdjones@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7HHtflt071220 for perforce@freebsd.org; Thu, 17 Aug 2006 17:55:41 GMT (envelope-from cdjones@FreeBSD.org) Date: Thu, 17 Aug 2006 17:55:41 GMT Message-Id: <200608171755.k7HHtflt071220@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to cdjones@FreeBSD.org using -f From: Chris Jones To: Perforce Change Reviews Cc: Subject: PERFORCE change 104418 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 17 Aug 2006 17:55:42 -0000 http://perforce.freebsd.org/chv.cgi?CH=104418 Change 104418 by cdjones@cdjones_meanook on 2006/08/17 17:54:41 Make sysctl actually work. Affected files ... .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/sched_hier.c#15 edit Differences ... ==== //depot/projects/soc2006/cdjones_jail/src/sys/kern/sched_hier.c#15 (text+ko) ==== @@ -296,7 +296,8 @@ "number of followons done in a ksegrp"); static int sched_unjailedProcessShares = 50; -SYSCTL_INT(_kern_sched, OID_AUTO, unjailedprocessshares, CTLFLAG_RW, +SYSCTL_INT(_kern_sched, OID_AUTO, unjailedprocessshares, + CTLTYPE_INT | CTLFLAG_RW, &sched_unjailedProcessShares, 0, "number of shares to allocate to unjailed processes"); From owner-p4-projects@FreeBSD.ORG Thu Aug 17 19:14:25 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D4D2216A4E5; Thu, 17 Aug 2006 19:14:24 +0000 (UTC) X-Original-To: perforce@FreeBSD.org 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 8E9A516A4DA for ; Thu, 17 Aug 2006 19:14:24 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 41E6E43D49 for ; Thu, 17 Aug 2006 19:14:24 +0000 (GMT) (envelope-from gonzo@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7HJEOIj077337 for ; Thu, 17 Aug 2006 19:14:24 GMT (envelope-from gonzo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7HJENFQ077333 for perforce@freebsd.org; Thu, 17 Aug 2006 19:14:23 GMT (envelope-from gonzo@FreeBSD.org) Date: Thu, 17 Aug 2006 19:14:23 GMT Message-Id: <200608171914.k7HJENFQ077333@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gonzo@FreeBSD.org using -f From: Oleksandr Tymoshenko To: Perforce Change Reviews Cc: Subject: PERFORCE change 104420 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 17 Aug 2006 19:14:25 -0000 http://perforce.freebsd.org/chv.cgi?CH=104420 Change 104420 by gonzo@gonzo_hideout on 2006/08/17 19:13:45 o First bits of userland code: - crt[in].S are borrowed from NetBSD. - crt1.s is adopted file from arm with TODO banners inside. Affected files ... .. //depot/projects/mips2/src/lib/csu/mips/Makefile#1 add .. //depot/projects/mips2/src/lib/csu/mips/crt1.c#1 add .. //depot/projects/mips2/src/lib/csu/mips/crti.S#1 add .. //depot/projects/mips2/src/lib/csu/mips/crtn.S#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Thu Aug 17 19:25:48 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5085116A4E0; Thu, 17 Aug 2006 19:25:48 +0000 (UTC) X-Original-To: perforce@FreeBSD.org 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 02BAD16A4DE for ; Thu, 17 Aug 2006 19:25:48 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 024FE43D66 for ; Thu, 17 Aug 2006 19:25:39 +0000 (GMT) (envelope-from gonzo@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7HJPdAU078140 for ; Thu, 17 Aug 2006 19:25:39 GMT (envelope-from gonzo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7HJPdUG078137 for perforce@freebsd.org; Thu, 17 Aug 2006 19:25:39 GMT (envelope-from gonzo@FreeBSD.org) Date: Thu, 17 Aug 2006 19:25:39 GMT Message-Id: <200608171925.k7HJPdUG078137@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gonzo@FreeBSD.org using -f From: Oleksandr Tymoshenko To: Perforce Change Reviews Cc: Subject: PERFORCE change 104423 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 17 Aug 2006 19:25:48 -0000 http://perforce.freebsd.org/chv.cgi?CH=104423 Change 104423 by gonzo@gonzo_hq on 2006/08/17 19:25:11 o Tweak some includes in order not to confuse libkvm build. Affected files ... .. //depot/projects/mips2/src/sys/mips/include/pmap.h#3 edit .. //depot/projects/mips2/src/sys/mips/include/signal.h#2 edit Differences ... ==== //depot/projects/mips2/src/sys/mips/include/pmap.h#3 (text+ko) ==== @@ -29,7 +29,10 @@ #ifndef _MACHINE_PMAP_H_ #define _MACHINE_PMAP_H_ +#include + #include +#include #ifndef LOCORE ==== //depot/projects/mips2/src/sys/mips/include/signal.h#2 (text+ko) ==== @@ -44,7 +44,6 @@ typedef long sig_atomic_t; #if __BSD_VISIBLE -#include /* codes for SIGILL, SIGFPE */ /* * Only the kernel should need these old type definitions. From owner-p4-projects@FreeBSD.ORG Thu Aug 17 19:44:13 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 77C0B16A4E5; Thu, 17 Aug 2006 19:44:13 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 5214216A4DF for ; Thu, 17 Aug 2006 19:44:13 +0000 (UTC) (envelope-from bushman@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id AD15743D67 for ; Thu, 17 Aug 2006 19:44:05 +0000 (GMT) (envelope-from bushman@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7HJi53F079305 for ; Thu, 17 Aug 2006 19:44:05 GMT (envelope-from bushman@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7HJi5aL079302 for perforce@freebsd.org; Thu, 17 Aug 2006 19:44:05 GMT (envelope-from bushman@freebsd.org) Date: Thu, 17 Aug 2006 19:44:05 GMT Message-Id: <200608171944.k7HJi5aL079302@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bushman@freebsd.org using -f From: Michael Bushkov To: Perforce Change Reviews Cc: Subject: PERFORCE change 104430 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 17 Aug 2006 19:44:13 -0000 http://perforce.freebsd.org/chv.cgi?CH=104430 Change 104430 by bushman@bushman_nss_ldap_cached on 2006/08/17 19:43:19 IFC. Kerberos added to make it able to use OpenLDAP from source tree. Affected files ... .. //depot/projects/soc2006/nss_ldap_cached/src/etc/defaults/rc.conf#5 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/etc/network.subr#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/etc/pccard_ether#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/etc/rc.d/dhclient#3 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/etc/rc.subr#4 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/etc/sendmail/freebsd.mc#3 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/etc/sendmail/freebsd.submit.mc#3 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/kerberos5/Makefile#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/kerberos5/Makefile.inc#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/kerberos5/README#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/kerberos5/doc/Makefile#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/kerberos5/include/config.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/kerberos5/include/crypto-headers.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/kerberos5/include/krb5-types.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/kerberos5/include/version.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/kerberos5/lib/Makefile#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/kerberos5/lib/Makefile.inc#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/kerberos5/lib/libasn1/Makefile#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/kerberos5/lib/libgssapi/Makefile#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/kerberos5/lib/libhdb/Makefile#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/kerberos5/lib/libkadm5clnt/Makefile#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/kerberos5/lib/libkadm5srv/Makefile#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/kerberos5/lib/libkafs5/Makefile#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/kerberos5/lib/libkrb5/Makefile#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/kerberos5/lib/libroken/Makefile#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/kerberos5/lib/libsl/Makefile#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/kerberos5/lib/libvers/Makefile#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/kerberos5/libexec/Makefile#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/kerberos5/libexec/Makefile.inc#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/kerberos5/libexec/hprop/Makefile#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/kerberos5/libexec/hpropd/Makefile#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/kerberos5/libexec/ipropd-master/Makefile#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/kerberos5/libexec/ipropd-slave/Makefile#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/kerberos5/libexec/kadmind/Makefile#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/kerberos5/libexec/kdc/Makefile#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/kerberos5/libexec/kpasswdd/Makefile#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/kerberos5/tools/Makefile#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/kerberos5/tools/Makefile.inc#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/kerberos5/tools/asn1_compile/Makefile#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/kerberos5/tools/make-print-version/Makefile#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/kerberos5/tools/make-roken/Makefile#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/kerberos5/usr.bin/Makefile#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/kerberos5/usr.bin/Makefile.inc#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/kerberos5/usr.bin/kadmin/Makefile#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/kerberos5/usr.bin/kdestroy/Makefile#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/kerberos5/usr.bin/kinit/Makefile#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/kerberos5/usr.bin/klist/Makefile#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/kerberos5/usr.bin/kpasswd/Makefile#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/kerberos5/usr.bin/krb5-config/Makefile#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/kerberos5/usr.bin/ksu/Makefile#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/kerberos5/usr.bin/verify_krb5_conf/Makefile#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/kerberos5/usr.sbin/Makefile#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/kerberos5/usr.sbin/Makefile.inc#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/kerberos5/usr.sbin/kstash/Makefile#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/kerberos5/usr.sbin/ktutil/Makefile#1 branch .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/arp/arp.8#2 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/newsyslog/newsyslog.c#4 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/rpc.lockd/kern.c#3 integrate Differences ... ==== //depot/projects/soc2006/nss_ldap_cached/src/etc/defaults/rc.conf#5 (text+ko) ==== @@ -15,7 +15,7 @@ # For a more detailed explanation of all the rc.conf variables, please # refer to the rc.conf(5) manual page. # -# $FreeBSD: src/etc/defaults/rc.conf,v 1.292 2006/08/16 17:14:52 brooks Exp $ +# $FreeBSD: src/etc/defaults/rc.conf,v 1.293 2006/08/17 17:12:26 brian Exp $ ############################################################## ### Important initial Boot-time options #################### @@ -94,6 +94,7 @@ nisdomainname="NO" # Set to NIS domain if using NIS (or NO). dhclient_program="/sbin/dhclient" # Path to dhcp client program. dhclient_flags="" # Additional flags to pass to dhcp client. +dhclient_flags_fxp0="" # Additional dhclient flags for fxp0 only background_dhclient="NO" # Start dhcp client in the background. synchronous_dhclient="YES" # Start dhclient directly on configured # interfaces during startup. ==== //depot/projects/soc2006/nss_ldap_cached/src/etc/network.subr#2 (text+ko) ==== @@ -22,7 +22,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/etc/network.subr,v 1.171 2006/04/13 18:34:13 brooks Exp $ +# $FreeBSD: src/etc/network.subr,v 1.172 2006/08/17 03:03:38 brooks Exp $ # # @@ -70,35 +70,14 @@ } # ifconfig_down if -# Remove all inet entries from the $if interface. It returns -# 0 if inet entries were found and removed. It returns 1 if -# no entries were found or they could not be removed. -# -# XXX: should not be only inet +# returns 1 if wpa_supplicant or dhclient was stopped or +# the interface exists. # ifconfig_down() { [ -z "$1" ] && return 1 - _ifs="^" _cfg=1 - inetList="`ifconfig $1 | grep 'inet ' | tr "\n" "$_ifs"`" - - oldifs="$IFS" - IFS="$_ifs" - for _inet in $inetList ; do - # get rid of extraneous line - [ -z "$_inet" ] && break - - _inet=`expr "$_inet" : '.*\(inet \([0-9]\{1,3\}\.\)\{3\}[0-9]\{1,3\}\).*'` - - IFS="$oldifs" - ifconfig $1 ${_inet} delete - IFS="$_ifs" - _cfg=0 - done - IFS="$oldifs" - if wpaif $1; then /etc/rc.d/wpa_supplicant stop $1 _cfg=0 @@ -109,7 +88,10 @@ _cfg=0 fi - ifconfig $1 down + if ifexists $1; then + ifconfig $1 down + _cfg=0 + fi return $_cfg } @@ -255,6 +237,13 @@ return 1 } +# ifexists if +# Returns 0 if the interface exists and 1 otherwise. +ifexists() +{ + ifconfig $1 > /dev/null 2>&1 +} + # ipv4_up if # add IPv4 addresses to the interface $if ipv4_up() @@ -269,8 +258,32 @@ ipv4_down() { _if=$1 - ifalias_down ${_if} - ipv4_addrs_common ${_if} -alias + _ifs="^" + _ret=1 + + ifexists ${_if} || return 1 + + inetList="`ifconfig ${_if} | grep 'inet ' | tr "\n" "$_ifs"`" + + oldifs="$IFS" + IFS="$_ifs" + for _inet in $inetList ; do + # get rid of extraneous line + [ -z "$_inet" ] && break + + _inet=`expr "$_inet" : '.*\(inet \([0-9]\{1,3\}\.\)\{3\}[0-9]\{1,3\}\).*'` + + IFS="$oldifs" + ifconfig ${_if} ${_inet} delete + IFS="$_ifs" + _ret=0 + done + IFS="$oldifs" + + ifalias_down ${_if} && _ret=0 + ipv4_addrs_common ${_if} -alias && _ret=0 + + return $_ret } # ipv4_addrs_common if action @@ -466,6 +479,8 @@ _ifs="^" _ret=1 + ifexists $1 || return 1 + ipxList="`ifconfig $1 | grep 'ipx ' | tr "\n" "$_ifs"`" oldifs="$IFS" ==== //depot/projects/soc2006/nss_ldap_cached/src/etc/pccard_ether#2 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh - # -# $FreeBSD: src/etc/pccard_ether,v 1.48 2005/10/03 18:20:44 brooks Exp $ +# $FreeBSD: src/etc/pccard_ether,v 1.49 2006/08/17 03:03:38 brooks Exp $ # # pccard_ether interfacename [start|stop|restart] # @@ -101,7 +101,7 @@ /etc/rc.d/netif stop $ifn # clean ARP table - arp -d -a + ifexists $ifn && arp -d -i $ifn -a # Clean the routing table if checkyesno removable_route_flush; then ==== //depot/projects/soc2006/nss_ldap_cached/src/etc/rc.d/dhclient#3 (text+ko) ==== @@ -1,7 +1,7 @@ #!/bin/sh # # $NetBSD: dhclient,v 1.8 2002/03/22 04:33:58 thorpej Exp $ -# $FreeBSD: src/etc/rc.d/dhclient,v 1.22 2006/07/09 06:54:24 stefanf Exp $ +# $FreeBSD: src/etc/rc.d/dhclient,v 1.23 2006/08/17 17:12:26 brian Exp $ # # PROVIDE: dhclient @@ -27,7 +27,18 @@ fi fi - if checkyesno background_dhclient; then + # Override for $ifn specific flags (see rc.subr for $flags setting) + eval specific=\$dhclient_flags_$ifn + if [ -z "$flags" -a -n "$specific" ]; then + rc_flags=$specific + fi + + eval specific=\$background_dhclient_$ifn + if [ -n "$specific ]; then + if checkyesno background_dhclient_$ifn; then + rc_flags="${rc_flags} -b" + fi + elif checkyesno background_dhclient; then rc_flags="${rc_flags} -b" fi ==== //depot/projects/soc2006/nss_ldap_cached/src/etc/rc.subr#4 (text+ko) ==== @@ -1,5 +1,5 @@ # $NetBSD: rc.subr,v 1.66 2006/04/01 10:05:50 he Exp $ -# $FreeBSD: src/etc/rc.subr,v 1.64 2006/07/26 08:03:24 yar Exp $ +# $FreeBSD: src/etc/rc.subr,v 1.65 2006/08/17 08:04:20 yar Exp $ # # Copyright (c) 1997-2004 The NetBSD Foundation, Inc. # All rights reserved. @@ -666,12 +666,17 @@ $_chroot $command $rc_flags $command_args" else _doit="\ -${_chdir:+cd $_chdir; }\ -${_nice:+nice -n $_nice }\ +${_chdir:+cd $_chdir && }\ $command $rc_flags $command_args" if [ -n "$_user" ]; then _doit="su -m $_user -c 'sh -c \"$_doit\"'" fi + if [ -n "$_nice" ]; then + if [ -z "$_user" ]; then + _doit="sh -c \"$_doit\"" + fi + _doit="nice -n $_nice $_doit" + fi fi # run the full command; ==== //depot/projects/soc2006/nss_ldap_cached/src/etc/sendmail/freebsd.mc#3 (text+ko) ==== @@ -44,7 +44,7 @@ # divert(0) -VERSIONID(`$FreeBSD: src/etc/sendmail/freebsd.mc,v 1.32 2006/06/14 23:03:41 gshapiro Exp $') +VERSIONID(`$FreeBSD: src/etc/sendmail/freebsd.mc,v 1.33 2006/08/17 05:12:07 gshapiro Exp $') OSTYPE(freebsd6) DOMAIN(generic) ==== //depot/projects/soc2006/nss_ldap_cached/src/etc/sendmail/freebsd.submit.mc#3 (text+ko) ==== @@ -16,7 +16,7 @@ # divert(0)dnl -VERSIONID(`$FreeBSD: src/etc/sendmail/freebsd.submit.mc,v 1.3 2006/06/14 23:03:41 gshapiro Exp $') +VERSIONID(`$FreeBSD: src/etc/sendmail/freebsd.submit.mc,v 1.4 2006/08/17 05:12:07 gshapiro Exp $') define(`confCF_VERSION', `Submit')dnl define(`__OSTYPE__',`')dnl dirty hack to keep proto.m4 from complaining define(`_USE_DECNET_SYNTAX_', `1')dnl support DECnet ==== //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/arp/arp.8#2 (text+ko) ==== @@ -26,9 +26,9 @@ .\" SUCH DAMAGE. .\" .\" @(#)arp.8 8.1 (Berkeley) 6/6/93 -.\" $FreeBSD: src/usr.sbin/arp/arp.8,v 1.24 2006/01/10 05:17:16 brooks Exp $ +.\" $FreeBSD: src/usr.sbin/arp/arp.8,v 1.25 2006/08/17 07:14:01 yar Exp $ .\" -.Dd June 6, 1993 +.Dd August 17, 2006 .Dt ARP 8 .Os .Sh NAME @@ -103,7 +103,8 @@ .Tn ARP entries on .Ar interface . -Applicable to the display operations only. +Applicable only to the following operations: +display one, display all, delete all. .It Fl n Show network addresses as numbers (normally .Nm ==== //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/newsyslog/newsyslog.c#4 (text+ko) ==== @@ -54,7 +54,7 @@ */ #include -__FBSDID("$FreeBSD: src/usr.sbin/newsyslog/newsyslog.c,v 1.106 2006/07/21 22:13:06 sobomax Exp $"); +__FBSDID("$FreeBSD: src/usr.sbin/newsyslog/newsyslog.c,v 1.107 2006/08/17 18:15:43 delphij Exp $"); #define OSF #ifndef COMPRESS_POSTFIX @@ -890,7 +890,8 @@ static void expand_globs(struct conf_entry **work_p, struct conf_entry **glob_p) { - int gmatch, gres, i; + int gmatch, gres; + size_t i; char *mfname; struct conf_entry *dupent, *ent, *firstmatch, *globent; struct conf_entry *lastmatch; ==== //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/rpc.lockd/kern.c#3 (text+ko) ==== @@ -29,7 +29,7 @@ */ #include -__FBSDID("$FreeBSD: src/usr.sbin/rpc.lockd/kern.c,v 1.20 2006/08/16 18:33:35 thomas Exp $"); +__FBSDID("$FreeBSD: src/usr.sbin/rpc.lockd/kern.c,v 1.21 2006/08/17 05:55:20 maxim Exp $"); #include #include @@ -147,10 +147,10 @@ case -1: err(1, "fork"); case 0: - setproctitle ("client"); + setproctitle("client"); break; default: - setproctitle ("server"); + setproctitle("server"); return (child); } From owner-p4-projects@FreeBSD.ORG Thu Aug 17 19:48:13 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DCB0D16A4DF; Thu, 17 Aug 2006 19:48:12 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 3D83E16A4DA for ; Thu, 17 Aug 2006 19:48:12 +0000 (UTC) (envelope-from bushman@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id CECED43D46 for ; Thu, 17 Aug 2006 19:48:11 +0000 (GMT) (envelope-from bushman@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7HJmBMp079490 for ; Thu, 17 Aug 2006 19:48:11 GMT (envelope-from bushman@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7HJmBHg079487 for perforce@freebsd.org; Thu, 17 Aug 2006 19:48:11 GMT (envelope-from bushman@freebsd.org) Date: Thu, 17 Aug 2006 19:48:11 GMT Message-Id: <200608171948.k7HJmBHg079487@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bushman@freebsd.org using -f From: Michael Bushkov To: Perforce Change Reviews Cc: Subject: PERFORCE change 104431 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 17 Aug 2006 19:48:13 -0000 http://perforce.freebsd.org/chv.cgi?CH=104431 Change 104431 by bushman@bushman_nss_ldap_cached on 2006/08/17 19:47:09 IFC Affected files ... .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/defaults/rc.conf#3 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/network.subr#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/pccard_ether#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/rc.d/dhclient#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/rc.subr#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/sendmail/freebsd.mc#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/sendmail/freebsd.submit.mc#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/kerberos5/Makefile#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/kerberos5/Makefile.inc#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/kerberos5/README#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/kerberos5/doc/Makefile#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/kerberos5/include/config.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/kerberos5/include/crypto-headers.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/kerberos5/include/krb5-types.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/kerberos5/include/version.h#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/kerberos5/lib/Makefile#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/kerberos5/lib/Makefile.inc#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/kerberos5/lib/libasn1/Makefile#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/kerberos5/lib/libgssapi/Makefile#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/kerberos5/lib/libhdb/Makefile#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/kerberos5/lib/libkadm5clnt/Makefile#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/kerberos5/lib/libkadm5srv/Makefile#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/kerberos5/lib/libkafs5/Makefile#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/kerberos5/lib/libkrb5/Makefile#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/kerberos5/lib/libroken/Makefile#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/kerberos5/lib/libsl/Makefile#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/kerberos5/lib/libvers/Makefile#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/kerberos5/libexec/Makefile#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/kerberos5/libexec/Makefile.inc#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/kerberos5/libexec/hprop/Makefile#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/kerberos5/libexec/hpropd/Makefile#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/kerberos5/libexec/ipropd-master/Makefile#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/kerberos5/libexec/ipropd-slave/Makefile#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/kerberos5/libexec/kadmind/Makefile#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/kerberos5/libexec/kdc/Makefile#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/kerberos5/libexec/kpasswdd/Makefile#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/kerberos5/tools/Makefile#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/kerberos5/tools/Makefile.inc#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/kerberos5/tools/asn1_compile/Makefile#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/kerberos5/tools/make-print-version/Makefile#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/kerberos5/tools/make-roken/Makefile#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/kerberos5/usr.bin/Makefile#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/kerberos5/usr.bin/Makefile.inc#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/kerberos5/usr.bin/kadmin/Makefile#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/kerberos5/usr.bin/kdestroy/Makefile#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/kerberos5/usr.bin/kinit/Makefile#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/kerberos5/usr.bin/klist/Makefile#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/kerberos5/usr.bin/kpasswd/Makefile#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/kerberos5/usr.bin/krb5-config/Makefile#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/kerberos5/usr.bin/ksu/Makefile#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/kerberos5/usr.bin/verify_krb5_conf/Makefile#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/kerberos5/usr.sbin/Makefile#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/kerberos5/usr.sbin/Makefile.inc#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/kerberos5/usr.sbin/kstash/Makefile#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/kerberos5/usr.sbin/ktutil/Makefile#1 branch .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/arp/arp.8#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/newsyslog/newsyslog.c#2 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/rpc.lockd/kern.c#3 integrate Differences ... ==== //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/defaults/rc.conf#3 (text+ko) ==== @@ -15,7 +15,7 @@ # For a more detailed explanation of all the rc.conf variables, please # refer to the rc.conf(5) manual page. # -# $FreeBSD: src/etc/defaults/rc.conf,v 1.292 2006/08/16 17:14:52 brooks Exp $ +# $FreeBSD: src/etc/defaults/rc.conf,v 1.293 2006/08/17 17:12:26 brian Exp $ ############################################################## ### Important initial Boot-time options #################### @@ -94,6 +94,7 @@ nisdomainname="NO" # Set to NIS domain if using NIS (or NO). dhclient_program="/sbin/dhclient" # Path to dhcp client program. dhclient_flags="" # Additional flags to pass to dhcp client. +dhclient_flags_fxp0="" # Additional dhclient flags for fxp0 only background_dhclient="NO" # Start dhcp client in the background. synchronous_dhclient="YES" # Start dhclient directly on configured # interfaces during startup. ==== //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/network.subr#2 (text+ko) ==== @@ -22,7 +22,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/etc/network.subr,v 1.171 2006/04/13 18:34:13 brooks Exp $ +# $FreeBSD: src/etc/network.subr,v 1.172 2006/08/17 03:03:38 brooks Exp $ # # @@ -70,35 +70,14 @@ } # ifconfig_down if -# Remove all inet entries from the $if interface. It returns -# 0 if inet entries were found and removed. It returns 1 if -# no entries were found or they could not be removed. -# -# XXX: should not be only inet +# returns 1 if wpa_supplicant or dhclient was stopped or +# the interface exists. # ifconfig_down() { [ -z "$1" ] && return 1 - _ifs="^" _cfg=1 - inetList="`ifconfig $1 | grep 'inet ' | tr "\n" "$_ifs"`" - - oldifs="$IFS" - IFS="$_ifs" - for _inet in $inetList ; do - # get rid of extraneous line - [ -z "$_inet" ] && break - - _inet=`expr "$_inet" : '.*\(inet \([0-9]\{1,3\}\.\)\{3\}[0-9]\{1,3\}\).*'` - - IFS="$oldifs" - ifconfig $1 ${_inet} delete - IFS="$_ifs" - _cfg=0 - done - IFS="$oldifs" - if wpaif $1; then /etc/rc.d/wpa_supplicant stop $1 _cfg=0 @@ -109,7 +88,10 @@ _cfg=0 fi - ifconfig $1 down + if ifexists $1; then + ifconfig $1 down + _cfg=0 + fi return $_cfg } @@ -255,6 +237,13 @@ return 1 } +# ifexists if +# Returns 0 if the interface exists and 1 otherwise. +ifexists() +{ + ifconfig $1 > /dev/null 2>&1 +} + # ipv4_up if # add IPv4 addresses to the interface $if ipv4_up() @@ -269,8 +258,32 @@ ipv4_down() { _if=$1 - ifalias_down ${_if} - ipv4_addrs_common ${_if} -alias + _ifs="^" + _ret=1 + + ifexists ${_if} || return 1 + + inetList="`ifconfig ${_if} | grep 'inet ' | tr "\n" "$_ifs"`" + + oldifs="$IFS" + IFS="$_ifs" + for _inet in $inetList ; do + # get rid of extraneous line + [ -z "$_inet" ] && break + + _inet=`expr "$_inet" : '.*\(inet \([0-9]\{1,3\}\.\)\{3\}[0-9]\{1,3\}\).*'` + + IFS="$oldifs" + ifconfig ${_if} ${_inet} delete + IFS="$_ifs" + _ret=0 + done + IFS="$oldifs" + + ifalias_down ${_if} && _ret=0 + ipv4_addrs_common ${_if} -alias && _ret=0 + + return $_ret } # ipv4_addrs_common if action @@ -466,6 +479,8 @@ _ifs="^" _ret=1 + ifexists $1 || return 1 + ipxList="`ifconfig $1 | grep 'ipx ' | tr "\n" "$_ifs"`" oldifs="$IFS" ==== //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/pccard_ether#2 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh - # -# $FreeBSD: src/etc/pccard_ether,v 1.48 2005/10/03 18:20:44 brooks Exp $ +# $FreeBSD: src/etc/pccard_ether,v 1.49 2006/08/17 03:03:38 brooks Exp $ # # pccard_ether interfacename [start|stop|restart] # @@ -101,7 +101,7 @@ /etc/rc.d/netif stop $ifn # clean ARP table - arp -d -a + ifexists $ifn && arp -d -i $ifn -a # Clean the routing table if checkyesno removable_route_flush; then ==== //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/rc.d/dhclient#2 (text+ko) ==== @@ -1,7 +1,7 @@ #!/bin/sh # # $NetBSD: dhclient,v 1.8 2002/03/22 04:33:58 thorpej Exp $ -# $FreeBSD: src/etc/rc.d/dhclient,v 1.22 2006/07/09 06:54:24 stefanf Exp $ +# $FreeBSD: src/etc/rc.d/dhclient,v 1.23 2006/08/17 17:12:26 brian Exp $ # # PROVIDE: dhclient @@ -27,7 +27,18 @@ fi fi - if checkyesno background_dhclient; then + # Override for $ifn specific flags (see rc.subr for $flags setting) + eval specific=\$dhclient_flags_$ifn + if [ -z "$flags" -a -n "$specific" ]; then + rc_flags=$specific + fi + + eval specific=\$background_dhclient_$ifn + if [ -n "$specific ]; then + if checkyesno background_dhclient_$ifn; then + rc_flags="${rc_flags} -b" + fi + elif checkyesno background_dhclient; then rc_flags="${rc_flags} -b" fi ==== //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/rc.subr#2 (text+ko) ==== @@ -1,5 +1,5 @@ # $NetBSD: rc.subr,v 1.66 2006/04/01 10:05:50 he Exp $ -# $FreeBSD: src/etc/rc.subr,v 1.64 2006/07/26 08:03:24 yar Exp $ +# $FreeBSD: src/etc/rc.subr,v 1.65 2006/08/17 08:04:20 yar Exp $ # # Copyright (c) 1997-2004 The NetBSD Foundation, Inc. # All rights reserved. @@ -666,12 +666,17 @@ $_chroot $command $rc_flags $command_args" else _doit="\ -${_chdir:+cd $_chdir; }\ -${_nice:+nice -n $_nice }\ +${_chdir:+cd $_chdir && }\ $command $rc_flags $command_args" if [ -n "$_user" ]; then _doit="su -m $_user -c 'sh -c \"$_doit\"'" fi + if [ -n "$_nice" ]; then + if [ -z "$_user" ]; then + _doit="sh -c \"$_doit\"" + fi + _doit="nice -n $_nice $_doit" + fi fi # run the full command; ==== //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/sendmail/freebsd.mc#2 (text+ko) ==== @@ -44,7 +44,7 @@ # divert(0) -VERSIONID(`$FreeBSD: src/etc/sendmail/freebsd.mc,v 1.32 2006/06/14 23:03:41 gshapiro Exp $') +VERSIONID(`$FreeBSD: src/etc/sendmail/freebsd.mc,v 1.33 2006/08/17 05:12:07 gshapiro Exp $') OSTYPE(freebsd6) DOMAIN(generic) ==== //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/sendmail/freebsd.submit.mc#2 (text+ko) ==== @@ -16,7 +16,7 @@ # divert(0)dnl -VERSIONID(`$FreeBSD: src/etc/sendmail/freebsd.submit.mc,v 1.3 2006/06/14 23:03:41 gshapiro Exp $') +VERSIONID(`$FreeBSD: src/etc/sendmail/freebsd.submit.mc,v 1.4 2006/08/17 05:12:07 gshapiro Exp $') define(`confCF_VERSION', `Submit')dnl define(`__OSTYPE__',`')dnl dirty hack to keep proto.m4 from complaining define(`_USE_DECNET_SYNTAX_', `1')dnl support DECnet ==== //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/arp/arp.8#2 (text+ko) ==== @@ -26,9 +26,9 @@ .\" SUCH DAMAGE. .\" .\" @(#)arp.8 8.1 (Berkeley) 6/6/93 -.\" $FreeBSD: src/usr.sbin/arp/arp.8,v 1.24 2006/01/10 05:17:16 brooks Exp $ +.\" $FreeBSD: src/usr.sbin/arp/arp.8,v 1.25 2006/08/17 07:14:01 yar Exp $ .\" -.Dd June 6, 1993 +.Dd August 17, 2006 .Dt ARP 8 .Os .Sh NAME @@ -103,7 +103,8 @@ .Tn ARP entries on .Ar interface . -Applicable to the display operations only. +Applicable only to the following operations: +display one, display all, delete all. .It Fl n Show network addresses as numbers (normally .Nm ==== //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/newsyslog/newsyslog.c#2 (text+ko) ==== @@ -54,7 +54,7 @@ */ #include -__FBSDID("$FreeBSD: src/usr.sbin/newsyslog/newsyslog.c,v 1.106 2006/07/21 22:13:06 sobomax Exp $"); +__FBSDID("$FreeBSD: src/usr.sbin/newsyslog/newsyslog.c,v 1.107 2006/08/17 18:15:43 delphij Exp $"); #define OSF #ifndef COMPRESS_POSTFIX @@ -890,7 +890,8 @@ static void expand_globs(struct conf_entry **work_p, struct conf_entry **glob_p) { - int gmatch, gres, i; + int gmatch, gres; + size_t i; char *mfname; struct conf_entry *dupent, *ent, *firstmatch, *globent; struct conf_entry *lastmatch; ==== //depot/projects/soc2006/nss_ldap_cached_openldap/src/usr.sbin/rpc.lockd/kern.c#3 (text+ko) ==== @@ -29,7 +29,7 @@ */ #include -__FBSDID("$FreeBSD: src/usr.sbin/rpc.lockd/kern.c,v 1.20 2006/08/16 18:33:35 thomas Exp $"); +__FBSDID("$FreeBSD: src/usr.sbin/rpc.lockd/kern.c,v 1.21 2006/08/17 05:55:20 maxim Exp $"); #include #include @@ -147,10 +147,10 @@ case -1: err(1, "fork"); case 0: - setproctitle ("client"); + setproctitle("client"); break; default: - setproctitle ("server"); + setproctitle("server"); return (child); } From owner-p4-projects@FreeBSD.ORG Thu Aug 17 19:48:13 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DFF1616A4E2; Thu, 17 Aug 2006 19:48:12 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 7104A16A4DD for ; Thu, 17 Aug 2006 19:48:12 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 377AC43D49 for ; Thu, 17 Aug 2006 19:48:12 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7HJmCIu079496 for ; Thu, 17 Aug 2006 19:48:12 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7HJmBwq079493 for perforce@freebsd.org; Thu, 17 Aug 2006 19:48:11 GMT (envelope-from jhb@freebsd.org) Date: Thu, 17 Aug 2006 19:48:11 GMT Message-Id: <200608171948.k7HJmBwq079493@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Cc: Subject: PERFORCE change 104432 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 17 Aug 2006 19:48:13 -0000 http://perforce.freebsd.org/chv.cgi?CH=104432 Change 104432 by jhb@jhb_mutex on 2006/08/17 19:47:48 During a LK_DRAIN, lockmgr() sleeps on &lkp->lk_flags rather than lkp, so add a check for that case. Affected files ... .. //depot/projects/smpng/sys/kern/kern_lock.c#55 edit Differences ... ==== //depot/projects/smpng/sys/kern/kern_lock.c#55 (text+ko) ==== @@ -602,9 +602,22 @@ lkp = td->td_wchan; /* Simple test to see if wchan points to a lockmgr lock. */ - if (lkp->lk_wmesg != td->td_wmesg) - return (0); + if (lkp->lk_wmesg == td->td_wmesg) + goto ok; + + /* + * If this thread is doing a DRAIN, then it would be asleep on + * &lkp->lk_flags rather than lkp. + */ + lkp = (struct lock *)((char *)td->td_wchan - + offsetof(struct lock, lk_flags)); + if (lkp->lk_wmesg == td->td_wmesg && (lkp->lk_flags & LK_WAITDRAIN)) + goto ok; + + /* Doen't seem to be a lockmgr lock. */ + return (0); +ok: /* Ok, we think we have a lockmgr lock, so output some details. */ db_printf("blocked on lk \"%s\" ", lkp->lk_wmesg); if (lkp->lk_sharecount) { From owner-p4-projects@FreeBSD.ORG Thu Aug 17 20:55:39 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A94A516A4E5; Thu, 17 Aug 2006 20:55:39 +0000 (UTC) X-Original-To: perforce@FreeBSD.org 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 8219316A4E0 for ; Thu, 17 Aug 2006 20:55:39 +0000 (UTC) (envelope-from cdjones@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4F61443D46 for ; Thu, 17 Aug 2006 20:55:39 +0000 (GMT) (envelope-from cdjones@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7HKtdPH092159 for ; Thu, 17 Aug 2006 20:55:39 GMT (envelope-from cdjones@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7HKtdCq092156 for perforce@freebsd.org; Thu, 17 Aug 2006 20:55:39 GMT (envelope-from cdjones@FreeBSD.org) Date: Thu, 17 Aug 2006 20:55:39 GMT Message-Id: <200608172055.k7HKtdCq092156@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to cdjones@FreeBSD.org using -f From: Chris Jones To: Perforce Change Reviews Cc: Subject: PERFORCE change 104436 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 17 Aug 2006 20:55:40 -0000 http://perforce.freebsd.org/chv.cgi?CH=104436 Change 104436 by cdjones@cdjones_meanook on 2006/08/17 20:55:33 Fix kernel panics by being more paranoid about KSEs having credentials. Affected files ... .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/sched_hier.c#16 edit Differences ... ==== //depot/projects/soc2006/cdjones_jail/src/sys/kern/sched_hier.c#16 (text+ko) ==== @@ -550,7 +550,8 @@ continue; kg->kg_estcpu = decay_cpu(loadfac, kg->kg_estcpu); total_est_cpu += kg->kg_estcpu; - if (kg->kg_proc->p_ucred->cr_prison) + if (NULL != kg->kg_proc->p_ucred && + NULL != kg->kg_proc->p_ucred->cr_prison) kg->kg_proc->p_ucred->cr_prison->pr_estcpu += kg->kg_estcpu; resetpriority(kg); @@ -641,7 +642,9 @@ resetpriority(struct ksegrp *kg) { register unsigned int newpriority; - struct prison *pr = kg->kg_proc->p_ucred->cr_prison; + struct prison *pr = NULL; + if (NULL != kg->kg_proc->p_ucred) + pr = kg->kg_proc->p_ucred->cr_prison; if (kg->kg_pri_class == PRI_TIMESHARE) { newpriority = PUSER + kg->kg_estcpu / INVERSE_ESTCPU_WEIGHT + From owner-p4-projects@FreeBSD.ORG Thu Aug 17 21:35:36 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6FC1F16A4DF; Thu, 17 Aug 2006 21:35:36 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 27DE216A4DA for ; Thu, 17 Aug 2006 21:35:36 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id CA63C43D45 for ; Thu, 17 Aug 2006 21:35:35 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7HLZUWi096139 for ; Thu, 17 Aug 2006 21:35:30 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7HLZUTw096136 for perforce@freebsd.org; Thu, 17 Aug 2006 21:35:30 GMT (envelope-from jb@freebsd.org) Date: Thu, 17 Aug 2006 21:35:30 GMT Message-Id: <200608172135.k7HLZUTw096136@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 104441 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 17 Aug 2006 21:35:36 -0000 http://perforce.freebsd.org/chv.cgi?CH=104441 Change 104441 by jb@jb_freebsd2 on 2006/08/17 21:34:37 IFlibbsdelf Affected files ... .. //depot/projects/dtrace/src/lib/libelf/_libelf.h#6 integrate .. //depot/projects/dtrace/src/lib/libelf/elf_errmsg.c#5 integrate .. //depot/projects/dtrace/src/lib/libelf/gelf_getehdr.3#3 integrate .. //depot/projects/dtrace/src/lib/libelf/gelf_newehdr.3#3 integrate .. //depot/projects/dtrace/src/lib/libelf/libelf_convert.m4#7 integrate .. //depot/projects/dtrace/src/lib/libelf/libelf_ehdr.c#3 integrate Differences ... ==== //depot/projects/dtrace/src/lib/libelf/_libelf.h#6 (text+ko) ==== @@ -107,8 +107,8 @@ Elf64_Phdr *e_phdr64; } e_phdr; union { - Elf32_Shdr *e_shdr32; - Elf64_Shdr *e_shdr64; + Elf32_Phdr *e_shdr32; + Elf64_Phdr *e_shdr64; } e_shdr; } e_elf; } e_u; ==== //depot/projects/dtrace/src/lib/libelf/elf_errmsg.c#5 (text+ko) ==== @@ -50,7 +50,8 @@ DEFINE_ERROR(STAT, "Cannot determine file parameters"), DEFINE_ERROR(TRUNCATE, "File truncation failed"), DEFINE_ERROR(UNIMPL, "Feature is unimplemented"), - DEFINE_ERROR(VERSION, "Unknown API version") + DEFINE_ERROR(VERSION, "Unknown API version"), + DEFINE_ERROR(NUM, "Unknown error") #undef DEFINE_ERROR }; ==== //depot/projects/dtrace/src/lib/libelf/gelf_getehdr.3#3 (text+ko) ==== @@ -99,6 +99,10 @@ does not have an associated header. .It Bq Er ELF_E_RESOURCE An out of memory condition was detected during execution. +.It Bq Er ELF_E_VERSION +The ELF descriptor +.Ar elf +had an unsupported ELF version number. .El .Sh SEE ALSO .Xr elf 3 , ==== //depot/projects/dtrace/src/lib/libelf/gelf_newehdr.3#3 (text+ko) ==== @@ -151,6 +151,10 @@ A malformed ELF header was detected. .It Bq Er ELF_E_RESOURCE An out of memory condition was detected during execution. +.It Bq Er ELF_E_VERSION +The ELF descriptor +.Ar elf +had an unsupported ELF version number. .El .Sh SEE ALSO .Xr elf 3 , ==== //depot/projects/dtrace/src/lib/libelf/libelf_convert.m4#7 (text+ko) ==== @@ -129,7 +129,9 @@ #define WRITE_XWORD(P,X) WRITE_WORD64(P,X) #define WRITE_IDENT(P,X) do { \ (void) memcpy((P), (X), sizeof((X))); \ + (P) = (P) + EI_NIDENT; \ } while (0) + /* * Read in various integral values. The source pointer could be * unaligned. Values are read in in native byte order. The source @@ -189,7 +191,7 @@ #define READ_XWORD(P,X) READ_WORD64(P,X) #define READ_IDENT(P,X) do { \ (void) memcpy((X), (P), sizeof((X))); \ - (P) = (P) + sizeof((X)); \ + (P) = (P) + EI_NIDENT; \ } while (0) divert(-1) ==== //depot/projects/dtrace/src/lib/libelf/libelf_ehdr.c#3 (text+ko) ==== @@ -66,6 +66,11 @@ return (NULL); } + if (e->e_version != EV_CURRENT) { + LIBELF_SET_ERROR(VERSION, 0); + return (NULL); + } + if (e->e_class == ELFCLASSNONE) e->e_class = ec; From owner-p4-projects@FreeBSD.ORG Thu Aug 17 22:35:46 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9515016A4E5; Thu, 17 Aug 2006 22:35:46 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 57ACE16A4E1 for ; Thu, 17 Aug 2006 22:35:46 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1308943D53 for ; Thu, 17 Aug 2006 22:35:46 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7HMZj41000754 for ; Thu, 17 Aug 2006 22:35:45 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7HMZjXN000751 for perforce@freebsd.org; Thu, 17 Aug 2006 22:35:45 GMT (envelope-from jb@freebsd.org) Date: Thu, 17 Aug 2006 22:35:45 GMT Message-Id: <200608172235.k7HMZjXN000751@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 104444 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 17 Aug 2006 22:35:46 -0000 http://perforce.freebsd.org/chv.cgi?CH=104444 Change 104444 by jb@jb_zoo on 2006/08/17 22:35:38 Add support for amd64. Affected files ... .. //depot/projects/dtrace/src/cddl/lib/libdtrace/Makefile#12 edit Differences ... ==== //depot/projects/dtrace/src/cddl/lib/libdtrace/Makefile#12 (text+ko) ==== @@ -66,7 +66,7 @@ #CFLAGS+= -DYYDEBUG -.if ${MACHINE_ARCH} == "i386" +.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "amd64" CFLAGS+= -I${OPENSOLARIS_SYS_DISTDIR}/uts/intel .elif ${MACHINE_ARCH} == "sparc64" CFLAGS+= -I${OPENSOLARIS_SYS_DISTDIR}/uts/sparc From owner-p4-projects@FreeBSD.ORG Thu Aug 17 22:39:52 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EB3F616A4E0; Thu, 17 Aug 2006 22:39:51 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 C85D716A4DA for ; Thu, 17 Aug 2006 22:39:51 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8472943D46 for ; Thu, 17 Aug 2006 22:39:51 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7HMdpu5000915 for ; Thu, 17 Aug 2006 22:39:51 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7HMdpna000912 for perforce@freebsd.org; Thu, 17 Aug 2006 22:39:51 GMT (envelope-from jb@freebsd.org) Date: Thu, 17 Aug 2006 22:39:51 GMT Message-Id: <200608172239.k7HMdpna000912@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 104445 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 17 Aug 2006 22:39:52 -0000 http://perforce.freebsd.org/chv.cgi?CH=104445 Change 104445 by jb@jb_zoo on 2006/08/17 22:39:06 Add kernel DTrace support by default. Affected files ... .. //depot/projects/dtrace/src/sys/amd64/conf/GENERIC#11 edit Differences ... ==== //depot/projects/dtrace/src/sys/amd64/conf/GENERIC#11 (text+ko) ==== @@ -68,6 +68,8 @@ options WITNESS # Enable checks to detect deadlocks and cycles options WITNESS_SKIPSPIN # Don't run witness on spinlocks for speed +options KDTRACE # Kernel DTrace support + # Make an SMP-capable kernel by default options SMP # Symmetric MultiProcessor Kernel From owner-p4-projects@FreeBSD.ORG Fri Aug 18 00:12:56 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A7C3416A4E6; Fri, 18 Aug 2006 00:12:56 +0000 (UTC) X-Original-To: perforce@FreeBSD.org 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 6E0C816A4DE for ; Fri, 18 Aug 2006 00:12:56 +0000 (UTC) (envelope-from adamartin@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2382343D46 for ; Fri, 18 Aug 2006 00:12:56 +0000 (GMT) (envelope-from adamartin@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7I0CuSu012057 for ; Fri, 18 Aug 2006 00:12:56 GMT (envelope-from adamartin@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7I0Ctkn012054 for perforce@freebsd.org; Fri, 18 Aug 2006 00:12:55 GMT (envelope-from adamartin@FreeBSD.org) Date: Fri, 18 Aug 2006 00:12:55 GMT Message-Id: <200608180012.k7I0Ctkn012054@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to adamartin@FreeBSD.org using -f From: Adam Martin To: Perforce Change Reviews Cc: Subject: PERFORCE change 104455 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 18 Aug 2006 00:12:56 -0000 http://perforce.freebsd.org/chv.cgi?CH=104455 Change 104455 by adamartin@adamartin_hobbes on 2006/08/18 00:12:18 Moved to Pseudofs for basis of autofs core. Autofs_ctl device has ioctl implemented partially for creation of new autofs devices. Affected files ... .. //depot/projects/soc2006/adamartin_autofs/autofs/Makefile#3 edit .. //depot/projects/soc2006/adamartin_autofs/autofs/autofs.c#3 edit .. //depot/projects/soc2006/adamartin_autofs/autofs/autofs.h#3 edit .. //depot/projects/soc2006/adamartin_autofs/autofs/autofs_ctl.c#2 edit .. //depot/projects/soc2006/adamartin_autofs/autofs/autofs_pfsops.c#1 add .. //depot/projects/soc2006/adamartin_autofs/autofs/autofs_vfsops.c#3 edit .. //depot/projects/soc2006/adamartin_autofs/autofs/cleanup.h#3 edit .. //depot/projects/soc2006/adamartin_autofs/autofs/protocol.c#2 edit .. //depot/projects/soc2006/adamartin_autofs/autofs/protocol.h#2 edit Differences ... ==== //depot/projects/soc2006/adamartin_autofs/autofs/Makefile#3 (text+ko) ==== @@ -27,7 +27,7 @@ AUTOFS_DEV_SOURCE=autofs_ctl.c autofs_dev.c -AUTOFS_FS_SOURCE=autofs_vnops.c autofs_vfsops.c vnode_if.h +AUTOFS_FS_SOURCE=autofs_pfsops.c vnode_if.h AUTOFS_CORE_SOURCE=autofs.c protocol.c SRCS=$(AUTOFS_CORE_SOURCE) $(AUTOFS_FS_SOURCE) $(AUTOFS_DEV_SOURCE) HEADERS=autofs.h cleanup.h protocol.h ==== //depot/projects/soc2006/adamartin_autofs/autofs/autofs.c#3 (text+ko) ==== @@ -29,7 +29,6 @@ -#include #include #include @@ -48,23 +47,17 @@ #include -#define AUTOFS_CTL_DEV_NAME "autofs_ctl" +#include "autofs.h" +#include "autofs_ctl.h" + + -static struct cdevsw autofs_ctl_devops = { - .d_version= D_VERSION, - .d_open= NULL, - .d_close= NULL, - .d_read= NULL, - .d_write= NULL, - .d_name= AUTOFS_CTL_DEV_NAME, -}; /** There's no more block devices, so all are cdevs, as c represents char in cdev **/ -static struct cdev *autofs_ctl_dev; @@ -72,17 +65,21 @@ autofs_handle_loader( struct module *mod, int action, void *args ) { int err= 0; - switch( action ) - { + switch (action) { case MOD_LOAD: - KPRINTF( "Now loading AutoFS module: \n" ); - autofs_ctl_dev= make_dev( &autofs_ctl_devops, + KPRINTF("Now loading AutoFS module: \n"); + autofs_ctl_dev = make_dev(&autofs_ctl_devops, 00, UID_ROOT, GID_WHEEL, 0600, - AUTOFS_CTL_DEV_NAME ); - KPRINTF( "AutoFS module successfully loaded.\n" ); + AUTOFS_CTL_DEV_NAME); + DEBUG KPRINTF("."); + autofs_ctl_state = (struct autofs_ctl_state) + malloc( + sizeof(struct autofs_ctl_state), + M_AUTOFS_CTL_NODES, M_WAITOK); + KPRINTF("AutoFS module successfully loaded.\n"); break; case MOD_QUIESCE: @@ -96,6 +93,7 @@ case MOD_UNLOAD: destroy_dev( autofs_ctl_dev ); + free(autofs_ctl_state, M_AUTOFS_CTL_NODES); KPRINTF( "AutoFS unloaded.\n" ); break; @@ -112,6 +110,9 @@ } + +int vn_iscdev(struct vnode *vp, int *errp); + int vn_iscdev(struct vnode *vp, int *errp) { ==== //depot/projects/soc2006/adamartin_autofs/autofs/autofs.h#3 (text+ko) ==== @@ -31,6 +31,9 @@ #define __AUTOFS_MAIN_HEADER__ +#define AUTOFS_VERSION ( 1 ) + + //#define USE_SETJMP_CLEANUP //#define NO_USE_SETJMP_INCLUDE //#define NO_CLEANUP_WARNING @@ -50,7 +53,7 @@ #define DEBUG_L( level ) if( DEBUG_LEVEL >= level ) -#define DEBUG DEBUG8 +#define DEBUG DEBUG5 #define DEBUG1 DEBUG_L( 1 ) #define DEBUG2 DEBUG_L( 2 ) @@ -63,38 +66,16 @@ -#define STOR_NAME_MAX 64 - #define MNT_TARGET ( "fspath" ) #define MNT_DEVICE ( "from" ) -typedef struct _autofs_storage_unit { - char name [ STOR_NAME_MAX ]; - struct _autofs_storage_unit *next; -} autofs_storage_unit; - - -struct autofs_mount { - struct autofs_ctrl *ctrl; - autofs_storage_unit contents; - struct vnode *afsm_devvp; - struct cdev *ctrl_dev; -}; - #define entity( member, value )\ .member = value -#define VFSTOAUTOFS(mp) ((struct autofs_mount *)((mp)->mnt_data)) - - -int vn_iscdev( struct vnode *vp, int *errp ); - -//extern struct vop_vector autofs_vnodeops; - #endif /*** __AUTOFS_MAIN_HEADER__ ***/ ==== //depot/projects/soc2006/adamartin_autofs/autofs/autofs_ctl.c#2 (text+ko) ==== @@ -27,4 +27,82 @@ * */ +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include +#include + + +#include "autofs.h" +#include "autofs_ctl.h" +#include "cleanup.h" + +struct cdev *autofs_ctl_dev; + +static d_ioctl_t autofs_ctl_ioctl; + +struct cdevsw autofs_ctl_devops = { + .d_version= D_VERSION, + .d_open= NULL, + .d_close= NULL, + .d_read= NULL, + .d_write= NULL, + .d_name= AUTOFS_CTL_DEV_NAME, + .d_ioctl= autofs_ctl_ioctl, +}; + + + +struct autofs_ctl_state autofs_ctl_state; +/* + * We only handle the IOCTLS for create and destroy autofs_dev instances. + * Autofs devs are addressed by number. Creation always assigns a new, + * per-mount unique number. (This number can be recycled, if it's freed + * by delete.) + * + * Autofs_ctl will return the assigned number, via the ioctl arg 1 + * value, unless an error occurs. + */ + + +static int +autofs_ctl_ioctl(struct cdev *i_dev, u_long cmd, caddr_t arg_c, int mode, + struct thread *td) +{ + $cleanup_init_size( 8 ); + int error= 0; + int *arg= (int *) arg_c; + + switch( cmd ) { + case AFSIOCREATDEV: + mtx_lock(&autofs_ctl_state.lock); + $cleanup( + mtx_unlock(&autofs_ctl_state.lock); + ) + + arg= autofs_ctl_state.next_assignable_node++; + error= create_autofs_node(arg); + + $do_cleanup; + + break; + + default: + /* NOTREACHED */ + + /* + * In theory, but could be reached when someone sends + * a bad IOCTL code... + */ + error= EIO; + +} ==== //depot/projects/soc2006/adamartin_autofs/autofs/autofs_vfsops.c#3 (text+ko) ==== @@ -54,7 +54,15 @@ #include "cleanup.h" +static vfs_mount_t autofs_mount; +static vfs_root_t autofs_root; +static vfs_unmount_t autofs_unmount; +static struct vfsops autofs_vfsops = { + entity(vfs_mount, autofs_mount), + entity(vfs_unmount, autofs_unmount), + entity(vfs_root, autofs_root), +}; MALLOC_DEFINE(M_AUTOFS_MOUNTBUF, "AutoFS mntbuf", "AutoFS mountpoint data, to simulate filesystem contents."); @@ -68,6 +76,8 @@ struct vnode *devvp; struct autofs_mount *a_mnt; + struct vnode *root_vp; + struct nameidata ndp; /* Mount point path and length */ @@ -139,12 +149,17 @@ vfs_mountedfrom(mp, "autofs"); DEBUG KPRINTF("Done\n"); + DEBUG KPRINTF("Setting up root vnode pointer..."); + error = autofs_allocvp( + //DEBUG $return (EOPNOTSUPP); $cleanup( DEBUG KPRINTF("Mount done -- error = %d...\n", error); ); + + DEBUG KPRINTF("Leaving mount, invoking cleanups -- error = %d...\n", error); $return (error); @@ -170,9 +185,16 @@ $return (error); } -static struct vfsops autofs_vfsops = { - entity(vfs_mount, autofs_mount), - entity(vfs_unmount, autofs_unmount), -}; +static int +autofs_root(struct mount *mp, int flags, struct vnode **vpp, struct thread *td) +{ + struct vnode *vp; + vp= VFSTOAUTOFS(mp)->root_vnode; + VREF(vp); + vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, td); + + *vpp= vp; + return 0; +} VFS_SET(autofs_vfsops, autofs, 0); ==== //depot/projects/soc2006/adamartin_autofs/autofs/cleanup.h#3 (text+ko) ==== @@ -198,6 +198,8 @@ #define $cleanup_init_size( a ) CLEANUP_STACK_SIZE( a ) #define $cleanup( a ) REGISTER_ACTION( a ) +#define $do_cleanup CLEANUP_RESOURCES + #define $return leave #define $cleanup_local GET_LOCAL() ==== //depot/projects/soc2006/adamartin_autofs/autofs/protocol.c#2 (text+ko) ==== @@ -26,3 +26,5 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * */ + +#include "protocol.h" ==== //depot/projects/soc2006/adamartin_autofs/autofs/protocol.h#2 (text+ko) ==== @@ -25,9 +25,13 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - */#ifndef AUTOFS_PROTOCOL_HEADER + */ + +#ifndef AUTOFS_PROTOCOL_HEADER #define AUTOFS_PROTOCOL_HEADER +#include + /* * The protocol between AutoFS and Automounter consists of these data types, * strung together, as explained below. @@ -45,7 +49,7 @@ the message pertains to. */ uint32_t message_type; /* Used to identify which command is issued in this packet. COMMAND_* constants are used to fill these */ - void message_data[]; /* The rest of the message data, as an + char message_data[]; /* The rest of the message data, as an indeterminate length. */ }; @@ -213,7 +217,7 @@ struct modify_mounts_acknowledge { uint32_t n_mounts; /* Number of entries that are in response */ - struct managed_mounts mounts[]; /* The mount entries, and correspondant + struct managed_mount mounts[]; /* The mount entries, and correspondant status of action */ }; From owner-p4-projects@FreeBSD.ORG Fri Aug 18 07:20:52 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D79FE16A4DE; Fri, 18 Aug 2006 07:20:51 +0000 (UTC) X-Original-To: perforce@FreeBSD.org 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 98DCB16A4DA for ; Fri, 18 Aug 2006 07:20:51 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 62D4B43D4C for ; Fri, 18 Aug 2006 07:20:51 +0000 (GMT) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7I7Kpoj059011 for ; Fri, 18 Aug 2006 07:20:51 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7I7Kpuc059007 for perforce@freebsd.org; Fri, 18 Aug 2006 07:20:51 GMT (envelope-from rdivacky@FreeBSD.org) Date: Fri, 18 Aug 2006 07:20:51 GMT Message-Id: <200608180720.k7I7Kpuc059007@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rdivacky@FreeBSD.org using -f From: Roman Divacky To: Perforce Change Reviews Cc: Subject: PERFORCE change 104458 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 18 Aug 2006 07:20:52 -0000 http://perforce.freebsd.org/chv.cgi?CH=104458 Change 104458 by rdivacky@rdivacky_witten on 2006/08/18 07:20:27 Dont wake with 0 retries, linux uses very strange code here which confused me use very_big_number (tm). Affected files ... .. //depot/projects/soc2006/rdivacky_linuxolator/compat/linux/linux_futex.c#29 edit Differences ... ==== //depot/projects/soc2006/rdivacky_linuxolator/compat/linux/linux_futex.c#29 (text+ko) ==== @@ -304,8 +304,8 @@ if (op_ret > 0) { printf("second wakeup\n"); op_ret = 0; - /* Linux always puts there 0 retries */ - op_ret += futex_wake(f2, 0, NULL); + /* Linux always puts there struct timespec *utime :) */ + op_ret += futex_wake(f2, 0x7fffffff, NULL); ret += op_ret; } futex_put(f2); From owner-p4-projects@FreeBSD.ORG Fri Aug 18 07:26:00 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BCD2716A56C; Fri, 18 Aug 2006 07:26:00 +0000 (UTC) X-Original-To: perforce@FreeBSD.org 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 956A116A52D for ; Fri, 18 Aug 2006 07:26:00 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 14D9443D8C for ; Fri, 18 Aug 2006 07:25:59 +0000 (GMT) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7I7Pwh3059289 for ; Fri, 18 Aug 2006 07:25:58 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7I7PvZB059286 for perforce@freebsd.org; Fri, 18 Aug 2006 07:25:57 GMT (envelope-from rdivacky@FreeBSD.org) Date: Fri, 18 Aug 2006 07:25:57 GMT Message-Id: <200608180725.k7I7PvZB059286@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rdivacky@FreeBSD.org using -f From: Roman Divacky To: Perforce Change Reviews Cc: Subject: PERFORCE change 104459 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 18 Aug 2006 07:26:01 -0000 http://perforce.freebsd.org/chv.cgi?CH=104459 Change 104459 by rdivacky@rdivacky_witten on 2006/08/18 07:25:26 IFC Affected files ... .. //depot/projects/soc2006/rdivacky_linuxolator/amd64/amd64/support.S#3 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/amd64/linux32/linux32_sysvec.c#11 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/boot/arm/at91/boot0iic/Makefile#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/boot/arm/at91/boot0iic/doit.c#2 delete .. //depot/projects/soc2006/rdivacky_linuxolator/boot/arm/at91/boot0iic/main.c#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/boot/arm/at91/boot0spi/Makefile#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/boot/arm/at91/boot0spi/doit.c#2 delete .. //depot/projects/soc2006/rdivacky_linuxolator/boot/arm/at91/boot0spi/main.c#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/boot/arm/at91/bootiic/loader_prompt.c#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/boot/arm/at91/bootspi/Makefile#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/boot/arm/at91/bootspi/arm_init.S#1 branch .. //depot/projects/soc2006/rdivacky_linuxolator/boot/arm/at91/bootspi/arm_init.s#2 delete .. //depot/projects/soc2006/rdivacky_linuxolator/boot/arm/at91/bootspi/env_vars.c#1 branch .. //depot/projects/soc2006/rdivacky_linuxolator/boot/arm/at91/bootspi/env_vars.h#1 branch .. //depot/projects/soc2006/rdivacky_linuxolator/boot/arm/at91/bootspi/loader_prompt.c#1 branch .. //depot/projects/soc2006/rdivacky_linuxolator/boot/arm/at91/bootspi/loader_prompt.h#1 branch .. //depot/projects/soc2006/rdivacky_linuxolator/boot/arm/at91/bootspi/main.c#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/boot/arm/at91/libat91/Makefile#3 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/boot/arm/at91/libat91/delay.c#1 branch .. //depot/projects/soc2006/rdivacky_linuxolator/boot/arm/at91/libat91/emac.c#3 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/boot/arm/at91/libat91/emac.h#3 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/boot/arm/at91/libat91/emac_init.c#1 branch .. //depot/projects/soc2006/rdivacky_linuxolator/boot/arm/at91/libat91/lib_AT91RM9200.h#1 branch .. //depot/projects/soc2006/rdivacky_linuxolator/boot/arm/at91/libat91/mci_device.c#1 branch .. //depot/projects/soc2006/rdivacky_linuxolator/boot/arm/at91/libat91/mci_device.h#1 branch .. //depot/projects/soc2006/rdivacky_linuxolator/boot/arm/at91/libat91/reset.c#1 branch .. //depot/projects/soc2006/rdivacky_linuxolator/boot/arm/at91/libat91/sd-card.c#1 branch .. //depot/projects/soc2006/rdivacky_linuxolator/boot/arm/at91/libat91/sd-card.h#1 branch .. //depot/projects/soc2006/rdivacky_linuxolator/compat/freebsd32/freebsd32.h#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/compat/freebsd32/syscalls.master#6 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/compat/linux/linux_misc.c#23 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/compat/linux/linux_signal.c#9 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/compat/ndis/ntoskrnl_var.h#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/conf/NOTES#7 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/conf/options#8 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/dev/arl/if_arlreg.h#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/dev/ata/ata-chipset.c#8 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/dev/ath/if_athvar.h#4 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/dev/bge/if_bge.c#5 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/dev/em/if_em.c#8 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/dev/ips/ips.h#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/dev/usb/usb_port.h#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/fs/msdosfs/denode.h#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/geom/vinum/geom_vinum_raid5.h#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/i386/linux/linux_machdep.c#54 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/i386/linux/linux_sysvec.c#19 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/kern/syscalls.master#6 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/net/if_bridge.c#6 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/netinet/ip_fastfwd.c#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/netinet/ip_fw.h#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/netinet/ip_fw2.c#6 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/netinet/ip_input.c#2 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/netinet/ip_output.c#3 integrate .. //depot/projects/soc2006/rdivacky_linuxolator/nfsclient/nfs_lock.c#2 integrate Differences ... ==== //depot/projects/soc2006/rdivacky_linuxolator/amd64/amd64/support.S#3 (text+ko) ==== @@ -27,7 +27,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/amd64/support.S,v 1.118 2006/08/15 22:43:02 davidxu Exp $ + * $FreeBSD: src/sys/amd64/amd64/support.S,v 1.119 2006/08/16 22:22:28 davidxu Exp $ */ #include "opt_ddb.h" @@ -432,7 +432,7 @@ ja fusufault movq %rsi,(%rdi) - xorq %rax,%rax + xorl %eax,%eax movq PCPU(CURPCB),%rcx movq %rax,PCB_ONFAULT(%rcx) ret ==== //depot/projects/soc2006/rdivacky_linuxolator/amd64/linux32/linux32_sysvec.c#11 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_sysvec.c,v 1.21 2006/08/15 14:58:15 netchild Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_sysvec.c,v 1.23 2006/08/17 21:06:48 netchild Exp $"); #include "opt_compat.h" #ifndef COMPAT_IA32 ==== //depot/projects/soc2006/rdivacky_linuxolator/boot/arm/at91/boot0iic/Makefile#2 (text) ==== @@ -1,10 +1,10 @@ -# $FreeBSD: src/sys/boot/arm/at91/boot0iic/Makefile,v 1.1 2006/04/21 06:48:52 imp Exp $ +# $FreeBSD: src/sys/boot/arm/at91/boot0iic/Makefile,v 1.2 2006/08/16 23:14:52 imp Exp $ .PATH: ${.CURDIR}/../boot0 P=boot0iic FILES=${P} -SRCS=arm_init.s main.c doit.c +SRCS=arm_init.s main.c NO_MAN= LDFLAGS=-e 0 -T ${.CURDIR}/../linker.cfg OBJS+= ${SRCS:N*.h:R:S/$/.o/g} ==== //depot/projects/soc2006/rdivacky_linuxolator/boot/arm/at91/boot0iic/main.c#2 (text) ==== @@ -21,15 +21,13 @@ * (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/boot/arm/at91/boot0iic/main.c,v 1.1 2006/04/21 06:48:52 imp Exp $ + * $FreeBSD: src/sys/boot/arm/at91/boot0iic/main.c,v 1.2 2006/08/16 23:14:52 imp Exp $ */ #include "at91rm9200.h" #include "lib.h" #include "at91rm9200_lowlevel.h" -extern void doit(void *); - int main(void) { @@ -37,6 +35,9 @@ while (xmodem_rx(addr) == -1) continue; - doit(addr); + InitEEPROM(); + printf("Writing EEPROM from 0x%x to addr 0\r\n", addr); + WriteEEPROM(0, addr, 8192); + printf("Write complete. Press reset\r\n"); return (1); } ==== //depot/projects/soc2006/rdivacky_linuxolator/boot/arm/at91/boot0spi/Makefile#2 (text) ==== @@ -1,10 +1,10 @@ -# $FreeBSD: src/sys/boot/arm/at91/boot0spi/Makefile,v 1.1 2006/04/21 06:51:08 imp Exp $ +# $FreeBSD: src/sys/boot/arm/at91/boot0spi/Makefile,v 1.2 2006/08/16 23:18:07 imp Exp $ .PATH: ${.CURDIR}/../boot0 P=boot0spi FILES=${P} -SRCS=arm_init.s main.c doit.c +SRCS=arm_init.s main.c NO_MAN= LDFLAGS=-e 0 -T ${.CURDIR}/../linker.cfg OBJS+= ${SRCS:N*.h:R:S/$/.o/g} ==== //depot/projects/soc2006/rdivacky_linuxolator/boot/arm/at91/boot0spi/main.c#2 (text) ==== @@ -21,22 +21,41 @@ * (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/boot/arm/at91/boot0spi/main.c,v 1.1 2006/04/21 06:51:08 imp Exp $ + * $FreeBSD: src/sys/boot/arm/at91/boot0spi/main.c,v 1.2 2006/08/16 23:18:07 imp Exp $ */ #include "at91rm9200.h" #include "lib.h" #include "at91rm9200_lowlevel.h" +#include "spi_flash.h" -extern void doit(void *); +#define OFFSET 0 int main(void) { + int len, i, j, off; char *addr = (char *)SDRAM_BASE + (1 << 20); /* Load to base + 1MB */ + char *addr2 = (char *)SDRAM_BASE + (2 << 20); /* Load to base + 2MB */ + char *addr3 = (char *)SDRAM_BASE + (3 << 20); /* Load to base + 2MB */ - while (xmodem_rx(addr) == -1) + SPI_InitFlash(); + printf("Waiting for data\r\n"); + while ((len = xmodem_rx(addr)) == -1) continue; - doit(addr); + printf("\r\nDownloaded %u bytes.\r\n", len); + p_memcpy(addr3, addr, (len + FLASH_PAGE_SIZE - 1) / FLASH_PAGE_SIZE * FLASH_PAGE_SIZE); + printf("Writing %u bytes to flash at %u\r\n", len, OFFSET); + for (i = 0; i < len; i+= FLASH_PAGE_SIZE) { + for (j = 0; j < 10; j++) { + off = i + OFFSET; + SPI_WriteFlash(off, addr + i, FLASH_PAGE_SIZE); + SPI_ReadFlash(off, addr2 + i, FLASH_PAGE_SIZE); + if (p_memcmp(addr3 + i, addr2 + i, FLASH_PAGE_SIZE) == 0) + break; + } + if (j >= 10) + printf("Bad Readback at %u\r\n", i); + } return (1); } ==== //depot/projects/soc2006/rdivacky_linuxolator/boot/arm/at91/bootiic/loader_prompt.c#2 (text+ko) ==== @@ -19,7 +19,7 @@ * only. * END_BLOCK * - * $FreeBSD: src/sys/boot/arm/at91/bootiic/loader_prompt.c,v 1.1 2006/08/10 19:55:52 imp Exp $ + * $FreeBSD: src/sys/boot/arm/at91/bootiic/loader_prompt.c,v 1.2 2006/08/16 23:39:58 imp Exp $ *****************************************************************************/ #include "at91rm9200_lowlevel.h" @@ -266,7 +266,7 @@ if (argc > 6) { for (i = 0; i < 6; i++) mac[i] = p_ASCIIToHex(argv[i + 1]); - SetMACAddress(mac); + EMAC_SetMACAddress(mac); } break; } ==== //depot/projects/soc2006/rdivacky_linuxolator/boot/arm/at91/bootspi/Makefile#2 (text) ==== @@ -1,10 +1,14 @@ -# $FreeBSD: src/sys/boot/arm/at91/bootspi/Makefile,v 1.1 2006/04/19 17:16:48 imp Exp $ +# $FreeBSD: src/sys/boot/arm/at91/bootspi/Makefile,v 1.2 2006/08/16 23:39:58 imp Exp $ P=bootspi FILES=${P} -SRCS=arm_init.s main.c +SRCS=arm_init.S main.c loader_prompt.c env_vars.c NO_MAN= LDFLAGS=-e 0 -T ${.CURDIR}/../linker.cfg OBJS+= ${SRCS:N*.h:R:S/$/.o/g} .include + +.if ${MK_FPGA} != "no" +CFLAGS += -DTSC_FPGA +.endif ==== //depot/projects/soc2006/rdivacky_linuxolator/boot/arm/at91/bootspi/main.c#2 (text) ==== @@ -1,57 +1,58 @@ -/******************************************************************************* +/*- + * Copyright (c) 2006 M. Warner Losh. All rights reserved. * - * Filename: main.c + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. * - * Basic entry points for top-level functions + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * Revision information: - * - * 20AUG2004 kb_admin initial creation - * 12JAN2005 kb_admin cosmetic changes - * 29APR2005 kb_admin modified boot delay + * This software is derived from software provided by kwikbyte without + * copyright as follows: * - * BEGIN_KBDD_BLOCK * No warranty, expressed or implied, is included with this software. It is * provided "AS IS" and no warranty of any kind including statutory or aspects * relating to merchantability or fitness for any purpose is provided. All * intellectual property rights of others is maintained with the respective * owners. This software is not copyrighted and is intended for reference * only. - * END_BLOCK * - * $FreeBSD: src/sys/boot/arm/at91/bootspi/main.c,v 1.1 2006/04/19 17:16:48 imp Exp $ - ******************************************************************************/ + * $FreeBSD: src/sys/boot/arm/at91/bootspi/main.c,v 1.2 2006/08/16 23:39:58 imp Exp $ + */ #include "env_vars.h" +#include "at91rm9200.h" #include "at91rm9200_lowlevel.h" #include "loader_prompt.h" #include "emac.h" #include "lib.h" +#include "spi_flash.h" -/* - * .KB_C_FN_DEFINITION_START - * int main(void) - * This global function waits at least one second, but not more than two - * seconds, for input from the serial port. If no response is recognized, - * it acts according to the parameters specified by the environment. For - * example, the function might boot an operating system. Do not return - * from this function. - * .KB_C_FN_DEFINITION_END - */ int main(void) { - + printf("\r\nBoot\r\n"); + SPI_InitFlash(); EMAC_Init(); - LoadBootCommands(); - - printf("\r\nSPI Boot loader.\r\nAutoboot...\r\n"); - - if (getc(1) == -1) + if (getc(1) == -1) { + start_wdog(30); ExecuteEnvironmentFunctions(); - - Bootloader(0); - + } + Bootloader(getc); return (1); } ==== //depot/projects/soc2006/rdivacky_linuxolator/boot/arm/at91/libat91/Makefile#3 (text) ==== @@ -1,11 +1,12 @@ -# $FreeBSD: src/sys/boot/arm/at91/libat91/Makefile,v 1.3 2006/08/10 18:14:35 imp Exp $ +# $FreeBSD: src/sys/boot/arm/at91/libat91/Makefile,v 1.4 2006/08/16 23:39:58 imp Exp $ .include "${.CURDIR}/../Makefile.inc" LIB= at91 INTERNALLIB= -SRCS=at91rm9200_lowlevel.c eeprom.c emac.c getc.c \ - p_string.c putchar.c printf.c spi_flash.c xmodem.c +SRCS=at91rm9200_lowlevel.c delay.c eeprom.c emac.c emac_init.c getc.c \ + p_string.c putchar.c printf.c reset.c spi_flash.c xmodem.c \ + sd-card.c mci_device.c NO_MAN= .if ${MK_TAG_LIST} != "no" ==== //depot/projects/soc2006/rdivacky_linuxolator/boot/arm/at91/libat91/emac.c#3 (text) ==== @@ -19,7 +19,7 @@ * only. * END_BLOCK * - * $FreeBSD: src/sys/boot/arm/at91/libat91/emac.c,v 1.2 2006/08/10 18:11:22 imp Exp $ + * $FreeBSD: src/sys/boot/arm/at91/libat91/emac.c,v 1.3 2006/08/16 23:39:58 imp Exp $ ******************************************************************************/ #include "at91rm9200.h" @@ -31,22 +31,14 @@ /* ********************** PRIVATE FUNCTIONS/DATA ******************************/ -static unsigned localMACSet, serverMACSet; -static unsigned char localMACAddr[6], serverMACAddr[6]; -static unsigned localMAClow, localMAChigh; -static unsigned localIPSet, serverIPSet; +static char serverMACAddr[6]; static unsigned char localIPAddr[4], serverIPAddr[4]; -static unsigned short serverPort, localPort; static int ackBlock; -static unsigned lastSize; static char *dlAddress; static unsigned transmitBuffer[1024 / sizeof(unsigned)]; static unsigned tftpSendPacket[256 / sizeof(unsigned)]; -receive_descriptor_t *p_rxBD; - - /* * .KB_C_FN_DEFINITION_START * unsigned short IP_checksum(unsigned short *p, int len) @@ -474,64 +466,8 @@ /* ************************** GLOBAL FUNCTIONS ********************************/ - /* * .KB_C_FN_DEFINITION_START - * void SetMACAddress(unsigned low_address, unsigned high_address) - * This global function sets the MAC address. low_address is the first - * four bytes while high_address is the last 2 bytes of the 48-bit value. - * .KB_C_FN_DEFINITION_END - */ -void -SetMACAddress(unsigned char mac[6]) -{ - AT91PS_PMC pPMC = AT91C_BASE_PMC; - AT91PS_EMAC pEmac = AT91C_BASE_EMAC; - - /* enable the peripheral clock before using EMAC */ - pPMC->PMC_PCER = ((unsigned) 1 << AT91C_ID_EMAC); - - p_memcpy(localMACAddr, mac, 6); - localMAClow = (mac[2] << 24) | (mac[3] << 16) | (mac[4] << 8) | mac[5]; - localMAChigh = (mac[0] << 8) | mac[1]; - localMACSet = 1; - - AT91C_BASE_PMC->PMC_PCER = 1u << AT91C_ID_EMAC; - AT91C_BASE_PIOA->PIO_ASR = - AT91C_PA14_ERXER | AT91C_PA12_ERX0 | AT91C_PA13_ERX1 | - AT91C_PA8_ETXEN | AT91C_PA16_EMDIO | AT91C_PA9_ETX0 | - AT91C_PA10_ETX1 | AT91C_PA11_ECRS_ECRSDV | AT91C_PA15_EMDC | - AT91C_PA7_ETXCK_EREFCK; - AT91C_BASE_PIOA->PIO_PDR = - AT91C_PA14_ERXER | AT91C_PA12_ERX0 | AT91C_PA13_ERX1 | - AT91C_PA8_ETXEN | AT91C_PA16_EMDIO | AT91C_PA9_ETX0 | - AT91C_PA10_ETX1 | AT91C_PA11_ECRS_ECRSDV | AT91C_PA15_EMDC | - AT91C_PA7_ETXCK_EREFCK; -#ifdef BOOT_KB9202 /* Really !RMII */ - AT91C_BASE_PIOB->PIO_BSR = - AT91C_PB12_ETX2 | AT91C_PB13_ETX3 | AT91C_PB14_ETXER | - AT91C_PB15_ERX2 | AT91C_PB16_ERX3 | AT91C_PB17_ERXDV | - AT91C_PB18_ECOL | AT91C_PB19_ERXCK; - AT91C_BASE_PIOB->PIO_PDR = - AT91C_PB12_ETX2 | AT91C_PB13_ETX3 | AT91C_PB14_ETXER | - AT91C_PB15_ERX2 | AT91C_PB16_ERX3 | AT91C_PB17_ERXDV | - AT91C_PB18_ECOL | AT91C_PB19_ERXCK; -#endif - pEmac->EMAC_CTL = 0; - - pEmac->EMAC_CFG = (pEmac->EMAC_CFG & ~(AT91C_EMAC_CLK)) | -#ifdef BOOT_TSC - AT91C_EMAC_RMII | -#endif - AT91C_EMAC_CLK_HCLK_32 | AT91C_EMAC_CAF; - // the sequence write EMAC_SA1L and write EMAC_SA1H must be respected - pEmac->EMAC_SA1L = localMAClow; - pEmac->EMAC_SA1H = localMAChigh; -} - - -/* - * .KB_C_FN_DEFINITION_START * void SetServerIPAddress(unsigned address) * This global function sets the IP of the TFTP download server. * .KB_C_FN_DEFINITION_END @@ -624,22 +560,3 @@ if (timeout == 0) printf("TFTP TIMEOUT!\r\n"); } - - -/* - * .KB_C_FN_DEFINITION_START - * void EMAC_Init(void) - * This global function initializes variables used in tftp transfers. - * .KB_C_FN_DEFINITION_END - */ -void -EMAC_Init(void) -{ - p_rxBD = (receive_descriptor_t*)RX_BUFFER_START; - localMACSet = 0; - serverMACSet = 0; - localIPSet = 0; - serverIPSet = 0; - localPort = SWAP16(0x8002); - lastSize = 0; -} ==== //depot/projects/soc2006/rdivacky_linuxolator/boot/arm/at91/libat91/emac.h#3 (text) ==== @@ -17,14 +17,14 @@ * only. * END_BLOCK * - * $FreeBSD: src/sys/boot/arm/at91/libat91/emac.h,v 1.2 2006/08/10 18:11:22 imp Exp $ + * $FreeBSD: src/sys/boot/arm/at91/libat91/emac.h,v 1.3 2006/08/16 23:39:58 imp Exp $ *****************************************************************************/ #ifndef _EMAC_H_ #define _EMAC_H_ -extern void SetMACAddress(unsigned char addr[6]); +extern void EMAC_SetMACAddress(unsigned char addr[6]); extern void SetServerIPAddress(unsigned address); extern void SetLocalIPAddress(unsigned address); extern void EMAC_Init(void); @@ -127,4 +127,12 @@ #define MII_SSTS_10HDX 0x1000 #endif +extern unsigned char localMACAddr[6]; +extern unsigned localMAClow, localMAChigh; +extern unsigned localMACSet, serverMACSet; +extern receive_descriptor_t *p_rxBD; +extern unsigned lastSize; +extern unsigned localIPSet, serverIPSet; +extern unsigned short serverPort, localPort; + #endif /* _EMAC_H_ */ ==== //depot/projects/soc2006/rdivacky_linuxolator/compat/freebsd32/freebsd32.h#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/compat/freebsd32/freebsd32.h,v 1.4 2004/04/14 23:17:37 peter Exp $ + * $FreeBSD: src/sys/compat/freebsd32/freebsd32.h,v 1.5 2006/08/17 22:50:32 imp Exp $ */ #ifndef _COMPAT_FREEBSD32_FREEBSD32_H_ @@ -45,7 +45,7 @@ #define TV_CP(src,dst,fld) do { \ CP((src).fld,(dst).fld,tv_sec); \ CP((src).fld,(dst).fld,tv_usec); \ -} while (0); +} while (0) struct timespec32 { u_int32_t tv_sec; ==== //depot/projects/soc2006/rdivacky_linuxolator/compat/freebsd32/syscalls.master#6 (text+ko) ==== @@ -1,4 +1,4 @@ - $FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.70 2006/07/28 19:05:26 jhb Exp $ + $FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.71 2006/08/16 22:32:50 peter Exp $ ; from: @(#)syscalls.master 8.2 (Berkeley) 1/13/94 ; from: src/sys/kern/syscalls.master 1.107 ; @@ -754,3 +754,5 @@ 466 AUE_NULL UNIMPL thr_setscheduler 467 AUE_NULL UNIMPL thr_getscheduler 468 AUE_NULL UNIMPL thr_setschedparam +469 AUE_NULL UNIMPL __getpath_fromfd +470 AUE_NULL UNIMPL __getpath_fromaddr ==== //depot/projects/soc2006/rdivacky_linuxolator/compat/linux/linux_misc.c#23 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/linux/linux_misc.c,v 1.182 2006/08/15 15:15:17 netchild Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/linux/linux_misc.c,v 1.184 2006/08/17 21:21:30 netchild Exp $"); #include "opt_compat.h" #include "opt_mac.h" ==== //depot/projects/soc2006/rdivacky_linuxolator/compat/linux/linux_signal.c#9 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/linux/linux_signal.c,v 1.57 2006/08/15 12:54:29 netchild Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/linux/linux_signal.c,v 1.58 2006/08/17 21:06:48 netchild Exp $"); #include #include ==== //depot/projects/soc2006/rdivacky_linuxolator/compat/ndis/ntoskrnl_var.h#2 (text+ko) ==== @@ -29,7 +29,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF * THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/compat/ndis/ntoskrnl_var.h,v 1.42 2005/11/06 19:38:33 wpaul Exp $ + * $FreeBSD: src/sys/compat/ndis/ntoskrnl_var.h,v 1.43 2006/08/17 22:50:32 imp Exp $ */ #ifndef _NTOSKRNL_VAR_H_ @@ -1257,8 +1257,7 @@ (w)->wqi_func = (func); \ (w)->wqi_ctx = (ctx); \ InitializeListHead(&((w)->wqi_entry)); \ - } while (0); \ - + } while (0) /* * FreeBSD's kernel stack is 2 pages in size by default. The ==== //depot/projects/soc2006/rdivacky_linuxolator/conf/NOTES#7 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/NOTES,v 1.1377 2006/07/29 18:38:53 marcel Exp $ +# $FreeBSD: src/sys/conf/NOTES,v 1.1378 2006/08/17 00:37:03 julian Exp $ # # NOTES -- Lines that can be cut/pasted into kernel and hints configs. # @@ -720,13 +720,10 @@ # # IPFIREWALL_FORWARD enables changing of the packet destination either # to do some sort of policy routing or transparent proxying. Used by -# ``ipfw forward''. +# ``ipfw forward''. All redirections apply to locally generated +# packets too. Because of this great care is required when +# crafting the ruleset. # -# IPFIREWALL_FORWARD_EXTENDED enables full packet destination changing -# including redirecting packets to local IP addresses and ports. All -# redirections apply to locally generated packets too. Because of this -# great care is required when crafting the ruleset. -# # IPSTEALTH enables code to support stealth forwarding (i.e., forwarding # packets without touching the ttl). This can be useful to hide firewalls # from traceroute and similar tools. @@ -742,7 +739,6 @@ options IPFIREWALL_VERBOSE_LIMIT=100 #limit verbosity options IPFIREWALL_DEFAULT_TO_ACCEPT #allow everything by default options IPFIREWALL_FORWARD #packet destination changes -options IPFIREWALL_FORWARD_EXTENDED #all packet dest changes options IPDIVERT #divert sockets options IPFILTER #ipfilter support options IPFILTER_LOG #ipfilter logging ==== //depot/projects/soc2006/rdivacky_linuxolator/conf/options#8 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/options,v 1.556 2006/08/03 05:19:33 jb Exp $ +# $FreeBSD: src/sys/conf/options,v 1.557 2006/08/17 00:37:03 julian Exp $ # # On the handling of kernel options # @@ -369,7 +369,6 @@ IPFIREWALL_VERBOSE_LIMIT opt_ipfw.h IPFIREWALL_DEFAULT_TO_ACCEPT opt_ipfw.h IPFIREWALL_FORWARD opt_ipfw.h -IPFIREWALL_FORWARD_EXTENDED opt_ipfw.h IPSTEALTH IPX IPXIP opt_ipx.h ==== //depot/projects/soc2006/rdivacky_linuxolator/dev/arl/if_arlreg.h#2 (text+ko) ==== @@ -25,7 +25,7 @@ * SUCH DAMAGE. * * $RISS: if_arl/dev/arl/if_arlreg.h,v 1.4 2004/03/16 04:43:27 count Exp $ - * $FreeBSD: src/sys/dev/arl/if_arlreg.h,v 1.6 2005/06/10 16:49:04 brooks Exp $ + * $FreeBSD: src/sys/dev/arl/if_arlreg.h,v 1.7 2006/08/17 22:50:32 imp Exp $ */ #ifndef _IF_ARLREG_H @@ -322,7 +322,7 @@ for (i = cnt; i && ar->resetFlag; i--) { \ DELAY(delay); \ } \ - } while (0); + } while (0) #ifdef _KERNEL void arl_release_resources (device_t); ==== //depot/projects/soc2006/rdivacky_linuxolator/dev/ata/ata-chipset.c#8 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/ata-chipset.c,v 1.169 2006/08/14 19:39:33 sos Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/ata-chipset.c,v 1.170 2006/08/18 00:01:29 imp Exp $"); #include "opt_ata.h" #include @@ -2533,7 +2533,7 @@ /* fill in this request */ quadp[0] = (long)ch->dma->sg_bus & 0xffffffff; - quadp[1] = (ch->dma->sg_bus & 0xffffffff00000000) >> 32; + quadp[1] = (ch->dma->sg_bus & 0xffffffff00000000ull) >> 32; wordp[4] = (request->flags & ATA_R_READ ? 0x01 : 0x00) | (tag<<1); i = 10; ==== //depot/projects/soc2006/rdivacky_linuxolator/dev/ath/if_athvar.h#4 (text+ko) ==== @@ -33,7 +33,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF * THE POSSIBILITY OF SUCH DAMAGES. * - * $FreeBSD: src/sys/dev/ath/if_athvar.h,v 1.50 2006/06/26 03:10:45 sam Exp $ + * $FreeBSD: src/sys/dev/ath/if_athvar.h,v 1.51 2006/08/17 22:50:32 imp Exp $ */ /* @@ -149,7 +149,7 @@ snprintf((_tq)->axq_name, sizeof((_tq)->axq_name), "%s_txq%u", \ device_get_nameunit((_sc)->sc_dev), (_tq)->axq_qnum); \ mtx_init(&(_tq)->axq_lock, (_tq)->axq_name, "ath_txq", MTX_DEF); \ -} while (0); +} while (0) #define ATH_TXQ_LOCK_DESTROY(_tq) mtx_destroy(&(_tq)->axq_lock) #define ATH_TXQ_LOCK(_tq) mtx_lock(&(_tq)->axq_lock) #define ATH_TXQ_UNLOCK(_tq) mtx_unlock(&(_tq)->axq_lock) ==== //depot/projects/soc2006/rdivacky_linuxolator/dev/bge/if_bge.c#5 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/bge/if_bge.c,v 1.136 2006/08/07 12:51:50 glebius Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/bge/if_bge.c,v 1.137 2006/08/17 09:53:04 glebius Exp $"); /* * Broadcom BCM570x family gigabit ethernet driver for FreeBSD. @@ -330,7 +330,7 @@ static void bge_tick(void *); static void bge_stats_update(struct bge_softc *); static void bge_stats_update_regs(struct bge_softc *); -static int bge_encap(struct bge_softc *, struct mbuf *, uint32_t *); +static int bge_encap(struct bge_softc *, struct mbuf **, uint32_t *); static void bge_intr(void *); static void bge_start_locked(struct ifnet *); @@ -2894,50 +2894,37 @@ * pointers to descriptors. */ static int -bge_encap(struct bge_softc *sc, struct mbuf *m_head, uint32_t *txidx) +bge_encap(struct bge_softc *sc, struct mbuf **m_head, uint32_t *txidx) { bus_dma_segment_t segs[BGE_NSEG_NEW]; bus_dmamap_t map; - struct bge_tx_bd *d = NULL; + struct bge_tx_bd *d; + struct mbuf *m = *m_head; struct m_tag *mtag; uint32_t idx = *txidx; - uint16_t csum_flags = 0; + uint16_t csum_flags; int nsegs, i, error; - if (m_head->m_pkthdr.csum_flags) { - if (m_head->m_pkthdr.csum_flags & CSUM_IP) - csum_flags |= BGE_TXBDFLAG_IP_CSUM; - if (m_head->m_pkthdr.csum_flags & (CSUM_TCP | CSUM_UDP)) { - csum_flags |= BGE_TXBDFLAG_TCP_UDP_CSUM; - if (m_head->m_pkthdr.len < ETHER_MIN_NOPAD && - bge_cksum_pad(m_head) != 0) - return (ENOBUFS); - } - if (m_head->m_flags & M_LASTFRAG) - csum_flags |= BGE_TXBDFLAG_IP_FRAG_END; - else if (m_head->m_flags & M_FRAG) - csum_flags |= BGE_TXBDFLAG_IP_FRAG; - } - - mtag = VLAN_OUTPUT_TAG(sc->bge_ifp, m_head); - map = sc->bge_cdata.bge_tx_dmamap[idx]; - error = bus_dmamap_load_mbuf_sg(sc->bge_cdata.bge_mtag, map, - m_head, segs, &nsegs, BUS_DMA_NOWAIT); - if (error) { - if (error == EFBIG) { - struct mbuf *m0; - - m0 = m_defrag(m_head, M_DONTWAIT); - if (m0 == NULL) - return (ENOBUFS); - m_head = m0; - error = bus_dmamap_load_mbuf_sg(sc->bge_cdata.bge_mtag, - map, m_head, segs, &nsegs, BUS_DMA_NOWAIT); + error = bus_dmamap_load_mbuf_sg(sc->bge_cdata.bge_mtag, map, m, segs, + &nsegs, BUS_DMA_NOWAIT); + if (error == EFBIG) { + m = m_defrag(m, M_DONTWAIT); + if (m == NULL) { + m_freem(*m_head); + *m_head = NULL; + return (ENOBUFS); } - if (error) + *m_head = m; + error = bus_dmamap_load_mbuf_sg(sc->bge_cdata.bge_mtag, map, m, + segs, &nsegs, BUS_DMA_NOWAIT); + if (error) { + m_freem(m); + *m_head = NULL; return (error); - } + } + } else if (error != 0) + return (error); /* * Sanity check: avoid coming within 16 descriptors @@ -2948,6 +2935,26 @@ return (ENOBUFS); } + csum_flags = 0; + if (m->m_pkthdr.csum_flags) { + if (m->m_pkthdr.csum_flags & CSUM_IP) + csum_flags |= BGE_TXBDFLAG_IP_CSUM; + if (m->m_pkthdr.csum_flags & (CSUM_TCP | CSUM_UDP)) { + csum_flags |= BGE_TXBDFLAG_TCP_UDP_CSUM; + if (m->m_pkthdr.len < ETHER_MIN_NOPAD && + (error = bge_cksum_pad(m)) != 0) { + bus_dmamap_unload(sc->bge_cdata.bge_mtag, map); + m_freem(m); + *m_head = NULL; + return (error); + } + } + if (m->m_flags & M_LASTFRAG) + csum_flags |= BGE_TXBDFLAG_IP_FRAG_END; + else if (m->m_flags & M_FRAG) + csum_flags |= BGE_TXBDFLAG_IP_FRAG; + } + bus_dmamap_sync(sc->bge_cdata.bge_mtag, map, BUS_DMASYNC_PREWRITE); for (i = 0; ; i++) { @@ -2963,9 +2970,10 @@ /* Mark the last segment as end of packet... */ d->bge_flags |= BGE_TXBDFLAG_END; + /* ... and put VLAN tag into first segment. */ d = &sc->bge_ldata.bge_tx_ring[*txidx]; - if (mtag != NULL) { + if ((mtag = VLAN_OUTPUT_TAG(sc->bge_ifp, m)) != NULL) { d->bge_flags |= BGE_TXBDFLAG_VLAN_TAG; d->bge_vlan_tag = VLAN_TAG_VALUE(mtag); } else @@ -2978,7 +2986,7 @@ */ sc->bge_cdata.bge_tx_dmamap[*txidx] = sc->bge_cdata.bge_tx_dmamap[idx]; sc->bge_cdata.bge_tx_dmamap[idx] = map; - sc->bge_cdata.bge_tx_chain[idx] = m_head; + sc->bge_cdata.bge_tx_chain[idx] = m; sc->bge_txcnt += nsegs; BGE_INC(idx, BGE_TX_RING_CNT); @@ -3039,7 +3047,9 @@ * don't have room, set the OACTIVE flag and wait * for the NIC to drain the ring. */ - if (bge_encap(sc, m_head, &prodidx)) { + if (bge_encap(sc, &m_head, &prodidx)) { + if (m_head == NULL) + break; IFQ_DRV_PREPEND(&ifp->if_snd, m_head); ifp->if_drv_flags |= IFF_DRV_OACTIVE; break; ==== //depot/projects/soc2006/rdivacky_linuxolator/dev/em/if_em.c#8 (text+ko) ==== @@ -31,7 +31,7 @@ ***************************************************************************/ -/*$FreeBSD: src/sys/dev/em/if_em.c,v 1.131 2006/08/14 09:52:35 glebius Exp $*/ +/*$FreeBSD: src/sys/dev/em/if_em.c,v 1.132 2006/08/16 23:55:34 yongari Exp $*/ #ifdef HAVE_KERNEL_OPTION_HEADERS #include "opt_device_polling.h" @@ -2865,8 +2865,6 @@ rx_buffer->m_head = m; adapter->rx_desc_base[i].buffer_addr = htole64(segs[0].ds_addr); - /* Zero out the receive descriptors status. */ - adapter->rx_desc_base[i].status = 0; return (0); } @@ -3123,6 +3121,7 @@ /* Pointer to the receive descriptor being examined. */ struct em_rx_desc *current_desc; + uint8_t status; ifp = adapter->ifp; i = adapter->next_rx_desc_to_check; @@ -3149,7 +3148,8 @@ accept_frame = 1; prev_len_adj = 0; desc_len = le16toh(current_desc->length); - if (current_desc->status & E1000_RXD_STAT_EOP) { + status = current_desc->status; + if (status & E1000_RXD_STAT_EOP) { count--; eop = 1; if (desc_len < ETHER_CRC_LEN) { @@ -3170,9 +3170,8 @@ pkt_len += adapter->fmp->m_pkthdr.len; last_byte = *(mtod(mp, caddr_t) + desc_len - 1); - if (TBI_ACCEPT(&adapter->hw, current_desc->status, - current_desc->errors, - pkt_len, last_byte)) { + if (TBI_ACCEPT(&adapter->hw, status, + current_desc->errors, pkt_len, last_byte)) { em_tbi_adjust_stats(&adapter->hw, &adapter->stats, pkt_len, adapter->hw.mac_addr); @@ -3224,7 +3223,7 @@ em_fixup_rx(adapter) != 0) goto skip; #endif - if (current_desc->status & E1000_RXD_STAT_VP) + if (status & E1000_RXD_STAT_VP) VLAN_INPUT_TAG(ifp, adapter->fmp, (le16toh(current_desc->special) & E1000_RXD_SPC_VLAN_MASK)); @@ -3250,11 +3249,11 @@ adapter->fmp = NULL; adapter->lmp = NULL; } - /* Zero out the receive descriptors status. */ - adapter->rx_desc_base[i].status = 0; m = NULL; } + /* Zero out the receive descriptors status. */ + current_desc->status = 0; bus_dmamap_sync(adapter->rxdma.dma_tag, adapter->rxdma.dma_map, BUS_DMASYNC_PREREAD | BUS_DMASYNC_PREWRITE); ==== //depot/projects/soc2006/rdivacky_linuxolator/dev/ips/ips.h#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/dev/ips/ips.h,v 1.16 2005/11/29 09:39:41 scottl Exp $ + * $FreeBSD: src/sys/dev/ips/ips.h,v 1.17 2006/08/17 22:50:32 imp Exp $ */ #ifndef _IPS_H #define _IPS_H @@ -74,7 +74,7 @@ #define ips_set_error(command, error) do { \ (command)->status.fields.basic_status = IPS_DRV_ERROR; \ (command)->status.fields.reserved = ((error) & 0x0f); \ -} while (0); +} while (0) #ifndef IPS_DEBUG #define DEVICE_PRINTF(x...) ==== //depot/projects/soc2006/rdivacky_linuxolator/dev/usb/usb_port.h#2 (text+ko) ==== @@ -1,6 +1,6 @@ /* $OpenBSD: usb_port.h,v 1.18 2000/09/06 22:42:10 rahnds Exp $ */ /* $NetBSD: usb_port.h,v 1.68 2005/07/30 06:14:50 skrll Exp $ */ -/* $FreeBSD: src/sys/dev/usb/usb_port.h,v 1.78 2006/03/01 06:31:24 imp Exp $ */ +/* $FreeBSD: src/sys/dev/usb/usb_port.h,v 1.79 2006/08/17 22:42:56 imp Exp $ */ /* Also already merged from NetBSD: * $NetBSD: usb_port.h,v 1.57 2002/09/27 20:42:01 thorpej Exp $ @@ -437,7 +437,7 @@ device_detach(dev); \ free(uaap, M_USB); \ device_delete_child(device_get_parent(dev), dev); \ - } while (0); + } while (0) typedef struct malloc_type *usb_malloc_type; @@ -493,7 +493,7 @@ do { \ sc->sc_dev = self; \ device_set_desc_copy(self, devinfo); \ - } while (0); + } while (0) #define USB_DETACH(dname) \ Static int \ ==== //depot/projects/soc2006/rdivacky_linuxolator/fs/msdosfs/denode.h#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/fs/msdosfs/denode.h,v 1.33 2005/04/07 07:55:37 phk Exp $ */ +/* $FreeBSD: src/sys/fs/msdosfs/denode.h,v 1.34 2006/08/17 22:50:33 imp Exp $ */ /* $NetBSD: denode.h,v 1.25 1997/11/17 15:36:28 ws Exp $ */ /*- @@ -241,7 +241,7 @@ (dep)->de_flag |= DE_MODIFIED; \ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Aug 18 07:32:12 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EDB2E16A4DF; Fri, 18 Aug 2006 07:32:11 +0000 (UTC) X-Original-To: perforce@FreeBSD.org 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 B006F16A4DA for ; Fri, 18 Aug 2006 07:32:11 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6A95343D55 for ; Fri, 18 Aug 2006 07:32:07 +0000 (GMT) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7I7W7ku059633 for ; Fri, 18 Aug 2006 07:32:07 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7I7W6N9059630 for perforce@freebsd.org; Fri, 18 Aug 2006 07:32:06 GMT (envelope-from rdivacky@FreeBSD.org) Date: Fri, 18 Aug 2006 07:32:06 GMT Message-Id: <200608180732.k7I7W6N9059630@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rdivacky@FreeBSD.org using -f From: Roman Divacky To: Perforce Change Reviews Cc: Subject: PERFORCE change 104460 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 18 Aug 2006 07:32:12 -0000 http://perforce.freebsd.org/chv.cgi?CH=104460 Change 104460 by rdivacky@rdivacky_witten on 2006/08/18 07:31:11 opt_global.h is not needed in support.s Affected files ... .. //depot/projects/soc2006/rdivacky_linuxolator/i386/i386/support.s#7 edit Differences ... ==== //depot/projects/soc2006/rdivacky_linuxolator/i386/i386/support.s#7 (text+ko) ==== @@ -37,7 +37,6 @@ #include #include -#include "opt_global.h" #include "assym.s" #define IDXSHIFT 10 From owner-p4-projects@FreeBSD.ORG Fri Aug 18 07:36:13 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DC10116A4DE; Fri, 18 Aug 2006 07:36:12 +0000 (UTC) X-Original-To: perforce@FreeBSD.org 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 ACB3116A4DA for ; Fri, 18 Aug 2006 07:36:12 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7601F43D49 for ; Fri, 18 Aug 2006 07:36:12 +0000 (GMT) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7I7aCaN059842 for ; Fri, 18 Aug 2006 07:36:12 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7I7aCvV059839 for perforce@freebsd.org; Fri, 18 Aug 2006 07:36:12 GMT (envelope-from rdivacky@FreeBSD.org) Date: Fri, 18 Aug 2006 07:36:12 GMT Message-Id: <200608180736.k7I7aCvV059839@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rdivacky@FreeBSD.org using -f From: Roman Divacky To: Perforce Change Reviews Cc: Subject: PERFORCE change 104461 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 18 Aug 2006 07:36:13 -0000 http://perforce.freebsd.org/chv.cgi?CH=104461 Change 104461 by rdivacky@rdivacky_witten on 2006/08/18 07:36:06 Make buildable on amd64. Submitted by: netchild Affected files ... .. //depot/projects/soc2006/rdivacky_linuxolator/compat/linux/linux_futex.c#30 edit Differences ... ==== //depot/projects/soc2006/rdivacky_linuxolator/compat/linux/linux_futex.c#30 (text+ko) ==== @@ -147,9 +147,10 @@ #ifdef DEBUG if (ldebug(sys_futex)) printf("FUTEX_WAIT %d: val = %d, uaddr = %p, " - "*uaddr = %d, timeout = %d.%09ld\n", + "*uaddr = %d, timeout = %d.%09lu\n", td->td_proc->p_pid, args->val, - args->uaddr, val, timeout.tv_sec, timeout.tv_nsec); + args->uaddr, val, timeout.tv_sec, + (unsigned long) timeout.tv_nsec); #endif tv.tv_usec = timeout.tv_sec * 1000000 + timeout.tv_nsec / 1000; timeout_hz = tvtohz(&tv); From owner-p4-projects@FreeBSD.ORG Fri Aug 18 07:42:20 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C0AC316A4E1; Fri, 18 Aug 2006 07:42:20 +0000 (UTC) X-Original-To: perforce@FreeBSD.org 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 8474F16A4DA for ; Fri, 18 Aug 2006 07:42:20 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4E44643D45 for ; Fri, 18 Aug 2006 07:42:20 +0000 (GMT) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7I7gK7W060162 for ; Fri, 18 Aug 2006 07:42:20 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7I7gKv0060159 for perforce@freebsd.org; Fri, 18 Aug 2006 07:42:20 GMT (envelope-from rdivacky@FreeBSD.org) Date: Fri, 18 Aug 2006 07:42:20 GMT Message-Id: <200608180742.k7I7gKv0060159@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rdivacky@FreeBSD.org using -f From: Roman Divacky To: Perforce Change Reviews Cc: Subject: PERFORCE change 104462 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 18 Aug 2006 07:42:21 -0000 http://perforce.freebsd.org/chv.cgi?CH=104462 Change 104462 by rdivacky@rdivacky_witten on 2006/08/18 07:41:56 Remove redundant casts. Affected files ... .. //depot/projects/soc2006/rdivacky_linuxolator/compat/linux/linux_emul.c#12 edit Differences ... ==== //depot/projects/soc2006/rdivacky_linuxolator/compat/linux/linux_emul.c#12 (text+ko) ==== @@ -82,14 +82,14 @@ if (child != 0) { /* non-exec call */ - em = (struct linux_emuldata *) malloc(sizeof *em, M_LINUX, M_WAITOK | M_ZERO); + em = malloc(sizeof *em, M_LINUX, M_WAITOK | M_ZERO); em->pid = child; if (flags & CLONE_VM) { /* handled later in the code */ } else { struct linux_emuldata_shared *s; - s = (struct linux_emuldata_shared *) malloc(sizeof *s, M_LINUX, M_WAITOK | M_ZERO); + s = malloc(sizeof *s, M_LINUX, M_WAITOK | M_ZERO); em->shared = s; s->refs = 1; s->group_pid = child; From owner-p4-projects@FreeBSD.ORG Fri Aug 18 15:42:12 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 00F5216A4EA; Fri, 18 Aug 2006 15:42:12 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 C69CD16A4DA for ; Fri, 18 Aug 2006 15:42:11 +0000 (UTC) (envelope-from bushman@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8FFE443D53 for ; Fri, 18 Aug 2006 15:42:11 +0000 (GMT) (envelope-from bushman@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7IFgBYn007970 for ; Fri, 18 Aug 2006 15:42:11 GMT (envelope-from bushman@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7IFgBPE007967 for perforce@freebsd.org; Fri, 18 Aug 2006 15:42:11 GMT (envelope-from bushman@freebsd.org) Date: Fri, 18 Aug 2006 15:42:11 GMT Message-Id: <200608181542.k7IFgBPE007967@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bushman@freebsd.org using -f From: Michael Bushkov To: Perforce Change Reviews Cc: Subject: PERFORCE change 104489 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 18 Aug 2006 15:42:12 -0000 http://perforce.freebsd.org/chv.cgi?CH=104489 Change 104489 by bushman@bushman_nss_ldap_cached on 2006/08/18 15:41:28 Minor bug fixed. Affected files ... .. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/net/nscache.c#4 edit Differences ... ==== //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/net/nscache.c#4 (text) ==== @@ -124,7 +124,7 @@ __close_cached_connection(connection); if (res == -2 && buffer_size < NSS_CACHE_BUFFER_SIZE_LIMIT) { free(buffer); - buffer = (char *)malloc(buffer, buffer_size); + buffer = (char *)malloc(buffer_size); if (buffer == NULL) return (NS_UNAVAIL); } @@ -320,7 +320,7 @@ res = __cached_mp_read(rs, buffer, &buffer_size); if (res == -2 && buffer_size < NSS_CACHE_BUFFER_SIZE_LIMIT) { free(buffer); - buffer = (char *)malloc(buffer); + buffer = (char *)malloc(buffer_size); if (buffer == NULL) { res = -1; break; From owner-p4-projects@FreeBSD.ORG Fri Aug 18 15:44:16 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C783516A4DF; Fri, 18 Aug 2006 15:44:15 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 7237B16A4DD for ; Fri, 18 Aug 2006 15:44:15 +0000 (UTC) (envelope-from bushman@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E49D843D4C for ; Fri, 18 Aug 2006 15:44:14 +0000 (GMT) (envelope-from bushman@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7IFiEY2008060 for ; Fri, 18 Aug 2006 15:44:14 GMT (envelope-from bushman@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7IFiEfd008057 for perforce@freebsd.org; Fri, 18 Aug 2006 15:44:14 GMT (envelope-from bushman@freebsd.org) Date: Fri, 18 Aug 2006 15:44:14 GMT Message-Id: <200608181544.k7IFiEfd008057@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bushman@freebsd.org using -f From: Michael Bushkov To: Perforce Change Reviews Cc: Subject: PERFORCE change 104490 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 18 Aug 2006 15:44:16 -0000 http://perforce.freebsd.org/chv.cgi?CH=104490 Change 104490 by bushman@bushman_nss_ldap_cached on 2006/08/18 15:43:38 Kerberos stuff now uses in-tree OpenLDAP, if it is enabled. Manual pages and headers are properly installed. liblber is installed along with libldap. Affected files ... .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/kerberos5/Makefile.inc#2 edit .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libldap/liblber/Makefile#2 edit .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libldap/libldap/Makefile#2 edit .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/share/mk/bsd.libnames.mk#3 edit Differences ... ==== //depot/projects/soc2006/nss_ldap_cached_openldap/src/kerberos5/Makefile.inc#2 (text+ko) ==== @@ -1,17 +1,18 @@ # $FreeBSD: src/kerberos5/Makefile.inc,v 1.27 2006/07/28 06:33:27 yar Exp $ +.include + NO_LINT= KRB5DIR= ${.CURDIR}/../../../crypto/heimdal CFLAGS+= -DHAVE_CONFIG_H -I${.CURDIR}/../../include -.if defined(WITH_OPENLDAP) -OPENLDAPBASE?= /usr/local -LDAPLDADD= -lldap -llber -LDAPDPADD= ${LDAPLDADD:C;^-l(.*)$;${OPENLDAPBASE}/lib/lib\1.a;} -LDAPCFLAGS= -I${OPENLDAPBASE}/include -DOPENLDAP=1 -LDAPLDFLAGS= -L${OPENLDAPBASE}/lib -Wl,-rpath,${OPENLDAPBASE}/lib +.if ${MK_OPENLDAP} != "no" +LDAPLDADD= -lldap -llber +LDAPDPADD= ${LIBLDAP} ${LIBLBER} +LDAPCFLAGS= -DOPENLDAP=1 +LDAPLDFLAGS= .endif LIBVERS= ${.OBJDIR}/../../lib/libvers/libvers.a ==== //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libldap/liblber/Makefile#2 (text+ko) ==== @@ -3,11 +3,11 @@ .include OPENLDAP= ${.CURDIR}/../../../contrib/openldap -.PATH: ${OPENLDAP}/include ${OPENLDAP}/libraries/liblber +.PATH: ${OPENLDAP}/include ${OPENLDAP}/libraries/liblber \ + ${OPENLDAP}/doc/man/man3 ${.CURDIR}/../include LIB= lber -NO_PROFILE= -#INTERNALLIB= +SHLIB_MAJOR= 2 SRCS= assert.c \ bprint.c \ @@ -23,4 +23,8 @@ CFLAGS+= -I${.CURDIR}/../include -I${OPENLDAP}/include \ -I${OPENLDAP}/libraries/liblber +INCS= lber.h lber_types.h +MAN= lber-decode.3 lber-encode.3 lber-memory.3 lber-types.3 + .include + ==== //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libldap/libldap/Makefile#2 (text+ko) ==== @@ -3,7 +3,8 @@ .include OPENLDAP= ${.CURDIR}/../../../contrib/openldap -.PATH: ${OPENLDAP}/include ${OPENLDAP}/libraries/libldap +.PATH: ${OPENLDAP}/include ${OPENLDAP}/libraries/libldap \ + ${OPENLDAP}/doc/man/man3 ${.CURDIR}/../include LIB= ldap SHLIB_MAJOR= 2 @@ -75,5 +76,15 @@ LDFLAGS+= ${OPENLDAP_LDFLAGS} LDADD+= ${OPENLDAP_LDADD} +INCS= ldap.h ldap_cdefs.h ldap_features.h ldap_schema.h ldap_utf8.h +MAN= ldap.3 ldap_abandon.3 ldap_add.3 ldap_bind.3 \ + ldap_compare.3 ldap_delete.3 ldap_error.3 \ + ldap_first_attribute.3 ldap_first_entry.3 \ + ldap_first_message.3 ldap_first_reference.3 \ + ldap_get_dn.3 ldap_get_values.3 ldap_modify.3 \ + ldap_modrdn.3 ldap_open.3 ldap_parse_reference.3 \ + ldap_parse_result.3 ldap_result.3 ldap_schema.3 \ + ldap_search.3 ldap_sort.3 ldap_url.3 + .include ==== //depot/projects/soc2006/nss_ldap_cached_openldap/src/share/mk/bsd.libnames.mk#3 (text+ko) ==== @@ -70,6 +70,7 @@ LIBKVM?= ${DESTDIR}${LIBDIR}/libkvm.a LIBL?= ${DESTDIR}${LIBDIR}/libl.a .if ${MK_OPENLDAP} != "no" +LIBLBER?= ${DESTDIR}${LIBDIR}/liblber.a LIBLDAP?= ${DESTDIR}${LIBDIR}/libldap.a .endif LIBLN?= "don't use LIBLN, use LIBL" From owner-p4-projects@FreeBSD.ORG Fri Aug 18 15:45:17 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 750C116A4E5; Fri, 18 Aug 2006 15:45:17 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 4F78F16A4E2 for ; Fri, 18 Aug 2006 15:45:17 +0000 (UTC) (envelope-from bushman@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E2F2743D53 for ; Fri, 18 Aug 2006 15:45:16 +0000 (GMT) (envelope-from bushman@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7IFjGSd008121 for ; Fri, 18 Aug 2006 15:45:16 GMT (envelope-from bushman@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7IFjGAM008118 for perforce@freebsd.org; Fri, 18 Aug 2006 15:45:16 GMT (envelope-from bushman@freebsd.org) Date: Fri, 18 Aug 2006 15:45:16 GMT Message-Id: <200608181545.k7IFjGAM008118@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bushman@freebsd.org using -f From: Michael Bushkov To: Perforce Change Reviews Cc: Subject: PERFORCE change 104491 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 18 Aug 2006 15:45:17 -0000 http://perforce.freebsd.org/chv.cgi?CH=104491 Change 104491 by bushman@bushman_nss_ldap_cached on 2006/08/18 15:44:39 IFC Affected files ... .. //depot/projects/soc2006/nss_ldap_cached/src/etc/defaults/rc.conf#6 integrate .. //depot/projects/soc2006/nss_ldap_cached/src/etc/rc.d/dhclient#4 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/net/nscache.c#3 integrate Differences ... ==== //depot/projects/soc2006/nss_ldap_cached/src/etc/defaults/rc.conf#6 (text+ko) ==== @@ -15,7 +15,7 @@ # For a more detailed explanation of all the rc.conf variables, please # refer to the rc.conf(5) manual page. # -# $FreeBSD: src/etc/defaults/rc.conf,v 1.293 2006/08/17 17:12:26 brian Exp $ +# $FreeBSD: src/etc/defaults/rc.conf,v 1.294 2006/08/17 20:13:24 brian Exp $ ############################################################## ### Important initial Boot-time options #################### @@ -93,9 +93,10 @@ hostname="" # Set this! nisdomainname="NO" # Set to NIS domain if using NIS (or NO). dhclient_program="/sbin/dhclient" # Path to dhcp client program. -dhclient_flags="" # Additional flags to pass to dhcp client. -dhclient_flags_fxp0="" # Additional dhclient flags for fxp0 only +dhclient_flags="" # Extra flags to pass to dhcp client. +dhclient_flags_fxp0="" # Extra dhclient flags for fxp0 only background_dhclient="NO" # Start dhcp client in the background. +background_dhclient_fxp0="" # Start dhcp client on fxp0 in the background. synchronous_dhclient="YES" # Start dhclient directly on configured # interfaces during startup. firewall_enable="NO" # Set to YES to enable firewall functionality ==== //depot/projects/soc2006/nss_ldap_cached/src/etc/rc.d/dhclient#4 (text+ko) ==== @@ -1,7 +1,7 @@ #!/bin/sh # # $NetBSD: dhclient,v 1.8 2002/03/22 04:33:58 thorpej Exp $ -# $FreeBSD: src/etc/rc.d/dhclient,v 1.23 2006/08/17 17:12:26 brian Exp $ +# $FreeBSD: src/etc/rc.d/dhclient,v 1.24 2006/08/17 19:57:10 brian Exp $ # # PROVIDE: dhclient @@ -34,7 +34,7 @@ fi eval specific=\$background_dhclient_$ifn - if [ -n "$specific ]; then + if [ -n "$specific" ]; then if checkyesno background_dhclient_$ifn; then rc_flags="${rc_flags} -b" fi ==== //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/libc/net/nscache.c#3 (text) ==== @@ -124,7 +124,7 @@ __close_cached_connection(connection); if (res == -2 && buffer_size < NSS_CACHE_BUFFER_SIZE_LIMIT) { free(buffer); - buffer = (char *)malloc(buffer, buffer_size); + buffer = (char *)malloc(buffer_size); if (buffer == NULL) return (NS_UNAVAIL); } @@ -320,7 +320,7 @@ res = __cached_mp_read(rs, buffer, &buffer_size); if (res == -2 && buffer_size < NSS_CACHE_BUFFER_SIZE_LIMIT) { free(buffer); - buffer = (char *)malloc(buffer); + buffer = (char *)malloc(buffer_size); if (buffer == NULL) { res = -1; break; From owner-p4-projects@FreeBSD.ORG Fri Aug 18 15:47:20 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AECC716A4E8; Fri, 18 Aug 2006 15:47:20 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 8901716A4DA for ; Fri, 18 Aug 2006 15:47:20 +0000 (UTC) (envelope-from bushman@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E881B43D5A for ; Fri, 18 Aug 2006 15:47:19 +0000 (GMT) (envelope-from bushman@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7IFlJxv008288 for ; Fri, 18 Aug 2006 15:47:19 GMT (envelope-from bushman@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7IFlJKZ008285 for perforce@freebsd.org; Fri, 18 Aug 2006 15:47:19 GMT (envelope-from bushman@freebsd.org) Date: Fri, 18 Aug 2006 15:47:19 GMT Message-Id: <200608181547.k7IFlJKZ008285@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bushman@freebsd.org using -f From: Michael Bushkov To: Perforce Change Reviews Cc: Subject: PERFORCE change 104492 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 18 Aug 2006 15:47:20 -0000 http://perforce.freebsd.org/chv.cgi?CH=104492 Change 104492 by bushman@bushman_nss_ldap_cached on 2006/08/18 15:46:30 Space nit issue. Affected files ... .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/share/mk/bsd.libnames.mk#4 edit Differences ... ==== //depot/projects/soc2006/nss_ldap_cached_openldap/src/share/mk/bsd.libnames.mk#4 (text+ko) ==== @@ -71,7 +71,7 @@ LIBL?= ${DESTDIR}${LIBDIR}/libl.a .if ${MK_OPENLDAP} != "no" LIBLBER?= ${DESTDIR}${LIBDIR}/liblber.a -LIBLDAP?= ${DESTDIR}${LIBDIR}/libldap.a +LIBLDAP?= ${DESTDIR}${LIBDIR}/libldap.a .endif LIBLN?= "don't use LIBLN, use LIBL" .if ${MK_BIND} != "no" From owner-p4-projects@FreeBSD.ORG Fri Aug 18 15:52:37 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6F65816A4E0; Fri, 18 Aug 2006 15:52:37 +0000 (UTC) X-Original-To: perforce@FreeBSD.org 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 1920116A4DE for ; Fri, 18 Aug 2006 15:52:37 +0000 (UTC) (envelope-from cdjones@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D539243D86 for ; Fri, 18 Aug 2006 15:52:26 +0000 (GMT) (envelope-from cdjones@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7IFqQKd008589 for ; Fri, 18 Aug 2006 15:52:26 GMT (envelope-from cdjones@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7IFqQhd008585 for perforce@freebsd.org; Fri, 18 Aug 2006 15:52:26 GMT (envelope-from cdjones@FreeBSD.org) Date: Fri, 18 Aug 2006 15:52:26 GMT Message-Id: <200608181552.k7IFqQhd008585@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to cdjones@FreeBSD.org using -f From: Chris Jones To: Perforce Change Reviews Cc: Subject: PERFORCE change 104493 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 18 Aug 2006 15:52:37 -0000 http://perforce.freebsd.org/chv.cgi?CH=104493 Change 104493 by cdjones@cdjones-impulse on 2006/08/18 15:52:06 Unlock some things that didn't need locking (which caused sleepable-after-non-sleepable panics anyways) and switch to a system where we throw you to the back of the line on the basis of ratio between (cpu used / total cpu) and (shares held / total shares), rather than the difference between the two. It works better. Affected files ... .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/sched_hier.c#17 edit Differences ... ==== //depot/projects/soc2006/cdjones_jail/src/sys/kern/sched_hier.c#17 (text+ko) ==== @@ -295,7 +295,7 @@ &sched_kgfollowons, 0, "number of followons done in a ksegrp"); -static int sched_unjailedProcessShares = 50; +static int sched_unjailedProcessShares = 0; SYSCTL_INT(_kern_sched, OID_AUTO, unjailedprocessshares, CTLTYPE_INT | CTLFLAG_RW, &sched_unjailedProcessShares, 0, @@ -460,7 +460,6 @@ mtx_lock(&allprison_mtx); if (prisoncount) { LIST_FOREACH(pr, &allprison, pr_list) { - mtx_lock(&pr->pr_mtx); pr->pr_estcpu = 0; } } @@ -553,7 +552,7 @@ if (NULL != kg->kg_proc->p_ucred && NULL != kg->kg_proc->p_ucred->cr_prison) kg->kg_proc->p_ucred->cr_prison->pr_estcpu += - kg->kg_estcpu; + kg->kg_estcpu; resetpriority(kg); FOREACH_THREAD_IN_GROUP(kg, td) { resetpriority_thread(td, kg); @@ -561,11 +560,6 @@ } /* end of ksegrp loop */ mtx_unlock_spin(&sched_lock); } /* end of process loop */ - if (prisoncount) { - LIST_FOREACH(pr, &allprison, pr_list) { - mtx_unlock(&pr->pr_mtx); - } - } mtx_unlock(&allprison_mtx); sx_sunlock(&allproc_lock); } @@ -649,7 +643,10 @@ if (kg->kg_pri_class == PRI_TIMESHARE) { newpriority = PUSER + kg->kg_estcpu / INVERSE_ESTCPU_WEIGHT + NICE_WEIGHT * (kg->kg_proc->p_nice - PRIO_MIN); - if (NULL != pr) { + if (NULL == pr) { + newpriority = min(max(newpriority, PRI_MIN_TIMESHARE), + PRI_MAX_TIMESHARE); + } else { /* * Skew the priority by the jail's share of CPU resources. * The unjailed processes get half the CPU time. @@ -659,21 +656,36 @@ * reserved to unjailed processes really should be sysctl'd. */ register unsigned int np = newpriority; - register unsigned int skew = PRI_MAX_TIMESHARE; - skew -= PRI_MIN_TIMESHARE; - skew /= 16; - + register unsigned int skew; + skew = pr->pr_estcpu * total_jail_sched_shares; + skew /= max(total_est_cpu, 1) * max(pr->pr_sched_shares, 1); + if (skew > 0) { + /* wait your turn until your cpu usage's proportionate */ + newpriority = PRI_MAX_IDLE; + } else { + newpriority = min(max(newpriority, PRI_MIN_TIMESHARE), + PRI_MAX_TIMESHARE); + } +/* + a = skew; skew *= pr->pr_sched_shares; + b = skew; skew *= pr->pr_estcpu; + c = skew; */ /* avoid divide-by-zero hazards */ - skew /= max(total_jail_sched_shares, 1); +/* skew /= max(total_jail_sched_shares, 1); + d = skew; skew /= max(total_est_cpu, 1); + e = skew; +*/ - printf("resetpriority: skewing KSE %p to %d from %d\n", - &kg, np + skew, np); +/* newpriority += skew; */ + printf("skew KSE %p (%d / %d cpu, %d / %d shares) from %d to %d\n", + &kg, pr->pr_estcpu, total_est_cpu, + pr->pr_sched_shares, + total_jail_sched_shares, + np, newpriority); } - newpriority = min(max(newpriority, PRI_MIN_TIMESHARE), - PRI_MAX_TIMESHARE); kg->kg_user_pri = newpriority; } } From owner-p4-projects@FreeBSD.ORG Fri Aug 18 16:05:45 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1CFF516A4FC; Fri, 18 Aug 2006 16:05:45 +0000 (UTC) X-Original-To: perforce@FreeBSD.org 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 D70C816A4F6 for ; Fri, 18 Aug 2006 16:05:44 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 883F943D46 for ; Fri, 18 Aug 2006 16:05:44 +0000 (GMT) (envelope-from gonzo@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7IG5iCX010718 for ; Fri, 18 Aug 2006 16:05:44 GMT (envelope-from gonzo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7IG5ih1010715 for perforce@freebsd.org; Fri, 18 Aug 2006 16:05:44 GMT (envelope-from gonzo@FreeBSD.org) Date: Fri, 18 Aug 2006 16:05:44 GMT Message-Id: <200608181605.k7IG5ih1010715@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gonzo@FreeBSD.org using -f From: Oleksandr Tymoshenko To: Perforce Change Reviews Cc: Subject: PERFORCE change 104496 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 18 Aug 2006 16:05:45 -0000 http://perforce.freebsd.org/chv.cgi?CH=104496 Change 104496 by gonzo@gonzo_hideout on 2006/08/18 16:05:02 o Introduce IEEEl2bits union. Source: MIPS32(r) Architecture For Programmers. Volume I: Introduction to the MIPS32(r) Architecture. Sec. 5.4.1. Affected files ... .. //depot/projects/mips2/src/lib/libc/mips/_fpmath.h#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Fri Aug 18 17:28:38 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 76C3F16A4E1; Fri, 18 Aug 2006 17:28:38 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 51CEB16A4DF for ; Fri, 18 Aug 2006 17:28:38 +0000 (UTC) (envelope-from bushman@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2F60043D78 for ; Fri, 18 Aug 2006 17:28:32 +0000 (GMT) (envelope-from bushman@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7IHSWRt023754 for ; Fri, 18 Aug 2006 17:28:32 GMT (envelope-from bushman@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7IHSVcr023751 for perforce@freebsd.org; Fri, 18 Aug 2006 17:28:31 GMT (envelope-from bushman@freebsd.org) Date: Fri, 18 Aug 2006 17:28:31 GMT Message-Id: <200608181728.k7IHSVcr023751@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bushman@freebsd.org using -f From: Michael Bushkov To: Perforce Change Reviews Cc: Subject: PERFORCE change 104501 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 18 Aug 2006 17:28:38 -0000 http://perforce.freebsd.org/chv.cgi?CH=104501 Change 104501 by bushman@bushman_nss_ldap_cached on 2006/08/18 17:28:20 Alphabetical order fixed. Affected files ... .. //depot/projects/soc2006/nss_ldap_cached/src/lib/Makefile#7 edit Differences ... ==== //depot/projects/soc2006/nss_ldap_cached/src/lib/Makefile#7 (text+ko) ==== @@ -28,7 +28,7 @@ # Otherwise, the SUBDIR list should be in alphabetical order. SUBDIR= ${_csu} libbsm libcom_err libcrypt libkvm msun libmd libncurses \ - libnssutil nss_files nss_compat nss_dns nss_icmp ${_nss_nis}\ + libnssutil nss_compat nss_dns nss_files nss_icmp ${_nss_nis}\ libnetgraph libradius librpcsvc libsbuf libtacplus libutil \ ${_libypclnt} libalias libarchive ${_libatm} \ libbegemot ${_libbluetooth} libbsnmp libbz2 libc ${_libc_r} \ From owner-p4-projects@FreeBSD.ORG Fri Aug 18 17:30:36 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E561616A4E2; Fri, 18 Aug 2006 17:30:35 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 A4DD916A4DD for ; Fri, 18 Aug 2006 17:30:35 +0000 (UTC) (envelope-from bushman@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 49CCF43D78 for ; Fri, 18 Aug 2006 17:30:35 +0000 (GMT) (envelope-from bushman@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7IHUZ7e023876 for ; Fri, 18 Aug 2006 17:30:35 GMT (envelope-from bushman@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7IHUY8v023872 for perforce@freebsd.org; Fri, 18 Aug 2006 17:30:34 GMT (envelope-from bushman@freebsd.org) Date: Fri, 18 Aug 2006 17:30:34 GMT Message-Id: <200608181730.k7IHUY8v023872@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bushman@freebsd.org using -f From: Michael Bushkov To: Perforce Change Reviews Cc: Subject: PERFORCE change 104502 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 18 Aug 2006 17:30:36 -0000 http://perforce.freebsd.org/chv.cgi?CH=104502 Change 104502 by bushman@bushman_nss_ldap_cached on 2006/08/18 17:30:10 IFC Affected files ... .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/defaults/rc.conf#4 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/rc.d/dhclient#3 integrate .. //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/Makefile#3 integrate Differences ... ==== //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/defaults/rc.conf#4 (text+ko) ==== @@ -15,7 +15,7 @@ # For a more detailed explanation of all the rc.conf variables, please # refer to the rc.conf(5) manual page. # -# $FreeBSD: src/etc/defaults/rc.conf,v 1.293 2006/08/17 17:12:26 brian Exp $ +# $FreeBSD: src/etc/defaults/rc.conf,v 1.294 2006/08/17 20:13:24 brian Exp $ ############################################################## ### Important initial Boot-time options #################### @@ -93,9 +93,10 @@ hostname="" # Set this! nisdomainname="NO" # Set to NIS domain if using NIS (or NO). dhclient_program="/sbin/dhclient" # Path to dhcp client program. -dhclient_flags="" # Additional flags to pass to dhcp client. -dhclient_flags_fxp0="" # Additional dhclient flags for fxp0 only +dhclient_flags="" # Extra flags to pass to dhcp client. +dhclient_flags_fxp0="" # Extra dhclient flags for fxp0 only background_dhclient="NO" # Start dhcp client in the background. +background_dhclient_fxp0="" # Start dhcp client on fxp0 in the background. synchronous_dhclient="YES" # Start dhclient directly on configured # interfaces during startup. firewall_enable="NO" # Set to YES to enable firewall functionality ==== //depot/projects/soc2006/nss_ldap_cached_openldap/src/etc/rc.d/dhclient#3 (text+ko) ==== @@ -1,7 +1,7 @@ #!/bin/sh # # $NetBSD: dhclient,v 1.8 2002/03/22 04:33:58 thorpej Exp $ -# $FreeBSD: src/etc/rc.d/dhclient,v 1.23 2006/08/17 17:12:26 brian Exp $ +# $FreeBSD: src/etc/rc.d/dhclient,v 1.24 2006/08/17 19:57:10 brian Exp $ # # PROVIDE: dhclient @@ -34,7 +34,7 @@ fi eval specific=\$background_dhclient_$ifn - if [ -n "$specific ]; then + if [ -n "$specific" ]; then if checkyesno background_dhclient_$ifn; then rc_flags="${rc_flags} -b" fi ==== //depot/projects/soc2006/nss_ldap_cached_openldap/src/lib/Makefile#3 (text+ko) ==== From owner-p4-projects@FreeBSD.ORG Sat Aug 19 08:50:06 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9F50C16A4DE; Sat, 19 Aug 2006 08:50:06 +0000 (UTC) X-Original-To: perforce@FreeBSD.org 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 6296416A4DA for ; Sat, 19 Aug 2006 08:50:06 +0000 (UTC) (envelope-from cdjones@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 119F543D4C for ; Sat, 19 Aug 2006 08:50:06 +0000 (GMT) (envelope-from cdjones@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7J8o573032138 for ; Sat, 19 Aug 2006 08:50:05 GMT (envelope-from cdjones@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7J8o51f032135 for perforce@freebsd.org; Sat, 19 Aug 2006 08:50:05 GMT (envelope-from cdjones@FreeBSD.org) Date: Sat, 19 Aug 2006 08:50:05 GMT Message-Id: <200608190850.k7J8o51f032135@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to cdjones@FreeBSD.org using -f From: Chris Jones To: Perforce Change Reviews Cc: Subject: PERFORCE change 104529 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 19 Aug 2006 08:50:06 -0000 http://perforce.freebsd.org/chv.cgi?CH=104529 Change 104529 by cdjones@cdjones-impulse on 2006/08/19 08:49:17 Introduce jtune (not yet functional), add relevant members to xprison struct, get rid of sched_td from kern_jail. Affected files ... .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/kern_jail.c#22 edit .. //depot/projects/soc2006/cdjones_jail/src/sys/sys/jail.h#18 edit .. //depot/projects/soc2006/cdjones_jail/src/usr.sbin/jtune/Makefile#1 add .. //depot/projects/soc2006/cdjones_jail/src/usr.sbin/jtune/jtune.8#1 add .. //depot/projects/soc2006/cdjones_jail/src/usr.sbin/jtune/jtune.c#1 add Differences ... ==== //depot/projects/soc2006/cdjones_jail/src/sys/kern/kern_jail.c#22 (text+ko) ==== @@ -99,33 +99,8 @@ SYSINIT(prison, SI_SUB_INTRINSIC, SI_ORDER_ANY, init_prison, NULL); +#if 0 static void -jsched_td(void *arg) -{ - struct prison *pr = arg; - /* int pr_id = pr->pr_id; */ - int flags = J_SCHED_TD_ACTIVE; - pr->pr_scheduler_flags_ptr = &flags; - -/* printf("Starting jsched_td\n"); */ - - for (;;) { - if (flags & J_SCHED_TD_DIE) - break; - - mtx_lock(&pr->pr_mtx); - /* Scheduling stuff goes here. */ -/* printf("jsched_td running\n"); */ - mtx_unlock(&pr->pr_mtx); - - tsleep(pr, 0, "-", hz); - } - - printf("Exiting jsched_td\n"); - kthread_exit(0); -} - -static void jpager_td(void *arg) { struct proc *p; @@ -228,6 +203,7 @@ printf("Exiting jpager_td\n"); kthread_exit(0); } +#endif /* * MPSAFE @@ -243,8 +219,7 @@ struct prison *pr, *tpr; struct jail j; struct jail_attach_args jaa; - struct proc *j_sched_proc = NULL; - struct proc *j_pager_proc = NULL; + /* struct proc *j_pager_proc = NULL; */ int vfslocked, error, tryprid; error = copyin(uap->jail, &j, sizeof(j)); @@ -274,7 +249,7 @@ goto e_dropvnref; pr->pr_ip = j.ip_number; pr->pr_linux = NULL; - pr->pr_sched_shares = j.priority; + pr->pr_sched_shares = j.sched_shares; pr->pr_securelevel = securelevel; pr->pr_mem_limit = j.mem_limit; @@ -300,16 +275,10 @@ prisoncount++; mtx_unlock(&allprison_mtx); - /* TODO #ifdef SCHED_HIER */ - if (kthread_create(jsched_td, pr, (void *) j_sched_proc, 0, 0, "jsched %d", pr->pr_id)) + /* if (kthread_create(jpager_td, pr, (void *) j_pager_proc, 0, 0, "jpager %d", pr->pr_id)) goto e_dropprref; - KASSERT(j_sched_proc != NULL, ("NULL j_sched_proc")); - pr->pr_scheduler = j_sched_proc; - if (kthread_create(jpager_td, pr, (void *) j_pager_proc, 0, 0, "jpager %d", pr->pr_id)) - goto e_dropprref; KASSERT(j_pager_proc != NULL, ("NULL j_pager_proc")); - pr->pr_pager = j_pager_proc; - /* TODO #endif */ + pr->pr_pager = j_pager_proc; */ error = jail_attach(td, &jaa); if (error) @@ -435,8 +404,8 @@ mtx_unlock(&allprison_mtx); /* Tell scheduler, pager to die. No need to wait. */ - *pr->pr_scheduler_flags_ptr = J_SCHED_TD_DIE; - *pr->pr_pager_flags_ptr = J_PAGER_TD_DIE; +/* *pr->pr_scheduler_flags_ptr = J_SCHED_TD_DIE; + *pr->pr_pager_flags_ptr = J_PAGER_TD_DIE; */ wakeup(pr); TASK_INIT(&pr->pr_task, 0, prison_complete, pr); @@ -752,6 +721,10 @@ strlcpy(xp->pr_path, pr->pr_path, sizeof(xp->pr_path)); strlcpy(xp->pr_host, pr->pr_host, sizeof(xp->pr_host)); xp->pr_ip = pr->pr_ip; + xp->pr_sched_shares = pr->pr_sched_shares; + xp->pr_estcpu = pr->pr_estcpu; + xp->pr_mem_limit = pr->pr_mem_limit; + xp->pr_mem_usage = pr->pr_mem_usage; mtx_unlock(&pr->pr_mtx); xp++; } ==== //depot/projects/soc2006/cdjones_jail/src/sys/sys/jail.h#18 (text+ko) ==== @@ -18,10 +18,8 @@ char *path; char *hostname; u_int32_t ip_number; - unsigned int priority; + unsigned int sched_shares; unsigned int mem_limit; -/* struct thread *scheduler; - CJ TODO --- add reference to preferred scheduler, e.g. by name? */ }; struct xprison { @@ -30,11 +28,12 @@ char pr_path[MAXPATHLEN]; char pr_host[MAXHOSTNAMELEN]; u_int32_t pr_ip; - unsigned int priority; - unsigned int mem_limit; - /* struct thread *scheduler; */ + unsigned int pr_sched_shares; + unsigned int pr_estcpu; + unsigned int pr_mem_limit; + unsigned int pr_mem_usage; }; -#define XPRISON_VERSION 1 +#define XPRISON_VERSION 2 #define JAIL_DEFAULT_PRIORITY 10 #define JAIL_MINIMUM_PRIORITY 1 @@ -101,8 +100,6 @@ struct mtx pr_mtx; u_int32_t pr_sched_shares; /* (p) jail priority */ u_int pr_estcpu; /* (p) est. cpu of jail */ - struct proc *pr_scheduler; /* (c) scheduler pid */ - int *pr_scheduler_flags_ptr; /* (p) communication to scheduler */ struct proc *pr_pager; /* (c) pager pid */ int *pr_pager_flags_ptr; /* (p) communication to pager */ size_t pr_mem_limit; /* (p) memory allocation limit */ From owner-p4-projects@FreeBSD.ORG Sat Aug 19 10:57:51 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3A70616A4DE; Sat, 19 Aug 2006 10:57:51 +0000 (UTC) X-Original-To: perforce@FreeBSD.org 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 1541E16A4DA for ; Sat, 19 Aug 2006 10:57:51 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id BD66543D49 for ; Sat, 19 Aug 2006 10:57:50 +0000 (GMT) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7JAvoIA042147 for ; Sat, 19 Aug 2006 10:57:50 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7JAvoQN042144 for perforce@freebsd.org; Sat, 19 Aug 2006 10:57:50 GMT (envelope-from rdivacky@FreeBSD.org) Date: Sat, 19 Aug 2006 10:57:50 GMT Message-Id: <200608191057.k7JAvoQN042144@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rdivacky@FreeBSD.org using -f From: Roman Divacky To: Perforce Change Reviews Cc: Subject: PERFORCE change 104538 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 19 Aug 2006 10:57:51 -0000 http://perforce.freebsd.org/chv.cgi?CH=104538 Change 104538 by rdivacky@rdivacky_witten on 2006/08/19 10:56:51 ifdef DEBUG a printf Affected files ... .. //depot/projects/soc2006/rdivacky_linuxolator/compat/linux/linux_futex.c#31 edit Differences ... ==== //depot/projects/soc2006/rdivacky_linuxolator/compat/linux/linux_futex.c#31 (text+ko) ==== @@ -303,7 +303,9 @@ ret = futex_wake(f, args->val, NULL); futex_put(f); if (op_ret > 0) { +#ifdef DEBUG printf("second wakeup\n"); +#endif op_ret = 0; /* Linux always puts there struct timespec *utime :) */ op_ret += futex_wake(f2, 0x7fffffff, NULL); From owner-p4-projects@FreeBSD.ORG Sat Aug 19 11:18:18 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D6FBA16A4E2; Sat, 19 Aug 2006 11:18:17 +0000 (UTC) X-Original-To: perforce@FreeBSD.org 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 B050616A4DE for ; Sat, 19 Aug 2006 11:18:17 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7B4DF43D46 for ; Sat, 19 Aug 2006 11:18:17 +0000 (GMT) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7JBIH27044350 for ; Sat, 19 Aug 2006 11:18:17 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7JBIH68044347 for perforce@freebsd.org; Sat, 19 Aug 2006 11:18:17 GMT (envelope-from rdivacky@FreeBSD.org) Date: Sat, 19 Aug 2006 11:18:17 GMT Message-Id: <200608191118.k7JBIH68044347@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rdivacky@FreeBSD.org using -f From: Roman Divacky To: Perforce Change Reviews Cc: Subject: PERFORCE change 104540 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 19 Aug 2006 11:18:18 -0000 http://perforce.freebsd.org/chv.cgi?CH=104540 Change 104540 by rdivacky@rdivacky_witten on 2006/08/19 11:18:11 Be like src. Affected files ... .. //depot/projects/soc2006/rdivacky_linuxolator/compat/linux/linux_futex.c#32 edit Differences ... ==== //depot/projects/soc2006/rdivacky_linuxolator/compat/linux/linux_futex.c#32 (text+ko) ==== @@ -149,8 +149,8 @@ printf("FUTEX_WAIT %d: val = %d, uaddr = %p, " "*uaddr = %d, timeout = %d.%09lu\n", td->td_proc->p_pid, args->val, - args->uaddr, val, timeout.tv_sec, - (unsigned long) timeout.tv_nsec); + args->uaddr, val, timeout.tv_sec, + (unsigned long)timeout.tv_nsec); #endif tv.tv_usec = timeout.tv_sec * 1000000 + timeout.tv_nsec / 1000; timeout_hz = tvtohz(&tv); From owner-p4-projects@FreeBSD.ORG Sat Aug 19 13:37:36 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 47D4616A4E1; Sat, 19 Aug 2006 13:37:36 +0000 (UTC) X-Original-To: perforce@FreeBSD.org 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 0AF8E16A4DD for ; Sat, 19 Aug 2006 13:37:36 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9DED243D49 for ; Sat, 19 Aug 2006 13:37:35 +0000 (GMT) (envelope-from gonzo@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7JDbZwM061618 for ; Sat, 19 Aug 2006 13:37:35 GMT (envelope-from gonzo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7JDbZPs061615 for perforce@freebsd.org; Sat, 19 Aug 2006 13:37:35 GMT (envelope-from gonzo@FreeBSD.org) Date: Sat, 19 Aug 2006 13:37:35 GMT Message-Id: <200608191337.k7JDbZPs061615@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gonzo@FreeBSD.org using -f From: Oleksandr Tymoshenko To: Perforce Change Reviews Cc: Subject: PERFORCE change 104543 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 19 Aug 2006 13:37:36 -0000 http://perforce.freebsd.org/chv.cgi?CH=104543 Change 104543 by gonzo@gonzo_hideout on 2006/08/19 13:37:00 o Stub for libdisk. Just like in FreeBSD/arm. Affected files ... .. //depot/projects/mips2/src/lib/libdisk/write_mips_disk.c#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Sat Aug 19 20:12:06 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D90C916A4DD; Sat, 19 Aug 2006 20:12:05 +0000 (UTC) X-Original-To: perforce@FreeBSD.org 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 8743F16A4F8 for ; Sat, 19 Aug 2006 20:12:05 +0000 (UTC) (envelope-from swhitman@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 48B5B43D76 for ; Sat, 19 Aug 2006 20:11:59 +0000 (GMT) (envelope-from swhitman@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7JKBxwI096661 for ; Sat, 19 Aug 2006 20:11:59 GMT (envelope-from swhitman@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7JKBwJY096658 for perforce@freebsd.org; Sat, 19 Aug 2006 20:11:58 GMT (envelope-from swhitman@FreeBSD.org) Date: Sat, 19 Aug 2006 20:11:58 GMT Message-Id: <200608192011.k7JKBwJY096658@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to swhitman@FreeBSD.org using -f From: Spencer Whitman To: Perforce Change Reviews Cc: Subject: PERFORCE change 104562 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 19 Aug 2006 20:12:06 -0000 http://perforce.freebsd.org/chv.cgi?CH=104562 Change 104562 by swhitman@swhitman_joethecat on 2006/08/19 20:11:34 More work on macro replacment. Affected files ... .. //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/k/cpp.c#18 edit Differences ... ==== //depot/projects/soc2006/swhitman-K_Kernel_Meta-Language/k/cpp.c#18 (text+ko) ==== @@ -191,49 +191,34 @@ fprintf(stderr, "PRAGMA: <%V>\n", String(b, e)); } -#if 0 - static const char * -replace_word(const char * word) { +replace_word(const char * word, const char * newend) { + /* XXX set new end to the end of the string */ struct define * tmp; TAILQ_FOREACH(tmp, &define, list) { - if (String(word,NULL) == (tmp->name)) { + if (word == (tmp->name)) { return (tmp->value); } } return word; } +/* Puts the begining of the first word from begin in s and the end in e */ +static void +grab_word(const char * begin, const char * end, const char * s, const char * e) +{ + const char * tmp; + s = e = NULL; + for(tmp = begin; tmp < end; tmp++) { + /* Find the first char of an identifier */ + /* Check if the identifier could be a macro */ + /* Stop if it can, continue if it can't */ + } -static const char * -expand_macro(struct define * mac, struct arg_ind * head) { - -} - - -static const char * -get_name(const char * word) { - const char e = strstr(word,"("); - if(e == NULL) - return word; - - return String(word,e); -} - -static const char * -get_arg(const char * word) { - const char e = NULL; } -static const char * -expand_string(const char * str) { - -} - -#endif - /* -------------------------------------------------------------------*/ static void @@ -244,16 +229,28 @@ assert(e != NULL); if (s == e) return; - - /* Expand any macros before passing String(s,e) to the lexer */ - - /* Search through and grab each word to test if it is a macro */ - for(;;) { - break; + + const char * curr; + const char * tempstart = NULL; + const char * tempend = NULL; + const char * new_end = NULL; + const char * new_word; + + for(curr = s; curr < e; curr++) { + /* Search through and grab each word to test if it is a macro */ + grab_word(curr,e,tempstart,tempend); + new_word = replace_word(String(tempstart,tempend), newend); + + if(new_word == tempstart) { /* Didn't macro expand, this string is ready to lex */ + D(0x10, "expand <%V>\n", String(s, e)); + Lexer(cfs->h->tokens, s, e); + } else /* We did some expansions. Re expand the expanded output */ + cpp_expand(cfs,rr,new_word,new_end); /* XXX This does not catch recursive macro's */ + /* XXX So #define FOO FOO will cause this to */ + /* XXX loop forever */ + curr = tempend; } - D(0x10, "expand <%V>\n", String(s, e)); - Lexer(cfs->h->tokens, s, e); } /* -------------------------------------------------------------------*/ From owner-p4-projects@FreeBSD.ORG Sat Aug 19 21:31:02 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AC57516A4E0; Sat, 19 Aug 2006 21:31:02 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 6FDCE16A4DE for ; Sat, 19 Aug 2006 21:31:02 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5259A43D97 for ; Sat, 19 Aug 2006 21:30:48 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7JLUmfW018351 for ; Sat, 19 Aug 2006 21:30:48 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7JLUlpO018348 for perforce@freebsd.org; Sat, 19 Aug 2006 21:30:47 GMT (envelope-from jb@freebsd.org) Date: Sat, 19 Aug 2006 21:30:47 GMT Message-Id: <200608192130.k7JLUlpO018348@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 104565 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 19 Aug 2006 21:31:02 -0000 http://perforce.freebsd.org/chv.cgi?CH=104565 Change 104565 by jb@jb_freebsd2 on 2006/08/19 21:30:29 IFlibbsdelf Affected files ... .. //depot/projects/dtrace/src/lib/libelf/elf_errmsg.c#6 integrate .. //depot/projects/dtrace/src/lib/libelf/gelf_getehdr.3#4 integrate .. //depot/projects/dtrace/src/lib/libelf/gelf_newehdr.3#4 integrate .. //depot/projects/dtrace/src/lib/libelf/libelf.h#5 integrate .. //depot/projects/dtrace/src/lib/libelf/libelf_ehdr.c#4 integrate Differences ... ==== //depot/projects/dtrace/src/lib/libelf/elf_errmsg.c#6 (text+ko) ==== @@ -50,7 +50,7 @@ DEFINE_ERROR(STAT, "Cannot determine file parameters"), DEFINE_ERROR(TRUNCATE, "File truncation failed"), DEFINE_ERROR(UNIMPL, "Feature is unimplemented"), - DEFINE_ERROR(VERSION, "Unknown API version"), + DEFINE_ERROR(VERSION, "Unknown ELF API version"), DEFINE_ERROR(NUM, "Unknown error") #undef DEFINE_ERROR }; ==== //depot/projects/dtrace/src/lib/libelf/gelf_getehdr.3#4 (text+ko) ==== @@ -93,6 +93,10 @@ Argument .Ar dst was null. +.It Bq Er ELF_E_CLASS +The ELF class of descriptor +.Ar elf +did not match that of the API function being called. .It Bq Er ELF_E_HEADER ELF descriptor .Ar elf ==== //depot/projects/dtrace/src/lib/libelf/gelf_newehdr.3#4 (text+ko) ==== @@ -147,6 +147,10 @@ .Dv ELFCLASSNONE and did not match the argument .Ar elfclass . +.It Bq Er ELF_E_CLASS +The ELF class of descriptor +.Ar elf +did not match that of the API function being called. .It Bq Er ELF_E_HEADER A malformed ELF header was detected. .It Bq Er ELF_E_RESOURCE ==== //depot/projects/dtrace/src/lib/libelf/libelf.h#5 (text+ko) ==== @@ -140,7 +140,7 @@ ELF_E_NONE, /* No error */ ELF_E_ARCHIVE, /* Malformed ar(1) archive */ ELF_E_ARGUMENT, /* Invalid argument */ - ELF_E_CLASS, /* ELF class mismatch */ + ELF_E_CLASS, /* Mismatched ELF class */ ELF_E_HEADER, /* Missing or malformed ELF header */ ELF_E_MMAP, /* File mapping failed */ ELF_E_MODE, /* Wrong mode for ELF descriptor */ ==== //depot/projects/dtrace/src/lib/libelf/libelf_ehdr.c#4 (text+ko) ==== @@ -59,13 +59,16 @@ assert(ec == ELFCLASS32 || ec == ELFCLASS64); - if (e == NULL || - e->e_kind != ELF_K_ELF || - (e->e_class != ELFCLASSNONE && e->e_class != ec)) { + if (e == NULL || e->e_kind != ELF_K_ELF) { LIBELF_SET_ERROR(ARGUMENT, 0); return (NULL); } + if (e->e_class != ELFCLASSNONE && e->e_class != ec) { + LIBELF_SET_ERROR(CLASS, 0); + return (NULL); + } + if (e->e_version != EV_CURRENT) { LIBELF_SET_ERROR(VERSION, 0); return (NULL); From owner-p4-projects@FreeBSD.ORG Sat Aug 19 23:10:05 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D644316A4E7; Sat, 19 Aug 2006 23:10:04 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 9AB5516A4DA for ; Sat, 19 Aug 2006 23:10:04 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5DEBC43D45 for ; Sat, 19 Aug 2006 23:10:04 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7JNA4k6027242 for ; Sat, 19 Aug 2006 23:10:04 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7JNA4Gt027239 for perforce@freebsd.org; Sat, 19 Aug 2006 23:10:04 GMT (envelope-from jb@freebsd.org) Date: Sat, 19 Aug 2006 23:10:04 GMT Message-Id: <200608192310.k7JNA4Gt027239@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 104568 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 19 Aug 2006 23:10:05 -0000 http://perforce.freebsd.org/chv.cgi?CH=104568 Change 104568 by jb@jb_zoo on 2006/08/19 23:09:05 A quirk of the amd64 build is the 32-bit libraries which build into a temporary obj directory which isn't created by mtree, so the subdirectories aren't created. When installing the DTrace library scripts, only do so if the target directory has been created, as is the case for the real install. For the lib32 build case, the DTrace library scripts aren't required. Affected files ... .. //depot/projects/dtrace/src/cddl/lib/libdtrace/Makefile#13 edit Differences ... ==== //depot/projects/dtrace/src/cddl/lib/libdtrace/Makefile#13 (text+ko) ==== @@ -87,8 +87,10 @@ beforedepend: dt_errtags.c dt_names.c beforeinstall: +.if exists(${DESTDIR}/usr/lib/dtrace) .for file in ${DSRCS} ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m ${NOBINMODE} ${.CURDIR}/${file} ${DESTDIR}/usr/lib/dtrace .endfor +.endif .include From owner-p4-projects@FreeBSD.ORG Sat Aug 19 23:45:50 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0B2C716A4E0; Sat, 19 Aug 2006 23:45:50 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 C483E16A4DE for ; Sat, 19 Aug 2006 23:45:49 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7E24143D45 for ; Sat, 19 Aug 2006 23:45:49 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7JNjncX028928 for ; Sat, 19 Aug 2006 23:45:49 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7JNjnpO028925 for perforce@freebsd.org; Sat, 19 Aug 2006 23:45:49 GMT (envelope-from jb@freebsd.org) Date: Sat, 19 Aug 2006 23:45:49 GMT Message-Id: <200608192345.k7JNjnpO028925@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 104570 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 19 Aug 2006 23:45:50 -0000 http://perforce.freebsd.org/chv.cgi?CH=104570 Change 104570 by jb@jb_zoo on 2006/08/19 23:45:05 Add the puts method. Affected files ... .. //depot/projects/dtrace/src/sys/gdb/gdb_cons.c#3 edit Differences ... ==== //depot/projects/dtrace/src/sys/gdb/gdb_cons.c#3 (text) ==== @@ -159,6 +159,18 @@ } } +static void +gdb_cnputs(struct consdev *cp, char *p, int num) +{ + int i; + + for (i = 0; i < num; i++) { + if (p[i] == '\n') + gdb_cnputc(cp, '\r'); + gdb_cnputc(cp, p[i] & 0xff); + } +} + CONSOLE_DRIVER(gdb); /* From owner-p4-projects@FreeBSD.ORG Sat Aug 19 23:46:52 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id F305016A4E5; Sat, 19 Aug 2006 23:46:51 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 A912316A4DF for ; Sat, 19 Aug 2006 23:46:51 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5DCFD43D49 for ; Sat, 19 Aug 2006 23:46:51 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7JNkp71028972 for ; Sat, 19 Aug 2006 23:46:51 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7JNkplh028969 for perforce@freebsd.org; Sat, 19 Aug 2006 23:46:51 GMT (envelope-from jb@freebsd.org) Date: Sat, 19 Aug 2006 23:46:51 GMT Message-Id: <200608192346.k7JNkplh028969@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 104571 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 19 Aug 2006 23:46:52 -0000 http://perforce.freebsd.org/chv.cgi?CH=104571 Change 104571 by jb@jb_zoo on 2006/08/19 23:46:21 - Remove NO_DTRACE as it turned out not to be useful. - Change NO_CDDL to MK_CDDL to suit the new style build toggles. - Add amd64 to the list of arches on which DTrace works. Affected files ... .. //depot/projects/dtrace/src/share/mk/bsd.dtrace.mk#3 edit Differences ... ==== //depot/projects/dtrace/src/share/mk/bsd.dtrace.mk#3 (text+ko) ==== @@ -1,7 +1,6 @@ # $FreeBSD$ -.if ${MACHINE_ARCH} != "i386" && ${MACHINE_ARCH} != "sparc64" +.if ${MACHINE_ARCH} != "amd64" && ${MACHINE_ARCH} != "i386" && ${MACHINE_ARCH} != "sparc64" NO_CTF= 1 -NO_CDDL= 1 -NO_DTRACE= 1 +MK_CDDL= no .endif